diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bff753c62a..6477b03f07 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -163,8 +163,8 @@
 /types/animejs/                                     @A-Babin
 /types/annyang/                                     @hisham @theluk
 /types/ansi/                                        @Gustavo6046
-/types/ansi-colors/v1/                              @rogierschouten
 /types/ansi-colors/                                 @rogierschouten @BendingBender
+/types/ansi-colors/v1/                              @rogierschouten
 /types/ansi-escape-sequences/                       @aomarks
 /types/ansi-escapes/                                @jacobbubu
 /types/ansi-regex/                                  @mvachhar @ffflorian
@@ -196,8 +196,8 @@
 /types/aqb/                                         @Athenkosi-Mase
 /types/arangodb/                                    @pluma
 /types/arbiter/                                     @arash16
-/types/arcgis-js-api/v3/                            @Esri @bsvensson
 /types/arcgis-js-api/                               @Esri @bsvensson
+/types/arcgis-js-api/v3/                            @Esri @bsvensson
 /types/arcgis-rest-api/                             @JeffJacobson
 /types/arcgis-to-geojson-utils/                     @JeffJacobson
 /types/archiver/                                    @dolanmiu @crevil
@@ -223,6 +223,7 @@
 /types/ascii-art/                                   @lukaselmer
 /types/ascii2mathml/                                @RagibHasin
 /types/asenv/                                       @remisery
+/types/asn1/                                        @jgeurts
 /types/asn1js/                                      @microshine
 /types/aspnet-identity-pw/                          @jt000
 /types/assert/                                      @nicoabie @LinusU
@@ -257,8 +258,8 @@
 /types/auth-header/                                 @ForbesLindesay
 /types/auth0/                                       @westy92 @ianhowe76 @dauledk
 /types/auth0-angular/                               @homesar
-/types/auth0-js/v7/                                 @advancedrei
 /types/auth0-js/                                    @adrianchia @mdurrant @peterblazejewicz
+/types/auth0-js/v7/                                 @advancedrei
 /types/auth0-lock/                                  @carusology @goldcaddy77 @lfaudreejr @willcaul
 /types/auth0.widget/                                @advancedrei
 /types/auto-bind/                                   @sseppola
@@ -277,6 +278,7 @@
 /types/aws4/                                        @ajcrites
 /types/axe-webdriverjs/                             @JoshuaKGoldberg
 /types/axel/                                        @ruslan-molodyko
+/types/axios-case-converter/                        @dkniffin
 /types/axios-token-interceptor/                     @innovation-team
 /types/axon/                                        @jewbre
 /types/azure/                                       @AndrewGaspar @antiveeranna @SomaticIT
@@ -323,8 +325,8 @@
 /types/barcode/                                     @pvomhoff
 /types/bardjs/                                      @TepigMC
 /types/base-64/                                     @dolanmiu
-/types/base-x/v1/                                   @chrootsu
 /types/base-x/                                      @chrootsu @BendingBender
+/types/base-x/v1/                                   @chrootsu
 /types/base16/                                      @alechill
 /types/base64-arraybuffer/                          @jbencook
 /types/base64-async/                                @BendingBender
@@ -351,7 +353,7 @@
 /types/better-curry/                                @pocesar
 /types/better-queue/                                @maozedong
 /types/better-scroll/                               @stoneChen @cnjack
-/types/better-sqlite3/                              @Morfent @matrumz @sant123 @loghorn
+/types/better-sqlite3/                              @Morfent @matrumz @sant123 @loghorn @andykais
 /types/bezier-easing/                               @ptlis
 /types/bezier-js/                                   @danmarshall @Epskampie
 /types/bgiframe/                                    @sumegizoltan
@@ -392,9 +394,9 @@
 /types/bloom-filter/                                @danwbyrne
 /types/bloomfilter/                                 @slawiko
 /types/blue-tape/                                   @sodatea
-/types/bluebird/v1/                                 @Bartvds
-/types/bluebird/v2/                                 @Bartvds @falsandtru
 /types/bluebird/                                    @lhecker
+/types/bluebird/v2/                                 @Bartvds @falsandtru
+/types/bluebird/v1/                                 @Bartvds
 /types/bluebird-global/                             @d-ph
 /types/bluebird-retry/                              @pvomhoff
 /types/blueimp-md5/                                 @rmartone @mkohlmyr
@@ -404,13 +406,13 @@
 /types/body-scroll-lock/                            @kimcoder
 /types/bonjour/                                     @quentin-ol @octo-sniffle
 /types/bookshelf/                                   @arcticwaters @vesse
-/types/boom/v3/                                     @rogatty
-/types/boom/v4/                                     @rogatty @AJamesPhillips @jineshshah36 @danielmachado
 /types/boom/                                        @rogatty @AJamesPhillips @jineshshah36 @TimonVS @danielmachado
+/types/boom/v4/                                     @rogatty @AJamesPhillips @jineshshah36 @danielmachado
+/types/boom/v3/                                     @rogatty
 /types/bootbox/                                     @vbortone @konpikwastaken @kanup @icereed @trodi @stannynuytkens @renjfk
 /types/bootpag/                                     @rdeneau
-/types/bootstrap/v3/                                @borisyankov @denisname
 /types/bootstrap/                                   @denisname
+/types/bootstrap/v3/                                @borisyankov @denisname
 /types/bootstrap-3-typeahead/                       @AndersonFriaca
 /types/bootstrap-datepicker/                        @borisyankov
 /types/bootstrap-fileinput/                         @CheCoxshall
@@ -427,8 +429,8 @@
 /types/bootstrap-validator/                         @BradyLiles
 /types/bootstrap.paginator/                         @derikwhittaker
 /types/bootstrap.timepicker/                        @derikwhittaker @heatherbooker
-/types/bootstrap.v3.datetimepicker/v3/              @bayitajesi
 /types/bootstrap.v3.datetimepicker/                 @katonap
+/types/bootstrap.v3.datetimepicker/v3/              @bayitajesi
 /types/bootstrap3-dialog/                           @nakupanda @cnboland
 /types/bounce.js/                                   @cherrry
 /types/box2d/                                       @jbaldwin
@@ -453,10 +455,11 @@
 /types/browserify/                                  @AndrewGaspar @jvilk @leonard-thieu @LinusU
 /types/browserslist/                                @davecardwell
 /types/browserslist-useragent/                      @nju33
-/types/bs58/v3/                                     @chrootsu
 /types/bs58/                                        @chrootsu @BendingBender
+/types/bs58/v3/                                     @chrootsu
 /types/bson/                                        @horiuchi @CaselIT
-/types/btoa/                                        @johngeorgewright
+/types/btoa/                                        @johngeorgewright @bricka
+/types/buble/                                       @Kocal
 /types/bucks/                                       @zaneli
 /types/buffer-compare/                              @chrootsu
 /types/buffer-crc32/                                @BendingBender
@@ -467,8 +470,8 @@
 /types/buffers/                                     @rhencke
 /types/bufferstream/                                @Bartvds
 /types/builtin-modules/                             @ajafff
-/types/bull/v2/                                     @bgrieder @JProgrammer
 /types/bull/                                        @bgrieder @JProgrammer @marshall007 @weeco @blaugold @iamolegga @koblas @bondz @wuha-team @aleccool213 @danmana @kjellmorten @pc-jedi
+/types/bull/v2/                                     @bgrieder @JProgrammer
 /types/bump-regex/                                  @silkentrance
 /types/bunnymq/                                     @cyrilschumacher
 /types/bunyan/                                      @amikhalev
@@ -487,6 +490,7 @@
 /types/bytewise/                                    @danwbyrne
 /types/c3/                                          @mcliment @gerinjacob @denyo @dmitryshindin @timn
 /types/cache-manager/                               @GausSim
+/types/cacheable-request/                           @BendingBender
 /types/cached-path-relative/                        @TeamworkGuy2
 /types/cadesplugin/                                 @Delagen @kmvi
 /types/cal-heatmap/                                 @RetroChrisB
@@ -513,16 +517,16 @@
 /types/cash/                                        @akvlko
 /types/casperjs/                                    @jedmao @urielch
 /types/cassandra-driver/                            @Svjard @pc-jedi
-/types/catbox/v7/                                   @jasonswearingen @AJamesPhillips
 /types/catbox/                                      @jasonswearingen @AJamesPhillips @saboya
+/types/catbox/v7/                                   @jasonswearingen @AJamesPhillips
 /types/catbox-memory/                               @SimonSchick
 /types/catbox-redis/                                @SimonSchick
 /types/cbor/                                        @pushplay
 /types/ccap/                                        @taoqf
 /types/cesium/                                      @Zuzon @hnipps @szechyjs @golyalpha
 /types/cfn-response/                                @ivoisbelongtous
-/types/chai/v2/                                     @Bartvds @AGBrown
 /types/chai/                                        @jedmao @Bartvds @AGBrown @olivr70 @mwistrand @joshuakgoldberg @shaunluttin @Naktibalda @micksatana @ErikSchierboom
+/types/chai/v2/                                     @Bartvds @AGBrown
 /types/chai-almost/                                 @kclnn
 /types/chai-arrays/                                 @clementprevot
 /types/chai-as-promised/                            @jt000 @Kuniwak @leonard-thieu @lazerwalker @mattbishop
@@ -565,8 +569,8 @@
 /types/chordsheetjs/                                @adamsbloom
 /types/chosen-js/                                   @borisyankov @denisname
 /types/chownr/                                      @BendingBender
-/types/chroma-js/v0/                                @invliD
 /types/chroma-js/                                   @invliD @mpacholec
+/types/chroma-js/v0/                                @invliD
 /types/chrome/                                      @matthewkimber @otiai10 @couven92 @rreverser @sreimer15 @MatCarlson
 /types/chrome-apps/                                 @niikoo @AdamLay @pine613 @mzsm @RReverser @pyle @matthewkimber @otiai10 @couven92 @rreverser @sreimer15
 /types/chromecast-caf-receiver/                     @craigrbruce
@@ -574,8 +578,8 @@
 /types/chromedriver/                                @pe8ter
 /types/circuit-breaker-js/                          @DeTeam
 /types/circular-json/                               @jpevarnek
-/types/ckeditor/v2/                                 @wittwert
 /types/ckeditor/                                    @wittwert @stuartlong @viktorpegy
+/types/ckeditor/v2/                                 @wittwert
 /types/ckeditor__ckeditor5-core/                    @denisname
 /types/ckeditor__ckeditor5-engine/                  @denisname
 /types/ckeditor__ckeditor5-utils/                   @denisname
@@ -583,8 +587,8 @@
 /types/clamp-js-main/                               @sinziananicolae
 /types/classnames/                                  @adidahiya @JKillian @seansfkelley @mradamczyk @marvinhagemeister
 /types/cldrjs/                                      @RamanBut-Husaim @gcastre
-/types/clean-css/v3/                                @tkrotoff
 /types/clean-css/                                   @tkrotoff @GolaWaya
+/types/clean-css/v3/                                @tkrotoff
 /types/clean-regexp/                                @BendingBender
 /types/clean-stack/                                 @BendingBender
 /types/clean-webpack-plugin/                        @j-f1
@@ -633,11 +637,12 @@
 /types/coinlist/                                    @BendingBender
 /types/coinstring/                                  @mhegazy
 /types/collections/                                 @scarabedore
-/types/color/v0/                                    @LKay
-/types/color/v1/                                    @LKay
-/types/color/v2/                                    @Airlun
 /types/color/                                       @Airlun @jameswlane
+/types/color/v2/                                    @Airlun
+/types/color/v1/                                    @LKay
+/types/color/v0/                                    @LKay
 /types/color-convert/                               @Airlun
+/types/color-diff/                                  @katsanva
 /types/color-name/                                  @Ailrun
 /types/color-namer/                                 @in19farkt
 /types/color-string/                                @BendingBender @danmarshall
@@ -651,8 +656,8 @@
 /types/combokeys/                                   @iclanton
 /types/cometd/                                      @derekcicerone @unindented @alxHenry
 /types/command-exists/                              @BendingBender
-/types/command-line-args/v4/                        @CzBuCHi @75lb
 /types/command-line-args/                           @75lb
+/types/command-line-args/v4/                        @CzBuCHi @75lb
 /types/command-line-commands/                       @CzBuCHi
 /types/command-line-usage/                          @matrumz @Dvorsky
 /types/commangular/                                 @hiraash
@@ -676,9 +681,9 @@
 /types/compute-stdev/                               @mrmlnc
 /types/concat-stream/                               @jmarianer
 /types/concaveman/                                  @DenisCarriere
-/types/conf/v0/                                     @SamVerschueren
-/types/conf/v1/                                     @SamVerschueren @BendingBender
 /types/conf/                                        @SamVerschueren @BendingBender
+/types/conf/v1/                                     @SamVerschueren @BendingBender
+/types/conf/v0/                                     @SamVerschueren
 /types/confidence/                                  @jppellerin
 /types/config/                                      @RWander @forrestbice @jndonald3 @albertovasquez
 /types/config-yaml/                                 @me
@@ -707,6 +712,7 @@
 /types/consul/                                      @chrootsu
 /types/contains-path/                               @BendingBender
 /types/content-disposition/                         @bomret
+/types/content-range/                               @bricka
 /types/content-type/                                @horiuchi @BendingBender
 /types/contentful-resolve-response/                 @antonkarsten
 /types/contextjs/                                   @kernhanda
@@ -754,16 +760,16 @@
 /types/core-object/                                 @dfreeman
 /types/correlation-id/                              @natemara
 /types/cors/                                        @pluma
-/types/cosmiconfig/v4/                              @ozum
 /types/cosmiconfig/                                 @ozum @szeck87 @saadq @jinwoo
+/types/cosmiconfig/v4/                              @ozum
 /types/cote/                                        @makepost @roblabat
 /types/couchbase/                                   @maouida @fluggo
 /types/countdown/                                   @gjuchault
 /types/counterpart/                                 @santiagodoldan
 /types/countries-and-timezones/                     @zero51
 /types/country-data/                                @biltongza
-/types/country-list/v1/                             @iRoachie
 /types/country-list/                                @iRoachie @Kimahriman
+/types/country-list/v1/                             @iRoachie
 /types/country-select-js/                           @humrochagf
 /types/countup.js/                                  @shermendev
 /types/coverup/                                     @bevalorous
@@ -816,12 +822,12 @@
 /types/csv2json/                                    @dex4er
 /types/csvrow/                                      @codeanimal
 /types/csvtojson/                                   @EricByers @wcarson
-/types/cucumber/v1/                                 @abraaoalves @jan-molak @isoung @BendingBender
-/types/cucumber/v3/                                 @abraaoalves @jan-molak @isoung @BendingBender @ErikSchierboom
 /types/cucumber/                                    @abraaoalves @jan-molak @isoung @BendingBender @ErikSchierboom
+/types/cucumber/v3/                                 @abraaoalves @jan-molak @isoung @BendingBender @ErikSchierboom
+/types/cucumber/v1/                                 @abraaoalves @jan-molak @isoung @BendingBender
 /types/currency-formatter/                          @mhegazy @davidmpaz
 /types/custom-error-generator/                      @thmiceli
-/types/custom-functions-runtime/                    @OfficeDev @Zlatkovsky @mscharlock
+/types/custom-functions-runtime/                    @OfficeDev @akrantz @Zlatkovsky @mscharlock
 /types/cwd/                                         @BendingBender
 /types/cwise/                                       @taoqf
 /types/cwise-compiler/                              @taoqf
@@ -831,9 +837,9 @@
 /types/cypress-axe/                                 @wKovacs64
 /types/cytoscape/                                   @phreed @wy193777 @ypconstante @janniclas @cerberuser
 /types/d/                                           @BendingBender
-/types/d3/v3/                                       @gustavderdrache @borisyankov @MatthiasJobst
-/types/d3/v4/                                       @tomwanzek @gustavderdrache @borisyankov @denisname
 /types/d3/                                          @tomwanzek @gustavderdrache @borisyankov @denisname
+/types/d3/v4/                                       @tomwanzek @gustavderdrache @borisyankov @denisname
+/types/d3/v3/                                       @gustavderdrache @borisyankov @MatthiasJobst
 /types/d3-array/                                    @gustavderdrache @borisyankov @tomwanzek @denisname
 /types/d3-axis/                                     @tomwanzek @gustavderdrache @borisyankov @denisname
 /types/d3-box/                                      @lk-chen
@@ -864,8 +870,8 @@
 /types/d3-random/                                   @tomwanzek @gustavderdrache @borisyankov
 /types/d3-request/                                  @Ledragon @gustavderdrache @borisyankov @tomwanzek @denisname
 /types/d3-sankey/                                   @tomwanzek @gustavderdrache
-/types/d3-scale/v1/                                 @tomwanzek @gustavderdrache @borisyankov
 /types/d3-scale/                                    @tomwanzek @gustavderdrache @borisyankov @denisname
+/types/d3-scale/v1/                                 @tomwanzek @gustavderdrache @borisyankov
 /types/d3-scale-chromatic/                          @Ledragon @gustavderdrache @borisyankov @henriquefm
 /types/d3-selection/                                @tomwanzek @gustavderdrache @borisyankov @denisname
 /types/d3-selection-multi/                          @gustavderdrache @borisyankov
@@ -900,8 +906,8 @@
 /types/datatables.net-select/                       @szechyjs
 /types/date-arithmetic/                             @HeeL
 /types/date.format.js/                              @balrob
-/types/dateformat/v1/                               @aicest
 /types/dateformat/                                  @aicest @BendingBender
+/types/dateformat/v1/                               @aicest
 /types/datejs/                                      @rupertavery
 /types/daterangepicker/                             @SirMartin @smasala @nertzy
 /types/dav/                                         @ToastHawaii
@@ -934,13 +940,14 @@
 /types/deep-freeze-strict/                          @mhegazy
 /types/default-gateway/                             @BendingBender
 /types/defaults/                                    @IbtihelCHNAB
+/types/defaults-deep/                               @Kocal
 /types/defer-promise/                               @niklasf
 /types/define-lazy-prop/                            @BendingBender
 /types/defined/                                     @BendingBender
 /types/deglob/                                      @saadq
 /types/deku/                                        @pocka
-/types/del/v2/                                      @AyaMorisawa
 /types/del/                                         @AyaMorisawa @BendingBender @bitjson
+/types/del/v2/                                      @AyaMorisawa
 /types/delaunator/                                  @DenisCarriere @BTOdell
 /types/delete-empty/                                @Alorel
 /types/deline/                                      @iarroyo5
@@ -959,8 +966,8 @@
 /types/detect-browser/                              @rogierschouten @carusology
 /types/detect-character-encoding/                   @BendingBender
 /types/detect-hover/                                @thomastilkema
-/types/detect-indent/v0/                            @Bartvds
 /types/detect-indent/                               @Bartvds @BendingBender
+/types/detect-indent/v0/                            @Bartvds
 /types/detect-it/                                   @thomastilkema
 /types/detect-newline/                              @BendingBender
 /types/detect-node/                                 @LogvinovLeon
@@ -980,7 +987,8 @@
 /types/diacritics/                                  @otociulis
 /types/dialogflow/                                  @dyladan
 /types/dicer/                                       @GoupilRobin @BendingBender
-/types/diff/                                        @vvakame @szdc @moc-yuto
+/types/diff/                                        @vvakame @szdc @moc-yuto @BendingBender
+/types/diff/v3/                                     @vvakame @szdc @moc-yuto
 /types/diff2html/                                   @rtfpessoa
 /types/diffie-hellman/                              @BendingBender
 /types/digibyte/                                    @lautarodragan @werewolfe
@@ -994,6 +1002,7 @@
 /types/dispatchr/                                   @Ragg-
 /types/disposable-email-domains/                    @geoffreak
 /types/distributions/                               @marcolanaro
+/types/dlv/                                         @ryansonshine
 /types/dnssd/                                       @angelmerino @Maxr1998
 /types/doccookies/                                  @jonegerton
 /types/dockerode/                                   @seikho @nlaplante @isac322 @lazarusx @meisenzahl @thegecko @CameronDiver @p4sca1
@@ -1020,12 +1029,12 @@
 /types/dookie/                                      @swanest
 /types/dot/                                         @ZombieHunter
 /types/dot-object/                                  @nkovacic
-/types/dot-prop/v2/                                 @samverschueren
 /types/dot-prop/                                    @samverschueren @BendingBender
+/types/dot-prop/v2/                                 @samverschueren
 /types/dotdir-regex/                                @mrmlnc
 /types/dotdotdot/                                   @milanjaros
-/types/dotenv/v2/                                   @jussikinnula @borekb @enaeseth
 /types/dotenv/                                      @jussikinnula @borekb @enaeseth @maxbeatty
+/types/dotenv/v2/                                   @jussikinnula @borekb @enaeseth
 /types/dotenv-flow/                                 @vincentlanglet
 /types/dotenv-safe/                                 @krenor
 /types/dotenv-webpack/                              @karol-majewski @davecardwell
@@ -1042,11 +1051,12 @@
 /types/draggabilly/                                 @jaydubu
 /types/dragster/                                    @zskovacs
 /types/dragula/                                     @pwelter34 @abruzzihraig
+/types/drivelist/                                   @WholeMilk
 /types/dropbox-chooser/                             @quas94
 /types/dropboxjs/                                   @Steve-Fenton @xperiments
 /types/dropkickjs/                                  @VorobeY1326
-/types/dropzone/v4/                                 @nvivo @outring @renuo @Hikariii
 /types/dropzone/                                    @nvivo @outring @renuo @Hikariii @tedbcsgpro @dwaxweiler
+/types/dropzone/v4/                                 @nvivo @outring @renuo @Hikariii
 /types/dts-generator/                               @mtraynham
 /types/duplexer2/                                   @Goldsmith42
 /types/duplexer3/                                   @BendingBender
@@ -1098,8 +1108,8 @@
 /types/electron-notifications/                      @djpereira
 /types/electron-notify/                             @djpereira
 /types/electron-packager/                           @SomaticIT @cortopy @jkleinsc @shiftkey @malept
-/types/electron-settings/v2/                        @leonard-thieu
 /types/electron-settings/                           @icopp @nrlquaker
+/types/electron-settings/v2/                        @leonard-thieu
 /types/electron-spellchecker/                       @unindented
 /types/electron-store/                              @unindented @jsynowiec
 /types/electron-unhandled/                          @jeremejevs
@@ -1114,22 +1124,22 @@
 /types/elliptic/                                    @danwbyrne @Gilthoniel
 /types/elm/                                         @thSoft
 /types/email-templates/                             @cyrilschumacher @gurisko @blankstar85
-/types/ember/v1/                                    @jedmao
-/types/ember/v2/                                    @jedmao @bttf @dwickern @chriskrycho @theroncross @mfeckie @alexlafroscia @mike-north
 /types/ember/                                       @jedmao @bttf @dwickern @chriskrycho @theroncross @mfeckie @alexlafroscia @mike-north @BryanCrotaz
-/types/ember-data/v2/                               @dwickern @mike-north @chriskrycho
+/types/ember/v2/                                    @jedmao @bttf @dwickern @chriskrycho @theroncross @mfeckie @alexlafroscia @mike-north
+/types/ember/v1/                                    @jedmao
 /types/ember-data/                                  @dwickern @mike-north @chriskrycho
-/types/ember-feature-flags/v3/                      @tansongyang @mike-north
+/types/ember-data/v2/                               @dwickern @mike-north @chriskrycho
 /types/ember-feature-flags/                         @tansongyang @mike-north
+/types/ember-feature-flags/v3/                      @tansongyang @mike-north
 /types/ember-mocha/                                 @dwickern @simonihmig @mike-north
-/types/ember-modal-dialog/v2/                       @tansongyang @mike-north
 /types/ember-modal-dialog/                          @tansongyang @mike-north
-/types/ember-qunit/v2/                              @dwickern @mike-north
+/types/ember-modal-dialog/v2/                       @tansongyang @mike-north
 /types/ember-qunit/                                 @dwickern @mike-north @scalvert @dfreeman
-/types/ember-resolver/v4/                           @dfreeman @mike-north
+/types/ember-qunit/v2/                              @dwickern @mike-north
 /types/ember-resolver/                              @dfreeman @mike-north
-/types/ember-test-helpers/v0/                       @dwickern @mike-north
+/types/ember-resolver/v4/                           @dfreeman @mike-north
 /types/ember-test-helpers/                          @dwickern @mike-north
+/types/ember-test-helpers/v0/                       @dwickern @mike-north
 /types/ember-testing-helpers/                       @chriskrycho
 /types/ember__application/                          @mike-north
 /types/ember__array/                                @mike-north
@@ -1148,7 +1158,7 @@
 /types/ember__test-helpers/                         @dfreeman @jamescdavis @mike-north
 /types/ember__utils/                                @mike-north
 /types/emissary/                                    @vvakame
-/types/emoji-mart/                                  @Kovensky @Nicell
+/types/emoji-mart/                                  @Jessidhia @Nicell
 /types/emoji-regex/                                 @iKBAHT
 /types/emojione/                                    @dbrgn
 /types/empower/                                     @vvakame
@@ -1201,8 +1211,8 @@
 /types/eslint-plugin-prettier/                      @ikatyang
 /types/eslint-scope/                                @mysticatea
 /types/eslint-visitor-keys/                         @mysticatea
-/types/esprima/v2/                                  @teppeis @RReverser
 /types/esprima/                                     @teppeis @RReverser @peter-scott
+/types/esprima/v2/                                  @teppeis @RReverser
 /types/esprima-walk/                                @tswaters
 /types/espruino/                                    @stasberkov @createdbyjurand
 /types/esri-leaflet/                                @strajuser
@@ -1245,16 +1255,16 @@
 /types/expectations/                                @vvakame
 /types/expired-storage/                             @intolerance
 /types/expirymanager/                               @DanielRose
-/types/expo/v23/                                    @KonstantinKai
-/types/expo/v24/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger
-/types/expo/v25/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov
-/types/expo/v26/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @tinaroh
-/types/expo/v27/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo
-/types/expo/v30/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo
 /types/expo/                                        @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo @levansuper @ihmpavel @burtek @jkillian
+/types/expo/v30/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo
+/types/expo/v27/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo
+/types/expo/v26/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @tinaroh
+/types/expo/v25/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov
+/types/expo/v24/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger
+/types/expo/v23/                                    @KonstantinKai
 /types/expo-localization/                           @burtek
 /types/expo__status-bar-height/                     @dawnmist
-/types/expo__vector-icons/                          @incleaf
+/types/expo__vector-icons/                          @incleaf @robertying
 /types/express/                                     @borisyankov
 /types/express-brute/                               @cyrilschumacher
 /types/express-brute-memcached/                     @cyrilschumacher
@@ -1290,8 +1300,8 @@
 /types/express-paginate/                            @AmirTugi
 /types/express-partials/                            @jt000
 /types/express-promise-router/                      @wanganjun
-/types/express-rate-limit/v2/                       @cyrilschumacher @makepost
 /types/express-rate-limit/                          @cyrilschumacher @makepost @jdforsythe
+/types/express-rate-limit/v2/                       @cyrilschumacher @makepost
 /types/express-redis-cache/                         @ajliv
 /types/express-route-fs/                            @kripod
 /types/express-routemap/                            @icopp
@@ -1313,6 +1323,7 @@
 /types/express-xml-bodyparser/                      @noticeMaker @macedigital
 /types/extend/                                      @reppners
 /types/extjs/                                       @brian428
+/types/extra-watch-webpack-plugin/                  @davecardwell
 /types/extract-files/                               @Slessi
 /types/extract-stack/                               @BendingBender
 /types/extract-text-webpack-plugin/                 @flying-sheep @katyo
@@ -1326,8 +1337,8 @@
 /types/facebook-js-sdk/                             @amritk @mahmoudzohdi @fluidsonic
 /types/facebook-pixel/                              @noctishsu
 /types/factory-girl/                                @stackbuilders @sestrella @elcuy
-/types/faker/v3/                                    @Kuniwak
 /types/faker/                                       @bensw @basp @Kuniwak @mattbishop
+/types/faker/v3/                                    @Kuniwak
 /types/falcor/                                      @Quramy
 /types/falcor-express/                              @Quramy
 /types/falcor-http-datasource/                      @Quramy
@@ -1348,6 +1359,7 @@
 /types/fastify-favicon/                             @tuelsch
 /types/fastify-jwt/                                 @jannikkeye
 /types/fastify-multipart/                           @jannikkeye
+/types/fastify-rate-limit/                          @pc-jedi
 /types/fastify-static/                              @leomelzer
 /types/favico.js/                                   @drowse314-dev-ymat
 /types/favicons/                                    @mohsen1 @metsawyr
@@ -1356,12 +1368,12 @@
 /types/fbemitter/                                   @kmxz
 /types/feather-icons/                               @jineshshah36
 /types/featherlight/                                @xStrom
-/types/feathersjs__authentication/                  @AbraaoAlves @j2L4e
+/types/feathersjs__authentication/                  @AbraaoAlves @j2L4e @NickBolles
 /types/feathersjs__authentication-client/           @AbraaoAlves @j2L4e
 /types/feathersjs__authentication-jwt/              @j2L4e
 /types/feathersjs__authentication-local/            @j2L4e
 /types/feathersjs__authentication-oauth1/           @j2L4e
-/types/feathersjs__authentication-oauth2/           @j2L4e
+/types/feathersjs__authentication-oauth2/           @j2L4e @NickBolles
 /types/feathersjs__configuration/                   @j2L4e
 /types/feathersjs__errors/                          @j2L4e
 /types/feathersjs__express/                         @j2L4e @DadUndead
@@ -1375,8 +1387,8 @@
 /types/feedme/                                      @codeanimal
 /types/feedparser/                                  @cortopy
 /types/fetch-jsonp/                                 @tkrotoff
-/types/fetch-mock/v6/                               @asvetliakov @tamird @merrywhether @chrissinclair @matttennison @quentinbouygues @mtsmfm
 /types/fetch-mock/                                  @asvetliakov @tamird @merrywhether @chrissinclair @matttennison @quentinbouygues @mtsmfm @captain-igloo @ChenNima
+/types/fetch-mock/v6/                               @asvetliakov @tamird @merrywhether @chrissinclair @matttennison @quentinbouygues @mtsmfm
 /types/fetch.io/                                    @newraina
 /types/ffi/                                         @loyd @waitingsong
 /types/ffi-napi/                                    @keerthi16 @KiranNiranjan
@@ -1409,12 +1421,12 @@
 /types/find-root/                                   @Alorel
 /types/find-up/                                     @BendingBender
 /types/find-versions/                               @LogvinovLeon @carnesen
-/types/findup-sync/v0/                              @Bartvds @ngbrown
 /types/findup-sync/                                 @Bartvds @ngbrown @BendingBender
+/types/findup-sync/v0/                              @Bartvds @ngbrown
 /types/fined/                                       @BendingBender
 /types/fingerprintjs/                               @zaneli
-/types/fingerprintjs2/v1/                           @curtstate
 /types/fingerprintjs2/                              @curtstate @BendingBender
+/types/fingerprintjs2/v1/                           @curtstate
 /types/firebase-client/                             @fpsscarecrow
 /types/firebase-token-generator/                    @dotdotcommadot
 /types/firebird/                                    @karak
@@ -1429,6 +1441,7 @@
 /types/flagged-respawn/                             @BendingBender
 /types/flat/                                        @chrootsu
 /types/fleximap/                                    @DanielRose
+/types/flexmonster/                                 @flexmonster
 /types/flexslider/                                  @diullei
 /types/flickity/                                    @clmcgrath @wagich
 /types/flight/                                      @jonathanhedren
@@ -1456,6 +1469,7 @@
 /types/fontoxml/                                    @rolandzwaga
 /types/forever-agent/                               @yavanosta
 /types/forever-monitor/                             @shuntksh @wrboyce
+/types/forge-apis/                                  @Autodesk-Forge
 /types/forge-di/                                    @adamcarr
 /types/forge-viewer/                                @Autodesk-Forge
 /types/form-data/                                   @soywiz @leonyu @BendingBender
@@ -1479,16 +1493,16 @@
 /types/fresh/                                       @BendingBender
 /types/freshy/                                      @qlonik
 /types/friendly-errors-webpack-plugin/              @bahlo
-/types/frisby/v0/                                   @johnny4753
 /types/frisby/                                      @cwoodland @johnny4753
+/types/frisby/v0/                                   @johnny4753
 /types/from/                                        @Bartvds
 /types/from2/                                       @BendingBender
 /types/fromjs/                                      @glenndierckx
 /types/fromnow/                                     @marinewater
 /types/fs-cson/                                     @dex4er
 /types/fs-ext/                                      @OguzhanE
-/types/fs-extra/v4/                                 @alan-agius4 @midknight41 @shiftkey @mees-
 /types/fs-extra/                                    @alan-agius4 @midknight41 @shiftkey @mees- @jrockwood
+/types/fs-extra/v4/                                 @alan-agius4 @midknight41 @shiftkey @mees-
 /types/fs-extra-promise/                            @midknight41 @jasonswearingen @HiromiShikata
 /types/fs-extra-promise-es6/                        @midknight41 @jasonswearingen @geoffreak @HiromiShikata
 /types/fs-finder/                                   @misak113
@@ -1723,8 +1737,8 @@
 /types/gl-texture2d/                                @MathiasPaumgarten
 /types/gldatepicker/                                @qcz
 /types/glidejs/                                     @milanjaros
-/types/glob/v5/                                     @vvakame @voy
 /types/glob/                                        @vvakame @voy @ajafff
+/types/glob/v5/                                     @vvakame @voy
 /types/glob-base/                                   @alan-agius4
 /types/glob-expand/                                 @vvakame
 /types/glob-parent/                                 @mrmlnc
@@ -1739,8 +1753,8 @@
 /types/globalize-compiler/                          @iclanton
 /types/globby/                                      @douglasduteil @ikatyang
 /types/globule/                                     @durad
-/types/glue/v4/                                     @gjednaszewski
 /types/glue/                                        @garfty
+/types/glue/v4/                                     @gjednaszewski
 /types/gm/                                          @ChaosinaCan @maartenvanvliet @mlejva
 /types/go/                                          @NorthwoodsSoftware
 /types/google-adwords-scripts/                      @jafaircl
@@ -1749,6 +1763,7 @@
 /types/google-cloud__datastore/                     @beaulac @ogawa0071 @ThomasdenH
 /types/google-cloud__kms/                           @ben-tbotlabs
 /types/google-cloud__pubsub/                        @pheromonez @LunaPg @msiviero
+/types/google-cloud__tasks/                         @ifiokjr
 /types/google-earth/                                @icholy
 /types/google-images/                               @dolanmiu
 /types/google-libphonenumber/                       @leonyu @winfinit
@@ -1768,10 +1783,10 @@
 /types/googlemaps/                                  @cgwrench @nertzy @xaolas @mrmcnerd @martincostello @svenkreiss @bolatovumar @gauthierm
 /types/googlemaps.infobubble/                       @Dashue
 /types/googlepay/                                   @Fluccioni @Radu-Raicea @fstanis
-/types/got/v8/                                      @BendingBender @LinusU @ikokostya
 /types/got/                                         @BendingBender @LinusU @ikokostya @stijnvn
-/types/graceful-fs/v2/                              @Bartvds
+/types/got/v8/                                      @BendingBender @LinusU @ikokostya
 /types/graceful-fs/                                 @Bartvds @BendingBender
+/types/graceful-fs/v2/                              @Bartvds
 /types/gradient-string/                             @Ailrun
 /types/graham_scan/                                 @hberntsen
 /types/gramps__rest-helpers/                        @claude
@@ -1795,8 +1810,8 @@
 /types/gravatar/                                    @denis-sokolov
 /types/gravatar-url/                                @ivangabriele
 /types/greasemonkey/                                @kotas
-/types/grecaptcha/v0/                               @brentj73
 /types/grecaptcha/                                  @DethAriel @rafaeltavares
+/types/grecaptcha/v0/                               @brentj73
 /types/gregorian-calendar/                          @cwalv
 /types/gridfs-stream/                               @liorm
 /types/gridstack/                                   @PascalSenn @ZoolWay @Sl1MBoy
@@ -1884,27 +1899,28 @@
 /types/gulp-watch/                                  @tkrotoff
 /types/gulp-zip/                                    @dudeofawesome
 /types/gzip-js/                                     @rhysd
-/types/gzip-size/v3/                                @plantain-00
 /types/gzip-size/                                   @plantain-00 @jimivdw @andrewiggins
+/types/gzip-size/v3/                                @plantain-00
 /types/h2o2/                                        @jasonswearingen @AJamesPhillips @garthk
 /types/halfred/                                     @dherges
 /types/halogen/                                     @steller
 /types/hammerjs/                                    @milkisevil @codler
 /types/handlebars/                                  @borisyankov @evil-shrike
 /types/handlebars-helpers/                          @Toilal
-/types/hapi/v8/                                     @jasonswearingen
-/types/hapi/v12/                                    @jasonswearingen
-/types/hapi/v15/                                    @jasonswearingen
-/types/hapi/v16/                                    @jasonswearingen @AJamesPhillips
-/types/hapi/v17/                                    @rafaelsouzaf @jhsimms @SimonSchick @saboya
 /types/hapi/                                        @rafaelsouzaf @jhsimms @SimonSchick @saboya
+/types/hapi/v17/                                    @rafaelsouzaf @jhsimms @SimonSchick @saboya
+/types/hapi/v16/                                    @jasonswearingen @AJamesPhillips
+/types/hapi/v15/                                    @jasonswearingen
+/types/hapi/v12/                                    @jasonswearingen
+/types/hapi/v8/                                     @jasonswearingen
 /types/hapi-auth-basic/                             @AJamesPhillips @saboya
 /types/hapi-auth-bearer-token/                      @saboya
 /types/hapi-auth-cookie/                            @lenovouser @SimonSchick @Mutmatt
-/types/hapi-auth-jwt2/v7/                           @warrenseymour
 /types/hapi-auth-jwt2/                              @warrenseymour @SimonSchick
+/types/hapi-auth-jwt2/v7/                           @warrenseymour
 /types/hapi-decorators/                             @kenhowardpdx
 /types/hapi-pino/                                   @saboya
+/types/happypack/                                   @akashishu777
 /types/har-format/                                  @micmro
 /types/hard-rejection/                              @BendingBender
 /types/hard-source-webpack-plugin/                  @woitechen
@@ -1947,9 +1963,9 @@
 /types/highland/                                    @Bartvds @hgwood @iwllyu @alvis @notbobthebuilder
 /types/highlight.js/                                @nikeee @sourrust @joshuakgoldberg
 /types/hiredis/                                     @titan
-/types/history/v2/                                  @sergey-buturlakin @ngbrown
-/types/history/v3/                                  @sergey-buturlakin @ngbrown @LKay
 /types/history/                                     @sergey-buturlakin @ngbrown @rokoroku
+/types/history/v3/                                  @sergey-buturlakin @ngbrown @LKay
+/types/history/v2/                                  @sergey-buturlakin @ngbrown
 /types/history.js/                                  @borisyankov @gjunge
 /types/historykana/                                 @h-shiratsuki
 /types/hjson/                                       @crunchie84
@@ -1964,8 +1980,8 @@
 /types/howler/                                      @xperiments @tdukart @alien35 @nicholashza
 /types/hpp/                                         @kryops
 /types/html-entities/                               @xstoudi
-/types/html-minifier/v1/                            @tkrotoff
 /types/html-minifier/                               @tkrotoff @rikuayanokozy
+/types/html-minifier/v1/                            @tkrotoff
 /types/html-pdf/                                    @westy92
 /types/html-tag-names/                              @sandersn
 /types/html-tags/                                   @BendingBender
@@ -1979,6 +1995,7 @@
 /types/htmltojsx/                                   @basarat
 /types/http-assert/                                 @jkeylu @stripedpajamas
 /types/http-aws-es/                                 @marcogrcr
+/types/http-cache-semantics/                        @BendingBender
 /types/http-codes/                                  @mhegazy
 /types/http-context/                                @mtraynham
 /types/http-errors/                                 @tkrotoff @BendingBender
@@ -2008,11 +2025,11 @@
 /types/i18n/                                        @SomaticIT @FindQ
 /types/i18n-abide/                                  @smbell
 /types/i18n-js/                                     @ypresto
-/types/i18next/v2/                                  @mxl @deerawan @GiedriusGrabauskas
-/types/i18next/v8/                                  @mxl @deerawan @GiedriusGrabauskas
 /types/i18next/                                     @mxl @deerawan @GiedriusGrabauskas @lenovouser @qqilihq @butchyyyy
-/types/i18next-browser-languagedetector/v0/         @cyrilschumacher @GiedriusGrabauskas
+/types/i18next/v8/                                  @mxl @deerawan @GiedriusGrabauskas
+/types/i18next/v2/                                  @mxl @deerawan @GiedriusGrabauskas
 /types/i18next-browser-languagedetector/            @cyrilschumacher @GiedriusGrabauskas
+/types/i18next-browser-languagedetector/v0/         @cyrilschumacher @GiedriusGrabauskas
 /types/i18next-express-middleware/                  @cyrilschumacher
 /types/i18next-ko/                                  @dwaxweiler
 /types/i18next-node-fs-backend/                     @cyrilschumacher @lenovouser
@@ -2059,8 +2076,8 @@
 /types/inboxsdk/                                    @rdoursenaud @amiram
 /types/incremental-dom/                             @basarat @lanthaler @vvakame
 /types/indent-string/                               @mhegazy @BendingBender
-/types/inert/v4/                                    @nycdotnet @AJamesPhillips
 /types/inert/                                       @nycdotnet @AJamesPhillips @lenovouser
+/types/inert/v4/                                    @nycdotnet @AJamesPhillips
 /types/inflected/                                   @dsci
 /types/inflection/                                  @shiwano
 /types/inherits/                                    @chrootsu
@@ -2080,31 +2097,31 @@
 /types/intercom-client/                             @jineshshah36 @peping
 /types/intercom-web/                                @fongandrew @salbahra @onatm
 /types/intercomjs/                                  @spencerwi
-/types/internal-ip/v2/                              @BendingBender
 /types/internal-ip/                                 @BendingBender
+/types/internal-ip/v2/                              @BendingBender
 /types/interpret/                                   @BendingBender
 /types/intl/                                        @RagibHasin
 /types/intl-locales-supported/                      @Slessi
 /types/intl-messageformat/                          @mhegazy
 /types/intl-relativeformat/                         @mohsen1
-/types/intl-tel-input/v13/                          @fdnhkj @leonard-thieu
 /types/intl-tel-input/                              @fdnhkj @leonard-thieu @molnarm
+/types/intl-tel-input/v13/                          @fdnhkj @leonard-thieu
 /types/into-stream/                                 @BendingBender
 /types/intrinsic-scale/                             @shalomdotnet
 /types/intro.js/                                    @anahkiasen
 /types/invariant/                                   @bennett000
 /types/inversify-devtools/                          @inversify
 /types/iobroker/                                    @AlCalzone
-/types/ion-rangeslider/v1/                          @dduugg @Karel-van-de-Plassche
 /types/ion-rangeslider/                             @Karel-van-de-Plassche
+/types/ion-rangeslider/v1/                          @dduugg @Karel-van-de-Plassche
 /types/iopipe__iopipe/                              @javonharper
-/types/ioredis/v3/                                  @plantain-00 @chrisleck @aliarham11 @br8h @shaharmor @palindrom615 @reconbot @pettyalex
 /types/ioredis/                                     @plantain-00 @chrisleck @aliarham11 @br8h @shaharmor @palindrom615 @reconbot @funthing @iamolegga @tingwai-to @pettyalex
+/types/ioredis/v3/                                  @plantain-00 @chrisleck @aliarham11 @br8h @shaharmor @palindrom615 @reconbot @pettyalex
 /types/iota.lib.js/                                 @fogsh
 /types/ip/                                          @codeanimal @BendingBender
 /types/ip-address/                                  @icopp @danwbyrne
-/types/ip-regex/v2/                                 @unindented
 /types/ip-regex/                                    @renarsvilnis
+/types/ip-regex/v2/                                 @unindented
 /types/ipcheck/                                     @bengry
 /types/ipify/                                       @BendingBender
 /types/irc/                                         @phillips1012
@@ -2197,9 +2214,9 @@
 /types/jade/                                        @panuhorsmalahti
 /types/jalaali-js/                                  @alitaheri
 /types/japanese-holidays/                           @syamatoo
-/types/jasmine/v1/                                  @borisyankov
-/types/jasmine/v2/                                  @borisyankov @theodorejb @davidparsson @gmoothart @lukas-zech-software @Engineer2B @cyungmann @devoto13 @fdim
 /types/jasmine/                                     @borisyankov @theodorejb @davidparsson @gmoothart @lukas-zech-software @Engineer2B @cyungmann @Roaders @devoto13 @fdim @pe8ter
+/types/jasmine/v2/                                  @borisyankov @theodorejb @davidparsson @gmoothart @lukas-zech-software @Engineer2B @cyungmann @devoto13 @fdim
+/types/jasmine/v1/                                  @borisyankov
 /types/jasmine-ajax/                                @lgrignon
 /types/jasmine-data-provider/                       @tlaziuk
 /types/jasmine-data_driven_tests/                   @AnthonyMacKinnon
@@ -2223,8 +2240,8 @@
 /types/jcanvas/                                     @rogierschouten
 /types/jdataview/                                   @RReverser
 /types/jdenticon/                                   @mtr
-/types/jest/v16/                                    @NoHomey @jwbay
 /types/jest/                                        @NoHomey @jwbay @asvetliakov @alexjoverm @epicallan @ikatyang @wsmd @JamieMason @douglasduteil @ahnpnl @joshuakgoldberg @UselessPickles @r3nya @hotell @sebald @andys8
+/types/jest/v16/                                    @NoHomey @jwbay
 /types/jest-axe/                                    @JoshuaKGoldberg
 /types/jest-cli/                                    @lifeiscontent
 /types/jest-diff/                                   @myabc
@@ -2250,10 +2267,10 @@
 /types/jjve/                                        @Nemo157
 /types/jmespath/                                    @pushplay
 /types/johnny-five/                                 @nakakura @ujvzolee @workshop2 @xtrimsystems @marcinobiedz
-/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/v13/                                     @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @dankraus @wanganjun @rafaelkallis @aconanlai @zaphoyd @thewillg @SimonSchick
 /types/joi/                                         @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @dankraus @wanganjun @rafaelkallis @aconanlai @zaphoyd @thewillg @SimonSchick
+/types/joi/v13/                                     @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @dankraus @wanganjun @rafaelkallis @aconanlai @zaphoyd @thewillg @SimonSchick
+/types/joi/v10/                                     @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @aconanlai
+/types/joi/v6/                                      @Bartvds @laurence-myers @cglantschnig @DavidBR-SW
 /types/joigoose/                                    @boothwhack
 /types/josa/                                        @vichyssoise
 /types/jotform-css.js/                              @pandawood
@@ -2263,9 +2280,9 @@
 /types/jpm/                                         @github-account-because-they-want-it
 /types/jqgrid/                                      @lokeshpeta
 /types/jqrangeslider/                               @qcz
-/types/jquery/v1/                                   @choffmeister @Steve-Fenton @Diullei @tasoili @jasons-novaleaf @seanski @Guuz @ksummerlin @basarat @nwolverson @derekcicerone @AndrewGaspar @seikichi @benjaminjackman @s093294 @JoshStrobl @DickvdBrink @King2500 @leonard-thieu
-/types/jquery/v2/                                   @choffmeister @Steve-Fenton @Diullei @tasoili @jasons-novaleaf @seanski @Guuz @ksummerlin @basarat @nwolverson @derekcicerone @AndrewGaspar @seikichi @benjaminjackman @s093294 @JoshStrobl @DickvdBrink @King2500 @leonard-thieu
 /types/jquery/                                      @leonard-thieu @borisyankov @choffmeister @Steve-Fenton @Diullei @tasoili @jasons-novaleaf @seanski @Guuz @ksummerlin @basarat @nwolverson @derekcicerone @AndrewGaspar @seikichi @benjaminjackman @s093294 @JoshStrobl @johnnyreilly @DickvdBrink @King2500 @terrymun
+/types/jquery/v2/                                   @choffmeister @Steve-Fenton @Diullei @tasoili @jasons-novaleaf @seanski @Guuz @ksummerlin @basarat @nwolverson @derekcicerone @AndrewGaspar @seikichi @benjaminjackman @s093294 @JoshStrobl @DickvdBrink @King2500 @leonard-thieu
+/types/jquery/v1/                                   @choffmeister @Steve-Fenton @Diullei @tasoili @jasons-novaleaf @seanski @Guuz @ksummerlin @basarat @nwolverson @derekcicerone @AndrewGaspar @seikichi @benjaminjackman @s093294 @JoshStrobl @DickvdBrink @King2500 @leonard-thieu
 /types/jquery-ajax-chain/                           @humana-fragilitas
 /types/jquery-alertable/                            @stever
 /types/jquery-animate-scroll/                       @AndersonFriaca
@@ -2444,8 +2461,8 @@
 /types/jsoneditor/                                  @alejo90 @errietta
 /types/jsoneditor-for-react/                        @joshuakgoldberg
 /types/jsoneditoronline/                            @vbortone
-/types/jsonfile/v4/                                 @dbowring
 /types/jsonfile/                                    @dbowring @BendingBender
+/types/jsonfile/v4/                                 @dbowring
 /types/jsonic/                                      @jacobbubu
 /types/jsonminify/                                  @no23reason
 /types/jsonnet/                                     @hookclaw
@@ -2463,8 +2480,8 @@
 /types/jsrender/                                    @zakki
 /types/jsreport-core/                               @taoqf
 /types/jsreport-html-embedded-in-docx/              @taoqf
-/types/jsreport-html-to-xlsx/v1/                    @me
 /types/jsreport-html-to-xlsx/                       @me
+/types/jsreport-html-to-xlsx/v1/                    @me
 /types/jsreport-jsrender/                           @taoqf
 /types/jsreport-phantom-pdf/                        @taoqf
 /types/jsreport-xlsx/                               @taoqf
@@ -2489,18 +2506,18 @@
 /types/just-extend/                                 @pe8ter
 /types/just-pick/                                   @pe8ter
 /types/jweixin/                                     @taoqf @gomydodo
-/types/jwplayer/                                    @martinduparc @kutomer @philippguertler @danielmcgraw @bpdsw @bebebebebe @djcsdy
+/types/jwplayer/                                    @martinduparc @kutomer @philippguertler @danielmcgraw @bpdsw @bebebebebe @djcsdy @drewwyatt
 /types/jws/                                         @JustinBeckwith
 /types/jwt-client/                                  @timoteoponce
-/types/jwt-decode/v1/                               @QuatroDevOfficial
 /types/jwt-decode/                                  @GiedriusGrabauskas @madsmadsen
+/types/jwt-decode/v1/                               @QuatroDevOfficial
 /types/jwt-express/                                 @nickp10
 /types/jwt-simple/                                  @kenfdev @GaelMagnan
 /types/jwt-then/                                    @phenomax
 /types/k6/                                          @MajorBreakfast
 /types/kafka-node/                                  @dansitu @bkim54 @sfrooster @amiram
-/types/karma/v1/                                    @tkrotoff @43081j
 /types/karma/                                       @tkrotoff @43081j @devoto13
+/types/karma/v1/                                    @tkrotoff @43081j
 /types/karma-chai/                                  @JayAndCatchFire
 /types/karma-chai-sinon/                            @vasek17
 /types/karma-coverage/                              @tkrotoff @devoto13
@@ -2531,8 +2548,8 @@
 /types/keyv__redis/                                 @BendingBender
 /types/keyv__sqlite/                                @BendingBender
 /types/kik-browser/                                 @joelday
-/types/klaw/v1/                                     @mceachen
 /types/klaw/                                        @mceachen
+/types/klaw/v1/                                     @mceachen
 /types/klaw-sync/                                   @shiftkey
 /types/kms-json/                                    @sunnyone
 /types/knex/                                        @tkQubo @MeLlamoPablo @mastermatt @micksatana @shreyjain1994 @joelshepherd
@@ -2599,7 +2616,7 @@
 /types/koa-route/                                   @migstopheles @jacogr
 /types/koa-router/                                  @hellopao @schfkt @JounQin @romain-faust @Guillaume-Mayer @falinor
 /types/koa-send/                                    @pe8ter @tlaziuk
-/types/koa-session/                                 @kerol2r20 @tlaziuk
+/types/koa-session/                                 @kerol2r20 @tlaziuk @hirochachacha
 /types/koa-session-minimal/                         @longztian
 /types/koa-sslify/                                  @wingsbob
 /types/koa-static/                                  @hellopao @tlaziuk
@@ -2640,8 +2657,8 @@
 /types/ldap-filters/                                @pluma
 /types/ldapjs/                                      @cvillemure @peterkooijmans
 /types/leadfoot/                                    @theintern
-/types/leaflet/v0/                                  @rgripper
 /types/leaflet/                                     @alejo90 @atd-schubert @mcauer
+/types/leaflet/v0/                                  @rgripper
 /types/leaflet-areaselect/                          @awallat
 /types/leaflet-curve/                               @onikiienko
 /types/leaflet-draw/                                @matt-guest @reblace @YunS-Stacy @beschoenen
@@ -2656,8 +2673,8 @@
 /types/leaflet-providers/                           @BendingBender
 /types/leaflet-rotatedmarker/                       @robert-prib-polestar
 /types/leaflet-routing-machine/                     @chanakadrathnayaka
-/types/leaflet.awesome-markers/v0/                  @Odrin @sebek64
 /types/leaflet.awesome-markers/                     @sebek64
+/types/leaflet.awesome-markers/v0/                  @Odrin @sebek64
 /types/leaflet.fullscreen/                          @wcomartin
 /types/leaflet.gridlayer.googlemutant/              @ernest-rhinozeros
 /types/leaflet.heat/                                @onderceylan
@@ -2681,10 +2698,10 @@
 /types/lestate/                                     @thelambdaparty
 /types/level-codec/                                 @danwbyrne
 /types/level-sublevel/                              @basp
-/types/leveldown/v1/                                @tarruda @LinusU
 /types/leveldown/                                   @MeirionHughes @danwbyrne
-/types/levelup/v1/                                  @blittle @tarruda
+/types/leveldown/v1/                                @tarruda @LinusU
 /types/levelup/                                     @MeirionHughes @danwbyrne
+/types/levelup/v1/                                  @blittle @tarruda
 /types/leven/                                       @jmalonzo
 /types/levenshtein/                                 @geoffreak
 /types/libpq/                                       @Lodin
@@ -2726,13 +2743,13 @@
 /types/localizejs-library/                          @salbahra
 /types/locate-path/                                 @me
 /types/lock-system/                                 @BendingBender
-/types/lockfile/v0/                                 @Bartvds
 /types/lockfile/                                    @Bartvds @BendingBender
+/types/lockfile/v0/                                 @Bartvds
 /types/lockr/                                       @droritos
 /types/locks/                                       @flippynips
 /types/locutus/                                     @hookclaw
-/types/lodash/v3/                                   @bczengel @chrootsu
 /types/lodash/                                      @bczengel @chrootsu @stepancar @aj-r @ailrun @e-cloud @thorn0 @jtmthf @DomiR
+/types/lodash/v3/                                   @bczengel @chrootsu
 /types/lodash-es/                                   @stephenlautier @e-cloud
 /types/lodash-webpack-plugin/                       @bumbleblym
 /types/lodash.add/                                  @bczengel @chrootsu @stepancar
@@ -3045,10 +3062,10 @@
 /types/lscache/                                     @Chris-Martinezz
 /types/ltx/                                         @PJakcson @BendingBender
 /types/luaparse/                                    @stpettersens
-/types/lunr/v0/                                     @sebastian-lenz
 /types/lunr/                                        @seantanly @hokiegeek
+/types/lunr/v0/                                     @sebastian-lenz
 /types/lusca/                                       @crutchcorn
-/types/luxon/                                       @colbydehart @FourwingsY @jsiebern @mastermatt @pietrovismara
+/types/luxon/                                       @colbydehart @FourwingsY @jsiebern @mastermatt @pietrovismara @dawnmist
 /types/lwip/                                        @AyaMorisawa
 /types/lz-string/                                   @M0ns1gn0r
 /types/lzma-native/                                 @leshow
@@ -3080,6 +3097,7 @@
 /types/mapbox__geo-viewport/                        @fnberta
 /types/mapbox__geojson-area/                        @n0nick
 /types/mapbox__polyline/                            @Kern0 @mklopets
+/types/mapbox__s3urls/                              @sebastianvera
 /types/mapbox__shelf-pack/                          @Perlmint
 /types/mapnik/                                      @ipv4sec
 /types/mapsjs/                                      @davismj
@@ -3099,9 +3117,9 @@
 /types/marko/                                       @darkwebdev
 /types/maskedinput/                                 @lokeshpeta
 /types/masonry-layout/                              @m-a-wilson @warriorrocker
-/types/massive/v3/                                  @swissspidy @clarenceh
-/types/massive/v4/                                  @swissspidy @clarenceh @AmazingTurtle
 /types/massive/                                     @swissspidy @clarenceh @AmazingTurtle @mike-engel
+/types/massive/v4/                                  @swissspidy @clarenceh @AmazingTurtle
+/types/massive/v3/                                  @swissspidy @clarenceh
 /types/match-media-mock/                            @asvetliakov
 /types/match-sorter/                                @claasahl @chrisru
 /types/matcher/                                     @BendingBender
@@ -3137,8 +3155,8 @@
 /types/material__textfield/                         @BrentDouglas @ckosti
 /types/material__toolbar/                           @BrentDouglas @ckosti
 /types/material__top-app-bar/                       @BrentDouglas @ckosti
-/types/materialize-css/v0/                          @eriklieben @leonyu @SinghSukhdeep @jfcere @scote @LiadIdan
 /types/materialize-css/                             @huww98 @MaximBalaganskiy @MonizDave @broccoliarchy
+/types/materialize-css/v0/                          @eriklieben @leonyu @SinghSukhdeep @jfcere @scote @LiadIdan
 /types/math3d/                                      @laszlojakab @jimsmart
 /types/mathjax/                                     @rolandzwaga
 /types/mathjs/                                      @siavol @andnp @bradbesserman @pawkrol
@@ -3154,13 +3172,14 @@
 /types/medium-editor/                               @keika299 @pascaliske
 /types/megajs/                                      @danwbyrne
 /types/mem/                                         @SamVerschueren
+/types/mem-cache/                                   @MutterPedro
 /types/mem-fs/                                      @MyFoodBag
 /types/mem-fs-editor/                               @MyFoodBag
 /types/memcached/                                   @KentarouTakeda
 /types/memdown/                                     @MeirionHughes @danwbyrne
 /types/memjs/                                       @leizongmin
-/types/memoize-one/v3/                              @karol-majewski @franklixuefei
 /types/memoize-one/                                 @karol-majewski @franklixuefei
+/types/memoize-one/v3/                              @karol-majewski @franklixuefei
 /types/memoizee/                                    @juanpicado
 /types/memory-cache/                                @jedigo @thieman
 /types/memory-fs/                                   @e-cloud
@@ -3196,8 +3215,8 @@
 /types/micro/                                       @kaoDev
 /types/micro-cors/                                  @CallumDenby
 /types/micro-events/                                @AlexanderSychev
-/types/micromatch/v2/                               @glen-84
 /types/micromatch/                                  @glen-84 @vemoo
+/types/micromatch/v2/                               @glen-84
 /types/microrouter/                                 @mathieudutour
 /types/microservice-utilities/                      @runebaas
 /types/microsoft-ajax/                              @pjmagee
@@ -3267,12 +3286,12 @@
 /types/moment-timezone/                             @michelsalib @alanblins @asermax
 /types/money-math/                                  @taoqf
 /types/mongo-sanitize/                              @CedricCazin
-/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 @various89 @angela-1 @lirbank @hector7 @floric @erikc5000
+/types/mongodb/v2/                                  @CaselIT @alanmarcell @bitjson @dante-101 @mcortesi
 /types/mongodb-memory-server/                       @dmitryrogozhny
 /types/mongodb-uri/                                 @mernxl
+/types/mongoose/                                    @horiuchi @lukasz-zak @Alorel @jendrikw @ethanresnick @vologab @jussikinnula @ondratra @alfirin @idandrd @various89 @Fazendaaa @NormanPerrin @danmana @stablio @emmanuelgautier @frontendmonster @mingchen
 /types/mongoose/v4/                                 @simonxca @horiuchi @lukasz-zak
-/types/mongoose/                                    @horiuchi @lukasz-zak @Alorel @jendrikw @ethanresnick @vologab @jussikinnula @ondratra @alfirin @idandrd @various89 @Fazendaaa @NormanPerrin @danmana @stablio @emmanuelgautier
 /types/mongoose-auto-increment/                     @AyaMorisawa
 /types/mongoose-deep-populate/                      @AyaMorisawa
 /types/mongoose-geojson-schema/                     @bondz
@@ -3311,11 +3330,12 @@
 /types/msportalfx-test/                             @julioct
 /types/mssql/                                       @jaminfarr @buzinas @mrrichar @elhaard @pkeuter @mcdado
 /types/mu2/                                         @jedigo
+/types/mui-datatables/                              @favna
 /types/muicss/                                      @samuelneff
 /types/multer/                                      @jt000 @DavidBR-SW @mxl @hyunseob
-/types/multer-gridfs-storage/v1/                    @devconcept
-/types/multer-gridfs-storage/v2/                    @devconcept
 /types/multer-gridfs-storage/                       @devconcept
+/types/multer-gridfs-storage/v2/                    @devconcept
+/types/multer-gridfs-storage/v1/                    @devconcept
 /types/multer-s3/                                   @tcaesvk @galtalmor @terski
 /types/multi-progress/                              @DHBrett
 /types/multi-typeof/                                @mhegazy
@@ -3363,9 +3383,9 @@
 /types/neat-csv/                                    @calamitizer
 /types/nedb/                                        @reppners @anthonynichols @afharo
 /types/nedb-logger/                                 @thisboyiscrazy
-/types/needle/v0/                                   @bigsan
-/types/needle/v1/                                   @bigsan @nikeee
 /types/needle/                                      @bigsan @nikeee @sindilevich @bryanspears
+/types/needle/v1/                                   @bigsan @nikeee
+/types/needle/v0/                                   @bigsan
 /types/negative-array/                              @BendingBender
 /types/negative-zero/                               @BendingBender
 /types/negotiator/                                  @BendingBender
@@ -3387,8 +3407,10 @@
 /types/next/                                        @dru89 @brikou @jthegedus @resir014 @scottdj92 @joaovieira @ajliv
 /types/next-redux-saga/                             @leocavalcante
 /types/next-redux-wrapper/                          @stevegeek @Jungwoo-An
+/types/next-seo/                                    @ThomasK33
 /types/next-server/                                 @dru89 @brikou @jthegedus @resir014 @scottdj92 @joaovieira @ajliv
 /types/next-tick/                                   @BendingBender
+/types/nextgen-events/                              @katsanva
 /types/ng-command/                                  @stephenlautier
 /types/ng-cordova/                                  @ksachdeva
 /types/ng-dialog/                                   @stephenlautier
@@ -3419,13 +3441,13 @@
 /types/noble-mac/                                   @swook @shantanubhadoria @lukel99 @bioball @keton @thegecko
 /types/nock/                                        @bonnici @horiuchi @afharo @mastermatt @damour @paambaati
 /types/nodal/                                       @charrondev
-/types/node/v0/                                     @Microsoft @DefinitelyTyped
-/types/node/v4/                                     @Microsoft @DefinitelyTyped @eps1lon @Archcry
-/types/node/v6/                                     @Microsoft @DefinitelyTyped @WilcoBakker @inlined @eps1lon @Alorel @KSXGitHub @Archcry
-/types/node/v7/                                     @Microsoft @DefinitelyTyped @parambirs @tellnes @WilcoBakker @eps1lon @KSXGitHub @Archcry
-/types/node/v8/                                     @Microsoft @DefinitelyTyped @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/                                        @Microsoft @DefinitelyTyped @jkomyno @a-tarasyuk @alvis @r3nya @brunoscheufler @smac89 @tellnes @DeividasBakanas @eyqs @Flarna @Hannes-Magnusson-CK @KSXGitHub @hoo29 @kjin @ajafff @islishude @mwiktorczyk @matthieusieben @mohsen1 @n-e @octo-sniffle @parambirs @eps1lon @SimonSchick @ThomasdenH @WilcoBakker @wwwy3y3 @ZaneHannanAU @jeremiergz @samuela @kuehlein
 /types/node/v9/                                     @Microsoft @DefinitelyTyped @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/                                        @Microsoft @DefinitelyTyped @jkomyno @a-tarasyuk @alvis @r3nya @brunoscheufler @smac89 @tellnes @DeividasBakanas @eyqs @Flarna @Hannes-Magnusson-CK @KSXGitHub @hoo29 @kjin @ajafff @islishude @mwiktorczyk @matthieusieben @mohsen1 @n-e @octo-sniffle @parambirs @eps1lon @SimonSchick @ThomasdenH @WilcoBakker @wwwy3y3 @ZaneHannanAU @jeremiergz @samuela
+/types/node/v8/                                     @Microsoft @DefinitelyTyped @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/v7/                                     @Microsoft @DefinitelyTyped @parambirs @tellnes @WilcoBakker @eps1lon @KSXGitHub @Archcry
+/types/node/v6/                                     @Microsoft @DefinitelyTyped @WilcoBakker @inlined @eps1lon @Alorel @KSXGitHub @Archcry
+/types/node/v4/                                     @Microsoft @DefinitelyTyped @eps1lon @Archcry
+/types/node/v0/                                     @Microsoft @DefinitelyTyped
 /types/node-7z/                                     @erkie
 /types/node-array-ext/                              @Beng89
 /types/node-cache/                                  @chrootsu @dthunell @useltmann
@@ -3437,9 +3459,9 @@
 /types/node-dir/                                    @panuhorsmalahti
 /types/node-dogstatsd/                              @chrisbobo
 /types/node-emoji/                                  @jonestristand @styu @rimiti
-/types/node-fetch/                                  @torstenwerner @nikcorg
+/types/node-fetch/                                  @torstenwerner @nikcorg @vinaybedre
 /types/node-fibers/                                 @caryhaynie
-/types/node-forge/                                  @westy92 @flynetworks @a-k-g @rafal2228 @beenotung @joeflateau @Apologiz @timhwang21 @supaiku0
+/types/node-forge/                                  @westy92 @flynetworks @a-k-g @rafal2228 @beenotung @joeflateau @Apologiz @timhwang21 @supaiku0 @andersk
 /types/node-gcm/                                    @horiuchi
 /types/node-geocoder/                               @rosek86
 /types/node-getopt/                                 @kcauchy
@@ -3467,6 +3489,7 @@
 /types/node-slack/                                  @tkQubo
 /types/node-snap7/                                  @heilingbrunner
 /types/node-sprite-generator/                       @Perlmint
+/types/node-sql-parser/                             @taozhi8833998
 /types/node-ssdp/                                   @OrionNebula
 /types/node-static/                                 @Morfent
 /types/node-statsd/                                 @alexturek @convoyinc
@@ -3484,8 +3507,8 @@
 /types/node_redis/                                  @borisyankov
 /types/nodecredstash/                               @migstopheles
 /types/nodegit/                                     @dolanmiu @tniessen
-/types/nodemailer/v3/                               @rogierschouten
 /types/nodemailer/                                  @rogierschouten @dex4er @bioball
+/types/nodemailer/v3/                               @rogierschouten
 /types/nodemailer-direct-transport/                 @rogierschouten
 /types/nodemailer-mailgun-transport/                @otociulis
 /types/nodemailer-pickup-transport/                 @psnider
@@ -3506,13 +3529,14 @@
 /types/notifyjs/                                    @soundTricker @NateScarlet
 /types/notifyjs-browser/                            @bahman616
 /types/notyf/                                       @gurov
-/types/nouislider/v7/                               @acoreyj
-/types/nouislider/v8/                               @bleuarg
 /types/nouislider/                                  @bleuarg @lagaffe
+/types/nouislider/v8/                               @bleuarg
+/types/nouislider/v7/                               @acoreyj
 /types/novnc-core/                                  @smithkl42 @BendingBender
 /types/npm/                                         @SomaticIT
 /types/npm-email/                                   @BendingBender
 /types/npm-keyword/                                 @BendingBender
+/types/npm-license-crawler/                         @ffflorian
 /types/npm-name/                                    @BendingBender
 /types/npm-package-arg/                             @mgroenhoff @OiYouYeahYou
 /types/npm-packlist/                                @ajafff
@@ -3587,14 +3611,14 @@
 /types/open-editor/                                 @BendingBender
 /types/openapi-factory/                             @runebaas
 /types/opener/                                      @tikurahul
-/types/openfin/v17/                                 @chrisbarker
-/types/openfin/v29/                                 @chrisbarker @rdepena
-/types/openfin/v34/                                 @chrisbarker @rdepena @whyn07m3
 /types/openfin/                                     @chrisbarker @rdepena @whyn07m3 @licui3936
+/types/openfin/v34/                                 @chrisbarker @rdepena @whyn07m3
+/types/openfin/v29/                                 @chrisbarker @rdepena
+/types/openfin/v17/                                 @chrisbarker
 /types/openjscad/                                   @danmarshall
-/types/openlayers/v2/                               @bolhovsky
-/types/openlayers/v3/                               @osechet @matthiasdailey-ccri
 /types/openlayers/                                  @osechet @wb14123 @ailrun @mylen @iamthechad @danmana @yairtawil @pierremarc @hauke96 @gberaudo
+/types/openlayers/v3/                               @osechet @matthiasdailey-ccri
+/types/openlayers/v2/                               @bolhovsky
 /types/openpgp/                                     @errietta @damonpam @po5i @ecamellini
 /types/openstack-wrapper/                           @sanjaymadane
 /types/opentok/                                     @westy92 @CatGuardian
@@ -3604,9 +3628,9 @@
 /types/optics-agent/                                @crevil
 /types/optimist/                                    @soywiz @chbrown
 /types/optimize-css-assets-webpack-plugin/          @odnamrataizem
-/types/ora/v0/                                      @basarat @screendriver
-/types/ora/v1/                                      @basarat @screendriver @BendingBender @azasypkin
 /types/ora/                                         @basarat @screendriver @BendingBender @azasypkin
+/types/ora/v1/                                      @basarat @screendriver @BendingBender @azasypkin
+/types/ora/v0/                                      @basarat @screendriver
 /types/oracle__oraclejet/                           @nolakara @jingxwu
 /types/oracledb/                                    @Bigous
 /types/orchestrator/                                @tkQubo @TeamworkGuy2
@@ -3614,8 +3638,8 @@
 /types/orientjs/                                    @saeedtabrizi
 /types/original/                                    @wcarson
 /types/os-homedir/                                  @mhegazy
-/types/os-locale/v1/                                @AyaMorisawa @BendingBender
 /types/os-locale/                                   @AyaMorisawa @BendingBender
+/types/os-locale/v1/                                @AyaMorisawa @BendingBender
 /types/os-name/                                     @BendingBender
 /types/os-tmpdir/                                   @mhegazy
 /types/osmosis/                                     @jurajkocan @evanshortiss
@@ -3652,8 +3676,8 @@
 /types/p-pipe/                                      @BendingBender
 /types/p-progress/                                  @icopp
 /types/p-props/                                     @BendingBender
-/types/p-queue/v2/                                  @BendingBender @evanshortiss
 /types/p-queue/                                     @BendingBender @evanshortiss
+/types/p-queue/v2/                                  @BendingBender @evanshortiss
 /types/p-reduce/                                    @BendingBender
 /types/p-reflect/                                   @BendingBender
 /types/p-retry/                                     @BendingBender
@@ -3666,8 +3690,8 @@
 /types/p-timeout/                                   @BendingBender
 /types/p-times/                                     @BendingBender
 /types/p-try/                                       @BendingBender @LinusU
-/types/p-wait-for/v1/                               @BendingBender
 /types/p-wait-for/                                  @BendingBender
+/types/p-wait-for/v1/                               @BendingBender
 /types/p-waterfall/                                 @BendingBender
 /types/p-whilst/                                    @BendingBender
 /types/p2/                                          @clark-stevenson
@@ -3692,12 +3716,12 @@
 /types/parity-pmr/                                  @leovujanic
 /types/parity-poe/                                  @leovujanic
 /types/park-miller/                                 @BendingBender
-/types/parse/v1/                                    @dpoetzsch @jaeggerr @flavionegrao @wesleygrimes @owsas
 /types/parse/                                       @dpoetzsch @jaeggerr @flavionegrao @wesleygrimes @owsas @agoldis
+/types/parse/v1/                                    @dpoetzsch @jaeggerr @flavionegrao @wesleygrimes @owsas
 /types/parse-columns/                               @BendingBender
 /types/parse-filepath/                              @BendingBender
-/types/parse-git-config/v2/                         @leonard-thieu @deltaidea
 /types/parse-git-config/                            @leonard-thieu @deltaidea @BendingBender
+/types/parse-git-config/v2/                         @leonard-thieu @deltaidea
 /types/parse-github-url/                            @ajafff
 /types/parse-glob/                                  @glen-84
 /types/parse-json/                                  @mrmlnc
@@ -3709,8 +3733,8 @@
 /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/v4/                                   @inikulin @andnp
 /types/parse5-html-rewriting-stream/                @samuelli
 /types/parse5-htmlparser2-tree-adapter/             @inikulin
 /types/parse5-parser-stream/                        @inikulin
@@ -3754,8 +3778,8 @@
 /types/passport-windowsauth/                        @forivall
 /types/password-hash/                               @mugeso
 /types/password-hash-and-salt/                      @alitaheri
-/types/path-exists/v1/                              @shiwano
 /types/path-exists/                                 @shiwano @BendingBender
+/types/path-exists/v1/                              @shiwano
 /types/path-is-absolute/                            @mhegazy
 /types/path-is-inside/                              @aomarks
 /types/path-key/                                    @BendingBender
@@ -3785,8 +3809,8 @@
 /types/persona/                                     @Nycto
 /types/pet-finder-api/                              @me
 /types/petit-dom/                                   @JamesMessinger
-/types/pg/v6/                                       @pspeter3
 /types/pg/                                          @pspeter3
+/types/pg/v6/                                       @pspeter3
 /types/pg-ears/                                     @bradleyayers
 /types/pg-escape/                                   @khell
 /types/pg-format/                                   @zopf
@@ -3820,8 +3844,8 @@
 /types/pikaday/                                     @MidnightDesign @wake42 @mezoistvan
 /types/pikaday-time/                                @Sayan751
 /types/pinkyswear/                                  @chances
-/types/pino/v3/                                     @psnider
 /types/pino/                                        @psnider @BendingBender @screendriver @paambaati @alferpal @mortiy
+/types/pino/v3/                                     @psnider
 /types/pino-http/                                   @screendriver
 /types/pino-multi-stream/                           @JakeGinnivan
 /types/pinterest-sdk/                               @adamburmister
@@ -3904,12 +3928,12 @@
 /types/preloadjs/                                   @endel
 /types/prelude-ls/                                  @AyaMorisawa
 /types/prettier/                                    @ikatyang
-/types/pretty-bytes/v4/                             @plantain-00
 /types/pretty-bytes/                                @plantain-00 @danielasy
+/types/pretty-bytes/v4/                             @plantain-00
 /types/pretty-format/                               @ikatyang
 /types/pretty-hrtime/                               @BendingBender
-/types/pretty-ms/v3/                                @BendingBender @ocboogie
 /types/pretty-ms/                                   @BendingBender @ocboogie @silh
+/types/pretty-ms/v3/                                @BendingBender @ocboogie
 /types/preval.macro/                                @huan086
 /types/printf/                                      @AluisioASG
 /types/priorityqueuejs/                             @geoffreak
@@ -3988,19 +4012,19 @@
 /types/pumpify/                                     @JustinBeckwith @aoberoi
 /types/punycode/                                    @yavanosta
 /types/pupa/                                        @nju33
-/types/puppeteer/v0/                                @marvinhagemeister @cdeutsch
 /types/puppeteer/                                   @marvinhagemeister @cdeutsch @ksm2 @SimonSchick
+/types/puppeteer/v0/                                @marvinhagemeister @cdeutsch
 /types/puppeteer-core/                              @mtsmfm
 /types/pure-render-decorator/                       @seansfkelley
 /types/purl/                                        @danfma
 /types/pusher-js/                                   @tkqubo @cainlevy
 /types/pvutils/                                     @microshine
 /types/python-shell/                                @dolanmiu @WORMSS
-/types/q/v0/                                        @bnemetchek @johnnyreilly
 /types/q/                                           @bnemetchek @AndrewGaspar @johnnyreilly @mboudreau @TeamworkGuy2
+/types/q/v0/                                        @bnemetchek @johnnyreilly
 /types/q-io/                                        @Bartvds
 /types/q-retry/                                     @vilic
-/types/qhistory/                                    @Kovensky
+/types/qhistory/                                    @Jessidhia
 /types/qiniu-js/                                    @taoqf @qiqizjl
 /types/qlik/                                        @RubenSlabbert @AginicX
 /types/qlik-engineapi/                              @konne @richardison
@@ -4009,15 +4033,16 @@
 /types/qrcode/                                      @plantain-00
 /types/qrcode.react/                                @mleko
 /types/qs/                                          @RWander @leonyu @tehbelinda @zyml @artursvonda @CarlosBonetti
+/types/qs-middleware/                               @davecardwell
 /types/qtip2/                                       @Seltzer @leonard-thieu
 /types/query-string/                                @SamVerschueren @tkrotoff @huhuanming @MadaraUchiha @shssoichiro @jarrku
 /types/querystringify/                              @ilich
-/types/quick-lru/v1/                                @BendingBender
 /types/quick-lru/                                   @BendingBender
+/types/quick-lru/v1/                                @BendingBender
 /types/quill/                                       @sumitkm @guillaume-ro-fr @43081j @AnielloFalcone @mhamri
 /types/quixote/                                     @greybax
-/types/qunit/v1/                                    @diullei
 /types/qunit/                                       @waratuman @mike-north
+/types/qunit/v1/                                    @diullei
 /types/qunit-dom/                                   @happycollision
 /types/quoted-printable/                            @pushplay
 /types/qwest/                                       @lindsayevans
@@ -4077,12 +4102,12 @@
 /types/rdflib/                                      @cenotelie
 /types/re-base/                                     @jordandrako
 /types/reach__router/                               @kingdaro
+/types/react/                                       @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @tkrotoff @DovydasNavickas @onigoetz @theruther4d @guilhermehubner @ferdaber @jrakotoharisoa @pascaloliv @hotell @franklixuefei @Jessidhia @pshrmn @threepointone
 /types/react/v15/                                   @bbenezech @pzavolinsky @digiguru @ericanderson @tkrotoff @DovydasNavickas @onigoetz
-/types/react/                                       @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @tkrotoff @DovydasNavickas @onigoetz @theruther4d @guilhermehubner @ferdaber @jrakotoharisoa @pascaloliv @hotell @franklixuefei @Kovensky @pshrmn
 /types/react-adal/                                  @dkorolev1
 /types/react-albus/                                 @sseppola @conradreuter @kuirak
-/types/react-alert/v2/                              @ssyrell
 /types/react-alert/                                 @g1eny0ung
+/types/react-alert/v2/                              @ssyrell
 /types/react-alice-carousel/                        @endigo
 /types/react-amplitude/                             @rayzor65
 /types/react-animate-on-scroll/                     @ralbuque
@@ -4097,12 +4122,12 @@
 /types/react-big-calendar/                          @piotrwitek @paustint @pikpok @eps1lon @strongpauly @janb87
 /types/react-blessed/                               @me
 /types/react-body-classname/                        @mhegazy
-/types/react-bootstrap/                             @walkerburgin @vsiao @danilojrr @Batbold-Gansukh @octatone @chengsieuly @mretolaza @katbusch @vitosamson @LKay @aaronbeall @jrakotoharisoa @r3nya @t49tran
+/types/react-bootstrap/                             @walkerburgin @vsiao @danilojrr @Batbold-Gansukh @octatone @chengsieuly @mretolaza @katbusch @vitosamson @LKay @aaronbeall @jrakotoharisoa @r3nya @t49tran @bes
 /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 @PaitoAnderson @arichter83
+/types/react-bootstrap-table/v2/                    @flaub @alelode @UJosue10
+/types/react-bootstrap-typeahead/                   @Guymestef @radziksh @PaitoAnderson @arichter83 @dalevfenton
 /types/react-breadcrumbs/                           @guoyunhe
 /types/react-breadcrumbs-dynamic/                   @mitsuruog
 /types/react-broadcast/                             @kandros
@@ -4130,11 +4155,11 @@
 /types/react-css-modules/                           @KostyaEsmukov @skirsdeda
 /types/react-css-transition-replace/                @LKay
 /types/react-currency-formatter/                    @pastushenkoy @Jeka-Vasiliev
-/types/react-custom-scrollbars/v3/                  @David-LeBlanc-git
 /types/react-custom-scrollbars/                     @David-LeBlanc-git @kittimiyo
-/types/react-data-grid/v1/                          @SupernaviX
-/types/react-data-grid/v2/                          @SupernaviX @KieranPeat @martinnov92
+/types/react-custom-scrollbars/v3/                  @David-LeBlanc-git
 /types/react-data-grid/                             @SupernaviX @KieranPeat @martinnov92 @baso53
+/types/react-data-grid/v2/                          @SupernaviX @KieranPeat @martinnov92
+/types/react-data-grid/v1/                          @SupernaviX
 /types/react-datagrid/                              @stephenjelfs
 /types/react-date-range/                            @Junbong
 /types/react-datepicker/                            @radziksh @andrewBalekha @smrq @Rogach @royxue @KoalaHuman @seansfkelley @justingrant @jakeboone02
@@ -4145,15 +4170,15 @@
 /types/react-dnd-touch-backend/                     @mleko @dawnmist @beeequeue
 /types/react-document-meta/                         @ulrichb
 /types/react-document-title/                        @cleverguy25
-/types/react-dom/v15/                               @MartynasZilinskas
 /types/react-dom/                                   @MartynasZilinskas @theruther4d
+/types/react-dom/v15/                               @MartynasZilinskas
 /types/react-dom-factories/                         @jgoz
 /types/react-dotdotdot/                             @jczyzewski
 /types/react-draft-wysiwyg/                         @imechZhangLY @brunoMaurice
 /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 @ekilah
+/types/react-dropzone/v3/                           @matdube @LynxEyes @goblindegook @benbayard @LKay
+/types/react-dropzone/v2/                           @matdube @LynxEyes @goblindegook @benbayard
 /types/react-dynamic-number/                        @eugrdn
 /types/react-easy-chart/                            @danzel
 /types/react-event-listener/                        @asvetliakov
@@ -4170,8 +4195,8 @@
 /types/react-flex/                                  @pushplay
 /types/react-flexr/                                 @pushplay
 /types/react-fontawesome/                           @timurrustamov @dublicator @vincaslt @gavingregory
-/types/react-form/v1/                               @cameron-mcateer
 /types/react-form/                                  @cameron-mcateer @TiuSh
+/types/react-form/v1/                               @cameron-mcateer
 /types/react-foundation/                            @danielearwicker
 /types/react-frontload/                             @rockon404
 /types/react-gateway/                               @jsonunger
@@ -4182,13 +4207,13 @@
 /types/react-google-places-suggest/                 @vasilysn
 /types/react-google-recaptcha/                      @KoalaHuman @tomsturge
 /types/react-gravatar/                              @invliD
-/types/react-grid-layout/                           @abirkholz @alitaheri @ZheyangSong @andrewhathaway
+/types/react-grid-layout/                           @abirkholz @alitaheri @ZheyangSong @andrewhathaway @manav-m
 /types/react-hamburger-menu/                        @grzesie2k
-/types/react-hammerjs/v0/                           @jsonunger
 /types/react-hammerjs/                              @jsonunger @cecchi
+/types/react-hammerjs/v0/                           @jsonunger
 /types/react-headroom/                              @zerocho
-/types/react-helmet/v4/                             @evanbb @isman-usoh
 /types/react-helmet/                                @evanbb @isman-usoh @lith-light-g @sammkj @yuit
+/types/react-helmet/v4/                             @evanbb @isman-usoh
 /types/react-helmet-async/                          @forabi
 /types/react-highcharts/                            @j1r1k
 /types/react-highlight/                             @joshuakgoldberg
@@ -4196,6 +4221,7 @@
 /types/react-highlighter/                           @oizie
 /types/react-holder/                                @isman-usoh
 /types/react-hot-loader/                            @jacekjagiello @MartynasZilinskas @DovydasNavickas
+/types/react-howler/                                @maksimovicdanijel
 /types/react-hyperscript/                           @tock203
 /types/react-icon-base/                             @apare @LKay
 /types/react-icons/                                 @apare @johnnyreilly @LKay
@@ -4212,14 +4238,14 @@
 /types/react-inlinesvg/                             @MyCryptoHQ @nickmccurdy
 /types/react-input-autosize/                        @jsonunger @franklixuefei
 /types/react-input-calendar/                        @stepancar
-/types/react-input-mask/v1/                         @apare
 /types/react-input-mask/                            @apare @dima7a14
+/types/react-input-mask/v1/                         @apare
 /types/react-instantsearch/                         @gburgett @jpowell
 /types/react-instantsearch-core/                    @gburgett @jpowell @davidfurlong
 /types/react-instantsearch-dom/                     @gburgett @jpowell
 /types/react-instantsearch-native/                  @gburgett @jpowell
-/types/react-intl/v1/                               @bgrieder
 /types/react-intl/                                  @bgrieder @cdroulers @gyzerok @tillwolff @LKay @bhouser @kristerkari @formatlos @lukyth @obedm503
+/types/react-intl/v1/                               @bgrieder
 /types/react-intl-redux/                            @LKay
 /types/react-is/                                    @AviVahl @christianchown @eps1lon
 /types/react-is-deprecated/                         @seansfkelley
@@ -4227,9 +4253,9 @@
 /types/react-js-pagination/                         @netoisc
 /types/react-json/                                  @spielc
 /types/react-json-pretty/                           @LKay
-/types/react-json-tree/                             @gnestor
+/types/react-json-tree/                             @gnestor @zainafzal08
 /types/react-jsonschema-form/                       @iamdanfox @iplus26 @phbou72 @LucianBuzzo @sthenault @sbusch
-/types/react-jss/                                   @eps1lon
+/types/react-jss/                                   @eps1lon @jlaw90
 /types/react-lazyload/                              @m0a
 /types/react-lazylog/                               @benjaminRomano
 /types/react-leaflet/                               @danzel @davschne @yuit
@@ -4237,7 +4263,7 @@
 /types/react-lifecycle-component/                   @pixelshaded
 /types/react-lifecycles-compat/                     @bySabi
 /types/react-list/                                  @buptyyf @tomshen
-/types/react-loadable/                              @Kovensky @odensc @ianks @tlaziuk @iMobs
+/types/react-loadable/                              @Jessidhia @odensc @ianks @tlaziuk @iMobs
 /types/react-loader/                                @artfuldev
 /types/react-lottie/                                @Kana00 @Ricki-BumbleDev
 /types/react-mailchimp-subscribe/                   @osdiab
@@ -4331,33 +4357,33 @@
 /types/react-native-version-number/                 @VincentLanglet
 /types/react-native-video/                          @huhuanming
 /types/react-native-zeroconf/                       @mattapet
-/types/react-navigation/v1/                         @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @YourGamesBeOver @ArmandoAssuncao @cliedeman @Slessi
-/types/react-navigation/v2/                         @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @YourGamesBeOver @ArmandoAssuncao @cliedeman @magrinj @TizioFittizio @stigi @LinusU @jshosomichi @jakebooyah @brunoro @DenisFrezzato @mickaelw @maxdavidson @alechill @builtbyproxy @jkillian @jeroenvervaeke @chagasaway
 /types/react-navigation/                            @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @YourGamesBeOver @ArmandoAssuncao @cliedeman @magrinj @TizioFittizio @stigi @LinusU @jshosomichi @jakebooyah @brunoro @DenisFrezzato @mickaelw @maxdavidson @alechill @builtbyproxy @jkillian @jeroenvervaeke @chagasaway @denissb @skovhus
+/types/react-navigation/v2/                         @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @YourGamesBeOver @ArmandoAssuncao @cliedeman @magrinj @TizioFittizio @stigi @LinusU @jshosomichi @jakebooyah @brunoro @DenisFrezzato @mickaelw @maxdavidson @alechill @builtbyproxy @jkillian @jeroenvervaeke @chagasaway
+/types/react-navigation/v1/                         @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @YourGamesBeOver @ArmandoAssuncao @cliedeman @Slessi
 /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-notify-toast/                          @klaascuvelier
 /types/react-numeric-input/                         @heatherbooker @akx
-/types/react-onclickoutside/v5/                     @LKay
 /types/react-onclickoutside/                        @LKay @surgeboris
+/types/react-onclickoutside/v5/                     @LKay
 /types/react-onsenui/                               @salim7 @jemmyw @lirbank
 /types/react-outside-click-handler/                 @zubivan
 /types/react-overlays/                              @aaronbeall @vitosamson @aarondancer
 /types/react-owl-carousel/                          @tbounsiar @igorissen @KennethanCeyer
-/types/react-paginate/v4/                           @deevus @wouterhardeman @pegel03 @archy-bold
-/types/react-paginate/v5/                           @deevus @wouterhardeman @pegel03 @archy-bold @yasupeke
 /types/react-paginate/                              @deevus @wouterhardeman @pegel03 @archy-bold @yasupeke @sugarshin @SPWizard01
+/types/react-paginate/v5/                           @deevus @wouterhardeman @pegel03 @archy-bold @yasupeke
+/types/react-paginate/v4/                           @deevus @wouterhardeman @pegel03 @archy-bold
 /types/react-panelgroup/                            @qgolsteyn
-/types/react-places-autocomplete/v6/                @guilhermehubner @r3nya @ApeNox @azizhk
 /types/react-places-autocomplete/                   @guilhermehubner @r3nya @ApeNox @azizhk
+/types/react-places-autocomplete/v6/                @guilhermehubner @r3nya @ApeNox @azizhk
 /types/react-plotly.js/                             @jonfreedman
 /types/react-plyr/                                  @baorv
 /types/react-pointable/                             @istefo @mdibyo
 /types/react-popover/                               @jacoporicare
-/types/react-portal/v3/                             @shuntksh
 /types/react-portal/                                @shuntksh @HorusGoul
+/types/react-portal/v3/                             @shuntksh
 /types/react-primitives/                            @aghoneim92 @davidpett
 /types/react-props-decorators/                      @tkqubo
 /types/react-qr-reader/                             @davidkevork
@@ -4365,22 +4391,22 @@
 /types/react-rangeslider/                           @RichieRock
 /types/react-recaptcha/                             @mhegazy @zzanol
 /types/react-reconciler/                            @Methuselah96
-/types/react-redux/v5/                              @tkqubo @thasner @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva
-/types/react-redux/v6/                              @tkqubo @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva @kallikrein @val1984 @jrakotoharisoa @apapirovski @surgeboris
 /types/react-redux/                                 @tkqubo @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva @kallikrein @val1984 @jrakotoharisoa @apapirovski @surgeboris @soerenbf
+/types/react-redux/v6/                              @tkqubo @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva @kallikrein @val1984 @jrakotoharisoa @apapirovski @surgeboris
+/types/react-redux/v5/                              @tkqubo @thasner @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva
 /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 @kastermester
+/types/react-relay/                                 @graphcool @voxmatt @alloy @npirotte @ckknight @kastermester @mattkrick
 /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-responsive/v1/                         @asvetliakov
 /types/react-rnd/                                   @Ragg- @fsubal @zyh825
-/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 @gillchristian @nulladdict
 /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 @8enSmith
+/types/react-router/v3/                             @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @ssorallen @gillchristian @nulladdict
+/types/react-router/v2/                             @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov
 /types/react-router-bootstrap/                      @vlesierse @LKay @olmobrutall
 /types/react-router-config/                         @lith-light-g @johnnyreilly @NullMDR
 /types/react-router-dom/                            @tkrotoff @huy-nguyen @p-jackson @johnnyreilly
@@ -4389,20 +4415,20 @@
 /types/react-router-navigation/                     @kaoDev @johnnyreilly
 /types/react-router-navigation-core/                @kaoDev @johnnyreilly
 /types/react-router-param-link/                     @mtsg
-/types/react-router-redux/v3/                       @isman-usoh @noah79 @rosendi
-/types/react-router-redux/v4/                       @isman-usoh @noah79 @rosendi @LKay @DovydasNavickas
 /types/react-router-redux/                          @huy-nguyen @8398a7 @mykolas
+/types/react-router-redux/v4/                       @isman-usoh @noah79 @rosendi @LKay @DovydasNavickas
+/types/react-router-redux/v3/                       @isman-usoh @noah79 @rosendi
 /types/react-rte/                                   @jclyons52
 /types/react-s-alert/                               @mitsuruog
 /types/react-scroll/                                @sudoplz @GiedriusGrabauskas
 /types/react-scrollbar/                             @stephenjelfs
-/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-select/v1/                             @Hesquibet @giladgray @iebaker @skirsdeda @vujevits @devrelm @MartynasZilinskas @onatm @ninjaferret @tehbi4 @misantronic @darkartur @eps1lon @endurance @RCGuillaume
 /types/react-share/                                 @icopp
 /types/react-show-more/                             @naortor
 /types/react-side-effect/                           @remojansen @0xcaff
 /types/react-sidebar/                               @jeroenvervaeke
-/types/react-simple-maps/                           @thepocp
+/types/react-simple-maps/                           @thepocp @pronebird
 /types/react-sketchapp/                             @ricokahler @DomiR @saschazar21
 /types/react-slick/                                 @andrewBalekha @GiedriusGrabauskas @r3nya
 /types/react-slider/                                @jsonunger
@@ -4413,8 +4439,8 @@
 /types/react-sortable-tree-theme-file-explorer/     @dolezel
 /types/react-sound/                                 @koss-lebedev
 /types/react-sparklines/                            @henrinormak
-/types/react-spinkit/v1/                            @tkqubo @mleko @pelotom
 /types/react-spinkit/                               @tkqubo @mleko @pelotom @zzanol
+/types/react-spinkit/v1/                            @tkqubo @mleko @pelotom
 /types/react-splitter-layout/                       @snaptags
 /types/react-star-rating-component/                 @marpstar
 /types/react-sticky/                                @curtisw0 @ajhyndman
@@ -4437,8 +4463,8 @@
 /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-test-renderer/v15/                     @arvitaly @lochbrunner @lochbrunner @johnnyreilly
 /types/react-tether/                                @ryprice
 /types/react-text-mask/                             @guilhermehubner @cavarzan @needpower
 /types/react-textarea-autosize/                     @asvetliakov @zry656565
@@ -4446,16 +4472,17 @@
 /types/react-timeout/                               @kerwynrg
 /types/react-toastify/                              @icopp
 /types/react-toastr/                                @shssoichiro @DanRegazzi
-/types/react-toggle/v2/                             @LKay @jsonunger
 /types/react-toggle/                                @LKay
+/types/react-toggle/v2/                             @LKay @jsonunger
 /types/react-tooltip/                               @DeividasBakanas @Vijayasingam
 /types/react-touch/                                 @grzesie2k
 /types/react-tracking/                              @alloy
-/types/react-transition-group/v1/                   @LKay
 /types/react-transition-group/                      @LKay @Epskampie @ybiquitous
+/types/react-transition-group/v1/                   @LKay
 /types/react-treeview/                              @janslow
 /types/react-truncate/                              @mattvperry
 /types/react-twitter-auth/                          @paulfasola @loginwashere
+/types/react-ultimate-pagination/                   @BenLorantfy
 /types/react-user-tour/                             @ccancellieri
 /types/react-vertical-timeline-component/           @stephane-monnot
 /types/react-virtual-keyboard/                      @bsurai
@@ -4473,8 +4500,8 @@
 /types/react-youtube-embed/                         @charles-salmon
 /types/reactable/                                   @spielc
 /types/reactcss/                                    @chrisgervang @LKay
-/types/reactstrap/v4/                               @alihammad @mfal @danilobjr @fabiopaiva
 /types/reactstrap/                                  @alihammad @mfal @danilobjr @FaithForHumans @timc13 @patrickrgaffney @prabodht @georg94
+/types/reactstrap/v4/                               @alihammad @mfal @danilobjr @fabiopaiva
 /types/read/                                        @timjk
 /types/read-chunk/                                  @crispybee
 /types/read-package-tree/                           @mgroenhoff
@@ -4486,11 +4513,11 @@
 /types/readline-sync/                               @jonestristand
 /types/readline-transform/                          @dex4er
 /types/reapop/                                      @Barrokgl
-/types/rebass/                                      @ryee-dev @jamesmckenzie
+/types/rebass/                                      @rhysd @ryee-dev @jamesmckenzie
 /types/rebass__grid/                                @antonvasin @vittorio @lhache @lavoaster
 /types/recaptcha2/                                  @l-jonas
 /types/recase/                                      @18steps
-/types/recharts/                                    @mthmulders @rapmue @royxue @ZheyangSong @richbai90 @caspeco-dan @pkeuter @jrsaunde @paulmelnikow @crusectrl @apalugniok @RobertStigsson
+/types/recharts/                                    @mthmulders @rapmue @royxue @ZheyangSong @richbai90 @caspeco-dan @pkeuter @jrsaunde @paulmelnikow @crusectrl @apalugniok @RobertStigsson @kousaku-maron
 /types/recharts-scale/                              @johnnyreilly
 /types/rechoir/                                     @BendingBender
 /types/recluster/                                   @dex4er
@@ -4498,24 +4525,24 @@
 /types/reconnect-core/                              @thw0rted
 /types/reconnectingwebsocket/                       @nguarracino
 /types/recorder-js/                                 @higuri
-/types/recursive-readdir/v1/                        @elisee
 /types/recursive-readdir/                           @elisee @MicahZoltu
+/types/recursive-readdir/v1/                        @elisee
 /types/redent/                                      @BendingBender
 /types/redis/                                       @soywiz @CodeAnimal @MugeSo @UppaJung @Rokt33r @43081j @barnski @1pete @blablapolicja @ferrantejake
 /types/redis-errors/                                @43081j
 /types/redis-mock/                                  @BendingBender
 /types/redis-rate-limiter/                          @westy92 @nodify-at
 /types/redis-scripto/                               @westy92
-/types/redlock/v2/                                  @chrootsu
 /types/redlock/                                     @chrootsu @BendingBender
+/types/redlock/v2/                                  @chrootsu
 /types/redom/                                       @RauliL @nemoinho
-/types/reduce-reducers/                             @huy-nguyen
+/types/reduce-reducers/                             @huy-nguyen @daliusd
 /types/redux-action/                                @newraina
 /types/redux-action-utils/                          @tkqubo
 /types/redux-actions/                               @jaysoo @alexgorbatchev @alechill @alexey-pelykh @7hi4g0
 /types/redux-async-queue/                           @andreiho
-/types/redux-auth-wrapper/v1/                       @LKay
 /types/redux-auth-wrapper/                          @LKay
+/types/redux-auth-wrapper/v1/                       @LKay
 /types/redux-batched-subscribe/                     @mDibyo
 /types/redux-debounced/                             @seansfkelley
 /types/redux-devtools/                              @mc-petry
@@ -4526,11 +4553,11 @@
 /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 @mshaaban088
 /types/redux-form/                                  @carsonf @aikoven @LKay @bancek @alsiola @tehbi4 @huwmartin @ethanresnick @reggino @maddijoyce @smifun @mshaaban088
-/types/redux-immutable/v3/                          @oizie @sebald @gavingregory
+/types/redux-form/v6/                               @carsonf @aikoven @LKay @bancek @mshaaban088
+/types/redux-form/v4/                               @aikoven
 /types/redux-immutable/                             @oizie @sebald @gavingregory @lukyth
+/types/redux-immutable/v3/                          @oizie @sebald @gavingregory
 /types/redux-immutable-state-invariant/             @remojansen @highflying @mihai-dinculescu
 /types/redux-infinite-scroll/                       @silkyfray
 /types/redux-injectable-store/                      @unindented
@@ -4538,8 +4565,8 @@
 /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-mock-store/v0/                         @MarianPalkus
 /types/redux-optimistic-ui/                         @asvetliakov
 /types/redux-orm/                                   @keenondrums
 /types/redux-pack/                                  @tansongyang @quicksnap @no-stack-dub-sack
@@ -4553,6 +4580,7 @@
 /types/redux-sentry-middleware/                     @dolezel
 /types/redux-shortcuts/                             @tstirrat
 /types/redux-socket.io/                             @snakeego
+/types/redux-state-sync/                            @AOHUA @AntonioMendez
 /types/redux-storage/                               @asvetliakov
 /types/redux-storage-engine-jsurl/                  @screendriver
 /types/redux-storage-engine-localstorage/           @screendriver
@@ -4567,8 +4595,8 @@
 /types/ref-struct-di/                               @keerthi16 @KiranNiranjan
 /types/ref-union/                                   @loyd
 /types/ref-union-di/                                @keerthi16 @KiranNiranjan
-/types/reflux/v0/                                   @mauricedb
 /types/reflux/                                      @mauricedb @LiangZugeng
+/types/reflux/v0/                                   @mauricedb
 /types/registry-auth-token/                         @mauricedb @LiangZugeng
 /types/regression/                                  @MattiasMartens
 /types/relateurl/                                   @tkrotoff
@@ -4604,18 +4632,19 @@
 /types/resize-img/                                  @higuri
 /types/resolve/                                     @marionebl @ajafff
 /types/resolve-cwd/                                 @BendingBender
-/types/resolve-from/v2/                             @unional
 /types/resolve-from/                                @unional @BendingBender
+/types/resolve-from/v2/                             @unional
 /types/resolve-global/                              @BendingBender
 /types/resolve-pkg/                                 @mabels @BendingBender
 /types/resourcejs/                                  @shaunluttin
 /types/response-time/                               @urossmolnik @TonyPythoneer @danmana
+/types/responselike/                                @BendingBender
 /types/rest/                                        @Nemo157
 /types/restangular/                                 @borisyankov
 /types/restful.js/                                  @tkqubo
-/types/restify/v4/                                  @blittle @stevehipwell
-/types/restify/v5/                                  @blittle @stevehipwell @leanazulyoro
 /types/restify/                                     @blittle @stevehipwell @leanazulyoro @mgebundy
+/types/restify/v5/                                  @blittle @stevehipwell @leanazulyoro
+/types/restify/v4/                                  @blittle @stevehipwell
 /types/restify-cookies/                             @weekens
 /types/restify-cors-middleware/                     @dthunell
 /types/restify-errors/                              @stevehipwell
@@ -4656,7 +4685,10 @@
 /types/roll/                                        @icopp
 /types/rolling-rate-limiter/                        @l-jonas
 /types/rollup-plugin-commonjs/                      @eoin-obrien
+/types/rollup-plugin-delete/                        @vladshcherbin
 /types/rollup-plugin-json/                          @asmockler @hotell
+/types/rollup-plugin-node-builtins/                 @Kocal
+/types/rollup-plugin-node-globals/                  @kocal
 /types/rollup-plugin-node-resolve/                  @eoin-obrien
 /types/rollup-plugin-sourcemaps/                    @eoin-obrien
 /types/roman-numerals/                              @pluma
@@ -4747,6 +4779,7 @@
 /types/screenfull/                                  @icholy @lionelb @joelshepherd
 /types/screeps/                                     @MarkoSulamagi @NhanHo @bryanbecker @resir014 @Arcath @dmarcuse
 /types/screeps-profiler/                            @ramblurr
+/types/script-ext-html-webpack-plugin/              @davecardwell
 /types/scriptjs/                                    @ssttevee
 /types/scroll-into-view/                            @zivni
 /types/scroller/                                    @haskellcamargo
@@ -4766,13 +4799,14 @@
 /types/seededshuffle/                               @urish
 /types/seedrandom/                                  @kernhanda
 /types/segment-analytics/                           @fongandrew
-/types/select2/v3/                                  @borisyankov
 /types/select2/                                     @borisyankov @denisname
+/types/select2/v3/                                  @borisyankov
 /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 @oddui
+/types/selenium-webdriver/v2/                       @BillArmstrong @Kuniwak @cnishina
+/types/semantic-release/                            @lgaticaq
 /types/semantic-ui/                                 @leonard-thieu
 /types/semantic-ui-accordion/                       @leonard-thieu
 /types/semantic-ui-api/                             @leonard-thieu
@@ -4804,17 +4838,17 @@
 /types/sencha_touch/                                @brian428
 /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 @thomas-b @Antoine38660 @smff
+/types/sequelize/v3/                                @samuelneff @codeanimal @drinchev @morpheusxaut @torhal
 /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 @Pochodaydayup
-/types/serialport/v4/                               @codefoster
-/types/serialport/v6/                               @codefoster @apearson
 /types/serialport/                                  @codefoster @apearson
+/types/serialport/v6/                               @codefoster @apearson
+/types/serialport/v4/                               @codefoster
 /types/serve-favicon/                               @urossmolnik
 /types/serve-index/                                 @tkrotoff
 /types/serve-static/                                @urossmolnik @LinusU
@@ -4823,7 +4857,7 @@
 /types/serverless/                                  @hassankhan
 /types/servicenow/                                  @bryceg
 /types/session-file-store/                          @blendsdk @rokt33r
-/types/set-cookie-parser/                           @nickp10
+/types/set-cookie-parser/                           @nickp10 @ilyaztsv
 /types/set-value/                                   @DanielRosenwasser
 /types/setasap/                                     @djcsdy
 /types/settings/                                    @shreyjain1994
@@ -4832,8 +4866,8 @@
 /types/sha1/                                        @arcdev1
 /types/sha256/                                      @nhardy
 /types/shallow-equals/                              @rsolomon
-/types/shallowequal/v0/                             @seansfkelley
 /types/shallowequal/                                @seansfkelley @BendingBender
+/types/shallowequal/v0/                             @seansfkelley
 /types/shapefile/                                   @DenisCarriere @Thw0rted
 /types/sharedb/                                     @soney
 /types/sharedworker/                                @nakakura
@@ -4853,8 +4887,8 @@
 /types/shopify-buy/                                 @openminder @straiforos @totemika
 /types/shorten-repo-url/                            @BendingBender
 /types/shortid/                                     @stpettersens @despairblue
-/types/shot/v3/                                     @AJamesPhillips @SimonSchick
 /types/shot/                                        @AJamesPhillips @SimonSchick
+/types/shot/v3/                                     @AJamesPhillips @SimonSchick
 /types/should-sinon/                                @Arylo
 /types/showdown/                                    @hamedbaatour @cbowdon @tan9 @arielsaldana
 /types/shpjs/                                       @littlebtc
@@ -4875,14 +4909,14 @@
 /types/simple-cw-node/                              @vvakame
 /types/simple-lru/                                  @NN---
 /types/simple-mock/                                 @leonyu
-/types/simple-oauth2/v1/                            @mad-mike @troy-lamerton @netux
 /types/simple-oauth2/                               @mad-mike @troy-lamerton @netux @LinusU
+/types/simple-oauth2/v1/                            @mad-mike @troy-lamerton @netux
 /types/simple-peer/                                 @tlaziuk
 /types/simple-url-cache/                            @a-lucas
 /types/simple-websocket/                            @dex4er
 /types/simple-xml/                                  @notVitaliy
-/types/simplebar/v1/                                @gregonnet @leonard-thieu
 /types/simplebar/                                   @gregonnet @leonard-thieu
+/types/simplebar/v1/                                @gregonnet @leonard-thieu
 /types/simplemde/                                   @Scalesoft
 /types/simplesmtp/                                  @rogierschouten
 /types/simplestorage.js/                            @axelcostaspena @mxl
@@ -4897,8 +4931,8 @@
 /types/single-spa-react/                            @Garrett-Smith-iq @chrisdopuch
 /types/sinon/                                       @mrbigdog2u @rationull @lumaxis @nicojs @43081j @joshuakgoldberg @gjednaszewski @johnjesse @alecf @SimonSchick
 /types/sinon-as-promised/                           @igrayson
-/types/sinon-chai/v2/                               @kazimanzurrashid @jedmao
 /types/sinon-chai/                                  @kazimanzurrashid @jedmao @elpdpt
+/types/sinon-chai/v2/                               @kazimanzurrashid @jedmao
 /types/sinon-chrome/                                @pimterry @crimx @kobanyan
 /types/sinon-express-mock/                          @jpchip @tlaziuk
 /types/sinon-mongoose/                              @stevehipwell
@@ -4937,8 +4971,8 @@
 /types/smart-truncate/                              @oyalhi
 /types/smooth-scroll/                               @andreiho
 /types/smoothscroll-polyfill/                       @kryops
-/types/smtp-server/v1/                              @markisme @Taisiias
 /types/smtp-server/                                 @markisme @Taisiias @dex4er
+/types/smtp-server/v1/                              @markisme @Taisiias
 /types/smtpapi/                                     @a-morales
 /types/snakecase-keys/                              @BendingBender
 /types/snappy/                                      @reconbot
@@ -4948,8 +4982,8 @@
 /types/snoowrap/                                    @vitosamson @TheAppleFreak @willwull
 /types/snowball-stemmers/                           @ryanvolum
 /types/snowboy/                                     @dolanmiu
-/types/socket.io/v1/                                @progre @divillysausages @florentpoujol @KentarouTakeda @gigi @BrainMaestro
 /types/socket.io/                                   @progre @divillysausages @florentpoujol @KentarouTakeda @gigi @BrainMaestro
+/types/socket.io/v1/                                @progre @divillysausages @florentpoujol @KentarouTakeda @gigi @BrainMaestro
 /types/socket.io-client/                            @progre @divillysausages @florentpoujol
 /types/socket.io-p2p/                               @saenglert
 /types/socket.io-parser/                            @plantain-00
@@ -4978,8 +5012,8 @@
 /types/space-pen/                                   @vvakame
 /types/spark-md5/                                   @bastienmoulia
 /types/sparkly/                                     @BendingBender
-/types/sparkpost/v1/                                @geoffreak
 /types/sparkpost/                                   @geoffreak @bondz @vvu
+/types/sparkpost/v1/                                @geoffreak
 /types/sparqljs/                                    @AlexeyMz
 /types/sparse-bitfield/                             @BendingBender
 /types/spatialite/                                  @atd-schubert
@@ -5018,8 +5052,8 @@
 /types/stack-utils/                                 @BendingBender
 /types/stacktrace-js/                               @exceptionless @pilagod
 /types/stale-lru-cache/                             @cxcorp
-/types/stampit/v2/                                  @koresar
 /types/stampit/                                     @koresar @lummish
+/types/stampit/v2/                                  @koresar
 /types/stamplay-js-sdk/                             @ridermansb
 /types/standard-error/                              @roblabat
 /types/standard-http-error/                         @roblabat
@@ -5072,8 +5106,8 @@
 /types/stream-series/                               @k-kagurazaka
 /types/stream-shift/                                @djcsdy
 /types/stream-throttle/                             @danwbyrne
-/types/stream-to-array/v0/                          @Bartvds
 /types/stream-to-array/                             @Bartvds @BendingBender
+/types/stream-to-array/v0/                          @Bartvds
 /types/stream-to-promise/                           @Alorel
 /types/stream-to-string/                            @BendingBender
 /types/streaming-json-stringify/                    @BendingBender
@@ -5087,8 +5121,8 @@
 /types/string-hash/                                 @ethanrubio
 /types/string-length/                               @BendingBender
 /types/string-replace-webpack-plugin/               @pd4d10
-/types/string-similarity/v1/                        @ragtime
 /types/string-similarity/                           @ragtime @BendingBender
+/types/string-similarity/v1/                        @ragtime
 /types/string-template/                             @TonyPythoneer
 /types/string-width/                                @jacobbubu
 /types/string_score/                                @marcinporebski
@@ -5110,20 +5144,20 @@
 /types/strophe/                                     @DavidKDeutsch
 /types/strophe.js/                                  @DavidKDeutsch
 /types/structured-source/                           @azu
+/types/styled-components/                           @Igorbek @Igmat @lavoaster @Jessidhia
 /types/styled-components/v3/                        @Igorbek @Igmat
-/types/styled-components/                           @Igorbek @Igmat @lavoaster @Kovensky
 /types/styled-jsx/                                  @R1ZZU
 /types/styled-react-modal/                          @Lavoaster
-/types/styled-system/                               @maxdeviant @phobon @zephraph @damassi @alloy @maoueh @lavoaster @jschuler @adam187
+/types/styled-system/                               @maxdeviant @phobon @zephraph @damassi @alloy @maoueh @lavoaster @jschuler @adam187 @gretzky
 /types/styled-theming/                              @ArjanJ
-/types/stylelint/v7/                                @alan-agius4
 /types/stylelint/                                   @alan-agius4 @filipsalpe
+/types/stylelint/v7/                                @alan-agius4
 /types/stylelint-webpack-plugin/                    @bahlo
 /types/stylenames/                                  @bengry
 /types/stylus/                                      @SomaticIT
 /types/subscribe-ui-event/                          @wangcheng678
-/types/subsume/v1/                                  @BendingBender
 /types/subsume/                                     @BendingBender
+/types/subsume/v1/                                  @BendingBender
 /types/subtitle/                                    @jenglamlow
 /types/succinct/                                    @EnableSoftware
 /types/sudo-block/                                  @BendingBender
@@ -5131,8 +5165,8 @@
 /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 @beeequeue @lukaselmer
+/types/superagent/v2/                               @varju @NicoZelaya @mxl
 /types/superagent-bunyan/                           @bricka
 /types/superagent-no-cache/                         @mxl
 /types/superagent-prefix/                           @mxl
@@ -5140,8 +5174,8 @@
 /types/superstruct/                                 @edwardsnare
 /types/supertest/                                   @varju @pietu
 /types/supertest-as-promised/                       @tkrotoff
-/types/supports-color/v3/                           @mgroenhoff
 /types/supports-color/                              @mgroenhoff @mtraynham
+/types/supports-color/v3/                           @mgroenhoff
 /types/svg-injector/                                @poke
 /types/svg-parser/                                  @mrmlnc
 /types/svg-path-bounding-box/                       @NotWoods
@@ -5176,8 +5210,8 @@
 /types/swig/                                        @CodeAnimal @soywiz
 /types/swig-email-templates/                        @mrhen @micksatana
 /types/swipe/                                       @kant2002
-/types/swiper/v3/                                   @sgaliano @lucax88x
 /types/swiper/                                      @sgaliano @lucax88x @ematseruk @odahcam @jmca @daem0ndev
+/types/swiper/v3/                                   @sgaliano @lucax88x
 /types/swipeview/                                   @borisyankov
 /types/switchery/                                   @bgrieder @claylaut
 /types/swiz/                                        @jedigo
@@ -5195,8 +5229,8 @@
 /types/tabtab/                                      @vojtechhabarta @kamontat
 /types/tabulator/                                   @euginio
 /types/tail/                                        @spacejack
-/types/tapable/v0/                                  @e-cloud
 /types/tapable/                                     @e-cloud @johnnyreilly
+/types/tapable/v0/                                  @e-cloud
 /types/tape/                                        @Bartvds @sodatea @DennisSchwartz @mikehenrty @rostrowski
 /types/tar/                                         @SomaticIT @connor4312
 /types/tar-fs/                                      @Umoxfo
@@ -5216,6 +5250,7 @@
 /types/tempy/                                       @douglasduteil @maistho
 /types/term-size/                                   @BendingBender
 /types/terminal-image/                              @BendingBender
+/types/terminal-kit/                                @katsanva
 /types/terminal-link/                               @BendingBender
 /types/terminal-menu/                               @aravindarun
 /types/tern/                                        @nkappler
@@ -5228,6 +5263,7 @@
 /types/tether-drop/                                 @adidahiya
 /types/tether-shepherd/                             @mtgibbs
 /types/text-buffer/                                 @GlenCFL
+/types/text-clipper/                                @krzysztof-grzybek
 /types/text-encoding/                               @pine @mohsen1 @nwmqpa
 /types/text-encoding-utf-8/                         @trxcllnt
 /types/text-table/                                  @saadq
@@ -5247,8 +5283,8 @@
 /types/throttle/                                    @BendingBender
 /types/throttle-debounce/                           @czbuchi @franklixuefei
 /types/through/                                     @AndrewGaspar
-/types/through2/v0/                                 @Bartvds @jedmao
 /types/through2/                                    @Bartvds @jedmao @valotas @TeamworkGuy2 @Alorel
+/types/through2/v0/                                 @Bartvds @jedmao
 /types/through2-concurrent/                         @Alorel
 /types/through2-map/                                @LucasHill
 /types/tildify/                                     @BendingBender
@@ -5343,8 +5379,8 @@
 /types/twix/                                        @j3ko
 /types/two.js/                                      @cprecioso
 /types/type-check/                                  @hansrwindhoff
-/types/type-detect/v0/                              @Bartvds
 /types/type-detect/                                 @Bartvds
+/types/type-detect/v0/                              @Bartvds
 /types/type-is/                                     @BendingBender
 /types/type-name/                                   @armorik83
 /types/typeahead/                                   @igochkov @gjunge
@@ -5357,8 +5393,8 @@
 /types/ua-parser-js/                                @superduper @legendecas @MeLlamoPablo
 /types/ua-string/                                   @BendingBender
 /types/uglify-es/                                   @alan-agius4
-/types/uglify-js/v2/                                @tkrotoff
 /types/uglify-js/                                   @alan-agius4 @tkrotoff @johnnyreilly
+/types/uglify-js/v2/                                @tkrotoff
 /types/uglifycss/                                   @blendsdk
 /types/uglifyjs-webpack-plugin/                     @vajkayrene
 /types/ui-box/                                      @nettofarah
@@ -5395,8 +5431,8 @@
 /types/unused-filename/                             @BendingBender
 /types/unzip/                                       @coding2012
 /types/unzipper/                                    @s73obrien @natemara @bartje321
-/types/update-notifier/v1/                          @vvakame @nchen63
 /types/update-notifier/                             @vvakame @nchen63 @bitjson @grinich
+/types/update-notifier/v1/                          @vvakame @nchen63
 /types/uploadcare/                                  @jineshshah36
 /types/upng-js/                                     @plantain-00 @pineapplemachine
 /types/uppercamelcase/                              @plantain-00
@@ -5406,8 +5442,8 @@
 /types/uritemplate/                                 @teyc @rubensworks
 /types/urix/                                        @BendingBender
 /types/url-assembler/                               @wolfgang42
-/types/url-join/v0/                                 @rogierschouten @devrelm
 /types/url-join/                                    @rogierschouten @devrelm @BendingBender
+/types/url-join/v0/                                 @rogierschouten @devrelm
 /types/url-metadata/                                @mrkmg
 /types/url-params/                                  @danielsogl
 /types/url-parse/                                   @ChernenkoPaul @harisiva @DimitryDushkin @davidgoli
@@ -5422,6 +5458,7 @@
 /types/urlsafe-base64/                              @tkrotoff
 /types/usage/                                       @pvomhoff
 /types/usb/                                         @underscorebrody @thegecko
+/types/user-event/                                  @whtsky
 /types/user-home/                                   @mhegazy
 /types/useragent/                                   @geoffreak
 /types/username/                                    @kayahr @krivachy
@@ -5434,6 +5471,7 @@
 /types/uuid-js/                                     @mhegazy
 /types/uuid-parse/                                  @screendriver
 /types/uuid-validate/                               @HiromiShikata
+/types/uuidv4/                                      @Hinaser
 /types/uws/                                         @plantain-00 @orblazer
 /types/v-chart-plugin/                              @natemara
 /types/v8flags/                                     @BendingBender
@@ -5470,16 +5508,18 @@
 /types/viewporter/                                  @borisyankov
 /types/vimeo/                                       @DazWilkin
 /types/vimeo__player/                               @denisyilmaz @timc13 @terrymun
-/types/vinyl/v0/                                    @jedmao
 /types/vinyl/                                       @vvakame @jedmao @thorn0
+/types/vinyl/v0/                                    @jedmao
 /types/vinyl-buffer/                                @tkQubo
-/types/vinyl-fs/                                    @vvakame @remisery
+/types/vinyl-fs/                                    @vvakame @remisery @TeamworkGuy2
+/types/vinyl-fs/v1/                                 @vvakame @remisery
+/types/vinyl-fs/v0/                                 @vvakame @remisery
 /types/vinyl-paths/                                 @tkQubo
 /types/virtual-dom/                                 @chbrown
 /types/virtual-keyboard/                            @bsurai
 /types/vis/                                         @MichaelBitard @macleodbroad-wf @adripanico @seveves @kaktus40 @mmaitre314 @supercargo @takato1314 @alex-kachura @dcop @avrahamcool @divideby
-/types/vision/v4/                                   @jasonswearingen @AJamesPhillips
 /types/vision/                                      @jasonswearingen @AJamesPhillips @lenovouser
+/types/vision/v4/                                   @jasonswearingen @AJamesPhillips
 /types/vitalsigns/                                  @cyrilschumacher
 /types/vivus/                                       @DanielRosenwasser @lekhmanrus
 /types/vkbeautify/                                  @sch3lp
@@ -5538,22 +5578,21 @@
 /types/webcl/                                       @NCARalph
 /types/webcomponents.js/                            @adidahiya
 /types/webcrypto/                                   @iislucas
-/types/webdriverio/                                 @nmalaguti @timbru31 @fsmedberg-tc @tanvirislam06 @daveparslow @phil-lgr @mroggy85
 /types/webfontloader/                               @doskallemaskin
 /types/webgl-ext/                                   @zenmumbler
 /types/webgl2/                                      @nkemnitz @karhu
 /types/webidl2/                                     @saschanaz
 /types/webmidi/                                     @lostfictions
-/types/webpack/v3/                                  @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @alan-agius4 @elliottsj @jason0x43 @christophehurpeau @rwaskiewicz @kuehlein
 /types/webpack/                                     @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @alan-agius4 @elliottsj @jason0x43 @dennispg @christophehurpeau @ZSkycat @johnnyreilly @rwaskiewicz @kuehlein @grgur
+/types/webpack/v3/                                  @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @alan-agius4 @elliottsj @jason0x43 @christophehurpeau @rwaskiewicz @kuehlein
 /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 @chrisabrams
+/types/webpack-dev-middleware/v1/                   @bumbleblym @reduckted
 /types/webpack-dev-server/                          @maestroh @daveparslow @ZheyangSong @alan-agius4 @arturovt
 /types/webpack-dotenv-plugin/                       @kryops
 /types/webpack-env/                                 @use-strict @rhonsby
@@ -5561,12 +5600,12 @@
 /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-merge/v0/                            @deevus
 /types/webpack-node-externals/                      @mtraynham
 /types/webpack-notifier/                            @bumbleblym
-/types/webpack-serve/v1/                            @rynclark @Jokcy @ZSkycat
 /types/webpack-serve/                               @rynclark @Jokcy @ZSkycat
+/types/webpack-serve/v1/                            @rynclark @Jokcy @ZSkycat
 /types/webpack-sources/                             @e-cloud @chriseppstein
 /types/webpack-stream/                              @iclanton @bumbleblym
 /types/webpack-subresource-integrity/               @huan086
@@ -5608,16 +5647,16 @@
 /types/windows-1251/                                @RomanGolovanov
 /types/windows-script-host/                         @zspitz
 /types/windows-service/                             @rogierschouten
-/types/winjs/v1/                                    @adamhewitt627 @craigktreasure @xirzec
-/types/winjs/v2/                                    @adamhewitt627 @craigktreasure @xirzec
 /types/winjs/                                       @adamhewitt627 @craigktreasure @xirzec
+/types/winjs/v2/                                    @adamhewitt627 @craigktreasure @xirzec
+/types/winjs/v1/                                    @adamhewitt627 @craigktreasure @xirzec
 /types/wink-tokenizer/                              @lal12
 /types/winreg/                                      @RX14 @BobBuehler
 /types/winrt-uwp/                                   @saschanaz @taylor224
 /types/winston-dynamodb/                            @nickiannone
 /types/winston-mail/                                @idono87
-/types/winston-syslog/v1/                           @cjbarth
 /types/winston-syslog/                              @cjbarth @felix-hoc
+/types/winston-syslog/v1/                           @cjbarth
 /types/wiring-pi/                                   @NoHomey
 /types/wnumb/                                       @acoreyj
 /types/wonder.js/                                   @yyc-git
@@ -5630,10 +5669,10 @@
 /types/worker-threads-pool/                         @BendingBender
 /types/workerpool/                                  @Alorel
 /types/wpapi/                                       @guoyunhe
-/types/wrap-ansi/v2/                                @kayahr
 /types/wrap-ansi/                                   @kayahr
-/types/wreck/v7/                                    @marcinporebski
+/types/wrap-ansi/v2/                                @kayahr
 /types/wreck/                                       @marcinporebski @saboya
+/types/wreck/v7/                                    @marcinporebski
 /types/wrench/                                      @soywiz
 /types/write-file-atomic/                           @BendingBender
 /types/write-file-atomically/                       @Aankhen
@@ -5661,21 +5700,21 @@
 /types/xmpp__jid/                                   @PJakcson @BendingBender
 /types/xmpp__xml/                                   @BendingBender
 /types/xregexp/                                     @Bartvds @jfahrenkrug @sigo
-/types/xrm/v7/                                      @daryllabar
-/types/xrm/v8/                                      @6ix4our @mattngan @markusmauch @daryllabar @clownwilleatme @mariusagur
 /types/xrm/                                         @6ix4our @mattngan @markusmauch @daryllabar @clownwilleatme @scottdurow
+/types/xrm/v8/                                      @6ix4our @mattngan @markusmauch @daryllabar @clownwilleatme @mariusagur
+/types/xrm/v7/                                      @daryllabar
 /types/xsd-schema-validator/                        @Goldsmith42
 /types/xsockets/                                    @pushplay
-/types/xxhashjs/                                    @mDibyo
+/types/xxhashjs/                                    @mDibyo @Manc
 /types/yallist/                                     @BendingBender
 /types/yaml/                                        @ikatyang @ColinBradley
 /types/yandex-maps/                                 @Delagen @gastwork13
 /types/yandex-money-sdk/                            @chrootsu
 /types/yar/                                         @SimonSchick
-/types/yargs/v8/                                    @poelstra @mizunashi-mana @pushplay @jeffkenney
-/types/yargs/v10/                                   @poelstra @mizunashi-mana @pushplay @jeffkenney @JimiC
-/types/yargs/v11/                                   @poelstra @mizunashi-mana @pushplay @jeffkenney @JimiC
 /types/yargs/                                       @poelstra @mizunashi-mana @pushplay @jeffkenney @JimiC @steffenvv
+/types/yargs/v11/                                   @poelstra @mizunashi-mana @pushplay @jeffkenney @JimiC
+/types/yargs/v10/                                   @poelstra @mizunashi-mana @pushplay @jeffkenney @JimiC
+/types/yargs/v8/                                    @poelstra @mizunashi-mana @pushplay @jeffkenney
 /types/yargs-interactive/                           @szeck87
 /types/yargs-parser/                                @milesj
 /types/yauzl/                                       @ffflorian
@@ -5698,7 +5737,7 @@
 /types/youtube/                                     @DazWilkin @JoshuaKGoldberg @eliotfallon213 @terrymun @paulhobbel
 /types/youtube-dl/                                  @bsurai @moshfeu
 /types/yui/                                         @giabao
-/types/yup/                                         @dhardtke @vtserman @MoretonBayRC @sseppola @YashdalfTheGray @vincentjames501 @robertbullen @sat0yu
+/types/yup/                                         @dhardtke @vtserman @MoretonBayRC @sseppola @YashdalfTheGray @vincentjames501 @robertbullen @sat0yu @dancrumb
 /types/z-schema/                                    @pgonzal
 /types/zapier-platform-core/                        @bradleyayers
 /types/zeit__next-typescript/                       @icopp
@@ -5706,8 +5745,8 @@
 /types/zen-push/                                    @daprahamian
 /types/zenscroll/                                   @HamedFathi
 /types/zepto/                                       @jbaldwin
-/types/zeroclipboard/v1/                            @ejsmith @niemyjski @balassy @leonyu
 /types/zeroclipboard/                               @ejsmith @niemyjski @balassy @leonyu
+/types/zeroclipboard/v1/                            @ejsmith @niemyjski @balassy @leonyu
 /types/zeromq/                                      @davemckeown @erikma @TitaneBoy
 /types/zip-webpack-plugin/                          @blaise-io
 /types/zip.js/                                      @lgrignon
diff --git a/README.md b/README.md
index 4343577bd0..746d9d9f3e 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,8 @@ Also see the [definitelytyped.org](http://definitelytyped.org) website, although
 This section tracks the health of the repository and publishing process.
 It may be helpful for contributors experiencing any issues with their PRs and packages.
 
-* All packages are type-checking/linting cleanly: [![Build Status](https://travis-ci.org/DefinitelyTyped/DefinitelyTyped.svg?branch=master)](https://travis-ci.org/DefinitelyTyped/DefinitelyTyped)
-* All packages are being published to npm in under 10,000 seconds: [![Publish Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.types-publisher-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=13)
+* All packages are [type-checking/linting](https://github.com/Microsoft/dtslint) cleanly: [![Build Status](https://travis-ci.org/DefinitelyTyped/DefinitelyTyped.svg?branch=master)](https://travis-ci.org/DefinitelyTyped/DefinitelyTyped)
+* All packages are being [published to npm](https://github.com/Microsoft/types-publisher) in under an hour: [![Publish Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.types-publisher-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=13)
 * [typescript-bot](https://github.com/typescript-bot) has been active on DefinitelyTyped [![Activity Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.typescript-bot-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=14)
 
 If anything here seems wrong, or any of the above are failing, please raise an issue in [the DefinitelyTyped Gitter channel](https://gitter.im/DefinitelyTyped/DefinitelyTyped).
@@ -229,7 +229,7 @@ It depends, but most pull requests will be merged within a week. PRs that have b
 
 #### My PR is merged; when will the `@types` NPM package be updated?
 
-NPM packages should update within a few hours. If it's been more than 24 hours, ping @RyanCavanaugh and @andy-ms on the PR to investigate.
+NPM packages should update within a few minutes. If it's been more than an hour, mention the PR number on [the DefinitelyTyped Gitter channel](https://gitter.im/DefinitelyTyped/DefinitelyTyped) and the current maintainer will get the correct team member to investigate.
 
 #### I'm writing a definition that depends on another definition. Should I use `<reference types="" />` or an import?
 
@@ -255,12 +255,30 @@ Here are the [currently requested definitions](https://github.com/DefinitelyType
 
 If types are part of a web standard, they should be contributed to [TSJS-lib-generator](https://github.com/Microsoft/TSJS-lib-generator) so that they can become part of the default `lib.dom.d.ts`.
 
+#### Should I add an empty namespace to a package that doesn't export a module to use ES6 style imports?
+
+Some packages, like [chai-http](https://github.com/chaijs/chai-http), export a function.
+
+Importing this module with an ES6 style import in the form `import * as foo from "foo";` leads to the error:
+
+> error TS2497: Module 'foo' resolves to a non-module entity and cannot be imported using this construct
+
+This error can be suppressed by merging the function declaration with an empty namespace of the same name, but this practice is discouraged.
+This is a commonly cited [Stack Overflow answer](https://stackoverflow.com/questions/39415661/what-does-resolves-to-a-non-module-entity-and-cannot-be-imported-using-this) regarding this matter.
+
+It is more appropriate to import the module using the `import foo = require("foo");` syntax.
+Nevertheless, if you want to use a default import like `import foo from "foo";` you have two options:
+- you can use the [`--allowSyntheticDefaultImports` compiler option](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-1-8.html#support-for-default-import-interop-with-systemjs) if your module runtime supports an interop scheme for non-ECMAScript modules, i.e. if default imports work in your environment (e.g. Webpack, SystemJS, esm).
+- you can use the [`--esModuleInterop` compiler option](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-7.html#support-for-import-d-from-cjs-form-commonjs-modules-with---esmoduleinterop) if you want TypeScript to take care of non-ECMAScript interop (since Typescript 2.7).
+
 #### A package uses `export =`, but I prefer to use default imports. Can I change `export =` to `export default`?
 
-If you are using TypeScript 2.7 or later, use `--esModuleInterop` in your project.
-Otherwise, if default imports work in your environment (e.g. Webpack, SystemJS, esm), consider turning on the [`--allowSyntheticDefaultImports`](http://www.typescriptlang.org/docs/handbook/compiler-options.html) compiler option.
+Like in the previous question, refer to using either the [`--allowSyntheticDefaultImports`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-1-8.html#support-for-default-import-interop-with-systemjs)
+or [`--esModuleInterop`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-7.html#support-for-import-d-from-cjs-form-commonjs-modules-with---esmoduleinterop)
+compiler options.
+
 Do not change the type definition if it is accurate.
-For an NPM package, `export =` is accurate if `node -p 'require("foo")'` is the export, and `export default` is accurate if `node -p 'require("foo").default'` is the export.
+For an NPM package, `export =` is accurate if `node -p 'require("foo")'` works to import a module, and `export default` is accurate if `node -p 'require("foo").default'` works to import a module.
 
 #### I want to use features from TypeScript 2.1 or above.
 
@@ -268,8 +286,9 @@ Then you will have to add a comment to the last line of your definition header (
 
 #### I want to use features from TypeScript 3.1 or above.
 
-You will need to use the `typesVersions` feature of TypeScript 3.1 and above. You can find a detailed explanation
-of this feature in the [official TypeScript documentation](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-1.html#version-selection-with-typesversions).
+You can use the same `// TypeScript Version: 3.1` comment as above.
+However, if your project needs to maintain types that are compatible with 3.1 and above *at the same time as* types that are compatible with 3.0 or below, you will need to use the `typesVersions` feature, which is available in TypeScript 3.1 and above.
+You can find a detailed explanation of this feature in the [official TypeScript documentation](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-1.html#version-selection-with-typesversions).
 
 Here's a short explanation to get you started:
 
@@ -308,14 +327,60 @@ If the standard is still a draft, it belongs here.
 Use a name beginning with `dom-` and include a link to the standard as the "Project" link in the header.
 When it graduates draft mode, we may remove it from DefinitelyTyped and deprecate the associated `@types` package.
 
-#### I want to update a package to a new major version
+#### How do DefinitelyTyped package versions relate to versions of the corresponding library? 
 
-If you intend to continue updating the older version of the package, you may create a new subfolder with the current version e.g. `v2`, and copy existing files to it. If so, you will need to:
+_NOTE: The discussion in this section assumes familiarity with [Semantic versioning](https://semver.org/)_
+
+Each DefinitelyTyped package is versioned when published to NPM. 
+The [types-publisher](https://github.com/Microsoft/types-publisher) (the tool that publishes `@types` packages to npm) will set the declaration package's version by using the `major.minor` version number listed in the first line of its `index.d.ts` file. 
+For example, here are the first few lines of [Node's type declarations](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/1253faabf5e0d2c5470db6ea87795d7f96fef7e2/types/node/index.d.ts) for version `10.12.x` at the time of writing:
+
+```js
+// Type definitions for Node.js 10.12
+// Project: http://nodejs.org/
+// Definitions by: Microsoft TypeScript <https://github.com/Microsoft>
+//                 DefinitelyTyped <https://github.com/DefinitelyTyped>
+//                 Alberto Schiabel <https://github.com/jkomyno>
+```
+
+Because `10.12` is at the end the first line, the npm version of the `@types/node` package will also be `10.12.x`. 
+Note that the first-line comment in the `index.d.ts` file should only contain the `major.minor` version (e.g. `10.12`) and should not contain a patch version (e.g. `10.12.4`).
+This is because only the major and minor release numbers are aligned between library packages and type declaration packages. 
+The patch release number of the type declaration package (e.g. `.0` in `10.12.0`) is initialized to zero by DefinitelyTyped and is incremented each time a new `@types/node` package is published to NPM for the same major/minor version of the corresponding library.
+
+Sometimes type declaration package versions and library package versions can get out of sync.
+Below are a few common reasons why, in order of how much they inconvenience users of a library.
+Only the last case is typically problematic.
+
+* As noted above, the patch version of the type declaration package is unrelated to the library patch version.
+  This allows DefinitelyTyped to safely update type declarations for the same major/minor version of a library. 
+* If updating a package for new functionality, don't forget to update the version number to line up with that version of the library.
+  If users make sure versions correspond between JavaScript packages and their respective `@types` packages, then `npm update` should typically just work.
+* It's common for type declaration package updates to lag behind library updates because it's often library users, not maintainers, who update DefinitelyTyped when new library features are released.
+  So there may be a lag of days, weeks, or even months before a helpful community member sends a PR to update the type declaration package for a new library release.
+  If you're impacted by this, you can be the change you want to see in the world and you can be that helpful community member!
+
+:exclamation: If you're updating type declarations for a library, always set the `major.minor` version in the first line of `index.d.ts` to match the library version that you're documenting! :exclamation:
+
+#### If a library is updated to a new major version with breaking changes, how should I update its type declaration package?
+
+[Semantic versioning](https://semver.org/) requires that versions with breaking changes must increment the major version number.  
+For example, a library that removes a publicly exported function after its `3.5.8` release must bump its version to `4.0.0` in its next release.  
+Furthermore, when the library's `4.0.0` release is out, its DefinitelyTyped type declaration package should also be updated to `4.0.0`, including any breaking changes to the library's API. 
+
+Many libraries have a large installed base of developers (including maintainers of other packages using that library as a dependency) who won't move right away to a new version that has breaking changes, because it might be months until a maintainer has time to rewrite code to adapt to the new version. 
+In the meantime, users of old library versions still may want to update type declarations for older versions. 
+
+If you intend to continue updating the older version of a library's type declarations, you may create a new subfolder (e.g. `/v2/`) named for the current (soon to be "old") version, and copy existing files from the current version to it. 
+
+Because the root folder should always contain the type declarations for the latest ("new") version, you'll need to make a few changes to the files in your old-version subdirectory to ensure that relative path references point to the subdirectory, not the root.
 
 1. Update the relative paths in `tsconfig.json` as well as `tslint.json`.
 2. Add path mapping rules to ensure that tests are running against the intended version.
 
-For example [history v2 `tsconfig.json`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/history/v2/tsconfig.json) looks like:
+For example, the [`history`](https://github.com/ReactTraining/history/) library introduced breaking changes between version `2.x` and `3.x`.  
+Because many users still consumed the older `2.x` version, a maintainer who wanted to update the type declarations for this library to `3.x` added a `v2` folder inside the history repository that contains type declarations for the older version. 
+At the time of writing, the [history v2 `tsconfig.json`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/1253faabf5e0d2c5470db6ea87795d7f96fef7e2/types/history/v2/tsconfig.json) looks roughly like:
 
 ```json
 {
@@ -333,10 +398,11 @@ For example [history v2 `tsconfig.json`](https://github.com/DefinitelyTyped/Defi
 }
 ```
 
-If there are other packages on DefinitelyTyped that are incompatible with the new version, you will need to add path mappings to the old version. You will also need to do this for packages depending on packages depending on the old version.
+If there are other packages in DefinitelyTyped that are incompatible with the new version, you will need to add path mappings to the old version. 
+You will also need to do this recursively for packages depending on packages depending on the old version.
 
-For example, `react-router` depends on `history@2`, so [react-router `tsconfig.json`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-router/tsconfig.json) has a path mapping to `"history": [ "history/v2" ]`;
-transitively `react-router-bootstrap` (which depends on `react-router`) also adds a path mapping in its [tsconfig.json](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-router-bootstrap/tsconfig.json).
+For example, `react-router` depends on `history@2`, so [react-router `tsconfig.json`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-router/v2/tsconfig.json) has a path mapping to `"history": [ "history/v2" ]`. 
+Transitively, `react-router-bootstrap` (which depends on `react-router`) also needed to add the same path mapping (`"history": [ "history/v2" ]`) in its `tsconfig.json` until its `react-router` dependency was updated to the latest version.
 
 Also, `/// <reference types=".." />` will not work with path mapping, so dependencies must use `import`.
 
@@ -368,19 +434,6 @@ When `dts-gen` is used to scaffold a scoped package, the `paths` property has to
 
 GitHub doesn't [support](http://stackoverflow.com/questions/5646174/how-to-make-github-follow-directory-history-after-renames) file history for renamed files. Use [`git log --follow`](https://www.git-scm.com/docs/git-log) instead.
 
-#### Should I add an empty namespace to a package that doesn't export a module to use ES6 style imports?
-
-Some packages, like [chai-http](https://github.com/chaijs/chai-http), export a function.
-
-Importing this module with an ES6 style import in the form `import * as foo from "foo";` leads to the error:
-
-> error TS2497: Module 'foo' resolves to a non-module entity and cannot be imported using this construct
-
-This error can be suppressed by merging the function declaration with an empty namespace of the same name, but this practice is discouraged.
-This is a commonly cited [Stack Overflow answer](https://stackoverflow.com/questions/39415661/what-does-resolves-to-a-non-module-entity-and-cannot-be-imported-using-this) regarding this matter.
-
-It is more appropriate to import the module using the `import foo = require("foo");` syntax, or to use a default import like `import foo from "foo";` if using the `--allowSyntheticDefaultImports` flag if your module runtime supports an interop scheme for non-ECMAScript modules as such.
-
 ## License
 
 This project is licensed under the MIT license.
diff --git a/notNeededPackages.json b/notNeededPackages.json
index 2a645f9c93..4c33728a01 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -564,6 +564,30 @@
             "sourceRepoURL": "https://www.npmjs.com/package/fast-simplex-noise",
             "asOfVersion": "3.0.0"
         },
+        {
+            "libraryName": "fastify-cors",
+            "typingsPackageName": "fastify-cors",
+            "sourceRepoURL": "https://github.com/fastify/fastify-cors",
+            "asOfVersion": "2.1.0"
+        },
+        {
+            "libraryName": "Fastify-JWT",
+            "typingsPackageName": "fastify-jwt",
+            "sourceRepoURL": "https://github.com/fastify/fastify-jwt",
+            "asOfVersion": "0.8.1"
+        },
+        {
+            "libraryName": "fastify-multipart",
+            "typingsPackageName": "fastify-multipart",
+            "sourceRepoURL": "https://github.com/fastify/fastify-multipart",
+            "asOfVersion": "0.7.0"
+        },
+        {
+            "libraryName": "fastify-static",
+            "typingsPackageName": "fastify-static",
+            "sourceRepoURL": "https://github.com/fastify/fastify-static",
+            "asOfVersion": "2.2.1"
+        },
         {
             "libraryName": "fecha",
             "typingsPackageName": "fecha",
@@ -702,6 +726,12 @@
             "sourceRepoURL": "https://github.com/prettymuchbryce/node-http-status",
             "asOfVersion": "1.2.0"
         },
+        {
+            "libraryName": "i18next-xhr-backend",
+            "typingsPackageName": "i18next-xhr-backend",
+            "sourceRepoURL": "https://github.com/i18next/i18next-xhr-backend",
+            "asOfVersion": "1.4.2"
+        },
         {
             "libraryName": "iconv-lite",
             "typingsPackageName": "iconv-lite",
@@ -1086,6 +1116,12 @@
             "sourceRepoURL": "http://onsen.io",
             "asOfVersion": "2.0.0"
         },
+        {
+            "libraryName": "p-throttle",
+            "typingsPackageName": "p-throttle",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-throttle",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "param-case",
             "typingsPackageName": "param-case",
@@ -1260,6 +1296,12 @@
             "sourceRepoURL": "https://github.com/i18next/react-i18next",
             "asOfVersion": "8.1.0"
         },
+        {
+            "libraryName": "React Icons",
+            "typingsPackageName": "react-icons",
+            "sourceRepoURL": "https://www.npmjs.com/package/react-icons",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "react-monaco-editor",
             "typingsPackageName": "react-monaco-editor",
@@ -1608,6 +1650,12 @@
             "sourceRepoURL": "http://gcanti.github.io/tcomb/guide/index.html",
             "asOfVersion": "2.6.0"
         },
+        {
+            "libraryName": "terser",
+            "typingsPackageName": "terser",
+            "sourceRepoURL": "https://github.com/terser-js/terser",
+            "asOfVersion": "3.12.0"
+        },
         {
             "libraryName": "timezonecomplete",
             "typingsPackageName": "timezonecomplete",
diff --git a/package.json b/package.json
index 7fc0358f27..1a5124c035 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
         "lint": "dtslint types"
     },
     "devDependencies": {
-        "dtslint": "github:Microsoft/dtslint#production",
+        "dtslint": "latest",
         "types-publisher": "github:Microsoft/types-publisher#production"
     },
     "dependencies": {}
diff --git a/types/abs/index.d.ts b/types/abs/index.d.ts
index b5e8d23636..b1f31899d9 100644
--- a/types/abs/index.d.ts
+++ b/types/abs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for abs 1.3
-// Project: https://github.com/IonicaBizau/node-abs
+// Project: https://github.com/ionicabizau/abs
 // Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/acl/index.d.ts b/types/acl/index.d.ts
index 3f4df31aa2..931452dc52 100644
--- a/types/acl/index.d.ts
+++ b/types/acl/index.d.ts
@@ -1,150 +1,179 @@
-// Type definitions for node_acl 0.4.8
+// Type definitions for acl 0.4
 // Project: https://github.com/optimalbits/node_acl
 // Definitions by: Qubo <https://github.com/tkQubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 /// <reference types="node"/>
-/// <reference types="express"/>
 
 import http = require('http');
-import Promise = require("bluebird");
-import express = require("express");
+import Promise = require('bluebird');
+import express = require('express');
+import redis = require('redis');
+import mongo = require('mongodb');
 
-type strings = string|string[];
-type Value = string|number;
-type Values = Value|Value[];
+export = AclStatic;
+
+declare const AclStatic: AclStatic;
+
+type strings = string | string[];
+type Value = string | number;
+type Values = Value | Value[];
 type Action = () => any;
-type Callback = (err: Error) => any;
+type Callback = (err?: Error) => any;
 type AnyCallback = (err: Error, obj: any) => any;
 type AllowedCallback = (err: Error, allowed: boolean) => any;
 type GetUserId = (req: http.IncomingMessage, res: http.ServerResponse) => Value;
 
 interface AclStatic {
-    new (backend: Backend<any>, logger: Logger, options: Option): Acl;
-    new (backend: Backend<any>, logger: Logger): Acl;
-    new (backend: Backend<any>): Acl;
-    memoryBackend: MemoryBackendStatic;
+    new (
+        backend: AclStatic.Backend<any>,
+        logger?: AclStatic.Logger,
+        options?: AclStatic.Option
+    ): AclStatic.Acl;
+    readonly memoryBackend: AclStatic.MemoryBackendStatic;
+    readonly mongodbBackend: AclStatic.MongodbBackendStatic;
+    readonly redisBackend: AclStatic.RedisBackendStatic;
 }
 
-interface Logger {
-    debug: (msg: string) => any;
-}
-
-interface Acl {
-    addUserRoles: (userId: Value, roles: strings, cb?: Callback) => Promise<void>;
-    removeUserRoles: (userId: Value, roles: strings, cb?: Callback) => Promise<void>;
-    userRoles: (userId: Value, cb?: (err: Error, roles: string[]) => any) => Promise<string[]>;
-    roleUsers: (role: Value, cb?: (err: Error, users: Values) => any) => Promise<any>;
-    hasRole: (userId: Value, role: string, cb?: (err: Error, isInRole: boolean) => any) => Promise<boolean>;
-    addRoleParents: (role: string, parents: Values, cb?: Callback) => Promise<void>;
-    removeRole: (role: string, cb?: Callback) => Promise<void>;
-    removeResource: (resource: string, cb?: Callback) => Promise<void>;
-    allow: {
-        (roles: Values, resources: strings, permissions: strings, cb?: Callback): Promise<void>;
-        (aclSets: AclSet | AclSet[]): Promise<void>;
+declare namespace AclStatic {
+    interface Logger {
+        debug: (msg: string) => any;
     }
-    removeAllow: (role: string, resources: strings, permissions: strings, cb?: Callback) => Promise<void>;
-    removePermissions: (role: string, resources: strings, permissions: strings, cb?: Function) => Promise<void>;
-    allowedPermissions: (userId: Value, resources: strings, cb?: AnyCallback) => Promise<void>;
-    isAllowed: (userId: Value, resources: strings, permissions: strings, cb?: AllowedCallback) => Promise<boolean>;
-    areAnyRolesAllowed: (roles: strings, resource: strings, permissions: strings, cb?: AllowedCallback) => Promise<any>;
-    whatResources: {
-        (roles: strings, cb?: AnyCallback): Promise<any>;
-        (roles: strings, permissions: strings, cb?: AnyCallback): Promise<any>;
+
+    interface Acl {
+        addUserRoles: (userId: Value, roles: strings, cb?: Callback) => Promise<void>;
+        removeUserRoles: (userId: Value, roles: strings, cb?: Callback) => Promise<void>;
+        userRoles: (userId: Value, cb?: (err: Error, roles: string[]) => any) => Promise<string[]>;
+        roleUsers: (role: Value, cb?: (err: Error, users: Values) => any) => Promise<any>;
+        hasRole: (
+            userId: Value,
+            role: string,
+            cb?: (err: Error, isInRole: boolean) => any
+        ) => Promise<boolean>;
+        addRoleParents: (role: string, parents: Values, cb?: Callback) => Promise<void>;
+        removeRole: (role: string, cb?: Callback) => Promise<void>;
+        removeResource: (resource: string, cb?: Callback) => Promise<void>;
+        allow: {
+            (roles: Values, resources: strings, permissions: strings, cb?: Callback): Promise<void>;
+            (aclSets: AclSet | AclSet[]): Promise<void>;
+        };
+        removeAllow: (
+            role: string,
+            resources: strings,
+            permissions: strings,
+            cb?: Callback
+        ) => Promise<void>;
+        removePermissions: (
+            role: string,
+            resources: strings,
+            permissions: strings,
+            cb?: Callback
+        ) => Promise<void>;
+        allowedPermissions: (userId: Value, resources: strings, cb?: AnyCallback) => Promise<void>;
+        isAllowed: (
+            userId: Value,
+            resources: strings,
+            permissions: strings,
+            cb?: AllowedCallback
+        ) => Promise<boolean>;
+        areAnyRolesAllowed: (
+            roles: strings,
+            resource: strings,
+            permissions: strings,
+            cb?: AllowedCallback
+        ) => Promise<any>;
+        whatResources: {
+            (roles: strings, cb?: AnyCallback): Promise<any>;
+            (roles: strings, permissions: strings, cb?: AnyCallback): Promise<any>;
+        };
+        permittedResources: (roles: strings, permissions: strings, cb?: Callback) => Promise<void>;
+        middleware: (
+            numPathComponents?: number,
+            userId?: Value | GetUserId,
+            actions?: strings
+        ) => express.RequestHandler;
+    }
+
+    interface Option {
+        buckets?: BucketsOption;
+    }
+
+    interface BucketsOption {
+        meta?: string;
+        parents?: string;
+        permissions?: string;
+        resources?: string;
+        roles?: string;
+        users?: string;
+    }
+
+    interface AclSet {
+        roles: strings;
+        allows: AclAllow[];
+    }
+
+    interface AclAllow {
+        resources: strings;
+        permissions: strings;
+    }
+
+    interface MemoryBackend extends Backend<Action[]> {}
+    interface MemoryBackendStatic {
+        new (): MemoryBackend;
+    }
+
+    //
+    // For internal use
+    //
+    interface Backend<T> {
+        begin: () => T;
+        end: (transaction: T, cb?: Action) => void;
+        clean: (cb?: Action) => void;
+        get: (bucket: string, key: Value, cb?: Action) => void;
+        union: (bucket: string, keys: Value[], cb?: Action) => void;
+        add: (transaction: T, bucket: string, key: Value, values: Values) => void;
+        del: (transaction: T, bucket: string, keys: Value[]) => void;
+        remove: (transaction: T, bucket: string, key: Value, values: Values) => void;
+
+        endAsync: (transaction: T, cb?: (err: Error | null) => void) => Promise<void>;
+        getAsync: (
+            bucket: string,
+            key: Value,
+            cb?: (err: Error | null, value: any) => void
+        ) => Promise<any>;
+        cleanAsync: (cb?: (error?: Error) => void) => Promise<void>;
+        unionAsync: (
+            bucket: string,
+            keys: Value[],
+            cb?: (error: Error | undefined, results: any[]) => void
+        ) => Promise<any[]>;
+    }
+
+    interface Contract {
+        (args: IArguments): Contract | NoOp;
+        debug: boolean;
+        fulfilled: boolean;
+        args: any[];
+        checkedParams: string[];
+        params: (...types: string[]) => Contract | NoOp;
+        end: () => void;
+    }
+
+    interface NoOp {
+        params: (...types: string[]) => NoOp;
+        end: () => void;
+    }
+
+    // for redis backend
+    interface RedisBackend extends Backend<redis.RedisClient> {}
+    interface RedisBackendStatic {
+        new (redis: redis.RedisClient, prefix?: string): RedisBackend;
+    }
+
+    // for mongodb backend
+    interface MongodbBackend extends Backend<Callback> {}
+    interface MongodbBackendStatic {
+        new (db: mongo.Db, prefix?: string, useSingle?: boolean): MongodbBackend;
     }
-    permittedResources: (roles: strings, permissions: strings, cb?: Function) => Promise<void>;
-    middleware: (numPathComponents?: number, userId?: Value | GetUserId, actions?: strings) => express.RequestHandler;
 }
-
-interface Option {
-    buckets?: BucketsOption;
-}
-
-interface BucketsOption {
-    meta?: string;
-    parents?: string;
-    permissions?: string;
-    resources?: string;
-    roles?: string;
-    users?: string;
-}
-
-interface AclSet {
-    roles: strings;
-    allows: AclAllow[];
-}
-
-interface AclAllow {
-    resources: strings;
-    permissions: strings;
-}
-
-interface MemoryBackend extends Backend<Action[]> { }
-interface MemoryBackendStatic {
-    new (): MemoryBackend;
-}
-
-//
-// For internal use
-//
-interface Backend<T> {
-    begin: () => T;
-    end: (transaction: T, cb?: Action) => void;
-    clean: (cb?: Action) => void;
-    get: (bucket: string, key: Value, cb?: Action) => void;
-    union: (bucket: string, keys: Value[], cb?: Action) => void;
-    add: (transaction: T, bucket: string, key: Value, values: Values) => void;
-    del: (transaction: T, bucket: string, keys: Value[]) => void;
-    remove: (transaction: T, bucket: string, key: Value, values: Values) => void;
-
-    endAsync: Function; //TODO: Give more specific function signature
-    getAsync: Function;
-    cleanAsync: Function;
-    unionAsync: Function;
-}
-
-interface Contract {
-    (args: IArguments): Contract | NoOp;
-    debug: boolean;
-    fulfilled: boolean;
-    args: any[];
-    checkedParams: string[];
-    params: (...types: string[]) => Contract | NoOp;
-    end: () => void;
-}
-
-interface NoOp {
-    params: (...types: string[]) => NoOp;
-    end: () => void;
-}
-
-// for redis backend
-import redis = require('redis');
-
-interface AclStatic {
-    redisBackend: RedisBackendStatic;
-}
-
-interface RedisBackend extends Backend<redis.RedisClient> { }
-interface RedisBackendStatic {
-    new (redis: redis.RedisClient, prefix: string): RedisBackend;
-    new (redis: redis.RedisClient): RedisBackend;
-}
-
-// for mongodb backend
-import mongo = require('mongodb');
-
-interface AclStatic {
-    mongodbBackend: MongodbBackendStatic;
-}
-
-interface MongodbBackend extends Backend<Callback> { }
-interface MongodbBackendStatic {
-    new (db: mongo.Db, prefix: string, useSingle: boolean): MongodbBackend;
-    new (db: mongo.Db, prefix: string): MongodbBackend;
-    new (db: mongo.Db): MongodbBackend;
-}
-
-declare var _: AclStatic;
-export = _;
diff --git a/types/acl/test/index.ts b/types/acl/test/index.ts
index bb3e6fa54e..3485ab3662 100644
--- a/types/acl/test/index.ts
+++ b/types/acl/test/index.ts
@@ -2,15 +2,15 @@
 // https://github.com/OptimalBits/node_acl/blob/master/Readme.md
 import Acl = require('acl');
 
-var report = <T>(err: Error, value: T) => {
-  if (err) {
-    console.error(err);
-  }
-  console.info(value);
+const report = (err: Error, value: any) => {
+    if (err) {
+        console.error(err);
+    }
+    console.info(value);
 };
 
 // Using the memory backend
-var acl = new Acl(new Acl.memoryBackend());
+const acl: Acl.Acl = new Acl(new Acl.memoryBackend());
 
 // middleware with no optional parameters
 acl.middleware();
@@ -18,11 +18,11 @@ acl.middleware();
 acl.middleware(1);
 
 acl.middleware(1, () => {
-  return "joed";
+    return 'joed';
 });
 
 acl.middleware(1, () => {
-  return 2;
+    return 2;
 });
 
 acl.middleware(1, 'joed');
@@ -33,36 +33,36 @@ acl.middleware(3, 'joed', 'post');
 acl.allow('guest', 'blogs', 'view');
 
 // allow function accepts arrays as any parameter
-acl.allow('member', 'blogs', ['edit','view', 'delete']);
+acl.allow('member', 'blogs', ['edit', 'view', 'delete']);
 
 acl.addUserRoles('joed', 'guest');
 
-acl.addRoleParents('baz', ['foo','bar']);
+acl.addRoleParents('baz', ['foo', 'bar']);
 
-acl.allow('foo', ['blogs','forums','news'], ['view', 'delete']);
+acl.allow('foo', ['blogs', 'forums', 'news'], ['view', 'delete']);
 
-acl.allow('admin', ['blogs','forums'], '*');
+acl.allow('admin', ['blogs', 'forums'], '*');
 
 acl.allow([
     {
-        roles:['guest','special-member'],
-        allows:[
-            {resources:'blogs', permissions:'get'},
-            {resources:['forums','news'], permissions:['get','put','delete']}
-        ]
+        roles: ['guest', 'special-member'],
+        allows: [
+            { resources: 'blogs', permissions: 'get' },
+            { resources: ['forums', 'news'], permissions: ['get', 'put', 'delete'] },
+        ],
     },
     {
-        roles:['gold','silver'],
-        allows:[
-            {resources:'cash', permissions:['sell','exchange']},
-            {resources:['account','deposit'], permissions:['put','delete']}
-        ]
-    }
+        roles: ['gold', 'silver'],
+        allows: [
+            { resources: 'cash', permissions: ['sell', 'exchange'] },
+            { resources: ['account', 'deposit'], permissions: ['put', 'delete'] },
+        ],
+    },
 ]);
 
 acl.isAllowed('joed', 'blogs', 'view', (err, res) => {
     if (res) {
-        console.log("User joed is allowed to view blogs");
+        console.log('User joed is allowed to view blogs');
     }
 });
 
@@ -78,15 +78,14 @@ acl.whatResources('foo', 'view', (err, res) => {
     }
 });
 
-acl.isAllowed('jsmith', 'blogs', ['edit','view','delete'])
-.then((result) => {
-  console.dir('jsmith is allowed blogs ' + result);
-  acl.addUserRoles('jsmith', 'member');
-}).then(() =>
-  acl.isAllowed('jsmith', 'blogs', ['edit','view','delete'])
-).then((result) =>
-  console.dir('jsmith is allowed blogs ' + result)
-).then(() => {
-  acl.allowedPermissions('james', ['blogs','forums'], report);
-  acl.allowedPermissions('jsmith', ['blogs','forums'], report);
-});
+acl.isAllowed('jsmith', 'blogs', ['edit', 'view', 'delete'])
+    .then(result => {
+        console.dir('jsmith is allowed blogs ' + result);
+        acl.addUserRoles('jsmith', 'member');
+    })
+    .then(() => acl.isAllowed('jsmith', 'blogs', ['edit', 'view', 'delete']))
+    .then(result => console.dir('jsmith is allowed blogs ' + result))
+    .then(() => {
+        acl.allowedPermissions('james', ['blogs', 'forums'], report);
+        acl.allowedPermissions('jsmith', ['blogs', 'forums'], report);
+    });
diff --git a/types/acl/test/mongodbBackend.ts b/types/acl/test/mongodbBackend.ts
index ae3b1d03c9..449cefa030 100644
--- a/types/acl/test/mongodbBackend.ts
+++ b/types/acl/test/mongodbBackend.ts
@@ -5,10 +5,10 @@ import mongodb = require('mongodb');
 declare var db: mongodb.Db;
 
 // Using the mongo db backend
-var acl = new Acl(new Acl.mongodbBackend(db, 'acl_', true));
+const acl = new Acl(new Acl.mongodbBackend(db, 'acl_', true));
 
 // guest is allowed to view blogs
 acl.allow('guest', 'blogs', 'view');
 
 // allow function accepts arrays as any parameter
-acl.allow('member', 'blogs', ['edit','view', 'delete']);
+acl.allow('member', 'blogs', ['edit', 'view', 'delete']);
diff --git a/types/acl/test/redisBackend.ts b/types/acl/test/redisBackend.ts
index ec1924cce6..669d28ed6d 100644
--- a/types/acl/test/redisBackend.ts
+++ b/types/acl/test/redisBackend.ts
@@ -5,10 +5,10 @@ import redis = require('redis');
 declare var client: redis.RedisClient;
 
 // Using the redis backend
-var acl = new Acl(new Acl.redisBackend(client, 'acl_'));
+const acl = new Acl(new Acl.redisBackend(client, 'acl_'));
 
 // guest is allowed to view blogs
 acl.allow('guest', 'blogs', 'view');
 
 // allow function accepts arrays as any parameter
-acl.allow('member', 'blogs', ['edit','view', 'delete']);
+acl.allow('member', 'blogs', ['edit', 'view', 'delete']);
diff --git a/types/acl/tslint.json b/types/acl/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/acl/tslint.json
+++ b/types/acl/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/acorn/index.d.ts b/types/acorn/index.d.ts
index e6a9291d1c..7fb55f4472 100644
--- a/types/acorn/index.d.ts
+++ b/types/acorn/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Acorn 4.0
-// Project: https://github.com/marijnh/acorn
+// Project: https://github.com/acornjs/acorn
 // Definitions by: RReverser <https://github.com/RReverser>, e-cloud <https://github.com/e-cloud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/activestorage/index.d.ts b/types/activestorage/index.d.ts
index 2d749c84ec..e8214d2d8e 100644
--- a/types/activestorage/index.d.ts
+++ b/types/activestorage/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ActiveStorage 5.2
-// Project: https://github.com/rails/rails/tree/master/activestorage/app/javascipt
+// Project: https://github.com/rails/rails/tree/master/activestorage/app/javascript, http://rubyonrails.org
 // Definitions by: Cameron Bothner <https://github.com/cbothner>
 // Definitions: https://github.com/cbothner/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/activex-access/index.d.ts b/types/activex-access/index.d.ts
index d0bf798652..a1dae561bf 100644
--- a/types/activex-access/index.d.ts
+++ b/types/activex-access/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft Access 14.0 Object Library - Access 14.0
+// Type definitions for non-npm package Microsoft Access 14.0 Object Library - Access 14.0
 // Project: https://msdn.microsoft.com/en-us/library/dn142571.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-adodb/index.d.ts b/types/activex-adodb/index.d.ts
index 580042cfa6..7c5fabd082 100644
--- a/types/activex-adodb/index.d.ts
+++ b/types/activex-adodb/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft ActiveX Data Objects 6.0 Library - ADODB 6.1
+// Type definitions for non-npm package Microsoft ActiveX Data Objects 6.0 Library - ADODB 6.1
 // Project: https://msdn.microsoft.com/en-us/library/jj249010.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-adox/index.d.ts b/types/activex-adox/index.d.ts
index fd502684e4..87d273de52 100644
--- a/types/activex-adox/index.d.ts
+++ b/types/activex-adox/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft ADO Extensions 6.0 for DDL and Security - ADOX 6.0
+// Type definitions for non-npm package Microsoft ADO Extensions 6.0 for DDL and Security - ADOX 6.0
 // Project: https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/adox-object-model
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-dao/index.d.ts b/types/activex-dao/index.d.ts
index 0a13747514..c9cf55a367 100644
--- a/types/activex-dao/index.d.ts
+++ b/types/activex-dao/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft Office 16.0 Access Database Engine Object Library - DAO 16.0
+// Type definitions for non-npm package Microsoft Office 16.0 Access Database Engine Object Library - DAO 16.0
 // Project: https://msdn.microsoft.com/en-us/library/dn124645.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-diskquota/index.d.ts b/types/activex-diskquota/index.d.ts
index 71b534ee0c..c47fc7bb46 100644
--- a/types/activex-diskquota/index.d.ts
+++ b/types/activex-diskquota/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for DiskQuotaTypeLibrary 1.0
+// Type definitions for non-npm package DiskQuotaTypeLibrary 1.0
 // Project: https://msdn.microsoft.com/en-us/library/windows/desktop/bb773938(v=vs.85).aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-excel/index.d.ts b/types/activex-excel/index.d.ts
index 6243d25e05..84144fa8dd 100644
--- a/types/activex-excel/index.d.ts
+++ b/types/activex-excel/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft Excel 14.0 Object Library - Excel 14.0
+// Type definitions for non-npm package Microsoft Excel 14.0 Object Library - Excel 14.0
 // Project: https://msdn.microsoft.com/en-us/library/fp179694.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-faxcomexlib/index.d.ts b/types/activex-faxcomexlib/index.d.ts
index ffd2412ef3..17c9bded5f 100644
--- a/types/activex-faxcomexlib/index.d.ts
+++ b/types/activex-faxcomexlib/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft Fax Service Extended COM Type Library - FAXCOMEXLib 1.0
+// Type definitions for non-npm package Microsoft Fax Service Extended COM Type Library - FAXCOMEXLib 1.0
 // Project: https://msdn.microsoft.com/en-us/library/windows/desktop/ms684513(v=vs.85).aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-infopath/index.d.ts b/types/activex-infopath/index.d.ts
index 9cace4ec2e..fde4242456 100644
--- a/types/activex-infopath/index.d.ts
+++ b/types/activex-infopath/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft InfoPath 3.0 Type Library - InfoPath 3.0
+// Type definitions for non-npm package Microsoft InfoPath 3.0 Type Library - InfoPath 3.0
 // Project: https://msdn.microsoft.com/en-us/library/jj602751.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-interop/index.d.ts b/types/activex-interop/index.d.ts
index d59b315fcb..15cd1ce260 100644
--- a/types/activex-interop/index.d.ts
+++ b/types/activex-interop/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Javascript Automation interop 0.0
+// Type definitions for non-npm package Javascript Automation interop 0.0
 // Project: https://msdn.microsoft.com/en-us/library/ff521046(v=vs.85).aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-iwshruntimelibrary/index.d.ts b/types/activex-iwshruntimelibrary/index.d.ts
index fad992e185..7553cbf7e0 100644
--- a/types/activex-iwshruntimelibrary/index.d.ts
+++ b/types/activex-iwshruntimelibrary/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Windows Script Host Runtime Object Model 0.0
+// Type definitions for non-npm package Windows Script Host Runtime Object Model 0.0
 // Project: https://msdn.microsoft.com/en-us/library/9bbdkx3k.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-libreoffice/index.d.ts b/types/activex-libreoffice/index.d.ts
index 7d8e109861..08f1ea5bdc 100644
--- a/types/activex-libreoffice/index.d.ts
+++ b/types/activex-libreoffice/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for LibreOffice 5.3
+// Type definitions for non-npm package LibreOffice 5.3
 // Project: https://api.libreoffice.org/
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-msforms/index.d.ts b/types/activex-msforms/index.d.ts
index a9b5e8f8ac..01f2788b5b 100644
--- a/types/activex-msforms/index.d.ts
+++ b/types/activex-msforms/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft Forms 2.0 Object Library - MSForms 2.0
+// Type definitions for non-npm package Microsoft Forms 2.0 Object Library - MSForms 2.0
 // Project: https://msdn.microsoft.com/VBA/Language-Reference-VBA/articles/reference-microsoft-forms
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-mshtml/index.d.ts b/types/activex-mshtml/index.d.ts
index 93b307d3ba..e2a2192990 100644
--- a/types/activex-mshtml/index.d.ts
+++ b/types/activex-mshtml/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft HTML Object Library - MSHTML 4.0
+// Type definitions for non-npm package Microsoft HTML Object Library - MSHTML 4.0
 // Project: https://msdn.microsoft.com/en-us/library/aa741317(v=vs.85).aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-msxml2/index.d.ts b/types/activex-msxml2/index.d.ts
index 3ee2b1f050..f4c5143b25 100644
--- a/types/activex-msxml2/index.d.ts
+++ b/types/activex-msxml2/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft XML, v6.0 - MSXML2 6.0
+// Type definitions for non-npm package Microsoft XML, v6.0 - MSXML2 6.0
 // Project: https://msdn.microsoft.com/en-us/library/ms763742.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-office/index.d.ts b/types/activex-office/index.d.ts
index 6df01eb16e..37eaacec1a 100644
--- a/types/activex-office/index.d.ts
+++ b/types/activex-office/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft Office 16.0 Object Library - Office 16.0
+// Type definitions for non-npm package Microsoft Office 16.0 Object Library - Office 16.0
 // Project: https://msdn.microsoft.com/VBA/Office-Shared-VBA/articles/office-vba-object-library-reference
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-outlook/index.d.ts b/types/activex-outlook/index.d.ts
index 4789c10e19..a0910c380f 100644
--- a/types/activex-outlook/index.d.ts
+++ b/types/activex-outlook/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft Outlook 14.0 Object Library - Outlook 14.0
+// Type definitions for non-npm package Microsoft Outlook 14.0 Object Library - Outlook 14.0
 // Project: https://msdn.microsoft.com/en-us/vba/vba-outlook
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-powerpoint/index.d.ts b/types/activex-powerpoint/index.d.ts
index 34e722a8a0..de32768dda 100644
--- a/types/activex-powerpoint/index.d.ts
+++ b/types/activex-powerpoint/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft PowerPoint 14.0 Object Library - PowerPoint 14.0
+// Type definitions for non-npm package Microsoft PowerPoint 14.0 Object Library - PowerPoint 14.0
 // Project: https://msdn.microsoft.com/en-us/library/fp161225.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-scripting/index.d.ts b/types/activex-scripting/index.d.ts
index 0d2ae52343..7d3e5a4404 100644
--- a/types/activex-scripting/index.d.ts
+++ b/types/activex-scripting/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft Scripting Runtime 1.0
+// Type definitions for non-npm package Microsoft Scripting Runtime 1.0
 // Project: https://msdn.microsoft.com/en-us/library/bstcxhf7(v=vs.84).aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-shdocvw/index.d.ts b/types/activex-shdocvw/index.d.ts
index f450ea6112..bb5ce25509 100644
--- a/types/activex-shdocvw/index.d.ts
+++ b/types/activex-shdocvw/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft Internet Controls - SHDocVw 1.1
+// Type definitions for non-npm package Microsoft Internet Controls - SHDocVw 1.1
 // Project: https://msdn.microsoft.com/en-us/library/aa752040(v=vs.85).aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-shell/index.d.ts b/types/activex-shell/index.d.ts
index f12d135979..1f5946f8b8 100644
--- a/types/activex-shell/index.d.ts
+++ b/types/activex-shell/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft Shell Controls And Automation - Shell32 1.0
+// Type definitions for non-npm package Microsoft Shell Controls And Automation - Shell32 1.0
 // Project: https://msdn.microsoft.com/en-us/library/windows/desktop/bb773938(v=vs.85).aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-stdole/index.d.ts b/types/activex-stdole/index.d.ts
index 070a84a30a..403a1b012e 100644
--- a/types/activex-stdole/index.d.ts
+++ b/types/activex-stdole/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for OLE Automation - stdole 2.0
+// Type definitions for non-npm package OLE Automation - stdole 2.0
 // Project: https://msdn.microsoft.com/en-us/library/hh272953.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-vbide/index.d.ts b/types/activex-vbide/index.d.ts
index 88594969e6..8d854043df 100644
--- a/types/activex-vbide/index.d.ts
+++ b/types/activex-vbide/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft Visual Basic for Applications Extensibility 5.3 - VBIDE 14.0
+// Type definitions for non-npm package Microsoft Visual Basic for Applications Extensibility 5.3 - VBIDE 14.0
 // Project: https://msdn.microsoft.com/en-us/vba/language-reference-vba/articles/collections-visual-basic-add-in-model
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-wia/index.d.ts b/types/activex-wia/index.d.ts
index 5a06471ff8..6438d4d87f 100644
--- a/types/activex-wia/index.d.ts
+++ b/types/activex-wia/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Windows Image Acquisition 2.0
+// Type definitions for non-npm package Windows Image Acquisition 2.0
 // Project: https://msdn.microsoft.com/en-us/library/windows/desktop/ms630368(v=vs.85).aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-word/index.d.ts b/types/activex-word/index.d.ts
index f6f559ae16..5059f7feb0 100644
--- a/types/activex-word/index.d.ts
+++ b/types/activex-word/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft Word 14.0 Object Library - Word 14.0
+// Type definitions for non-npm package Microsoft Word 14.0 Object Library - Word 14.0
 // Project: https://msdn.microsoft.com/en-us/library/fp179696.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/adlib/index.d.ts b/types/adlib/index.d.ts
index 8866ab7809..5bad2bac2e 100644
--- a/types/adlib/index.d.ts
+++ b/types/adlib/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for adlib 3.0
-// Project: https://github.com/Esri/adlib
+// Project: https://github.com/Esri/adlib, https://arcgis.github.io/ember-arcgis-adlib-service
 // Definitions by: Esri <https://github.com/Esri>
 //                 Mike Tschudi <https://github.com/MikeTschudi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/adm-zip/adm-zip-tests.ts b/types/adm-zip/adm-zip-tests.ts
index 2418597087..bd17c098be 100644
--- a/types/adm-zip/adm-zip-tests.ts
+++ b/types/adm-zip/adm-zip-tests.ts
@@ -1,62 +1,69 @@
-
-import AdmZip = require("adm-zip");
+import AdmZip = require('adm-zip');
 
 // reading archives
-var zip = new AdmZip("./my_file.zip");
-var zipEntries: AdmZip.IZipEntry[] = zip.getEntries(); // an array of ZipEntry records
+const zip = new AdmZip('./my_file.zip');
+const zipEntries: AdmZip.IZipEntry[] = zip.getEntries(); // an array of ZipEntry records
 
-zipEntries.forEach(function (zipEntry) {
+zipEntries.forEach(zipEntry => {
     console.log(zipEntry.toString()); // outputs zip entries information
-    if (zipEntry.entryName == "my_file.txt") {
+    if (zipEntry.entryName === 'my_file.txt') {
         console.log(zipEntry.getData().toString('utf8'));
     }
 });
 // outputs the content of some_folder/my_file.txt
-console.log(zip.readAsText("some_folder/my_file.txt"));
+console.log(zip.readAsText('some_folder/my_file.txt'));
 // extracts the specified file to the specified location
-zip.extractEntryTo(/*entry name*/"some_folder/my_file.txt", /*target path*/"/home/me/tempfolder", /*overwrite*/true)
+zip.extractEntryTo(
+    /*entry name*/ 'some_folder/my_file.txt',
+    /*target path*/ '/home/me/tempfolder',
+    /*overwrite*/ true
+);
 // extracts everything
-zip.extractAllTo(/*target path*/"/home/me/zipcontent/", /*overwrite*/true);
+zip.extractAllTo(/*target path*/ '/home/me/zipcontent/', /*overwrite*/ true);
 // extracts everything and calls callback -> async extracction
-zip.extractAllToAsync(/*target path*/"/home/me/zipcontent/", /*overwrite*/true, (error: Error)=> {});
+zip.extractAllToAsync(
+    /*target path*/ '/home/me/zipcontent/',
+    /*overwrite*/ true,
+    (error: Error) => {}
+);
 
 // creating archives
-var zip = new AdmZip();
+new AdmZip();
 
 // add file directly
-zip.addFile("test.txt", new Buffer("inner content of the file"), "entry comment goes here");
+zip.addFile('test.txt', new Buffer('inner content of the file'), 'entry comment goes here');
 // add local file
-zip.addLocalFile("/home/me/some_picture.png");
+zip.addLocalFile('/home/me/some_picture.png');
 // get everything as a buffer
-var willSendthis = zip.toBuffer();
+const willSendthis = zip.toBuffer();
 // or write everything to disk
-zip.writeZip(/*target file name*/"/home/me/files.zip");
+zip.writeZip(/*target file name*/ '/home/me/files.zip');
 
 function processZipEntry(zipEntry: AdmZip.IZipEntry) {
     console.log('comment', zipEntry.comment);
 }
 
-//tests taken from examples at https://github.com/cthackers/adm-zip/wiki/ADM-ZIP
-import Zip = require("adm-zip");
+// tests taken from examples at https://github.com/cthackers/adm-zip/wiki/ADM-ZIP
+import Zip = require('adm-zip');
 // loads and parses existing zip file local_file.zip
-var zip = new Zip("local_file.zip"); 
+new Zip('local_file.zip');
 // creates new in memory zip
-zip = new Zip();
+new Zip();
 // loads and parses existing zip file local_file.zip
-zip = new Zip("local_file.zip"); 
+new Zip('local_file.zip');
 // get all entries and iterate them
-zip.getEntries().forEach((entry) => {
-    var entryName = entry.entryName;
-    var decompressedData = zip.readFile(entry); // decompressed buffer of the entry
-    console.log(zip.readAsText(entry)); // outputs the decompressed content of the entry  
+zip.getEntries().forEach(entry => {
+    const entryName = entry.entryName;
+    const decompressedData = zip.readFile(entry); // decompressed buffer of the entry
+    console.log(zip.readAsText(entry)); // outputs the decompressed content of the entry
 });
 
 // will extract the file myfile.txt from the archive to /home/user/folder/subfolder/myfile.txt
-zip.extractEntryTo("folder/subfolder/myfile.txt", "/home/user/", true, true);
+zip.extractEntryTo('folder/subfolder/myfile.txt', '/home/user/', true, true);
 
 // will extract the file myfile.txt from the archive to /home/user/myfile.txt
-zip.extractEntryTo("folder/subfolder/myfile.txt", "/home/user/", false, true);
+zip.extractEntryTo('folder/subfolder/myfile.txt', '/home/user/', false, true);
 
 function isAdmZipEntry(obj: any): obj is AdmZip.IZipEntry {
-  return obj !== null && typeof obj === "object" && typeof obj['entryName'] === 'string';
+    return obj !== null && typeof obj === 'object' && typeof obj['entryName'] === 'string';
 }
diff --git a/types/adm-zip/index.d.ts b/types/adm-zip/index.d.ts
index 39725932fc..52fd86a9e0 100644
--- a/types/adm-zip/index.d.ts
+++ b/types/adm-zip/index.d.ts
@@ -1,90 +1,56 @@
-// Type definitions for adm-zip v0.4.4
+// Type definitions for adm-zip 0.4
 // Project: https://github.com/cthackers/adm-zip
-// Definitions by: John Vilk <https://github.com/jvilk>, Abner Oliveira <https://github.com/abner>
+// Definitions by: John Vilk <https://github.com/jvilk>
+//                 Abner Oliveira <https://github.com/abner>
+//                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
-
 declare class AdmZip {
     /**
-     * Create a new, empty archive.
+     * @param fileNameOrRawData If provided, reads an existing archive. Otherwise creates a new, empty archive.
      */
-    constructor();
+    constructor(fileNameOrRawData?: string | Buffer);
     /**
-     * Read an existing archive.
+     * Extracts the given entry from the archive and returns the content.
+     * @param entry The full path of the entry or a `IZipEntry` object.
+     * @return `Buffer` or `null` in case of error.
      */
-    constructor(fileName: string);
-    constructor(rawData: Buffer);
+    readFile(entry: string | AdmZip.IZipEntry): Buffer | null;
     /**
-     * Extracts the given entry from the archive and returns the content as a
-     * Buffer object.
-     * @param entry String with the full path of the entry
-     * @return Buffer or Null in case of error
+     * Asynchronous `readFile`.
+     * @param entry The full path of the entry or a `IZipEntry` object.
+     * @param callback Called with a `Buffer` or `null` in case of error.
      */
-    readFile(entry: string): Buffer;
-    /**
-     * Extracts the given entry from the archive and returns the content as a
-     * Buffer object.
-     * @param entry ZipEntry object
-     * @return Buffer or Null in case of error
-     */
-    readFile(entry: AdmZip.IZipEntry): Buffer;
-    /**
-     * Asynchronous readFile
-     * @param entry String with the full path of the entry
-     * @param callback Called with a Buffer or Null in case of error
-     */
-    readFileAsync(entry: string, callback: (data: Buffer, err: string) => any): void;
-    /**
-     * Asynchronous readFile
-     * @param entry ZipEntry object
-     * @param callback Called with a Buffer or Null in case of error
-     * @return Buffer or Null in case of error
-     */
-    readFileAsync(entry: AdmZip.IZipEntry, callback: (data: Buffer, err: string) => any): void;
+    readFileAsync(
+        entry: string | AdmZip.IZipEntry,
+        callback: (data: Buffer | null, err: string) => any
+    ): void;
     /**
      * Extracts the given entry from the archive and returns the content as
-     * plain text in the given encoding
-     * @param entry String with the full path of the entry
-     * @param encoding Optional. If no encoding is specified utf8 is used
-     * @return String
+     * plain text in the given encoding.
+     * @param entry The full path of the entry or a `IZipEntry` object.
+     * @param encoding If no encoding is specified `"utf8"` is used.
      */
-    readAsText(fileName: string, encoding?: string): string;
+    readAsText(fileName: string | AdmZip.IZipEntry, encoding?: string): string;
     /**
-     * Extracts the given entry from the archive and returns the content as
-     * plain text in the given encoding
-     * @param entry ZipEntry object
-     * @param encoding Optional. If no encoding is specified utf8 is used
-     * @return String
-     */
-    readAsText(fileName: AdmZip.IZipEntry, encoding?: string): string;
-    /**
-     * Asynchronous readAsText
-     * @param entry String with the full path of the entry
+     * Asynchronous `readAsText`.
+     * @param entry The full path of the entry or a `IZipEntry` object.
      * @param callback Called with the resulting string.
-     * @param encoding Optional. If no encoding is specified utf8 is used
+     * @param encoding If no encoding is specified `"utf8"` is used.
      */
-    readAsTextAsync(fileName: string, callback: (data: string) => any, encoding?: string): void;
-    /**
-     * Asynchronous readAsText
-     * @param entry ZipEntry object
-     * @param callback Called with the resulting string.
-     * @param encoding Optional. If no encoding is specified utf8 is used
-     */
-    readAsTextAsync(fileName: AdmZip.IZipEntry, callback: (data: string) => any, encoding?: string): void;
+    readAsTextAsync(
+        fileName: string | AdmZip.IZipEntry,
+        callback: (data: string) => any,
+        encoding?: string
+    ): void;
     /**
      * Remove the entry from the file or the entry and all its nested directories
-     * and files if the given entry is a directory
-     * @param entry String with the full path of the entry
+     * and files if the given entry is a directory.
+     * @param entry The full path of the entry or a `IZipEntry` object.
      */
-    deleteFile(entry: string): void;
-    /**
-     * Remove the entry from the file or the entry and all its nested directories
-     * and files if the given entry is a directory
-     * @param entry A ZipEntry object.
-     */
-    deleteFile(entry: AdmZip.IZipEntry): void;
+    deleteFile(entry: string | AdmZip.IZipEntry): void;
     /**
      * Adds a comment to the zip. The zip must be rewritten after
      * adding the comment.
@@ -92,72 +58,55 @@ declare class AdmZip {
      */
     addZipComment(comment: string): void;
     /**
-     * Returns the zip comment
      * @return The zip comment.
      */
     getZipComment(): string;
     /**
-     * Adds a comment to a specified zipEntry. The zip must be rewritten after
+     * Adds a comment to a specified file or `IZipEntry`. The zip must be rewritten after
      * adding the comment.
      * The comment cannot exceed 65535 characters in length.
-     * @param entry String with the full path of the entry
+     * @param entry The full path of the entry or a `IZipEntry` object.
      * @param comment The comment to add to the entry.
      */
-    addZipEntryComment(entry: string, comment: string): void;
-    /**
-     * Adds a comment to a specified zipEntry. The zip must be rewritten after
-     * adding the comment.
-     * The comment cannot exceed 65535 characters in length.
-     * @param entry ZipEntry object.
-     * @param comment The comment to add to the entry.
-     */
-    addZipEntryComment(entry: AdmZip.IZipEntry, comment: string): void;
+    addZipEntryComment(entry: string | AdmZip.IZipEntry, comment: string): void;
     /**
      * Returns the comment of the specified entry.
-     * @param entry String with the full path of the entry.
-     * @return String The comment of the specified entry.
+     * @param entry The full path of the entry or a `IZipEntry` object.
+     * @return The comment of the specified entry.
      */
-    getZipEntryComment(entry: string): string;
-    /**
-     * Returns the comment of the specified entry
-     * @param entry ZipEntry object.
-     * @return String The comment of the specified entry.
-     */
-    getZipEntryComment(entry: AdmZip.IZipEntry): string;
+    getZipEntryComment(entry: string | AdmZip.IZipEntry): string;
     /**
      * Updates the content of an existing entry inside the archive. The zip
-     * must be rewritten after updating the content
-     * @param entry String with the full path of the entry.
+     * must be rewritten after updating the content.
+     * @param entry The full path of the entry or a `IZipEntry` object.
      * @param content The entry's new contents.
      */
-    updateFile(entry: string, content: Buffer): void;
-    /**
-     * Updates the content of an existing entry inside the archive. The zip
-     * must be rewritten after updating the content
-     * @param entry ZipEntry object.
-     * @param content The entry's new contents.
-     */
-    updateFile(entry: AdmZip.IZipEntry, content: Buffer): void;
+    updateFile(entry: string | AdmZip.IZipEntry, content: Buffer): void;
     /**
      * Adds a file from the disk to the archive.
      * @param localPath Path to a file on disk.
      * @param zipPath Path to a directory in the archive. Defaults to the empty
      *   string.
+     * @param zipName Name for the file.
      */
-    addLocalFile(localPath: string, zipPath?: string): void;
+    addLocalFile(localPath: string, zipPath?: string, zipName?: string): void;
     /**
      * Adds a local directory and all its nested files and directories to the
      * archive.
      * @param localPath Path to a folder on disk.
-     * @param zipPath Path to a folder in the archive. Defaults to an empty
-     *   string.
+     * @param zipPath Path to a folder in the archive. Default: `""`.
+     * @param filter RegExp or Function if files match will be included.
      */
-    addLocalFolder(localPath: string, zipPath?: string): void;
+    addLocalFolder(
+        localPath: string,
+        zipPath?: string,
+        filter?: RegExp | ((filename: string) => boolean)
+    ): void;
     /**
      * Allows you to create a entry (file or directory) in the zip file.
-     * If you want to create a directory the entryName must end in / and a null
+     * If you want to create a directory the `entryName` must end in `"/"` and a `null`
      * buffer should be provided.
-     * @param entryName Entry path
+     * @param entryName Entry path.
      * @param content Content to add to the entry; must be a 0-length buffer
      *   for a directory.
      * @param comment Comment to add to the entry.
@@ -165,89 +114,81 @@ declare class AdmZip {
      */
     addFile(entryName: string, data: Buffer, comment?: string, attr?: number): void;
     /**
-     * Returns an array of ZipEntry objects representing the files and folders
-     * inside the archive
+     * Returns an array of `IZipEntry` objects representing the files and folders
+     * inside the archive.
      */
     getEntries(): AdmZip.IZipEntry[];
     /**
-     * Returns a ZipEntry object representing the file or folder specified by
-     * ``name``.
+     * Returns a `IZipEntry` object representing the file or folder specified by `name`.
      * @param name Name of the file or folder to retrieve.
-     * @return ZipEntry The entry corresponding to the name.
+     * @return The entry corresponding to the `name`.
      */
     getEntry(name: string): AdmZip.IZipEntry;
     /**
-     * Extracts the given entry to the given targetPath.
+     * Extracts the given entry to the given `targetPath`.
      * If the entry is a directory inside the archive, the entire directory and
      * its subdirectories will be extracted.
-     * @param entry String with the full path of the entry
-     * @param targetPath Target folder where to write the file
-     * @param maintainEntryPath If maintainEntryPath is true and the entry is
-     *   inside a folder, the entry folder will be created in targetPath as
-     *   well. Default is TRUE
+     * @param entry The full path of the entry or a `IZipEntry` object.
+     * @param targetPath Target folder where to write the file.
+     * @param maintainEntryPath If maintainEntryPath is `true` and the entry is
+     *   inside a folder, the entry folder will be created in `targetPath` as
+     *   well. Default: `true`.
      * @param overwrite If the file already exists at the target path, the file
-     *   will be overwriten if this is true. Default is FALSE
-     *
-     * @return Boolean
+     *   will be overwriten if this is `true`. Default: `false`.
      */
-    extractEntryTo(entryPath: string, targetPath: string, maintainEntryPath?: boolean, overwrite?: boolean): boolean;
+    extractEntryTo(
+        entryPath: string | AdmZip.IZipEntry,
+        targetPath: string,
+        maintainEntryPath?: boolean,
+        overwrite?: boolean
+    ): boolean;
     /**
-     * Extracts the given entry to the given targetPath.
-     * If the entry is a directory inside the archive, the entire directory and
-     * its subdirectories will be extracted.
-     * @param entry ZipEntry object
-     * @param targetPath Target folder where to write the file
-     * @param maintainEntryPath If maintainEntryPath is true and the entry is
-     *   inside a folder, the entry folder will be created in targetPath as
-     *   well. Default is TRUE
+     * Extracts the entire archive to the given location.
+     * @param targetPath Target location.
      * @param overwrite If the file already exists at the target path, the file
-     *   will be overwriten if this is true. Default is FALSE
-     * @return Boolean
-     */
-    extractEntryTo(entryPath: AdmZip.IZipEntry, targetPath: string, maintainEntryPath?: boolean, overwrite?: boolean): boolean;
-    /**
-     * Extracts the entire archive to the given location
-     * @param targetPath Target location
-     * @param overwrite If the file already exists at the target path, the file
-     *   will be overwriten if this is true. Default is FALSE
+     *   will be overwriten if this is `true`. Default: `false`.
      */
     extractAllTo(targetPath: string, overwrite?: boolean): void;
     /**
-     * Extracts the entire archive to the given location
-     * @param targetPath Target location
+     * Extracts the entire archive to the given location.
+     * @param targetPath Target location.
      * @param overwrite If the file already exists at the target path, the file
-     *   will be overwriten if this is true. Default is FALSE
-     * @param callback The callback function will be called afeter extraction
+     *   will be overwriten if this is `true`. Default: `false`.
+     * @param callback The callback function will be called after extraction.
      */
-    extractAllToAsync(targetPath: string, overwrite: boolean, callback: (error: Error) => void): void;
+    extractAllToAsync(
+        targetPath: string,
+        overwrite?: boolean,
+        callback?: (error: Error) => void
+    ): void;
     /**
      * Writes the newly created zip file to disk at the specified location or
-     * if a zip was opened and no ``targetFileName`` is provided, it will
-     * overwrite the opened zip
-     * @param targetFileName
+     * if a zip was opened and no `targetFileName` is provided, it will
+     * overwrite the opened zip.
      */
-    writeZip(targetPath?: string): void;
+    writeZip(targetFileName?: string, callback?: (error: Error | null) => void): void;
     /**
-     * Returns the content of the entire zip file as a Buffer object
-     * @return Buffer
+     * Returns the content of the entire zip file.
      */
     toBuffer(): Buffer;
 }
 
 declare namespace AdmZip {
     /**
-     * The ZipEntry is more than a structure representing the entry inside the
+     * The `IZipEntry` is more than a structure representing the entry inside the
      * zip file. Beside the normal attributes and headers a entry can have, the
      * class contains a reference to the part of the file where the compressed
      * data resides and decompresses it when requested. It also compresses the
      * data and creates the headers required to write in the zip file.
      */
+    // disable warning about the I-prefix in interface name to prevent breaking stuff for users without a major bump
+    // tslint:disable-next-line:interface-name
     interface IZipEntry {
         /**
          * Represents the full name and path of the file
          */
         entryName: string;
-        rawEntryName: Buffer;
+        readonly rawEntryName: Buffer;
         /**
          * Extra data associated with this entry.
          */
@@ -256,15 +197,16 @@ declare namespace AdmZip {
          * Entry comment.
          */
         comment: string;
-        name: string;
+        readonly name: string;
         /**
          * Read-Only property that indicates the type of the entry.
          */
-        isDirectory: boolean;
+        readonly isDirectory: boolean;
         /**
          * Get the header associated with this ZipEntry.
          */
         header: Buffer;
+        attr: number;
         /**
          * Retrieve the compressed data for this entry. Note that this may trigger
          * compression if any properties were modified.
@@ -278,11 +220,7 @@ declare namespace AdmZip {
         /**
          * Set the (uncompressed) data to be associated with this entry.
          */
-        setData(value: string): void;
-        /**
-         * Set the (uncompressed) data to be associated with this entry.
-         */
-        setData(value: Buffer): void;
+        setData(value: string | Buffer): void;
         /**
          * Get the decompressed data associated with this entry.
          */
diff --git a/types/adm-zip/tsconfig.json b/types/adm-zip/tsconfig.json
index 8e998c6f38..7bcb8d3644 100644
--- a/types/adm-zip/tsconfig.json
+++ b/types/adm-zip/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",
         "adm-zip-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/adm-zip/tslint.json b/types/adm-zip/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/adm-zip/tslint.json
+++ b/types/adm-zip/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/ajv-merge-patch/ajv-merge-patch-tests.ts b/types/ajv-merge-patch/ajv-merge-patch-tests.ts
new file mode 100644
index 0000000000..bc09e41aa0
--- /dev/null
+++ b/types/ajv-merge-patch/ajv-merge-patch-tests.ts
@@ -0,0 +1,7 @@
+import * as Ajv from "ajv";
+
+import ajvMergePatch = require("ajv-merge-patch");
+
+const ajv = new Ajv();
+
+ajvMergePatch(ajv); // $ExpectType void
diff --git a/types/ajv-merge-patch/index.d.ts b/types/ajv-merge-patch/index.d.ts
new file mode 100644
index 0000000000..9371031667
--- /dev/null
+++ b/types/ajv-merge-patch/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for ajv-merge-patch 4.1
+// Project: https://github.com/epoberezkin/ajv-merge-patch#readme
+// Definitions by: Zhu Zijia <https://github.com/littlepiggy03>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { Ajv } from "ajv";
+
+declare function ajvMergePatch(ajv: Ajv): void;
+
+export = ajvMergePatch;
diff --git a/types/ajv-merge-patch/package.json b/types/ajv-merge-patch/package.json
new file mode 100644
index 0000000000..8babfde009
--- /dev/null
+++ b/types/ajv-merge-patch/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "ajv": ">=4.1.0"
+    }
+}
diff --git a/types/ajv-merge-patch/tsconfig.json b/types/ajv-merge-patch/tsconfig.json
new file mode 100644
index 0000000000..2bce6577de
--- /dev/null
+++ b/types/ajv-merge-patch/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ajv-merge-patch-tests.ts"
+    ]
+}
diff --git a/types/fastify-cors/tslint.json b/types/ajv-merge-patch/tslint.json
similarity index 100%
rename from types/fastify-cors/tslint.json
rename to types/ajv-merge-patch/tslint.json
diff --git a/types/alexa-sdk/index.d.ts b/types/alexa-sdk/index.d.ts
index 56278df11c..dd2aa5ce99 100644
--- a/types/alexa-sdk/index.d.ts
+++ b/types/alexa-sdk/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Alexa SDK for Node.js 1.1
-// Project: https://github.com/alexa/alexa-skills-kit-sdk-for-nodejs
+// Project: https://github.com/alexa/alexa-skill-sdk-for-nodejs
 // Definitions by:  Pete Beegle <https://github.com/petebeegle>
 //                  Huw <https://github.com/hoo29>
 //                  pascalwhoop <https://github.com/pascalwhoop>
diff --git a/types/alexa-voice-service/index.d.ts b/types/alexa-voice-service/index.d.ts
index eb639729fd..dd75ab3fa1 100644
--- a/types/alexa-voice-service/index.d.ts
+++ b/types/alexa-voice-service/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for alexa-voice-service 0.0
-// Project: https://github.com/miguelmota/alexa-voice-service.js
+// Project: https://github.com/miguelmota/alexa-voice-service
 // Definitions by: Dolan Miu <https://github.com/dolanmiu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/algoliasearch-helper/algoliasearch-helper-tests.ts b/types/algoliasearch-helper/algoliasearch-helper-tests.ts
new file mode 100644
index 0000000000..9f056d3610
--- /dev/null
+++ b/types/algoliasearch-helper/algoliasearch-helper-tests.ts
@@ -0,0 +1,325 @@
+import * as algoliasearch from 'algoliasearch';
+import * as algoliasearchHelper from 'algoliasearch-helper';
+// tslint:disable-next-line:no-duplicate-imports
+import { SearchResults, SearchParameters } from 'algoliasearch-helper';
+
+// https://community.algolia.com/algoliasearch-helper-js/reference.html#module:algoliasearchHelper
+
+const client = algoliasearch('latency', '6be0576ff61c053d5f9a3225e2a90f76');
+const helper = algoliasearchHelper(client, 'bestbuy', {
+  facets: ['shipping'],
+  disjunctiveFacets: ['category']
+});
+helper.on('result', (result) => {
+  console.log(result);
+});
+helper.toggleRefine('Movies & TV Shows')
+      .toggleRefine('Free shipping')
+      .search();
+
+const updateTheResult = (results: SearchResults, state: SearchParameters) => {
+  console.log(results, state);
+};
+helper.on('result', updateTheResult);
+helper.once('result', updateTheResult);
+helper.removeListener('result', updateTheResult);
+helper.removeAllListeners('result');
+
+() => {
+  // Changing the number of records returned per page to 1
+  // This example uses the callback API
+  const state = helper.searchOnce({hitsPerPage: 1},
+    (error, content: SearchResults, state: SearchParameters) => {});
+
+  // Changing the number of records returned per page to 1
+  // This example uses the promise API
+  const state1 = helper.searchOnce({hitsPerPage: 1})
+                  .then(promiseHandler);
+
+  function promiseHandler(res: {content: SearchResults, state: SearchParameters}) {
+    // res contains
+    // {
+    //   content : SearchResults
+    //   state   : SearchParameters (the one used for this specific search)
+    // }
+  }
+};
+
+helper.setIndex('highestPrice_products').getIndex();
+helper.setPage(0).nextPage().getPage();
+helper.setPage(1).previousPage().getPage();
+helper.setQueryParameter('hitsPerPage', 20).search();
+const hitsPerPage = helper.getQueryParameter('hitsPerPage');
+helper.addFacetRefinement('film-genre', 'comedy');
+helper.addFacetRefinement('film-genre', 'science-fiction');
+
+() => {
+  const indexName = 'test';
+  const helper2 = algoliasearchHelper(client, indexName, {
+    facets: ['nameOfTheAttribute']
+  });
+};
+
+// Removing all the refinements
+helper.clearRefinements().search();
+
+// Removing all the filters on a the category attribute.
+helper.clearRefinements('category').search();
+
+// Removing only the exclude filters on the category facet.
+helper.clearRefinements((value, attribute, type) => {
+  return type === 'exclude' && attribute === 'category';
+}).search();
+
+// https://community.algolia.com/algoliasearch-helper-js/reference.html#AlgoliaSearchHelper#hasRefinements
+
+helper.hasRefinements('price'); // false
+helper.addNumericRefinement('price', '>', 100);
+helper.hasRefinements('price'); // true
+
+helper.hasRefinements('color'); // false
+helper.addFacetRefinement('color', 'blue');
+helper.hasRefinements('color'); // true
+
+helper.hasRefinements('material'); // false
+helper.addDisjunctiveFacetRefinement('material', 'plastic');
+helper.hasRefinements('material'); // true
+
+helper.hasRefinements('categories'); // false
+helper.toggleFacetRefinement('categories', 'kitchen > knife');
+helper.hasRefinements('categories'); // true
+
+// https://community.algolia.com/algoliasearch-helper-js/reference.html#AlgoliaSearchHelper#getRefinements
+
+helper.addNumericRefinement('price', '>', 100);
+helper.getRefinements('price');
+
+helper.addFacetRefinement('color', 'blue');
+helper.addFacetExclusion('color', 'red');
+helper.getRefinements('color');
+
+helper.addDisjunctiveFacetRefinement('material', 'plastic');
+
+helper.addDisjunctiveFacetRefinement('tech', 'crt');
+helper.addDisjunctiveFacetRefinement('tech', 'led');
+helper.addDisjunctiveFacetRefinement('tech', 'plasma');
+
+() => {
+  const helper2 = algoliasearchHelper(client, 'test', {
+      disjunctiveFacets: ['nameOfTheAttribute']
+    });
+};
+
+// https://community.algolia.com/algoliasearch-helper-js/reference.html#AlgoliaSearchHelper#hasRefinements
+
+// hasRefinements works with numeric, conjunctive, disjunctive and hierarchical filters
+helper.hasRefinements('price'); // false
+helper.addNumericRefinement('price', '>', 100);
+helper.hasRefinements('price'); // true
+
+helper.hasRefinements('color'); // false
+helper.addFacetRefinement('color', 'blue');
+helper.hasRefinements('color'); // true
+
+helper.hasRefinements('material'); // false
+helper.addDisjunctiveFacetRefinement('material', 'plastic');
+helper.hasRefinements('material'); // true
+
+helper.hasRefinements('categories'); // false
+helper.toggleFacetRefinement('categories', 'kitchen > knife');
+helper.hasRefinements('categories'); // true
+
+// https://community.algolia.com/algoliasearch-helper-js/reference.html#SearchResults#getFacetValues
+helper.on('result', (content) => {
+  // get values ordered only by name ascending using the string predicate
+  content.getFacetValues('city', {sortBy: ['name:asc']});
+  // get values  ordered only by count ascending using a function
+  content.getFacetValues('city', {
+    // this is equivalent to ['count:asc']
+    sortBy(a: { count: number }, b: { count: number }) {
+      if (a.count === b.count) return 0;
+      if (a.count > b.count)   return 1;
+      if (b.count > a.count)   return -1;
+    }
+  });
+});
+
+// https://community.algolia.com/algoliasearch-helper-js/reference.html#SearchParameters#addTagRefinement
+
+const searchparameter = new SearchParameters();
+
+// for price = 50 or 40
+searchparameter.addNumericRefinement('price', '=', [50, 40]);
+
+// for size = 38 and 40
+searchparameter.addNumericRefinement('size', '=', 38);
+searchparameter.addNumericRefinement('size', '=', 40);
+
+let queryParameters = new SearchParameters({}); // everything is optional
+queryParameters = new SearchParameters({
+    advancedSyntax: true,
+    allowTyposOnNumericTokens: true,
+    analytics: true,
+    analyticsTags: ['test'],
+    aroundLatLng: 'latitude',
+    aroundLatLngViaIP: true,
+    aroundPrecision: 1,
+    aroundRadius: 1,
+    attributesToHighlight: ['test'],
+    attributesToRetrieve: ['test'],
+    attributesToSnippet: ['test'],
+    disableExactOnAttributes: ['test'],
+    disjunctiveFacets: ['test'],
+    disjunctiveFacetsRefinements: { test: ['test'] },
+    distinct: 2,
+    enableExactOnSingleWordQuery: true,
+    facets: ['test'],
+    facetsExcludes: { test: ['test'] },
+    facetsRefinements: { test: ['test'] },
+    getRankingInfo: true,
+    hierarchicalFacets: ['test'],
+    hierarchicalFacetsRefinements: { test: ['test'] },
+    highlightPostTag: 'test',
+    highlightPreTag: 'test',
+    hitsPerPage: 1,
+    ignorePlurals: true,
+    index: 'test',
+    insideBoundingBox: [[1, 2, 3, 4]],
+    insidePolygon: [[1, 2, 3, 4]],
+    length: 2,
+    maxValuesPerFacet: 1,
+    minimumAroundRadius: 1,
+    minProximity: 1,
+    minWordSizefor1Typo: 1,
+    minWordSizefor2Typos: 1,
+    numericFilters: ['test'],
+    numericRefinements: { test: { '=': [1], '>': [[2, 3]] } },
+    offset: 1,
+    optionalFacetFilters: 'test',
+    optionalTagFilters: 'test',
+    optionalWords: ['test'],
+    page: 1,
+    query: 'test',
+    queryType: 'prefixAll',
+    removeWordsIfNoResults: 'none',
+    replaceSynonymsInHighlight: true,
+    restrictSearchableAttributes: ['test'],
+    snippetEllipsisText: '...',
+    synonyms: true,
+    tagFilters: ['test'],
+    tagRefinements: ['test'],
+    typoTolerance: true,
+});
+
+queryParameters.advancedSyntax;
+queryParameters.allowTyposOnNumericTokens;
+queryParameters.analytics;
+queryParameters.analyticsTags;
+queryParameters.aroundLatLng;
+queryParameters.aroundLatLngViaIP;
+queryParameters.aroundPrecision;
+queryParameters.aroundRadius;
+queryParameters.attributesToHighlight;
+queryParameters.attributesToRetrieve;
+queryParameters.attributesToSnippet;
+queryParameters.disableExactOnAttributes;
+queryParameters.disjunctiveFacets;
+queryParameters.disjunctiveFacetsRefinements;
+queryParameters.distinct;
+queryParameters.enableExactOnSingleWordQuery;
+queryParameters.facets;
+queryParameters.facetsExcludes;
+queryParameters.facetsRefinements;
+queryParameters.getRankingInfo;
+queryParameters.hierarchicalFacets;
+queryParameters.hierarchicalFacetsRefinements;
+queryParameters.highlightPostTag;
+queryParameters.highlightPreTag;
+queryParameters.hitsPerPage;
+queryParameters.ignorePlurals;
+queryParameters.index;
+queryParameters.insideBoundingBox;
+queryParameters.insidePolygon;
+queryParameters.length;
+queryParameters.maxValuesPerFacet;
+queryParameters.minimumAroundRadius;
+queryParameters.minProximity;
+queryParameters.minWordSizefor1Typo;
+queryParameters.minWordSizefor2Typos;
+queryParameters.numericFilters;
+queryParameters.numericRefinements;
+queryParameters.offset;
+queryParameters.optionalFacetFilters;
+queryParameters.optionalTagFilters;
+queryParameters.optionalWords;
+queryParameters.page;
+queryParameters.query;
+queryParameters.queryType;
+queryParameters.removeWordsIfNoResults;
+queryParameters.replaceSynonymsInHighlight;
+queryParameters.restrictSearchableAttributes;
+queryParameters.snippetEllipsisText;
+queryParameters.synonyms;
+queryParameters.tagFilters;
+queryParameters.tagRefinements;
+queryParameters.typoTolerance;
+
+queryParameters.addDisjunctiveFacet('test');
+queryParameters.addDisjunctiveFacetRefinement('test', 'test');
+queryParameters.addExcludeRefinement('test', 'test');
+queryParameters.addFacet('test');
+queryParameters.addFacetRefinement('test', 'test');
+queryParameters.addHierarchicalFacet({});
+queryParameters.addHierarchicalFacetRefinement('test', 'test');
+queryParameters.addNumericRefinement('test', '>', [7]);
+queryParameters.addTagRefinement('test');
+queryParameters.clearRefinements('test');
+queryParameters.clearTags();
+queryParameters.filter(['test']);
+queryParameters.getConjunctiveRefinements('test');
+queryParameters.getDisjunctiveRefinements('test');
+queryParameters.getExcludeRefinements('test');
+queryParameters.getHierarchicalFacetBreadcrumb('test');
+queryParameters.getHierarchicalFacetByName('test');
+queryParameters.getHierarchicalRefinement('test');
+queryParameters.getNumericRefinement('test', '=');
+queryParameters.getNumericRefinements('test');
+queryParameters.getQueryParameter('test');
+queryParameters.getRefinedDisjunctiveFacets('test', {});
+queryParameters.getRefinedHierarchicalFacets('test', {});
+queryParameters.getUnrefinedDisjunctiveFacets();
+queryParameters.isConjunctiveFacet('test');
+queryParameters.isDisjunctiveFacet('test');
+queryParameters.isDisjunctiveFacetRefined('test', 'test');
+queryParameters.isExcludeRefined('test', 'test');
+queryParameters.isFacetRefined('test', 'test');
+queryParameters.isHierarchicalFacet('test');
+queryParameters.isHierarchicalFacetRefined('test', 'test');
+queryParameters.isNumericRefined('test', '>', 'test');
+queryParameters.isTagRefined('test');
+queryParameters.removeDisjunctiveFacet('test');
+queryParameters.removeDisjunctiveFacetRefinement('test', 'test');
+queryParameters.removeExcludeRefinement('test', 'test');
+queryParameters.removeFacet('test');
+queryParameters.removeFacetRefinement('test', 'test');
+queryParameters.removeHierarchicalFacet('test');
+queryParameters.removeHierarchicalFacetRefinement('test');
+queryParameters.removeTagRefinement('test');
+queryParameters.setDisjunctiveFacets(['test']);
+queryParameters.setFacets(['test']);
+queryParameters.setHitsPerPage(1);
+queryParameters.setPage(1);
+queryParameters.setQuery('test');
+queryParameters.setQueryParameter('test', {});
+queryParameters.setQueryParameters({ test: {} });
+queryParameters.setTypoTolerance('test');
+queryParameters.toggleConjunctiveFacetRefinement('test', {});
+queryParameters.toggleDisjunctiveFacetRefinement('test', {});
+queryParameters.toggleExcludeFacetRefinement('test', {});
+queryParameters.toggleFacetRefinement('test', {});
+queryParameters.toggleHierarchicalFacetRefinement('test', {});
+queryParameters.toggleTagRefinement('test');
+
+// static methods
+SearchParameters.make(queryParameters);
+SearchParameters.validate(queryParameters, { queryType: 'prefixAll' });
diff --git a/types/algoliasearch-helper/index.d.ts b/types/algoliasearch-helper/index.d.ts
new file mode 100644
index 0000000000..eb92a2118f
--- /dev/null
+++ b/types/algoliasearch-helper/index.d.ts
@@ -0,0 +1,747 @@
+// Type definitions for algoliasearch-helper 2.26
+// Project: https://community.algolia.com/algoliasearch-helper-js/
+// Definitions by: Gordon Burgett <https://github.com/gburgett>
+//                 Haroen Viaene <https://github.com/haroenv>
+//                 Samuel Vaillant <https://github.com/samouss>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { Client } from 'algoliasearch';
+import { EventEmitter } from 'events';
+import algoliasearch = require('algoliasearch');
+
+/**
+ * The algoliasearchHelper module is the function that will let its
+ * contains everything needed to use the Algoliasearch
+ * Helper. It is a also a function that instanciate the helper.
+ * To use the helper, you also need the Algolia JS client v3.
+ * @param client an AlgoliaSearch client
+ * @param index the name of the index to query
+ * @param opts
+ */
+declare function algoliasearchHelper(client: Client, index: string, opts: algoliasearchHelper.QueryParameters): algoliasearchHelper.AlgoliaSearchHelper;
+
+declare namespace algoliasearchHelper {
+  export const version: string;
+
+  export class AlgoliaSearchHelper extends EventEmitter {
+    state: SearchParameters;
+    lastResults: SearchResults;
+    derivedHelpers: AlgoliaSearchHelper[];
+
+    on(event: 'change' | 'search', cb: (state: SearchParameters, lastResults: SearchResults | null) => any): this;
+    on(event: 'searchForFacetValues', cb: (state: SearchParameters, facet: string, query: string) => any): this;
+    on(event: 'searchOnce', cb: (state: SearchParameters) => any): this;
+    on(event: 'result', cb: (results: SearchResults, state: SearchParameters) => any): this;
+    on(event: 'error', cb: (error: any) => any): this;
+    on(event: 'searchQueueEmpty', cb: () => any): this;
+
+    /**
+     * Start the search with the parameters set in the state. When the
+     * method is called, it triggers a `search` event. The results will
+     * be available through the `result` event. If an error occurs, an
+     * `error` will be fired instead.
+     * @return
+     * @fires search
+     * @fires result
+     * @fires error
+     * @chainable
+     */
+    search(): this;
+
+    /**
+     * Gets the search query parameters that would be sent to the Algolia Client
+     * for the hits
+     * @return Query Parameters
+     */
+    getQuery(): QueryParameters;
+
+    /**
+     * Start a search using a modified version of the current state. This method does
+     * not trigger the helper lifecycle and does not modify the state kept internally
+     * by the helper. This second aspect means that the next search call will be the
+     * same as a search call before calling searchOnce.
+     * @param options can contain all the parameters that can be set to SearchParameters
+     * plus the index
+     * @param [callback] optional callback executed when the response from the
+     * server is back.
+     * @return if a callback is passed the method returns undefined
+     * otherwise it returns a promise containing an object with two keys :
+     *  - content with a SearchResults
+     *  - state with the state used for the query as a SearchParameters
+     * @example
+     * // Changing the number of records returned per page to 1
+     * // This example uses the callback API
+     * var state = helper.searchOnce({hitsPerPage: 1},
+     *   function(error, content, state) {
+     *     // if an error occurred it will be passed in error, otherwise its value is null
+     *     // content contains the results formatted as a SearchResults
+     *     // state is the instance of SearchParameters used for this search
+     *   });
+     * @example
+     * // Changing the number of records returned per page to 1
+     * // This example uses the promise API
+     * var state1 = helper.searchOnce({hitsPerPage: 1})
+     *                 .then(promiseHandler);
+     *
+     * function promiseHandler(res) {
+     *   // res contains
+     *   // {
+     *   //   content : SearchResults
+     *   //   state   : SearchParameters (the one used for this specific search)
+     *   // }
+     * }
+     */
+    searchOnce(options: QueryParameters): Promise<{ content: SearchResults, state: SearchParameters }>;
+    searchOnce(options: QueryParameters, cb: (error: any, content: SearchResults, state: SearchParameters) => any): undefined;
+
+    /**
+     * Search for facet values based on an query and the name of a faceted attribute. This
+     * triggers a search and will return a promise. On top of using the query, it also sends
+     * the parameters from the state so that the search is narrowed down to only the possible values.
+     *
+     * See the description of [FacetSearchResult](reference.html#FacetSearchResult)
+     * @param facet the name of the faceted attribute
+     * @param query the string query for the search
+     * @param [maxFacetHits] the maximum number values returned. Should be > 0 and <= 100
+     * @param [userState] the set of custom parameters to use on top of the current state. Setting a property to `undefined` removes
+     * it in the generated query.
+     * @return the results of the search
+     */
+    searchForFacetValues(facet: string, query: string, maxFacetHits: number, userState: any): Promise<AlgoliaSearchHelper.FacetSearchResult>;
+
+    /**
+     * Sets the text query used for the search.
+     *
+     * This method resets the current page to 0.
+     * @param  q the user query
+     * @return
+     * @fires change
+     * @chainable
+     */
+    setQuery(q: string): this;
+
+    /**
+     * Remove all the types of refinements except tags. A string can be provided to remove
+     * only the refinements of a specific attribute. For more advanced use case, you can
+     * provide a function instead. This function should follow the
+     * [clearCallback definition](#SearchParameters.clearCallback).
+     *
+     * This method resets the current page to 0.
+     * @param [name] optional name of the facet / attribute on which we want to remove all refinements
+     * @return
+     * @fires change
+     * @chainable
+     * @example
+     * // Removing all the refinements
+     * helper.clearRefinements().search();
+     * @example
+     * // Removing all the filters on a the category attribute.
+     * helper.clearRefinements('category').search();
+     * @example
+     * // Removing only the exclude filters on the category facet.
+     * helper.clearRefinements(function(value, attribute, type) {
+     *   return type === 'exclude' && attribute === 'category';
+     * }).search();
+     */
+    clearRefinements(name?: string): this;
+    clearRefinements(func: (value: any, attribute: string, type: string) => boolean): this;
+
+    /**
+     * Remove all the tag filters.
+     *
+     * This method resets the current page to 0.
+     * @return
+     * @fires change
+     * @chainable
+     */
+    clearTags(): this;
+
+    /**
+     * Updates the name of the index that will be targeted by the query.
+     *
+     * This method resets the current page to 0.
+     * @param name the index name
+     * @return
+     * @fires change
+     * @chainable
+     */
+    setIndex(name: string): this;
+
+    addDisjunctiveFacetRefinement(...args: any[]): any;
+    addDisjunctiveRefine(...args: any[]): any;
+    addHierarchicalFacetRefinement(...args: any[]): any;
+    addNumericRefinement(...args: any[]): any;
+    addFacetRefinement(...args: any[]): any;
+    addRefine(...args: any[]): any;
+    addFacetExclusion(...args: any[]): any;
+    addExclude(...args: any[]): any;
+    addTag(...args: any[]): any;
+    removeNumericRefinement(...args: any[]): any;
+    removeDisjunctiveFacetRefinement(...args: any[]): any;
+    removeDisjunctiveRefine(...args: any[]): any;
+    removeHierarchicalFacetRefinement(...args: any[]): any;
+    removeFacetRefinement(...args: any[]): any;
+    removeRefine(...args: any[]): any;
+    removeFacetExclusion(...args: any[]): any;
+    removeExclude(...args: any[]): any;
+    removeTag(...args: any[]): any;
+    toggleFacetExclusion(...args: any[]): any;
+    toggleExclude(...args: any[]): any;
+    toggleRefinement(...args: any[]): any;
+    toggleFacetRefinement(...args: any[]): any;
+    toggleRefine(...args: any[]): any;
+    toggleTag(...args: any[]): any;
+    nextPage(...args: any[]): any;
+    previousPage(...args: any[]): any;
+    setCurrentPage(...args: any[]): any;
+    setPage(...args: any[]): any;
+    setQueryParameter(...args: any[]): any;
+
+    /**
+     * Set the whole state (warning: will erase previous state)
+     * @param newState the whole new state
+     * @return
+     * @fires change
+     * @chainable
+     */
+    setState(newState: QueryParameters): this;
+
+    /**
+     * Get the current search state stored in the helper. This object is immutable.
+     * @param [filters] optional filters to retrieve only a subset of the state
+     * @return if filters is specified a plain object is
+     * returned containing only the requested fields, otherwise return the unfiltered
+     * state
+     * @example
+     * // Get the complete state as stored in the helper
+     * helper.getState();
+     * @example
+     * // Get a part of the state with all the refinements on attributes and the query
+     * helper.getState(['query', 'attribute:category']);
+     */
+    getState(): SearchParameters;
+    getState(filters: string[]): QueryParameters;
+
+    getStateAsQueryString(...args: any[]): any;
+    setStateFromQueryString(...args: any[]): any;
+    overrideStateWithoutTriggeringChangeEvent(...args: any[]): any;
+    isRefined(...args: any[]): any;
+    hasRefinements(...args: any[]): any;
+    isExcluded(...args: any[]): any;
+    isDisjunctiveRefined(...args: any[]): any;
+    hasTag(...args: any[]): any;
+    isTagRefined(...args: any[]): any;
+    getIndex(...args: any[]): any;
+    getCurrentPage(...args: any[]): any;
+    getPage(...args: any[]): any;
+    getTags(...args: any[]): any;
+    getQueryParameter(...args: any[]): any;
+    getRefinements(...args: any[]): any;
+    getNumericRefinement(...args: any[]): any;
+    getHierarchicalFacetBreadcrumb(...args: any[]): any;
+    containsRefinement(...args: any[]): any;
+    clearCache(...args: any[]): any;
+    setClient(...args: any[]): any;
+    getClient(...args: any[]): any;
+    derive(...args: any[]): any;
+    detachDerivedHelper(...args: any[]): any;
+    hasPendingRequests(...args: any[]): any;
+  }
+
+  namespace AlgoliaSearchHelper {
+    /**
+     * Structure of each result when using
+     * [`searchForFacetValues()`](reference.html#AlgoliaSearchHelper#searchForFacetValues)
+     */
+    interface FacetSearchHit {
+      value: string;
+      highlighted: string;
+      count: number;
+      isRefined: boolean;
+    }
+
+    /**
+     * Structure of the data resolved by the
+     * [`searchForFacetValues()`](reference.html#AlgoliaSearchHelper#searchForFacetValues)
+     * promise.
+     */
+    interface FacetSearchResult {
+      facetHits: FacetSearchHit;
+      processingTimeMS: number;
+    }
+  }
+
+  export interface QueryParameters extends algoliasearch.QueryParameters {
+    /**
+     * Targeted index. This parameter is mandatory.
+     */
+    index?: string;
+    /**
+     * This attribute contains the list of all the disjunctive facets
+     * used. This list will be added to requested facets in the
+     * [facets attribute](https://www.algolia.com/doc/rest-api/search#param-facets) sent to algolia.
+     */
+    disjunctiveFacets?: string[];
+    /**
+     * This attribute contains the list of all the hierarchical facets
+     * used. This list will be added to requested facets in the
+     * [facets attribute](https://www.algolia.com/doc/rest-api/search#param-facets) sent to algolia.
+     * Hierarchical facets are a sub type of disjunctive facets that
+     * let you filter faceted attributes hierarchically.
+     */
+    hierarchicalFacets?: string[] | object[];
+
+    // Refinements
+    /**
+     * This attribute contains all the filters that need to be
+     * applied on the conjunctive facets. Each facet must be properly
+     * defined in the `facets` attribute.
+     *
+     * The key is the name of the facet, and the `FacetList` contains all
+     * filters selected for the associated facet name.
+     *
+     * When querying algolia, the values stored in this attribute will
+     * be translated into the `facetFilters` attribute.
+     */
+    facetsRefinements?: { [facet: string]: SearchParameters.FacetList };
+    /**
+     * This attribute contains all the filters that need to be
+     * excluded from the conjunctive facets. Each facet must be properly
+     * defined in the `facets` attribute.
+     *
+     * The key is the name of the facet, and the `FacetList` contains all
+     * filters excluded for the associated facet name.
+     *
+     * When querying algolia, the values stored in this attribute will
+     * be translated into the `facetFilters` attribute.
+     */
+    facetsExcludes?: { [facet: string]: SearchParameters.FacetList };
+    /**
+     * This attribute contains all the filters that need to be
+     * applied on the disjunctive facets. Each facet must be properly
+     * defined in the `disjunctiveFacets` attribute.
+     *
+     * The key is the name of the facet, and the `FacetList` contains all
+     * filters selected for the associated facet name.
+     *
+     * When querying algolia, the values stored in this attribute will
+     * be translated into the `facetFilters` attribute.
+     */
+    disjunctiveFacetsRefinements?: { [facet: string]: SearchParameters.FacetList };
+    /**
+     * This attribute contains all the filters that need to be
+     * applied on the numeric attributes.
+     *
+     * The key is the name of the attribute, and the value is the
+     * filters to apply to this attribute.
+     *
+     * When querying algolia, the values stored in this attribute will
+     * be translated into the `numericFilters` attribute.
+     */
+    numericRefinements?: { [facet: string]: SearchParameters.OperatorList };
+    /**
+     * This attribute contains all the tags used to refine the query.
+     *
+     * When querying algolia, the values stored in this attribute will
+     * be translated into the `tagFilters` attribute.
+     */
+    tagRefinements?: string[];
+    /**
+     * This attribute contains all the filters that need to be
+     * applied on the hierarchical facets. Each facet must be properly
+     * defined in the `hierarchicalFacets` attribute.
+     *
+     * The key is the name of the facet, and the `FacetList` contains all
+     * filters selected for the associated facet name. The FacetList values
+     * are structured as a string that contain the values for each level
+     * separated by the configured separator.
+     *
+     * When querying algolia, the values stored in this attribute will
+     * be translated into the `facetFilters` attribute.
+     */
+    hierarchicalFacetsRefinements?: { [facet: string]: SearchParameters.FacetList };
+
+    /**
+     * Contains the optional tag filters in the raw format of the Algolia API.
+     * @see https://www.algolia.com/doc/rest#param-tagFilters
+     */
+    optionalTagFilters?: string;
+
+    /**
+     * Contains the optional facet filters in the raw format of the Algolia API.
+     * @see https://www.algolia.com/doc/rest#param-tagFilters
+     */
+    optionalFacetFilters?: string;
+
+    // Misc. parameters
+    /**
+     * Applies 'exact' on single word queries if the word contains at least 3 characters
+     * and is not a stop word.
+     * Can take two values?: true or false.
+     * By default, its set to false.
+     * @see https://www.algolia.com/doc/rest#param-enableExactOnSingleWordQuery
+     */
+    enableExactOnSingleWordQuery?: boolean;
+  }
+
+  export class SearchParameters implements QueryParameters {
+    index?: string ;
+    disjunctiveFacets?: string[] ;
+    hierarchicalFacets?: string[] | object[] ;
+    facetsRefinements?: { [facet: string]: string[]; } ;
+    facetsExcludes?: { [facet: string]: string[]; } ;
+    disjunctiveFacetsRefinements?: { [facet: string]: string[]; } ;
+    numericRefinements?: { [facet: string]: SearchParameters.OperatorList };
+    tagRefinements?: string[] ;
+    hierarchicalFacetsRefinements?: { [facet: string]: string[]; } ;
+    optionalTagFilters?: string ;
+    optionalFacetFilters?: string ;
+    hitsPerPage?: number ;
+    maxValuesPerFacet?: number ;
+    minWordSizefor1Typo?: number ;
+    minWordSizefor2Typos?: number ;
+    minProximity?: any;
+    allowTyposOnNumericTokens?: boolean ;
+    ignorePlurals?: boolean ;
+    advancedSyntax?: boolean ;
+    analytics?: boolean ;
+    synonyms?: boolean ;
+    replaceSynonymsInHighlight?: boolean ;
+    highlightPreTag?: string ;
+    highlightPostTag?: string ;
+    distinct?: number | boolean ;
+    aroundLatLng?: string ;
+    aroundRadius?: number ;
+    minimumAroundRadius?: number ;
+    aroundPrecision?: number ;
+    snippetEllipsisText?: string;
+    enableExactOnSingleWordQuery?: boolean ;
+    query?: string ;
+    filters?: string ;
+    attributesToRetrieve?: string[] ;
+    restrictSearchableAttributes?: string[] ;
+    facets?: string[] ;
+    facetingAfterDistinct?: boolean ;
+    attributesToHighlight?: string[] ;
+    attributesToSnippet?: string[] ;
+    restrictHighlightAndSnippetArrays?: boolean ;
+    page?: number ;
+    offset?: number ;
+    length?: number ;
+    typoTolerance?: boolean ;
+    disableTypoToleranceOnAttributes?: string[] ;
+    aroundLatLngViaIP?: boolean ;
+    insideBoundingBox?: number[][] ;
+    queryType?: "prefixAll" | "prefixLast" | "prefixNone" ;
+    insidePolygon?: number[][] ;
+    removeWordsIfNoResults?: "none" | "lastWords" | "firstWords" | "allOptional" ;
+    optionalWords?: string[] ;
+    removeStopWords?: boolean | string[] ;
+    disableExactOnAttributes?: string[] ;
+    exactOnSingleWordQuery?: "none" | "attribute" | "word" ;
+    alternativesAsExact?: Array<"ignorePlurals" | "singleWordSynonym" | "multiWordsSynonym"> ;
+    getRankingInfo?: boolean ;
+    numericAttributesToIndex?: string[] ;
+    numericAttributesForFiltering?: string[] ;
+    numericFilters?: string[] ;
+    tagFilters?: string[] ;
+    facetFilters?: string[] | string[][] ;
+    analyticsTags?: string[] ;
+    nbShards?: number ;
+    userData?: string | object ;
+
+    constructor(newParameters?: QueryParameters)
+
+    /* Add a disjunctive facet to the disjunctiveFacets attribute of the helper configuration, if it isn't already present. */
+    addDisjunctiveFacet(facet: string): SearchParameters;
+    /* Adds a refinement on a disjunctive facet. */
+    addDisjunctiveFacetRefinement(facet: string, value: string): SearchParameters;
+    /* Exclude a value from a "normal" facet */
+    addExcludeRefinement(facet: string, value: string): SearchParameters;
+    /* Add a facet to the facets attribute of the helper configuration, if it isn't already present. */
+    addFacet(facet: string): SearchParameters;
+    /* Add a refinement on a "normal" facet */
+    addFacetRefinement(facet: string, value: string): SearchParameters;
+    addHierarchicalFacet(facet: any): SearchParameters;
+    addHierarchicalFacetRefinement(facet: string, path: string): SearchParameters;
+    addNumericRefinement(attribute: string, operator: SearchParameters.Operator, value: number | number[]): SearchParameters;
+    addTagRefinement(tag: string): SearchParameters;
+    clearRefinements(attribute?: string | ((value: any, attribute: string, type: string) => any)): SearchParameters;
+    clearTags(): SearchParameters;
+    filter(filters: string[]): any;
+    getConjunctiveRefinements(facetName: string): string[];
+    getDisjunctiveRefinements(facetName: string): string[];
+    getExcludeRefinements(facetName: string): string[];
+    getHierarchicalFacetBreadcrumb(facetName: string): string[];
+    getHierarchicalFacetByName(hierarchicalFacetName: string): any;
+    getHierarchicalRefinement(facetName: string): string[];
+    getNumericRefinements(facetName: string): SearchParameters.OperatorList[];
+    getNumericRefinement(attribute: string, operator: SearchParameters.Operator): Array<number | number[]>;
+    getQueryParameter(paramName: string): any;
+    getRefinedDisjunctiveFacets(facet: string, value: any): string[];
+    getRefinedHierarchicalFacets(facet: string, value: any): string[];
+    getUnrefinedDisjunctiveFacets(): string[];
+    isConjunctiveFacet(facet: string): boolean;
+    isDisjunctiveFacetRefined(facet: string, value?: string): boolean;
+    isDisjunctiveFacet(facet: string): boolean;
+    isExcludeRefined(facet: string, value?: string): boolean;
+    isFacetRefined(facet: string, value?: string): boolean;
+    isHierarchicalFacetRefined(facet: string, value?: string): boolean;
+    isHierarchicalFacet(facet: string): boolean;
+    isNumericRefined(attribute: string, operator: SearchParameters.Operator, value?: string): boolean;
+    isTagRefined(tag: string): boolean;
+    static make(newParameters: QueryParameters): SearchParameters;
+    removeExcludeRefinement(facet: string, value: string): SearchParameters;
+    removeFacet(facet: string): SearchParameters;
+    removeFacetRefinement(facet: string, value?: string): SearchParameters;
+    removeDisjunctiveFacet(facet: string): SearchParameters;
+    removeDisjunctiveFacetRefinement(facet: string, value?: string): SearchParameters;
+    removeHierarchicalFacet(facet: string): SearchParameters;
+    removeHierarchicalFacetRefinement(facet: string): SearchParameters;
+    removeTagRefinement(tag: string): SearchParameters;
+    setDisjunctiveFacets(facets: string[]): SearchParameters;
+    setFacets(facets: string[]): SearchParameters;
+    setHitsPerPage(n: number): SearchParameters;
+    setPage(newPage: number): SearchParameters;
+    setQueryParameters(params: { [key: string]: any }): SearchParameters;
+    setQueryParameter(parameter: string, value: any): SearchParameters;
+    setQuery(newQuery: string): SearchParameters;
+    setTypoTolerance(typoTolerance: string): SearchParameters;
+    toggleDisjunctiveFacetRefinement(facet: string, value: any): SearchParameters;
+    toggleExcludeFacetRefinement(facet: string, value: any): SearchParameters;
+    toggleConjunctiveFacetRefinement(facet: string, value: any): SearchParameters;
+    toggleHierarchicalFacetRefinement(facet: string, value: any): SearchParameters;
+    toggleFacetRefinement(facet: string, value: any): SearchParameters;
+    toggleTagRefinement(tag: string): SearchParameters;
+    static validate(currentState: SearchParameters, parameters: QueryParameters): null | Error;
+  }
+
+  namespace SearchParameters {
+    type FacetList = string[];
+
+    type OperatorList = {
+      [k in Operator]?: Array<number | number[]>
+    };
+    type Operator = '=' | '>' | '>=' | '<' | '<=' | '!=';
+  }
+
+  export class SearchResults {
+    /**
+     * query used to generate the results
+     */
+    query: string;
+    /**
+     * The query as parsed by the engine given all the rules.
+     */
+    parsedQuery: string;
+    /**
+     * all the records that match the search parameters. Each record is
+     * augmented with a new attribute `_highlightResult`
+     * which is an object keyed by attribute and with the following properties:
+     *  - `value` : the value of the facet highlighted (html)
+     *  - `matchLevel`: full, partial or none depending on how the query terms match
+     */
+    hits: any[];
+    /**
+     * index where the results come from
+     */
+    index: string;
+    /**
+     * number of hits per page requested
+     */
+    hitsPerPage: number;
+    /**
+     * total number of hits of this query on the index
+     */
+    nbHits: number;
+    /**
+     * total number of pages with respect to the number of hits per page and the total number of hits
+     */
+    nbPages: number;
+    /**
+     * current page
+     */
+    page: number;
+    /**
+     * sum of the processing time of all the queries
+     */
+    processingTimeMS: number;
+    /**
+     * The position if the position was guessed by IP.
+     * @example "48.8637,2.3615",
+     */
+    aroundLatLng: string;
+    /**
+     * The radius computed by Algolia.
+     * @example "126792922",
+     */
+    automaticRadius: string;
+    /**
+     * String identifying the server used to serve this request.
+     * @example "c7-use-2.algolia.net",
+     */
+    serverUsed: string;
+    /**
+     * Boolean that indicates if the computation of the counts did time out.
+     * @deprecated
+     */
+    timeoutCounts: boolean;
+    /**
+     * Boolean that indicates if the computation of the hits did time out.
+     * @deprecated
+     */
+    timeoutHits: boolean;
+
+    /**
+     * True if the counts of the facets is exhaustive
+     */
+    exhaustiveFacetsCount: boolean;
+
+    /**
+     * True if the number of hits is exhaustive
+     */
+    exhaustiveNbHits: boolean;
+
+    /**
+     * Contains the userData if they are set by a [query rule](https://www.algolia.com/doc/guides/query-rules/query-rules-overview/).
+     */
+    userData: any[];
+
+    /**
+     * queryID is the unique identifier of the query used to generate the current search results.
+     * This value is only available if the `clickAnalytics` search parameter is set to `true`.
+     */
+    queryID: string;
+
+    /**
+     * disjunctive facets results
+     */
+    disjunctiveFacets: SearchResults.Facet[];
+    /**
+     * disjunctive facets results
+     */
+    hierarchicalFacets: SearchResults.HierarchicalFacet[];
+
+    /**
+     * other facets results
+     */
+    facets: SearchResults.Facet[];
+
+    _rawResults: any;
+    _state: SearchParameters;
+
+    constructor(state: SearchParameters, results: any[])
+
+    /**
+     * Get a facet object with its name
+     * @deprecated
+     * @param name name of the faceted attribute
+     * @return  the facet object
+     */
+    getFacetByName(name: string): SearchResults.Facet;
+
+    /**
+     * Get a the list of values for a given facet attribute. Those values are sorted
+     * refinement first, descending count (bigger value on top), and name ascending
+     * (alphabetical order). The sort formula can overridden using either string based
+     * predicates or a function.
+     *
+     * This method will return all the values returned by the Algolia engine plus all
+     * the values already refined. This means that it can happen that the
+     * `maxValuesPerFacet` [configuration](https://www.algolia.com/doc/rest-api/search#param-maxValuesPerFacet)
+     * might not be respected if you have facet values that are already refined.
+     * @param attribute attribute name
+     * @param opts configuration options.
+     * @param opts.sortBy
+     * When using strings, it consists of
+     * the name of the [FacetValue](#SearchResults.FacetValue) or the
+     * [HierarchicalFacet](#SearchResults.HierarchicalFacet) attributes with the
+     * order (`asc` or `desc`). For example to order the value by count, the
+     * argument would be `['count:asc']`.
+     *
+     * If only the attribute name is specified, the ordering defaults to the one
+     * specified in the default value for this attribute.
+     *
+     * When not specified, the order is
+     * ascending.  This parameter can also be a function which takes two facet
+     * values and should return a number, 0 if equal, 1 if the first argument is
+     * bigger or -1 otherwise.
+     *
+     * The default value for this attribute `['isRefined:desc', 'count:desc', 'name:asc']`
+     * @return depending on the type of facet of
+     * the attribute requested (hierarchical, disjunctive or conjunctive)
+     * @example
+     * helper.on('results', function(content){
+     *   //get values ordered only by name ascending using the string predicate
+     *   content.getFacetValues('city', {sortBy: ['name:asc']});
+     *   //get values  ordered only by count ascending using a function
+     *   content.getFacetValues('city', {
+     *     // this is equivalent to ['count:asc']
+     *     sortBy: function(a, b) {
+     *       if (a.count === b.count) return 0;
+     *       if (a.count > b.count)   return 1;
+     *       if (b.count > a.count)   return -1;
+     *     }
+     *   });
+     * });
+     */
+    getFacetValues(attribute: string, opts: any): SearchResults.FacetValue[] | SearchResults.HierarchicalFacet;
+
+    /**
+     * Returns the facet stats if attribute is defined and the facet contains some.
+     * Otherwise returns undefined.
+     * @param attribute name of the faceted attribute
+     * @return The stats of the facet
+     */
+    getFacetStats(attribute: string): any;
+
+    /**
+     * Returns all refinements for all filters + tags. It also provides
+     * additional information: count and exhausistivity for each filter.
+     *
+     * See the [refinement type](#Refinement) for an exhaustive view of the available
+     * data.
+     *
+     * @return all the refinements
+     */
+    getRefinements(): SearchResults.Refinement[];
+  }
+
+  namespace SearchResults {
+    interface Facet {
+      name: string;
+      data: object;
+      stats: object;
+    }
+
+    interface HierarchicalFacet {
+      name: string;
+      count: number;
+      path: string;
+      isRefined: boolean;
+      data: HierarchicalFacet[];
+    }
+
+    interface FacetValue {
+      name: string;
+      count: number;
+      isRefined: boolean;
+      isExcluded: boolean;
+    }
+
+    interface Refinement {
+      type: `numeric` | `facet` | `exclude` | `disjunctive` | `hierarchical`;
+      attributeName: string;
+      name: string;
+      numericValue: number;
+      operator: string;
+      count: number;
+      exhaustive: boolean;
+    }
+  }
+
+  export {};
+}
+
+export = algoliasearchHelper;
diff --git a/types/algoliasearch-helper/tsconfig.json b/types/algoliasearch-helper/tsconfig.json
new file mode 100644
index 0000000000..223c0136ef
--- /dev/null
+++ b/types/algoliasearch-helper/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",
+        "algoliasearch-helper-tests.ts"
+    ]
+}
diff --git a/types/fastify-jwt/tslint.json b/types/algoliasearch-helper/tslint.json
similarity index 100%
rename from types/fastify-jwt/tslint.json
rename to types/algoliasearch-helper/tslint.json
diff --git a/types/algoliasearch/algoliasearch-tests.ts b/types/algoliasearch/algoliasearch-tests.ts
index cbd98d253a..fdd0f395fe 100644
--- a/types/algoliasearch/algoliasearch-tests.ts
+++ b/types/algoliasearch/algoliasearch-tests.ts
@@ -97,6 +97,7 @@ let _algoliaIndexSettings: IndexSettings = {
   minProximity: 0,
   placeholders: { '': [''] },
   camelCaseAttributes: [''],
+  sortFacetValuesBy: 'count',
 };
 
 let _algoliaQueryParameters: QueryParameters = {
@@ -124,7 +125,7 @@ let _algoliaQueryParameters: QueryParameters = {
   ignorePlurals: false,
   disableTypoToleranceOnAttributes: [''],
   aroundLatLng: '',
-  aroundLatLngViaIP: '',
+  aroundLatLngViaIP: true,
   aroundRadius: 0,
   aroundPrecision: 0,
   minimumAroundRadius: 0,
@@ -150,6 +151,7 @@ let _algoliaQueryParameters: QueryParameters = {
   synonyms: true,
   replaceSynonymsInHighlight: false,
   minProximity: 0,
+  sortFacetValuesBy: 'alpha',
 };
 
 let client: Client = algoliasearch('', '');
diff --git a/types/algoliasearch/index.d.ts b/types/algoliasearch/index.d.ts
index 04291996ba..f25d901f73 100644
--- a/types/algoliasearch/index.d.ts
+++ b/types/algoliasearch/index.d.ts
@@ -1279,7 +1279,7 @@ declare namespace algoliasearch {
      * default: ""
      * https://www.algolia.com/doc/api-reference/api-parameters/aroundLatLngViaIP/
      */
-    aroundLatLngViaIP?: string;
+    aroundLatLngViaIP?: boolean;
     /**
      * Control the radius associated with a geo search. Defined in meters.
      * default: null
@@ -1451,6 +1451,11 @@ declare namespace algoliasearch {
 
     nbShards?: number;
     userData?: string | object;
+
+    /**
+     * https://www.algolia.com/doc/api-reference/api-parameters/sortFacetValuesBy/
+     */
+    sortFacetValuesBy?: 'count' | 'alpha';
   }
 
   namespace SearchForFacetValues {
@@ -1687,7 +1692,7 @@ declare namespace algoliasearch {
      * a list of language ISO codes (as a comma-separated string) for which stop words should be enable
      * https://github.com/algolia/algoliasearch-client-js#removestopwords
      */
-    removeStopWords?: string[];
+    removeStopWords?: boolean | string[];
     /**
      * List of attributes on which you want to apply word-splitting ("decompounding") for
      * each of the languages supported (German, Dutch, and Finnish as of 05/2018)
@@ -1776,6 +1781,8 @@ declare namespace algoliasearch {
      https://www.algolia.com/doc/api-reference/api-parameters/camelCaseAttributes/
      */
     camelCaseAttributes?: string[];
+
+    sortFacetValuesBy?: 'count' | 'alpha';
   }
 
   interface Response {
diff --git a/types/algoliasearch/lite/index.d.ts b/types/algoliasearch/lite/index.d.ts
index ce58d6a428..5c9457df22 100644
--- a/types/algoliasearch/lite/index.d.ts
+++ b/types/algoliasearch/lite/index.d.ts
@@ -531,6 +531,11 @@ declare namespace algoliasearch {
 
     nbShards?: number;
     userData?: string | object;
+
+    /**
+     * https://www.algolia.com/doc/api-reference/api-parameters/sortFacetValuesBy/
+     */
+    sortFacetValuesBy?: 'count' | 'alpha';
   }
 
   namespace SearchForFacetValues {
diff --git a/types/ali-oss/index.d.ts b/types/ali-oss/index.d.ts
index e4f9e09e7c..952a1df20c 100644
--- a/types/ali-oss/index.d.ts
+++ b/types/ali-oss/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ali-oss 6.0
-// Project: https://github.com/ali-sdk/ali-oss
+// Project: https://github.com/aliyun/oss-nodejs-sdk
 // Definitions by: Ptrdu <https://github.com/ptrdu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/alt/index.d.ts b/types/alt/index.d.ts
index 515a67986a..573fbdbac1 100644
--- a/types/alt/index.d.ts
+++ b/types/alt/index.d.ts
@@ -148,7 +148,7 @@ declare module "alt/AltContainer" {
     stores?:Array<AltJS.AltStore<any>>;
     inject?:{[key:string]:any};
     actions?:{[key:string]:Object};
-    render?:(...props:Array<any>) => React.ReactElement<any>;
+    render?:(...props:Array<any>) => React.ReactElement;
     flux?:AltJS.Alt;
     transform?:(store:AltJS.AltStore<any>, actions:any) => any;
     shouldComponentUpdate?:(props:any) => boolean;
diff --git a/types/amap-js-sdk/index.d.ts b/types/amap-js-sdk/index.d.ts
index a1b93e6cb3..8cb12530f2 100644
--- a/types/amap-js-sdk/index.d.ts
+++ b/types/amap-js-sdk/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for amap-js-sdk 1.4
+// Type definitions for non-npm package amap-js-sdk 1.4
 // Project: http://lbs.amap.com/api/javascript-api/summary/
 // Definitions by: Bian Zhongjie <https://github.com/agasbzj>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/amazon-cognito-auth-js/index.d.ts b/types/amazon-cognito-auth-js/index.d.ts
index d828fccfc8..00f5ab3214 100644
--- a/types/amazon-cognito-auth-js/index.d.ts
+++ b/types/amazon-cognito-auth-js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for amazon-cognito-auth-js 1.2
-// Project: https://github.com/aws/amazon-cognito-auth-js
+// Project: https://github.com/aws/amazon-cognito-auth-js, http://aws.amazon.com/cognito
 // Definitions by: Scott Escue <https://github.com/scottescue>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/amcharts/index.d.ts b/types/amcharts/index.d.ts
index 759e22e942..7188bd95de 100644
--- a/types/amcharts/index.d.ts
+++ b/types/amcharts/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for amCharts 3.21
-// Project: http://www.amcharts.com/
+// Project: https://amcharts.com
 // Definitions by: ldrick <https://github.com/ldrick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/amplify-deferred/index.d.ts b/types/amplify-deferred/index.d.ts
index 508cb5bb11..6daf4b1124 100644
--- a/types/amplify-deferred/index.d.ts
+++ b/types/amplify-deferred/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for AmplifyJs (using JQuery Deferred) 1.1
-// Project: http://amplifyjs.com/
+// Project: http://amplifyjs.com/, https://github.com/laurentiustamate94/amplify-deferred
 // Definitions by: Jonas Eriksson <https://github.com/joeriks>, Laurentiu Stamate <https://github.com/laurentiustamate94>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/amqplib/index.d.ts b/types/amqplib/index.d.ts
index 2ea088f841..7087d74edc 100644
--- a/types/amqplib/index.d.ts
+++ b/types/amqplib/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for amqplib 0.5
-// Project: https://github.com/squaremo/amqp.node
+// Project: https://github.com/squaremo/amqp.node, http://squaremo.github.io/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.8
diff --git a/types/analytics-node/index.d.ts b/types/analytics-node/index.d.ts
index 168e0f17ea..d46fc09189 100644
--- a/types/analytics-node/index.d.ts
+++ b/types/analytics-node/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for analytics-node 3.1
-// Project: https://segment.com/docs/libraries/node/
+// Project: https://segment.com/docs/libraries/node/, https://github.com/segmentio/analytics-node
 // Definitions by: Andrew Fong <https://github.com/fongandrew>
 //                 Thomas Thiebaud <https://github.com/thomasthiebaud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/angular-gridster/index.d.ts b/types/angular-gridster/index.d.ts
index 27e664f1e8..bcf2e7e4d2 100644
--- a/types/angular-gridster/index.d.ts
+++ b/types/angular-gridster/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for angular-gridster (gridster module) 0.13
-// Project: https://github.com/ManifestWebDesign/angular-gridster
+// Project: https://github.com/ManifestWebDesign/angular-gridster, http://manifestwebdesign.github.io/angular-gridster
 // Definitions by: Joao Monteiro <https://github.com/jpmnteiro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/angular-hotkeys/index.d.ts b/types/angular-hotkeys/index.d.ts
index 360e2cefbe..4456864b41 100644
--- a/types/angular-hotkeys/index.d.ts
+++ b/types/angular-hotkeys/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for angular-hotkeys 1.7
-// Project: https://github.com/chieffancypants/angular-hotkeys
+// Project: https://github.com/chieffancypants/angular-hotkeys, https://chieffancypants.github.io/angular-hotkeys
 // Definitions by: Jason Zhao <https://github.com/jlz27>
 //                 Stefan Steinhart <https://github.com/reppners>
 //                 Cyril Gandon <https://github.com/cyrilgandon>
diff --git a/types/angular-material/index.d.ts b/types/angular-material/index.d.ts
index 19c6dcc9e5..6b012d5677 100644
--- a/types/angular-material/index.d.ts
+++ b/types/angular-material/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for angular-material 1.1
-// Project: https://github.com/angular/material
+// Project: https://github.com/angular/material, https://material.angularjs.org
 // Definitions by: Blake Bigelow <https://github.com/blbigelow>, Peter Hajdu <https://github.com/PeterHajdu>, Davide Donadello <https://github.com/Dona278>, Geert Jansen <https://github.com/geertjansen>, Edward Knowles <https://github.com/eknowles>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
@@ -346,7 +346,7 @@ declare module 'angular' {
         interface IMenuService {
             close(): void;
             hide(response?: any, options?: any): IPromise<any>;
-            open(event?: MouseEvent): void;
+            open(event?: MouseEvent | JQueryEventObject): void;
         }
 
         interface IColorPalette {
diff --git a/types/angular-oauth2/index.d.ts b/types/angular-oauth2/index.d.ts
index ef11ee3680..3db23073a8 100644
--- a/types/angular-oauth2/index.d.ts
+++ b/types/angular-oauth2/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for angular-oauth2 4.1
-// Project: https://github.com/oauthjs/angular-oauth2
+// Project: https://github.com/oauthjs/angular-oauth2, https://github.com/seegno/angular-oauth2
 // Definitions by: Antério Vieira <https://github.com/anteriovieira>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/angular-websocket/index.d.ts b/types/angular-websocket/index.d.ts
index 0b26bd2cfd..46242e65b9 100644
--- a/types/angular-websocket/index.d.ts
+++ b/types/angular-websocket/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for angular-websocket 2.0
-// Project: https://github.com/AngularClass/angular-websocket
+// Project: https://github.com/gdi2290/angular-websocket, https://github.com/angular-class/angular-websocket
 // Definitions by: Nick Veys <https://github.com/nickveys>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/angular/angular-tests.ts b/types/angular/angular-tests.ts
index b83a41a6df..7470fb08bb 100644
--- a/types/angular/angular-tests.ts
+++ b/types/angular/angular-tests.ts
@@ -294,6 +294,14 @@ foo.then((x) => {
     x.toFixed();
 });
 
+namespace TestPromiseInterop {
+    declare const promiseInterop: ng.IPromise<number>;
+    const ngStringPromise: ng.IPromise<string> =
+        promiseInterop.then((num) => Promise.resolve(String(num)));
+    const caughtStringPromise: ng.IPromise<string|number> =
+        promiseInterop.catch((reason) => Promise.resolve('oh noes'));
+}
+
 // $q signature tests
 namespace TestQ {
     interface AbcObject {
diff --git a/types/angular/index.d.ts b/types/angular/index.d.ts
index 4a8b26fba9..0c28ddbf27 100644
--- a/types/angular/index.d.ts
+++ b/types/angular/index.d.ts
@@ -1197,6 +1197,15 @@ declare namespace angular {
          * the `notifyCallback` method. The promise can not be resolved or rejected from the
          * `notifyCallback` method.
          */
+        then<TResult1 = T, TResult2 = never>(
+            successCallback?:
+                | ((value: T) => PromiseLike<never> | PromiseLike<TResult1> | TResult1)
+                | null,
+            errorCallback?:
+                | ((reason: any) => PromiseLike<never> | PromiseLike<TResult2> | TResult2)
+                | null,
+            notifyCallback?: (state: any) => any
+        ): IPromise<TResult1 | TResult2>;
         then<TResult1 = T, TResult2 = never>(
             successCallback?:
                 | ((value: T) => IPromise<never> | IPromise<TResult1> | TResult1)
@@ -1210,6 +1219,11 @@ declare namespace angular {
         /**
          * Shorthand for promise.then(null, errorCallback)
          */
+        catch<TResult = never>(
+            onRejected?:
+                | ((reason: any) => PromiseLike<never> | PromiseLike<TResult> | TResult)
+                | null
+        ): IPromise<T | TResult>;
         catch<TResult = never>(
             onRejected?:
                 | ((reason: any) => IPromise<never> | IPromise<TResult> | TResult)
diff --git a/types/angular/tsconfig.json b/types/angular/tsconfig.json
index 46eeb69c7a..590c9c7798 100644
--- a/types/angular/tsconfig.json
+++ b/types/angular/tsconfig.json
@@ -11,7 +11,8 @@
         "lib": [
             "es5",
             "dom",
-            "es2015.iterable"
+            "es2015.iterable",
+            "es2015.promise"
         ],
         "noImplicitAny": false,
         "noImplicitThis": false,
@@ -25,4 +26,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
\ No newline at end of file
+}
diff --git a/types/ansi/index.d.ts b/types/ansi/index.d.ts
index 4e486d61ef..a7173030b0 100644
--- a/types/ansi/index.d.ts
+++ b/types/ansi/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ansi 0.3
-// Project: https://www.npmjs.com/package/ansi
+// Project: https://github.com/tootallnate/ansi.js
 // Definitions by: Gustavo6046 <https://github.com/Gustavo6046>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/anymatch/index.d.ts b/types/anymatch/index.d.ts
index 4eb90734a4..ac247fd832 100644
--- a/types/anymatch/index.d.ts
+++ b/types/anymatch/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for anymatch 1.3
-// Project: https://github.com/es128/anymatch
+// Project: https://github.com/micromatch/anymatch
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/aos/index.d.ts b/types/aos/index.d.ts
index 1e1a9f7cc6..446c2935f1 100644
--- a/types/aos/index.d.ts
+++ b/types/aos/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for aos 3.0
-// Project: https://github.com/michalsnik/aos
+// Project: https://github.com/michalsnik/aos, https://michalsnik.github.io/aos
 // Definitions by: Rostislav Shermenyov <https://github.com/shermendev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/arangodb/index.d.ts b/types/arangodb/index.d.ts
index c5e83a1cfc..d9ec1a752c 100644
--- a/types/arangodb/index.d.ts
+++ b/types/arangodb/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ArangoDB 3.4
+// Type definitions for non-npm package ArangoDB 3.4
 // Project: https://github.com/arangodb/arangodb
 // Definitions by: Alan Plum <https://github.com/pluma>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/arcgis-rest-api/index.d.ts b/types/arcgis-rest-api/index.d.ts
index ade4b7a857..49e3151b5e 100644
--- a/types/arcgis-rest-api/index.d.ts
+++ b/types/arcgis-rest-api/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ArcGIS REST API 10.4
+// Type definitions for non-npm package ArcGIS REST API 10.4
 // Project: http://resources.arcgis.com/en/help/arcgis-rest-api/
 // Definitions by: Jeff Jacobson <https://github.com/JeffJacobson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/artillery/index.d.ts b/types/artillery/index.d.ts
index fbc5d41917..b901692106 100644
--- a/types/artillery/index.d.ts
+++ b/types/artillery/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for artillery 1.6
-// Project: https://github.com/shoreditch-ops/artillery#readme
+// Project: https://github.com/artilleryio/artillery
 // Definitions by: Kira McCoan <https://github.com/kmccoan-allocadia>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/asn1/asn1-tests.ts b/types/asn1/asn1-tests.ts
new file mode 100644
index 0000000000..f37541b03e
--- /dev/null
+++ b/types/asn1/asn1-tests.ts
@@ -0,0 +1,88 @@
+import { Ber, BerReader, BerWriter } from 'asn1';
+
+let buf: Buffer = Buffer.alloc(0);
+let bool = false;
+let str = '';
+let num = 0;
+let numOrNull: number | null = 0;
+const roStrArray: ReadonlyArray<string> = [str];
+
+const reader = new BerReader(buf);
+numOrNull = reader.peek();
+bool = reader.readBoolean();
+numOrNull = reader.readByte(bool);
+num = reader.readEnumeration();
+num = reader.readInt();
+num = reader.readLength();
+num = reader.readLength(num);
+str = reader.readOID();
+str = reader.readOID(num);
+numOrNull = reader.readSequence();
+numOrNull = reader.readSequence(num);
+str = reader.readString();
+str = reader.readString(num);
+buf = reader.readString(num, bool);
+num = reader._readTag();
+num = reader._readTag(num);
+
+let writer = new BerWriter();
+writer = new BerWriter({
+	size: num,
+	growthFactor: num,
+});
+
+buf = writer.buffer;
+buf = writer._buf;
+num = writer._size;
+num = writer._offset;
+
+writer.endSequence();
+writer.startSequence();
+writer.startSequence(num);
+writer.writeBoolean(bool);
+writer.writeBoolean(bool, num);
+writer.writeBuffer(buf, num);
+writer.writeByte(num);
+writer.writeEnumeration(num);
+writer.writeEnumeration(num, num);
+writer.writeInt(num);
+writer.writeInt(num, num);
+writer.writeLength(num);
+writer.writeNull();
+writer.writeOID(str, num);
+writer.writeString(str);
+writer.writeString(str, num);
+writer.writeStringArray(roStrArray);
+writer._ensure(num);
+
+num = Ber.BMPString;
+num = Ber.BitString;
+num = Ber.Boolean;
+num = Ber.CharacterString;
+num = Ber.Constructor;
+num = Ber.Context;
+num = Ber.EOC;
+num = Ber.Enumeration;
+num = Ber.External;
+num = Ber.GeneralString;
+num = Ber.GeneralizedTime;
+num = Ber.GraphicString;
+num = Ber.IA5String;
+num = Ber.Integer;
+num = Ber.Null;
+num = Ber.NumericString;
+num = Ber.OID;
+num = Ber.ObjectDescriptor;
+num = Ber.OctetString;
+num = Ber.PDV;
+num = Ber.PrintableString;
+num = Ber.Real;
+num = Ber.RelativeOID;
+num = Ber.Sequence;
+num = Ber.Set;
+num = Ber.T61String;
+num = Ber.UTCTime;
+num = Ber.UniversalString;
+num = Ber.Utf8String;
+num = Ber.VideotexString;
+num = Ber.VisibleString;
diff --git a/types/asn1/index.d.ts b/types/asn1/index.d.ts
new file mode 100644
index 0000000000..3f7de44af8
--- /dev/null
+++ b/types/asn1/index.d.ts
@@ -0,0 +1,126 @@
+// Type definitions for asn1 0.2
+// Project: https://github.com/joyent/node-asn1
+// Definitions by: Jim Geurts <https://github.com/jgeurts>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+/// <reference types="node" />
+
+export class BerReader {
+    readonly buffer: Buffer;
+    readonly offset: number;
+    readonly length: number;
+    readonly remain: number;
+    readonly _buf: Buffer;
+    _size: number;
+    _offset: number;
+
+    constructor(data: Buffer);
+
+    peek(): number | null;
+    readBoolean(): boolean;
+    readByte(peek: boolean): number | null;
+    readEnumeration(): number;
+    readInt(): number;
+    readLength(offset?: number): number;
+    readOID(tag?: number): string;
+    readSequence(tag?: number): number | null;
+    readString(tag?: number): string;
+    readString(tag: number, retbuf: boolean): Buffer;
+    _readTag(tag?: number): number;
+}
+
+export class BerWriter {
+    readonly buffer: Buffer;
+    readonly _buf: Buffer;
+    readonly _size: number;
+    _offset: number;
+
+    constructor(options?: {
+        size: number;
+        growthFactor: number;
+    });
+
+    endSequence(): void;
+    startSequence(tag?: number): void;
+    writeBoolean(b: boolean, tag?: number): void;
+    writeBuffer(buf: Buffer, tag: number): void;
+    writeByte(b: number): void;
+    writeEnumeration(i: number, tag?: number): void;
+    writeInt(i: number, tag?: number): void;
+    writeLength(len: number): void;
+    writeNull(): void;
+    writeOID(s: string, tag: number): void;
+    writeString(s: string, tag?: number): void;
+    writeStringArray(strings: ReadonlyArray<string>): void;
+    _ensure(length: number): void;
+}
+
+export namespace Ber {
+    const BMPString: number;
+    const BitString: number;
+    const Boolean: number;
+    const CharacterString: number;
+    const Constructor: number;
+    const Context: number;
+    const EOC: number;
+    const Enumeration: number;
+    const External: number;
+    const GeneralString: number;
+    const GeneralizedTime: number;
+    const GraphicString: number;
+    const IA5String: number;
+    const Integer: number;
+    const Null: number;
+    const NumericString: number;
+    const OID: number;
+    const ObjectDescriptor: number;
+    const OctetString: number;
+    const PDV: number;
+    const PrintableString: number;
+    const Real: number;
+    const RelativeOID: number;
+    const Sequence: number;
+    const Set: number;
+    const T61String: number;
+    const UTCTime: number;
+    const UniversalString: number;
+    const Utf8String: number;
+    const VideotexString: number;
+    const VisibleString: number;
+}
+/*
+declare enum BerType {
+  EOC = 0,
+  Boolean = 1,
+  Integer = 2,
+  BitString = 3,
+  OctetString = 4,
+  Null = 5,
+  OID = 6,
+  ObjectDescriptor = 7,
+  External = 8,
+  Real = 9, // float
+  Enumeration = 10,
+  PDV = 11,
+  Utf8String = 12,
+  RelativeOID = 13,
+  Sequence = 16,
+  Set = 17,
+  NumericString = 18,
+  PrintableString = 19,
+  T61String = 20,
+  VideotexString = 21,
+  IA5String = 22,
+  UTCTime = 23,
+  GeneralizedTime = 24,
+  GraphicString = 25,
+  VisibleString = 26,
+  GeneralString = 28,
+  UniversalString = 29,
+  CharacterString = 30,
+  BMPString = 31,
+  Constructor = 32,
+  Context = 128,
+}
+
+*/
diff --git a/types/asn1/tsconfig.json b/types/asn1/tsconfig.json
new file mode 100644
index 0000000000..fd1bdc45d9
--- /dev/null
+++ b/types/asn1/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "noUnusedParameters": true,
+
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "asn1-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/asn1/tslint.json b/types/asn1/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/asn1/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/assert/index.d.ts b/types/assert/index.d.ts
index f04158bbd3..6e1dded3f3 100644
--- a/types/assert/index.d.ts
+++ b/types/assert/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for commonjs-assert 1.4
-// Project: https://github.com/browserify/commonjs-assert
+// Project: https://github.com/browserify/commonjs-assert, https://github.com/defunctzombie/commonjs-assert
 // Definitions by: Nico Gallinal <https://github.com/nicoabie>
 //                 Linus Unnebäck <https://github.com/LinusU>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/assets-webpack-plugin/index.d.ts b/types/assets-webpack-plugin/index.d.ts
index 7644d8f9ad..63563d6298 100644
--- a/types/assets-webpack-plugin/index.d.ts
+++ b/types/assets-webpack-plugin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for assets-webpack-plugin 3.5
-// Project: https://github.com/sporto/assets-webpack-plugin
+// Project: https://github.com/ztoben/assets-webpack-plugin
 // Definitions by: Michael Strobel <https://github.com/kryops>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/async-lock/index.d.ts b/types/async-lock/index.d.ts
index cd2b1e4b40..3c358c744c 100644
--- a/types/async-lock/index.d.ts
+++ b/types/async-lock/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for async-lock 1.1
-// Project: https://github.com/rain1017/async-lock
+// Project: https://github.com/rain1017/async-lock, https://github.com/rogierschouten/async-lock
 // Definitions by: Elisée MAURER <https://github.com/elisee>
 //                 Alejandro <https://github.com/afharo>
 //                 Anatoly <https://github.com/rhymmor>
diff --git a/types/async.nexttick/index.d.ts b/types/async.nexttick/index.d.ts
index a8572cc087..9ed5d1f626 100644
--- a/types/async.nexttick/index.d.ts
+++ b/types/async.nexttick/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for async.nexttick 0.5
-// Project: https://www.npmjs.com/package/async.nexttick
+// Project: https://github.com/caolan/async
 // Definitions by: Damien "pyrho" Rajon <https://github.com/pyrho>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/async/index.d.ts b/types/async/index.d.ts
index 05d99e5968..1d9054e5e1 100644
--- a/types/async/index.d.ts
+++ b/types/async/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Async 2.4
-// Project: https://github.com/caolan/async
+// Project: https://github.com/caolan/async, https://caolan.github.io/async
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 //                 Arseniy Maximov <https://github.com/kern0>
 //                 Joe Herman <https://github.com/Penryn>
diff --git a/types/atlaskit__button/index.d.ts b/types/atlaskit__button/index.d.ts
index 95ac1e0961..915417945c 100644
--- a/types/atlaskit__button/index.d.ts
+++ b/types/atlaskit__button/index.d.ts
@@ -42,9 +42,9 @@ export interface ButtonProps {
     /** Provides a url for buttons being used as a link. */
     readonly href?: string;
     /** Places an icon within the button, after the button's text. */
-    readonly iconAfter?: ReactElement<any>;
+    readonly iconAfter?: ReactElement;
     /** Places an icon within the button, before the button's text. */
-    readonly iconBefore?: ReactElement<any>;
+    readonly iconBefore?: ReactElement;
     /** Pass a reference on to the styled component */
     readonly innerRef?: (instance: any) => void;
     /** Provide a unique id to the button. */
diff --git a/types/atlaskit__calendar/index.d.ts b/types/atlaskit__calendar/index.d.ts
index e1c76eb397..bf45c8969f 100644
--- a/types/atlaskit__calendar/index.d.ts
+++ b/types/atlaskit__calendar/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for atlaskit__calendar 5.0
-// Project: https://bitbucket.org/atlassian/atlaskit-mk-2/src/master/
+// Project: https://bitbucket.org/atlassian/atlaskit-mk-2/src/master/, https://bitbucket.org/atlassian/atlaskit-mk-2
 // Definitions by: Lee Standen <https://github.com/lstanden>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/atlaskit__inline-edit/index.d.ts b/types/atlaskit__inline-edit/index.d.ts
index d2d706c5a4..b9371f6a69 100644
--- a/types/atlaskit__inline-edit/index.d.ts
+++ b/types/atlaskit__inline-edit/index.d.ts
@@ -12,9 +12,9 @@ export interface BaseProps {
     /** Label above the input. */
     label?: string;
     /** Component to be shown when reading only */
-    readView: ReactElement<any>;
+    readView: ReactElement;
     /** Component to be shown when editing. Should be an @atlaskit/input. */
-    editView?: ReactElement<any>;
+    editView?: ReactElement;
     /** Set whether the read view should fit width, most obvious when hovered. */
     isFitContainerWidthReadView?: boolean;
     /** Greys out text and shows spinner. Does not disable input. */
@@ -38,7 +38,7 @@ export interface BaseProps {
     /** Set whether default stylings should be disabled when editing. */
     disableEditViewFieldBase?: boolean;
     /** Component to be shown in an @atlaskit/inline-dialog when edit view is open. */
-    invalidMessage?: ReactElement<any>;
+    invalidMessage?: ReactElement;
 }
 
 export interface StatelessProps extends BaseProps {
diff --git a/types/atlaskit__layer/index.d.ts b/types/atlaskit__layer/index.d.ts
index 03673c47a3..bfc131bfe6 100644
--- a/types/atlaskit__layer/index.d.ts
+++ b/types/atlaskit__layer/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @atlaskit/layer 3.1
-// Project: https://bitbucket.org/atlassian/atlaskit-mk-2/src/master/
+// Project: https://bitbucket.org/atlassian/atlaskit-mk-2/src/master/, https://bitbucket.org/atlassian/atlaskit-mk-2
 // Definitions by: Lee Standen <https://github.com/lstanden>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/atlaskit__single-select/index.d.ts b/types/atlaskit__single-select/index.d.ts
index 4910c10a11..d2085c998c 100644
--- a/types/atlaskit__single-select/index.d.ts
+++ b/types/atlaskit__single-select/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @atlaskit/single-select 4.0
-// Project: https://bitbucket.org/atlassian/atlaskit-mk-2/src/master/
+// Project: https://bitbucket.org/atlassian/atlaskit-mk-2/src/master/, https://bitbucket.org/atlassian/atlaskit-mk-2
 // Definitions by: Lee Standen <https://github.com/lstanden>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index d77663c460..d1394d1586 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Atom 1.31
+// Type definitions for non-npm package Atom 1.31
 // Project: https://github.com/atom/atom
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 //                 smhxx <https://github.com/smhxx>
diff --git a/types/auth0-js/index.d.ts b/types/auth0-js/index.d.ts
index a38c928333..7e43da1c89 100644
--- a/types/auth0-js/index.d.ts
+++ b/types/auth0-js/index.d.ts
@@ -569,6 +569,14 @@ export type SpecErrorCodes =
 export interface Auth0Error {
     error: LibErrorCodes | SpecErrorCodes | string;
     errorDescription: string;
+    // Need to include non-intuitive error fields that Auth0 uses
+    code?: string;
+    description?: string;
+    name?: string;
+    policy?: string;
+    original?: any;
+    statusCode?: number;
+    statusText?: string;
 }
 
 export type Auth0ParseHashError = Auth0Error & {
@@ -812,6 +820,8 @@ export interface AuthorizeOptions {
     login_hint?: string;
 	prompt?: string;
     mode?: "login" | "signUp";
+    accessType?: string;
+    approvalPrompt?: string;
 }
 
 export interface CheckSessionOptions extends AuthorizeOptions {
diff --git a/types/auth0-lock/index.d.ts b/types/auth0-lock/index.d.ts
index 32a3228e56..6abb5069ad 100644
--- a/types/auth0-lock/index.d.ts
+++ b/types/auth0-lock/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for auth0-lock 11.4
-// Project: http://auth0.com
+// Project: http://auth0.com, https://github.com/auth0/lock
 // Definitions by: Brian Caruso <https://github.com/carusology>
 //                 Dan Caddigan <https://github.com/goldcaddy77>
 //                 Larry Faudree <https://github.com/lfaudreejr>
diff --git a/types/auto-launch/index.d.ts b/types/auto-launch/index.d.ts
index 1ea4fcc25a..e0cabe59f6 100644
--- a/types/auto-launch/index.d.ts
+++ b/types/auto-launch/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for auto-launch 5.0
-// Project: https://github.com/Teamwork/node-auto-launch
+// Project: https://github.com/Teamwork/node-auto-launch, https://github.com/4ver/node-auto-launch
 // Definitions by: rhysd <https://github.com/rhysd>, Daniel Perez Alvarez <https://github.com/unindented>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/auto-sni/index.d.ts b/types/auto-sni/index.d.ts
index 19272446a6..d365165128 100644
--- a/types/auto-sni/index.d.ts
+++ b/types/auto-sni/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for auto-sni 2.1
-// Project: https://www.npmjs.com/package/auto-sni
+// Project: https://github.com/dylanpiercey/auto-sni
 // Definitions by: Jan Wolf <https://github.com/janwo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/autobahn/index.d.ts b/types/autobahn/index.d.ts
index 7a518e0fd4..9c1d66fb85 100644
--- a/types/autobahn/index.d.ts
+++ b/types/autobahn/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for AutobahnJS 0.9
-// Project: http://autobahn.ws/js/
+// Project: http://autobahn.ws/js/, https://github.com/crossbario/autobahn-js
 // Definitions by: Elad Zelingher <https://github.com/darkl>, Andy Hawkins <https://github.com/a904guy>, Wladimir Totino <https://github.com/valepu>, Mathias Teier <https://github.com/glenroy37>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index 92f0a6999b..ad063c20b6 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -1,12 +1,14 @@
 declare let str: string;
 declare let strOrNull: string | null;
 declare let strOrUndefined: string | undefined;
+declare let strOrUndefinedOrNull: string | undefined | null;
 declare let date: Date;
 declare let anyObj: any;
 declare let num: number;
 declare let error: Error;
 declare let bool: boolean;
 declare let boolOrUndefined: boolean | undefined;
+declare let numOrUndefined: number | undefined;
 declare let apiGwEvtReqCtx: AWSLambda.APIGatewayEventRequestContext;
 declare let apiGwEvtReqCtxOpt: AWSLambda.APIGatewayEventRequestContext | null | undefined;
 declare let apiGwEvt: AWSLambda.APIGatewayEvent;
@@ -80,6 +82,11 @@ declare const scheduledEvent: AWSLambda.ScheduledEvent;
 str = apiGwEvtReqCtx.accountId;
 str = apiGwEvtReqCtx.apiId;
 authResponseContextOpt = apiGwEvtReqCtx.authorizer;
+numOrUndefined = apiGwEvtReqCtx.connectedAt;
+strOrUndefined = apiGwEvtReqCtx.connectionId;
+strOrUndefined = apiGwEvtReqCtx.domainName;
+strOrUndefined = apiGwEvtReqCtx.eventType;
+strOrUndefined = apiGwEvtReqCtx.extendedRequestId;
 str = apiGwEvtReqCtx.httpMethod;
 strOrNull = apiGwEvtReqCtx.identity.accessKey;
 strOrNull = apiGwEvtReqCtx.identity.accountId;
@@ -94,11 +101,15 @@ str = apiGwEvtReqCtx.identity.sourceIp;
 strOrNull = apiGwEvtReqCtx.identity.user;
 strOrNull = apiGwEvtReqCtx.identity.userAgent;
 strOrNull = apiGwEvtReqCtx.identity.userArn;
+strOrUndefined = apiGwEvtReqCtx.messageDirection;
+strOrUndefinedOrNull = apiGwEvtReqCtx.messageId;
 str = apiGwEvtReqCtx.path;
 str = apiGwEvtReqCtx.stage;
 str = apiGwEvtReqCtx.requestId;
+strOrUndefined = apiGwEvtReqCtx.requestTime;
 str = apiGwEvtReqCtx.resourceId;
 str = apiGwEvtReqCtx.resourcePath;
+strOrUndefined = apiGwEvtReqCtx.routeKey;
 
 /* API Gateway Event */
 strOrNull = apiGwEvt.body;
@@ -1056,3 +1067,113 @@ const firehoseEventHandler: AWSLambda.FirehoseTransformationHandler = (
         ]
     });
 };
+
+declare let lexEvent: AWSLambda.LexEvent;
+lexEvent = {
+    currentIntent: {
+        name: 'intent-name',
+        slots: {
+            slot1: null,
+            slot2: 'value2',
+        },
+        slotDetails: {
+            slot1: {
+                resolutions: [
+                    { value: 'value1' },
+                ],
+                originalValue: 'originalValue',
+            }
+        },
+        confirmationStatus: 'None',
+    },
+    bot: {
+        name: 'bot name',
+        alias: 'bot alias',
+        version: 'bot version',
+    },
+    userId: 'User ID specified in the POST request to Amazon Lex.',
+    inputTranscript: 'Text used to process the request',
+    invocationSource: 'FulfillmentCodeHook',
+    outputDialogMode: 'Text',
+    messageVersion: '1.0',
+    sessionAttributes: {
+        key1: 'value1',
+        key2: 'value2',
+    },
+    requestAttributes: {
+        key1: 'value1',
+        key2: 'value2',
+    }
+};
+
+declare let lexResult: AWSLambda.LexResult;
+declare let lexDialogAction: AWSLambda.LexDialogAction;
+declare let lexDialogActionBase: AWSLambda.LexDialogActionBase;
+declare let lexDialogActionClose: AWSLambda.LexDialogActionClose;
+declare let lexDialogActionConfirmIntent: AWSLambda.LexDialogActionConfirmIntent;
+declare let lexDialogActionDelegate: AWSLambda.LexDialogActionDelegate;
+declare let lexDialogActionElicitIntent: AWSLambda.LexDialogActionElicitIntent;
+declare let lexDialogActionElicitSlot: AWSLambda.LexDialogActionElicitSlot;
+declare let lexGenericAttachment: AWSLambda.LexGenericAttachment;
+
+lexResult = {
+    sessionAttributes: {
+        attrib1: 'Value One',
+    },
+    dialogAction: {
+        type: 'Close',
+        fulfillmentState: 'Failed',
+    },
+};
+
+str = lexGenericAttachment.title;
+str = lexGenericAttachment.subTitle;
+str = lexGenericAttachment.imageUrl;
+str = lexGenericAttachment.attachmentLinkUrl;
+str = lexGenericAttachment.buttons[0].text;
+str = lexGenericAttachment.buttons[0].value;
+
+lexDialogAction.type === 'Close';
+lexDialogAction.type === 'ConfirmIntent';
+lexDialogAction.type === 'Delegate';
+lexDialogAction.type === 'ElicitIntent';
+lexDialogAction.type === 'ElicitSlot';
+
+lexDialogActionBase.message!.contentType === 'CustomPayload';
+lexDialogActionBase.message!.contentType === 'PlainText';
+lexDialogActionBase.message!.contentType === 'SSML';
+str = lexDialogActionBase.message!.content;
+num = lexDialogActionBase.responseCard!.version;
+lexDialogActionBase.responseCard!.contentType === 'application/vnd.amazonaws.card.generic';
+// $ExpectType LexGenericAttachment
+lexDialogActionBase.responseCard!.genericAttachments[0];
+
+lexDialogActionClose.type === 'Close';
+lexDialogActionClose.fulfillmentState === 'Failed';
+lexDialogActionClose.fulfillmentState === 'Fulfilled';
+
+lexDialogActionConfirmIntent.type === 'ConfirmIntent';
+str = lexDialogActionConfirmIntent.intentName;
+strOrNull = lexDialogActionConfirmIntent.slots['example'];
+
+lexDialogActionDelegate.type === 'Delegate';
+strOrNull = lexDialogActionDelegate.slots['example'];
+
+lexDialogActionElicitIntent.type === 'ElicitIntent';
+lexDialogActionElicitSlot.type === 'ElicitSlot';
+strOrNull = lexDialogActionElicitSlot.slots['example'];
+str = lexDialogActionElicitSlot.slotToElicit;
+str = lexDialogActionElicitSlot.intentName;
+
+const lexEventHandler: AWSLambda.LexHandler = async (
+    event: AWSLambda.LexEvent,
+    context: AWSLambda.Context,
+) => {
+    // $ExpectType LexEvent
+    event;
+
+    // $ExpectType Context
+    context;
+    str = context.functionName;
+    return lexResult;
+};
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index 4cafe3d2da..3301feebb5 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -25,6 +25,7 @@
 //                 Trevor Leach <https://github.com/trevor-leach>
 //                 James Gregory <https://github.com/jagregory>
 //                 Erik Dalén <https://github.com/dalen>
+//                 Loïk Gaonac'h <https://github.com/loikg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -33,6 +34,11 @@ export interface APIGatewayEventRequestContext {
     accountId: string;
     apiId: string;
     authorizer?: AuthResponseContext | null;
+    connectedAt: number;
+    connectionId?: string;
+    domainName?: string;
+    eventType?: string;
+    extendedRequestId?: string;
     httpMethod: string;
     identity: {
         accessKey: string | null;
@@ -49,12 +55,16 @@ export interface APIGatewayEventRequestContext {
         userAgent: string | null;
         userArn: string | null;
     };
+    messageDirection?: string;
+    messageId?: string | null;
     path: string;
     stage: string;
     requestId: string;
+    requestTime?: string;
     requestTimeEpoch: number;
     resourceId: string;
     resourcePath: string;
+    routeKey?: string;
 }
 
 // API Gateway "event"
@@ -876,6 +886,100 @@ export interface SQSMessageAttributes {
     [name: string]: SQSMessageAttribute;
 }
 
+// Lex
+// https://docs.aws.amazon.com/lambda/latest/dg/invoking-lambda-function.html#supported-event-source-lex
+export interface LexEvent {
+    currentIntent: {
+        name: string;
+        slots: { [name: string]: string | null };
+        slotDetails: LexSlotDetails;
+        confirmationStatus: 'None' | 'Confirmed' | 'Denied';
+    };
+    bot: {
+        name: string;
+        alias: string;
+        version: string;
+    };
+    userId: string;
+    inputTranscript: string;
+    invocationSource: 'DialogCodeHook' | 'FulfillmentCodeHook';
+    outputDialogMode: 'Text' | 'Voice';
+    messageVersion: '1.0';
+    sessionAttributes: { [key: string]: string };
+    requestAttributes: { [key: string]: string } | null;
+}
+
+export interface LexSlotResolution {
+    value: string;
+}
+
+export interface LexSlotDetails {
+    [name: string]: {
+        // The following line only works in TypeScript Version: 3.0, The array should have at least 1 and no more than 5 items
+        // resolutions: [LexSlotResolution, LexSlotResolution?, LexSlotResolution?, LexSlotResolution?, LexSlotResolution?];
+        resolutions: LexSlotResolution[]
+        originalValue: string;
+    };
+}
+
+export interface LexGenericAttachment {
+    title: string;
+    subTitle: string;
+    imageUrl: string;
+    attachmentLinkUrl: string;
+    buttons: Array<{
+        text: string;
+        value: string;
+    }>;
+}
+
+export interface LexDialogActionBase {
+    type: 'Close' | 'ElicitIntent' | 'ElicitSlot' | 'ConfirmIntent';
+    message?: {
+        contentType: 'PlainText' | 'SSML' | 'CustomPayload';
+        content: string;
+    };
+    responseCard?: {
+        version: number;
+        contentType: 'application/vnd.amazonaws.card.generic';
+        genericAttachments: LexGenericAttachment[];
+    };
+}
+
+export interface LexDialogActionClose extends LexDialogActionBase {
+    type: 'Close';
+    fulfillmentState: 'Fulfilled' | 'Failed';
+}
+
+export interface LexDialogActionElicitIntent extends LexDialogActionBase {
+    type: 'ElicitIntent';
+}
+
+export interface LexDialogActionElicitSlot extends LexDialogActionBase {
+    type: 'ElicitSlot';
+    intentName: string;
+    slots: { [name: string]: string | null };
+    slotToElicit: string;
+}
+
+export interface LexDialogActionConfirmIntent extends LexDialogActionBase {
+    type: 'ConfirmIntent';
+    intentName: string;
+    slots: { [name: string]: string | null };
+}
+
+export interface LexDialogActionDelegate {
+    type: 'Delegate';
+    slots: { [name: string]: string | null };
+}
+
+export type LexDialogAction = LexDialogActionClose | LexDialogActionElicitIntent | LexDialogActionElicitSlot | LexDialogActionConfirmIntent | LexDialogActionDelegate;
+
+export interface LexResult {
+    sessionAttributes?: { [key: string]: string };
+    dialogAction: LexDialogAction;
+}
+
 /**
  * AWS Lambda handler function.
  * http://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-handler.html
@@ -938,6 +1042,9 @@ export type ScheduledHandler = Handler<ScheduledEvent, void>;
 
 // TODO: Alexa
 
+export type LexHandler = Handler<LexEvent, LexResult>;
+export type LexCallback = Callback<LexResult>;
+
 export type APIGatewayProxyHandler = Handler<APIGatewayProxyEvent, APIGatewayProxyResult>;
 export type APIGatewayProxyCallback = Callback<APIGatewayProxyResult>;
 export type ProxyHandler = APIGatewayProxyHandler; // Old name
diff --git a/types/aws-param-store/aws-param-store-tests.ts b/types/aws-param-store/aws-param-store-tests.ts
new file mode 100644
index 0000000000..13ad6c0514
--- /dev/null
+++ b/types/aws-param-store/aws-param-store-tests.ts
@@ -0,0 +1,78 @@
+import { SSM } from 'aws-sdk';
+import {
+    ParameterQuery,
+    parameterQuery,
+    getParameter,
+    getParameters,
+    getParametersByPath,
+    getParameterSync,
+    getParametersSync,
+    getParametersByPathSync,
+} from 'aws-param-store';
+
+declare let bool: boolean;
+declare let query: ParameterQuery;
+declare let psName: SSM.Types.PSParameterName;
+declare let psNames: SSM.Types.ParameterNameList;
+declare let options: SSM.Types.ClientConfiguration;
+declare let paramResult: SSM.Types.Parameter;
+declare let paramsResult: SSM.Types.GetParametersResult;
+declare let paramsByPathResult: SSM.Types.ParameterList;
+declare let allParamResults: SSM.Types.Parameter | SSM.Types.GetParametersByPathResult | SSM.Types.ParameterList;
+declare let promiseParamResult: Promise<SSM.Types.Parameter>;
+declare let promiseParamsResult: Promise<SSM.Types.GetParametersResult>;
+declare let promiseParamsByPathResult: Promise<SSM.Types.ParameterList>;
+declare let promiseAllParamResults: Promise<typeof allParamResults>;
+
+query = parameterQuery();
+
+query.path(psName);
+query.named(psName);
+query.named(psNames);
+query.decryption(bool);
+query.recursive(bool);
+
+promiseAllParamResults = query.execute();
+allParamResults = query.executeSync();
+
+// test chaining
+query = query
+.path(psName)
+.named(psName)
+.named(psNames)
+.decryption(bool)
+.recursive(bool);
+
+promiseAllParamResults = query
+.path(psName)
+.named(psName)
+.named(psNames)
+.decryption(bool)
+.recursive(bool)
+.execute();
+
+allParamResults = query
+.path(psName)
+.named(psName)
+.named(psNames)
+.decryption(bool)
+.recursive(bool)
+.executeSync();
+
+promiseParamResult = getParameter(psName);
+promiseParamResult = getParameter(psName, options);
+
+promiseParamsResult = getParameters(psNames);
+promiseParamsResult = getParameters(psNames, options);
+
+promiseParamsByPathResult = getParametersByPath(psNames);
+promiseParamsByPathResult = getParametersByPath(psNames, options);
+
+paramResult = getParameterSync(psName);
+paramResult = getParameterSync(psName, options);
+
+paramsResult = getParametersSync(psNames);
+paramsResult = getParametersSync(psNames, options);
+
+paramsByPathResult = getParametersByPathSync(psNames);
+paramsByPathResult = getParametersByPathSync(psNames, options);
diff --git a/types/aws-param-store/index.d.ts b/types/aws-param-store/index.d.ts
new file mode 100644
index 0000000000..c35edef688
--- /dev/null
+++ b/types/aws-param-store/index.d.ts
@@ -0,0 +1,48 @@
+// Type definitions for aws-param-store 2.1
+// Project: https://github.com/vandium-io/aws-param-store#readme
+// Definitions by: Jason Gray <https://github.com/jasonthomasgray>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+import { SSM } from 'aws-sdk';
+
+export function getParameter(
+    name: SSM.Types.PSParameterName,
+    options?: SSM.Types.ClientConfiguration
+): Promise<SSM.Types.Parameter>;
+
+export function getParameterSync(
+    name: SSM.Types.PSParameterName,
+    options?: SSM.Types.ClientConfiguration
+): SSM.Types.Parameter;
+
+export function getParameters(
+    names: SSM.Types.ParameterNameList,
+    options?: SSM.Types.ClientConfiguration
+): Promise<SSM.Types.GetParametersResult>;
+
+export function getParametersSync(
+    names: SSM.Types.ParameterNameList,
+    options?: SSM.Types.ClientConfiguration
+): SSM.Types.GetParametersResult;
+
+export function getParametersByPath(
+    path: SSM.Types.ParameterNameList,
+    options?: SSM.Types.ClientConfiguration
+): Promise<SSM.Types.ParameterList>;
+
+export function getParametersByPathSync(
+    path: SSM.Types.ParameterNameList,
+    options?: SSM.Types.ClientConfiguration
+): SSM.Types.ParameterList;
+
+export interface ParameterQuery {
+    path(path: SSM.Types.PSParameterName): ParameterQuery;
+    named(nameOrNames: SSM.Types.PSParameterName | SSM.Types.ParameterNameList): ParameterQuery;
+    decryption(enabled: boolean): ParameterQuery;
+    recursive(enabled: boolean): ParameterQuery;
+    execute(): Promise<SSM.Types.ParameterList | SSM.Types.Parameter | SSM.Types.GetParametersResult>;
+    executeSync(): SSM.Types.ParameterList | SSM.Types.Parameter | SSM.Types.GetParametersResult;
+}
+
+export function parameterQuery(options?: SSM.Types.ClientConfiguration): ParameterQuery;
diff --git a/types/aws-param-store/package.json b/types/aws-param-store/package.json
new file mode 100644
index 0000000000..abb680d4ac
--- /dev/null
+++ b/types/aws-param-store/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "aws-sdk": "^2.325.0"
+    }
+}
diff --git a/types/aws-param-store/tsconfig.json b/types/aws-param-store/tsconfig.json
new file mode 100644
index 0000000000..2857e45680
--- /dev/null
+++ b/types/aws-param-store/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "aws-param-store-tests.ts"
+    ]
+}
diff --git a/types/fastify-multipart/tslint.json b/types/aws-param-store/tslint.json
similarity index 100%
rename from types/fastify-multipart/tslint.json
rename to types/aws-param-store/tslint.json
diff --git a/types/axios-case-converter/axios-case-converter-tests.ts b/types/axios-case-converter/axios-case-converter-tests.ts
new file mode 100644
index 0000000000..77fa927976
--- /dev/null
+++ b/types/axios-case-converter/axios-case-converter-tests.ts
@@ -0,0 +1,6 @@
+import axios from "axios";
+import applyConverters from "axios-case-converter";
+
+applyConverters(); // $ExpectError
+
+applyConverters(axios.create()); // $ExpectType AxiosInstance
diff --git a/types/axios-case-converter/index.d.ts b/types/axios-case-converter/index.d.ts
new file mode 100644
index 0000000000..d1dce4d7f3
--- /dev/null
+++ b/types/axios-case-converter/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for axios-case-converter 0.3
+// Project: https://github.com/mpyw/axios-case-converter, https://github.com/mpyw/axios-interceptor-change-case
+// Definitions by: Derek Kniffin <https://github.com/dkniffin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+import { AxiosInstance } from "axios";
+
+export default function applyConverters(axios: AxiosInstance): AxiosInstance;
diff --git a/types/axios-case-converter/package.json b/types/axios-case-converter/package.json
new file mode 100644
index 0000000000..ab98e74e0b
--- /dev/null
+++ b/types/axios-case-converter/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "axios": "^0.16.1"
+    }
+}
diff --git a/types/axios-case-converter/tsconfig.json b/types/axios-case-converter/tsconfig.json
new file mode 100644
index 0000000000..fb3102b6eb
--- /dev/null
+++ b/types/axios-case-converter/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "axios-case-converter-tests.ts"
+    ]
+}
diff --git a/types/fastify-static/tslint.json b/types/axios-case-converter/tslint.json
similarity index 100%
rename from types/fastify-static/tslint.json
rename to types/axios-case-converter/tslint.json
diff --git a/types/babel-code-frame/index.d.ts b/types/babel-code-frame/index.d.ts
index 19d18b6df8..7b3f3a2f37 100644
--- a/types/babel-code-frame/index.d.ts
+++ b/types/babel-code-frame/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for babel-code-frame 6.20
-// Project: https://github.com/babel/babel/tree/master/packages
+// Project: https://github.com/babel/babel/tree/master/packages, https://babeljs.io
 // Definitions by: Mohsen Azimi <https://github.com/mohsen1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/babel-core/index.d.ts b/types/babel-core/index.d.ts
index 3a6da1b49d..e1ff0114c1 100644
--- a/types/babel-core/index.d.ts
+++ b/types/babel-core/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for babel-core 6.25
-// Project: https://github.com/babel/babel/tree/master/packages/babel-core
+// Project: https://github.com/babel/babel/tree/master/packages/babel-core, https://babeljs.io
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/babel-generator/index.d.ts b/types/babel-generator/index.d.ts
index 8afeca4cd1..6eef6fd899 100644
--- a/types/babel-generator/index.d.ts
+++ b/types/babel-generator/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for babel-generator 6.25
-// Project: https://github.com/babel/babel/tree/master/packages/babel-generator
+// Project: https://github.com/babel/babel/tree/master/packages/babel-generator, https://babeljs.io
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Johnny Estilles <https://github.com/johnnyestilles>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/babel-template/index.d.ts b/types/babel-template/index.d.ts
index 50b759c3f5..176d02ddec 100644
--- a/types/babel-template/index.d.ts
+++ b/types/babel-template/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for babel-template 6.25
-// Project: https://github.com/babel/babel/tree/master/packages/babel-template
+// Project: https://github.com/babel/babel/tree/master/packages/babel-template, https://babeljs.io
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/babel-traverse/index.d.ts b/types/babel-traverse/index.d.ts
index 5c18c3ff29..fa754107af 100644
--- a/types/babel-traverse/index.d.ts
+++ b/types/babel-traverse/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for babel-traverse 6.25
-// Project: https://github.com/babel/babel/tree/master/packages/babel-traverse
+// Project: https://github.com/babel/babel/tree/master/packages/babel-traverse, https://babeljs.io
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
 //                 Ryan Petrich <https://github.com/rpetrich>
diff --git a/types/babel-types/index.d.ts b/types/babel-types/index.d.ts
index c464c4bc3f..d37cdf0a76 100644
--- a/types/babel-types/index.d.ts
+++ b/types/babel-types/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for babel-types 7.0
-// Project: https://github.com/babel/babel/tree/master/packages/babel-types
+// Project: https://github.com/babel/babel/tree/master/packages/babel-types, https://babeljs.io
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Sam Baxter <https://github.com/baxtersa>
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
diff --git a/types/babel__code-frame/index.d.ts b/types/babel__code-frame/index.d.ts
index 5a32040bb2..8941e7ff49 100644
--- a/types/babel__code-frame/index.d.ts
+++ b/types/babel__code-frame/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @babel/code-frame 7.0
-// Project: https://github.com/babel/babel/tree/master/packages/babel-code-frame
+// Project: https://github.com/babel/babel/tree/master/packages/babel-code-frame, https://babeljs.io
 // Definitions by: Mohsen Azimi <https://github.com/mohsen1>
 //                 Forbes Lindesay <https://github.com/ForbesLindesay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/babel__core/index.d.ts b/types/babel__core/index.d.ts
index eb39d90a58..66501d24db 100644
--- a/types/babel__core/index.d.ts
+++ b/types/babel__core/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @babel/core 7.0
-// Project: https://github.com/babel/babel/tree/master/packages/babel-core
+// Project: https://github.com/babel/babel/tree/master/packages/babel-core, https://babeljs.io
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
 //                 Melvin Groenhoff <https://github.com/mgroenhoff>
diff --git a/types/babel__generator/index.d.ts b/types/babel__generator/index.d.ts
index 9b6a9fbc1c..d229c9855f 100644
--- a/types/babel__generator/index.d.ts
+++ b/types/babel__generator/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @babel/generator 7.0
-// Project: https://github.com/babel/babel/tree/master/packages/babel-generator
+// Project: https://github.com/babel/babel/tree/master/packages/babel-generator, https://babeljs.io
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Johnny Estilles <https://github.com/johnnyestilles>
 //                 Melvin Groenhoff <https://github.com/mgroenhoff>
diff --git a/types/babel__template/index.d.ts b/types/babel__template/index.d.ts
index 8750e52d8e..05084359f6 100644
--- a/types/babel__template/index.d.ts
+++ b/types/babel__template/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @babel/template 7.0
-// Project: https://github.com/babel/babel/tree/master/packages/babel-template
+// Project: https://github.com/babel/babel/tree/master/packages/babel-template, https://babeljs.io
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
 //                 Melvin Groenhoff <https://github.com/mgroenhoff>
diff --git a/types/babel__traverse/babel__traverse-tests.ts b/types/babel__traverse/babel__traverse-tests.ts
index 70f8c5f0b6..98a0338021 100644
--- a/types/babel__traverse/babel__traverse-tests.ts
+++ b/types/babel__traverse/babel__traverse-tests.ts
@@ -150,3 +150,8 @@ const VisitorStateTest: Visitor<SomeVisitorState> = {
         }
     }
 };
+
+const VisitorAliasTest: Visitor = {
+    Function() {},
+    Expression() {},
+};
diff --git a/types/babel__traverse/index.d.ts b/types/babel__traverse/index.d.ts
index 89e242129b..148f5dd7af 100644
--- a/types/babel__traverse/index.d.ts
+++ b/types/babel__traverse/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @babel/traverse 7.0
-// Project: https://github.com/babel/babel/tree/master/packages/babel-traverse
+// Project: https://github.com/babel/babel/tree/master/packages/babel-traverse, https://babeljs.io
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
 //                 Ryan Petrich <https://github.com/rpetrich>
@@ -145,6 +145,8 @@ export class Binding {
 
 export type Visitor<S = {}> = VisitNodeObject<S, Node> & {
     [Type in Node["type"]]?: VisitNode<S, Extract<Node, { type: Type; }>>;
+} & {
+    [K in keyof t.Aliases]?: VisitNode<S, t.Aliases[K]>
 };
 
 export type VisitNode<S, P> = VisitNodeFunction<S, P> | VisitNodeObject<S, P>;
diff --git a/types/babel__traverse/package.json b/types/babel__traverse/package.json
index 2442a952db..47a2d3dc48 100644
--- a/types/babel__traverse/package.json
+++ b/types/babel__traverse/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.3.0"
     }
 }
diff --git a/types/babylon/index.d.ts b/types/babylon/index.d.ts
index b179f6f357..90c9e3a90d 100644
--- a/types/babylon/index.d.ts
+++ b/types/babylon/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for babylon 6.16
-// Project: https://github.com/babel/babylon
+// Project: https://github.com/babel/babylon, https://babeljs.io
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/backbone-associations/index.d.ts b/types/backbone-associations/index.d.ts
index d0681c6651..c93eb965e8 100644
--- a/types/backbone-associations/index.d.ts
+++ b/types/backbone-associations/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Backbone-associations 0.6.4
-// Project: https://github.com/dhruvaray/backbone-associations/
+// Project: http://dhruvaray.github.io/backbone-associations
 // Definitions by: Craig Brett <https://github.com/craigbrett17>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/backbone-relational/backbone-relational-tests.ts b/types/backbone-relational/backbone-relational-tests.ts
index 6e0135fcd9..c8b94c4029 100644
--- a/types/backbone-relational/backbone-relational-tests.ts
+++ b/types/backbone-relational/backbone-relational-tests.ts
@@ -1,13 +1,13 @@
-import * as Backbone from 'backbone';
+import * as BackboneRel from 'backbone-relational';
 
-class House extends Backbone.RelationalModel {
+class House extends BackboneRel.Model {
     // The 'relations' property, on the House's prototype. Initialized separately for each
     // instance of House. Each relation must define (as a minimum) the 'type', 'key' and
     // 'relatedModel'. Options include 'includeInJSON', 'createModels' and 'reverseRelation'.
 
     relations = [
         {
-            type: Backbone.HasMany, // Use the type, or the string 'HasOne' or 'HasMany'.
+            type: BackboneRel.HasMany, // Use the type, or the string 'HasOne' or 'HasMany'.
             key: 'occupants',
             relatedModel: 'Person',
             includeInJSON: true,
@@ -20,14 +20,14 @@ class House extends Backbone.RelationalModel {
 
 }
 
-class Person extends Backbone.RelationalModel {
+class Person extends BackboneRel.Model {
     relations = [
         { // Create a (recursive) one-to-one relationship
-            type: Backbone.HasOne,
+            type: BackboneRel.HasOne,
             key: 'user',
             relatedModel: 'User',
             reverseRelation: {
-                type: Backbone.HasOne,
+                type: BackboneRel.HasOne,
                 key: 'person'
             }
         }
@@ -39,7 +39,7 @@ class Person extends Backbone.RelationalModel {
     }
 }
 
-class User extends Backbone.RelationalModel {
+class User extends BackboneRel.Model {
 
 }
 
diff --git a/types/backbone-relational/index.d.ts b/types/backbone-relational/index.d.ts
index 84406fb60a..e9cc5e71ff 100644
--- a/types/backbone-relational/index.d.ts
+++ b/types/backbone-relational/index.d.ts
@@ -1,185 +1,169 @@
-// Type definitions for Backbone-relational 0.8.5
+// Type definitions for Backbone-relational 0.10.0
 // Project: http://backbonerelational.org/
 // Definitions by: Eirik Hoem <https://github.com/eirikhm>
+//                 Julian Gonggrijp <https://github.com/jgonggrijp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
-import * as Backbone from 'backbone';
+import { EventsMixin, Events, Model as BModel, Collection } from 'backbone';
 
-declare module 'backbone' {
-    class RelationalModel extends Model {
-        /**
-        * Do not use, prefer TypeScript's extend functionality.
-        **/
-        //private static extend(properties:any, classProperties?:any):any;
+export class Model extends BModel {
+    /**
+    * Do not use, prefer TypeScript's extend functionality.
+    **/
+    //private static extend(properties:any, classProperties?:any):any;
 
-        relations:any;
-        subModelTypes:any;
-        subModelTypeAttribute:any;
+    relations:any;
+    subModelTypes:any;
+    subModelTypeAttribute:any;
 
 
-        initializeRelations(options:any):void;
+    initializeRelations(options:any):void;
 
-        updateRelations(options:any):void;
+    updateRelations(options:any):void;
 
-        queue(func:any):void;
+    queue(func:any):void;
 
-        processQueue():void;
+    processQueue():void;
 
-        getRelation(name:string):Relation;
+    getRelation(name:string):Relation;
 
-        getRelations():Relation[];
+    getRelations():Relation[];
 
-        fetchRelated(key:string, options?:any, update?:boolean):any;
+    fetchRelated(key:string, options?:any, update?:boolean):any;
 
-        toJSON(options?: any):any;
+    toJSON(options?: any):any;
 
-        static setup();
+    static setup();
 
-        static build(attributes:any, options?:any);
+    static build(attributes:any, options?:any);
 
-        static findOrCreate(attributes:string, options?:any);
+    static findOrCreate(attributes:string, options?:any);
 
-        static findOrCreate(attributes:number, options?:any);
+    static findOrCreate(attributes:number, options?:any);
 
-        static findOrCreate(attributes:any, options?:any);
-    }
+    static findOrCreate(attributes:any, options?:any);
+}
 
-    export class Relation extends Model {
+export class Relation extends BModel {
 
-        options:any;
-        instance:any;
-        key:any;
-        keyContents:any;
-        relatedModel:any;
-        relatedCollection:any;
-        reverseRelation:any;
-        related:any;
+    options:any;
+    instance:any;
+    key:any;
+    keyContents:any;
+    relatedModel:any;
+    relatedCollection:any;
+    reverseRelation:any;
+    related:any;
 
-        checkPreconditions():boolean;
+    checkPreconditions():boolean;
 
-        setRelated(related:Model):void;
+    setRelated(related:BModel):void;
 
-        setRelated(related:Collection<Model>):void;
+    setRelated(related:Collection<BModel>):void;
 
-        getReverseRelations(model:RelationalModel):Relation;
+    getReverseRelations(model:Model):Relation;
 
-        destroy():void;
-    }
+    destroy():void;
+}
 
-    export class HasOne extends Relation {
-        collectionType:any;
+export class HasOne extends Relation {
+    collectionType:any;
 
-        findRelated(options:any):Model;
+    findRelated(options:any):BModel;
 
-        setKeyContents(keyContents:string):void;
+    setKeyContents(keyContents:string):void;
 
-        setKeyContents(keyContents:string[]):void;
+    setKeyContents(keyContents:string[]):void;
 
-        setKeyContents(keyContents:number):void;
+    setKeyContents(keyContents:number):void;
 
-        setKeyContents(keyContents:number[]):void;
+    setKeyContents(keyContents:number[]):void;
 
-        setKeyContents(keyContents:Collection<Model>):void;
+    setKeyContents(keyContents:Collection<BModel>):void;
 
-        onChange(model:Model, attr:any, options:any):void;
+    onChange(model:BModel, attr:any, options:any):void;
 
-        handleAddition(model:Model, coll:Collection<Model>, options:any):void;
+    handleAddition(model:BModel, coll:Collection<BModel>, options:any):void;
 
-        handleRemoval(model:Model, coll:Collection<Model>, options:any):void;
+    handleRemoval(model:BModel, coll:Collection<BModel>, options:any):void;
 
-        handleReset(coll:Collection<Model>, options:any):void;
+    handleReset(coll:Collection<BModel>, options:any):void;
 
-        tryAddRelated(model:Model, coll:any, options:any):void;
+    tryAddRelated(model:BModel, coll:any, options:any):void;
 
-        addRelated(model:Model, options:any):void;
+    addRelated(model:BModel, options:any):void;
 
-        removeRelated(model:Model, coll:any, options:any):void;
-
-    }
-
-
-    export class HasMany extends Relation {
-        collectionType:any;
-
-        findRelated(options:any):Model;
-
-        setKeyContents(keyContents:string):void;
-
-        setKeyContents(keyContents:number):void;
-
-        setKeyContents(keyContents:Model):void;
-
-        onChange(model:Model, attr:any, options:any):void;
-
-        tryAddRelated(model:Model, coll:any, options:any):void;
-
-        addRelated(model:Model, options:any):void;
-
-        removeRelated(model:Model, coll:any, options:any):void;
-
-    }
-
-    export class Store implements Events {
-        on(eventName: string, callback?: (...args: any[]) => void, context?: any): any;
-        on(eventMap: EventsHash): any;
-        on(eventName: any, callback?: any, context?: any): any;
-        off(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
-        trigger(eventName: string, ...args: any[]): any;
-        bind(eventName: string, callback: (...args: any[]) => void, context?: any): any;
-        unbind(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
-        once(events: string, callback: (...args: any[]) => void, context?: any): any;
-        listenTo(object: any, events: string, callback: (...args: any[]) => void): any;
-        listenToOnce(object: any, events: string, callback: (...args: any[]) => void): any;
-        stopListening(object?: any, events?: string, callback?: (...args: any[]) => void): any;
-
-        initializeRelation(model, relation, options);
-
-        addModelScope(scope:any):void;
-
-        removeModelScope(scope):void;
-
-        addSubModels(subModelTypes:RelationalModel, superModelType:RelationalModel):void;
-
-        setupSuperModel(modelType:RelationalModel):void;
-
-        addReverseRelation(relation:any):void;
-
-        addOrphanRelation(relation:any):void;
-
-        processOrphanRelations():void;
-
-        retroFitRelation(relation:RelationalModel, create:boolean):Collection<Model>;
-
-        getCollection(type:RelationalModel, create:boolean):Collection<Model>;
-
-        getObjectByName(name:string):any;
-
-
-        resolveIdForItem(type:any, item:any):any;
-
-        static find(type:any, item:string):RelationalModel;
-
-        static find(type:any, item:number):RelationalModel;
-
-        static find(type:any, item:RelationalModel):RelationalModel;
-
-        static find(type:any, item:any):RelationalModel;
-
-        register(model:RelationalModel):void;
-
-        checkId(model:RelationalModel, id:any):void;
-
-        update(model:RelationalModel):void;
-
-        unregister(model:RelationalModel, collection:Collection<Model>, options:any):void;
-
-        reset():void;
-
-
-    }
+    removeRelated(model:BModel, coll:any, options:any):void;
 
 }
 
+
+export class HasMany extends Relation {
+    collectionType:any;
+
+    findRelated(options:any):BModel;
+
+    setKeyContents(keyContents:string):void;
+
+    setKeyContents(keyContents:number):void;
+
+    setKeyContents(keyContents:BModel):void;
+
+    onChange(model:BModel, attr:any, options:any):void;
+
+    tryAddRelated(model:BModel, coll:any, options:any):void;
+
+    addRelated(model:BModel, options:any):void;
+
+    removeRelated(model:BModel, coll:any, options:any):void;
+
+}
+
+export class Store extends EventsMixin implements Events {
+    initializeRelation(model, relation, options);
+
+    addModelScope(scope:any):void;
+
+    removeModelScope(scope):void;
+
+    addSubModels(subModelTypes:Model, superModelType:Model):void;
+
+    setupSuperModel(modelType:Model):void;
+
+    addReverseRelation(relation:any):void;
+
+    addOrphanRelation(relation:any):void;
+
+    processOrphanRelations():void;
+
+    retroFitRelation(relation:Model, create:boolean):Collection<BModel>;
+
+    getCollection(type:Model, create:boolean):Collection<BModel>;
+
+    getObjectByName(name:string):any;
+
+
+    resolveIdForItem(type:any, item:any):any;
+
+    static find(type:any, item:string):Model;
+
+    static find(type:any, item:number):Model;
+
+    static find(type:any, item:Model):Model;
+
+    static find(type:any, item:any):Model;
+
+    register(model:Model):void;
+
+    checkId(model:Model, id:any):void;
+
+    update(model:Model):void;
+
+    unregister(model:Model, collection:Collection<BModel>, options:any):void;
+
+    reset():void;
+
+}
diff --git a/types/backbone-relational/tslint.json b/types/backbone-relational/tslint.json
index a41bf5d19a..65e27fce52 100644
--- a/types/backbone-relational/tslint.json
+++ b/types/backbone-relational/tslint.json
@@ -1,79 +1,24 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
         "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
         "comment-format": false,
         "dt-header": false,
         "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
         "jsdoc-format": false,
         "max-line-length": false,
         "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
         "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
         "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
         "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
         "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
         "one-line": false,
-        "one-variable-per-declaration": false,
         "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
         "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
         "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
         "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
         "typedef-whitespace": false,
         "unified-signatures": false,
-        "void-return": false,
         "whitespace": false
     }
 }
diff --git a/types/backbone.marionette/index.d.ts b/types/backbone.marionette/index.d.ts
index 4edaba87b7..f24d80ff4d 100644
--- a/types/backbone.marionette/index.d.ts
+++ b/types/backbone.marionette/index.d.ts
@@ -1,11 +1,12 @@
 // Type definitions for Marionette 3.3
-// Project: https://github.com/marionettejs/
+// Project: https://github.com/marionettejs/, https://marionettejs.com
 // 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>,
 //                 Ard Timmerman <https://github.com/confususs>,
 //                 J. Joe Koullas <https://github.com/jjoekoullas>
+//                 Julian Gonggrijp <https://github.com/jgonggrijp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -407,20 +408,14 @@ export interface ObjectOptions extends RadioMixinOptions {
  * A base class which other classes can extend from. Object incorporates many
  * backbone conventions and utilities like initialize and Backbone.Events.
  */
-export class Object implements CommonMixin, RadioMixin, Backbone.Events {
+export class Object extends Backbone.EventsMixin implements CommonMixin, RadioMixin, Backbone.Events {
     constructor(options?: ObjectOptions);
 
-    on(eventName: string, callback?: (...args: any[]) => void, context?: any): any;
-    on(eventMap: EventsHash): any;
+    /**
+     * Faulty overgeneralization of Backbone.Events.on, for historical
+     * reasons.
+     */
     on(eventName: any, callback?: any, context?: any): any;
-    off(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
-    trigger(eventName: string, ...args: any[]): any;
-    bind(eventName: string, callback: (...args: any[]) => void, context?: any): any;
-    unbind(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
-    once(events: string, callback: (...args: any[]) => void, context?: any): any;
-    listenTo(object: any, events: string, callback: (...args: any[]) => void): any;
-    listenToOnce(object: any, events: string, callback: (...args: any[]) => void): any;
-    stopListening(object?: any, events?: string, callback?: (...args: any[]) => void): any;
 
     /**
      * Receives a hash of event names and functions and/or function names,
diff --git a/types/backbone.radio/index.d.ts b/types/backbone.radio/index.d.ts
index ac953aa00b..e6682bd52e 100644
--- a/types/backbone.radio/index.d.ts
+++ b/types/backbone.radio/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for Backbone.Radio v0.8.3
 // Project: https://github.com/marionettejs/backbone.radio
 // Definitions by: Peter Palotas <https://github.com/alphaleonis>
+//                 Julian Gonggrijp <https://github.com/jgonggrijp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -71,18 +72,12 @@ declare module "backbone" {
             stopReplying(commandName?: string, callback?: (...args: any[]) => any, context?: any): Requests;
         }
 
-        class Channel implements Commands, Requests, Backbone.Events {
-            on(eventName: string, callback?: (...args: any[]) => void, context?: any): any;
-            on(eventMap: EventsHash): any;
+        class Channel extends Backbone.EventsMixin implements Commands, Requests, Backbone.Events {
+            /**
+             * Faulty overgeneralization of Backbone.Events.on, for historical
+             * reasons.
+             */
             on(eventName: any, callback?: any, context?: any): any;
-            off(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
-            trigger(eventName: string, ...args: any[]): any;
-            bind(eventName: string, callback: (...args: any[]) => void, context?: any): any;
-            unbind(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
-            once(events: string, callback: (...args: any[]) => void, context?: any): any;
-            listenTo(object: any, events: string, callback: (...args: any[]) => void): any;
-            listenToOnce(object: any, events: string, callback: (...args: any[]) => void): any;
-            stopListening(object?: any, events?: string, callback?: (...args: any[]) => void): any;
             channelName: string;
             reset(): Channel;
 
diff --git a/types/backbone/backbone-tests.ts b/types/backbone/backbone-tests.ts
index 563c21634c..c36b92ff3f 100644
--- a/types/backbone/backbone-tests.ts
+++ b/types/backbone/backbone-tests.ts
@@ -15,6 +15,50 @@ function test_events() {
     object.off();
 }
 
+class PubSub implements Backbone.Events {
+    on: Backbone.Events_On<PubSub>;
+    off: Backbone.Events_Off<PubSub>;
+    trigger: Backbone.Events_Trigger<PubSub>;
+    bind: Backbone.Events_On<PubSub>;
+    unbind: Backbone.Events_Off<PubSub>;
+
+    once: Backbone.Events_On<PubSub>;
+    listenTo: Backbone.Events_Listen<PubSub>;
+    listenToOnce: Backbone.Events_Listen<PubSub>;
+    stopListening: Backbone.Events_Stop<PubSub>;
+}
+
+Object.assign(PubSub.prototype, Backbone.Events);
+
+function test_events_shorthands() {
+    let channel1 = new PubSub();
+    let channel2 = new PubSub();
+    let onChange = () => alert('whatever');
+
+    channel1.on("alert", (eventName: string) => alert("Triggered " + eventName));
+    channel1.trigger("alert", "an event");
+
+    channel1.once('invalid', () => { }, this);
+    channel1.once('invalid', () => { });
+    channel1.once({invalid: () => { }, success: () => { }}, this);
+    channel1.once({invalid: () => { }, success: () => { }});
+
+    channel1.off("change", onChange);
+    channel1.off("change");
+    channel1.off(null, onChange);
+    channel1.off(null, null, this);
+    channel1.off();
+
+    channel2.listenTo(channel1, 'invalid', () => { });
+    channel2.listenTo(channel1, {invalid: () => { }, success: () => { }});
+    channel2.listenToOnce(channel1, 'invalid', () => { });
+    channel2.listenToOnce(channel1, {invalid: () => { }, success: () => { }});
+
+    channel2.stopListening(channel1, 'invalid', () => { });
+    channel2.stopListening(channel1, 'invalid');
+    channel2.stopListening(channel1);
+}
+
 class SettingDefaults extends Backbone.Model {
 
     // 'defaults' could be set in one of the following ways:
@@ -272,18 +316,22 @@ namespace v1Changes {
             var model = new Employee;
             model.once('invalid', () => { }, this);
             model.once('invalid', () => { });
+            model.once({invalid: () => { }, success: () => { }}, this);
+            model.once({invalid: () => { }, success: () => { }});
         }
 
         function test_listenTo() {
             var model = new Employee;
             var view = new Backbone.View<Employee>();
             view.listenTo(model, 'invalid', () => { });
+            view.listenTo(model, {invalid: () => { }, success: () => { }});
         }
 
         function test_listenToOnce() {
             var model = new Employee;
             var view = new Backbone.View<Employee>();
             view.listenToOnce(model, 'invalid', () => { });
+            view.listenToOnce(model, {invalid: () => { }, success: () => { }});
         }
 
         function test_stopListening() {
@@ -398,7 +446,7 @@ namespace v1Changes {
     namespace Collection {
         function test_fetch() {
             var collection = new EmployeeCollection;
-            collection.fetch({ 
+            collection.fetch({
                 reset: true,
                 remove: false
             });
diff --git a/types/backbone/index.d.ts b/types/backbone/index.d.ts
index a881284c8f..58e3735f2b 100644
--- a/types/backbone/index.d.ts
+++ b/types/backbone/index.d.ts
@@ -1,9 +1,11 @@
 // Type definitions for Backbone 1.3.3
 // Project: http://backbonejs.org/
+//          https://github.com/jashkenas/backbone
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 //                 Natan Vivo <https://github.com/nvivo>
 //                 kenjiru <https://github.com/kenjiru>
 //                 jjoekoullas <https://github.com/jjoekoullas>
+//                 Julian Gonggrijp <https://github.com/jgonggrijp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -91,44 +93,113 @@ declare namespace Backbone {
         [routePattern: string]: string | {(...urlParts: string[]): void};
     }
 
+    /**
+     * DOM events (used in the events property of a View)
+     */
     interface EventsHash {
         [selector: string]: string | {(eventObject: JQuery.TriggeredEvent): void};
     }
 
-    export const Events: Events;
-    interface Events {
-        on(eventName: string, callback?: (...args: any[]) => void, context?: any): any;
-        on(eventMap: EventsHash): any;
-        off(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
-        trigger(eventName: string, ...args: any[]): any;
-        bind(eventName: string, callback: (...args: any[]) => void, context?: any): any;
-        unbind(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
-
-        once(events: string, callback: (...args: any[]) => void, context?: any): any;
-        listenTo(object: any, events: string, callback: (...args: any[]) => void): any;
-        listenToOnce(object: any, events: string, callback: (...args: any[]) => void): any;
-        stopListening(object?: any, events?: string, callback?: (...args: any[]) => void): any;
+    /**
+     * JavaScript events (used in the methods of the Events interface)
+     */
+    interface EventHandler {
+        (...args: any[]): void;
+    }
+    interface EventMap {
+        [event: string]: EventHandler;
     }
 
-    class ModelBase implements Events {
-        on(eventName: string, callback?: Function, context?: any): any;
-        on(eventMap: EventsHash): any;
-        on(eventName: any, callback?: any, context?: any): any
-        off(eventName?: string, callback?: Function, context?: any): any
-        trigger(eventName: string, ...args: any[]): any
-        bind(eventName: string, callback: Function, context?: any): any
-        unbind(eventName?: string, callback?: Function, context?: any): any
-        once(events: string, callback: Function, context?: any): any
-        listenTo(object: any, events: string, callback: Function):any
-        listenToOnce(object: any, events: string, callback: Function): any
-        stopListening(object?: any, events?: string, callback?: Function): any
+    export const Events: Events;
+    interface Events extends EventsMixin { }
 
+    /**
+     * Helper shorthands for classes that implement the Events interface.
+     * Define your class like this:
+     *
+     * import {
+     *     Events,
+     *     Events_On,
+     *     Events_Off,
+     *     Events_Trigger,
+     *     Events_Listen,
+     *     Events_Stop,
+     * } from 'backbone';
+     *
+     * class YourClass implements Events {
+     *     on: Events_On<YourClass>;
+     *     off: Events_Off<YourClass>;
+     *     trigger: Events_Trigger<YourClass>;
+     *     bind: Events_On<YourClass>;
+     *     unbind: Events_Off<YourClass>;
+     *
+     *     once: Events_On<YourClass>;
+     *     listenTo: Events_Listen<YourClass>;
+     *     listenToOnce: Events_Listen<YourClass>;
+     *     stopListening: Events_Stop<YourClass>;
+     *
+     *     // ... (other methods)
+     * }
+     *
+     * Object.assign(YourClass.prototype, Events);  // can also use _.extend
+     *
+     * If you are just writing a class type declaration that doesn't already
+     * extend some other base class, you can use the EventsMixin instead;
+     * see below.
+     */
+    interface Events_On<BaseT> {
+        <T extends BaseT>(this: T, eventName: string, callback: EventHandler, context?: any): T;
+        <T extends BaseT>(this: T, eventMap: EventMap, context?: any): T;
+    }
+    interface Events_Off<BaseT> {
+        <T extends BaseT>(this: T, eventName?: string, callback?: EventHandler, context?: any): T;
+    }
+    interface Events_Trigger<BaseT> {
+        <T extends BaseT>(this: T, eventName: string, ...args: any[]): T;
+    }
+    interface Events_Listen<BaseT> {
+        <T extends BaseT>(this: T, object: any, events: string, callback: EventHandler): T;
+        <T extends BaseT>(this: T, object: any, eventMap: EventMap): T;
+    }
+    interface Events_Stop<BaseT> {
+        <T extends BaseT>(this: T, object?: any, events?: string, callback?: EventHandler): T;
+    }
+
+    /**
+     * Helper to avoid code repetition in type declarations.
+     * Backbone.Events cannot be extended, hence a separate abstract
+     * class with a different name. Both classes and interfaces can
+     * extend from this helper class to reuse the signatures.
+     *
+     * For class type declarations that already extend another base
+     * class, and for actual class definitions, please see the
+     * Events_* interfaces above.
+     */
+    abstract class EventsMixin implements Events {
+        on(eventName: string, callback: EventHandler, context?: any): this;
+        on(eventMap: EventMap, context?: any): this;
+        off(eventName?: string, callback?: EventHandler, context?: any): this;
+        trigger(eventName: string, ...args: any[]): this;
+        bind(eventName: string, callback: EventHandler, context?: any): this;
+        bind(eventMap: EventMap, context?: any): this;
+        unbind(eventName?: string, callback?: EventHandler, context?: any): this;
+
+        once(events: string, callback: EventHandler, context?: any): this;
+        once(eventMap: EventMap, context?: any): this;
+        listenTo(object: any, events: string, callback: EventHandler): this;
+        listenTo(object: any, eventMap: EventMap): this;
+        listenToOnce(object: any, events: string, callback: EventHandler): this;
+        listenToOnce(object: any, eventMap: EventMap): this;
+        stopListening(object?: any, events?: string, callback?: EventHandler): this;
+    }
+
+    class ModelBase extends EventsMixin {
         parse(response: any, options?: any): any;
         toJSON(options?: any): any;
         sync(...arg: any[]): JQueryXHR;
     }
 
-    class Model extends ModelBase {
+    class Model extends ModelBase implements Events {
 
         /**
         * Do not use, prefer TypeScript's extend functionality.
@@ -229,7 +300,7 @@ declare namespace Backbone {
         matches(attrs: any): boolean;
     }
 
-    class Collection<TModel extends Model> extends ModelBase {
+    class Collection<TModel extends Model> extends ModelBase implements Events {
 
         /**
         * Do not use, prefer TypeScript's extend functionality.
@@ -367,7 +438,7 @@ declare namespace Backbone {
         without(...values: TModel[]): TModel[];
     }
 
-    class Router extends EventSignatures {
+    class Router extends EventsMixin implements Events {
 
         /**
         * Do not use, prefer TypeScript's extend functionality.
@@ -396,7 +467,7 @@ declare namespace Backbone {
 
     var history: History;
 
-    class History extends EventSignatures {
+    class History extends EventsMixin implements Events {
 
         handlers: any[];
         interval: number;
@@ -433,7 +504,7 @@ declare namespace Backbone {
       attributes?: {[id: string]: any};
     }
 
-    class View<TModel extends Model> extends EventSignatures {
+    class View<TModel extends Model> extends EventsMixin implements Events {
 
         /**
         * Do not use, prefer TypeScript's extend functionality.
@@ -485,21 +556,3 @@ declare namespace Backbone {
     function noConflict(): typeof Backbone;
     var $: JQueryStatic;
 }
-
-/**
- * This is not for external use and is only here as a convenient way to
- * specify signatures for internal implementers of Backbone.Events
- */
-declare abstract class EventSignatures implements Backbone.Events {
-        on(eventName: string, callback?: (...args: any[]) => void, context?: any): any;
-        on(eventMap: Backbone.EventsHash): any;
-        off(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
-        trigger(eventName: string, ...args: any[]): any;
-        bind(eventName: string, callback: (...args: any[]) => void, context?: any): any;
-        unbind(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
-
-        once(events: string, callback: (...args: any[]) => void, context?: any): any;
-        listenTo(object: any, events: string, callback: (...args: any[]) => void): any;
-        listenToOnce(object: any, events: string, callback: (...args: any[]) => void): any;
-        stopListening(object?: any, events?: string, callback?: (...args: any[]) => void): any;
-}
\ No newline at end of file
diff --git a/types/backbone/tslint.json b/types/backbone/tslint.json
index d67ffb3a73..f5ae3a6788 100644
--- a/types/backbone/tslint.json
+++ b/types/backbone/tslint.json
@@ -8,73 +8,35 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
-        "eofline": false,
         "export-just-namespace": false,
-        "import-spacing": false,
         "interface-name": false,
-        "interface-over-type-literal": false,
         "jsdoc-format": false,
         "max-line-length": false,
         "member-access": false,
         "new-parens": false,
         "no-angle-bracket-type-assertion": false,
         "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
         "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
         "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
         "no-namespace": false,
         "no-object-literal-type-assertion": false,
         "no-padding": false,
         "no-redundant-jsdoc": false,
         "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
         "no-unnecessary-generics": false,
         "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
         "no-var-keyword": false,
-        "no-var-requires": false,
         "no-void-expression": false,
-        "no-trailing-whitespace": false,
         "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
         "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
         "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
         "prefer-method-signature": false,
         "prefer-template": false,
-        "radix": false,
         "semicolon": false,
         "space-before-function-paren": false,
-        "space-within-parens": false,
         "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
         "typedef-whitespace": false,
         "unified-signatures": false,
-        "void-return": false,
         "whitespace": false
     }
 }
diff --git a/types/baidu-app/index.d.ts b/types/baidu-app/index.d.ts
index 244e9dd473..ff71f9c012 100644
--- a/types/baidu-app/index.d.ts
+++ b/types/baidu-app/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for swan-app 2.2
+// Type definitions for non-npm package swan-app 2.2
 // Project: https://smartprogram.baidu.com/docs/develop/tutorial/codedir/
 // Definitions by: taoqf <https://github.com/taoqf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/bandagedbd__bdapi/index.d.ts b/types/bandagedbd__bdapi/index.d.ts
index 4792992374..d5b309d39f 100644
--- a/types/bandagedbd__bdapi/index.d.ts
+++ b/types/bandagedbd__bdapi/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for bdapi 0.2
+// Type definitions for non-npm package bdapi 0.2
 // Project: https://github.com/rauenzi/BetterDiscordApp
 // Definitions by: Ari Seyhun <https://github.com/Acidic9>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/base-64/index.d.ts b/types/base-64/index.d.ts
index 26cb9c4a41..7dc6af6f1d 100644
--- a/types/base-64/index.d.ts
+++ b/types/base-64/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for base-64 0.1
-// Project: https://github.com/mathiasbynens/base64
+// Project: https://github.com/mathiasbynens/base64, http://mths.be/base64
 // Definitions by: Dolan Miu <https://github.com/dolanmiu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/behavior3/index.d.ts b/types/behavior3/index.d.ts
index 7cb3ad9deb..2188ec02cf 100644
--- a/types/behavior3/index.d.ts
+++ b/types/behavior3/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for behavior3 0.2
+// Type definitions for non-npm package behavior3 0.2
 // Project: https://github.com/behavior3/behavior3js
 // Definitions by: carry.wu <https://github.com/carrrywu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/better-sqlite3/better-sqlite3-tests.ts b/types/better-sqlite3/better-sqlite3-tests.ts
index dddd69bea8..f5a6c0e070 100644
--- a/types/better-sqlite3/better-sqlite3-tests.ts
+++ b/types/better-sqlite3/better-sqlite3-tests.ts
@@ -69,3 +69,12 @@ trans.default('name');
 trans.deferred('name');
 trans.immediate('name');
 trans.exclusive('name');
+
+const transTyped = db.transaction((param: number) => stmt.all(param));
+transTyped(1);
+trans.default(1);
+trans.deferred(1);
+trans.immediate(1);
+trans.exclusive(1);
+// $ExpectError
+transTyped('name');
diff --git a/types/better-sqlite3/index.d.ts b/types/better-sqlite3/index.d.ts
index 2c027ff6e6..32a71d96af 100644
--- a/types/better-sqlite3/index.d.ts
+++ b/types/better-sqlite3/index.d.ts
@@ -4,10 +4,17 @@
 //                 Mathew Rumsey <https://github.com/matrumz>
 //                 Santiago Aguilar <https://github.com/sant123>
 //                 Alessandro Vergani <https://github.com/loghorn>
+//                 Andrew Kaiser <https://github.com/andykais>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
 
 import Integer = require("integer");
 
+type VariableArgFunction = (...params: any[]) => any;
+type ArgumentTypes<F extends VariableArgFunction> = F extends (...args: infer A) => any
+  ? A
+  : never;
+
 declare namespace BetterSqlite3 {
     interface Statement {
         database: Database;
@@ -34,12 +41,12 @@ declare namespace BetterSqlite3 {
         type: string | null;
     }
 
-    interface Transaction {
-        (...params: any[]): any;
-        default(...params: any[]): any;
-        deferred(...params: any[]): any;
-        immediate(...params: any[]): any;
-        exclusive(...params: any[]): any;
+    interface Transaction<F extends VariableArgFunction> {
+        (...params: ArgumentTypes<F>): any;
+        default(...params: ArgumentTypes<F>): any;
+        deferred(...params: ArgumentTypes<F>): any;
+        immediate(...params: ArgumentTypes<F>): any;
+        exclusive(...params: ArgumentTypes<F>): any;
     }
 
     interface Database {
@@ -50,7 +57,7 @@ declare namespace BetterSqlite3 {
         inTransaction: boolean;
 
         prepare(source: string): Statement;
-        transaction(fn: (...params: any[]) => any): Transaction;
+        transaction<F extends VariableArgFunction>(fn: F): Transaction<F>;
         exec(source: string): this;
         pragma(source: string, options?: Database.PragmaOptions): any;
         checkpoint(databaseName?: string): this;
@@ -113,7 +120,7 @@ declare namespace Database {
     type SqliteError = typeof SqliteError;
     type Statement = BetterSqlite3.Statement;
     type ColumnDefinition = BetterSqlite3.ColumnDefinition;
-    type Transaction = BetterSqlite3.Transaction;
+    type Transaction = BetterSqlite3.Transaction<VariableArgFunction>;
     type Database = BetterSqlite3.Database;
 }
 
diff --git a/types/bip38/index.d.ts b/types/bip38/index.d.ts
index 8842c6a241..b38794f694 100644
--- a/types/bip38/index.d.ts
+++ b/types/bip38/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for bip38 2.0
-// Project: https://github.com/bitcoinjs/bip38
+// Project: https://github.com/bitcoinjs/bip38, http://cryptocoinjs.com/modules/currency/bip38
 // Definitions by: Satana Charuwichitratana <https://github.com/micksatana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/bip39/index.d.ts b/types/bip39/index.d.ts
index 6894ac3b30..0cfbbe4f4d 100644
--- a/types/bip39/index.d.ts
+++ b/types/bip39/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for bip39 2.4
-// Project: https://github.com/bitcoinjs/bip39
+// Project: https://github.com/bitcoinjs/bip39, https://github.com/weilu/bip39
 // Definitions by: Satana Charuwichitratana <https://github.com/micksatana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/bittorrent-protocol/index.d.ts b/types/bittorrent-protocol/index.d.ts
index 7c205edc33..778eee25e1 100644
--- a/types/bittorrent-protocol/index.d.ts
+++ b/types/bittorrent-protocol/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for bittorrent-protocol 2.2
-// Project: https://github.com/feross/bittorrent-protocol#readme
+// Project: https://github.com/webtorrent/bittorrent-protocol
 // Definitions by: Feross Aboukhadijeh <https://github.com/feross>, Tomasz Łaziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/bluebird-global/index.d.ts b/types/bluebird-global/index.d.ts
index c82f91fc30..da33188dd1 100644
--- a/types/bluebird-global/index.d.ts
+++ b/types/bluebird-global/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for bluebird 3.5
-// Project: https://github.com/petkaantonov/bluebird
+// Project: https://github.com/kaatt/bluebird-global
 // Definitions by: d-ph <https://github.com/d-ph>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/bluebird-retry/index.d.ts b/types/bluebird-retry/index.d.ts
index 7192ff90a3..f2c930b6e0 100644
--- a/types/bluebird-retry/index.d.ts
+++ b/types/bluebird-retry/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for bluebird-retry 0.11
-// Project: https://github.com/jut-io/bluebird-retry
+// Project: https://github.com/demmer/bluebird-retry
 // Definitions by: Pascal Vomhoff <https://github.com/pvomhoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/bootstrap-colorpicker/bootstrap-colorpicker-tests.ts b/types/bootstrap-colorpicker/bootstrap-colorpicker-tests.ts
new file mode 100644
index 0000000000..a8be275b39
--- /dev/null
+++ b/types/bootstrap-colorpicker/bootstrap-colorpicker-tests.ts
@@ -0,0 +1,77 @@
+$(() => {
+    $('#cp1').colorpicker();
+
+    $('#cp2').colorpicker();
+
+    $('#cp3').colorpicker({
+        color: '#AA3399',
+        format: 'rgb'
+    });
+
+    $('#cp4').colorpicker().on('changeColor', (e) => {
+        $('body')[0].style.backgroundColor = e.color.toString('rgba');
+    });
+
+    $('#cp5').colorpicker({
+        color: "transparent",
+        format: "hex"
+    });
+
+    $('#cp6').colorpicker({
+        color: "#88cc33",
+        horizontal: true
+    });
+
+    $('#cp7').colorpicker({
+        color: '#ffaa00',
+        container: true,
+        inline: true
+    });
+
+    $('#cp8').colorpicker({
+        colorSelectors: {
+            black: '#000000',
+            white: '#ffffff',
+            red: '#FF0000',
+            default: '#777777',
+            primary: '#337ab7',
+            success: '#5cb85c',
+            info: '#5bc0de',
+            warning: '#f0ad4e',
+            danger: '#d9534f'
+        }
+    });
+
+    $('#cp9').colorpicker({
+        customClass: 'colorpicker-2x',
+        sliders: {
+            saturation: {
+                maxLeft: 200,
+                maxTop: 200
+            },
+            hue: {
+                maxTop: 200
+            },
+            alpha: {
+                maxTop: 200
+            }
+        }
+    });
+
+    $('.disable-button').click((e) => {
+        e.preventDefault();
+
+        $('#cp10').colorpicker('disable');
+    });
+
+    $('.enable-button').click((e) => {
+        e.preventDefault();
+
+        $('#cp10').colorpicker('enable');
+    });
+
+    $('#cp10').colorpicker();
+
+
+    $('#cp11').colorpicker();
+});
\ No newline at end of file
diff --git a/types/bootstrap-colorpicker/index.d.ts b/types/bootstrap-colorpicker/index.d.ts
new file mode 100644
index 0000000000..e0a0396d0c
--- /dev/null
+++ b/types/bootstrap-colorpicker/index.d.ts
@@ -0,0 +1,270 @@
+// Type definitions for bootstrap-colorpicker 2.5
+// Project: https://github.com/farbelous/bootstrap-colorpicker/tree/v2.x, https://farbelous.github.io/bootstrap-colorpicker
+// Definitions by: Aleksandar Manukov <https://github.com/aleksandar-manukov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+type ColorFormat = 'hex' | 'rgb' | 'rgba';
+
+type ColorPickerAlignOptions = 'right' | 'left';
+
+type ColorPickerEvents = 'create' |
+    'showPicker' |
+    'hidePicker' |
+    'changeColor' |
+    'disable' |
+    'enable' |
+    'destroy';
+
+/**
+ * You can set colorpicker options either as a plugin parameter or data-* attributes
+ */
+interface ColorPickerOptions {
+    /**
+     * If not false, forces the color format to be hex, rgb or rgba, otherwise the format is automatically detected.
+     * 
+     * Default: false
+     */
+    format?: ColorFormat;
+
+    /**
+     * If not false, sets the color to this value.
+     * 
+     * Default: false
+     */
+    color?: string;
+
+    /**
+     * If not false, the picker will be contained inside this element, otherwise it will be appended to the document body.
+     * 
+     * Default: false
+     */
+    container?: boolean;
+
+    /**
+     * Children selector for the component or element that trigger the colorpicker and which background color will change (needs an inner <i> element).
+     * 
+     * Default: '.add-on, .input-group-addon'
+     */
+    component?: string | JQuery;
+
+    /**
+     * Children selector for the input that will store the picker selected value.
+     * 
+     * Default: 'input'
+     */
+    input?: string | JQuery;
+
+    /**
+     * If true, put a '#' (number sign) before hex strings.
+     * 
+     * Default: true
+     */
+    hexNumberSignPrefix?: boolean;
+
+    /**
+     * If true, the hue and alpha channel bars will be rendered horizontally, above the saturation selector.
+     * 
+     * Default: false
+     */
+    horizontal?: boolean;
+
+    /**
+     * If true, forces to show the colorpicker as an inline element.
+     * 
+     * Default: false
+     */
+    inline?: boolean;
+
+    /**
+     * Vertical sliders configuration (read source code if you really need to tweak this).
+     */
+    sliders?: object;
+
+    /**
+     * Horizontal sliders configuration (read source code if you really need to tweak this).
+     */
+    slidersHorz?: object;
+
+    /**
+     * Customizes the default colorpicker HTML template.
+     */
+    template?: string;
+
+    /**
+     * 	By default, the colorpicker is aligned to the right of the input. If you need to switch it to the left, set align to 'left'.
+     * 
+     * Default: 'right'
+     */
+    align?: ColorPickerAlignOptions;
+
+    /**
+     * Adds this class to the colorpicker widget.
+     * 
+     * Default: null
+     */
+    customClass?: string;
+
+    /**
+     * 	List of pre selected colors (hex format). If you choose one of these colors, the alias is returned instead of the hex code.
+     * 
+     * Default: null
+     */
+    colorSelectors?: object;
+
+    /**
+     * Fallback color string that will be applied when the color failed to be parsed. If null, it will keep the current color if any.
+     * 
+     * Default: null
+     */
+    fallbackColor?: string;
+
+    /**
+     * 	Fallback color format (e.g. when not specified or for alias mode, when selecting non aliased colors)
+     * 
+     * Default: hex
+     */
+    fallbackFormat?: string;
+}
+
+interface Color {
+    colors: {};
+    fallbackFormat: string;
+    fallbackValue: string;
+    hexNumberSignPrefix: boolean;
+    origFormat: string;
+    predefinedColors: {};
+    value: {
+        h: number;
+        s: number;
+        b: number;
+        a: number;
+    };
+
+    /**
+     * Set a new color. The value is parsed and tries to do a quess on the format.
+     */
+    setColor(value: string): void;
+
+    /**
+     * Set the HUE with a value between 0 and 1.
+     */
+    setHue(value: number): void;
+
+    /**
+     * Set the saturation with a value between 0 and 1.
+     */
+    setSaturation(value: number): void;
+
+    /**
+     * Set the brightness with a value between 0 and 1.
+     */
+    setBrightness(value: number): void;
+
+    /**
+     * Set the transparency with a value between 0 and 1.
+     */
+    setAlpha(value: number): void;
+
+    /**
+     * Returns a hash with red, green, blue and alpha.
+     */
+    toRGB(): string;
+
+    /**
+     * Returns a string with HEX format for the current color.
+     */
+    toHex(): string;
+
+    /**
+     * Returns a hash with HSLA values.
+     */
+    toHSL(): string;
+
+    /**
+     * Returns current color as string in specified format.
+     */
+    toString(format: ColorFormat): string;
+}
+
+interface ColorPicker {
+    color: Color;
+    component: boolean;
+    container: boolean;
+    disabled: boolean;
+    element: JQuery;
+    format: string;
+    input: JQuery;
+    options: ColorPickerOptions;
+    picker: JQuery;
+}
+
+interface ColorPickerEventObject extends JQueryEventObject {
+    color: Color;
+}
+
+interface JQuery {
+    /**
+     * Initializes an colorpicker.
+     */
+    colorpicker(options?: ColorPickerOptions): JQuery;
+
+    /**
+     * Gets the value from the input or the data attribute (if has no input), otherwise returns the default value, which defaults to #000000 if not specified.
+     */
+    colorpicker(methodName: 'getValue', defaultValue: string): string;
+
+    /**
+     * Set a new value for the color picker (also updates everything). Triggers 'changeColor' event.
+     */
+    colorpicker(methodName: 'setValue', value: any): any;
+
+    /**
+     * Show the color picker
+     */
+    colorpicker(methodName: 'show'): void;
+
+    /**
+     * Hide the color picker
+     */
+    colorpicker(methodName: 'hide'): void;
+
+    /**
+     * Updates the color picker's position relative to the element
+     */
+    colorpicker(methodName: 'reposition'): void;
+
+    /**
+     * Refreshes the widget colors (this is done automatically)
+     */
+    colorpicker(methodName: 'update'): void;
+
+    /**
+     * Enable the color picker.
+     */
+    colorpicker(methodName: 'enable'): void;
+
+    /**
+     * Disable the color picker.
+     */
+    colorpicker(methodName: 'disable'): void;
+
+    /**
+     * Destroys the colorpicker widget and unbind all .colorpicker events from the element and component
+     */
+    colorpicker(methodName: 'destroy'): void;
+
+    /**
+     * Access to the colorpicker API directly
+     */
+    data(methodName: 'colorpicker'): ColorPicker;
+
+    off(events: ColorPickerEvents, selector?: string, handler?: (event: ColorPickerEventObject) => any): JQuery;
+    off(events: ColorPickerEvents, handler: (event: ColorPickerEventObject) => any): JQuery;
+
+    on(events: ColorPickerEvents, selector: string, data: any, handler?: (event: ColorPickerEventObject) => any): JQuery;
+    on(events: ColorPickerEvents, selector: string, handler: (event: ColorPickerEventObject) => any): JQuery;
+    on(events: ColorPickerEvents, handler: (event: ColorPickerEventObject) => any): JQuery;
+}
\ No newline at end of file
diff --git a/types/bootstrap-colorpicker/tsconfig.json b/types/bootstrap-colorpicker/tsconfig.json
new file mode 100644
index 0000000000..6b8f8a5d47
--- /dev/null
+++ b/types/bootstrap-colorpicker/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",
+        "bootstrap-colorpicker-tests.ts"
+    ]
+}
diff --git a/types/bootstrap-colorpicker/tslint.json b/types/bootstrap-colorpicker/tslint.json
new file mode 100644
index 0000000000..8be13c2695
--- /dev/null
+++ b/types/bootstrap-colorpicker/tslint.json
@@ -0,0 +1,9 @@
+{ 
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-consecutive-blank-lines": false,
+        "eofline": false,
+        "unified-signatures": false,
+        "no-trailing-whitespace": [true, "ignore-comments"]
+    }
+}
diff --git a/types/bootstrap-slider/index.d.ts b/types/bootstrap-slider/index.d.ts
index 5559e12f12..fe1578b8ca 100644
--- a/types/bootstrap-slider/index.d.ts
+++ b/types/bootstrap-slider/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for bootstrap-slider.js 9.9
-// Project: https://github.com/seiyria/bootstrap-slider
+// Project: http://github.com/seiyria/bootstrap-slider
 // Definitions by: Daniel Beckwith <https://github.com/dbeckwith>
 //                 Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/bootstrap-toggle/index.d.ts b/types/bootstrap-toggle/index.d.ts
index 51dcec9446..e5b5256c77 100644
--- a/types/bootstrap-toggle/index.d.ts
+++ b/types/bootstrap-toggle/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for bootstrap-toggle 2.2
-// Project: https://github.com/minhur/bootstrap-toggle
+// Project: https://github.com/minhur/bootstrap-toggle, http://www.bootstraptoggle.com
 // Definitions by: Mitchell Grice <https://github.com/gricey432>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/bootstrap.v3.datetimepicker/index.d.ts b/types/bootstrap.v3.datetimepicker/index.d.ts
index c588943afd..410ef1f861 100644
--- a/types/bootstrap.v3.datetimepicker/index.d.ts
+++ b/types/bootstrap.v3.datetimepicker/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Bootstrap 3 Datepicker 4.17
+// Type definitions for non-npm package Bootstrap 3 Datepicker 4.17
 // Project: http://eonasdan.github.io/bootstrap-datetimepicker
 // Definitions by: Katona Péter <https://github.com/katonap>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/index.d.ts
index d42cf5c524..2fb473fc29 100755
--- a/types/bootstrap/index.d.ts
+++ b/types/bootstrap/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Bootstrap 4.2
-// Project: https://github.com/twbs/bootstrap/
+// Project: https://github.com/twbs/bootstrap/, https://getbootstrap.com
 // Definitions by: denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/bootstrap/v3/bootstrap-tests.ts b/types/bootstrap/v3/bootstrap-tests.ts
index 7711b5792d..e834903867 100644
--- a/types/bootstrap/v3/bootstrap-tests.ts
+++ b/types/bootstrap/v3/bootstrap-tests.ts
@@ -1,11 +1,21 @@
 declare let aHtmlElement: HTMLElement;
 
+// --------------------------------------------------------------------------------------
+// jQuery backward compatibility
+// --------------------------------------------------------------------------------------
+
+$(".dropdown").on("affixed.bs.affix", (e) => {
+    e.stopPropagation();
+});
+
 // --------------------------------------------------------------------------------------
 // Modal
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $(".modal").modal();
 
+// $ExpectType JQuery<HTMLElement>
 $(".modal").modal("show");
 
 $(".modal").modal("toggle");
@@ -27,8 +37,10 @@ $(".modal").modal({
 // Dropdown
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $(".dropdown").dropdown();
 
+// $ExpectType JQuery<HTMLElement>
 $(".dropdown").dropdown("toggle");
 
 $(".dropdown").on("show.bs.dropdown", (e) => {
@@ -39,8 +51,10 @@ $(".dropdown").on("show.bs.dropdown", (e) => {
 // Scrollspy
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $(".navbar").scrollspy();
 
+// $ExpectType JQuery<HTMLElement>
 $(".navbar").scrollspy("refresh");
 
 $(".navbar").scrollspy({
@@ -48,7 +62,7 @@ $(".navbar").scrollspy({
     offset: 10,
 });
 
-$('.navbar').on("activate.bs.scrollspy", () => {
+$(".navbar").on("activate.bs.scrollspy", () => {
     // do something...
 });
 
@@ -56,8 +70,10 @@ $('.navbar').on("activate.bs.scrollspy", () => {
 // Togglable tabs
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $(".tab").tab();
 
+// $ExpectType JQuery<HTMLElement>
 $(".tab").tab("show");
 
 $(".tab").on("shown.bs.tab", (e) => {
@@ -69,8 +85,10 @@ $(".tab").on("shown.bs.tab", (e) => {
 // Tooltip
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $(".tooltip").tooltip();
 
+// $ExpectType JQuery<HTMLElement>
 $(".tooltip").tooltip("show");
 
 $(".tooltip").tooltip({
@@ -129,8 +147,10 @@ $(".tooltip").on("hidden.bs.tooltip", () => {
 // Popover
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $(".popover").popover();
 
+// $ExpectType JQuery<HTMLElement>
 $(".popover").popover("show");
 
 $(".popover").popover({
@@ -186,8 +206,10 @@ $(".popover").on("hidden.bs.popover", () => {
 // Alert
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $(".alert").alert();
 
+// $ExpectType JQuery<HTMLElement>
 $(".alert").alert("close");
 
 $(".alert").on("closed.bs.alert", () => {
@@ -198,6 +220,7 @@ $(".alert").on("closed.bs.alert", () => {
 // Button
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $(".btn").button("toggle");
 
 $(".btn").button("reset");
@@ -208,8 +231,10 @@ $(".btn").button("Swaps text to any data defined text state.");
 // Collapse
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $(".collapse").collapse();
 
+// $ExpectType JQuery<HTMLElement>
 $(".collapse").collapse("toggle");
 
 $(".collapse").collapse({
@@ -225,8 +250,10 @@ $(".collapse").on("hidden.bs.collapse", () => {
 // Carousel
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $(".carousel").carousel();
 
+// $ExpectType JQuery<HTMLElement>
 $(".carousel").carousel("cycle");
 
 $(".carousel").carousel(200);
@@ -246,7 +273,7 @@ $(".carousel").carousel({
     pause: null,
 });
 
-$('#myCarousel').on('slide.bs.carousel', (e) => {
+$("#myCarousel").on("slide.bs.carousel", (e) => {
     const dir: "left" | "right" = e.direction;
     aHtmlElement = e.relatedTarget;
 });
@@ -255,8 +282,10 @@ $('#myCarousel').on('slide.bs.carousel', (e) => {
 // Affix
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $(".affix").affix();
 
+// $ExpectType JQuery<HTMLElement>
 $(".affix").affix("checkPosition");
 
 $(".affix").affix({
diff --git a/types/bootstrap/v3/index.d.ts b/types/bootstrap/v3/index.d.ts
index 45dee67370..d3b80a0529 100644
--- a/types/bootstrap/v3/index.d.ts
+++ b/types/bootstrap/v3/index.d.ts
@@ -7,6 +7,16 @@
 
 /// <reference types="jquery"/>
 
+// --------------------------------------------------------------------------
+// For jQuery v1 and v2 backward compatibility
+// --------------------------------------------------------------------------
+
+/**
+ * Same as jQuery v3 `JQuery.EventHandlerBase`.
+ */
+type JQueryEventHandlerBase<TContext, T> =
+    (this: TContext, t: T, ...args: any[]) => void | false;
+
 // --------------------------------------------------------------------------
 // Some Types and Interfaces
 // --------------------------------------------------------------------------
@@ -265,7 +275,7 @@ interface AffixOptions {
 // Events
 // --------------------------------------------------------------------------------------
 
-interface CarouselEventHandler<TElement> extends JQuery.TriggeredEvent<TElement, undefined, HTMLElement, HTMLElement> {
+interface CarouselEventHandler extends JQueryEventObject {
     /**
      * The direction in which the carousel is sliding.
      */
@@ -277,14 +287,14 @@ interface CarouselEventHandler<TElement> extends JQuery.TriggeredEvent<TElement,
     relatedTarget: HTMLElement;
 }
 
-interface DropdownsEventHandler<TElement> extends JQuery.TriggeredEvent<TElement, undefined, HTMLElement, HTMLElement> {
+interface DropdownsEventHandler extends JQueryEventObject {
     /**
      * The toggling anchor element.
      */
     relatedTarget: HTMLElement;
 }
 
-interface TapEventHandler<TElement> extends JQuery.TriggeredEvent<TElement, undefined, HTMLElement, HTMLElement> {
+interface TapEventHandler extends JQueryEventObject {
     /**
      * * For `show.bs.tab` and `shown.bs.tab`, is the new active tab.
      * * For `hide.bs.tab`, is the current active tab.
@@ -314,7 +324,7 @@ type TooltipEvent = "show.bs.tooltip" | "shown.bs.tooltip" | "hide.bs.tooltip" |
 // jQuery
 // --------------------------------------------------------------------------------------
 
-interface JQuery {
+interface JQuery<TElement = HTMLElement> {
     /**
      * Call a method on the modal element:
      * * `toggle` – Manually toggles a modal.
@@ -325,22 +335,19 @@ interface JQuery {
      *
      * Returns to the caller before the modal has actually been shown or hidden (i.e. before the `shown.bs.modal` or `hidden.bs.modal` event occurs).
      */
-    modal(action: "toggle" | "show" | "hide" | "handleUpdate"): JQuery;
+    modal(action: "toggle" | "show" | "hide" | "handleUpdate"): this;
     /**
      * Activates a content as a modal.
      */
-    modal(options?: ModalOptions): JQuery;
+    modal(options?: ModalOptions): this;
 
     /**
-     * Toggles the dropdown menu of a given navbar or tabbed navigation.
-     */
-    dropdown(action: "toggle"): JQuery;
-    /**
-     * Toggle contextual overlays for displaying lists of links.
-     *
+     * If no _method_ is specified, toggle contextual overlays for displaying lists of links.
      * The data-api, `data-toggle="dropdown"` is always required to be present on the dropdown's trigger element.
+     *
+     * When _method_ `toggle` is specified, toggles the dropdown menu of a given navbar or tabbed navigation.
      */
-    dropdown(): this;
+    dropdown(action?: "toggle"): this;
 
 // tslint:disable:jsdoc-format
     /**
@@ -353,11 +360,11 @@ $('[data-spy="scroll"]').each(function () {
 ```
     */
 // tslint:enable:jsdoc-format
-    scrollspy(action: "refresh"): JQuery;
+    scrollspy(action: "refresh"): this;
     /**
      * Add scrollspy behavior to a topbar navigation.
      */
-    scrollspy(options?: ScrollSpyOptions): JQuery;
+    scrollspy(options?: ScrollSpyOptions): this;
 
     /**
      * If no _method_ is specified, activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the DOM.
@@ -367,7 +374,7 @@ $('[data-spy="scroll"]').each(function () {
      *
      * Returns to the caller before the tab pane has actually been shown (i.e. before the `shown.bs.tab` event occurs).
      */
-    tab(action?: "show"): JQuery;
+    tab(action?: "show"): this;
 
     /**
      * Call a method on the tooltip element:
@@ -380,11 +387,11 @@ $('[data-spy="scroll"]').each(function () {
      * Returns to the caller before the tooltip has actually been shown or hidden (i.e. before the `shown.bs.tooltip` or `hidden.bs.tooltip` event occurs).
      * This is considered a "manual" triggering of the tooltip.
      */
-    tooltip(action: "show" | "hide" | "toggle" | "destroy"): JQuery;
+    tooltip(action: "show" | "hide" | "toggle" | "destroy"): this;
     /**
      * Attaches a tooltip handler to an element collection.
      */
-    tooltip(options?: TooltipOptions): JQuery;
+    tooltip(options?: TooltipOptions): this;
 
     /**
      * Call a method on the popover element:
@@ -397,11 +404,11 @@ $('[data-spy="scroll"]').each(function () {
      * Returns to the caller before the popover has actually been shown or hidden (i.e. before the `shown.bs.popover` or `hidden.bs.popover` event occurs).
      * This is considered a "manual" triggering of the popover.
      */
-    popover(action: "show" | "hide" | "toggle" | "destroy"): JQuery;
+    popover(action: "show" | "hide" | "toggle" | "destroy"): this;
     /**
      * Initializes popovers for an element collection.
      */
-    popover(options?: PopoverOptions): JQuery;
+    popover(options?: PopoverOptions): this;
 
     /**
      * If no _method_ is specified, makes an alert listen for click events on descendant elements which have the `data-dismiss="alert"` attribute.
@@ -410,7 +417,7 @@ $('[data-spy="scroll"]').each(function () {
      * When _method_ `close` is specified, closes an alert by removing it from the DOM. If the `.fade` and `.in` classes are present on the element,
      * the alert will fade out before it is removed.
      */
-    alert(action?: "close"): JQuery;
+    alert(action?: "close"): this;
 
     /**
      * Call a method on the button element:
@@ -418,7 +425,7 @@ $('[data-spy="scroll"]').each(function () {
      * * `reset` – Resets button state: swaps text to original text. This method is asynchronous and returns before the resetting has actually completed.
      * * _string_ – Swaps text to any data defined text state.
      */
-    button(action: "toggle" | "reset" | string): JQuery;
+    button(action: "toggle" | "reset" | string): this;
 
     /**
      * Call a method on the collapsible element:
@@ -428,11 +435,11 @@ $('[data-spy="scroll"]').each(function () {
      *
      * Returns to the caller before the collapsible element has actually been shown or hidden (i.e. before the `shown.bs.collapse` or `hidden.bs.collapse` event occurs).
      */
-    collapse(action: "toggle" | "show" | "hide"): JQuery;
+    collapse(action: "toggle" | "show" | "hide"): this;
     /**
      * Activates a content as a collapsible element.
      */
-    collapse(options?: CollapseOptions): JQuery;
+    collapse(options?: CollapseOptions): this;
 
     /**
      * Call a method on the carousel element:
@@ -444,33 +451,33 @@ $('[data-spy="scroll"]').each(function () {
      *
      * Returns to the caller before the target item has been shown (i.e. before the `slid.bs.carousel` event occurs).
      */
-    carousel(action: "cycle" | "pause" | number | "prev" | "next"): JQuery;
+    carousel(action: "cycle" | "pause" | number | "prev" | "next"): this;
     /**
      * Initializes the carousel and starts cycling through items.
      */
-    carousel(options?: CarouselOptions): JQuery;
+    carousel(options?: CarouselOptions): this;
 
     /**
      * Recalculates the state of the affix based on the dimensions, position, and scroll position of the relevant elements.
      * The `.affix`, `.affix-top`, and `.affix-bottom` classes are added to or removed from the affixed content according to the new state.
      * This method needs to be called whenever the dimensions of the affixed content or the target element are changed, to ensure correct positioning of the affixed content.
      */
-    affix(action: "checkPosition"): JQuery;
+    affix(action: "checkPosition"): this;
     /**
      * Activates your content as affixed content.
      */
-    affix(options?: AffixOptions): JQuery;
+    affix(options?: AffixOptions): this;
 
-    on(events: CarouselEvent, handler: JQuery.EventHandlerBase<HTMLElement, CarouselEventHandler<HTMLElement>>): this;
-    on(events: DropdownEvent, handler: JQuery.EventHandlerBase<HTMLElement, DropdownsEventHandler<HTMLElement>>): this;
-    on(events: TapEvent, handler: JQuery.EventHandlerBase<HTMLElement, TapEventHandler<HTMLElement>>): this;
+    on(events: CarouselEvent, handler: JQueryEventHandlerBase<HTMLElement, CarouselEventHandler>): this;
+    on(events: DropdownEvent, handler: JQueryEventHandlerBase<HTMLElement, DropdownsEventHandler>): this;
+    on(events: TapEvent, handler: JQueryEventHandlerBase<HTMLElement, TapEventHandler>): this;
     on(
         events: AffixEvent | AlertEvent | CollapseEvent | PopoverEvent | ScrollspyEvent | TooltipEvent,
-        handler: JQuery.EventHandler<HTMLElement>
+        handler: JQueryEventHandlerBase<HTMLElement, JQueryEventObject>
     ): this;
 
     /** @deprecated */
-    emulateTransitionEnd(duration: number): JQuery;
+    emulateTransitionEnd(duration: number): this;
 }
 
 // --------------------------------------------------------------------------------------
diff --git a/types/bson/bson-tests.ts b/types/bson/bson-tests.ts
index f75ee94523..16f39ae759 100644
--- a/types/bson/bson-tests.ts
+++ b/types/bson/bson-tests.ts
@@ -1,10 +1,12 @@
-import * as bson from 'bson';
+import * as BSON from 'bson';
 
 // enable hex string caching
-bson.ObjectID.cacheHexString = true
+BSON.ObjectId.cacheHexString = true
 
-let BSON = new bson.BSON();
-let Long = bson.Long;
+// Verify that legacy name ObjectID still works
+BSON.ObjectID.cacheHexString = true
+
+let Long = BSON.Long;
 
 let doc = { long: Long.fromNumber(100) }
 
@@ -16,13 +18,34 @@ console.log("data:", data);
 let doc_2 = BSON.deserialize(data);
 console.log("doc_2:", doc_2);
 
-BSON = new bson.BSON();
 data = BSON.serialize(doc);
 doc_2 = BSON.deserialize(data);
 
 
 // Calculate Object Size
-BSON = new bson.BSON();
 console.log("Calculated Object size - no options object:", BSON.calculateObjectSize(doc));
 console.log("Calculated Object size - empty options object:", BSON.calculateObjectSize(doc, {}));
 console.log("Calculated Object size - custom options object:", BSON.calculateObjectSize(doc, { ignoreUndefined: false, serializeFunctions: true }));
+
+const { EJSON, Int32, ObjectId } = BSON;
+
+console.log(EJSON.stringify(doc, { relaxed: false }));
+console.log(EJSON.stringify(doc, ['int32'], { relaxed: false }));
+console.log(EJSON.stringify(doc, ['int32'], 2, { relaxed: false }));
+console.log(EJSON.stringify(doc));
+console.log(EJSON.stringify(doc, ['int32']));
+console.log(EJSON.stringify(doc, ['int32'], 2));
+
+let doc2 = { int32: new Int32(10), _id: new ObjectId() };
+const text = '{ "int32": { "$numberInt": "10" } }';
+
+let o: {}
+o = EJSON.parse (text, { relaxed: false });
+console.log(EJSON.stringify(o));
+
+console.log (EJSON.parse (text));
+
+o = EJSON.serialize(doc2);
+let o2 = EJSON.deserialize (o);
+console.log(o);
+console.log(o2);
\ No newline at end of file
diff --git a/types/bson/index.d.ts b/types/bson/index.d.ts
index e6afab65a5..40f9ade9da 100644
--- a/types/bson/index.d.ts
+++ b/types/bson/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for bson 1.0.6
+// Type definitions for bson 4.0
 // Project: https://github.com/mongodb/js-bson
 // Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
 //                 Federico Caselli <https://github.com/CaselIT>
+//                 Justin Grant <https://github.com/justingrant>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
@@ -42,6 +43,8 @@ export interface DeserializeOptions {
     fieldsAsRaw?: { readonly [fieldName: string]: boolean };
     /** {default:false}, return BSON regular expressions as BSONRegExp instances. */
     bsonRegExp?: boolean;
+    /** {default:false}, allows the buffer to be larger than the parsed BSON object. */
+    allowObjectSmallerThanBufferSize?: boolean;
 }
 
 export interface CalculateObjectSizeOptions {
@@ -51,67 +54,64 @@ export interface CalculateObjectSizeOptions {
     ignoreUndefined?: boolean;
 }
 
-export class BSON {
 
-    /**
-     * 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, options?: SerializeOptions): Buffer;
+/**
+ * Serialize a Javascript object.
+ * 
+ * @param object The Javascript object to serialize.
+ * @param options Serialize options.
+ * @return The Buffer object containing the serialized object.
+ */
+export function 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;
+/**
+ * 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
+ */
+export function 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;
+/**
+ * Deserialize data as BSON.
+ * 
+ * @param buffer The buffer containing the serialized set of BSON documents.
+ * @param options Deserialize options.
+ * @returns The deserialized Javascript Object.
+ */
+export function deserialize(buffer: Buffer, options?: DeserializeOptions): any;
 
-    /**
-     * Calculate the bson size for a passed in Javascript object.
-     *
-     * @param {Object} object the Javascript object to calculate the BSON byte size for.
-     * @param {CalculateObjectSizeOptions} Options
-     * @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;
-
-}
+/**
+ * Calculate the bson size for a passed in Javascript object.
+ *
+ * @param {Object} object the Javascript object to calculate the BSON byte size for.
+ * @param {CalculateObjectSizeOptions} Options
+ * @return {Number} returns the number of bytes the BSON object will take up.
+ */
+export function 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`
+ */
+export function 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 {
 
@@ -167,13 +167,12 @@ export class Code {
 export class DBRef {
     /**
      * @param namespace The collection name.
-     * @param oid The reference ObjectID.
+     * @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);
-
+    constructor(namespace: string, oid: ObjectId, db?: string);
     namespace: string;
-    oid: ObjectID;
+    oid: ObjectId;
     db?: string;
 }
 
@@ -349,60 +348,64 @@ export class MinKey {
     constructor();
 }
 
-/** A class representation of the BSON ObjectID type. */
-export class ObjectID {
+/** A class representation of the BSON ObjectId type. */
+export class ObjectId {
     /**
-     * Create a new ObjectID instance
-     * @param {(string|number|ObjectID)} id Can be a 24 byte hex string, 12 byte binary string or a Number.
+     * Create a new ObjectId instance
+     * @param {(string|number|ObjectId)} id Can be a 24 byte hex string, 12 byte binary string or a Number.
      */
-    constructor(id?: string | number | ObjectID);
-    /** The generation time of this ObjectID instance */
+    constructor(id?: string | number | ObjectId);
+    /** The generation time of this ObjectId instance */
     generationTime: number;
-    /** If true cache the hex string representation of ObjectID */
+    /** If true cache the hex string representation of ObjectId */
     static cacheHexString?: boolean;
     /**
-     * Creates an ObjectID from a hex string representation of an ObjectID.
-     * @param {string} hexString create a ObjectID from a passed in 24 byte hexstring.
-     * @return {ObjectID} return the created ObjectID
+     * Creates an ObjectId from a hex string representation of an ObjectId.
+     * @param {string} hexString create a ObjectId from a passed in 24 byte hexstring.
+     * @return {ObjectId} return the created ObjectId
      */
-    static createFromHexString(hexString: string): ObjectID;
+    static createFromHexString(hexString: string): ObjectId;
     /**
-     * Creates an ObjectID from a second based number, with the rest of the ObjectID zeroed out. Used for comparisons or sorting the ObjectID.
+     * Creates an ObjectId from a second based number, with the rest of the ObjectId zeroed out. Used for comparisons or sorting the ObjectId.
      * @param {number} time an integer number representing a number of seconds.
-     * @return {ObjectID} return the created ObjectID
+     * @return {ObjectId} return the created ObjectId
      */
-    static createFromTime(time: number): ObjectID;
+    static createFromTime(time: number): ObjectId;
     /**
-     * Checks if a value is a valid bson ObjectID
+     * Checks if a value is a valid bson ObjectId
      *
-     * @return {boolean} return true if the value is a valid bson ObjectID, return false otherwise.
+     * @return {boolean} return true if the value is a valid bson ObjectId, return false otherwise.
      */
-    static isValid(id: string | number | ObjectID): boolean;
+    static isValid(id: string | number | ObjectId): boolean;
     /**
-     * Compares the equality of this ObjectID with `otherID`.
-     * @param {ObjectID|string} otherID ObjectID instance to compare against.
-     * @return {boolean} the result of comparing two ObjectID's
+     * Compares the equality of this ObjectId with `otherID`.
+     * @param {ObjectId|string} otherID ObjectId instance to compare against.
+     * @return {boolean} the result of comparing two ObjectId's
      */
-    equals(otherID: ObjectID | string): boolean;
+    equals(otherID: ObjectId | string): boolean;
     /**
-     * Generate a 12 byte id string used in ObjectID's
+     * 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): Buffer;
+    static generate(time?: number): Buffer;
     /**
      * Returns the generation date (accurate up to the second) that this ID was generated.
      * @return {Date} the generation date
      */
     getTimestamp(): Date;
     /**
-     * Return the ObjectID id as a 24 byte hex string representation
+     * Return the ObjectId id as a 24 byte hex string representation
      * @return {string} return the 24 byte hex string representation.
      */
     toHexString(): string;
 }
 
-export { ObjectID as ObjectId };
+/**
+ * ObjectID (with capital "D") is deprecated. Use ObjectId (lowercase "d") instead. 
+ * @deprecated
+ */
+export { ObjectId as ObjectID };
 
 /** A class representation of the BSON RegExp type. */
 export class BSONRegExp {
@@ -453,3 +456,139 @@ export class Timestamp extends LongLike<Timestamp> {
     static fromString(str: string, opt_radix?: number): Timestamp;
 
 }
+
+/**
+ * Functions for serializing JavaScript objects into Mongodb Extended JSON (EJSON).
+ * @namespace EJSON
+ */
+export namespace EJSON {
+
+    /**
+     * Parse an Extended JSON string, constructing the JavaScript value or object described by that
+     * string.
+     *
+     * @memberof EJSON
+     * @param {string} text
+     * @param {object} [options] Optional settings
+     * @param {boolean} [options.relaxed=true] Attempt to return native JS types where possible, rather than BSON types (if true)
+     * @return {object}
+     *
+     * @example
+     * const { EJSON } = require('bson');
+     * const text = '{ "int32": { "$numberInt": "10" } }';
+     *
+     * // prints { int32: { [String: '10'] _bsontype: 'Int32', value: '10' } }
+     * console.log(EJSON.parse(text, { relaxed: false }));
+     *
+     * // prints { int32: 10 }
+     * console.log(EJSON.parse(text));
+     */
+    export function parse(text: string, options?: {relaxed?: boolean;}): {};
+
+    /**
+     * Deserializes an Extended JSON object into a plain JavaScript object with native/BSON types
+     *
+     * @memberof EJSON
+     * @param {object} ejson The Extended JSON object to deserialize
+     * @param {object} [options] Optional settings passed to the parse method
+     * @return {object}
+     */
+    export function deserialize(ejson: {}, options?: {relaxed?: boolean;}): {};
+
+    /**
+     * Serializes an object to an Extended JSON string, and reparse it as a JavaScript object.
+     *
+     * @memberof EJSON
+     * @param {object} bson The object to serialize
+     * @param {object} [options] Optional settings passed to the `stringify` function
+     * @return {object}
+     */
+    export function serialize(bson: {}, options?: {relaxed?: boolean;}): {};
+
+    /**
+     * Converts a BSON document to an Extended JSON string, optionally replacing values if a replacer
+     * function is specified or optionally including only the specified properties if a replacer array
+     * is specified.
+     *
+     * @memberof EJSON
+     * @param {object} value The value to convert to extended JSON
+     * @param {function|array} [replacer] A function that alters the behavior of the stringification process, or an array of String and Number objects that serve as a whitelist for selecting/filtering the properties of the value object to be included in the JSON string. If this value is null or not provided, all properties of the object are included in the resulting JSON string
+     * @param {string|number} [space] A String or Number object that's used to insert white space into the output JSON string for readability purposes.
+     * @param {object} [options] Optional settings.
+     * @param {boolean} [options.relaxed=true] Enabled Extended JSON's `relaxed` mode
+     * @returns {string}
+     *
+     * @example
+     * const { EJSON, Int32 } = require('bson');
+     * const doc = { int32: new Int32(10) };
+     *
+     * // prints '{"int32":{"$numberInt":"10"}}'
+     * console.log(EJSON.stringify(doc, { relaxed: false }));
+     *
+     * // prints '{"int32":10}'
+     * console.log(EJSON.stringify(doc));
+     */
+    export function stringify(
+        value: {}, 
+        options?: {relaxed?: boolean;}
+    ): string;
+
+    /**
+     * Converts a BSON document to an Extended JSON string, optionally replacing values if a replacer
+     * function is specified or optionally including only the specified properties if a replacer array
+     * is specified.
+     *
+     * @memberof EJSON
+     * @param {object} value The value to convert to extended JSON
+     * @param {function|array} [replacer] A function that alters the behavior of the stringification process, or an array of String and Number objects that serve as a whitelist for selecting/filtering the properties of the value object to be included in the JSON string. If this value is null or not provided, all properties of the object are included in the resulting JSON string
+     * @param {string|number} [space] A String or Number object that's used to insert white space into the output JSON string for readability purposes.
+     * @param {object} [options] Optional settings.
+     * @param {boolean} [options.relaxed=true] Enabled Extended JSON's `relaxed` mode
+     * @returns {string}
+     *
+     * @example
+     * const { EJSON, Int32 } = require('bson');
+     * const doc = { int32: new Int32(10) };
+     *
+     * // prints '{"int32":{"$numberInt":"10"}}'
+     * console.log(EJSON.stringify(doc, { relaxed: false }));
+     *
+     * // prints '{"int32":10}'
+     * console.log(EJSON.stringify(doc));
+     */
+
+    export function stringify(
+        value: {}, 
+        replacer: ((key: string, value: any) => any) | Array<string|number>, 
+        options?: {relaxed?: boolean;}
+    ): string;
+    /**
+     * Converts a BSON document to an Extended JSON string, optionally replacing values if a replacer
+     * function is specified or optionally including only the specified properties if a replacer array
+     * is specified.
+     *
+     * @memberof EJSON
+     * @param {object} value The value to convert to extended JSON
+     * @param {function|array} [replacer] A function that alters the behavior of the stringification process, or an array of String and Number objects that serve as a whitelist for selecting/filtering the properties of the value object to be included in the JSON string. If this value is null or not provided, all properties of the object are included in the resulting JSON string
+     * @param {string|number} [space] A String or Number object that's used to insert white space into the output JSON string for readability purposes.
+     * @param {object} [options] Optional settings.
+     * @param {boolean} [options.relaxed=true] Enabled Extended JSON's `relaxed` mode
+     * @returns {string}
+     *
+     * @example
+     * const { EJSON, Int32 } = require('bson');
+     * const doc = { int32: new Int32(10) };
+     *
+     * // prints '{"int32":{"$numberInt":"10"}}'
+     * console.log(EJSON.stringify(doc, { relaxed: false }));
+     *
+     * // prints '{"int32":10}'
+     * console.log(EJSON.stringify(doc));
+     */
+    export function stringify(
+        value: {}, 
+        replacer: ((key: string, value: any) => any) | Array<string | number>, 
+        indents?: string | number, 
+        options?: {relaxed?: boolean;}
+        ): string;  
+}
diff --git a/types/btoa/btoa-tests.ts b/types/btoa/btoa-tests.ts
index d09cdad23a..7ce230fcf7 100644
--- a/types/btoa/btoa-tests.ts
+++ b/types/btoa/btoa-tests.ts
@@ -1,3 +1,3 @@
-import btoa from 'btoa';
+import btoa = require('btoa');
 
 btoa('foo');
diff --git a/types/btoa/index.d.ts b/types/btoa/index.d.ts
index cc311ed836..4f16b77328 100644
--- a/types/btoa/index.d.ts
+++ b/types/btoa/index.d.ts
@@ -1,7 +1,10 @@
 // Type definitions for btoa 1.2
-// Project: https://git.coolaj86.com/coolaj86/btoa.js
+// Project: https://git.coolaj86.com/coolaj86/btoa.js.git
 // Definitions by: John Wright <https://github.com/johngeorgewright>
+//                 Alex Brick <https://github.com/bricka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-export default function(str: string): string;
+declare function btoa(str: string): string;
+
+export = btoa;
diff --git a/types/buble/buble-tests.ts b/types/buble/buble-tests.ts
index e786ee6854..cebb373415 100644
--- a/types/buble/buble-tests.ts
+++ b/types/buble/buble-tests.ts
@@ -8,7 +8,7 @@ const input = 'const answer = () => 42;';
 
     console.log(output.code);
     console.log(output.map.toString());
-    console.log(output.map.toUrl);
+    console.log(output.map.toUrl());
 })();
 
 // Transform for Chrome & Firefox
diff --git a/types/buble/index.d.ts b/types/buble/index.d.ts
index c222d08e87..db3cb0a7b7 100644
--- a/types/buble/index.d.ts
+++ b/types/buble/index.d.ts
@@ -1,7 +1,10 @@
 // Type definitions for buble 0.19
 // Project: https://github.com/Rich-Harris/buble#README
-// Definitions by: Kocal <https://github.com/Kocal>
+// Definitions by: Hugo Alliaume <https://github.com/Kocal>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+import { SourceMap } from "magic-string";
 
 export interface TransformOptions {
     // source: https://github.com/Rich-Harris/buble/blob/master/src/support.js
@@ -56,10 +59,7 @@ export interface TransformOptions {
 
 export interface TransformOutput {
     code: string;
-    map: {
-        toString(): string;
-        toUrl(): string;
-    };
+    map: SourceMap;
 }
 
 export function transform(content: string, options?: TransformOptions): TransformOutput;
diff --git a/types/buble/package.json b/types/buble/package.json
new file mode 100644
index 0000000000..d2f8119c0a
--- /dev/null
+++ b/types/buble/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "magic-string": "^0.25.0"
+  }
+}
diff --git a/types/build-output-script/build-output-script-tests.ts b/types/build-output-script/build-output-script-tests.ts
new file mode 100644
index 0000000000..719c6301d5
--- /dev/null
+++ b/types/build-output-script/build-output-script-tests.ts
@@ -0,0 +1,11 @@
+import buildOutputScript = require('build-output-script');
+
+// $ExpectType string
+buildOutputScript([{ address: '1LukeQU5jwebXbMLDVydeH4vFSobRV9rkj', value: 100000000 }]);
+// $ExpectType string
+buildOutputScript([
+    { address: '1LukeQU5jwebXbMLDVydeH4vFSobRV9rkj', value: 100000000 },
+    { address: '1BitcoinEaterAddressDontSendf59kuE', value: 100000000 },
+]);
+// $ExpectError
+buildOutputScript([]);
diff --git a/types/build-output-script/index.d.ts b/types/build-output-script/index.d.ts
new file mode 100644
index 0000000000..5c90083e34
--- /dev/null
+++ b/types/build-output-script/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for build-output-script 1.0
+// Project: https://github.com/lukechilds/build-output-script#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
+
+export = buildOutputScript;
+
+/**
+ * Builds a P2PKH Bitcoin transaction output script from an array of P2PKH addresses and amounts.
+ * Will also work with any Bitcoin derived cryptocurrencies with a single byte pubkey hash address prefix.
+ *
+ * The output script is returned as a hex string and can be passed directly in to ledgerjs.
+ *
+ * @param outputs An array of one or more output objects.
+ * @returns A (hex string) P2PKH transaction output script.
+ */
+declare function buildOutputScript(
+    outputs: [buildOutputScript.Output, ...buildOutputScript.Output[]]
+): string;
+
+declare namespace buildOutputScript {
+    interface Output {
+        /**
+         * A valid P2PKH address.
+         */
+        address: string;
+        /**
+         * Value to send to `address` in satoshis.
+         */
+        value: number;
+    }
+}
diff --git a/types/build-output-script/tsconfig.json b/types/build-output-script/tsconfig.json
new file mode 100644
index 0000000000..1fc0da7de0
--- /dev/null
+++ b/types/build-output-script/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",
+        "build-output-script-tests.ts"
+    ]
+}
diff --git a/types/i18next-xhr-backend/tslint.json b/types/build-output-script/tslint.json
similarity index 100%
rename from types/i18next-xhr-backend/tslint.json
rename to types/build-output-script/tslint.json
diff --git a/types/bull/bull-tests.tsx b/types/bull/bull-tests.tsx
index 46c146272e..13ae21f5a4 100644
--- a/types/bull/bull-tests.tsx
+++ b/types/bull/bull-tests.tsx
@@ -143,6 +143,8 @@ pdfQueue
 .on('drained', () => undefined)
 .on('removed', (job: Queue.Job) => undefined);
 
+pdfQueue.setMaxListeners(42);
+
 // test different process methods
 
 const profileQueue = new Queue('profile');
diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index b2fb68d4d7..cd2d1a9047 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -17,6 +17,7 @@
 // TypeScript Version: 2.8
 
 import * as Redis from "ioredis";
+import { EventEmitter } from "events";
 
 /**
  * This is the Queue constructor.
@@ -228,6 +229,25 @@ declare namespace Bull {
      * Takes a lock for this job so that no other queue worker can process it at the same time.
      */
     takeLock(): Promise<number | false>;
+
+    /**
+     * Get job properties as Json Object
+     */
+    toJSON(): {
+      id: JobId,
+      name: string,
+      data: T,
+      opts: JobOptions,
+      progress: number,
+      delay: number,
+      timestamp: number,
+      attemptsMade: number,
+      failedReason: any,
+      stacktrace: string[] | null,
+      returnvalue: any,
+      finishedOn: number | null,
+      processedOn: number | null
+    };
   }
 
   type JobStatus = 'completed' | 'waiting' | 'active' | 'delayed' | 'failed';
@@ -365,7 +385,7 @@ declare namespace Bull {
     next: number;
   }
 
-  interface Queue<T = any> {
+  interface Queue<T = any> extends EventEmitter {
     /**
      * The name of the queue
      */
@@ -585,6 +605,11 @@ declare namespace Bull {
      */
     getJobCounts(): Promise<JobCounts>;
 
+    /**
+     * Returns a promise that resolves with the job counts for the given queue of the given types.
+     */
+    getJobCountByTypes(types: string[] | string): Promise<JobCounts>;
+
     /**
      * Returns a promise that resolves with the quantity of completed jobs.
      */
diff --git a/types/bunyan-seq/bunyan-seq-tests.ts b/types/bunyan-seq/bunyan-seq-tests.ts
new file mode 100644
index 0000000000..beeeb9d8ee
--- /dev/null
+++ b/types/bunyan-seq/bunyan-seq-tests.ts
@@ -0,0 +1,2 @@
+import bunyanSeq = require("bunyan-seq");
+bunyanSeq.createStream({name: 'LoggerComponent', serverUrl: 'http://seq.com'});
diff --git a/types/bunyan-seq/index.d.ts b/types/bunyan-seq/index.d.ts
new file mode 100644
index 0000000000..6d2a29fb1c
--- /dev/null
+++ b/types/bunyan-seq/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for bunyan-blackhole 0.2
+// Project: https://github.com/datalust/bunyan-seq, https://github.com/continuousit/bunyan-seq
+// Definitions by: Ray Booysen <https://github.com/raybooysen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+import * as Logger from "bunyan";
+export interface Configuration {
+    apiKey?: string;
+    batchSizeLimit?: number;
+    eventSizeLimit?: number;
+    level?: string;
+    maxBatchingTime?: number;
+    name?: string;
+    onError?: (e: Error) => void;
+    reemitErrorEvents?: boolean;
+    serverUrl?: string;
+}
+
+export function createStream(config: Configuration): Logger.Stream;
diff --git a/types/bunyan-seq/tsconfig.json b/types/bunyan-seq/tsconfig.json
new file mode 100644
index 0000000000..bd77368148
--- /dev/null
+++ b/types/bunyan-seq/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "bunyan-seq-tests.ts"
+    ]
+}
diff --git a/types/p-throttle/tslint.json b/types/bunyan-seq/tslint.json
similarity index 100%
rename from types/p-throttle/tslint.json
rename to types/bunyan-seq/tslint.json
diff --git a/types/byte-range/byte-range-tests.ts b/types/byte-range/byte-range-tests.ts
new file mode 100644
index 0000000000..150d6b0fc2
--- /dev/null
+++ b/types/byte-range/byte-range-tests.ts
@@ -0,0 +1,10 @@
+import byteRange = require('byte-range');
+
+byteRange(1); // $ExpectType [number, number]
+byteRange(1, { signed: false }); // $ExpectType [number, number]
+byteRange.uint8; // $ExpectType [number, number]
+byteRange.uint16; // $ExpectType [number, number]
+byteRange.uint32; // $ExpectType [number, number]
+byteRange.int8; // $ExpectType [number, number]
+byteRange.int16; // $ExpectType [number, number]
+byteRange.int32; // $ExpectType [number, number]
diff --git a/types/byte-range/index.d.ts b/types/byte-range/index.d.ts
new file mode 100644
index 0000000000..120889ad90
--- /dev/null
+++ b/types/byte-range/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for byte-range 1.0
+// Project: https://github.com/lukechilds/byte-range#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = byteRange;
+
+/**
+ * Calculates integer ranges for a given number of bytes.
+ *
+ * @param bytes Number of bytes to return the integer range for. Must be a positive integer.
+ */
+declare function byteRange(bytes: number, options?: byteRange.Options): byteRange.ByteRange;
+
+declare namespace byteRange {
+    /**
+     * Precomputed byte range for an unsigned 8 bit integer.
+     */
+    const uint8: ByteRange;
+    /**
+     * Precomputed byte range for an unsigned 16 bit integer.
+     */
+    const uint16: ByteRange;
+    /**
+     * Precomputed byte range for an unsigned 32 bit integer.
+     */
+    const uint32: ByteRange;
+    /**
+     * Precomputed byte range for an signed 8 bit integer.
+     */
+    const int8: ByteRange;
+    /**
+     * Precomputed byte range for an signed 16 bit integer.
+     */
+    const int16: ByteRange;
+    /**
+     * Precomputed byte range for an signed 32 bit integer.
+     */
+    const int32: ByteRange;
+
+    interface Options {
+        /**
+         * @default false
+         */
+        signed?: boolean;
+    }
+
+    type ByteRange = [number, number];
+}
diff --git a/types/byte-range/tsconfig.json b/types/byte-range/tsconfig.json
new file mode 100644
index 0000000000..13d4b78f5d
--- /dev/null
+++ b/types/byte-range/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "byte-range-tests.ts"
+    ]
+}
diff --git a/types/shipit/tslint.json b/types/byte-range/tslint.json
similarity index 100%
rename from types/shipit/tslint.json
rename to types/byte-range/tslint.json
diff --git a/types/bytebuffer/index.d.ts b/types/bytebuffer/index.d.ts
index bafed6edf8..eaa1a509d5 100644
--- a/types/bytebuffer/index.d.ts
+++ b/types/bytebuffer/index.d.ts
@@ -127,7 +127,7 @@ declare class ByteBuffer
      * Calculates the number of UTF8 characters of a string.JavaScript itself uses UTF- 16, so that a string's length property does not reflect its actual UTF8 size if it contains code points larger than 0xFFFF.
      */
     static calculateUTF8Chars( str: string ): number;
-    
+
     /**
      * Calculates the number of UTF8 bytes of a string. This is an alias of ByteBuffer#calculateUTF8Bytes.
      */
@@ -574,6 +574,11 @@ declare class ByteBuffer
      */
     writeInt8( value: number, offset?: number ): ByteBuffer;
 
+    /**
+     * Write a 64bit signed integer. This is an alias of ByteBuffer#writeInt64.
+     */
+     writeLong( value: number | Long, offset?: number ): ByteBuffer;
+
     /**
      * Writes a 16bit signed integer. This is an alias of ByteBuffer#writeInt16.
      */
diff --git a/types/c3/index.d.ts b/types/c3/index.d.ts
index e047b22c7e..7aea852837 100644
--- a/types/c3/index.d.ts
+++ b/types/c3/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for C3js 0.6
-// Project: http://c3js.org/
+// Project: http://c3js.org/, https://github.com/c3js/c3
 // Definitions by: Marc Climent <https://github.com/mcliment>
 //                 Gerin Jacob <https://github.com/gerinjacob>
 //                 Bernd Hacker <https://github.com/denyo>
diff --git a/types/cacheable-request/cacheable-request-tests.ts b/types/cacheable-request/cacheable-request-tests.ts
new file mode 100644
index 0000000000..95458c14b7
--- /dev/null
+++ b/types/cacheable-request/cacheable-request-tests.ts
@@ -0,0 +1,28 @@
+import * as http from 'http';
+import * as https from 'https';
+import CacheableRequest = require('cacheable-request');
+import QuickLRU = require('quick-lru');
+
+// You can do
+let cacheableRequest = new CacheableRequest(http.request);
+const cacheReq = cacheableRequest('http://example.com', res => {
+    res; // $ExpectType ServerResponse | ResponseLike
+});
+cacheReq.on('request', req => req.end());
+
+cacheableRequest = new CacheableRequest(https.request);
+
+cacheableRequest = new CacheableRequest(http.request, 'redis://user:pass@localhost:6379');
+cacheableRequest = new CacheableRequest(http.request, new Map());
+cacheableRequest = new CacheableRequest(http.request, new QuickLRU({ maxSize: 1000 }));
+
+cacheableRequest('example.com', res => {
+    res; // $ExpectType ServerResponse | ResponseLike
+})
+    .on('error', err => {
+        err; // $ExpectType RequestErrorCls | CacheErrorCls
+    })
+    .on('request', req => {
+        req.on('error', () => {});
+        req.end();
+    });
diff --git a/types/cacheable-request/index.d.ts b/types/cacheable-request/index.d.ts
new file mode 100644
index 0000000000..98d858d3f6
--- /dev/null
+++ b/types/cacheable-request/index.d.ts
@@ -0,0 +1,134 @@
+// Type definitions for cacheable-request 6.0
+// Project: https://github.com/lukechilds/cacheable-request#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import { request, RequestOptions, ClientRequest, ServerResponse } from 'http';
+import { URL } from 'url';
+import { EventEmitter } from 'events';
+import { Store } from 'keyv';
+import { Options as CacheSemanticsOptions } from 'http-cache-semantics';
+import ResponseLike = require('responselike');
+
+export = CacheableRequest;
+
+declare const CacheableRequest: CacheableRequest;
+
+type RequestFn = typeof request;
+
+interface CacheableRequest {
+    new (requestFn: RequestFn, storageAdapter?: string | Store<any>): (
+        opts: string | URL | (RequestOptions & CacheSemanticsOptions),
+        cb?: (response: ServerResponse | ResponseLike) => void
+    ) => CacheableRequest.Emitter;
+
+    RequestError: typeof RequestErrorCls;
+    CacheError: typeof CacheErrorCls;
+}
+
+declare namespace CacheableRequest {
+    interface Options {
+        /**
+         * If the cache should be used. Setting this to `false` will completely bypass the cache for the current request.
+         * @default true
+         */
+        cache?: boolean;
+
+        /**
+         * If set to `true` once a cached resource has expired it is deleted and will have to be re-requested.
+         *
+         * If set to `false`, after a cached resource's TTL expires it is kept in the cache and will be revalidated
+         * on the next request with `If-None-Match`/`If-Modified-Since` headers.
+         * @default false
+         */
+        strictTtl?: boolean;
+
+        /**
+         * Limits TTL. The `number` represents milliseconds.
+         * @default undefined
+         */
+        maxTtl?: number;
+
+        /**
+         * When set to `true`, if the DB connection fails we will automatically fallback to a network request.
+         * DB errors will still be emitted to notify you of the problem even though the request callback may succeed.
+         * @default false
+         */
+        automaticFailover?: boolean;
+
+        /**
+         * Forces refreshing the cache. If the response could be retrieved from the cache, it will perform a
+         * new request and override the cache instead.
+         * @default false
+         */
+        forceRefresh?: boolean;
+    }
+
+    interface Emitter extends EventEmitter {
+        addListener(event: 'request', listener: (request: ClientRequest) => void): this;
+        addListener(
+            event: 'response',
+            listener: (response: ServerResponse | ResponseLike) => void
+        ): this;
+        addListener(event: 'error', listener: (error: RequestError | CacheError) => void): this;
+        on(event: 'request', listener: (request: ClientRequest) => void): this;
+        on(event: 'response', listener: (response: ServerResponse | ResponseLike) => void): this;
+        on(event: 'error', listener: (error: RequestError | CacheError) => void): this;
+        once(event: 'request', listener: (request: ClientRequest) => void): this;
+        once(event: 'response', listener: (response: ServerResponse | ResponseLike) => void): this;
+        once(event: 'error', listener: (error: RequestError | CacheError) => void): this;
+        prependListener(event: 'request', listener: (request: ClientRequest) => void): this;
+        prependListener(
+            event: 'response',
+            listener: (response: ServerResponse | ResponseLike) => void
+        ): this;
+        prependListener(event: 'error', listener: (error: RequestError | CacheError) => void): this;
+        prependOnceListener(event: 'request', listener: (request: ClientRequest) => void): this;
+        prependOnceListener(
+            event: 'response',
+            listener: (response: ServerResponse | ResponseLike) => void
+        ): this;
+        prependOnceListener(
+            event: 'error',
+            listener: (error: RequestError | CacheError) => void
+        ): this;
+        removeListener(event: 'request', listener: (request: ClientRequest) => void): this;
+        removeListener(
+            event: 'response',
+            listener: (response: ServerResponse | ResponseLike) => void
+        ): this;
+        removeListener(event: 'error', listener: (error: RequestError | CacheError) => void): this;
+        off(event: 'request', listener: (request: ClientRequest) => void): this;
+        off(event: 'response', listener: (response: ServerResponse | ResponseLike) => void): this;
+        off(event: 'error', listener: (error: RequestError | CacheError) => void): this;
+        removeAllListeners(event?: 'request' | 'response' | 'error'): this;
+        listeners(event: 'request'): Array<(request: ClientRequest) => void>;
+        listeners(event: 'response'): Array<(response: ServerResponse | ResponseLike) => void>;
+        listeners(event: 'error'): Array<(error: RequestError | CacheError) => void>;
+        rawListeners(event: 'request'): Array<(request: ClientRequest) => void>;
+        rawListeners(event: 'response'): Array<(response: ServerResponse | ResponseLike) => void>;
+        rawListeners(event: 'error'): Array<(error: RequestError | CacheError) => void>;
+        emit(event: 'request', request: ClientRequest): boolean;
+        emit(event: 'response', response: ServerResponse | ResponseLike): boolean;
+        emit(event: 'error', error: RequestError | CacheError): boolean;
+        eventNames(): Array<'request' | 'response' | 'error'>;
+        listenerCount(type: 'request' | 'response' | 'error'): number;
+    }
+
+    type RequestError = RequestErrorCls;
+    type CacheError = CacheErrorCls;
+}
+
+declare class RequestErrorCls extends Error {
+    readonly name: 'RequestError';
+
+    constructor(error: Error);
+}
+declare class CacheErrorCls extends Error {
+    readonly name: 'CacheError';
+
+    constructor(error: Error);
+}
diff --git a/types/cacheable-request/tsconfig.json b/types/cacheable-request/tsconfig.json
new file mode 100644
index 0000000000..635a5b1689
--- /dev/null
+++ b/types/cacheable-request/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",
+        "cacheable-request-tests.ts"
+    ]
+}
diff --git a/types/cacheable-request/tslint.json b/types/cacheable-request/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cacheable-request/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/canvasjs/index.d.ts b/types/canvasjs/index.d.ts
index e1b74a7606..c3c68712bf 100644
--- a/types/canvasjs/index.d.ts
+++ b/types/canvasjs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for CanvasJS 1.9
-// Project: http://canvasjs.com/
+// Project: http://canvasjs.com/, https://github.com/tsur/canvasjs
 // Definitions by: ShuYin Zhang  <https://github.com/brutalimp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/carbon__colors/carbon__colors-tests.ts b/types/carbon__colors/carbon__colors-tests.ts
new file mode 100644
index 0000000000..1df2cea931
--- /dev/null
+++ b/types/carbon__colors/carbon__colors-tests.ts
@@ -0,0 +1,3 @@
+import { rgba } from "@carbon/colors";
+
+rgba("TOTORO", 0.4); // $ExpectType string
diff --git a/types/carbon__colors/index.d.ts b/types/carbon__colors/index.d.ts
new file mode 100644
index 0000000000..33438d7c66
--- /dev/null
+++ b/types/carbon__colors/index.d.ts
@@ -0,0 +1,491 @@
+// Type definitions for @carbon/colors 0.0
+// Project: https://github.com/IBM/carbon-elements/tree/master/packages/colors
+// Definitions by: Vince Picone <https://github.com/vpicone>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export const black: string;
+
+export const black100: string;
+
+export const blue: {
+    "10": string;
+    "100": string;
+    "20": string;
+    "30": string;
+    "40": string;
+    "50": string;
+    "60": string;
+    "70": string;
+    "80": string;
+    "90": string;
+};
+
+export const blue10: string;
+
+export const blue100: string;
+
+export const blue20: string;
+
+export const blue30: string;
+
+export const blue40: string;
+
+export const blue50: string;
+
+export const blue60: string;
+
+export const blue70: string;
+
+export const blue80: string;
+
+export const blue90: string;
+
+export const colors: {
+    black: {
+        "100": string;
+    };
+    blue: {
+        "10": string;
+        "100": string;
+        "20": string;
+        "30": string;
+        "40": string;
+        "50": string;
+        "60": string;
+        "70": string;
+        "80": string;
+        "90": string;
+    };
+    coolGray: {
+        "10": string;
+        "100": string;
+        "20": string;
+        "30": string;
+        "40": string;
+        "50": string;
+        "60": string;
+        "70": string;
+        "80": string;
+        "90": string;
+    };
+    cyan: {
+        "10": string;
+        "100": string;
+        "20": string;
+        "30": string;
+        "40": string;
+        "50": string;
+        "60": string;
+        "70": string;
+        "80": string;
+        "90": string;
+    };
+    gray: {
+        "10": string;
+        "100": string;
+        "20": string;
+        "30": string;
+        "40": string;
+        "50": string;
+        "60": string;
+        "70": string;
+        "80": string;
+        "90": string;
+    };
+    green: {
+        "10": string;
+        "100": string;
+        "20": string;
+        "30": string;
+        "40": string;
+        "50": string;
+        "60": string;
+        "70": string;
+        "80": string;
+        "90": string;
+    };
+    magenta: {
+        "10": string;
+        "100": string;
+        "20": string;
+        "30": string;
+        "40": string;
+        "50": string;
+        "60": string;
+        "70": string;
+        "80": string;
+        "90": string;
+    };
+    orange: {
+        "40": string;
+    };
+    purple: {
+        "10": string;
+        "100": string;
+        "20": string;
+        "30": string;
+        "40": string;
+        "50": string;
+        "60": string;
+        "70": string;
+        "80": string;
+        "90": string;
+    };
+    red: {
+        "10": string;
+        "100": string;
+        "20": string;
+        "30": string;
+        "40": string;
+        "50": string;
+        "60": string;
+        "70": string;
+        "80": string;
+        "90": string;
+    };
+    teal: {
+        "10": string;
+        "100": string;
+        "20": string;
+        "30": string;
+        "40": string;
+        "50": string;
+        "60": string;
+        "70": string;
+        "80": string;
+        "90": string;
+    };
+    warmGray: {
+        "10": string;
+        "100": string;
+        "20": string;
+        "30": string;
+        "40": string;
+        "50": string;
+        "60": string;
+        "70": string;
+        "80": string;
+        "90": string;
+    };
+    white: {
+        "0": string;
+    };
+    yellow: {
+        "20": string;
+    };
+};
+
+export const coolGray: {
+    "10": string;
+    "100": string;
+    "20": string;
+    "30": string;
+    "40": string;
+    "50": string;
+    "60": string;
+    "70": string;
+    "80": string;
+    "90": string;
+};
+
+export const coolGray10: string;
+
+export const coolGray100: string;
+
+export const coolGray20: string;
+
+export const coolGray30: string;
+
+export const coolGray40: string;
+
+export const coolGray50: string;
+
+export const coolGray60: string;
+
+export const coolGray70: string;
+
+export const coolGray80: string;
+
+export const coolGray90: string;
+
+export const cyan: {
+    "10": string;
+    "100": string;
+    "20": string;
+    "30": string;
+    "40": string;
+    "50": string;
+    "60": string;
+    "70": string;
+    "80": string;
+    "90": string;
+};
+
+export const cyan10: string;
+
+export const cyan100: string;
+
+export const cyan20: string;
+
+export const cyan30: string;
+
+export const cyan40: string;
+
+export const cyan50: string;
+
+export const cyan60: string;
+
+export const cyan70: string;
+
+export const cyan80: string;
+
+export const cyan90: string;
+
+export const gray: {
+    "10": string;
+    "100": string;
+    "20": string;
+    "30": string;
+    "40": string;
+    "50": string;
+    "60": string;
+    "70": string;
+    "80": string;
+    "90": string;
+};
+
+export const gray10: string;
+
+export const gray100: string;
+
+export const gray20: string;
+
+export const gray30: string;
+
+export const gray40: string;
+
+export const gray50: string;
+
+export const gray60: string;
+
+export const gray70: string;
+
+export const gray80: string;
+
+export const gray90: string;
+
+export const green: {
+    "10": string;
+    "100": string;
+    "20": string;
+    "30": string;
+    "40": string;
+    "50": string;
+    "60": string;
+    "70": string;
+    "80": string;
+    "90": string;
+};
+
+export const green10: string;
+
+export const green100: string;
+
+export const green20: string;
+
+export const green30: string;
+
+export const green40: string;
+
+export const green50: string;
+
+export const green60: string;
+
+export const green70: string;
+
+export const green80: string;
+
+export const green90: string;
+
+export const magenta: {
+    "10": string;
+    "100": string;
+    "20": string;
+    "30": string;
+    "40": string;
+    "50": string;
+    "60": string;
+    "70": string;
+    "80": string;
+    "90": string;
+};
+
+export const magenta10: string;
+
+export const magenta100: string;
+
+export const magenta20: string;
+
+export const magenta30: string;
+
+export const magenta40: string;
+
+export const magenta50: string;
+
+export const magenta60: string;
+
+export const magenta70: string;
+
+export const magenta80: string;
+
+export const magenta90: string;
+
+export const orange: string;
+
+export const orange40: string;
+
+export const purple: {
+    "10": string;
+    "100": string;
+    "20": string;
+    "30": string;
+    "40": string;
+    "50": string;
+    "60": string;
+    "70": string;
+    "80": string;
+    "90": string;
+};
+
+export const purple10: string;
+
+export const purple100: string;
+
+export const purple20: string;
+
+export const purple30: string;
+
+export const purple40: string;
+
+export const purple50: string;
+
+export const purple60: string;
+
+export const purple70: string;
+
+export const purple80: string;
+
+export const purple90: string;
+
+export const red: {
+    "10": string;
+    "100": string;
+    "20": string;
+    "30": string;
+    "40": string;
+    "50": string;
+    "60": string;
+    "70": string;
+    "80": string;
+    "90": string;
+};
+
+export const red10: string;
+
+export const red100: string;
+
+export const red20: string;
+
+export const red30: string;
+
+export const red40: string;
+
+export const red50: string;
+
+export const red60: string;
+
+export const red70: string;
+
+export const red80: string;
+
+export const red90: string;
+
+export const teal: {
+    "10": string;
+    "100": string;
+    "20": string;
+    "30": string;
+    "40": string;
+    "50": string;
+    "60": string;
+    "70": string;
+    "80": string;
+    "90": string;
+};
+
+export const teal10: string;
+
+export const teal100: string;
+
+export const teal20: string;
+
+export const teal30: string;
+
+export const teal40: string;
+
+export const teal50: string;
+
+export const teal60: string;
+
+export const teal70: string;
+
+export const teal80: string;
+
+export const teal90: string;
+
+export const warmGray: {
+    "10": string;
+    "100": string;
+    "20": string;
+    "30": string;
+    "40": string;
+    "50": string;
+    "60": string;
+    "70": string;
+    "80": string;
+    "90": string;
+};
+
+export const warmGray10: string;
+
+export const warmGray100: string;
+
+export const warmGray20: string;
+
+export const warmGray30: string;
+
+export const warmGray40: string;
+
+export const warmGray50: string;
+
+export const warmGray60: string;
+
+export const warmGray70: string;
+
+export const warmGray80: string;
+
+export const warmGray90: string;
+
+export const white: string;
+
+export const white0: string;
+
+export const yellow: string;
+
+export const yellow20: string;
+
+export function rgba(hexcode: string, opacity: number): string;
+
+export namespace rgba {
+    const prototype: {};
+}
diff --git a/types/carbon__colors/tsconfig.json b/types/carbon__colors/tsconfig.json
new file mode 100644
index 0000000000..3b03be1aae
--- /dev/null
+++ b/types/carbon__colors/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true,
+        "paths": {
+            "@carbon/colors": ["carbon__colors"]
+        }
+    },
+    "files": ["index.d.ts", "carbon__colors-tests.ts"]
+}
diff --git a/types/carbon__colors/tslint.json b/types/carbon__colors/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/carbon__colors/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/carbon__layout/carbon__layout-tests.ts b/types/carbon__layout/carbon__layout-tests.ts
new file mode 100644
index 0000000000..ef002f50ae
--- /dev/null
+++ b/types/carbon__layout/carbon__layout-tests.ts
@@ -0,0 +1,20 @@
+import {
+    rem,
+    em,
+    px,
+    breakpoint,
+    breakpoints,
+    breakpointDown,
+    breakpointUp,
+    baseFontSize
+} from "@carbon/layout";
+
+const firstBreakpoint = Object.keys(breakpoints)[0];
+
+rem(baseFontSize); // $ExpectType string
+em(baseFontSize); // $ExpectType string
+px(baseFontSize); // $ExpectType string
+
+breakpoint(firstBreakpoint); // $ExpectType string
+breakpointUp(firstBreakpoint); // $ExpectType string
+breakpointDown(firstBreakpoint); // $ExpectType string
diff --git a/types/carbon__layout/index.d.ts b/types/carbon__layout/index.d.ts
new file mode 100644
index 0000000000..1d7c7b4630
--- /dev/null
+++ b/types/carbon__layout/index.d.ts
@@ -0,0 +1,80 @@
+// Type definitions for @carbon/layout 0.0
+// Project: https://github.com/IBM/carbon-elements/tree/master/packages/layout
+// Definitions by: Vince Picone <https://github.com/vpicone>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export const baseFontSize: number;
+
+export const breakpoints: {
+    lg: {
+        columns: number;
+        margin: string;
+        width: string;
+    };
+    max: {
+        columns: number;
+        margin: string;
+        width: string;
+    };
+    md: {
+        columns: number;
+        margin: string;
+        width: string;
+    };
+    sm: {
+        columns: number;
+        margin: string;
+        width: string;
+    };
+    xlg: {
+        columns: number;
+        margin: string;
+        width: string;
+    };
+};
+
+export const miniUnit: number;
+
+export const spacing: number[];
+
+export function breakpoint(...args: any[]): string;
+
+export function breakpointDown(name: string): string;
+
+export function breakpointUp(name: string): string;
+
+export function em(px: number): string;
+
+export function miniUnits(count: number): string;
+
+export function px(value: number): string;
+
+export function rem(px: number): string;
+
+export namespace breakpoint {
+    const prototype: {};
+}
+
+export namespace breakpointDown {
+    const prototype: {};
+}
+
+export namespace breakpointUp {
+    const prototype: {};
+}
+
+export namespace em {
+    const prototype: {};
+}
+
+export namespace miniUnits {
+    const prototype: {};
+}
+
+export namespace px {
+    const prototype: {};
+}
+
+export namespace rem {
+    const prototype: {};
+}
diff --git a/types/carbon__layout/tsconfig.json b/types/carbon__layout/tsconfig.json
new file mode 100644
index 0000000000..10f832a631
--- /dev/null
+++ b/types/carbon__layout/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": {
+            "@carbon/layout": ["carbon__layout"]
+        }
+    },
+    "files": ["index.d.ts", "carbon__layout-tests.ts"]
+}
diff --git a/types/carbon__layout/tslint.json b/types/carbon__layout/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/carbon__layout/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/carbon__motion/carbon__motion-tests.ts b/types/carbon__motion/carbon__motion-tests.ts
new file mode 100644
index 0000000000..6bcc820f5d
--- /dev/null
+++ b/types/carbon__motion/carbon__motion-tests.ts
@@ -0,0 +1,8 @@
+import { easings, motion } from "@carbon/motion";
+
+const easingNames = Object.keys(easings);
+
+const firstEasing = easingNames[0];
+const firstMode = Object.keys(firstEasing)[0];
+
+motion(firstEasing, firstMode);
diff --git a/types/carbon__motion/index.d.ts b/types/carbon__motion/index.d.ts
new file mode 100644
index 0000000000..173687d04c
--- /dev/null
+++ b/types/carbon__motion/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for @carbon/motion 0.0
+// Project: https://github.com/IBM/carbon-elements/tree/master/packages/motion
+// Definitions by: Vince Picone <https://github.com/vpicone>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export const easings: {
+    entrance: {
+        expressive: string;
+        productive: string;
+    };
+    exit: {
+        expressive: string;
+        productive: string;
+    };
+    standard: {
+        expressive: string;
+        productive: string;
+    };
+};
+
+export function motion(name: string, mode: string): string;
+
+export namespace motion {
+    const prototype: {};
+}
diff --git a/types/carbon__motion/tsconfig.json b/types/carbon__motion/tsconfig.json
new file mode 100644
index 0000000000..38245c7c9e
--- /dev/null
+++ b/types/carbon__motion/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": {
+            "@carbon/motion": ["carbon__motion"]
+        }
+    },
+    "files": ["index.d.ts", "carbon__motion-tests.ts"]
+}
diff --git a/types/carbon__motion/tslint.json b/types/carbon__motion/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/carbon__motion/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/carbon__themes/carbon__themes-tests.ts b/types/carbon__themes/carbon__themes-tests.ts
new file mode 100644
index 0000000000..7515742031
--- /dev/null
+++ b/types/carbon__themes/carbon__themes-tests.ts
@@ -0,0 +1,59 @@
+import ThemePackage from "@carbon/themes";
+
+interface Theme {
+    active01: string;
+    activeDanger: string;
+    activePrimary: string;
+    activeSecondary: string;
+    activeTertiary: string;
+    activeUI: string;
+    brand01: string;
+    brand02: string;
+    brand03: string;
+    disabled01: string;
+    disabled02: string;
+    disabled03: string;
+    field01: string;
+    field02: string;
+    focus: string;
+    highlight: string;
+    hoverDanger: string;
+    hoverField: string;
+    hoverPrimary: string;
+    hoverPrimaryText: string;
+    hoverRow: string;
+    hoverSecondary: string;
+    hoverSelectedUI: string;
+    hoverTertiary: string;
+    hoverUI: string;
+    icon01: string;
+    icon02: string;
+    interactive01: string;
+    interactive02: string;
+    interactive03: string;
+    inverse01: string;
+    inverse02: string;
+    overlay01: string;
+    selectedUI: string;
+    support01: string;
+    support02: string;
+    support03: string;
+    support04: string;
+    text01: string;
+    text02: string;
+    text03: string;
+    text04: string;
+    ui01: string;
+    ui02: string;
+    ui03: string;
+    ui04: string;
+    ui05: string;
+    uiBackground: string;
+    visitedLink: string;
+}
+
+const getDefaultTheme = (): Theme => {
+    return ThemePackage.white;
+};
+
+getDefaultTheme();
diff --git a/types/carbon__themes/index.d.ts b/types/carbon__themes/index.d.ts
new file mode 100644
index 0000000000..e10f17f35c
--- /dev/null
+++ b/types/carbon__themes/index.d.ts
@@ -0,0 +1,74 @@
+// Type definitions for @carbon/themes 0.0
+// Project: https://github.com/IBM/carbon-elements/tree/master/packages/themes
+// Definitions by: Vince Picone <https://github.com/vpicone>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export default carbon__themes;
+
+interface Theme {
+    active01: string;
+    activeDanger: string;
+    activePrimary: string;
+    activeSecondary: string;
+    activeTertiary: string;
+    activeUI: string;
+    brand01: string;
+    brand02: string;
+    brand03: string;
+    disabled01: string;
+    disabled02: string;
+    disabled03: string;
+    field01: string;
+    field02: string;
+    focus: string;
+    highlight: string;
+    hoverDanger: string;
+    hoverField: string;
+    hoverPrimary: string;
+    hoverPrimaryText: string;
+    hoverRow: string;
+    hoverSecondary: string;
+    hoverSelectedUI: string;
+    hoverTertiary: string;
+    hoverUI: string;
+    icon01: string;
+    icon02: string;
+    interactive01: string;
+    interactive02: string;
+    interactive03: string;
+    inverse01: string;
+    inverse02: string;
+    overlay01: string;
+    selectedUI: string;
+    support01: string;
+    support02: string;
+    support03: string;
+    support04: string;
+    text01: string;
+    text02: string;
+    text03: string;
+    text04: string;
+    ui01: string;
+    ui02: string;
+    ui03: string;
+    ui04: string;
+    ui05: string;
+    uiBackground: string;
+    visitedLink: string;
+}
+
+// The default theme is included as a top level export
+type ThemePackage = {
+    white: Theme;
+    g10: Theme;
+    g100: Theme;
+    g90: Theme;
+    themes: {
+        g10: Theme;
+        g100: Theme;
+        g90: Theme;
+        white: Theme;
+    };
+} & Theme;
+
+declare const carbon__themes: ThemePackage;
diff --git a/types/carbon__themes/tsconfig.json b/types/carbon__themes/tsconfig.json
new file mode 100644
index 0000000000..490b17648e
--- /dev/null
+++ b/types/carbon__themes/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": {
+            "@carbon/themes": ["carbon__themes"]
+        }
+    },
+    "files": ["index.d.ts", "carbon__themes-tests.ts"]
+}
diff --git a/types/carbon__themes/tslint.json b/types/carbon__themes/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/carbon__themes/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/carbon__type/carbon__type-tests.ts b/types/carbon__type/carbon__type-tests.ts
new file mode 100644
index 0000000000..a5d4cf7b8b
--- /dev/null
+++ b/types/carbon__type/carbon__type-tests.ts
@@ -0,0 +1,6 @@
+import { fontFamily, fontWeight, getTypeSize, print } from "@carbon/type";
+
+fontFamily("mono"); // $ExpectType { fontFamily: string; }
+fontWeight("light"); // $ExpectType { fontWeight: number; }
+print(fontFamily("mono")); // $ExpectType string
+getTypeSize(2); // $ExpectType number
diff --git a/types/carbon__type/index.d.ts b/types/carbon__type/index.d.ts
new file mode 100644
index 0000000000..7933f2e358
--- /dev/null
+++ b/types/carbon__type/index.d.ts
@@ -0,0 +1,726 @@
+// Type definitions for @carbon/type 0.0
+// Project: https://github.com/IBM/carbon-elements/tree/master/packages/type
+// Definitions by: Vince Picone <https://github.com/vpicone>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export const bodyLong01: {
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: string;
+    lineHeight: string;
+};
+
+export const bodyLong02: {
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: number;
+    lineHeight: string;
+};
+
+export const bodyShort01: {
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: string;
+    lineHeight: string;
+};
+
+export const bodyShort02: {
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: number;
+    lineHeight: string;
+};
+
+export const caption01: {
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: string;
+    lineHeight: string;
+};
+
+export const code01: {
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: string;
+    lineHeight: string;
+};
+
+export const code02: {
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: string;
+    lineHeight: string;
+};
+
+export const display01: {
+    "@media (min-width: 42rem)": {
+        fontSize: string;
+    };
+    "@media (min-width: 66rem)": {
+        fontSize: string;
+    };
+    "@media (min-width: 82rem)": {
+        fontSize: string;
+        lineHeight: string;
+    };
+    "@media (min-width: 99rem)": {
+        fontSize: string;
+        lineHeight: string;
+    };
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: number;
+    lineHeight: string;
+};
+
+export const display02: {
+    "@media (min-width: 42rem)": {
+        fontSize: string;
+    };
+    "@media (min-width: 66rem)": {
+        fontSize: string;
+    };
+    "@media (min-width: 82rem)": {
+        fontSize: string;
+        lineHeight: string;
+    };
+    "@media (min-width: 99rem)": {
+        fontSize: string;
+        lineHeight: string;
+    };
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: number;
+    lineHeight: string;
+};
+
+export const display03: {
+    "@media (min-width: 42rem)": {
+        fontSize: string;
+        lineHeight: string;
+    };
+    "@media (min-width: 66rem)": {
+        fontSize: string;
+        letterSpacing: string;
+        lineHeight: string;
+    };
+    "@media (min-width: 82rem)": {
+        fontSize: string;
+        lineHeight: string;
+    };
+    "@media (min-width: 99rem)": {
+        fontSize: string;
+        letterSpacing: string;
+        lineHeight: string;
+    };
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: number;
+    lineHeight: string;
+};
+
+export const display04: {
+    "@media (min-width: 42rem)": {
+        fontSize: string;
+        lineHeight: string;
+    };
+    "@media (min-width: 66rem)": {
+        fontSize: string;
+        letterSpacing: string;
+        lineHeight: string;
+    };
+    "@media (min-width: 82rem)": {
+        fontSize: string;
+        letterSpacing: string;
+        lineHeight: string;
+    };
+    "@media (min-width: 99rem)": {
+        fontSize: string;
+        letterSpacing: string;
+        lineHeight: string;
+    };
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: number;
+    lineHeight: string;
+};
+
+export const expressiveHeading04: {
+    "@media (min-width: 82rem)": {
+        fontSize: string;
+        lineHeight: string;
+    };
+    "@media (min-width: 99rem)": {
+        fontSize: string;
+    };
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: number;
+    lineHeight: string;
+};
+
+export const expressiveHeading05: {
+    "@media (min-width: 42rem)": {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    "@media (min-width: 66rem)": {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    "@media (min-width: 82rem)": {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    "@media (min-width: 99rem)": {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: number;
+    lineHeight: string;
+};
+
+export const expressiveParagraph01: {
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: number;
+    lg: {
+        fontSize: string;
+        lineHeight: string;
+    };
+    lineHeight: string;
+    max: {
+        fontSize: string;
+        lineHeight: string;
+    };
+};
+
+export const fontFamilies: {
+    mono: string;
+    sans: string;
+    sansCondensed: string;
+    sansHebrew: string;
+    serif: string;
+};
+
+export const fontWeights: {
+    light: number;
+    regular: number;
+    semibold: number;
+};
+
+export const heading01: {
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: string;
+    lineHeight: string;
+};
+
+export const heading02: {
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: number;
+    lineHeight: string;
+};
+
+export const heading03: {
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: number;
+    lineHeight: string;
+};
+
+export const helperText01: {
+    fontFamily: string;
+    fontSize: string;
+    fontStyle: string;
+    letterSpacing: string;
+    lineHeight: string;
+};
+
+export const label01: {
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: string;
+    lineHeight: string;
+};
+
+export const productiveHeading04: {
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: number;
+    lineHeight: string;
+};
+
+export const productiveHeading05: {
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: number;
+    lineHeight: string;
+};
+
+export const quotation01: {
+    "@media (min-width: 42rem)": {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+    };
+    "@media (min-width: 66rem)": {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    "@media (min-width: 82rem)": {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    "@media (min-width: 99rem)": {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: number;
+    lineHeight: string;
+};
+
+export const quotation02: {
+    "@media (min-width: 42rem)": {
+        fontSize: string;
+        lineHeight: string;
+    };
+    "@media (min-width: 66rem)": {
+        fontSize: string;
+        lineHeight: string;
+    };
+    "@media (min-width: 82rem)": {
+        fontSize: string;
+        lineHeight: string;
+    };
+    "@media (min-width: 99rem)": {
+        fontSize: string;
+    };
+    fontFamily: string;
+    fontSize: string;
+    fontWeight: number;
+    letterSpacing: number;
+    lineHeight: string;
+};
+
+export const reset: {
+    body: {
+        "-moz-osx-font-smoothing": string;
+        "-webkit-font-smoothing": string;
+        fontFamily: string;
+        fontWeight: number;
+        textRendering: string;
+    };
+    html: {
+        fontSize: string;
+    };
+    strong: {
+        fontWeight: number;
+    };
+};
+
+export const scale: number[];
+
+export const spacing: {
+    layout01: string;
+    layout02: string;
+    layout03: string;
+    margin01: string;
+    margin02: string;
+    margin03: string;
+};
+
+export const styles: {
+    bodyLong01: {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: string;
+        lineHeight: string;
+    };
+    bodyLong02: {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    bodyShort01: {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: string;
+        lineHeight: string;
+    };
+    bodyShort02: {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    caption01: {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: string;
+        lineHeight: string;
+    };
+    code01: {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: string;
+        lineHeight: string;
+    };
+    code02: {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: string;
+        lineHeight: string;
+    };
+    display01: {
+        "@media (min-width: 42rem)": {
+            fontSize: string;
+        };
+        "@media (min-width: 66rem)": {
+            fontSize: string;
+        };
+        "@media (min-width: 82rem)": {
+            fontSize: string;
+            lineHeight: string;
+        };
+        "@media (min-width: 99rem)": {
+            fontSize: string;
+            lineHeight: string;
+        };
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    display02: {
+        "@media (min-width: 42rem)": {
+            fontSize: string;
+        };
+        "@media (min-width: 66rem)": {
+            fontSize: string;
+        };
+        "@media (min-width: 82rem)": {
+            fontSize: string;
+            lineHeight: string;
+        };
+        "@media (min-width: 99rem)": {
+            fontSize: string;
+            lineHeight: string;
+        };
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    display03: {
+        "@media (min-width: 42rem)": {
+            fontSize: string;
+            lineHeight: string;
+        };
+        "@media (min-width: 66rem)": {
+            fontSize: string;
+            letterSpacing: string;
+            lineHeight: string;
+        };
+        "@media (min-width: 82rem)": {
+            fontSize: string;
+            lineHeight: string;
+        };
+        "@media (min-width: 99rem)": {
+            fontSize: string;
+            letterSpacing: string;
+            lineHeight: string;
+        };
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    display04: {
+        "@media (min-width: 42rem)": {
+            fontSize: string;
+            lineHeight: string;
+        };
+        "@media (min-width: 66rem)": {
+            fontSize: string;
+            letterSpacing: string;
+            lineHeight: string;
+        };
+        "@media (min-width: 82rem)": {
+            fontSize: string;
+            letterSpacing: string;
+            lineHeight: string;
+        };
+        "@media (min-width: 99rem)": {
+            fontSize: string;
+            letterSpacing: string;
+            lineHeight: string;
+        };
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    expressiveHeading04: {
+        "@media (min-width: 82rem)": {
+            fontSize: string;
+            lineHeight: string;
+        };
+        "@media (min-width: 99rem)": {
+            fontSize: string;
+        };
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    expressiveHeading05: {
+        "@media (min-width: 42rem)": {
+            fontFamily: string;
+            fontSize: string;
+            fontWeight: number;
+            letterSpacing: number;
+            lineHeight: string;
+        };
+        "@media (min-width: 66rem)": {
+            fontFamily: string;
+            fontSize: string;
+            fontWeight: number;
+            letterSpacing: number;
+            lineHeight: string;
+        };
+        "@media (min-width: 82rem)": {
+            fontFamily: string;
+            fontSize: string;
+            fontWeight: number;
+            letterSpacing: number;
+            lineHeight: string;
+        };
+        "@media (min-width: 99rem)": {
+            fontFamily: string;
+            fontSize: string;
+            fontWeight: number;
+            letterSpacing: number;
+            lineHeight: string;
+        };
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    expressiveParagraph01: {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lg: {
+            fontSize: string;
+            lineHeight: string;
+        };
+        lineHeight: string;
+        max: {
+            fontSize: string;
+            lineHeight: string;
+        };
+    };
+    heading01: {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: string;
+        lineHeight: string;
+    };
+    heading02: {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    heading03: {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    helperText01: {
+        fontFamily: string;
+        fontSize: string;
+        fontStyle: string;
+        letterSpacing: string;
+        lineHeight: string;
+    };
+    label01: {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: string;
+        lineHeight: string;
+    };
+    productiveHeading04: {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    productiveHeading05: {
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    quotation01: {
+        "@media (min-width: 42rem)": {
+            fontFamily: string;
+            fontSize: string;
+            fontWeight: number;
+            letterSpacing: number;
+        };
+        "@media (min-width: 66rem)": {
+            fontFamily: string;
+            fontSize: string;
+            fontWeight: number;
+            letterSpacing: number;
+            lineHeight: string;
+        };
+        "@media (min-width: 82rem)": {
+            fontFamily: string;
+            fontSize: string;
+            fontWeight: number;
+            letterSpacing: number;
+            lineHeight: string;
+        };
+        "@media (min-width: 99rem)": {
+            fontFamily: string;
+            fontSize: string;
+            fontWeight: number;
+            letterSpacing: number;
+            lineHeight: string;
+        };
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+    quotation02: {
+        "@media (min-width: 42rem)": {
+            fontSize: string;
+            lineHeight: string;
+        };
+        "@media (min-width: 66rem)": {
+            fontSize: string;
+            lineHeight: string;
+        };
+        "@media (min-width: 82rem)": {
+            fontSize: string;
+            lineHeight: string;
+        };
+        "@media (min-width: 99rem)": {
+            fontSize: string;
+        };
+        fontFamily: string;
+        fontSize: string;
+        fontWeight: number;
+        letterSpacing: number;
+        lineHeight: string;
+    };
+};
+
+export function fontFamily(
+    name: string
+): {
+    fontFamily: string;
+};
+
+export function fontWeight(
+    weight: string
+): {
+    fontWeight: number;
+};
+
+export function getTypeSize(step: number): number;
+
+export function print(block: object): string;
+
+export namespace fontFamily {
+    const prototype: {};
+}
+
+export namespace fontWeight {
+    const prototype: {};
+}
+
+export namespace getTypeSize {
+    const prototype: {};
+}
+
+export namespace print {
+    const prototype: {};
+}
diff --git a/types/carbon__type/tsconfig.json b/types/carbon__type/tsconfig.json
new file mode 100644
index 0000000000..7949e7ab22
--- /dev/null
+++ b/types/carbon__type/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": {
+            "@carbon/type": ["carbon__type"]
+        }
+    },
+    "files": ["index.d.ts", "carbon__type-tests.ts"]
+}
diff --git a/types/carbon__type/tslint.json b/types/carbon__type/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/carbon__type/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/cassandra-driver/cassandra-driver-tests.ts b/types/cassandra-driver/cassandra-driver-tests.ts
index ad8a7426fe..b4f850c315 100644
--- a/types/cassandra-driver/cassandra-driver-tests.ts
+++ b/types/cassandra-driver/cassandra-driver-tests.ts
@@ -2,24 +2,135 @@ import * as cassandra from 'cassandra-driver';
 import * as util from 'util';
 import * as fs from 'fs';
 
+class CustomRequestLogger implements cassandra.metrics.ClientMetrics {
+  onAuthenticationError(e: Error | cassandra.errors.AuthenticationError): void {
+    throw new Error("Method not implemented.");
+  }
+  onClientTimeoutError(e: cassandra.errors.OperationTimedOutError): void {
+    throw new Error("Method not implemented.");
+  }
+  onClientTimeoutRetry(e: Error): void {
+    throw new Error("Method not implemented.");
+  }
+  onConnectionError(e: Error): void {
+    throw new Error("Method not implemented.");
+  }
+  onIgnoreError(e: Error): void {
+    throw new Error("Method not implemented.");
+  }
+  onOtherError(e: Error): void {
+    throw new Error("Method not implemented.");
+  }
+  onOtherErrorRetry(e: Error): void {
+    throw new Error("Method not implemented.");
+  }
+  onReadTimeoutError(e: cassandra.errors.ResponseError): void {
+    throw new Error("Method not implemented.");
+  }
+  onReadTimeoutRetry(e: Error): void {
+    throw new Error("Method not implemented.");
+  }
+  onResponse(latency: number[]): void {
+    throw new Error("Method not implemented.");
+  }
+  onSpeculativeExecution(): void {
+    throw new Error("Method not implemented.");
+  }
+  onSuccessfulResponse(latency: number[]): void {
+    throw new Error("Method not implemented.");
+  }
+  onUnavailableError(e: cassandra.errors.ResponseError): void {
+    throw new Error("Method not implemented.");
+  }
+  onUnavailableRetry(e: Error): void {
+    throw new Error("Method not implemented.");
+  }
+  onWriteTimeoutError(e: cassandra.errors.ResponseError): void {
+    throw new Error("Method not implemented.");
+  }
+  onWriteTimeoutRetry(e: Error): void {
+    throw new Error("Method not implemented.");
+  }
+}
+
 const client = new cassandra.Client({
     contactPoints: ['h1', 'h2'],
+    localDataCenter: 'datacenter1',
     keyspace: 'ks1',
     sslOptions: {
         cert: fs.readFileSync('certFilePath')
     },
     encoding: {
         map: Map,
-        set: Set
-    }
+        set: Set,
+        useBigIntAsLong: false,
+        useBigIntAsVarint: true
+    },
+    requestTracker: new cassandra.tracker.RequestLogger({ logNormalRequests: true }),
+    metrics: new CustomRequestLogger()
 });
 
+console.log(client.metrics);
+
 const query = 'SELECT email, last_name FROM user_profiles WHERE key=?';
 client.execute(query, ['guy'], (err, result) => {
   console.log('got user profile with email ' + result.rows[0].email);
 });
 
-client.execute(query, [ 'guy' ], { prepare: true }).then(
+client.execute(query, [ 'guy' ], { prepare: true, counter: false }).then(
     (result) => console.log(result.first().email),
     (error) => console.log(error)
 );
+
+const mapper = new cassandra.mapping.Mapper(
+  client,
+  {
+    models: {
+      // example copied from library examples
+      // tslint:disable-next-line:object-literal-key-quotes
+      'Video': {
+        tables: [ 'videos', 'user_videos', 'latest_videos' ],
+        keyspace: 'examples',
+        // example copied from library examples
+        // tslint:disable-next-line:object-literal-key-quotes
+        columns: { 'videoid': 'videoId', 'userid': 'userId' },
+        mappings: new cassandra.mapping.UnderscoreCqlToCamelCaseMappings()
+      }
+    }
+  });
+
+const videoMapper = mapper.forModel('Video');
+videoMapper.insert({ videoId: 'uuid', addedDate: new Date(), userId: 'uuid', name: 'My video', description: 'My desc' });
+videoMapper.find({ videoId: 'uuid' }).then(results => results.first());
+
+console.log(cassandra.version);
+
+const metadata = new cassandra.metadata.Metadata(cassandra.defaultOptions(), undefined);
+let refreshFinished: Promise<void> = metadata.refreshKeyspaces();
+refreshFinished = metadata.refreshKeyspaces(true);
+metadata.refreshKeyspaces(() => {});
+metadata.refreshKeyspaces(true, () => {});
+
+const start: cassandra.token.Token = new cassandra.token.Token("x");
+const end: cassandra.token.Token = new cassandra.token.Token("z");
+
+const tokenizer: cassandra.token.Tokenizer = {
+  hash: (value: Buffer | number[]) => new cassandra.token.Token("x"),
+  parse: (value: string) => new cassandra.token.Token("x"),
+  minToken: () => new cassandra.token.Token("x"),
+  split: (start: cassandra.token.Token, end: cassandra.token.Token, numberOfSplits: number) => [],
+  splitBase: (start: number, end: number, ringEnd: number, ringLength: number, numberOfSplits: number): number[] => [1],
+  stringify: (token: cassandra.token.Token): string => "asd"
+};
+
+const range: cassandra.token.TokenRange = new cassandra.token.TokenRange(start, end, tokenizer);
+
+class MyLoadBalancingPolicy extends cassandra.policies.loadBalancing.LoadBalancingPolicy {
+  getDistance() {
+    return cassandra.types.distance.ignored;
+  }
+}
+
+const myPolicy: cassandra.policies.loadBalancing.LoadBalancingPolicy = new MyLoadBalancingPolicy();
+let existingPolicy: cassandra.policies.loadBalancing.LoadBalancingPolicy = new cassandra.policies.loadBalancing.DCAwareRoundRobinPolicy();
+existingPolicy = new cassandra.policies.loadBalancing.DCAwareRoundRobinPolicy("dc");
diff --git a/types/cassandra-driver/index.d.ts b/types/cassandra-driver/index.d.ts
index df95e386b6..86073ec888 100644
--- a/types/cassandra-driver/index.d.ts
+++ b/types/cassandra-driver/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for cassandra-driver 3.6
+// Type definitions for cassandra-driver 4.0
 // Project: https://github.com/datastax/nodejs-driver
 // Definitions by: Marc Fisher <https://github.com/Svjard>
 //                 Christian D <https://github.com/pc-jedi>
+//                 Michal Kaminski <https://github.com/michal-b-kaminski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -33,43 +34,29 @@ export namespace policies {
   }
 
   namespace loadBalancing {
-    let DCAwareRoundRobinPolicy: DCAwareRoundRobinPolicyStatic;
-    let RoundRobinPolicy: RoundRobinPolicyStatic;
-    let TokenAwarePolicy: TokenAwarePolicyStatic;
-    let WhiteListPolicy: WhiteListPolicyStatic;
-
-    interface LoadBalancingPolicy {
+    class LoadBalancingPolicy {
       init(client: Client, hosts: HostMap, callback: Callback): void;
       getDistance(host: Host): types.distance;
-      newQueryPlan(keyspace: string, queryOptions: any, callback: Callback): void;
+      newQueryPlan(keyspace: string, queryOptions: ExecutionOptions | null, callback: Callback): void;
+      getOptions(): Map<string, any>;
     }
 
-    interface DCAwareRoundRobinPolicyStatic {
-      new (localDc?: string, usedHostsPerRemoteDc?: number): DCAwareRoundRobinPolicy;
-    }
-
-    interface DCAwareRoundRobinPolicy extends LoadBalancingPolicy {
+    class DCAwareRoundRobinPolicy extends LoadBalancingPolicy {
+      localDc: string;
       localHostsArray: Host[];
-      remoteHostsArray: Host[];
+
+      constructor(localDc?: string);
     }
 
-    interface RoundRobinPolicyStatic {
-      new (): RoundRobinPolicy;
+    class RoundRobinPolicy extends LoadBalancingPolicy {}
+
+    class TokenAwarePolicy extends LoadBalancingPolicy {
+      constructor(childPolicy: LoadBalancingPolicy);
     }
 
-    interface RoundRobinPolicy extends LoadBalancingPolicy { }
-
-    interface TokenAwarePolicyStatic {
-      new (childPolicy: LoadBalancingPolicy): TokenAwarePolicy;
+    class WhiteListPolicy extends LoadBalancingPolicy {
+      constructor(childPolicy: LoadBalancingPolicy, whiteList: string[]);
     }
-
-    interface TokenAwarePolicy extends LoadBalancingPolicy { }
-
-    interface WhiteListPolicyStatic {
-      new (childPolicy: LoadBalancingPolicy, whiteList: string[]): WhiteListPolicy;
-    }
-
-    interface WhiteListPolicy extends LoadBalancingPolicy { }
   }
 
   namespace reconnection {
@@ -129,7 +116,7 @@ export namespace policies {
       onUnavailable(requestInfo: RequestInfo, consistency: types.consistencies, required: number, alive: number): DecisionInfo;
       onWriteTimeout(requestInfo: RequestInfo, consistency: types.consistencies, received: number, blockFor: number, writeType: string): DecisionInfo;
       rethrowResult(): { decision: retryDecision };
-      retryResult(): { decision: retryDecision, consistency: types.consistencies, useCurrentHost: boolean };
+      retryResult(consistency?: types.consistencies, useCurrentHost?: boolean): { decision: retryDecision, consistency: types.consistencies, useCurrentHost: boolean };
     }
   }
 
@@ -498,12 +485,11 @@ export namespace types {
 }
 
 export let Client: ClientStatic;
-export let Host: HostStatic;
-export let HostMap: HostMapStatic;
 export let Encoder: EncoderStatic;
 
 export interface ClientOptions {
   contactPoints: string[];
+  localDataCenter?: string;
   keyspace?: string;
   refreshSchemaDelay?: number;
   isMetadataSyncEnabled?: boolean;
@@ -541,15 +527,19 @@ export interface ClientOptions {
     coalescingThreshold?: number;
   };
   authProvider?: auth.AuthProvider;
+  requestTracker?: tracker.RequestTracker;
   sslOptions?: tls.ConnectionOptions;
   encoding?: {
     map?: typeof Map | ((...args: any[]) => any);
     set?: typeof Set | ((...args: any[]) => any);
     copyBuffer?: boolean;
     useUndefinedAsUnset?: boolean;
+    useBigIntAsLong?: boolean;
+    useBigIntAsVarint?: boolean;
   };
   profiles?: ExecutionProfile[];
   promiseFactory?: (handler: (callback: (err?: any, result?: any) => void) => void) => Promise<any>;
+  metrics?: metrics.ClientMetrics;
 }
 
 export interface QueryOptions {
@@ -563,11 +553,11 @@ export interface QueryOptions {
   isIdempotent?: boolean;
   keyspace?: string;
   logged?: boolean;
+  counter?: boolean;
   pageState?: Buffer | string;
   prepare?: boolean;
   readTimeout?: number;
   retry?: policies.retry.RetryPolicy;
-  retryOnTimeout?: boolean;
   routingIndexes?: number[];
   routingKey?: Buffer | Buffer[];
   routingNames?: string[];
@@ -585,6 +575,7 @@ export interface Client extends events.EventEmitter {
   hosts: HostMap;
   keyspace: string;
   metadata: metadata.Metadata;
+  metrics: metrics.ClientMetrics;
 
   batch(queries: string[] | Array<{ query: string, params?: any }>, options: QueryOptions, callback: ResultCallback): void;
   batch(queries: string[] | Array<{ query: string, params?: any }>, callback: ResultCallback): void;
@@ -604,14 +595,10 @@ export interface Client extends events.EventEmitter {
   stream(query: string, params?: any, options?: QueryOptions, callback?: Callback): NodeJS.ReadableStream;
 }
 
-export interface HostStatic {
-  new (address: string, protocolVersion: number, options: ClientOptions): Host;
-}
-
 export interface Host extends events.EventEmitter {
   address: string;
   cassandraVersion: string;
-  dataCenter: string;
+  datacenter: string;
   rack: string;
   tokens: string[];
 
@@ -620,10 +607,6 @@ export interface Host extends events.EventEmitter {
   isUp(): boolean;
 }
 
-export interface HostMapStatic {
-  new (): HostMap;
-}
-
 export interface HostMap extends events.EventEmitter {
   length: number;
 
@@ -735,19 +718,10 @@ export namespace errors {
 }
 
 export namespace metadata {
-  let Aggregate: AggregateStatic;
-  let Index: IndexStatic;
-  let MaterializedView: MaterializedViewStatic;
   let Metadata: MetadataStatic;
-  let SchemaFunction: SchemaFunctionStatic;
-  let TableMetadata: TableMetadataStatic;
 
   type caching = "all" | "keys_only" | "rows_only" | "none";
 
-  interface AggregateStatic {
-    new (): Aggregate;
-  }
-
   interface Aggregate {
     argumentTypes: Array<{ code: number, info: any }>;
     finalFunction: string;
@@ -759,10 +733,6 @@ export namespace metadata {
     stateType: string;
   }
 
-  interface ClientStateStatic {
-    new (): ClientState;
-  }
-
   interface ClientState {
     getConnectedHosts(): Host[];
     getInFlightQueries(host: Host): number;
@@ -815,13 +785,6 @@ export namespace metadata {
     composites
   }
 
-  interface IndexStatic {
-    new (name: string, target: string, kind: string | IndexType, options: object): Index;
-
-    fromRows(indexRows: types.Row[]): Index[];
-    fromColumnRows(columnRows: types.Row[], columnsByName: { [key: string]: ColumnInfo }): Index[];
-  }
-
   interface Index {
     kind: IndexType;
     name: string;
@@ -833,11 +796,19 @@ export namespace metadata {
     isKeysKind(): boolean;
   }
 
-  interface MaterializedViewStatic {
-    new (name: string): MaterializedView;
+  interface MaterializedView extends DataCollection { }
+
+  interface QueryTrace {
+    requestType: any;
+    coordinator: any;
+    parameters: any;
+    startedAt: any;
+    duration: any;
+    clientAddress: any;
+    events: Array<{ id: any; activity: any; source: any; elapsed: any; thread: any }>;
   }
 
-  interface MaterializedView extends DataCollection { }
+  type MetadataCallback<T> = (err: any, retVal: T) => void;
 
   interface MetadataStatic {
     new (options: ClientOptions, controlConnection: any): Metadata;
@@ -846,21 +817,34 @@ export namespace metadata {
   interface Metadata {
     clearPrepared(): void;
 
-    getAggregate(keyspaceName: string, name: string, signature: string[] | Array<{ code: number, info: any }>, callback: Callback): void;
-    getAggregates(keyspaceName: string, name: string, callback: Callback): void;
-    getFunction(keyspaceName: string, name: string, signature: string[] | Array<{ code: number, info: any }>, callback: Callback): void;
-    getFunctions(keyspaceName: string, name: string, callback: Callback): void;
-    getMaterializedView(keyspaceName: string, name: string, callback: Callback): void;
-    getReplicas(keyspaceName: string, tokenBuffer: Buffer): any[];
-    getTable(keyspaceName: string, name: string, callback: Callback): void;
-    getTrace(traceId: types.Uuid, callback: Callback): void;
-    getUdt(keyspaceName: string, name: string, callback: Callback): void;
-    refreshKeyspace(name: string, callback?: Callback): void;
-    refreshKeyspaces(callback?: Callback): void;
-  }
-
-  interface SchemaFunctionStatic {
-    new (): SchemaFunction;
+    getAggregate(keyspaceName: string, name: string, signature: string[] | Array<{ code: number, info: any }>, callback: MetadataCallback<Aggregate>): void;
+    getAggregate(keyspaceName: string, name: string, signature: string[] | Array<{ code: number, info: any }>): Promise<Aggregate>;
+    getAggregates(keyspaceName: string, name: string, callback: MetadataCallback<Aggregate[]>): void;
+    getAggregates(keyspaceName: string, name: string): Promise<Aggregate[]>;
+    getFunction(keyspaceName: string, name: string, signature: string[] | Array<{ code: number, info: any }>, callback: MetadataCallback<SchemaFunction>): void;
+    getFunction(keyspaceName: string, name: string, signature: string[] | Array<{ code: number, info: any }>): Promise<SchemaFunction>;
+    getFunctions(keyspaceName: string, name: string, callback: MetadataCallback<SchemaFunction[]>): void;
+    getFunctions(keyspaceName: string, name: string): Promise<SchemaFunction[]>;
+    getMaterializedView(keyspaceName: string, name: string, callback: MetadataCallback<MaterializedView>): void;
+    getMaterializedView(keyspaceName: string, name: string, callback: Callback): Promise<MaterializedView>;
+    getReplicas(keyspaceName: string, token: Buffer | token.Token | token.TokenRange): any[]; // TODO
+    getTable(keyspaceName: string, name: string, callback: MetadataCallback<TableMetadata>): void;
+    getTable(keyspaceName: string, name: string): Promise<TableMetadata>;
+    getTokenRanges(): Set<token.TokenRange>;
+    getTokenRangesForHost(keyspaceName: string, host: Host): Set<token.TokenRange> | null;
+    getTrace(traceId: types.Uuid, consistency: types.consistencies, callback: MetadataCallback<QueryTrace>): void;
+    getTrace(traceId: types.Uuid, consistency: types.consistencies, callback: Callback): Promise<QueryTrace>;
+    getTrace(traceId: types.Uuid, callback: MetadataCallback<QueryTrace>): void;
+    getTrace(traceId: types.Uuid): Promise<QueryTrace>;
+    getUdt(keyspaceName: string, name: string, callback: MetadataCallback<any>): void; // TODO
+    getUdt(keyspaceName: string, name: string): Promise<any>; // TODO
+    newToken(components: Buffer[] | Buffer | string): token.Token;
+    newTokenRange(start: token.Token, end: token.Token): token.TokenRange;
+    refreshKeyspace(name: string, callback: Callback): void;
+    refreshKeyspace(name: string): Promise<void>;
+    refreshKeyspaces(waitReconnect: boolean, callback: Callback): void;
+    refreshKeyspaces(waitReconnect?: boolean): Promise<void>;
+    refreshKeyspaces(callback: Callback): void;
   }
 
   interface SchemaFunction {
@@ -875,10 +859,6 @@ export namespace metadata {
     signature: string[];
   }
 
-  interface TableMetadataStatic {
-    new (name: string): TableMetadata;
-  }
-
   interface TableMetadata extends DataCollection {
     indexes: Index[];
     indexInterval?: number;
@@ -889,3 +869,282 @@ export namespace metadata {
     virtual: boolean;
   }
 }
+
+export interface ExecutionOptionsStatic {
+  new (): ExecutionOptions;
+}
+
+export interface ExecutionOptions {
+  getCaptureStackTrace(): boolean;
+  getConsistency(): types.consistencies;
+  getCustomPayload(): { [key: string]: any };
+  getFetchSize(): number;
+  getFixedHost(): Host;
+  getHints(): string[] | string[][];
+  isAutoPage(): boolean;
+  isBatchCounter(): boolean;
+  isBatchLogged(): boolean;
+  isIdempotent(): boolean;
+  isPrepared(): boolean;
+  isQueryTracing(): boolean;
+  getKeyspace(): string;
+  getLoadBalancingPolicy(): policies.loadBalancing.LoadBalancingPolicy;
+  getPageState(): Buffer;
+  getRawQueryOptions(): QueryOptions;
+  getReadTimeout(): number;
+  getRetryPolicy(): policies.retry.RetryPolicy;
+  getRoutingKey(): Buffer | Buffer[];
+  getSerialConsistency(): types.consistencies;
+  getTimestamp(): number | Long | undefined | null;
+  setHints(hints: string[]): void;
+}
+
+export let ExecutionOptions: ExecutionOptionsStatic;
+export let ExecutionProfile: ExecutionProfileStatic;
+
+export namespace mapping {
+  let Mapper: MapperStatic;
+  let ModelBatchItem: ModelBatchItemStatic;
+  let ModelMappingInfo: ModelMappingInfoStatic;
+  let ModelMapper: ModelMapperStatic;
+  let MappingHandler: MappingHandlerStatic;
+  let Result: ResultStatic;
+  let DefaultTableMappings: DefaultTableMappingsStatic;
+  let UnderscoreCqlToCamelCaseMappings: UnderscoreCqlToCamelCaseMappingsStatic;
+
+  interface MappingExecutionOptions {
+    executionProfile?: string;
+    isIdempotent?: boolean;
+    logged?: boolean;
+    timestamp?: number | Long;
+    fetchSize?: number;
+    pageState?: number;
+  }
+
+  interface ModelTables {
+    name: string;
+    isView: boolean;
+  }
+
+  interface MappingQuery {
+    query: string;
+    isIdempotent: boolean;
+    isCounter: boolean;
+  }
+
+  interface MapperStatic {
+    new (client: Client, options?: MappingOptions): Mapper;
+  }
+  interface Mapper {
+    batch(items: ModelBatchItem[], executionOptions?: string | MappingExecutionOptions): Promise<Result>;
+    forModel(name: string): ModelMapper;
+  }
+
+  interface MappingOptions {
+    models: { [key: string]: ModelOptions };
+  }
+
+  interface ModelOptions {
+    tables?: string[] | ModelTables[];
+    mappings?: TableMappings;
+    columns?: { [key: string]: string };
+    keyspace?: string;
+  }
+
+  interface ModelMappingInfoStatic {
+    new (keyspace: string, tables: ModelTables[], mappings: TableMappings, columns: { [key: string]: string }): ModelMappingInfo;
+    parse(options: MappingOptions, currentKeyspace: string): { [key: string]: ModelMappingInfo };
+    createDefault(modelName: string, currentKeyspace: string): ModelMappingInfo;
+  }
+  interface ModelMappingInfo {
+    keyspace: string;
+    tables: ModelTables[];
+
+    getColumnName(propName: string): string;
+    getPropertyName(columnName: string): string;
+    newInstance(): TableMappings;
+  }
+
+  interface MappingDocInfo {
+    fields?: string[];
+    ttl?: number;
+    ifNotExists?: boolean;
+    when?: { [key: string]: string };
+    orderBy?: { [key: string]: string };
+    limit?: number;
+    deleteOnlyColumns?: boolean;
+  }
+
+  interface ModelBatchItemStatic {
+    new (
+      queries: Promise<MappingQuery[]>,
+      doc: { [key: string]: any },
+      docInfo: MappingDocInfo,
+      mappingInfo: ModelMappingInfo
+    ): ModelBatchItem;
+  }
+  interface ModelBatchItem {}
+
+  interface MappingHandlerStatic {
+    new (client: Client, mappingInfo: ModelMappingInfo): MappingHandler;
+  }
+  interface MappingHandler {}
+
+  interface ModelBatchMapper {
+    insert(doc: { [key: string]: any }, docInfo?: MappingDocInfo): ModelBatchItem;
+    remove(doc: { [key: string]: any }, docInfo?: MappingDocInfo): ModelBatchItem;
+    update(doc: { [key: string]: any }, docInfo?: MappingDocInfo): ModelBatchItem;
+  }
+
+  interface ModelMapperStatic {
+    new (name: string, handler: MappingHandler): ModelMapper;
+  }
+  interface ModelMapper {
+    name: string;
+    batching: ModelBatchMapper;
+
+    get(doc: { [key: string]: any }, docInfo?: MappingDocInfo, executionOptions?: string | MappingExecutionOptions): Promise<Result>;
+    find(doc: { [key: string]: any }, docInfo?: MappingDocInfo, executionOptions?: string | MappingExecutionOptions): Promise<Result>;
+    findAll(docInfo?: MappingDocInfo, executionOptions?: string | MappingExecutionOptions): Promise<Result>;
+    insert(doc: { [key: string]: any }, docInfo?: MappingDocInfo, executionOptions?: string | MappingExecutionOptions): Promise<Result>;
+    update(doc: { [key: string]: any }, docInfo?: MappingDocInfo, executionOptions?: string | MappingExecutionOptions): Promise<Result>;
+    remove(doc: { [key: string]: any }, docInfo?: MappingDocInfo, executionOptions?: string | MappingExecutionOptions): Promise<Result>;
+    mapWithQuery(
+      query: string,
+      paramsHandler: (doc: { [key: string]: any }) => any,
+      executionOptions?: string | MappingExecutionOptions
+    ): (doc: { [key: string]: any }, executionOptions?: string | MappingExecutionOptions) => Promise<Result>;
+  }
+
+  interface ResultStatic {
+    new (rs: types.ResultSet, info: ModelMappingInfo, rowAdapter: (row: types.Row, info: ModelMappingInfo) => { [key: string]: any }): Result;
+  }
+  interface Result {
+    [Symbol.iterator](): Iterator<{ [key: string]: any }>;
+    wasApplied(): boolean;
+    first(): { [key: string]: any };
+    toArray(): Array<{ [key: string]: any }>;
+    forEach(callback: (currentValue: { [key: string]: any }, index: number) => void, thisArg?: any): void;
+  }
+
+  interface TableMappings {
+    getColumnName(propName: string): string;
+    getPropertyName(columnName: string): string;
+    newObjectInstance(): { [key: string]: any };
+  }
+
+  interface DefaultTableMappingsStatic {
+    new (): DefaultTableMappings;
+  }
+  interface DefaultTableMappings extends TableMappings {}
+  interface UnderscoreCqlToCamelCaseMappingsStatic {
+    new (): UnderscoreCqlToCamelCaseMappings;
+  }
+  interface UnderscoreCqlToCamelCaseMappings extends TableMappings {}
+}
+
+export namespace tracker {
+  let RequestLogger: RequestLoggerStatic;
+
+  interface RequestLoggerOptions {
+    slowThreshold?: number;
+    logNormalRequests?: boolean;
+    logErroredRequests?: boolean;
+    messageMaxQueryLength?: number;
+    messageMaxParameterValueLength?: number;
+    messageMaxErrorStackTraceLength?: number;
+  }
+
+  interface RequestTracker {
+    onError(
+      host: Host,
+      query: string | Array<{ query: string, params?: any }>,
+      parameters: any[] | { [key: string]: any } | null,
+      executionOptions: ExecutionOptions,
+      requestLength: number,
+      err: Error,
+      latency: number[]
+    ): void;
+    onSuccess(
+      host: Host,
+      query: string | Array<{ query: string, params?: any }>,
+      parameters: any[] | { [key: string]: any } | null,
+      executionOptions: ExecutionOptions,
+      requestLength: number,
+      responseLength: number,
+      latency: number[]
+    ): void;
+    shutdown(): void;
+  }
+
+  interface RequestLoggerStatic {
+    new (options: RequestLoggerOptions): RequestLogger;
+  }
+  interface RequestLogger extends RequestTracker {}
+}
+
+export namespace metrics {
+  let DefaultMetrics: DefaultMetricsStatic;
+
+  interface ClientMetrics {
+    onAuthenticationError(e: Error | errors.AuthenticationError): void;
+    onClientTimeoutError(e: errors.OperationTimedOutError): void;
+    onClientTimeoutRetry(e: Error): void;
+    onConnectionError(e: Error): void;
+    onIgnoreError(e: Error): void;
+    onOtherError(e: Error): void;
+    onOtherErrorRetry(e: Error): void;
+    onReadTimeoutError(e: errors.ResponseError): void;
+    onReadTimeoutRetry(e: Error): void;
+    onResponse(latency: number[]): void;
+    onSpeculativeExecution(): void;
+    onSuccessfulResponse(latency: number[]): void;
+    onUnavailableError(e: errors.ResponseError): void;
+    onUnavailableRetry(e: Error): void;
+    onWriteTimeoutError(e: errors.ResponseError): void;
+    onWriteTimeoutRetry(e: Error): void;
+  }
+
+  interface DefaultMetricsStatic {
+    new (): DefaultMetrics;
+  }
+  interface DefaultMetrics extends ClientMetrics {}
+}
+
+export namespace token {
+  interface Tokenizer {
+    hash(value: Buffer | number[]): Token;
+    parse(value: string): Token;
+    minToken(): Token;
+    split(start: Token, end: Token, numberOfSplits: number): TokenRange[];
+    splitBase(start: number, end: number, ringEnd: number, ringLength: number, numberOfSplits: number): number[];
+    stringify(token: Token): string;
+  }
+
+  class Token {
+    constructor(value: any);
+
+    getType(): { code: number, info: any };
+    getValue(): any;
+    compare(other: Token): number;
+    equals(other: Token): boolean;
+  }
+
+  class TokenRange {
+    start: Token;
+    end: Token;
+
+    constructor(start: Token, end: Token, tokenizer: Tokenizer);
+
+    splitEvenly(numberOfSplits: number): TokenRange[];
+    isEmpty(): boolean;
+    isWrappedAround(): boolean;
+    unwrap(): TokenRange[];
+    contains(token: Token): boolean;
+    equals(other: TokenRange): boolean;
+    compare(other: TokenRange): number;
+  }
+}
+
+export function defaultOptions(): ClientOptions;
+export const version: string;
diff --git a/types/catbox/catbox-tests.ts b/types/catbox/catbox-tests.ts
index e86d2a94af..af85cde068 100644
--- a/types/catbox/catbox-tests.ts
+++ b/types/catbox/catbox-tests.ts
@@ -18,6 +18,9 @@ const Memory: EnginePrototypeOrObject = {
 
 const client = new Client<string>(Memory, { partition: 'cache' });
 
+client.start().then(() => {});
+client.stop().then(() => {});
+
 const cache = new Policy({
     expiresIn: 5000,
 }, client, 'cache');
diff --git a/types/catbox/index.d.ts b/types/catbox/index.d.ts
index 32fbdf6f3f..e90768be20 100644
--- a/types/catbox/index.d.ts
+++ b/types/catbox/index.d.ts
@@ -23,7 +23,7 @@ export class Client<T> implements ClientApi<T> {
     /** start() - creates a connection to the cache server. Must be called before any other method is available. */
     start(): Promise<void>;
     /** stop() - terminates the connection to the cache server. */
-    stop(): void;
+    stop(): Promise<void>;
     /**
      * get(key, callback) - retrieve an item from the cache engine if found where:
      *  * key - a cache key object (see [ICacheKey]).
@@ -231,7 +231,7 @@ export interface DecoratedPolicyOptions<T> extends PolicyOptions<T> {
     /**
      * @default false
      */
-    getDecoratedValue?: boolean;
+    getDecoratedValue: boolean | undefined;
 }
 
 export interface GenerateFuncFlags {
diff --git a/types/chai-json-schema/index.d.ts b/types/chai-json-schema/index.d.ts
index 69aec8bec7..04e841bc91 100644
--- a/types/chai-json-schema/index.d.ts
+++ b/types/chai-json-schema/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for chai-json-schema 1.4
-// Project: https://github.com/chaijs/chai-json-schema/
+// Project: https://github.com/chaijs/chai-json-schema/, http://chaijs.com
 // Definitions by: Ulrich Heiniger <https://github.com/ulrichheiniger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/chai-subset/index.d.ts b/types/chai-subset/index.d.ts
index 615f9f52e4..d02efb5844 100644
--- a/types/chai-subset/index.d.ts
+++ b/types/chai-subset/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for chai-subset 1.3
-// Project: https://github.com/e-conomic/chai-subset
+// Project: https://github.com/debitoor/chai-subset
 // Definitions by: Sam Noedel <https://github.com/delta62>, Andrew Brown <https://github.com/AGBrown>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/chai-webdriverio/package.json b/types/chai-webdriverio/package.json
new file mode 100644
index 0000000000..cd495fe983
--- /dev/null
+++ b/types/chai-webdriverio/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "@types/webdriverio": "^4.0.0"
+    }
+}
diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index ca28a1a9f6..7745713c84 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Chart.js 2.7
-// Project: https://github.com/nnnick/Chart.js
+// Project: https://github.com/nnnick/Chart.js, http://www.chartjs.org
 // Definitions by: Alberto Nuti <https://github.com/anuti>
 //                 Fabien Lavocat <https://github.com/FabienLavocat>
 //                 KentarouTakeda <https://github.com/KentarouTakeda>
@@ -417,6 +417,7 @@ declare namespace Chart {
     }
 
     interface ChartLineOptions {
+        cubicInterpolationMode?: 'default' | 'monotone';
         tension?: number;
         backgroundColor?: ChartColor;
         borderWidth?: number;
@@ -537,6 +538,7 @@ declare namespace Chart {
     interface LinearTickOptions extends TickOptions {
         maxTicksLimit?: number;
         stepSize?: number;
+        precision?: number;
         suggestedMin?: number;
         suggestedMax?: number;
     }
diff --git a/types/chartist/chartist-tests.ts b/types/chartist/chartist-tests.ts
index cb7f884264..863fdb33be 100644
--- a/types/chartist/chartist-tests.ts
+++ b/types/chartist/chartist-tests.ts
@@ -485,3 +485,53 @@ new Chartist.Candle('.ct-chart', {
         }
     }
 });
+
+
+// Create a simple bar chart and line chart with two dimensional arrays
+new Chartist.Bar('.ct-chart', {
+    labels: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+    series: [
+        [
+            {value: 1},
+            {value: 2},
+            {value: 3},
+            {value: 4},
+            {value: 5},
+            {value: 6},
+            {value: 7}
+        ],
+        [
+            {value: 7},
+            {value: 6},
+            {value: 5},
+            {value: 4},
+            {value: 3},
+            {value: 2},
+            {value: 1}
+        ]
+    ]
+}, {})
+
+new Chartist.Line('.ct-chart', {
+    labels: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+    series: [
+        [
+            {value: 1},
+            {value: 2},
+            {value: 3},
+            {value: 4},
+            {value: 5},
+            {value: 6},
+            {value: 7}
+        ],
+        [
+            {value: 7},
+            {value: 6},
+            {value: 5},
+            {value: 4},
+            {value: 3},
+            {value: 2},
+            {value: 1}
+        ]
+    ]
+}, {})
diff --git a/types/chartist/index.d.ts b/types/chartist/index.d.ts
index 9b096839cc..8d700703c9 100644
--- a/types/chartist/index.d.ts
+++ b/types/chartist/index.d.ts
@@ -93,7 +93,7 @@ declare namespace Chartist {
     // TODO: come in and tidy this up and make it fit better
     interface IChartistData {
         labels?: Array<string> | Array<number> | Array<Date>;
-        series: Array<IChartistSeriesData> | Array<Array<IChartistData>> | Array<number> | Array<Array<number>>;
+        series: Array<IChartistSeriesData> | Array<Array<IChartistSeriesData>> | Array<Array<IChartistData>> | Array<number> | Array<Array<number>>;
     }
 
     interface IChartistSeriesData {
diff --git a/types/chayns/index.d.ts b/types/chayns/index.d.ts
index a1989a1c51..388d25d463 100644
--- a/types/chayns/index.d.ts
+++ b/types/chayns/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for chayns 3.1
+// Type definitions for non-npm package chayns 3.1
 // Project: https://github.com/TobitSoftware/chayns-js
 // Definitions by: Henning Kuehl <https://github.com/HenningKuehl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/check-types/index.d.ts b/types/check-types/index.d.ts
index fad987692f..a7b67b6863 100644
--- a/types/check-types/index.d.ts
+++ b/types/check-types/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for check-types 7.3
-// Project: https://github.com/philbooth/check-types.js
+// Project: https://gitlab.com/philbooth/check-types.js
 // Definitions by: idchlife <https://github.com/idchlife>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
 // TypeScript Version: 2.2
diff --git a/types/chessboardjs/index.d.ts b/types/chessboardjs/index.d.ts
index f6228f748e..0839c618ea 100644
--- a/types/chessboardjs/index.d.ts
+++ b/types/chessboardjs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for chessboardjs 0.3
-// Project: https://github.com/oakmac/chessboardjs/
+// Project: https://github.com/oakmac/chessboardjs/, https://github.com/deanius/chessboardjs
 // Definitions by: Bayo Olatunji <https://github.com/sliverb>
 //                 David Paz <https://github.com/davidmpaz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/chosen-js/index.d.ts b/types/chosen-js/index.d.ts
index e9a67550db..227d3795ad 100644
--- a/types/chosen-js/index.d.ts
+++ b/types/chosen-js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Chosen 1.8
-// Project: http://harvesthq.github.com/chosen/
+// Project: https://harvesthq.github.io/chosen
 // Definitions by: Boris Yankov <https://github.com/borisyankov>, denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/chrome/index.d.ts b/types/chrome/index.d.ts
index 528ab91be7..211b6a59d8 100644
--- a/types/chrome/index.d.ts
+++ b/types/chrome/index.d.ts
@@ -2486,6 +2486,33 @@ declare namespace chrome.enterprise.deviceAttributes {
      * function(string deviceId) {...};
      */
     export 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.
+     */
+    export 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.
+     */
+    export 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.
+     */
+    export function getDeviceAnnotatedLocation(callback: (annotatedLocation: string) => void): void;
 }
 
 ////////////////////
@@ -5219,7 +5246,7 @@ declare namespace chrome.runtime {
 
     export interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> { }
 
-    export interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> { }
+    export interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response?: any) => void) => void> { }
 
     export interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> { }
 
@@ -5999,6 +6026,480 @@ declare namespace chrome.system.storage {
     export var onDetached: SystemStorageDetachedEvent;
 }
 
+////////////////////
+// System Display //
+////////////////////
+/**
+ * Use the system.display API to query display metadata.
+ * Permissions: 'system.display'
+ * @since Chrome 30.
+ */
+declare namespace chrome.system.display {
+
+  export const DisplayPosition: {
+      TOP: 'top',
+      RIGHT: 'right',
+      BOTTOM: 'bottom',
+      LEFT: 'left'
+  };
+  export const MirrorMode: {
+      OFF: 'off',
+      NORMAL: 'normal',
+      MIXED: 'mixed'
+  };
+  export interface Bounds {
+      /**  The x-coordinate of the upper-left corner. */
+      left: number;
+      /**  The y-coordinate of the upper-left corner. */
+      top: number;
+      /** The width of the display in pixels. */
+      width: number;
+      /** The height of the display in pixels. */
+      height: number;
+  }
+
+  export interface Insets {
+      /** The x-axis distance from the left bound. */
+      left: number;
+      /** The y-axis distance from the top bound. */
+      top: number;
+      /** The x-axis distance from the right bound. */
+      right: number;
+      /** The y-axis distance from the bottom bound. */
+      bottom: number;
+  }
+
+  /**
+   * @since Chrome 57
+   */
+  export interface Point {
+      /** The x-coordinate of the point. */
+      x: number;
+      /** The y-coordinate of the point. */
+      y: number;
+  }
+
+  /**
+   * @since Chrome 57
+   */
+  export interface TouchCalibrationPair {
+      /** The coordinates of the display point. */
+      displayPoint: Point;
+      /** The coordinates of the touch point corresponding to the display point. */
+      touchPoint: Point;
+  }
+
+  /**
+   * @since Chrome 52
+   */
+  export interface DisplayMode {
+      /** The display mode width in device independent (user visible) pixels. */
+      width: number;
+
+      /** The display mode height in device independent (user visible) pixels. */
+      height: number;
+
+      /** The display mode width in native pixels. */
+      widthInNativePixels: number;
+
+      /** The display mode height in native pixels. */
+      heightInNativePixels: number;
+
+      /**
+       * @deprecated Deprecated since Chrome 70. Use `displayZoomFactor`
+       * @description The display mode UI scale factor.
+       **/
+      uiScale: number;
+
+      /** The display mode device scale factor. */
+      deviceScaleFactor: number;
+
+      /**
+       * The display mode refresh rate in hertz.
+       * @since Chrome 67
+       */
+      refreshRate: number;
+
+      /** True if the mode is the display's native mode. */
+      isNative: boolean;
+
+      /** True if the display mode is currently selected. */
+      isSelected: boolean;
+  }
+
+  /**
+   * @since Chrome 53
+   */
+  export interface DisplayLayout {
+
+      /** The unique identifier of the display. */
+      id: string;
+      /** The unique identifier of the parent display. Empty if this is the root. */
+      parentId: string;
+      /**
+       * The layout position of this display relative to the parent.
+       * This will be ignored for the root.
+       * @see enum
+       */
+      position: typeof DisplayPosition[keyof typeof DisplayPosition];
+      /** The offset of the display along the connected edge. 0 indicates that the topmost or leftmost corners are aligned. */
+      offset: number;
+  }
+
+  /**
+   * The pairs of point used to calibrate the display.
+   */
+  export interface TouchCalibrationPairs {
+      /** First pair of touch and display point required for touch calibration. */
+      pair1: TouchCalibrationPair,
+      /** Second pair of touch and display point required for touch calibration. */
+      pair2: TouchCalibrationPair,
+      /** Third pair of touch and display point required for touch calibration. */
+      pair3: TouchCalibrationPair,
+      /** Fourth pair of touch and display point required for touch calibration. */
+      pair4: TouchCalibrationPair
+  }
+
+  /**
+   * Representation of info data to be used in chrome.system.display.setDisplayProperties()
+   */
+  export interface DisplayPropertiesInfo {
+      /**
+       * @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;
+
+      /**
+       * @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.
+       */
+      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 parameter.
+       */
+      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[See documentation for boundsOriginX parameter.]
+       */
+      boundsOriginY: number;
+
+      /**
+       * If set, updates the display mode to the mode matching this value.
+       * @since Chrome 52
+       */
+      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?: number;
+  }
+
+  /**
+   * Options affecting how the information is returned.
+   * @since Chrome 59
+   */
+  export interface 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;
+  }
+
+  /** Information about display properties. */
+  export interface DisplayInfo {
+      /** The unique identifier of the display. */
+      id: string;
+      /** The user-friendly name (e.g. 'HP LCD monitor'). */
+      name: string;
+      /**
+       * @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. */
+      isInternal: boolean;
+      /** True if this display is enabled. */
+      isEnabled: boolean;
+      /** The number of pixels per inch along the x-axis. */
+      dpiX: number;
+      /** The number of pixels per inch along the y-axis. */
+      dpiY: number;
+      /** 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;
+      /** 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: number[];
+      /**
+       * 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: number;
+  }
+
+  export 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';
+  }
+  export interface MirrorModeInfoMixed extends MirrorModeInfo {
+      mode: 'mixed';
+      mirroringSourceId?: string;
+      /** The ids of the mirroring destination displays. */
+      mirroringDestinationIds?: string[];
+  }
+
+  /**
+   * Requests the information for all attached display devices.
+   * @param callback The callback to invoke with the results.
+   */
+  export function getInfo(callback: (info: DisplayInfo[]) => void): void;
+  /**
+   * Requests the information for all attached display devices.
+   * @since Chrome 59
+   * @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;
+
+  /**
+   * @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 callback The callback to invoke with the results.
+   */
+  export function getDisplayLayout(callback: (layouts: DisplayLayout[]) => void): void;
+
+  /**
+   * @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;
+
+  /**
+   * @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
+   * @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;
+
+  /**
+   * @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
+   * @param {boolean} enabled True if unified desktop should be enabled.
+   */
+  export function enableUnifiedDesktop(enabled: boolean): void;
+  /**
+   * 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
+   * @param id The display's unique identifier.
+   */
+  export function overscanCalibrationStart(id: string): void;
+  /**
+   * 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
+   * @param id The display's unique identifier.
+   * @param delta The amount to change the overscan insets.
+   */
+  export function overscanCalibrationAdjust(id: string, delta: Insets): void;
+
+  /**
+   * Resets the overscan insets for a display to the last saved value (i.e before Start was called).
+   * @since Chrome 53
+   * @param id The display's unique identifier.
+   */
+  export function overscanCalibrationReset(id: string): void;
+
+  /**
+   * Complete overscan adjustments for a display by saving the current values and hiding the overlay.
+   * @since Chrome 53
+   * @param id The display's unique identifier.
+   */
+  export function overscanCalibrationComplete(id: string): void;
+
+  /**
+   * 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
+   * @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;
+
+  /**
+   * 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
+   * @param id The display's unique identifier.
+   */
+  export function startCustomTouchCalibration(id: string): void;
+
+  /**
+   * 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
+   * @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;
+
+  /**
+   * 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 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.
+   */
+  export function setMirrorMode(info: MirrorModeInfo | MirrorModeInfoMixed, callback: () => void): void;
+
+  /**
+   * Fired when anything changes to the display configuration.
+   */
+  export const onDisplayChanged: chrome.events.Event<() => void>;
+}
+
 ////////////////////
 // TabCapture
 ////////////////////
@@ -6519,7 +7020,7 @@ declare namespace chrome.tabs {
         zoomSettings: ZoomSettings;
     }
 
-    export interface TabHighlightedEvent extends chrome.events.Event<(highlightInfo: HighlightInfo) => void> { }
+    export interface TabHighlightedEvent extends chrome.events.Event<(highlightInfo: TabHighlightInfo) => void> { }
 
     export interface TabRemovedEvent extends chrome.events.Event<(tabId: number, removeInfo: TabRemoveInfo) => void> { }
 
diff --git a/types/chromecast-caf-receiver/index.d.ts b/types/chromecast-caf-receiver/index.d.ts
index 444dba0af4..f1b2b4a512 100644
--- a/types/chromecast-caf-receiver/index.d.ts
+++ b/types/chromecast-caf-receiver/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for chromecast-caf-receiver 3.x
+// Type definitions for non-npm package chromecast-caf-receiver 3.x
 // Project: https://github.com/googlecast
 // Definitions by: Craig Bruce <https://github.com/craigrbruce>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/chromecast-caf-sender/index.d.ts b/types/chromecast-caf-sender/index.d.ts
index de152b0715..10f2845316 100644
--- a/types/chromecast-caf-sender/index.d.ts
+++ b/types/chromecast-caf-sender/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Cast Application Framework Sender API 1.0
+// Type definitions for non-npm package Cast Application Framework Sender API 1.0
 // Project: https://developers.google.com/cast/docs/caf_receiver_overview
 // Definitions by: Samuel Maddock <https://github.com/samuelmaddock>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ckeditor/ckeditor-tests.ts b/types/ckeditor/ckeditor-tests.ts
index 7e224ab683..1321d5b83d 100644
--- a/types/ckeditor/ckeditor-tests.ts
+++ b/types/ckeditor/ckeditor-tests.ts
@@ -289,6 +289,17 @@ function test_dom_node() {
     strong.insertBefore(em);
     strong.insertBeforeMe(em);
     element.isReadOnly();
+    var prev = node.getPreviousSourceNode();
+    prev = node.getPreviousSourceNode(true);
+    prev = node.getPreviousSourceNode(true, CKEDITOR.NODE_TEXT);
+    prev = node.getPreviousSourceNode(true, CKEDITOR.NODE_COMMENT, node);
+    prev = node.getPreviousSourceNode(true, CKEDITOR.NODE_COMMENT, (current: CKEDITOR.dom.node) => false);
+    var next = node.getNextSourceNode();
+    next = node.getNextSourceNode(true);
+    next = node.getNextSourceNode(true, CKEDITOR.NODE_ELEMENT);
+    next = node.getNextSourceNode(true, CKEDITOR.NODE_DOCUMENT, node);
+    next = node.getNextSourceNode(true, CKEDITOR.NODE_DOCUMENT_FRAGMENT, (current: CKEDITOR.dom.node) => true);
+    console.log(node.type);
 }
 
 function test_dom_nodeList() {
diff --git a/types/ckeditor/index.d.ts b/types/ckeditor/index.d.ts
index 88646f67d1..3d35877b9d 100644
--- a/types/ckeditor/index.d.ts
+++ b/types/ckeditor/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for CKEditor 4.9
-// Project: https://ckeditor.com/ckeditor-4/
+// Project: https://ckeditor.com/ckeditor-4/, http://ckeditor.com
 // Definitions by: Thomas Wittwer <https://github.com/wittwert>
 //                 Stuart Long <https://github.com/stuartlong>
 //                 Viktor Pegy <https://github.com/viktorpegy>
@@ -333,6 +333,7 @@ declare namespace CKEDITOR {
         }
 
         class node extends domObject {
+            type: number;
             constructor(domNode: Node);
             appendTo(element: element): element;
             clone(includeChildren: boolean, cloneId: boolean): node;
@@ -347,12 +348,12 @@ declare namespace CKEDITOR {
             getDocument(): document;
             getIndex(normalized?: boolean): number;
             getNext(evaluator?: (node: node) => boolean): node;
-            getNextSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
+            getNextSourceNode(startFromSibling?: boolean, nodeType?: number, guard?: node | ((node: node) => boolean)): node;
             getParent(allowFragmentParent?: boolean): element;
             getParents(closerFirst?: boolean): node[];
             getPosition(otherNode: node): void;
             getPrevious(evaluator?: (node: node) => boolean): node;
-            getPreviousSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
+            getPreviousSourceNode(startFromSibling?: boolean, nodeType?: number, guard?: node | ((node: node) => boolean)): node;
             hasAscendant(name: string, includeSelf: boolean): boolean;
             remove(preserveChildren?: boolean): node;
             replace(nodeToReplace: node): void;
diff --git a/types/ckeditor__ckeditor5-core/index.d.ts b/types/ckeditor__ckeditor5-core/index.d.ts
index 63ae237739..e3de076471 100644
--- a/types/ckeditor__ckeditor5-core/index.d.ts
+++ b/types/ckeditor__ckeditor5-core/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @ckeditor/ckeditor5-core 11.0
-// Project: https://github.com/ckeditor/ckeditor5-core
+// Project: https://github.com/ckeditor/ckeditor5-core, https://ckeditor.com
 // Definitions by: denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/ckeditor__ckeditor5-engine/index.d.ts b/types/ckeditor__ckeditor5-engine/index.d.ts
index 280b6ea213..4d3e3f4a97 100644
--- a/types/ckeditor__ckeditor5-engine/index.d.ts
+++ b/types/ckeditor__ckeditor5-engine/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @ckeditor/ckeditor5-engine 11.0
-// Project: https://github.com/ckeditor/ckeditor5-engine
+// Project: https://github.com/ckeditor/ckeditor5-engine, https://ckeditor.com
 // Definitions by: denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/ckeditor__ckeditor5-utils/index.d.ts b/types/ckeditor__ckeditor5-utils/index.d.ts
index 50571483f8..3d943969de 100644
--- a/types/ckeditor__ckeditor5-utils/index.d.ts
+++ b/types/ckeditor__ckeditor5-utils/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @ckeditor/ckeditor5-utils 10.2
-// Project: https://github.com/ckeditor/ckeditor5-utils
+// Project: https://github.com/ckeditor/ckeditor5-utils, https://ckeditor.com
 // Definitions by: denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/clean-css/clean-css-tests.ts b/types/clean-css/clean-css-tests.ts
index 9c856d40a1..98049b3ef6 100644
--- a/types/clean-css/clean-css-tests.ts
+++ b/types/clean-css/clean-css-tests.ts
@@ -81,3 +81,18 @@ new CleanCSS({ returnPromise: true, sourceMap: true }).minify(source, inputSourc
         console.log(error);
     }
 );
+
+// test object return when passing options as object
+let CleanCssOptions: CleanCSS.Options = { returnPromise: true };
+new CleanCSS(CleanCssOptions).minify(source)
+    .then((minified: CleanCSS.Output): void => {
+        console.log(minified.styles);
+    }).catch((error: any): void => {
+        console.log(error);
+    }
+);
+
+CleanCssOptions = { returnPromise: false };
+new CleanCSS(CleanCssOptions).minify(source, (error: any, minified: CleanCSS.Output): void => {
+    console.log(minified.styles);
+});
diff --git a/types/clean-css/index.d.ts b/types/clean-css/index.d.ts
index 244c585e53..9f2dfe9358 100644
--- a/types/clean-css/index.d.ts
+++ b/types/clean-css/index.d.ts
@@ -8,83 +8,78 @@
 import { RequestOptions as HttpsRequestOptions } from "https";
 import { RequestOptions as HttpRequestOptions } from "http";
 
-declare namespace CleanCSS {
+/**
+ * Shared options passed when initializing a new instance of CleanCSS that returns either a promise or output
+ */
+interface OptionsBase {
     /**
-     * Options passed when initializing a new instance of CleanCSS
+     * Controls compatibility mode used; defaults to ie10+ using `'*'`.
+     *  Compatibility hash exposes the following properties: `colors`, `properties`, `selectors`, and `units`
      */
-    interface Options {
-        /**
-         * Controls compatibility mode used; defaults to ie10+ using `'*'`.
-         *  Compatibility hash exposes the following properties: `colors`, `properties`, `selectors`, and `units`
-         */
-        compatibility?: "*" | "ie9" | "ie8" | "ie7" | CompatibilityOptions;
+    compatibility?: "*" | "ie9" | "ie8" | "ie7" | CleanCSS.CompatibilityOptions;
 
-        /**
-         * Controls a function for handling remote requests; Defaults to the build in `loadRemoteResource` function
-         */
-        fetch?: (uri: string, inlineRequest: HttpRequestOptions | HttpsRequestOptions, inlineTimeout: number, done: (message: string | number, body: string) => void) => void;
+    /**
+     * Controls a function for handling remote requests; Defaults to the build in `loadRemoteResource` function
+     */
+    fetch?: (uri: string, inlineRequest: HttpRequestOptions | HttpsRequestOptions, inlineTimeout: number, done: (message: string | number, body: string) => void) => void;
 
-        /**
-         * Controls output CSS formatting; defaults to `false`.
-         *  Format hash exposes the following properties: `breaks`, `breakWith`, `indentBy`, `indentWith`, `spaces`, and `wrapAt`.
-         */
-        format?: "beautify" | "keep-breaks" | FormatOptions | false;
+    /**
+     * Controls output CSS formatting; defaults to `false`.
+     *  Format hash exposes the following properties: `breaks`, `breakWith`, `indentBy`, `indentWith`, `spaces`, and `wrapAt`.
+     */
+    format?: "beautify" | "keep-breaks" | CleanCSS.FormatOptions | false;
 
-        /**
-         * inline option whitelists which @import rules will be processed.  Defaults to `'local'`
-         * Accepts the following values:
-         *  'local': enables local inlining;
-         *  'remote': enables remote inlining;
-         *  'none': disables all inlining;
-         *  'all': enables all inlining, same as ['local', 'remote'];
-         *  '[uri]': enables remote inlining from the specified uri;
-         *  '![url]': disables remote inlining from the specified uri;
-         */
-        inline?: ReadonlyArray<string> | false;
+    /**
+     * inline option whitelists which @import rules will be processed.  Defaults to `'local'`
+     * Accepts the following values:
+     *  'local': enables local inlining;
+     *  'remote': enables remote inlining;
+     *  'none': disables all inlining;
+     *  'all': enables all inlining, same as ['local', 'remote'];
+     *  '[uri]': enables remote inlining from the specified uri;
+     *  '![url]': disables remote inlining from the specified uri;
+     */
+    inline?: ReadonlyArray<string> | false;
 
-        /**
-         * Controls extra options for inlining remote @import rules
-         */
-        inlineRequest?: HttpRequestOptions | HttpsRequestOptions;
+    /**
+     * Controls extra options for inlining remote @import rules
+     */
+    inlineRequest?: HttpRequestOptions | HttpsRequestOptions;
 
-        /**
-         * Controls number of milliseconds after which inlining a remote @import fails; defaults to `5000`;
-         */
-        inlineTimeout?: number;
+    /**
+     * Controls number of milliseconds after which inlining a remote @import fails; defaults to `5000`;
+     */
+    inlineTimeout?: number;
 
-        /**
-         * Controls optimization level used; defaults to `1`.
-         * Level hash exposes `1`, and `2`.
-         */
-        level?: 0 | 1 | 2 | OptimizationsOptions;
+    /**
+     * Controls optimization level used; defaults to `1`.
+     * Level hash exposes `1`, and `2`.
+     */
+    level?: 0 | 1 | 2 | CleanCSS.OptimizationsOptions;
 
-        /**
-         * Controls URL rebasing; defaults to `true`;
-         */
-        rebase?: boolean;
+    /**
+     * Controls URL rebasing; defaults to `true`;
+     */
+    rebase?: boolean;
 
-        /**
-         * controls a directory to which all URLs are rebased, most likely the directory under which the output file
-         * will live; defaults to the current directory;
-         */
-        rebaseTo?: string;
+    /**
+     * controls a directory to which all URLs are rebased, most likely the directory under which the output file
+     * will live; defaults to the current directory;
+     */
+    rebaseTo?: string;
 
-        /**
-         * If you prefer clean-css to return a Promise object then you need to explicitely ask for it; defaults to `false`
-         */
-        returnPromise?: boolean;
+    /**
+     *  Controls whether an output source map is built; defaults to `false`
+     */
+    sourceMap?: boolean;
 
-        /**
-         *  Controls whether an output source map is built; defaults to `false`
-         */
-        sourceMap?: boolean;
-
-        /**
-         *  Controls embedding sources inside a source map's `sourcesContent` field; defaults to `false`
-         */
-        sourceMapInlineSources?: boolean;
-    }
+    /**
+     *  Controls embedding sources inside a source map's `sourcesContent` field; defaults to `false`
+     */
+    sourceMapInlineSources?: boolean;
+}
 
+declare namespace CleanCSS {
     /**
      * Output returned when calling minify functions
      */
@@ -650,12 +645,40 @@ declare namespace CleanCSS {
         minify(sources: Sources, sourceMap?: string): Promise<Output>;
     }
 
+    /**
+     * Options when returning a promise
+     */
+    type OptionsPromise = OptionsBase & {
+        /**
+         * If you prefer clean-css to return a Promise object then you need to explicitly ask for it; defaults to `false`
+         */
+        returnPromise: true
+    };
+
+    /**
+     * Options when returning an output
+     */
+    type OptionsOutput = OptionsBase & {
+        /**
+         * If you prefer clean-css to return a Promise object then you need to explicitly ask for it; defaults to `false`
+         */
+        returnPromise?: false
+    };
+
+    /**
+     * Discriminant union of both sets of options types.  If you initialize without setting `returnPromise: true`
+     *  and want to return a promise, you will need to cast to the correct options type so that TypeScript
+     *  knows what the expected return type will be:
+     *  `(options = options as CleanCSS.OptionsPromise).returnPromise = true`
+     */
+    type Options = OptionsPromise | OptionsOutput;
+
     /**
      * Constructor interface for CleanCSS
      */
     interface Constructor {
-        new(options: Options & { returnPromise: true }): MinifierPromise;
-        new(options?: Options): MinifierOutput;
+        new(options: OptionsPromise): MinifierPromise;
+        new(options?: OptionsOutput): MinifierOutput;
     }
 }
 
diff --git a/types/clear-require/index.d.ts b/types/clear-require/index.d.ts
index 4b9118a008..1ee315c5b4 100644
--- a/types/clear-require/index.d.ts
+++ b/types/clear-require/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for clear-require 2.0
-// Project: https://github.com/sindresorhus/clear-module
+// Project: https://github.com/sindresorhus/clear-module, https://github.com/sindresorhus/clear-require
 // Definitions by: dan-j <https://github.com/dan-j>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/clearbladejs-client/index.d.ts b/types/clearbladejs-client/index.d.ts
index fa27a5d076..0eb8e789d9 100644
--- a/types/clearbladejs-client/index.d.ts
+++ b/types/clearbladejs-client/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for clearbladejs-client 1.1
+// Type definitions for non-npm package clearbladejs-client 1.1
 // Project: https://github.com/ClearBlade/JavaScript-API
 // Definitions by: Jim Bouquet <https://github.com/ClearBlade>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/clearbladejs-node/index.d.ts b/types/clearbladejs-node/index.d.ts
index 192b1a97ee..d4f71d4b64 100644
--- a/types/clearbladejs-node/index.d.ts
+++ b/types/clearbladejs-node/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for clearbladejs-node 1.0
+// Type definitions for non-npm package clearbladejs-node 1.0
 // Project: https://github.com/ClearBlade/Node-SDK
 // Definitions by: Jim Bouquet <https://github.com/ClearBlade>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/clearbladejs-server/index.d.ts b/types/clearbladejs-server/index.d.ts
index 2f6e8d672b..89a5f7a9a1 100644
--- a/types/clearbladejs-server/index.d.ts
+++ b/types/clearbladejs-server/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for clearbladejs-server 1.1
+// Type definitions for non-npm package clearbladejs-server 1.1
 // Project: https://docs.clearblade.com/v/3/4-developer_reference/platformsdk/ClearBlade.js/
 // Definitions by: Jim Bouquet <https://github.com/ClearBlade>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/cleave.js/cleave.js-tests.tsx b/types/cleave.js/cleave.js-tests.tsx
index a826d2607a..461e4f4d05 100644
--- a/types/cleave.js/cleave.js-tests.tsx
+++ b/types/cleave.js/cleave.js-tests.tsx
@@ -1,7 +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";
+import { Props, ChangeEvent } from "cleave.js/react/props";
 
 const ExampleSelector1 = () => {
     const cleave = new Cleave("#my-input", { phone: true });
@@ -41,3 +41,17 @@ const ExampleReact2 = (props: Props) => {
         />
     );
 };
+
+const ExampleReact3 = (props: Props) => {
+    const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
+        return e.target.rawValue;
+    };
+    return (
+        <CleaveReact
+            value="test"
+            className="form-control"
+            options={{ date: true }}
+            onChange={handleChange}
+        />
+    );
+};
diff --git a/types/cleave.js/index.d.ts b/types/cleave.js/index.d.ts
index 77d2e818ca..11067195ea 100644
--- a/types/cleave.js/index.d.ts
+++ b/types/cleave.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for cleave.js 1.3
+// Type definitions for cleave.js 1.4
 // Project: https://github.com/nosir/cleave.js
 // Definitions by: C Lentfort <https://github.com/clentfort>,
 //                 J Giancono <https://github.com/jasongi-at-sportsbet>,
diff --git a/types/cleave.js/react/props.d.ts b/types/cleave.js/react/props.d.ts
index 6ce47db62c..d881e1b319 100644
--- a/types/cleave.js/react/props.d.ts
+++ b/types/cleave.js/react/props.d.ts
@@ -3,8 +3,15 @@ import { CleaveOptions } from "../options";
 
 export type InitHandler = (owner: React.ReactInstance) => void;
 
+export interface ChangeEvent<T> extends React.ChangeEvent<T> {
+    target: { rawValue: string } & EventTarget & T;
+}
+
+export type ChangeEventHandler<T = Element> = React.EventHandler<ChangeEvent<T>>;
+
 export interface Props extends React.InputHTMLAttributes<HTMLInputElement> {
     onInit?: InitHandler;
     options: CleaveOptions;
     htmlRef?: (i: any) => void;
+    onChange?: ChangeEventHandler<HTMLInputElement>;
 }
diff --git a/types/clockpicker/index.d.ts b/types/clockpicker/index.d.ts
index d9dbd444e8..ce279c668c 100644
--- a/types/clockpicker/index.d.ts
+++ b/types/clockpicker/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ClockPicker 0.0
-// Project: https://github.com/weareoutman/clockpicker
+// Project: https://github.com/weareoutman/clockpicker, http://weareoutman.github.io/clockpicker
 // Definitions by: jfcere <https://github.com/jfcere>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/cloudflare-apps/index.d.ts b/types/cloudflare-apps/index.d.ts
index 6223a5e8ca..06163d46d8 100644
--- a/types/cloudflare-apps/index.d.ts
+++ b/types/cloudflare-apps/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for cloudflare-apps 0.1
+// Type definitions for non-npm package cloudflare-apps 0.1
 // Project: https://www.cloudflare.com/apps/
 // Definitions by: MartynasZilinskas <https://github.com/MartynasZilinskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/clusterize.js/index.d.ts b/types/clusterize.js/index.d.ts
index 7c549761d6..47da5a2140 100644
--- a/types/clusterize.js/index.d.ts
+++ b/types/clusterize.js/index.d.ts
@@ -32,9 +32,9 @@ declare namespace Clusterize {
     }
 
     interface Callbacks {
-        clusterWillChange?(cb: () => void): void;
-        clusterChanged?(cb: () => void): void;
-        scrollingProgress?(cb: (progress: number) => void): void;
+        clusterWillChange?: () => void;
+        clusterChanged?: () => void;
+        scrollingProgress?: (progress: number) => void;
     }
 }
 
diff --git a/types/co/co-tests.ts b/types/co/co-tests.ts
new file mode 100644
index 0000000000..159a2e90fb
--- /dev/null
+++ b/types/co/co-tests.ts
@@ -0,0 +1,30 @@
+import co = require('co');
+
+function* gen(num: number, str: string, arr: number[], obj: object, fun: () => void) {
+    return num;
+}
+
+co(gen, 42, 'forty-two', [42], { value: 42 }, () => {})
+    .then((num: number) => {}, (err: Error) => {})
+    .catch((err: Error) => {});
+
+co.default(gen, 42, 'forty-two', [42], { value: 42 }, () => {})
+    .then((num: number) => {}, (err: Error) => {})
+    .catch((err: Error) => {});
+
+co.co(gen, 42, 'forty-two', [42], { value: 42 }, () => {})
+    .then((num: number) => {}, (err: Error) => {})
+    .catch((err: Error) => {});
+
+co.wrap(gen)(42, 'forty-two', [42], { value: 42 }, () => {})
+    .then((num: number) => {}, (err: Error) => {})
+    .catch((err: Error) => {});
+
+// $ExpectError
+co(gen, 42, 'forty-two', [42], { value: 42 }, () => {}).then((str: string) => {});
+
+// $ExpectError
+co.wrap(gen)();
+
+// $ExpectError
+co.wrap(gen)('forty-two');
diff --git a/types/co/index.d.ts b/types/co/index.d.ts
new file mode 100644
index 0000000000..958c222a14
--- /dev/null
+++ b/types/co/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for co 4.6
+// Project: https://github.com/tj/co#readme
+// Definitions by: Doniyor Aliyev <https://github.com/doniyor2109>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.1
+
+type ExtractType<T> = T extends IterableIterator<infer R> ? R : never;
+
+interface Co {
+    <F extends (...args: any[]) => Generator>(fn: F, ...args: Parameters<F>): Promise<ExtractType<ReturnType<F>>>;
+    default: Co;
+    co: Co;
+    wrap: <F extends (...args: any[]) => Generator>(fn: F) => (...args: Parameters<F>) => Promise<ExtractType<ReturnType<F>>>;
+}
+
+declare const co: Co;
+
+export = co;
diff --git a/types/co/tsconfig.json b/types/co/tsconfig.json
new file mode 100644
index 0000000000..bc5a88eb32
--- /dev/null
+++ b/types/co/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "co-tests.ts"
+    ]
+}
diff --git a/types/co/tslint.json b/types/co/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/co/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/codemirror/index.d.ts b/types/codemirror/index.d.ts
index bfef4c5e88..730e35b3f0 100644
--- a/types/codemirror/index.d.ts
+++ b/types/codemirror/index.d.ts
@@ -357,7 +357,7 @@ declare namespace CodeMirror {
         It will call the function, buffering up all changes, and only doing the expensive update after the function returns.
         This can be a lot faster. The return value from this method will be the return value of your function. */
         operation<T>(fn: ()=> T): T;
-        
+
         /** In normal circumstances, use the above operation method. But if you want to buffer operations happening asynchronously, or that can't all be wrapped in a callback
         function, you can call startOperation to tell CodeMirror to start buffering changes, and endOperation to actually render all the updates. Be careful: if you use this
         API and forget to call endOperation, the editor will just never update. */
@@ -783,8 +783,8 @@ declare namespace CodeMirror {
     }
 
     interface PositionConstructor {
-        new (line: number, ch?: number): Position;
-        (line: number, ch?: number): Position;
+        new (line: number, ch?: number, sticky?: string): Position;
+        (line: number, ch?: number, sticky?: string): Position;
     }
 
     interface Range {
@@ -797,6 +797,7 @@ declare namespace CodeMirror {
     interface Position {
         ch: number;
         line: number;
+        sticky?: string;
     }
 
     interface EditorConfiguration {
diff --git a/types/coinbase/coinbase-tests.ts b/types/coinbase/coinbase-tests.ts
index fb804ac566..65ec9693bd 100644
--- a/types/coinbase/coinbase-tests.ts
+++ b/types/coinbase/coinbase-tests.ts
@@ -25,7 +25,7 @@ client.getAccount("abcdef", (error: Error, account: coinbase.Account): void => {
 
     account.getBuy("abcdef", (error: Error, buy: coinbase.Buy): void => undefined);
 
-    account.getBuys((error: Error, buy: coinbase.Buy[]): void => undefined);
+    account.getBuys(null, (error: Error, buy: coinbase.Buy[]): void => undefined);
 
     account.getDeposit("abcdef", (error: Error, deposit: coinbase.Deposit): void => undefined);
 
@@ -33,7 +33,7 @@ client.getAccount("abcdef", (error: Error, account: coinbase.Account): void => {
 
     account.getSell("abcdef", (error: Error, deposit: coinbase.Sell): void => undefined);
 
-    account.getSells((error: Error, deposit: coinbase.Sell[]): void => undefined);
+    account.getSells(null, (error: Error, deposit: coinbase.Sell[]): void => undefined);
 
     account.getTransaction("abcdef", (error: Error, deposit: coinbase.Transaction): void => undefined);
 
diff --git a/types/coinbase/index.d.ts b/types/coinbase/index.d.ts
index 6057f58142..82fc32a7d3 100644
--- a/types/coinbase/index.d.ts
+++ b/types/coinbase/index.d.ts
@@ -536,6 +536,21 @@ export class Account implements Resource {
      */
     balance: MoneyHash;
 
+    /**
+     * Allow deposits
+     */
+    allow_deposits: boolean;
+
+    /**
+     * Allow withdrawls
+     */
+    allow_withdrawals: boolean;
+
+    /**
+     * Account worth in fiat.
+     */
+    native_balance: MoneyHash;
+
     /**
      * Promote an account as primary account.
      * Scope: wallet:accounts:update
@@ -630,7 +645,7 @@ export class Account implements Resource {
      * Lists buys for an account.
      * Scope: wallet:buys:read
      */
-    getBuys(cb: (error: Error, result: Buy[]) => void): void;
+    getBuys(opts: null, cb: (error: Error, result: Buy[]) => void): void;
 
     /**
      * Show an individual buy.
@@ -663,7 +678,7 @@ export class Account implements Resource {
      * Lists sells for an account.
      * Scope: wallet:sells:read
      */
-    getSells(cb: (error: Error, result: Sell[]) => void): void;
+    getSells(opts: null, cb: (error: Error, result: Sell[]) => void): void;
 
     /**
      * Show an individual sell.
@@ -883,7 +898,7 @@ export class Buy implements Resource {
     /**
      * Fee associated to this buy
      */
-    fee: MoneyHash;
+    fees: Fee[];
 
     /**
      * Has this buy been committed?
@@ -900,6 +915,26 @@ export class Buy implements Resource {
      */
     payout_at?: string;
 
+    /**
+     * Unit price of the base currency.
+     */
+    unit_price: UnitPrice;
+
+    /**
+     * Hold period for transfer.
+     */
+    hold_business_days: number;
+
+    /**
+     * Is it the first buy for this symbol?
+     */
+    is_first_buy: boolean;
+
+    /**
+     * Is there another action required to make the transfer pass?
+     */
+    requires_completion_step: boolean;
+
     /**
      * Completes a buy that is created in commit: false state.
      * If the exchange rate has changed since the buy was created, this call will fail with the error “The exchange rate updated while you
@@ -910,6 +945,32 @@ export class Buy implements Resource {
     commit(cb: (error: Error, transaction: Buy) => void): void;
 }
 
+export interface Fee {
+  /**
+   * Amount associated to this fee
+   */
+  amount: MoneyHash;
+  /**
+   * Fee beneficiary ("bank", "coinbase", ...)
+   */
+  type: string;
+}
+
+export interface UnitPrice {
+  /**
+   * Amount as floating-point in a string
+   */
+  amount: string;
+  /**
+   * Currency e.g. "BTC" (see Client#getCurrencies() for available strings)
+   */
+  currency: string;
+  /**
+   * Type of price
+   */
+  scale: number;
+}
+
 export type SellStatus = "created" | "completed" | "canceled";
 
 /**
diff --git a/types/color-name/index.d.ts b/types/color-name/index.d.ts
index 65b4ecc8fb..b5bff4717a 100644
--- a/types/color-name/index.d.ts
+++ b/types/color-name/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for color-name 1.1
-// Project: https://www.npmjs.com/package/color-name
+// Project: https://github.com/colorjs/color-name
 // Definitions by: Junyoung Clare Jang <https://github.com/Ailrun>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/color-support/color-support-tests.ts b/types/color-support/color-support-tests.ts
new file mode 100644
index 0000000000..45bb6317cf
--- /dev/null
+++ b/types/color-support/color-support-tests.ts
@@ -0,0 +1,48 @@
+import colorSupport = require('color-support');
+
+(() => {
+  const result = colorSupport();
+  if (!result) {
+    console.log('color is not supported');
+  } else if (result.has16m) {
+    console.log('\x1b[38;2;102;194;255m16m colors\x1b[0m');
+  } else if (result.has256) {
+    console.log('\x1b[38;5;119m256 colors\x1b[0m');
+  } else if (result.hasBasic) {
+    console.log('\x1b[31mbasic colors\x1b[0m');
+  } else {
+    console.log('Level: ', result.level);
+    console.log('this is impossible, but colors are not supported');
+  }
+})();
+
+(() => {
+  const result = colorSupport({
+    alwaysReturn: false,
+    env: process.env,
+    ignoreCI: true,
+    ignoreDumb: true,
+    ignoreTTY: true,
+    level: 2,
+    stream: process.stdout,
+    term: process.env.TERM,
+  }, {
+    has16m: false,
+    has256: false,
+    hasBasic: false,
+    level: 0,
+  });
+
+  if (!result) {
+    console.log('color is not supported');
+  } else if (result.has16m) {
+    console.log('\x1b[38;2;102;194;255m16m colors\x1b[0m');
+  } else if (result.has256) {
+    console.log('\x1b[38;5;119m256 colors\x1b[0m');
+  } else if (result.hasBasic) {
+    console.log('\x1b[31mbasic colors\x1b[0m');
+  } else {
+    console.log('Level: ', result.level);
+    console.log('this is impossible, but colors are not supported');
+  }
+})();
diff --git a/types/color-support/index.d.ts b/types/color-support/index.d.ts
new file mode 100644
index 0000000000..290a6e29b0
--- /dev/null
+++ b/types/color-support/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for color-support 1.1
+// Project: https://github.com/isaacs/color-support#readme
+// Definitions by: Guketlev Dmitry <https://github.com/Yavanosta>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+type ColorSupportLevel = 0 | 1 | 2 | 3;
+
+interface ColorSupportOptions {
+    alwaysReturn?: boolean;
+    env?: NodeJS.ProcessEnv;
+    ignoreCI?: boolean;
+    ignoreDumb?: boolean;
+    ignoreTTY?: boolean;
+    level?: ColorSupportLevel;
+    stream?: NodeJS.WriteStream;
+    term?: string;
+}
+
+interface ColorSupportResult {
+    level: ColorSupportLevel;
+    hasBasic: boolean;
+    has256: boolean;
+    has16m: boolean;
+}
+
+type ColorSupport = (options?: ColorSupportOptions,
+                     obj?: ColorSupportResult) => false | ColorSupportResult;
+
+declare var colorSupport: ColorSupport;
+
+export = colorSupport;
diff --git a/types/color-support/tsconfig.json b/types/color-support/tsconfig.json
new file mode 100644
index 0000000000..f1e6de8e28
--- /dev/null
+++ b/types/color-support/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "color-support-tests.ts"
+    ]
+}
diff --git a/types/color-support/tslint.json b/types/color-support/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/color-support/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/com.wikitude.phonegap.wikitudeplugin/index.d.ts b/types/com.wikitude.phonegap.wikitudeplugin/index.d.ts
index 50307d57c8..10b5d58b5b 100644
--- a/types/com.wikitude.phonegap.wikitudeplugin/index.d.ts
+++ b/types/com.wikitude.phonegap.wikitudeplugin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for com.wikitude.phonegap.wikitudeplugin 7.2
-// Project: https://github.com/Wikitude/wikitude-cordova-plugin
+// Project: https://github.com/Wikitude/wikitude-cordova-plugin, https://github.com/wikitude/wikitude-phonegap
 // Definitions by: zbarbuto <https://github.com/zbarbuto>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/cometd/AckExtension/index.d.ts b/types/cometd/AckExtension/index.d.ts
new file mode 100644
index 0000000000..49a007a8f8
--- /dev/null
+++ b/types/cometd/AckExtension/index.d.ts
@@ -0,0 +1,12 @@
+import * as m from '..';
+
+declare class AckExtension implements m.Extension {
+    constructor();
+
+    incoming: m.Listener;
+    outgoing: m.Listener;
+    registered: (name: string, cometd: m.CometD) => void;
+    unregistered: () => void;
+}
+
+export default AckExtension;
diff --git a/types/cometd/TimeSyncExtension/index.d.ts b/types/cometd/TimeSyncExtension/index.d.ts
new file mode 100644
index 0000000000..74ebe4ef3e
--- /dev/null
+++ b/types/cometd/TimeSyncExtension/index.d.ts
@@ -0,0 +1,40 @@
+import * as m from '..';
+
+declare class TimeSyncExtension implements m.Extension {
+    constructor();
+
+    incoming: m.Listener;
+    outgoing: m.Listener;
+    registered: (name: string, cometd: m.CometD) => void;
+    unregistered: () => void;
+
+    /**
+     * Get the estimated offset in ms from the clients clock to the
+     * servers clock.  The server time is the client time plus the offset.
+     */
+    getTimeOffset: () => number;
+
+    /**
+     * Get an array of multiple offset samples used to calculate
+     * the offset.
+     */
+    getTimeOffsetSamples: () => [number];
+
+    /**
+     * Get the estimated network lag in ms from the client to the server.
+     */
+    getNetworkLag: () => number;
+
+    /**
+     * Get the estimated server time in ms since the epoch.
+     */
+    getServerTime: () => number;
+
+    /**
+     *
+     * Get the estimated server time as a Date object
+     */
+    getServerDate: () => Date;
+}
+
+export default TimeSyncExtension;
diff --git a/types/cometd/cometd-tests.ts b/types/cometd/cometd-tests.ts
index ef56879d6f..e82cf16323 100644
--- a/types/cometd/cometd-tests.ts
+++ b/types/cometd/cometd-tests.ts
@@ -1,4 +1,6 @@
 import { CometD, Listener, Message, SubscriptionHandle } from "cometd";
+import TimeSyncExtension from 'cometd/TimeSyncExtension';
+import AckExtension from 'cometd/AckExtension';
 
 const cometd = new CometD();
 
@@ -11,7 +13,23 @@ cometd.configure({
     url: "http://localhost:8080/cometd"
 });
 
-cometd.registerExtension("ack", { incoming: () => {}, outgoing: () => {} });
+cometd.registerExtension("ack", new AckExtension());
+
+const timesync = new TimeSyncExtension();
+cometd.registerExtension("timesync", timesync);
+
+const timeSyncSubscription = cometd.addListener("/foo/bar", () => {
+    if (timesync.getNetworkLag() > 1000) {
+        cometd.publish("/mychannel", { timesyncStats: {
+                lag: timesync.getNetworkLag(),
+                serverTime: timesync.getServerTime(),
+                serverDate: timesync.getServerDate(),
+                timeOffset: timesync.getTimeOffset(),
+                timeOffsetSamples: timesync.getTimeOffsetSamples()
+            }
+        });
+    }
+});
 
 cometd.unregisterTransport("websocket");
 
diff --git a/types/cometd/index.d.ts b/types/cometd/index.d.ts
index cd829d444c..d7103f15cd 100644
--- a/types/cometd/index.d.ts
+++ b/types/cometd/index.d.ts
@@ -1,6 +1,9 @@
 // Type definitions for CometD 4.0
-// Project: http://cometd.org
-// Definitions by: Derek Cicerone <https://github.com/derekcicerone>, Daniel Perez Alvarez <https://github.com/unindented>, Alex Henry <https://github.com/alxHenry>
+// Project: https://cometd.org
+// Definitions by: Derek Cicerone <https://github.com/derekcicerone>
+//                 Daniel Perez Alvarez <https://github.com/unindented>
+//                 Alex Henry <https://github.com/alxHenry>
+//                 Harald Gliebe <https://github.com/hagl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -88,6 +91,8 @@ export interface SubscriptionHandle {
 export interface Extension {
     incoming?: Listener;
     outgoing?: Listener;
+    registered?: (name: string, cometd: CometD) => void;
+    unregistered?: () => void;
 }
 
 export class CometD {
diff --git a/types/cometd/tsconfig.json b/types/cometd/tsconfig.json
index 6533a1a225..da1896488a 100644
--- a/types/cometd/tsconfig.json
+++ b/types/cometd/tsconfig.json
@@ -18,6 +18,8 @@
     },
     "files": [
         "index.d.ts",
-        "cometd-tests.ts"
+        "cometd-tests.ts",
+        "AckExtension/index.d.ts",
+    	"TimeSyncExtension/index.d.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/commonmark/index.d.ts b/types/commonmark/index.d.ts
index 96bb2774c5..7ceb1fd2c5 100644
--- a/types/commonmark/index.d.ts
+++ b/types/commonmark/index.d.ts
@@ -1,18 +1,21 @@
 // Type definitions for commonmark.js 0.27
-// Project: https://github.com/jgm/commonmark.js
+// Project: https://github.com/jgm/commonmark.js, http://commonmark.org
 // Definitions by: Nico Jansen <https://github.com/nicojs>
 //                 Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+export type NodeType =
+    'text' |'softbreak' | 'linebreak' | 'emph' | 'strong' | 'html_inline' | 'link' | 'image' | 'code' | 'document' | 'paragraph' |
+    'block_quote' | 'item' | 'list' | 'heading' | 'code_block' | 'html_block' | 'thematic_break' | 'custom_inline' | 'custom_block';
+
 export class Node {
-    constructor(nodeType: string, sourcepos?: Position);
+    constructor(nodeType: NodeType, sourcepos?: Position);
 
     /**
      * (read-only): a String, one of text, softbreak, linebreak, emph, strong, html_inline, link, image, code, document, paragraph,
      * block_quote, item, list, heading, code_block, html_block, thematic_break.
      */
-    readonly type: 'text' | 'softbreak' | 'linebreak' | 'emph' | 'strong' | 'html_inline' | 'link' | 'image' | 'code' | 'document' | 'paragraph' |
-        'block_quote' | 'item' | 'list' | 'heading' | 'code_block' | 'html_block' | 'thematic_break' | 'custom_inline' | 'custom_block';
+    readonly type: NodeType;
     /**
      * (read-only): a Node or null.
      */
diff --git a/types/component-emitter/component-emitter-tests.ts b/types/component-emitter/component-emitter-tests.ts
index ed49d799c3..3d2ed7252a 100644
--- a/types/component-emitter/component-emitter-tests.ts
+++ b/types/component-emitter/component-emitter-tests.ts
@@ -48,3 +48,5 @@ emitter.emit('some-recurring-event', event_data)
 emitter.listeners('some-recurring-event')
 
 emitter.hasListeners('some-recurring-event')
+
+emitter.emit('some-event').emit("I can use chaining!")
diff --git a/types/component-emitter/index.d.ts b/types/component-emitter/index.d.ts
index b55a1673ab..16332270e1 100644
--- a/types/component-emitter/index.d.ts
+++ b/types/component-emitter/index.d.ts
@@ -3,19 +3,20 @@
 // Definitions by: Peter Snider <https://github.com/psnider>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/emitter-component
 
+// TypeScript Version: 2.2
 
 interface Emitter {
     on(event: string, listener: Function): Emitter;
     once(event: string, listener: Function): Emitter;
     off(event?: string, listener?: Function): Emitter;
-    emit(event: string, ...args: any[]): boolean;
+    emit(event: string, ...args: any[]): Emitter;
     listeners(event: string): Function[];
     hasListeners(event: string): boolean;
 }
 
 declare const Emitter: {
-    (obj?: any): Emitter;
-    new (obj?: any): Emitter;
+    (obj?: object): Emitter;
+    new (obj?: object): Emitter;
 };
 
 export = Emitter;
diff --git a/types/connect-history-api-fallback-exclusions/connect-history-api-fallback-exclusions-tests.ts b/types/connect-history-api-fallback-exclusions/connect-history-api-fallback-exclusions-tests.ts
new file mode 100644
index 0000000000..291622b349
--- /dev/null
+++ b/types/connect-history-api-fallback-exclusions/connect-history-api-fallback-exclusions-tests.ts
@@ -0,0 +1,70 @@
+import historyApiFallback = require('connect-history-api-fallback-exclusions');
+import express = require('express');
+
+const app = express();
+app.use(historyApiFallback());
+
+historyApiFallback({
+    verbose: true
+});
+
+historyApiFallback({
+    logger: console.log.bind(console)
+});
+
+historyApiFallback({
+    exclusions: [
+      '/api/*',
+      '/health',
+    ],
+});
+
+historyApiFallback({
+    rewrites: [
+        { from: /\/soccer/, to: '/soccer.html' }
+    ]
+});
+
+historyApiFallback({
+    index: 'default.html'
+});
+
+historyApiFallback({
+    htmlAcceptHeaders: ['text/html', 'application/xhtml+xml']
+});
+
+historyApiFallback({
+    rewrites: [
+        {
+            from: /^\/libs\/(.*)$/,
+            to(context) {
+                return './bower_components' + context.parsedUrl.pathname;
+            }
+        }
+    ]
+});
+
+historyApiFallback({
+    rewrites: [
+        {
+            from: /\/app\/login/,
+            to: function onMatch(ctx) {
+                if (ctx.parsedUrl.path && ctx.parsedUrl.path.indexOf('.js')) {
+                    return ctx.parsedUrl.href || '';
+                }
+                return '/app/login/index.html';
+            }
+        }
+    ]
+});
+
+historyApiFallback({
+    rewrites: [
+        {
+            from: /^\/libs\/(.*)$/,
+            to(context) {
+                return `/${context.match[2]}/${context.match[3]}`;
+            }
+        }
+    ]
+});
diff --git a/types/connect-history-api-fallback-exclusions/index.d.ts b/types/connect-history-api-fallback-exclusions/index.d.ts
new file mode 100644
index 0000000000..c83335203a
--- /dev/null
+++ b/types/connect-history-api-fallback-exclusions/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for connect-history-api-fallback-exclusions 1.5
+// Project: https://github.com/Wirewheel/connect-history-api-fallback#readme
+// Definitions by: Tony Stone <https://github.com/tonystonee>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import { Url } from 'url';
+
+import * as core from "express-serve-static-core";
+
+declare function historyApiFallback(options?: historyApiFallback.Options): core.RequestHandler;
+
+declare namespace historyApiFallback {
+    interface Options {
+        exclusions?: string[];
+        disableDotRule?: true;
+        htmlAcceptHeaders?: string[];
+        index?: string;
+        logger?: typeof console.log;
+        rewrites?: Rewrite[];
+        verbose?: boolean;
+    }
+
+    interface Context {
+        match: RegExpMatchArray;
+        parsedUrl: Url;
+    }
+    type RewriteTo = (context: Context) => string;
+
+    interface Rewrite {
+        from: RegExp;
+        to: string | RegExp | RewriteTo;
+    }
+}
+export = historyApiFallback;
diff --git a/types/connect-history-api-fallback-exclusions/tsconfig.json b/types/connect-history-api-fallback-exclusions/tsconfig.json
new file mode 100644
index 0000000000..1fc7fec2ca
--- /dev/null
+++ b/types/connect-history-api-fallback-exclusions/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "connect-history-api-fallback-exclusions-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/connect-history-api-fallback-exclusions/tslint.json b/types/connect-history-api-fallback-exclusions/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/connect-history-api-fallback-exclusions/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/content-range/content-range-tests.ts b/types/content-range/content-range-tests.ts
new file mode 100644
index 0000000000..c482d6f072
--- /dev/null
+++ b/types/content-range/content-range-tests.ts
@@ -0,0 +1,23 @@
+import { format, parse } from 'content-range';
+
+format({
+    first: 10,
+    last: 100,
+    length: 100,
+    limit: 20,
+    unit: 'items',
+});
+
+format({
+    length: null,
+    unit: 'bytes',
+});
+
+const parts = parse('items 10-29/100');
+
+if (parts) {
+    parts.first;
+    parts.last;
+    parts.length;
+    parts.unit;
+}
diff --git a/types/content-range/index.d.ts b/types/content-range/index.d.ts
new file mode 100644
index 0000000000..b8ee780541
--- /dev/null
+++ b/types/content-range/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for content-range 1.1
+// Project: https://github.com/neoziro/content-range
+// Definitions by: Alex Brick <https://github.com/bricka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface ContentRangeFormatOptions {
+    first?: number;
+    last?: number;
+    length: number | null;
+    limit?: number;
+    unit: string;
+}
+
+export interface ContentRangeParts {
+    first: number | null;
+    last: number | null;
+    length: number | null;
+    unit: string;
+}
+
+export function format(options: ContentRangeFormatOptions): string;
+export function parse(str: string): ContentRangeParts | null;
diff --git a/types/content-range/tsconfig.json b/types/content-range/tsconfig.json
new file mode 100644
index 0000000000..a2649416e0
--- /dev/null
+++ b/types/content-range/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",
+        "content-range-tests.ts"
+    ]
+}
diff --git a/types/content-range/tslint.json b/types/content-range/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/content-range/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/content-type/index.d.ts b/types/content-type/index.d.ts
index c81c78c966..246113c7b2 100644
--- a/types/content-type/index.d.ts
+++ b/types/content-type/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for content-type 1.1
-// Project: https://www.npmjs.com/package/content-type
+// Project: https://github.com/jshttp/content-type
 // Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
 //                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
diff --git a/types/cookie-signature/index.d.ts b/types/cookie-signature/index.d.ts
index cb044f4636..19246a9965 100644
--- a/types/cookie-signature/index.d.ts
+++ b/types/cookie-signature/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for cookie-signature 1.0
-// Project: https://github.com/tj/node-cookie-signature
+// Project: https://github.com/tj/node-cookie-signature, https://github.com/visionmedia/node-cookie-signature
 // Definitions by: François Nguyen <https://github.com/lith-light-g>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/copy-webpack-plugin/index.d.ts b/types/copy-webpack-plugin/index.d.ts
index 59c1b8d0cb..bc0fc5066a 100644
--- a/types/copy-webpack-plugin/index.d.ts
+++ b/types/copy-webpack-plugin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for copy-webpack-plugin 4.4
-// Project: https://github.com/kevlened/copy-webpack-plugin
+// Project: https://github.com/webpack-contrib/copy-webpack-plugin
 // Definitions by: flying-sheep <https://github.com/flying-sheep>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/cordova-plugin-bluetoothclassic-serial/index.d.ts b/types/cordova-plugin-bluetoothclassic-serial/index.d.ts
index 2dfe8c94ae..1d54e82b2a 100644
--- a/types/cordova-plugin-bluetoothclassic-serial/index.d.ts
+++ b/types/cordova-plugin-bluetoothclassic-serial/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for cordova-plugin-bluetoothClassic-serial 0.9
+// Type definitions for non-npm package cordova-plugin-bluetoothClassic-serial 0.9
 // Project: https://github.com/soltius/BluetoothClassicSerial
 // Definitions by: Wouter Roosendaal <https://github.com/tuvokki>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/cordova-plugin-canvascamera/index.d.ts b/types/cordova-plugin-canvascamera/index.d.ts
index f9d2a1717e..5c2f371d0f 100644
--- a/types/cordova-plugin-canvascamera/index.d.ts
+++ b/types/cordova-plugin-canvascamera/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for CanvasCameraPlugin 1.0
+// Type definitions for non-npm package CanvasCameraPlugin 1.0
 // Project: https://github.com/VirtuoWorks/CanvasCameraPlugin
 // Definitions by: Ricardo Azzi Silva <https://github.com/lordazzi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/create-subscription/index.d.ts b/types/create-subscription/index.d.ts
index 8c7d8c1ced..bf88af759b 100644
--- a/types/create-subscription/index.d.ts
+++ b/types/create-subscription/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for create-subscription 16.4
-// Project: https://github.com/facebook/react/tree/master/packages/create-subscription
+// Project: https://github.com/facebook/react/tree/master/packages/create-subscription, https://github.com/facebook/react
 // Definitions by: Asana <https://github.com/Asana>
 //                 Vincent Siao <https://github.com/vsiao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/create-xpub/create-xpub-tests.ts b/types/create-xpub/create-xpub-tests.ts
new file mode 100644
index 0000000000..c202d819d8
--- /dev/null
+++ b/types/create-xpub/create-xpub-tests.ts
@@ -0,0 +1,23 @@
+import createXpub = require('create-xpub');
+
+// $ExpectType string
+createXpub({
+    depth: 3,
+    childNumber: 2147483648,
+    chainCode: '84cf7d9029cdd9fcadbb3717fd92ec0db7d7d9787c57c13c08fc887c389b566b',
+    publicKey:
+        '048bcdcf59f046b13f1eb35b608d1211265fde8cc44fc7a5a7f7107c5cf238095328a0e0d7be17c7d3e48490e8c6433af6d2c3dacc687f3fecaa98a3d05f17de97',
+});
+
+// $ExpectType string
+createXpub({
+    networkVersion: createXpub.testnet,
+    depth: 3,
+    childNumber: 2147483648,
+    chainCode: '84cf7d9029cdd9fcadbb3717fd92ec0db7d7d9787c57c13c08fc887c389b566b',
+    publicKey:
+        '048bcdcf59f046b13f1eb35b608d1211265fde8cc44fc7a5a7f7107c5cf238095328a0e0d7be17c7d3e48490e8c6433af6d2c3dacc687f3fecaa98a3d05f17de97',
+});
+
+createXpub.mainnet; // $ExpectType 76067358
+createXpub.testnet; // $ExpectType 70617039
diff --git a/types/create-xpub/index.d.ts b/types/create-xpub/index.d.ts
new file mode 100644
index 0000000000..13057396eb
--- /dev/null
+++ b/types/create-xpub/index.d.ts
@@ -0,0 +1,52 @@
+// Type definitions for create-xpub 2.1
+// Project: https://github.com/lukechilds/create-xpub#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = createXpub;
+
+/**
+ * Creates a Base58 encoded extended public key (xpub) for use in a
+ * [BIP32 hierarchical deterministic wallet](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki).
+ *
+ * Tip: If you're working with ledgerjs you can pass the output of
+ * [`getWalletPublicKey()`](http://ledgerhq.github.io/ledgerjs/docs/#btcgetwalletpublickey) almost directly in.
+ *
+ * @returns A Base58 encoded extended public key.
+ */
+declare function createXpub(options: createXpub.Options): string;
+
+declare namespace createXpub {
+    /**
+     * Mainnet (xpub) version bytes.
+     */
+    const mainnet: 0x0488B21E;
+    /**
+     * Testnet (tpub) version bytes.
+     */
+    const testnet: 0x043587CF;
+
+    interface Options {
+        /**
+         * Network version bytes.
+         * @default 0x0488B21E
+         */
+        networkVersion?: number;
+        /**
+         * The depth of the derived key.
+         */
+        depth: number;
+        /**
+         * The child number.
+         */
+        childNumber: number;
+        /**
+         * The chain code.
+         */
+        chainCode: string;
+        /**
+         * The public key in compressed or uncompressed form.
+         */
+        publicKey: string;
+    }
+}
diff --git a/types/create-xpub/tsconfig.json b/types/create-xpub/tsconfig.json
new file mode 100644
index 0000000000..53e9b64c11
--- /dev/null
+++ b/types/create-xpub/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "create-xpub-tests.ts"
+    ]
+}
diff --git a/types/create-xpub/tslint.json b/types/create-xpub/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/create-xpub/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/cron/index.d.ts b/types/cron/index.d.ts
index b27bfdf90c..596a9536ca 100644
--- a/types/cron/index.d.ts
+++ b/types/cron/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for cron 1.3
+// Type definitions for cron 1.6
 // Project: https://www.npmjs.com/package/cron
 // Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
 //                 Lundarl Gholoi <https://github.com/winup>
@@ -9,8 +9,9 @@ export declare class CronTime {
      * Create a new ```CronTime```.
      * @param source The time to fire off your job. This can be in the form of cron syntax or a JS ```Date``` object.
      * @param zone Timezone name. You can check all timezones available at [Moment Timezone Website](http://momentjs.com/timezone/).
+     * @param utcOffset UTC offset. Don't use both ```zone``` and ```utcOffset``` together or weird things may happen.
      */
-    constructor(source: string | Date, zone?: string);
+    constructor(source: string | Date, zone?: string, utcOffset?: string | number);
 
     /**
      * Tells you when ```CronTime``` will be run.
@@ -29,19 +30,19 @@ export declare interface CronJobParameters {
      */
     cronTime: string | Date;
     /**
-     * The function to fire at the specified time.
+     * The function to fire at the specified time. If an ```onComplete``` callback was provided, ```onTick``` will receive it as an argument. ```onTick``` may call ```onComplete``` when it has finished its work.
      */
     onTick: () => void;
     /**
-     * A function that will fire when the job is complete, when it is stopped.
+     * A function that will fire when the job is stopped with ```job.stop()```, and may also be called by ```onTick``` at the end of each run.
      */
     onComplete?: () => void;
     /**
-     * Specifies whether to start the job just before exiting the constructor. By default this is set to false. If left at default you will need to call ```job.start()``` in order to start the job (assuming ```job``` is the variable you set the cronjob to). This does not immediately fire your onTick function, it just gives you more control over the behavior of your jobs.
+     * Specifies whether to start the job just before exiting the constructor. By default this is set to false. If left at default you will need to call ```job.start()``` in order to start the job (assuming ```job``` is the variable you set the cronjob to). This does not immediately fire your ```onTick``` function, it just gives you more control over the behavior of your jobs.
      */
     start?: boolean;
     /**
-     * Specify the timezone for the execution. This will modify the actual time relative to your timezone. If the timezone is invalid, an error is thrown. You can check all timezones available at [Moment Timezone Website](http://momentjs.com/timezone/).
+     * Specify the timezone for the execution. This will modify the actual time relative to your timezone. If the timezone is invalid, an error is thrown. You can check all timezones available at [Moment Timezone Website](http://momentjs.com/timezone/). Probably don't use both ```timeZone``` and ```utcOffset``` together or weird things may happen.
      */
     timeZone?: string;
     /**
@@ -52,6 +53,14 @@ export declare interface CronJobParameters {
      * This will immediately fire your ```onTick``` function as soon as the requisit initialization has happened. This option is set to ```false``` by default for backwards compatibility.
      */
     runOnInit?: boolean;
+    /**
+     * This allows you to specify the offset of your timezone rather than using the ```timeZone``` param. Probably don't use both ```timeZone``` and ```utcOffset``` together or weird things may happen.
+     */
+    utcOffset?: string | number;
+    /**
+     * If you have code that keeps the event loop running and want to stop the node process when that finishes regardless of the state of your cronjob, you can do so making use of this parameter. This is off by default and cron will run as if it needs to control the event loop. For more information take a look at [timers#timers_timeout_unref](https://nodejs.org/api/timers.html#timers_timeout_unref) from the NodeJS docs.
+     */
+    unrefTimeout?: boolean;
 }
 
 export declare class CronJob {
@@ -73,8 +82,10 @@ export declare class CronJob {
      * @param timeZone Specify the timezone for the execution. This will modify the actual time relative to your timezone. If the timezone is invalid, an error is thrown. You can check all timezones available at [Moment Timezone Website](http://momentjs.com/timezone/).
      * @param context The context within which to execute the onTick method. This defaults to the cronjob itself allowing you to call ```this.stop()```. However, if you change this you'll have access to the functions and values within your context object.
      * @param runOnInit This will immediately fire your ```onTick``` function as soon as the requisit initialization has happened. This option is set to ```false``` by default for backwards compatibility.
+     * @param utcOffset This allows you to specify the offset of your timezone rather than using the ```timeZone``` param. Probably don't use both ```timeZone``` and ```utcOffset``` together or weird things may happen.
+     * @param unrefTimeout If you have code that keeps the event loop running and want to stop the node process when that finishes regardless of the state of your cronjob, you can do so making use of this parameter. This is off by default and cron will run as if it needs to control the event loop. For more information take a look at [timers#timers_timeout_unref](https://nodejs.org/api/timers.html#timers_timeout_unref) from the NodeJS docs.
      */
-    constructor(cronTime: string | Date, onTick: () => void, onComplete?: () => void, start?: boolean, timeZone?: string, context?: any, runOnInit?: boolean);
+    constructor(cronTime: string | Date, onTick: () => void, onComplete?: () => void, start?: boolean, timeZone?: string, context?: any, runOnInit?: boolean, utcOffset?: string | number, unrefTimeout?: boolean);
     /**
      * Create a new ```CronJob```.
      * @param options Job parameters.
@@ -111,7 +122,7 @@ export declare class CronJob {
 }
 
 export declare var job:
-    ((cronTime: string | Date, onTick: () => void, onComplete?: () => void, start?: boolean, timeZone?: string, context?: any, runOnInit?: boolean) => CronJob)
+    ((cronTime: string | Date, onTick: () => void, onComplete?: () => void, start?: boolean, timeZone?: string, context?: any, runOnInit?: boolean, utcOffset?: string | number, unrefTimeout?: boolean) => CronJob)
     | ((options: CronJobParameters) => CronJob);
 export declare var time: (source: string | Date, zone?: string) => CronTime;
 export declare var sendAt: (cronTime: CronTime) => Date;
diff --git a/types/cropperjs/index.d.ts b/types/cropperjs/index.d.ts
index d444c20705..8d3108bc7e 100644
--- a/types/cropperjs/index.d.ts
+++ b/types/cropperjs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for cropperjs 1.1
-// Project: https://github.com/fengyuanchen/cropperjs
+// Project: https://github.com/fengyuanchen/cropperjs, https://fengyuanchen.github.io/cropperjs
 // Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/croppie/index.d.ts b/types/croppie/index.d.ts
index a8b53c54e5..c3e0627c08 100644
--- a/types/croppie/index.d.ts
+++ b/types/croppie/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for croppie 2.5
-// Project: https://github.com/Foliotek/Croppie
+// Project: https://github.com/Foliotek/Croppie, http://foliotek.github.io/croppie
 // Definitions by: Connor Peet <https://github.com/connor4312>
 //                 dklmuc <https://github.com/dklmuc>
 //                 Sarun Intaralawan <https://github.com/sarunint>
diff --git a/types/csprng/index.d.ts b/types/csprng/index.d.ts
index 90aa83b017..796294db0c 100644
--- a/types/csprng/index.d.ts
+++ b/types/csprng/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for csprng 0.1
-// Project: https://github.com/jcoglan/node-csprng
+// Project: http://github.com/jcoglan/node-csprng
 // Definitions by: Wink Saville <https://github.com/winksaville>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 export = csprng;
diff --git a/types/cssesc/cssesc-tests.ts b/types/cssesc/cssesc-tests.ts
new file mode 100644
index 0000000000..61475ed447
--- /dev/null
+++ b/types/cssesc/cssesc-tests.ts
@@ -0,0 +1,35 @@
+import cssesc = require("cssesc");
+
+// $ExpectType string
+cssesc('Ich ♥ Bücher');
+
+// $ExpectType string
+cssesc('123a2b', {
+    isIdentifier: true
+});
+
+// $ExpectType string
+cssesc('Lorem ipsum "dolor" sit \'amet\' etc.', {
+    quotes: 'single'
+});
+
+// $ExpectType string
+cssesc('Lorem ipsum "dolor" sit \'amet\' etc.', {
+    quotes: 'double'
+});
+
+// $ExpectType string
+cssesc('Lorem ipsum "dolor" sit \'amet\' etc.', {
+    quotes: 'single',
+    wrap: true
+});
+
+// $ExpectType string
+cssesc('lolwat"foo\'bar', {
+    escapeEverything: true
+});
+
+cssesc.options.escapeEverything = false;
+
+// $ExpectType string
+cssesc.version;
diff --git a/types/cssesc/index.d.ts b/types/cssesc/index.d.ts
new file mode 100644
index 0000000000..25a9e1f455
--- /dev/null
+++ b/types/cssesc/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for cssesc 3.0
+// Project: https://mths.be/cssesc
+// Definitions by: Daniel Cassidy <https://github.com/djcsdy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export = cssesc;
+
+declare function cssesc(string: string, options?: Readonly<Partial<cssesc.Options>>): string;
+
+declare namespace cssesc {
+    interface Options {
+        escapeEverything: boolean;
+        isIdentifier: boolean;
+        quotes: string;
+        wrap: boolean;
+    }
+
+    const options: Options;
+
+    const version: string;
+}
diff --git a/types/cssesc/tsconfig.json b/types/cssesc/tsconfig.json
new file mode 100644
index 0000000000..16acf5e56a
--- /dev/null
+++ b/types/cssesc/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "cssesc-tests.ts"
+    ]
+}
diff --git a/types/cssesc/tslint.json b/types/cssesc/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cssesc/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/csv-parse/index.d.ts b/types/csv-parse/index.d.ts
index e85742c1c9..5ecaeea77b 100644
--- a/types/csv-parse/index.d.ts
+++ b/types/csv-parse/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for csv-parse 1.1
-// Project: https://github.com/wdavidw/node-csv-parse
+// Project: https://github.com/wdavidw/node-csv-parse, https://csv.js.org/parse
 // Definitions by: David Muller <https://github.com/davidm77>
 //                 Jan Sziegaud <https://github.com/obi-jan-kenobi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/csv-stringify/index.d.ts b/types/csv-stringify/index.d.ts
index 2b74a8c864..c7cd4fd900 100644
--- a/types/csv-stringify/index.d.ts
+++ b/types/csv-stringify/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for csv-stringify 1.4
-// Project: https://github.com/wdavidw/node-csv-stringify
+// Project: https://github.com/wdavidw/node-csv-stringify, https://csv.js.org/stringify
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 //                 Arjen van der Ende <https://github.com/arjenvanderende>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/cucumber/index.d.ts b/types/cucumber/index.d.ts
index 8cfed3ef31..aff42c73da 100644
--- a/types/cucumber/index.d.ts
+++ b/types/cucumber/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for cucumber-js 4.0
-// Project: https://github.com/cucumber/cucumber-js
+// Project: http://github.com/cucumber/cucumber-js
 // Definitions by: Abraão Alves <https://github.com/abraaoalves>
 //                 Jan Molak <https://github.com/jan-molak>
 //                 Isaiah Soung <https://github.com/isoung>
diff --git a/types/custom-functions-runtime/custom-functions-runtime-tests.ts b/types/custom-functions-runtime/custom-functions-runtime-tests.ts
index 8f54ee4f5c..3b773e95b1 100644
--- a/types/custom-functions-runtime/custom-functions-runtime-tests.ts
+++ b/types/custom-functions-runtime/custom-functions-runtime-tests.ts
@@ -10,17 +10,20 @@ CustomFunctions.associate({
     RANDOM: (n: number) => n * Math.random()
 });
 
+function callerAddress(invocation: CustomFunctions.Invocation) {
+    return invocation.address;
+}
+
 async function getStockValues(ticker: string): Promise<number> {
     const response = await fetch(`myService.com/prices/${ticker}`);
     return (await response.json())["price"];
 }
 
-async function getStockValuesCancellable(
-    ticker: string,
-    handler: CustomFunctions.CancelableHandler
-): Promise<number> {
+async function getStockValuesCancellable(ticker: string,
+    invocation: CustomFunctions.CancelableInvocation): Promise<number> {
+    const address = invocation.address;
     let shouldStop = false;
-    handler.onCanceled = () => (shouldStop = true);
+    invocation.onCanceled = () => (shouldStop = true);
     await pause(1000);
 
     if (shouldStop) {
@@ -31,10 +34,9 @@ async function getStockValuesCancellable(
     return (await response.json())["price"];
 }
 
-function stockPriceStream(
-    ticker: string,
-    handler: CustomFunctions.StreamingHandler<number>
-) {
+function stockPriceStream(ticker: string,
+    invocation: CustomFunctions.StreamingInvocation<number>) {
+    const address = invocation.address;
     const updateFrequency = 10 /* milliseconds*/;
     let isPending = false;
 
@@ -49,14 +51,14 @@ function stockPriceStream(
         try {
             const response = await fetch(url);
             const data = await response.json();
-            handler.setResult(data.price);
+            invocation.setResult(data.price);
         } catch (error) {
-            handler.setResult(error);
+            invocation.setResult(error);
         }
         isPending = false;
     }, updateFrequency);
 
-    handler.onCanceled = () => {
+    invocation.onCanceled = () => {
         clearInterval(timer);
     };
 }
diff --git a/types/custom-functions-runtime/index.d.ts b/types/custom-functions-runtime/index.d.ts
index 174308c131..5afc7fbdb9 100644
--- a/types/custom-functions-runtime/index.d.ts
+++ b/types/custom-functions-runtime/index.d.ts
@@ -1,6 +1,9 @@
-// Type definitions for Custom Functions 1.4
+// Type definitions for non-npm package Custom Functions 1.4
 // Project: https://github.com/OfficeDev/office-js
-// Definitions by: OfficeDev <https://github.com/OfficeDev>, Michael Zlatkovsky <https://github.com/Zlatkovsky>, Michelle Scharlock <https://github.com/mscharlock>
+// Definitions by: OfficeDev <https://github.com/OfficeDev>,
+//                 Adam Krantz <https://github.com/akrantz>,
+//                 Michael Zlatkovsky <https://github.com/Zlatkovsky>,
+//                 Michelle Scharlock <https://github.com/mscharlock>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -10,8 +13,8 @@ Copyright (c) Microsoft Corporation
 */
 
 /**
- * CustomFunctions namespace, used by Excel Custom Functions
  * @beta
+ * CustomFunctions namespace, used by Excel Custom Functions
  */
 declare namespace CustomFunctions {
     /**
@@ -26,30 +29,67 @@ declare namespace CustomFunctions {
     function associate(mappings: { [key: string]: Function }): void;
 
     /**
-     * A handler passed automatically as the last parameter
-     * to a streaming function. With this parameter, a
-     * function can use handler.setResult to set a cell value
-     * or hook into the handler.onCanceled event to
-     * to handle what happens when the function stops streaming.
      * @beta
+     * Provides information about the invocation of a custom function.
      */
-    interface StreamingHandler<T> extends CancelableHandler {
+    interface Invocation {
         /**
-         * Sets the returned result for a streaming custom function.
          * @beta
+         * The cell address where the function is being called, if requested, otherwise undefined.
+         *
+         * To request the address for the function, in the metadata JSON file, the function options should specify:
+         * `{ "requiresAddress": true }`
+         *
+         * If the metadata JSON file is being generated from JSDoc comments, include the tag `@requiresAddress`.
          */
-        setResult: (value: T | Error) => void;
+        address?: string;
     }
 
     /**
      * @beta
-     * CancelableHandler interface
+     * Provides information about the invocation of a cancelable custom function.
+     * A cancelable custom function can provide a handler for the onCanceled event.
+     *
+     * To indicate that a function is cancelable, in the metadata JSON file, the function options should specify:
+     * `{ "cancelable": true }`
+     *
+     * If the metadata JSON file is being generated from JSDoc comments, include the tag `@cancelable`.
      */
-    interface CancelableHandler {
+    interface CancelableInvocation extends Invocation {
         /**
-         * Handles what should occur when a custom function is canceled.
          * @beta
+         * Event handler called when the custom function is canceled.
          */
         onCanceled: () => void;
     }
+
+    /**
+     * @beta
+     * @deprecated Use `CancelableInvocation` instead.
+     */
+    interface CancelableHandler extends CancelableInvocation {
+    }
+
+    /**
+     * @beta
+     * Provides information about the invocation of a streaming custom function.
+     * A streaming custom function can provide results which can change over time.
+     *
+     * Call `setResult()` one or more times to provide the result instead of returning
+     * a result from the function.
+     */
+    interface StreamingInvocation<ResultType> extends CancelableInvocation {
+        /**
+         * @beta
+         * Set the result for the custom function. May be called more than once.
+         */
+        setResult: (value: ResultType | Error) => void;
+    }
+
+    /**
+     * @beta
+     * @deprecated Use `StreamingInvocation<ResultType>` instead.
+     */
+    interface StreamingHandler<ResultType> extends StreamingInvocation<ResultType> {
+    }
 }
diff --git a/types/custom-functions-runtime/tslint.json b/types/custom-functions-runtime/tslint.json
index ad17c76132..bb858f4682 100644
--- a/types/custom-functions-runtime/tslint.json
+++ b/types/custom-functions-runtime/tslint.json
@@ -2,6 +2,7 @@
     "extends": "dtslint/dt.json",
     "rules": {
         "ban-types": false,
-        "file-name-casing": false
+        "file-name-casing": false,
+        "no-empty-interface": false
     }
 }
diff --git a/types/cytoscape/index.d.ts b/types/cytoscape/index.d.ts
index df6870c70a..b4ca7de92f 100644
--- a/types/cytoscape/index.d.ts
+++ b/types/cytoscape/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Cytoscape.js 3.2
+// Type definitions for Cytoscape.js 3.3
 // Project: http://js.cytoscape.org/
 // Definitions by:  Fabian Schmidt and Fred Eisele <https://github.com/phreed>
 //                  Shenghan Gao <https://github.com/wy193777>
@@ -464,6 +464,27 @@ declare namespace cytoscape {
          */
         endBatch(): void;
 
+        /**
+         * Attaches the instance to the specified container for visualisation.
+         * http://js.cytoscape.org/#cy.mount
+         *
+         * If the core instance is headless prior to calling cy.mount(), then
+         * the instance will no longer be headless and the visualisation will
+         * be shown in the specified container. If the core instance is
+         * non-headless prior to calling cy.mount(), then the visualisation
+         * is swapped from the prior container to the specified container.
+         */
+        mount(element: Element): void;
+
+        /**
+         * Remove the instance from its current container.
+         * http://js.cytoscape.org/#cy.unmount
+         *
+         * This function sets the instance to be headless after unmounting from
+         * the current container.
+         */
+        unmount(): void;
+
         /**
          * A convenience function to explicitly destroy the Core.
          * http://js.cytoscape.org/#cy.destroy
diff --git a/types/d3-array/index.d.ts b/types/d3-array/index.d.ts
index 6d128323f5..bc271ccffd 100644
--- a/types/d3-array/index.d.ts
+++ b/types/d3-array/index.d.ts
@@ -220,7 +220,7 @@ export function ascending(a: Primitive | undefined, b: Primitive | undefined): n
 
 // NB. this is limited to primitive values due to D3's use of the <, >, and >= operators. Results get weird for object instances.
 /**
- * Compares two primitive values for sorting (in ascending order).
+ * Compares two primitive values for sorting (in descending order).
  */
 export function descending(a: Primitive | undefined, b: Primitive | undefined): number;
 
diff --git a/types/d3-axis/index.d.ts b/types/d3-axis/index.d.ts
index 62d0503419..a9d21e887b 100644
--- a/types/d3-axis/index.d.ts
+++ b/types/d3-axis/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-axis module 1.0
-// Project: https://github.com/d3/d3-axis/
+// Project: https://github.com/d3/d3-axis/, https://d3js.org/d3-axis
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
diff --git a/types/d3-brush/index.d.ts b/types/d3-brush/index.d.ts
index 0d558fe385..89731cb3d2 100644
--- a/types/d3-brush/index.d.ts
+++ b/types/d3-brush/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-brush module 1.0
-// Project: https://github.com/d3/d3-brush/
+// Project: https://github.com/d3/d3-brush/, https://d3js.org/d3-brush
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/d3-chord/index.d.ts b/types/d3-chord/index.d.ts
index 80577f3528..7066f712ca 100644
--- a/types/d3-chord/index.d.ts
+++ b/types/d3-chord/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-chord module 1.0
-// Project: https://github.com/d3/d3-chord/
+// Project: https://github.com/d3/d3-chord/, https://d3js.org/d3-chord
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/d3-collection/index.d.ts b/types/d3-collection/index.d.ts
index 89ac8d6153..ebaa04a226 100644
--- a/types/d3-collection/index.d.ts
+++ b/types/d3-collection/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-collection module 1.0
-// Project: https://github.com/d3/d3-collection/
+// Project: https://github.com/d3/d3-collection/, https://d3js.org/d3-collection
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/d3-color/index.d.ts b/types/d3-color/index.d.ts
index 05cd974c1f..8416e6a569 100644
--- a/types/d3-color/index.d.ts
+++ b/types/d3-color/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-color module 1.2
-// Project: https://github.com/d3/d3-color/
+// Project: https://github.com/d3/d3-color/, https://d3js.org/d3-color
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>,
 //                 Alex Ford <https://github.com/gustavderdrache>,
 //                 Boris Yankov <https://github.com/borisyankov>,
diff --git a/types/d3-contour/d3-contour-tests.ts b/types/d3-contour/d3-contour-tests.ts
index 2d23017040..2d18ebe957 100644
--- a/types/d3-contour/d3-contour-tests.ts
+++ b/types/d3-contour/d3-contour-tests.ts
@@ -25,10 +25,10 @@ import { randomNormal } from 'd3-random';
 const n = 256;
 const m = 256;
 const values: number[] = new Array(n * m);
-for (let j = 0.5, k = 0; j < m; ++j) {
-    for (let i = 0.5; i < n; i++) {
+for (let j = 0.5, k = 0; j < m; j += 1) {
+    for (let i = 0.5; i < n; i += 1) {
         values[k] = goldsteinPrice(i / n * 4 - 2, 1 - j / m * 3);
-        k++;
+        k += 1;
     }
 }
 
@@ -193,7 +193,7 @@ num = contDensCustom.bandwidth();
 const indNorm: CustomDatum[] = [];
 const rX = randomNormal();
 const rY = randomNormal(1, 2);
-for (let i = 0; i < 1000; i++) {
+for (let i = 0; i < 1000; i += 1) {
     indNorm.push({
         x: rX(),
         y: rY()
diff --git a/types/d3-dispatch/index.d.ts b/types/d3-dispatch/index.d.ts
index c8beb28a5a..3e5b511646 100644
--- a/types/d3-dispatch/index.d.ts
+++ b/types/d3-dispatch/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-dispatch module 1.0
-// Project: https://github.com/d3/d3-dispatch/
+// Project: https://github.com/d3/d3-dispatch/, https://d3js.org/d3-dispatch
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
diff --git a/types/d3-drag/index.d.ts b/types/d3-drag/index.d.ts
index 3e76a2f976..101c301dfc 100644
--- a/types/d3-drag/index.d.ts
+++ b/types/d3-drag/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-drag module 1.2
-// Project: https://github.com/d3/d3-drag/
+// Project: https://github.com/d3/d3-drag/, https://d3js.org/d3-drag
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/d3-dsv/index.d.ts b/types/d3-dsv/index.d.ts
index fcfaa67339..f865bb8bdf 100644
--- a/types/d3-dsv/index.d.ts
+++ b/types/d3-dsv/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-dsv module 1.0
-// Project: https://github.com/d3/d3-dsv/
+// Project: https://github.com/d3/d3-dsv/, https://d3js.org/d3-dsv
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
diff --git a/types/d3-ease/index.d.ts b/types/d3-ease/index.d.ts
index 1f2b5f4cdd..749367b539 100644
--- a/types/d3-ease/index.d.ts
+++ b/types/d3-ease/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-ease module 1.0
-// Project: https://github.com/d3/d3-ease/
+// Project: https://github.com/d3/d3-ease/, https://d3js.org/d3-ease
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/d3-force/d3-force-tests.ts b/types/d3-force/d3-force-tests.ts
index 6b73a1dbf4..9bf424c1b6 100644
--- a/types/d3-force/d3-force-tests.ts
+++ b/types/d3-force/d3-force-tests.ts
@@ -685,6 +685,7 @@ nodeLinkSimulation = nodeLinkSimulation.stop();
 // tick() -----------------------------------------------------------------------------
 
 nodeLinkSimulation.tick();
+nodeLinkSimulation.tick(10);
 
 // find() -----------------------------------------------------------------------------
 
diff --git a/types/d3-force/index.d.ts b/types/d3-force/index.d.ts
index 35f4d06657..61b3ca6f6d 100644
--- a/types/d3-force/index.d.ts
+++ b/types/d3-force/index.d.ts
@@ -1,9 +1,12 @@
-// Type definitions for D3JS d3-force module 1.1
-// Project: https://github.com/d3/d3-force/
-// Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
+// Type definitions for D3JS d3-force module 1.2
+// Project: https://github.com/d3/d3-force/, https://d3js.org/d3-force
+// 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.0
+// Last module patch version validated against: 1.2.0
 
 // -----------------------------------------------------------------------
 // Force Simulation
@@ -108,13 +111,16 @@ export interface Simulation<NodeDatum extends SimulationNodeDatum, LinkDatum ext
     stop(): this;
 
     /**
-     * Increments the current alpha by (alphaTarget - alpha) × alphaDecay; then invokes each registered force, passing the new alpha;
+     * Manually steps the simulation by the specified number of *iterations*, and returns the simulation. If *iterations* is not specified, it defaults to 1 (single step).
+     *
+     * For each iteration, it increments the current alpha by (alphaTarget - alpha) × alphaDecay; then invokes each registered force, passing the new alpha;
      * then decrements each node’s velocity by velocity × velocityDecay; lastly increments each node’s position by velocity.
+     *
      * This method does not dispatch events; events are only dispatched by the internal timer when the simulation is started automatically upon
      * creation or by calling simulation.restart. The natural number of ticks when the simulation is started is
      * ⌈log(alphaMin) / log(1 - alphaDecay)⌉; by default, this is 300.
      */
-    tick(): void;
+    tick(iterations?: number): void;
 
     /**
      * Returns the simulation’s array of nodes as specified to the constructor.
diff --git a/types/d3-format/index.d.ts b/types/d3-format/index.d.ts
index 0508606148..e680c10a5c 100644
--- a/types/d3-format/index.d.ts
+++ b/types/d3-format/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-format module 1.3
-// Project: https://github.com/d3/d3-format/
+// Project: https://github.com/d3/d3-format/, https://d3js.org/d3-format
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
diff --git a/types/d3-geo/index.d.ts b/types/d3-geo/index.d.ts
index 16c51dfae6..ee24b50d38 100644
--- a/types/d3-geo/index.d.ts
+++ b/types/d3-geo/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-geo module 1.11
-// Project: https://github.com/d3/d3-geo/
+// Project: https://github.com/d3/d3-geo/, https://d3js.org/d3-geo
 // Definitions by: Hugues Stefanski <https://github.com/ledragon>, Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/d3-hierarchy/index.d.ts b/types/d3-hierarchy/index.d.ts
index fb5ebd5656..3b9e59d065 100644
--- a/types/d3-hierarchy/index.d.ts
+++ b/types/d3-hierarchy/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-hierarchy module 1.1
-// Project: https://github.com/d3/d3-hierarchy/
+// Project: https://github.com/d3/d3-hierarchy/, https://d3js.org/d3-hierarchy
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
diff --git a/types/d3-hsv/index.d.ts b/types/d3-hsv/index.d.ts
index 1728af0874..232b0ba2a5 100644
--- a/types/d3-hsv/index.d.ts
+++ b/types/d3-hsv/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-hsv module 0.1
-// Project: https://github.com/d3/d3-hsv/
+// Project: https://github.com/d3/d3-hsv/, https://d3js.org/d3-hsv
 // Definitions by: Yuri Feldman <https://github.com/arrayjam>, denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/d3-interpolate/index.d.ts b/types/d3-interpolate/index.d.ts
index 82d4100650..bb3f6374e0 100644
--- a/types/d3-interpolate/index.d.ts
+++ b/types/d3-interpolate/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-interpolate module 1.3
-// Project: https://github.com/d3/d3-interpolate/
+// Project: https://github.com/d3/d3-interpolate/, https://d3js.org/d3-interpolate
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
diff --git a/types/d3-path/index.d.ts b/types/d3-path/index.d.ts
index 4c1f124962..4b75aad61d 100644
--- a/types/d3-path/index.d.ts
+++ b/types/d3-path/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-path module 1.0
-// Project: https://github.com/d3/d3-path/
+// Project: https://github.com/d3/d3-path/, https://d3js.org/d3-path
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/d3-polygon/index.d.ts b/types/d3-polygon/index.d.ts
index b9f8711335..8e92d63657 100644
--- a/types/d3-polygon/index.d.ts
+++ b/types/d3-polygon/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-polygon module 1.0
-// Project: https://github.com/d3/d3-polygon/
+// Project: https://github.com/d3/d3-polygon/, https://d3js.org/d3-polygon
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/d3-quadtree/index.d.ts b/types/d3-quadtree/index.d.ts
index 8e66ba411c..4706b39693 100644
--- a/types/d3-quadtree/index.d.ts
+++ b/types/d3-quadtree/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-quadtree module 1.0
-// Project: https://github.com/d3/d3-quadtree/
+// Project: https://github.com/d3/d3-quadtree/, https://d3js.org/d3-quadtree
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
diff --git a/types/d3-queue/index.d.ts b/types/d3-queue/index.d.ts
index 094a62ab03..f47b28aaed 100644
--- a/types/d3-queue/index.d.ts
+++ b/types/d3-queue/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-queue module 3.0
-// Project: https://github.com/d3/d3-queue/
+// Project: https://github.com/d3/d3-queue/, https://d3js.org/d3-queue
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
diff --git a/types/d3-random/index.d.ts b/types/d3-random/index.d.ts
index c6335a694b..f8a4479175 100644
--- a/types/d3-random/index.d.ts
+++ b/types/d3-random/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-random module 1.1
-// Project: https://github.com/d3/d3-random/
+// Project: https://github.com/d3/d3-random/, https://d3js.org/d3-random
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/d3-request/index.d.ts b/types/d3-request/index.d.ts
index 65ac3849b7..47953ce649 100644
--- a/types/d3-request/index.d.ts
+++ b/types/d3-request/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-request module 1.0
-// Project: https://github.com/d3/d3-request/
+// Project: https://github.com/d3/d3-request/, https://d3js.org/d3-request
 // Definitions by: Hugues Stefanski <https://github.com/Ledragon>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
diff --git a/types/d3-scale-chromatic/index.d.ts b/types/d3-scale-chromatic/index.d.ts
index 70d180420a..5b08147a8f 100644
--- a/types/d3-scale-chromatic/index.d.ts
+++ b/types/d3-scale-chromatic/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-scale-chromatic module 1.3
-// Project: https://github.com/d3/d3-scale-chromatic/
+// Project: https://github.com/d3/d3-scale-chromatic/, https://d3js.org/d3-scale-chromatic
 // Definitions by: Hugues Stefanski <https://github.com/Ledragon>,
 //                 Alex Ford <https://github.com/gustavderdrache>,
 //                 Boris Yankov <https://github.com/borisyankov>,
diff --git a/types/d3-scale/index.d.ts b/types/d3-scale/index.d.ts
index db6f6a8761..969b634c58 100644
--- a/types/d3-scale/index.d.ts
+++ b/types/d3-scale/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-scale module 2.1
-// Project: https://github.com/d3/d3-scale/
+// Project: https://github.com/d3/d3-scale/, https://d3js.org/d3-scale
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
diff --git a/types/d3-selection/d3-selection-tests.ts b/types/d3-selection/d3-selection-tests.ts
index 092e8bfa5a..57c30ef9aa 100644
--- a/types/d3-selection/d3-selection-tests.ts
+++ b/types/d3-selection/d3-selection-tests.ts
@@ -604,7 +604,7 @@ d3Selection.select('#svg-1') // irrelevant typing to get contextual typing in la
     .classed('has-transform-property', function(d) {
         console.log('Color of first data element array', d.length > 0 ? d[0].color : 'Data array empty'); // CircleDatumAlternative type
         // $ExpectError
-        return this.transform !== undefined;
+        return this!.transform !== undefined;
     });
 
 // SCENARIO 3: Only inferred typing (To have datum-type in 'classed' method call, no need for DOM object access)
@@ -649,6 +649,7 @@ const startCircleData: CircleDatumAlternative[] = [
         color: 'slateblue'
     }
 ];
+
 const endCircleData: CircleDatumAlternative[] = [
     {
         nodeId: 'n1',
@@ -1169,3 +1170,134 @@ predefinedNamespaces['dummy'] = 'http://www.w3.org/2020/dummynamespace';
 xWindow = d3Selection.window(xElement);
 xWindow = d3Selection.window(xDoc);
 xWindow = d3Selection.window(xWindow);
+
+// ---------------------------------------------------------------------------------------
+// JOIN - Convenient alternative to explicit enter update and exit methods
+// ---------------------------------------------------------------------------------------
+
+interface OldDatum {
+    oldData: number;
+}
+
+interface Datum {
+    data: string;
+}
+
+let selText: d3Selection.Selection<SVGTextElement, Datum, SVGSVGElement, SVGDatum>;
+let selTextAndCircle: d3Selection.Selection<SVGTextElement | SVGCircleElement, Datum, SVGSVGElement, SVGDatum>;
+
+const text = svgEl.selectAll<SVGTextElement, OldDatum>('text').data<Datum>([{data: 'a'}]);
+
+declare const r: () => boolean;
+
+// with only enter param
+
+selText = text.join('text');
+selText = text.join<SVGTextElement>('custom');
+selText = text.join(enter => enter.append('text').text(d => d.data));
+
+selText = text.join('circle'); // $ExpectError
+selText = text.join<SVGCircleElement>('custom'); // $ExpectError
+selText = text.join(enter => enter.append('circle')); // $ExpectError
+
+selTextAndCircle = text.join('circle');
+selTextAndCircle = text.join<SVGCircleElement>('custom');
+selTextAndCircle = text.join(enter => enter.append('circle').text(d => d.data));
+
+// with all param
+
+selText = text.join(
+    'text',
+    update => r ? undefined : update.text(d => d.data).attr('fill', 'gray'),
+    exit => exit.text(d => d.data).remove(),
+);
+
+selText = text.join<SVGTextElement>(
+    'custom',
+    update => r ? undefined : update.text(d => d.data).attr('fill', 'gray'),
+    exit => exit.text(d => d.data).remove(),
+);
+
+selText = text.join(
+    enter => enter.append('text').text(d => d.data),
+    update => r ? undefined : update.text(d => d.data).attr('fill', 'gray'),
+    exit => exit.text(d => d.data).remove(),
+);
+
+selTextAndCircle = text.join(
+    'circle',
+    update => r ? undefined : update.text(d => d.data).attr('fill', 'gray'),
+    exit => exit.text(d => d.data).remove(),
+);
+
+selTextAndCircle = text.join<SVGCircleElement>(
+    'custom',
+    update => r ? undefined : update.text(d => d.data).attr('fill', 'gray'),
+    exit => exit.text(d => d.data).remove(),
+);
+
+selTextAndCircle = text.join(
+    enter => enter.append('circle').text(d => d.data),
+    update => r ? undefined : update.text(d => d.data).attr('fill', 'gray'),
+    exit => exit.text(d => d.data).remove(),
+);
+
+// with all param and old datum
+
+selText = text.join<'text', OldDatum>(
+    'text',
+    update => r ? undefined : update.text(d => d.data).attr('fill', 'gray'),
+    exit => exit.text(d => `Bye ${d.oldData}`).remove(),
+);
+
+selText = text.join<SVGTextElement, OldDatum>(
+    'custom',
+    update => r ? undefined : update.text(d => d.data).attr('fill', 'gray'),
+    exit => exit.text(d => `Bye ${d.oldData}`).remove(),
+);
+
+selText = text.join<SVGTextElement, OldDatum>(
+    enter => enter.append('text').text(d => d.data),
+    update => r ? undefined : update.text(d => d.data).attr('fill', 'gray'),
+    exit => exit.text(d => d.oldData).remove(),
+);
+
+selTextAndCircle = text.join<'circle', OldDatum>(
+    'circle',
+    update => r ? undefined : update.text(d => d.data).attr('fill', 'gray'),
+    exit => exit.text(d => d.oldData).remove(),
+);
+
+selTextAndCircle = text.join<SVGCircleElement, OldDatum>(
+    'circle',
+    update => r ? undefined : update.text(d => d.data).attr('fill', 'gray'),
+    exit => exit.text(d => d.oldData).remove(),
+);
+
+selTextAndCircle = text.join<SVGCircleElement, OldDatum>(
+    enter => enter.append('circle').text(d => d.data),
+    update => r ? undefined : update.text(d => d.data).attr('fill', 'gray'),
+    exit => exit.text(d => d.oldData).remove(),
+);
+
+// Example from: https://github.com/d3/d3-selection/issues/194#issuecomment-427577484
+const groups = svgEl.selectAll<SVGGElement, {}>('g')
+    .data([{r: 10, text: 'hi'}])
+    .join(
+        (enter) => {
+            const g = enter.append('g').attr('class', 'tick');
+            g.append('circle');
+            g.append('text');
+            return g;
+        },
+        () => undefined,
+        (exit) => exit.remove()
+    )
+    .attr('transform', (_, i) => `translate(0, ${i})`);
+
+    groups.select('circle')
+        .attr('r', d => d.r);
+
+    groups.select('text')
+        .text(d => d.text)
+        .attr('dy', '0.32em');
diff --git a/types/d3-selection/index.d.ts b/types/d3-selection/index.d.ts
index c29f7aa952..6f9e2f93be 100644
--- a/types/d3-selection/index.d.ts
+++ b/types/d3-selection/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for D3JS d3-selection module 1.3
-// Project: https://github.com/d3/d3-selection/
+// Type definitions for D3JS d3-selection module 1.4
+// Project: https://github.com/d3/d3-selection/, https://d3js.org/d3-selection
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
@@ -7,7 +7,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-// Last module patch version validated against: 1.3.0
+// Last module patch version validated against: 1.4.0
 
 // --------------------------------------------------------------------------
 // Shared Type Definitions and Interfaces
@@ -782,6 +782,40 @@ export interface Selection<GElement extends BaseType, Datum, PElement extends Ba
      */
     data<NewDatum>(data: ValueFn<PElement, PDatum, NewDatum[]>, key?: ValueFn<GElement | PElement, Datum | NewDatum, string>): Selection<GElement, NewDatum, PElement, PDatum>;
 
+    /**
+     * Appends, removes and reorders elements as necessary to match the data that was previously bound by `selection.data`, returning the merged enter and update selection.
+     * This method is a convenient alternative to the more explicit `selection.enter`, `selection.exit`, `selection.append` and `selection.remove`.
+     *
+     * The "matching" logic is determined by the key function passed to `selection.data`.
+     */
+    join<K extends keyof ElementTagNameMap, OldDatum = Datum>(
+        enter: K,
+        update?: (elem: Selection<GElement, Datum, PElement, PDatum>) => Selection<GElement, Datum, PElement, PDatum> | undefined,
+        exit?: (elem: Selection<GElement, OldDatum, PElement, PDatum>) => void
+    ): Selection<GElement | ElementTagNameMap[K], Datum, PElement, PDatum>;
+    /**
+     * Appends, removes and reorders elements as necessary to match the data that was previously bound by `selection.data`, returning the merged enter and update selection.
+     * This method is a convenient alternative to the more explicit `selection.enter`, `selection.exit`, `selection.append` and `selection.remove`.
+     *
+     * The "matching" logic is determined by the key function passed to `selection.data`.
+     */
+    join<ChildElement extends BaseType, OldDatum = Datum>(
+        enter: string,
+        update?: (elem: Selection<GElement, Datum, PElement, PDatum>) => Selection<GElement, Datum, PElement, PDatum> | undefined,
+        exit?: (elem: Selection<GElement, OldDatum, PElement, PDatum>) => void
+    ): Selection<ChildElement | GElement, Datum, PElement, PDatum>;
+    /**
+     * Appends, removes and reorders elements as necessary to match the data that was previously bound by `selection.data`, returning the merged enter and update selection.
+     * This method is a convenient alternative to the more explicit `selection.enter`, `selection.exit`, `selection.append` and `selection.remove`.
+     *
+     * The "matching" logic is determined by the key function passed to `selection.data`.
+     */
+    join<ChildElement extends BaseType, OldDatum = Datum>(
+        enter: (elem: Selection<EnterElement, Datum, PElement, PDatum>) => Selection<ChildElement, Datum, PElement, PDatum>,
+        update?: (elem: Selection<GElement, Datum, PElement, PDatum>) => Selection<GElement, Datum, PElement, PDatum> | undefined,
+        exit?: (elem: Selection<GElement, OldDatum, PElement, PDatum>) => void
+    ): Selection<ChildElement | GElement, Datum, PElement, PDatum>;
+
     /**
      * Return the enter selection: placeholder nodes for each datum that had no corresponding DOM element
      * in the selection. (The enter selection is empty for selections not returned by selection.data.)
@@ -828,9 +862,9 @@ export interface Selection<GElement extends BaseType, Datum, PElement extends Ba
      * When a specified event is dispatched on a selected node, the specified listener will be evaluated for each selected element.
      *
      * An optional capture flag may be specified which corresponds to the W3C useCapture flag:
-     * “After initiating capture, all events of the specified type will be dispatched to the registered EventListener before being
+     * "After initiating capture, all events of the specified type will be dispatched to the registered EventListener before being
      * dispatched to any EventTargets beneath them in the tree. Events which are bubbling upward through the tree will not
-     * trigger an EventListener designated to use capture.”
+     * trigger an EventListener designated to use capture."
      *
      * @param typenames The typenames is a string event type, such as click, mouseover, or submit; any DOM event type supported by your browser may be used.
      * The type may be optionally followed by a period (.) and a name; the optional name allows multiple callbacks to be registered
diff --git a/types/d3-shape/d3-shape-tests.ts b/types/d3-shape/d3-shape-tests.ts
index fb79b15e4a..1ce464093f 100644
--- a/types/d3-shape/d3-shape-tests.ts
+++ b/types/d3-shape/d3-shape-tests.ts
@@ -1464,6 +1464,7 @@ seriesDatum = seriesPoint.data;
 let order: number[];
 const seriesAnyAny: d3Shape.Series<any, any> = seriesArray[0];
 
+order = d3Shape.stackOrderAppearance(seriesAnyAny);
 order = d3Shape.stackOrderAscending(seriesAnyAny);
 order = d3Shape.stackOrderDescending(seriesAnyAny);
 order = d3Shape.stackOrderInsideOut(seriesAnyAny);
diff --git a/types/d3-shape/index.d.ts b/types/d3-shape/index.d.ts
index ed64d6f827..2f056cf005 100644
--- a/types/d3-shape/index.d.ts
+++ b/types/d3-shape/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for D3JS d3-shape module 1.2
-// Project: https://github.com/d3/d3-shape/
+// Type definitions for D3JS d3-shape module 1.3
+// Project: https://github.com/d3/d3-shape/, https://d3js.org/d3-shape
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
@@ -7,7 +7,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-// Last module patch version validated against: 1.2.0
+// Last module patch version validated against: 1.3.3
 
 import { Path } from 'd3-path';
 
@@ -2670,6 +2670,13 @@ export function stack<Datum, Key>(): Stack<any, Datum, Key>;
  */
 export function stack<This, Datum, Key>(): Stack<This, Datum, Key>;
 
+/**
+ * Returns a series order such that the earliest series (according to the maximum value) is at the bottom.
+ *
+ * @param series A series generated by a stack generator.
+ */
+export function stackOrderAppearance(series: Series<any, any>): number[];
+
 /**
  * Returns a series order such that the smallest series (according to the sum of values) is at the bottom.
  *
diff --git a/types/d3-time-format/index.d.ts b/types/d3-time-format/index.d.ts
index 4ac6fc8469..a50d3394e0 100644
--- a/types/d3-time-format/index.d.ts
+++ b/types/d3-time-format/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for d3JS d3-time-format module 2.1
-// Project: https://github.com/d3/d3-time-format/
+// Project: https://github.com/d3/d3-time-format/, https://d3js.org/d3-time-format
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/d3-time/index.d.ts b/types/d3-time/index.d.ts
index 65aaf3af7e..c16dfabee5 100644
--- a/types/d3-time/index.d.ts
+++ b/types/d3-time/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-time module 1.0
-// Project: https://github.com/d3/d3-time/
+// Project: https://github.com/d3/d3-time/, https://d3js.org/d3-time
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
diff --git a/types/d3-timer/index.d.ts b/types/d3-timer/index.d.ts
index af7b1a15b2..cf23e01844 100644
--- a/types/d3-timer/index.d.ts
+++ b/types/d3-timer/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for d3JS d3-timer module 1.0
-// Project: https://github.com/d3/d3-timer/
+// Project: https://github.com/d3/d3-timer/, https://d3js.org/d3-timer
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
diff --git a/types/d3-transition/index.d.ts b/types/d3-transition/index.d.ts
index 4d166f6080..caff3a4112 100644
--- a/types/d3-transition/index.d.ts
+++ b/types/d3-transition/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-transition module 1.1
-// Project: https://github.com/d3/d3-transition/
+// Project: https://github.com/d3/d3-transition/, https://d3js.org/d3-transition
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/d3-voronoi/index.d.ts b/types/d3-voronoi/index.d.ts
index 7dfb79cf66..1127272130 100644
--- a/types/d3-voronoi/index.d.ts
+++ b/types/d3-voronoi/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3-voronoi module 1.1
-// Project: https://github.com/d3/d3-voronoi/
+// Project: https://github.com/d3/d3-voronoi/, https://d3js.org/d3-voronoi
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
diff --git a/types/d3-zoom/index.d.ts b/types/d3-zoom/index.d.ts
index 3f6100d4b8..4e9448336f 100644
--- a/types/d3-zoom/index.d.ts
+++ b/types/d3-zoom/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for d3JS d3-zoom module 1.7
-// Project: https://github.com/d3/d3-zoom/
+// Project: https://github.com/d3/d3-zoom/, https://d3js.org/d3-zoom
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
diff --git a/types/d3/index.d.ts b/types/d3/index.d.ts
index 9b62c1e025..f804906f95 100644
--- a/types/d3/index.d.ts
+++ b/types/d3/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for D3JS d3 standard bundle 5.7
-// Project: https://github.com/d3/d3
+// Project: https://github.com/d3/d3, https://d3js.org
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
 //                 Boris Yankov <https://github.com/borisyankov>
diff --git a/types/dagre-d3/index.d.ts b/types/dagre-d3/index.d.ts
index d402fec730..a73ecbc596 100644
--- a/types/dagre-d3/index.d.ts
+++ b/types/dagre-d3/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for dagre-d3.core.js 0.4
-// Project: https://github.com/cpettitt/dagre-d3
+// Project: https://github.com/dagrejs/dagre-d3
 // Definitions by: Mark Wong Siang Kai <https://github.com/markwongsk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/dagre/index.d.ts b/types/dagre/index.d.ts
index 774fbf8f80..849673c715 100644
--- a/types/dagre/index.d.ts
+++ b/types/dagre/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for dagre 0.7
-// Project: https://github.com/cpettitt/dagre
+// Project: https://github.com/dagrejs/dagre
 // Definitions by: Qinfeng Chen <https://github.com/qinfchen>
 //                 Lisa Vallfors <https://github.com/Frankrike>
 //                 Pete Vilter <https://github.com/vilterp>
diff --git a/types/datatables.net-buttons/index.d.ts b/types/datatables.net-buttons/index.d.ts
index e084a50c8d..a0cc8360c2 100644
--- a/types/datatables.net-buttons/index.d.ts
+++ b/types/datatables.net-buttons/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for JQuery DataTables Buttons extension 1.4
-// Project: http://datatables.net/extensions/buttons/
+// Project: http://datatables.net/extensions/buttons/, https://datatables.net
 // Definitions by: Kiarash Ghiaseddin <https://github.com/Silver-Connection>, Sam Germano <https://github.com/SammyG4Free>, Jim Hartford <https://github.com/jimhartford>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/datatables.net-colreorder/index.d.ts b/types/datatables.net-colreorder/index.d.ts
index 8254cd71dc..384346ad8f 100644
--- a/types/datatables.net-colreorder/index.d.ts
+++ b/types/datatables.net-colreorder/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for datatables.net-colReorder 1.4
-// Project: https://datatables.net/extensions/colreorder/
+// Project: https://datatables.net/extensions/colreorder/, https://datatables.net
 // Definitions by: Andy Ma <https://github.com/andy-maca>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/datatables.net-fixedheader/index.d.ts b/types/datatables.net-fixedheader/index.d.ts
index aa6f87f3b7..cc3968758c 100644
--- a/types/datatables.net-fixedheader/index.d.ts
+++ b/types/datatables.net-fixedheader/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for datatables.net-fixedheader 3.1
-// Project: https://datatables.net/extensions/fixedheader/
+// Project: https://datatables.net/extensions/fixedheader/, https://datatables.net
 // Definitions by: Jared Szechy <https://github.com/szechyjs>, Kiarash Ghiaseddin <https://github.com/Silver-Connection>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/datatables.net-rowgroup/index.d.ts b/types/datatables.net-rowgroup/index.d.ts
index e2697c7fac..05b3ed3d8d 100644
--- a/types/datatables.net-rowgroup/index.d.ts
+++ b/types/datatables.net-rowgroup/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for datatables.net-rowgroup 1.0
-// Project: https://datatables.net/extensions/rowgroup/
+// Project: https://datatables.net/extensions/rowgroup/, https://datatables.net
 // Definitions by: Matthieu Tabuteau <https://github.com/maixiu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/datatables.net-rowreorder/index.d.ts b/types/datatables.net-rowreorder/index.d.ts
index c95c7a1fb9..895c2a2322 100644
--- a/types/datatables.net-rowreorder/index.d.ts
+++ b/types/datatables.net-rowreorder/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for JQuery DataTables RowReorder extension 1.1
-// Project: http://datatables.net/extensions/rowreorder/
+// Project: http://datatables.net/extensions/rowreorder/, https://datatables.net
 // Definitions by: Vincent Biret <https://github.com/baywet>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/datatables.net-select/index.d.ts b/types/datatables.net-select/index.d.ts
index 563a51fc25..87cdef4c39 100644
--- a/types/datatables.net-select/index.d.ts
+++ b/types/datatables.net-select/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for datatables.net-select 1.2
-// Project: https://datatables.net/extensions/select/
+// Project: https://datatables.net/extensions/select/, https://datatables.net
 // Definitions by: Jared Szechy <https://github.com/szechyjs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/datatables.net/index.d.ts b/types/datatables.net/index.d.ts
index d0c8d50de2..845fd2f2c2 100644
--- a/types/datatables.net/index.d.ts
+++ b/types/datatables.net/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for JQuery DataTables 1.10
-// Project: http://www.datatables.net
+// Project: https://datatables.net
 // Definitions by: Kiarash Ghiaseddin <https://github.com/Silver-Connection>
 //                 Omid Rad <https://github.com/omidkrad>
 //                 Armin Sander <https://github.com/pragmatrix>
diff --git a/types/daterangepicker/index.d.ts b/types/daterangepicker/index.d.ts
index 9267a801b2..b2361b104a 100644
--- a/types/daterangepicker/index.d.ts
+++ b/types/daterangepicker/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Date Range Picker 3.0
-// Project: http://www.daterangepicker.com/
+// Project: http://www.daterangepicker.com/, https://github.com/dangrossman/daterangepicker
 // Definitions by: SirMartin <https://github.com/SirMartin>
 //                 Steven Masala <https://github.com/smasala>
 //                 Grant Hutchins <https://github.com/nertzy>
diff --git a/types/dav/index.d.ts b/types/dav/index.d.ts
index 063cc38e60..effc9f1685 100644
--- a/types/dav/index.d.ts
+++ b/types/dav/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for dav 1.7
-// Project: https://github.com/lambdabaa/dav/
+// Project: https://github.com/lambdabaa/dav/, https://github.com/gaye/dav
 // Definitions by: ToastHawaii <https://github.com/ToastHawaii>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/dayzed/index.d.ts b/types/dayzed/index.d.ts
index 2356778328..ab273b4a0f 100644
--- a/types/dayzed/index.d.ts
+++ b/types/dayzed/index.d.ts
@@ -15,7 +15,7 @@ export interface DateObj {
     today: boolean;
 }
 
-interface Calendar {
+export interface Calendar {
     firstDayOfMonth: Date;
     lastDayOfMonth: Date;
     month: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11;
@@ -23,16 +23,22 @@ interface Calendar {
     year: number;
 }
 
-interface RenderProps {
+export interface RenderProps {
     calendars: Calendar[];
-    getBackProps: (data: { calendars: Calendar[]; offset?: number; }) => Record<string, any>;
-    getForwardProps: (data: { calendars: Calendar[]; offset?: number; }) => Record<string, any>;
-    getDateProps: (data: { dateObj: DateObj; }) => Record<string, any>;
+    getBackProps: (data: {
+        calendars: Calendar[];
+        offset?: number;
+    }) => Record<string, any>;
+    getForwardProps: (data: {
+        calendars: Calendar[];
+        offset?: number;
+    }) => Record<string, any>;
+    getDateProps: (data: { dateObj: DateObj }) => Record<string, any>;
 }
 
-type RenderFn = (renderProps: RenderProps) => ReactNode;
+export type RenderFn = (renderProps: RenderProps) => ReactNode;
 
-interface Props {
+export interface Props {
     date?: Date;
     maxDate?: Date;
     minDate?: Date;
@@ -47,6 +53,6 @@ interface Props {
     onDateSelected(selectedDate: DateObj): void;
 }
 
-declare class Dayzed extends Component<Props> { }
+declare class Dayzed extends Component<Props> {}
 
 export default Dayzed;
diff --git a/types/debug/debug-tests.ts b/types/debug/debug-tests.ts
index bad51ed584..92d6f5eb8e 100644
--- a/types/debug/debug-tests.ts
+++ b/types/debug/debug-tests.ts
@@ -1,26 +1,31 @@
+import * as debug1 from "debug";
+/*tslint:disable-next-line:no-duplicate-imports*/
+import debug2 from 'debug';
 
+const log2: debug1.Debugger = debug2("DefinitelyTyped:log");
+log2("Just text");
+log2("Formatted test (%d arg)", 1);
+log2("Formatted %s (%d args)", "test", 2);
 
-import debug = require("debug");
+debug1.disable();
+debug1.enable("DefinitelyTyped:*");
 
-debug.disable();
-debug.enable("DefinitelyTyped:*");
-
-var log:debug.IDebugger = debug("DefinitelyTyped:log");
+const log: debug1.Debugger = debug1("DefinitelyTyped:log");
 
 log("Just text");
 log("Formatted test (%d arg)", 1);
 log("Formatted %s (%d args)", "test", 2);
 
-log("Enabled?: %s", debug.enabled("DefinitelyTyped:log"));
-log("Name Enabled: %s", debug.names.some(name => name.test("DefinitelyTyped:log")));
+log("Enabled?: %s", debug1.enabled("DefinitelyTyped:log"));
+log("Name Enabled: %s", debug1.names.some(name => name.test("DefinitelyTyped:log")));
 log("Namespace: %s", log.namespace);
 
-var error:debug.IDebugger = debug("DefinitelyTyped:error");
+const error: debug1.Debugger = debug1("DefinitelyTyped:error");
 error.log = console.error.bind(console);
 error("This should be printed to stderr");
 
-var extendedLog: debug.IDebugger = log.extend('extended');
+const extendedLog: debug1.Debugger = log.extend('extended');
 extendedLog("Testing this is also an IDebugger.");
 
-var extendedWithCustomDelimiter: debug.IDebugger = log.extend('with-delim', '.');
-extendedWithCustomDelimiter("Testing this is an IDebugger, too.");
\ No newline at end of file
+const extendedWithCustomDelimiter: debug1.Debugger = log.extend('with-delim', '.');
+extendedWithCustomDelimiter("Testing this is an IDebugger, too.");
diff --git a/types/debug/index.d.ts b/types/debug/index.d.ts
index 2eca1c8fb8..715e7c145e 100644
--- a/types/debug/index.d.ts
+++ b/types/debug/index.d.ts
@@ -1,40 +1,45 @@
-// Type definitions for debug
+// Type definitions for debug 4.1
 // Project: https://github.com/visionmedia/debug
 // Definitions by: Seon-Wook Park <https://github.com/swook>
 //                 Gal Talmor <https://github.com/galtalmor>
 //                 John McLaughlin <https://github.com/zamb3zi>
 //                 Brasten Sager <https://github.com/brasten>
+//                 Nicolas Penin <https://github.com/npenin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare var debug: debug.IDebug;
+declare var debug: debug.Debug & {debug: debug.Debug, default: debug.Debug};
 
 export = debug;
 export as namespace debug;
 
 declare namespace debug {
-    export interface IDebug {
-        (namespace: string): debug.IDebugger,
-        coerce: (val: any) => any,
-        disable: () => void,
-        enable: (namespaces: string) => void,
-        enabled: (namespaces: string) => boolean,
+    interface Debug {
+        (namespace: string): Debugger;
+        coerce: (val: any) => any;
+        disable: () => string;
+        enable: (namespaces: string) => void;
+        enabled: (namespaces: string) => boolean;
 
-        names: RegExp[],
-        skips: RegExp[],
+        names: RegExp[];
+        skips: RegExp[];
 
-        formatters: IFormatters
+        formatters: Formatters;
     }
 
-    export interface IFormatters {
-        [formatter: string]: Function
+    type IDebug = Debug;
+
+    interface Formatters {
+        [formatter: string]: (v: any) => string;
     }
 
-    export interface IDebugger {
+    type IDebugger = Debugger;
+
+    interface Debugger {
         (formatter: any, ...args: any[]): void;
 
         enabled: boolean;
-        log: Function;
+        log: (...args: any[]) => any;
         namespace: string;
-        extend: (namespace: string, delimiter?: string) => debug.IDebugger;
+        extend: (namespace: string, delimiter?: string) => Debugger;
     }
 }
diff --git a/types/debug/tslint.json b/types/debug/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/debug/tslint.json
+++ b/types/debug/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/decode-entities/index.d.ts b/types/decode-entities/index.d.ts
index 965e974092..82bc88fa05 100644
--- a/types/decode-entities/index.d.ts
+++ b/types/decode-entities/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for decode-entities 1.0
-// Project: https://github.com/waspothegreat/decode-entities#readme
+// Project: https://github.com/waspothegreat/decode-entities#readme, https://github.com/waspothegreat/strip-entities
 // Definitions by: waspothegreat <https://github.com/waspothegreat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/deep-equal-in-any-order/deep-equal-in-any-order-tests.ts b/types/deep-equal-in-any-order/deep-equal-in-any-order-tests.ts
new file mode 100644
index 0000000000..f8fe278708
--- /dev/null
+++ b/types/deep-equal-in-any-order/deep-equal-in-any-order-tests.ts
@@ -0,0 +1,13 @@
+import { expect, use } from 'chai';
+import deepEqualInAnyOrder = require('deep-equal-in-any-order');
+
+use(deepEqualInAnyOrder);
+
+expect([1, 2]).to.deep.equalInAnyOrder([2, 1]);
+expect([1, 2]).to.not.deep.equalInAnyOrder([2, 1, 3]);
+expect({ foo: [1, 2], bar: [4, 89, 22] }).to.deep.equalInAnyOrder({ foo: [2, 1], bar: [4, 22, 89] });
+expect({ foo: ['foo-1', 'foo-2', [1, 2], null] }).to.deep.equalInAnyOrder({ foo: [null, [1, 2], 'foo-1', 'foo-2'] });
+expect({ foo: [1, 2], bar: { baz: ['a', 'b', { lorem: [5, 6] }] } }).to.deep.equalInAnyOrder({
+    foo: [2, 1],
+    bar: { baz: ['b', 'a', { lorem: [6, 5] }] }
+});
diff --git a/types/deep-equal-in-any-order/index.d.ts b/types/deep-equal-in-any-order/index.d.ts
new file mode 100644
index 0000000000..d0e646d64e
--- /dev/null
+++ b/types/deep-equal-in-any-order/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for deep-equal-in-any-order 1.0
+// Project: https://github.com/oprogramador/deep-equal-in-any-order#readme
+// Definitions by: Bastien Caudan <https://github.com/bcaudan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare global {
+    namespace Chai {
+        interface Deep {
+            equalInAnyOrder: Equal;
+        }
+    }
+}
+
+declare function deepEqualInAnyOrder(chai: any, utils: any): void;
+export = deepEqualInAnyOrder;
diff --git a/types/deep-equal-in-any-order/tsconfig.json b/types/deep-equal-in-any-order/tsconfig.json
new file mode 100644
index 0000000000..4a70c15618
--- /dev/null
+++ b/types/deep-equal-in-any-order/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",
+        "deep-equal-in-any-order-tests.ts"
+    ]
+}
diff --git a/types/deep-equal-in-any-order/tslint.json b/types/deep-equal-in-any-order/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/deep-equal-in-any-order/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/defaults-deep/defaults-deep-tests.ts b/types/defaults-deep/defaults-deep-tests.ts
new file mode 100644
index 0000000000..daabc46d7d
--- /dev/null
+++ b/types/defaults-deep/defaults-deep-tests.ts
@@ -0,0 +1,7 @@
+import defaults = require('defaults-deep');
+
+defaults();
+defaults({a: 'foo'});
+defaults({a: 'foo'}, {a: 'bar'});
+defaults({a: 'foo'}, {a: 'bar'}, {a: 'foobar'});
+defaults({a: {b: 'foo'}}, {a: {b: 'bar'}});
diff --git a/types/defaults-deep/index.d.ts b/types/defaults-deep/index.d.ts
new file mode 100644
index 0000000000..749257eb88
--- /dev/null
+++ b/types/defaults-deep/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for defaults-deep 0.2
+// Project: https://github.com/jonschlinkert/defaults-deep
+// Definitions by: Hugo Alliaume <https://github.com/Kocal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Obj {
+    [k: string]: any;
+}
+
+declare function defaultsDeep(...objs: Obj[]): Obj;
+
+export = defaultsDeep;
diff --git a/types/defaults-deep/tsconfig.json b/types/defaults-deep/tsconfig.json
new file mode 100644
index 0000000000..9b7c12bf2b
--- /dev/null
+++ b/types/defaults-deep/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "defaults-deep-tests.ts"
+    ]
+}
diff --git a/types/defaults-deep/tslint.json b/types/defaults-deep/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/defaults-deep/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/deglob/index.d.ts b/types/deglob/index.d.ts
index 6310201c11..346e958a5c 100644
--- a/types/deglob/index.d.ts
+++ b/types/deglob/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for deglob v 2.1
-// Project: https://github.com/standard/deglob
+// Project: https://github.com/standard/deglob, https://github.com/flet/deglob
 // Definitions by: Saad Quadri <https://github.com/saadq>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/deps-sort/index.d.ts b/types/deps-sort/index.d.ts
index e32c826771..5171fbcea7 100644
--- a/types/deps-sort/index.d.ts
+++ b/types/deps-sort/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for deps-sort 2.0
-// Project: https://github.com/browserify/deps-sort
+// Project: https://github.com/browserify/deps-sort, https://github.com/substack/deps-sort
 // Definitions by: TeamworkGuy2 <https://github.com/TeamworkGuy2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/detox/index.d.ts b/types/detox/index.d.ts
index de74163bf1..977f32e249 100644
--- a/types/detox/index.d.ts
+++ b/types/detox/index.d.ts
@@ -434,4 +434,10 @@ declare global {
     }
 }
 
-export { by, detox, device, element, expect, waitFor };
+export { by, detox, device, element, waitFor };
+
+// Not exporting the global `expect` from the top of the file here
+// because `expect` conflicts with the global `expect` of jest and
+// therefore exporting it doesn't work. The global `expect` is kept
+// for backwards compatibility though.
+export const expect: Detox.Expect<Detox.Expect<any>>;
diff --git a/types/devexpress-aspnetcore-bootstrap/index.d.ts b/types/devexpress-aspnetcore-bootstrap/index.d.ts
index 51d1c2ebb4..37a87470fc 100644
--- a/types/devexpress-aspnetcore-bootstrap/index.d.ts
+++ b/types/devexpress-aspnetcore-bootstrap/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for DevExpress ASP.NET 181.3
+// Type definitions for non-npm package DevExpress ASP.NET 181.3
 // Project: http://devexpress.com/
 // Definitions by: DevExpress Inc. <https://github.com/devexpress>
 //                 Andrey Skubarenko <https://github.com/skubarenko>
diff --git a/types/devexpress-web/index.d.ts b/types/devexpress-web/index.d.ts
index 5c2feff240..b165f1b44c 100644
--- a/types/devexpress-web/index.d.ts
+++ b/types/devexpress-web/index.d.ts
@@ -5,6 +5,7 @@
 // TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
+/// <reference types="knockout"/>
 
 /**
  * A client-side counterpart of the DashboardViewer extension.
@@ -34356,7 +34357,7 @@ interface ASPxDesignerNavigateTab {
      * Provides access to a report opened in the current tab.
      * Value: A knockout observable object that specifies a report opened in the current tab.
      */
-    report: any;
+    report: KnockoutObservable<Object>;
     /**
      * Provides access to an engine that manages undo and redo operations in the Web Report Designer.
      * Value: An object that specifies an undo/redo engine.
@@ -34889,6 +34890,9 @@ interface ASPxClientMenuAction {
      * Value: A string that specifies the name of the CSS class.
      */
     imageClassName: string;
+    /**
+     *  Knockout template, where you can specify a required SVG icon and write logic to color it.
+     */
     imageTemplateName: string;
     /**
      * Provides access to the action performed when a button is clicked.
@@ -34897,9 +34901,8 @@ interface ASPxClientMenuAction {
     clickAction: Function;
     /**
      * Provides access to the value that specifies whether or not the command is disabled by default.
-     * Value: true, if the command is disabled by default; otherwise, false.
      */
-    disabled: boolean;
+    disabled: KnockoutObservable<boolean>;
     /**
      * Provides access to the value that specifies whether or not the command is visible in the user interface.
      * Value: true if the command is visible; otherwise false.
@@ -38912,5 +38915,4 @@ declare var ASPxClientReportDocumentMap: ASPxClientReportDocumentMapStatic;
 declare var ASPxClientReportParametersPanel: ASPxClientReportParametersPanelStatic;
 declare var ASPxClientReportToolbar: ASPxClientReportToolbarStatic;
 declare var ASPxClientReportViewer: ASPxClientReportViewerStatic;
-declare var ASPxClientWebDocumentViewer: ASPxClientWebDocumentViewerStatic;
-
+declare var ASPxClientWebDocumentViewer: ASPxClientWebDocumentViewerStatic;
\ No newline at end of file
diff --git a/types/dhtmlxgantt/index.d.ts b/types/dhtmlxgantt/index.d.ts
index f2e322b0e3..cb009f20aa 100644
--- a/types/dhtmlxgantt/index.d.ts
+++ b/types/dhtmlxgantt/index.d.ts
@@ -1455,13 +1455,13 @@ interface GanttStatic {
 	 * exports a Gantt chart into the PDF format
 	 * @param _export_ an object with export settings (see the details)
 	*/
-	exportToPDF(_export_: any): void;
+	exportToPDF(_export_?: any): void;
 
 	/**
 	 * exports a Gantt chart into the PNG format
 	 * @param _export_ an object with export settings (see the details)
 	*/
-	exportToPNG(_export_: any): void;
+	exportToPNG(_export_?: any): void;
 
 	/**
 	 * returns all dependency loops in the chart
@@ -2009,7 +2009,7 @@ interface GanttStatic {
 	 * gets the relative horizontal position of the specified date in the chart area
 	 * @param date a date you want to know the position of
 	*/
-	posFromDate(date: Date): void;
+	posFromDate(date: Date): number;
 
 	/**
 	 * applies the reverted changes to the gantt once again
@@ -2242,4 +2242,4 @@ declare module "gantt" {
 
 declare module "Gantt" {
     export = Gantt;
-}
\ No newline at end of file
+}
diff --git a/types/dialogflow/index.d.ts b/types/dialogflow/index.d.ts
index 98cfc8b53f..29d4a0ae4f 100644
--- a/types/dialogflow/index.d.ts
+++ b/types/dialogflow/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for dialogflow 0.6
-// Project: https://github.com/dialogflow/dialogflow-nodejs-client-v2#readme
+// Project: https://github.com/googleapis/nodejs-dialogflow
 // Definitions by: Daniel Dyla <https://github.com/dyladan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/diff/diff-tests.ts b/types/diff/diff-tests.ts
index 2f640da490..ca00b1f458 100644
--- a/types/diff/diff-tests.ts
+++ b/types/diff/diff-tests.ts
@@ -1,47 +1,55 @@
-import jsdiff = require('diff');
+import * as diff from 'diff';
+
 const one = 'beep boop';
 const other = 'beep boob blah';
 
-let diff = jsdiff.diffChars(one, other);
-printDiff(diff);
+let changes = diff.diffChars(one, other);
+examineChanges(changes);
 
-const diffArraysResult = jsdiff.diffArrays<string>(['a', 'b', 'c'], ['a', 'c', 'd']);
+// $ExpectType void
+diff.diffChars(one, other, {
+    callback: (err, value) => {
+        err; // $ExpectType undefined
+        value; // $ExpectType Change[] | undefined
+    },
+});
+// $ExpectType void
+diff.diffChars(one, other, (err, value) => {
+    err; // $ExpectType undefined
+    value; // $ExpectType Change[] | undefined
+});
+
+const diffArraysResult = diff.diffArrays(['a', 'b', 'c'], ['a', 'c', 'd']);
 diffArraysResult.forEach(result => {
-    if (result.added) {
-        console.log(`added ${result.value.length} line(s):`, ...result.value);
-    } else if (result.removed) {
-        console.log(`removed ${result.value.length} line(s):`, ...result.value);
-    } else {
-        console.log(`no changes`);
-    }
+    result.added; // $ExpectType boolean | undefined
+    result.removed; // $ExpectType boolean | undefined
+    result.value; // $ExpectType string[]
+    result.count; // $ExpectType number | undefined
 });
 
 interface DiffObj {
     value: number;
 }
-const a: DiffObj = {value: 0};
-const b: DiffObj = {value: 1};
-const c: DiffObj = {value: 2};
-const d: DiffObj = {value: 3};
-const arrayOptions: jsdiff.IArrayOptions = {
-    comparator: (left: DiffObj, right: DiffObj) => {
-      return left.value === right.value;
-    }
+const a: DiffObj = { value: 0 };
+const b: DiffObj = { value: 1 };
+const c: DiffObj = { value: 2 };
+const d: DiffObj = { value: 3 };
+const arrayOptions: diff.ArrayOptions<DiffObj, DiffObj> = {
+    comparator: (left, right) => {
+        return left.value === right.value;
+    },
 };
-const diffResult = jsdiff.diffArrays([a, b, c], [a, b, d], arrayOptions);
-diffResult.forEach(result => {
-    if (result.added) {
-        console.log(`added ${result.value.length} line(s):`, ...result.value);
-    } else if (result.removed) {
-        console.log(`removed ${result.value.length} line(s):`, ...result.value);
-    } else {
-        console.log(`no changes`);
-    }
+const arrayChanges = diff.diffArrays([a, b, c], [a, b, d], arrayOptions);
+arrayChanges.forEach(result => {
+    result.added; // $ExpectType boolean | undefined
+    result.removed; // $ExpectType boolean | undefined
+    result.value; // $ExpectType DiffObj[]
+    result.count; // $ExpectType number | undefined
 });
 
 // --------------------------
 
-class LineDiffWithoutWhitespace extends jsdiff.Diff {
+class LineDiffWithoutWhitespace extends diff.Diff {
     tokenize(value: string): any {
         return value.split(/^/m);
     }
@@ -52,71 +60,71 @@ class LineDiffWithoutWhitespace extends jsdiff.Diff {
 }
 
 const obj = new LineDiffWithoutWhitespace();
-diff = obj.diff(one, other);
-printDiff(diff);
+changes = obj.diff(one, other);
+examineChanges(changes);
 
-function printDiff(diff: jsdiff.IDiffResult[]) {
-    function addLineHeader(decorator: string, str: string | string[]) {
-        return (typeof str === 'string' ? str.split("\n") : str).map((line, index, array) => {
-            if (index === array.length - 1 && line === "") {
-                return line;
-            } else {
-                return decorator + line;
-            }
-        }).join("\n");
-    }
-
-    diff.forEach((part) => {
-        if (part.added) {
-            console.log(addLineHeader("+", part.value));
-        } else if (part.removed) {
-            console.log(addLineHeader("-", part.value));
-        } else {
-            console.log(addLineHeader(" ", part.value));
-        }
+function examineChanges(diff: diff.Change[]) {
+    diff.forEach(part => {
+        part.added; // $ExpectType boolean | undefined
+        part.removed; // $ExpectType boolean | undefined
+        part.value; // $ExpectType string
+        part.count; // $ExpectType number | undefined
     });
 }
 
-function verifyPatchMethods(oldStr: string, newStr: string, uniDiff: jsdiff.IUniDiff) {
-    const verifyPatch = jsdiff.parsePatch(
-        jsdiff.createTwoFilesPatch("oldFile.ts", "newFile.ts", oldStr, newStr,
-            "old", "new", { context: 1 }));
+function verifyPatchMethods(oldStr: string, newStr: string, uniDiff: diff.ParsedDiff) {
+    const verifyPatch = diff.parsePatch(
+        diff.createTwoFilesPatch('oldFile.ts', 'newFile.ts', oldStr, newStr, 'old', 'new', {
+            context: 1,
+        })
+    );
 
-    if (JSON.stringify(verifyPatch[0], Object.keys(verifyPatch[0]).sort()) !== JSON.stringify(uniDiff, Object.keys(uniDiff).sort())) {
-        console.error("Patch did not match uniDiff");
+    if (
+        JSON.stringify(verifyPatch[0], Object.keys(verifyPatch[0]).sort()) !==
+        JSON.stringify(uniDiff, Object.keys(uniDiff).sort())
+    ) {
+        throw new Error('Patch did not match uniDiff');
     }
 }
-function verifyApplyMethods(oldStr: string, newStr: string, uniDiff: jsdiff.IUniDiff) {
-    const verifyApply = [
-        jsdiff.applyPatch(oldStr, uniDiff),
-        jsdiff.applyPatch(oldStr, [uniDiff])
-    ];
-    jsdiff.applyPatches([uniDiff], {
-        loadFile: (index: number, callback: (err: Error, data: string) => void) => {
+function verifyApplyMethods(oldStr: string, newStr: string, uniDiffStr: string) {
+    const uniDiff = diff.parsePatch(uniDiffStr)[0];
+    const verifyApply = [diff.applyPatch(oldStr, uniDiff), diff.applyPatch(oldStr, [uniDiff])];
+    const options: diff.ApplyPatchesOptions = {
+        loadFile(index, callback) {
+            index; // $ExpectType ParsedDiff
             callback(undefined, one);
         },
-        patched: (index: number, content: string) => {
+        patched(index, content) {
+            index; // $ExpectType ParsedDiff
             verifyApply.push(content);
         },
-        complete: (err?: Error) => {
+        complete(err) {
             if (err) {
-                console.error(err);
+                throw err;
             }
 
             verifyApply.forEach(result => {
                 if (result !== newStr) {
-                    console.error("Result did not match newStr");
+                    throw new Error('Result did not match newStr');
                 }
             });
-        }
-    });
+        },
+        compareLine(_, line, operator, patchContent) {
+            if (operator === ' ') {
+                return true;
+            }
+            return line === patchContent;
+        },
+        fuzzFactor: 0
+    };
+    diff.applyPatches([uniDiff], options);
+    diff.applyPatches(uniDiffStr, options);
 }
 
-const uniDiffPatch = jsdiff.structuredPatch("oldFile.ts", "newFile.ts", one, other,
-    "old", "new", { context: 1 });
+const uniDiffPatch = diff.structuredPatch('oldFile.ts', 'newFile.ts', one, other, 'old', 'new', {
+    context: 1,
+});
 verifyPatchMethods(one, other, uniDiffPatch);
 
-const uniDiffStr = jsdiff.createPatch("file.ts", one, other, "old", "new",
-    { context: 1 });
-const uniDiffApply = jsdiff.parsePatch(uniDiffStr)[0];
-verifyApplyMethods(one, other, uniDiffApply);
+const uniDiffStr = diff.createPatch('file.ts', one, other, 'old', 'new', { context: 1 });
+verifyApplyMethods(one, other, uniDiffStr);
diff --git a/types/diff/index.d.ts b/types/diff/index.d.ts
index 760aee4e61..5afb72192e 100644
--- a/types/diff/index.d.ts
+++ b/types/diff/index.d.ts
@@ -1,121 +1,402 @@
-// Type definitions for diff 3.5
+// Type definitions for diff 4.0
 // Project: https://github.com/kpdecker/jsdiff
 // Definitions by: vvakame <https://github.com/vvakame>
 //                 szdc <https://github.com/szdc>
 //                 moc-yuto <https://github.com/moc-yuto>
+//                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-export = JsDiff;
-export as namespace JsDiff;
+export as namespace Diff;
 
-declare namespace JsDiff {
-    interface IOptions {
-        ignoreCase: boolean;
-    }
+export type Callback = (err: undefined, value?: Change[]) => void;
 
-    interface ILinesOptions extends IOptions {
-        ignoreWhitespace?: boolean;
-        newlineIsToken?: boolean;
-    }
-
-    interface IArrayOptions {
-        comparator?: (left: any, right: any) => boolean;
-    }
-
-    interface IDiffResult {
-        value: string;
-        count?: number;
-        added?: boolean;
-        removed?: boolean;
-    }
-
-    interface IDiffArraysResult<T> {
-        value: T[];
-        count?: number;
-        added?: boolean;
-        removed?: boolean;
-    }
-
-    interface IBestPath {
-        newPos: number;
-        componenets: IDiffResult[];
-    }
-
-    interface IHunk {
-        oldStart: number;
-        oldLines: number;
-        newStart: number;
-        newLines: number;
-        lines: string[];
-    }
-
-    interface IUniDiff {
-        oldFileName: string;
-        newFileName: string;
-        oldHeader: string;
-        newHeader: string;
-        index: string;
-        hunks: IHunk[];
-    }
-
-    class Diff {
-        diff(oldString: string, newString: string, options?: IOptions): IDiffResult[];
-
-        pushComponent(components: IDiffResult[], added: boolean, removed: boolean): void;
-
-        extractCommon(basePath: IBestPath, newString: string, oldString: string, diagonalPath: number): number;
-
-        equals(left: string, right: string): boolean;
-
-        removeEmpty(array: any[]): any[];
-
-        castInput(value: any): any;
-
-        join(chars: string[]): string;
-
-        tokenize(value: string): any; // return types are string or string[]
-    }
-
-    function diffChars(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
-
-    function diffWords(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
-
-    function diffWordsWithSpace(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
-
-    function diffJson(oldObj: object, newObj: object, options?: IOptions): IDiffResult[];
-
-    function diffLines(oldStr: string, newStr: string, options?: ILinesOptions): IDiffResult[];
-
-    function diffCss(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
-
-    function diffTrimmedLines(oldStr: string, newStr: string, options?: ILinesOptions): IDiffResult[];
-
-    function diffSentences(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
-
-    function diffArrays<T>(oldArr: T[], newArr: T[], options?: IArrayOptions): Array<IDiffArraysResult<T>>;
-
-    function createPatch(fileName: string, oldStr: string, newStr: string, oldHeader: string, newHeader: string, options?: {context: number}): string;
-
-    function createTwoFilesPatch(oldFileName: string, newFileName: string, oldStr: string, newStr: string, oldHeader: string, newHeader: string, options?: {context: number}): string;
-
-    function structuredPatch(oldFileName: string, newFileName: string, oldStr: string, newStr: string, oldHeader: string, newHeader: string, options?: {context: number}): IUniDiff;
-
-    function applyPatch(oldStr: string, uniDiff: string | IUniDiff | IUniDiff[]): string;
-
-    function applyPatches(uniDiff: IUniDiff[], options: {
-        loadFile(index: number, callback: (err: Error, data: string) => void): void,
-        patched(index: number, content: string): void,
-        complete(err?: Error): void
-    }): void;
-
-    function parsePatch(diffStr: string, options?: {strict: boolean}): IUniDiff[];
-
-    function convertChangesToXML(changes: IDiffResult[]): string;
-
-    function convertChangesToDMP(changes: IDiffResult[]): Array<{0: number; 1: string; }>;
-
-    function merge(mine: string, theirs: string, base: string): IUniDiff;
-
-    function canonicalize(obj: any, stack: any[], replacementStack: any[]): any;
+export interface CallbackOptions {
+    /**
+     * Callback to call with the result instead of returning the result directly.
+     */
+    callback: Callback;
 }
+
+export interface BaseOptions {
+    /**
+     * `true` to ignore casing difference.
+     * @default false
+     */
+    ignoreCase?: boolean;
+}
+
+export interface WordsOptions extends BaseOptions {
+    /**
+     * `true` to ignore leading and trailing whitespace. This is the same as `diffWords()`.
+     */
+    ignoreWhitespace?: boolean;
+}
+
+export interface LinesOptions extends BaseOptions {
+    /**
+     * `true` to ignore leading and trailing whitespace. This is the same as `diffTrimmedLines()`.
+     */
+    ignoreWhitespace?: boolean;
+
+    /**
+     * `true` to treat newline characters as separate tokens. This allows for changes to the newline structure
+     * to occur independently of the line content and to be treated as such. In general this is the more
+     * human friendly form of `diffLines()` and `diffLines()` is better suited for patches and other computer
+     * friendly output.
+     */
+    newlineIsToken?: boolean;
+}
+
+export interface JsonOptions extends LinesOptions {
+    /**
+     * Replacer used to stringify the properties of the passed objects.
+     */
+    stringifyReplacer?: (key: string, value: any) => any;
+
+    /**
+     * The value to use when `undefined` values in the passed objects are encountered during stringification.
+     * Will only be used if `stringifyReplacer` option wasn't specified.
+     * @default undefined
+     */
+    undefinedReplacement?: any;
+}
+
+export interface ArrayOptions<TLeft, TRight> extends BaseOptions {
+    /**
+     * Comparator for custom equality checks.
+     */
+    comparator?: (left: TLeft, right: TRight) => boolean;
+}
+
+export interface PatchOptions extends LinesOptions {
+    /**
+     * Describes how many lines of context should be included.
+     * @default 4
+     */
+    context?: number;
+}
+
+export interface ApplyPatchOptions {
+    /**
+     * Number of lines that are allowed to differ before rejecting a patch.
+     * @default 0
+     */
+    fuzzFactor?: number;
+
+    /**
+     * Callback used to compare to given lines to determine if they should be considered equal when patching.
+     * Should return `false` if the lines should be rejected.
+     *
+     * @default strict equality
+     */
+    compareLine?: (
+        lineNumber: number,
+        line: string,
+        operation: '-' | ' ',
+        patchContent: string
+    ) => boolean;
+}
+
+export interface ApplyPatchesOptions extends ApplyPatchOptions {
+    loadFile(index: ParsedDiff, callback: (err: any, data: string) => void): void;
+    patched(index: ParsedDiff, content: string, callback: (err: any) => void): void;
+    complete(err: any): void;
+}
+
+export interface Change {
+    count?: number;
+    /**
+     * Text content.
+     */
+    value: string;
+    /**
+     * `true` if the value was inserted into the new string.
+     */
+    added?: boolean;
+    /**
+     * `true` if the value was removed from the old string.
+     */
+    removed?: boolean;
+}
+
+export interface ArrayChange<T> {
+    value: T[];
+    count?: number;
+    added?: boolean;
+    removed?: boolean;
+}
+
+export interface ParsedDiff {
+    index?: string;
+    oldFileName?: string;
+    newFileName?: string;
+    oldHeader?: string;
+    newHeader?: string;
+    hunks: Hunk[];
+}
+
+export interface Hunk {
+    oldStart: number;
+    oldLines: number;
+    newStart: number;
+    newLines: number;
+    lines: string[];
+}
+
+export interface BestPath {
+    newPos: number;
+    componenets: Change[];
+}
+
+export class Diff {
+    diff(
+        oldString: string,
+        newString: string,
+        options?: Callback | (ArrayOptions<any, any> & Partial<CallbackOptions>)
+    ): Change[];
+
+    pushComponent(components: Change[], added: boolean, removed: boolean): void;
+
+    extractCommon(
+        basePath: BestPath,
+        newString: string,
+        oldString: string,
+        diagonalPath: number
+    ): number;
+
+    equals(left: any, right: any): boolean;
+
+    removeEmpty(array: any[]): any[];
+
+    castInput(value: any): any;
+
+    join(chars: string[]): string;
+
+    tokenize(value: string): any; // return types are string or string[]
+}
+
+/**
+ * Diffs two blocks of text, comparing character by character.
+ *
+ * @returns A list of change objects.
+ */
+export function diffChars(oldStr: string, newStr: string, options?: BaseOptions): Change[];
+export function diffChars(
+    oldStr: string,
+    newStr: string,
+    options: Callback | (BaseOptions & CallbackOptions)
+): void;
+
+/**
+ * Diffs two blocks of text, comparing word by word, ignoring whitespace.
+ *
+ * @returns A list of change objects.
+ */
+export function diffWords(oldStr: string, newStr: string, options?: WordsOptions): Change[];
+export function diffWords(
+    oldStr: string,
+    newStr: string,
+    options: Callback | (WordsOptions & CallbackOptions)
+): void;
+
+/**
+ * Diffs two blocks of text, comparing word by word, treating whitespace as significant.
+ *
+ * @returns A list of change objects.
+ */
+export function diffWordsWithSpace(
+    oldStr: string,
+    newStr: string,
+    options?: WordsOptions
+): Change[];
+export function diffWordsWithSpace(
+    oldStr: string,
+    newStr: string,
+    options: Callback | (WordsOptions & CallbackOptions)
+): void;
+
+/**
+ * Diffs two blocks of text, comparing line by line.
+ *
+ * @returns A list of change objects.
+ */
+export function diffLines(oldStr: string, newStr: string, options?: LinesOptions): Change[];
+export function diffLines(
+    oldStr: string,
+    newStr: string,
+    options: Callback | (LinesOptions & CallbackOptions)
+): void;
+
+/**
+ * Diffs two blocks of text, comparing line by line, ignoring leading and trailing whitespace.
+ *
+ * @returns A list of change objects.
+ */
+export function diffTrimmedLines(oldStr: string, newStr: string, options?: LinesOptions): Change[];
+export function diffTrimmedLines(
+    oldStr: string,
+    newStr: string,
+    options: Callback | (LinesOptions & CallbackOptions)
+): void;
+
+/**
+ * Diffs two blocks of text, comparing sentence by sentence.
+ *
+ * @returns A list of change objects.
+ */
+export function diffSentences(oldStr: string, newStr: string, options?: BaseOptions): Change[];
+export function diffSentences(
+    oldStr: string,
+    newStr: string,
+    options: Callback | (BaseOptions & CallbackOptions)
+): void;
+
+/**
+ * Diffs two blocks of text, comparing CSS tokens.
+ *
+ * @returns A list of change objects.
+ */
+export function diffCss(oldStr: string, newStr: string, options?: BaseOptions): Change[];
+export function diffCss(
+    oldStr: string,
+    newStr: string,
+    options: Callback | (BaseOptions & CallbackOptions)
+): void;
+
+/**
+ * Diffs two JSON objects, comparing the fields defined on each. The order of fields, etc does not matter
+ * in this comparison.
+ *
+ * @returns A list of change objects.
+ */
+export function diffJson(
+    oldObj: string | object,
+    newObj: string | object,
+    options?: JsonOptions
+): Change[];
+export function diffJson(
+    oldObj: string | object,
+    newObj: string | object,
+    options: Callback | (JsonOptions & CallbackOptions)
+): void;
+
+/**
+ * Diffs two arrays, comparing each item for strict equality (`===`).
+ *
+ * @returns A list of change objects.
+ */
+export function diffArrays<TOld, TNew>(
+    oldArr: TOld[],
+    newArr: TNew[],
+    options?: ArrayOptions<TOld, TNew>
+): Array<ArrayChange<TOld | TNew>>;
+
+/**
+ * Creates a unified diff patch.
+ *
+ * @param oldFileName String to be output in the filename section of the patch for the removals.
+ * @param newFileName String to be output in the filename section of the patch for the additions.
+ * @param oldStr Original string value.
+ * @param newStr New string value.
+ * @param oldHeader Additional information to include in the old file header.
+ * @param newHeader Additional information to include in the new file header.
+ */
+export function createTwoFilesPatch(
+    oldFileName: string,
+    newFileName: string,
+    oldStr: string,
+    newStr: string,
+    oldHeader?: string,
+    newHeader?: string,
+    options?: PatchOptions
+): string;
+
+/**
+ * Creates a unified diff patch.
+ * Just like `createTwoFilesPatch()`, but with `oldFileName` being equal to `newFileName`.
+ *
+ * @param fileName String to be output in the filename section.
+ * @param oldStr Original string value.
+ * @param newStr New string value.
+ * @param oldHeader Additional information to include in the old file header.
+ * @param newHeader Additional information to include in the new file header.
+ */
+export function createPatch(
+    fileName: string,
+    oldStr: string,
+    newStr: string,
+    oldHeader?: string,
+    newHeader?: string,
+    options?: PatchOptions
+): string;
+
+/**
+ * This method is similar to `createTwoFilesPatch()`, but returns a data structure suitable for further processing.
+ * Parameters are the same as `createTwoFilesPatch()`.
+ *
+ * @param oldFileName String to be output in the `oldFileName` hunk property.
+ * @param newFileName String to be output in the `newFileName` hunk property.
+ * @param oldStr Original string value.
+ * @param newStr New string value.
+ * @param oldHeader Additional information to include in the `oldHeader` hunk property.
+ * @param newHeader Additional information to include in the `newHeader` hunk property.
+ * @returns An object with an array of hunk objects.
+ */
+export function structuredPatch(
+    oldFileName: string,
+    newFileName: string,
+    oldStr: string,
+    newStr: string,
+    oldHeader?: string,
+    newHeader?: string,
+    options?: PatchOptions
+): ParsedDiff;
+
+/**
+ * Applies a unified diff patch.
+ *
+ * @param patch May be a string diff or the output from the `parsePatch()` or `structuredPatch()` methods.
+ * @returns A string containing new version of provided data.
+ */
+export function applyPatch(
+    source: string,
+    patch: string | ParsedDiff | [ParsedDiff],
+    options?: ApplyPatchOptions
+): string;
+
+/**
+ * Applies one or more patches.
+ * This method will iterate over the contents of the patch and apply to data provided through callbacks.
+ *
+ * The general flow for each patch index is:
+ *
+ * 1. `options.loadFile(index, callback)` is called. The caller should then load the contents of the file
+ * and then pass that to the `callback(err, data)` callback. Passing an `err` will terminate further patch execution.
+ * 2. `options.patched(index, content, callback)` is called once the patch has been applied. `content` will be
+ * the return value from `applyPatch()`. When it's ready, the caller should call `callback(err)` callback.
+ * Passing an `err` will terminate further patch execution.
+ * 3. Once all patches have been applied or an error occurs, the `options.complete(err)` callback is made.
+ */
+export function applyPatches(patch: string | ParsedDiff[], options: ApplyPatchesOptions): void;
+
+/**
+ * Parses a patch into structured data.
+ *
+ * @returns A JSON object representation of the a patch, suitable for use with the `applyPatch()` method.
+ */
+export function parsePatch(diffStr: string, options?: { strict?: boolean }): ParsedDiff[];
+
+/**
+ * Converts a list of changes to a serialized XML format.
+ */
+export function convertChangesToXML(changes: Change[]): string;
+
+/**
+ * Converts a list of changes to [DMP](http://code.google.com/p/google-diff-match-patch/wiki/API) format.
+ */
+export function convertChangesToDMP(changes: Change[]): Array<[1 | 0 | -1, string]>;
+
+export function merge(mine: string, theirs: string, base: string): ParsedDiff;
+
+export function canonicalize(obj: any, stack: any[], replacementStack: any[]): any;
diff --git a/types/diff/tsconfig.json b/types/diff/tsconfig.json
index 9a1fdba840..b32089d091 100644
--- a/types/diff/tsconfig.json
+++ b/types/diff/tsconfig.json
@@ -2,12 +2,11 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6",
-            "dom"
+            "es6"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -21,4 +20,4 @@
         "index.d.ts",
         "diff-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/diff/tslint.json b/types/diff/tslint.json
index 1b7b2672e6..3db14f85ea 100644
--- a/types/diff/tslint.json
+++ b/types/diff/tslint.json
@@ -1,7 +1 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "interface-name": false,
-        "export-just-namespace": false
-    }
-}
+{ "extends": "dtslint/dt.json" }
diff --git a/types/diff/v3/diff-tests.ts b/types/diff/v3/diff-tests.ts
new file mode 100644
index 0000000000..2f640da490
--- /dev/null
+++ b/types/diff/v3/diff-tests.ts
@@ -0,0 +1,122 @@
+import jsdiff = require('diff');
+const one = 'beep boop';
+const other = 'beep boob blah';
+
+let diff = jsdiff.diffChars(one, other);
+printDiff(diff);
+
+const diffArraysResult = jsdiff.diffArrays<string>(['a', 'b', 'c'], ['a', 'c', 'd']);
+diffArraysResult.forEach(result => {
+    if (result.added) {
+        console.log(`added ${result.value.length} line(s):`, ...result.value);
+    } else if (result.removed) {
+        console.log(`removed ${result.value.length} line(s):`, ...result.value);
+    } else {
+        console.log(`no changes`);
+    }
+});
+
+interface DiffObj {
+    value: number;
+}
+const a: DiffObj = {value: 0};
+const b: DiffObj = {value: 1};
+const c: DiffObj = {value: 2};
+const d: DiffObj = {value: 3};
+const arrayOptions: jsdiff.IArrayOptions = {
+    comparator: (left: DiffObj, right: DiffObj) => {
+      return left.value === right.value;
+    }
+};
+const diffResult = jsdiff.diffArrays([a, b, c], [a, b, d], arrayOptions);
+diffResult.forEach(result => {
+    if (result.added) {
+        console.log(`added ${result.value.length} line(s):`, ...result.value);
+    } else if (result.removed) {
+        console.log(`removed ${result.value.length} line(s):`, ...result.value);
+    } else {
+        console.log(`no changes`);
+    }
+});
+
+// --------------------------
+
+class LineDiffWithoutWhitespace extends jsdiff.Diff {
+    tokenize(value: string): any {
+        return value.split(/^/m);
+    }
+
+    equals(left: string, right: string): boolean {
+        return left.trim() === right.trim();
+    }
+}
+
+const obj = new LineDiffWithoutWhitespace();
+diff = obj.diff(one, other);
+printDiff(diff);
+
+function printDiff(diff: jsdiff.IDiffResult[]) {
+    function addLineHeader(decorator: string, str: string | string[]) {
+        return (typeof str === 'string' ? str.split("\n") : str).map((line, index, array) => {
+            if (index === array.length - 1 && line === "") {
+                return line;
+            } else {
+                return decorator + line;
+            }
+        }).join("\n");
+    }
+
+    diff.forEach((part) => {
+        if (part.added) {
+            console.log(addLineHeader("+", part.value));
+        } else if (part.removed) {
+            console.log(addLineHeader("-", part.value));
+        } else {
+            console.log(addLineHeader(" ", part.value));
+        }
+    });
+}
+
+function verifyPatchMethods(oldStr: string, newStr: string, uniDiff: jsdiff.IUniDiff) {
+    const verifyPatch = jsdiff.parsePatch(
+        jsdiff.createTwoFilesPatch("oldFile.ts", "newFile.ts", oldStr, newStr,
+            "old", "new", { context: 1 }));
+
+    if (JSON.stringify(verifyPatch[0], Object.keys(verifyPatch[0]).sort()) !== JSON.stringify(uniDiff, Object.keys(uniDiff).sort())) {
+        console.error("Patch did not match uniDiff");
+    }
+}
+function verifyApplyMethods(oldStr: string, newStr: string, uniDiff: jsdiff.IUniDiff) {
+    const verifyApply = [
+        jsdiff.applyPatch(oldStr, uniDiff),
+        jsdiff.applyPatch(oldStr, [uniDiff])
+    ];
+    jsdiff.applyPatches([uniDiff], {
+        loadFile: (index: number, callback: (err: Error, data: string) => void) => {
+            callback(undefined, one);
+        },
+        patched: (index: number, content: string) => {
+            verifyApply.push(content);
+        },
+        complete: (err?: Error) => {
+            if (err) {
+                console.error(err);
+            }
+
+            verifyApply.forEach(result => {
+                if (result !== newStr) {
+                    console.error("Result did not match newStr");
+                }
+            });
+        }
+    });
+}
+
+const uniDiffPatch = jsdiff.structuredPatch("oldFile.ts", "newFile.ts", one, other,
+    "old", "new", { context: 1 });
+verifyPatchMethods(one, other, uniDiffPatch);
+
+const uniDiffStr = jsdiff.createPatch("file.ts", one, other, "old", "new",
+    { context: 1 });
+const uniDiffApply = jsdiff.parsePatch(uniDiffStr)[0];
+verifyApplyMethods(one, other, uniDiffApply);
diff --git a/types/diff/v3/index.d.ts b/types/diff/v3/index.d.ts
new file mode 100644
index 0000000000..760aee4e61
--- /dev/null
+++ b/types/diff/v3/index.d.ts
@@ -0,0 +1,121 @@
+// Type definitions for diff 3.5
+// Project: https://github.com/kpdecker/jsdiff
+// Definitions by: vvakame <https://github.com/vvakame>
+//                 szdc <https://github.com/szdc>
+//                 moc-yuto <https://github.com/moc-yuto>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export = JsDiff;
+export as namespace JsDiff;
+
+declare namespace JsDiff {
+    interface IOptions {
+        ignoreCase: boolean;
+    }
+
+    interface ILinesOptions extends IOptions {
+        ignoreWhitespace?: boolean;
+        newlineIsToken?: boolean;
+    }
+
+    interface IArrayOptions {
+        comparator?: (left: any, right: any) => boolean;
+    }
+
+    interface IDiffResult {
+        value: string;
+        count?: number;
+        added?: boolean;
+        removed?: boolean;
+    }
+
+    interface IDiffArraysResult<T> {
+        value: T[];
+        count?: number;
+        added?: boolean;
+        removed?: boolean;
+    }
+
+    interface IBestPath {
+        newPos: number;
+        componenets: IDiffResult[];
+    }
+
+    interface IHunk {
+        oldStart: number;
+        oldLines: number;
+        newStart: number;
+        newLines: number;
+        lines: string[];
+    }
+
+    interface IUniDiff {
+        oldFileName: string;
+        newFileName: string;
+        oldHeader: string;
+        newHeader: string;
+        index: string;
+        hunks: IHunk[];
+    }
+
+    class Diff {
+        diff(oldString: string, newString: string, options?: IOptions): IDiffResult[];
+
+        pushComponent(components: IDiffResult[], added: boolean, removed: boolean): void;
+
+        extractCommon(basePath: IBestPath, newString: string, oldString: string, diagonalPath: number): number;
+
+        equals(left: string, right: string): boolean;
+
+        removeEmpty(array: any[]): any[];
+
+        castInput(value: any): any;
+
+        join(chars: string[]): string;
+
+        tokenize(value: string): any; // return types are string or string[]
+    }
+
+    function diffChars(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
+
+    function diffWords(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
+
+    function diffWordsWithSpace(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
+
+    function diffJson(oldObj: object, newObj: object, options?: IOptions): IDiffResult[];
+
+    function diffLines(oldStr: string, newStr: string, options?: ILinesOptions): IDiffResult[];
+
+    function diffCss(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
+
+    function diffTrimmedLines(oldStr: string, newStr: string, options?: ILinesOptions): IDiffResult[];
+
+    function diffSentences(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
+
+    function diffArrays<T>(oldArr: T[], newArr: T[], options?: IArrayOptions): Array<IDiffArraysResult<T>>;
+
+    function createPatch(fileName: string, oldStr: string, newStr: string, oldHeader: string, newHeader: string, options?: {context: number}): string;
+
+    function createTwoFilesPatch(oldFileName: string, newFileName: string, oldStr: string, newStr: string, oldHeader: string, newHeader: string, options?: {context: number}): string;
+
+    function structuredPatch(oldFileName: string, newFileName: string, oldStr: string, newStr: string, oldHeader: string, newHeader: string, options?: {context: number}): IUniDiff;
+
+    function applyPatch(oldStr: string, uniDiff: string | IUniDiff | IUniDiff[]): string;
+
+    function applyPatches(uniDiff: IUniDiff[], options: {
+        loadFile(index: number, callback: (err: Error, data: string) => void): void,
+        patched(index: number, content: string): void,
+        complete(err?: Error): void
+    }): void;
+
+    function parsePatch(diffStr: string, options?: {strict: boolean}): IUniDiff[];
+
+    function convertChangesToXML(changes: IDiffResult[]): string;
+
+    function convertChangesToDMP(changes: IDiffResult[]): Array<{0: number; 1: string; }>;
+
+    function merge(mine: string, theirs: string, base: string): IUniDiff;
+
+    function canonicalize(obj: any, stack: any[], replacementStack: any[]): any;
+}
diff --git a/types/diff/v3/tsconfig.json b/types/diff/v3/tsconfig.json
new file mode 100644
index 0000000000..92e1861ec8
--- /dev/null
+++ b/types/diff/v3/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "diff": [
+                "diff/v3"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "diff-tests.ts"
+    ]
+}
diff --git a/types/diff/v3/tslint.json b/types/diff/v3/tslint.json
new file mode 100644
index 0000000000..1b7b2672e6
--- /dev/null
+++ b/types/diff/v3/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "interface-name": false,
+        "export-just-namespace": false
+    }
+}
diff --git a/types/digibyte/index.d.ts b/types/digibyte/index.d.ts
index e53638a98e..b671797dfa 100644
--- a/types/digibyte/index.d.ts
+++ b/types/digibyte/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for digibyte 0.14
-// Project: https://github.com/digibyte/digibyte-lib
+// Project: https://github.com/digicontributer/digibyte-js
 // Definitions by: Lautaro Dragan <https://github.com/lautarodragan>
 //                 Adam Wolfe <https://github.com/werewolfe>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/discontinuous-range/index.d.ts b/types/discontinuous-range/index.d.ts
index edb6a1efd6..c5153218e2 100644
--- a/types/discontinuous-range/index.d.ts
+++ b/types/discontinuous-range/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for discontinuous-range 1.0
-// Project: https://www.npmjs.com/package/discontinuous-range
+// Project: https://github.com/dtudury/discontinuous-range
 // Definitions by: Victor Zhou <https://github.com/OiCMudkips>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/dlv/dlv-tests.ts b/types/dlv/dlv-tests.ts
new file mode 100644
index 0000000000..abe4b259c3
--- /dev/null
+++ b/types/dlv/dlv-tests.ts
@@ -0,0 +1,44 @@
+import dlv from 'dlv';
+
+const obj = {
+	undef: undefined,
+	zero: 0,
+	one: 1,
+	n: null,
+	f: false,
+	a: {
+		two: 2,
+		b: {
+			three: 3,
+			c: {
+				four: 4
+			}
+		}
+	}
+};
+
+// Test without defaults
+dlv(obj, '');
+dlv(obj, 'one');
+dlv(obj, 'one.two');
+dlv(obj, 'a');
+dlv(obj, 'a.two');
+dlv(obj, 'a.b');
+dlv(obj, 'a.b.three');
+dlv(obj, 'a.b.c');
+dlv(obj, 'a.b.c.four');
+dlv(obj, 'n');
+dlv(obj, 'n.badkey');
+dlv(obj, 'f');
+dlv(obj, 'f.badkey');
+
+// Test defaults
+dlv(obj, '', 'foo');
+dlv(obj, 'undef', 'foo');
+dlv(obj, 'n', null);
+dlv(obj, 'n.badkey', 'foo');
+dlv(obj, 'zero', 0);
+dlv(obj, 'a.badkey', 'foo');
+dlv(obj, 'a.badkey.anotherbadkey', 'foo');
+dlv(obj, 'f', false);
+dlv(obj, 'f.badkey', 'foo');
diff --git a/types/dlv/index.d.ts b/types/dlv/index.d.ts
new file mode 100644
index 0000000000..5813ec0595
--- /dev/null
+++ b/types/dlv/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for dlv 1.1
+// Project: https://github.com/developit/dlv#readme
+// Definitions by: Ryan Sonshine <https://github.com/ryansonshine>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/**
+ * Safely get a dot-notated path within a nested object, with ability to
+ * return a default if the full key path does not exist or the value is
+ * undefined
+ */
+export default function dlv(object: object, key: string | string[], defaultValue?: any): any;
diff --git a/types/dlv/tsconfig.json b/types/dlv/tsconfig.json
new file mode 100644
index 0000000000..222ce070e7
--- /dev/null
+++ b/types/dlv/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",
+        "dlv-tests.ts"
+    ]
+}
diff --git a/types/dlv/tslint.json b/types/dlv/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dlv/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts
index bdbda1ed95..0581057dea 100644
--- a/types/dockerode/index.d.ts
+++ b/types/dockerode/index.d.ts
@@ -174,6 +174,10 @@ declare namespace Dockerode {
 
     update(options: {}, callback: Callback<any>): void;
     update(options: {}): Promise<any>;
+
+    logs(options: ContainerLogsOptions, callback: Callback<NodeJS.ReadableStream>): void;
+    logs(callback: Callback<NodeJS.ReadableStream>): void;
+    logs(options?: ContainerLogsOptions): Promise<NodeJS.ReadableStream>;
   }
 
   class Task {
diff --git a/types/dom-clipboard-api/index.d.ts b/types/dom-clipboard-api/index.d.ts
index 1af5f2c60a..0cb64654c5 100644
--- a/types/dom-clipboard-api/index.d.ts
+++ b/types/dom-clipboard-api/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for w3c Clipboard API 1.0
+// Type definitions for non-npm package 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
diff --git a/types/dom-helpers/index.d.ts b/types/dom-helpers/index.d.ts
index 3215fcc500..b3397c5d6b 100644
--- a/types/dom-helpers/index.d.ts
+++ b/types/dom-helpers/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for dom-helpers 3.4
-// Project: https://github.com/react-bootstrap/dom-helpers
+// Project: https://github.com/react-bootstrap/dom-helpers, https://github.com/jquense/dom-helpers
 // Definitions by: Konstantin Vasiliev <https://github.com/mctep>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/dom-inputevent/index.d.ts b/types/dom-inputevent/index.d.ts
index 0d2111a0e0..2b55f1d0a7 100644
--- a/types/dom-inputevent/index.d.ts
+++ b/types/dom-inputevent/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for UI Events W3C Working Draft — Input Events — Interface InputEvent 1.0
+// Type definitions for non-npm package UI Events W3C Working Draft — Input Events — Interface InputEvent 1.0
 // Project: https://w3c.github.io/uievents/#interface-inputevent
 // Definitions by: Steven Sinatra <https://github.com/diagramatics>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/dom-mediacapture-record/index.d.ts b/types/dom-mediacapture-record/index.d.ts
index fc941e89bf..95a6d7648d 100644
--- a/types/dom-mediacapture-record/index.d.ts
+++ b/types/dom-mediacapture-record/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for w3c MediaStream Recording 1.0
+// Type definitions for non-npm package w3c MediaStream Recording 1.0
 // Project: https://w3c.github.io/mediacapture-record
 // Definitions by: Elias Meire <https://github.com/eliasmeire>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/dot/index.d.ts b/types/dot/index.d.ts
index 3594381fff..5b5f190aab 100644
--- a/types/dot/index.d.ts
+++ b/types/dot/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for doT 1.1
-// Project: https://github.com/olado/doT
+// Project: http://github.com/olado/dot
 // Definitions by: ZombieHunter <https://github.com/ZombieHunter>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/dotenv-flow/index.d.ts b/types/dotenv-flow/index.d.ts
index 33a494c4a8..cf2c389218 100644
--- a/types/dotenv-flow/index.d.ts
+++ b/types/dotenv-flow/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for dotenv-flow 0.2
-// Project: https://github.com/motdotla/dotenv
+// Project: https://github.com/kerimdzhanov/dotenv-flow
 // Definitions by: Vincent Langlet <https://github.com/vincentlanglet>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/dottie/index.d.ts b/types/dottie/index.d.ts
index d8fcba1397..f5a1a33d87 100644
--- a/types/dottie/index.d.ts
+++ b/types/dottie/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for dottie 2.0
-// Project: https://github.com/mickhansen/dottie
+// Project: https://github.com/mickhansen/dottie.js
 // Definitions by: Dom Armstrong <https://github.com/domarmstrong>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/doubleclick-gpt/index.d.ts b/types/doubleclick-gpt/index.d.ts
index 374f410c36..5e693c8f9a 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 238.0
+// Type definitions for non-npm package Google Publisher Tag 238.0
 // Project: https://developers.google.com/doubleclick-gpt/reference
 // Definitions by: John Wright <https://github.com/johngeorgewright>
 //                 Steven Joyce <https://github.com/steven-joyce>
diff --git a/types/draft-js/index.d.ts b/types/draft-js/index.d.ts
index 4c00e7598f..2f58d64a52 100644
--- a/types/draft-js/index.d.ts
+++ b/types/draft-js/index.d.ts
@@ -623,7 +623,7 @@ declare namespace Draft {
 
             interface DraftBlockRenderConfig {
                 element: string;
-                wrapper?: React.ReactElement<any>;
+                wrapper?: React.ReactElement;
             }
 
             class EditorState extends Record {
diff --git a/types/draggabilly/index.d.ts b/types/draggabilly/index.d.ts
index 02cecbc4d2..ee65be97c3 100644
--- a/types/draggabilly/index.d.ts
+++ b/types/draggabilly/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for draggabilly 2.1
-// Project: http://draggabilly.desandro.com/
+// Project: https://draggabilly.desandro.com
 // Definitions by: Jason Wu <https://github.com/jaydubu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/dropbox-chooser/index.d.ts b/types/dropbox-chooser/index.d.ts
index c5fd8a6cd6..548f106679 100644
--- a/types/dropbox-chooser/index.d.ts
+++ b/types/dropbox-chooser/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Dropbox Chooser 1.0
+// Type definitions for non-npm package Dropbox Chooser 1.0
 // Project: https://www.dropbox.com/developers/chooser
 // Definitions by: Michael Su <https://github.com/quas94>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/dropkickjs/index.d.ts b/types/dropkickjs/index.d.ts
index 94554a793a..ba181066f8 100644
--- a/types/dropkickjs/index.d.ts
+++ b/types/dropkickjs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for dropkickjs 2.1
-// Project: http://dropkickjs.com/
+// Project: http://dropkickjs.com/, https://github.com/robdel12/dropkick
 // Definitions by: Dmitry Pesterev <https://github.com/VorobeY1326>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/dwt/index.d.ts b/types/dwt/index.d.ts
index 78b0846eb7..04f600367d 100644
--- a/types/dwt/index.d.ts
+++ b/types/dwt/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for dwt 14.4
-// Project: http://www.dynamsoft.com/Products/WebTWAIN_Overview.aspx
+// Project: https://www.dynamsoft.com/products/webtwain_overview.aspx
 // Definitions by: Xiao Ling <https://github.com/yushulx>
 //                 Josh Hall <https://github.com/jbh>
 //                 Lincoln Hu <https://github.com/lincoln2018>
diff --git a/types/dynatrace/index.d.ts b/types/dynatrace/index.d.ts
index 5627e6b1db..6467f078cd 100644
--- a/types/dynatrace/index.d.ts
+++ b/types/dynatrace/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for dynatrace 1.0
-// Project: https://www.dynatrace.com/
+// Project: https://www.dynatrace.com/, https://github.com/npm/deprecate-holder
 // Definitions by: Alvaro Cruz <https://github.com/alvaro450>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/echarts/index.d.ts b/types/echarts/index.d.ts
index adc4a2a24e..5d40c148f6 100644
--- a/types/echarts/index.d.ts
+++ b/types/echarts/index.d.ts
@@ -5,6 +5,7 @@
 //                 Liveangela <https://github.com/liveangela>
 //                 Ovilia <https://github.com/Ovilia>
 //                 Roman <https://github.com/iRON5>
+//                 Bilal <https://github.com/bilalucar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -460,7 +461,7 @@ declare namespace echarts {
          *
          * @see https://ecomfe.github.io/echarts-doc/public/en/option.html#title
          */
-        title?: EChartTitleOption
+        title?: EChartTitleOption | EChartTitleOption[]
 
         /**
          * Legend component.
diff --git a/types/ecma-proposal-math-extensions/index.d.ts b/types/ecma-proposal-math-extensions/index.d.ts
index 6412e63dd6..70f98e3388 100644
--- a/types/ecma-proposal-math-extensions/index.d.ts
+++ b/types/ecma-proposal-math-extensions/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ecma-proposal-math-extensions 0.0
-// Project: https://github.com/rwaldron/proposal-math-extensions#readme
+// Project: https://github.com/rwaldron/proposal-math-extensions#readme, https://github.com/tc39/proposal-math-extensions
 // Definitions by: Konstantin Simon Maria Möllers <https://github.com/ksm2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.0
diff --git a/types/egjs__component/index.d.ts b/types/egjs__component/index.d.ts
index e52cbba65e..dd67602606 100644
--- a/types/egjs__component/index.d.ts
+++ b/types/egjs__component/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for egjs-component 2.0
-// Project: https://github.com/naver/egjs-component
+// Project: https://github.com/naver/egjs-component, https://naver.github.io/egjs-component
 // Definitions by: Naver <https://github.com/naver>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/ej.web.all/index.d.ts b/types/ej.web.all/index.d.ts
index 776ed03a20..020b3d363a 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.4
+// Type definitions for non-npm package ej.web.all 16.4
 // Project: http://help.syncfusion.com/js/typescript
 // Definitions by: Syncfusion <https://github.com/syncfusion>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ejs/index.d.ts b/types/ejs/index.d.ts
index fc578cffff..a82e634367 100644
--- a/types/ejs/index.d.ts
+++ b/types/ejs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ejs.js 2.6
-// Project: http://ejs.co/
+// Project: http://ejs.co/, https://github.com/mde/ejs
 // Definitions by: Ben Liddicott <https://github.com/benliddicott>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/elastic-apm-node/index.d.ts b/types/elastic-apm-node/index.d.ts
index a8cb213dd7..182a56782e 100644
--- a/types/elastic-apm-node/index.d.ts
+++ b/types/elastic-apm-node/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Elastic APM Node.js Agent 1.x
-// Project: https://www.elastic.co/solutions/apm
+// Project: https://www.elastic.co/solutions/apm, https://github.com/elastic/apm-agent-nodejs
 // Definitions by: Shahaed Hasan <https://github.com/shahaed>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.7
diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index 54956d89a2..1c986b3001 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for elasticsearch 5.0
-// Project: https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html
+// Project: http://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html
 // Definitions by: Casper Skydt <https://github.com/CasperSkydt>
 //                 Blake Smith <https://github.com/bfsmith>
 //                 Dave Dunkin <https://github.com/ddunkin>
diff --git a/types/electron-util/index.d.ts b/types/electron-util/index.d.ts
index 275191b73d..911b0d758c 100644
--- a/types/electron-util/index.d.ts
+++ b/types/electron-util/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for electron-util 0.2
-// Project:  https://github.com/sindresorhus/electron-util
+// Project:  https://github.com/sindresorhus/electron-util, https://github.com/sindresorhus/electron-util
 // Definitions by: Kai Puth <https://github.com/kputh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/electron-winstaller/index.d.ts b/types/electron-winstaller/index.d.ts
index b5abd3c6ef..dbad60e35e 100644
--- a/types/electron-winstaller/index.d.ts
+++ b/types/electron-winstaller/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for electron-winstaller 2.6
-// Project: https://github.com/electron/windows-installer
+// Project: https://github.com/electron/windows-installer, https://github.com/electronjs/windows-installer
 // Definitions by: Brendan Forster <https://github.com/shiftkey>, Daniel Perez Alvarez <https://github.com/unindented>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/elliptic/index.d.ts b/types/elliptic/index.d.ts
index 2f1ceb9aab..7b1e885d6f 100644
--- a/types/elliptic/index.d.ts
+++ b/types/elliptic/index.d.ts
@@ -175,8 +175,8 @@ export class ec {
     constructor(options: string | curves.PresetCurve)
 
     keyPair(options: ec.KeyPairOptions): ec.KeyPair;
-    keyFromPrivate(priv: Buffer | ec.KeyPair, enc?: string): ec.KeyPair;
-    keyFromPublic(pub: Buffer | ec.KeyPair, enc?: string): ec.KeyPair;
+    keyFromPrivate(priv: Buffer | string | ec.KeyPair, enc?: string): ec.KeyPair;
+    keyFromPublic(pub: Buffer | string | {x: string, y: string} | ec.KeyPair, enc?: string): ec.KeyPair;
     genKeyPair(options?: ec.GenKeyPairOptions): ec.KeyPair;
     sign(msg: BNInput, key: Buffer | ec.KeyPair, enc: string, options?: ec.SignOptions): ec.Signature;
     sign(msg: BNInput, key: Buffer | ec.KeyPair, options?: ec.SignOptions): ec.Signature;
@@ -187,7 +187,7 @@ export class ec {
 
 export namespace ec {
     interface GenKeyPairOptions {
-        pers: any;
+        pers?: any;
         entropy: any;
         persEnc?: string;
         entropyEnc?: string;
@@ -201,8 +201,8 @@ export namespace ec {
     }
 
     class KeyPair {
-        static fromPublic(ec: ec, pub: Buffer | KeyPair, enc?: string): KeyPair;
-        static fromPrivate(ec: ec, priv: Buffer | KeyPair, enc?: string): KeyPair;
+        static fromPublic(ec: ec, pub: Buffer | string | {x: string, y: string} | KeyPair, enc?: string): KeyPair;
+        static fromPrivate(ec: ec, priv: Buffer | string | KeyPair, enc?: string): KeyPair;
 
         ec: ec;
 
diff --git a/types/email-templates/index.d.ts b/types/email-templates/index.d.ts
index 1cdd43c36e..6d21a49ccd 100644
--- a/types/email-templates/index.d.ts
+++ b/types/email-templates/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for node-email-templates 3.5
-// Project: https://github.com/niftylettuce/node-email-templates
+// Project: https://github.com/niftylettuce/email-templates
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 //                 Matus Gura <https://github.com/gurisko>
 //                 Jacob Copeland <https://github.com/blankstar85>
diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 4e2b45cd55..fbe058a643 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Ember.js 3.0
-// Project: http://emberjs.com/
+// Project: http://emberjs.com/, https://github.com/emberjs/ember
 // Definitions by: Jed Mao <https://github.com/jedmao>
 //                 bttf <https://github.com/bttf>
 //                 Derek Wickern <https://github.com/dwickern>
diff --git a/types/ember__application/index.d.ts b/types/ember__application/index.d.ts
index 7518d41cdb..b8cfc5434e 100644
--- a/types/ember__application/index.d.ts
+++ b/types/ember__application/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @ember/application 3.0
+// Type definitions for non-npm package @ember/application 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Fapplication
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ember__array/index.d.ts b/types/ember__array/index.d.ts
index 882455da73..d96178dced 100644
--- a/types/ember__array/index.d.ts
+++ b/types/ember__array/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @ember/array 3.0
+// Type definitions for non-npm package @ember/array 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Farray
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ember__component/index.d.ts b/types/ember__component/index.d.ts
index a5c54a7793..afc1914648 100644
--- a/types/ember__component/index.d.ts
+++ b/types/ember__component/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @ember/component 3.0
+// Type definitions for non-npm package @ember/component 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Fcomponent
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ember__controller/index.d.ts b/types/ember__controller/index.d.ts
index 684c8b04e4..77522a3b29 100644
--- a/types/ember__controller/index.d.ts
+++ b/types/ember__controller/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @ember/controller 3.0
+// Type definitions for non-npm package @ember/controller 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Fcontroller
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ember__debug/index.d.ts b/types/ember__debug/index.d.ts
index c8ace3eafb..0287f91792 100644
--- a/types/ember__debug/index.d.ts
+++ b/types/ember__debug/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @ember/debug 3.0
+// Type definitions for non-npm package @ember/debug 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Fdebug
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ember__engine/index.d.ts b/types/ember__engine/index.d.ts
index ddd2e1bfb3..936398edfa 100644
--- a/types/ember__engine/index.d.ts
+++ b/types/ember__engine/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @ember/engine 3.0
+// Type definitions for non-npm package @ember/engine 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Fengine
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ember__error/index.d.ts b/types/ember__error/index.d.ts
index 312b1c3334..d1386cf925 100644
--- a/types/ember__error/index.d.ts
+++ b/types/ember__error/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @ember/error 3.0
+// Type definitions for non-npm package @ember/error 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Ferror
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ember__object/index.d.ts b/types/ember__object/index.d.ts
index 06e417999d..f287a51a90 100644
--- a/types/ember__object/index.d.ts
+++ b/types/ember__object/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @ember/object 3.0
+// Type definitions for non-npm package @ember/object 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Fobject
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ember__polyfills/index.d.ts b/types/ember__polyfills/index.d.ts
index 697a6c596b..e5ace0fe2e 100644
--- a/types/ember__polyfills/index.d.ts
+++ b/types/ember__polyfills/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @ember/polyfills 3.0
+// Type definitions for non-npm package @ember/polyfills 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Fpolyfills
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ember__routing/index.d.ts b/types/ember__routing/index.d.ts
index 059ca512ae..c90b477697 100644
--- a/types/ember__routing/index.d.ts
+++ b/types/ember__routing/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @ember/routing 3.0
+// Type definitions for non-npm package @ember/routing 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Frouting
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ember__runloop/index.d.ts b/types/ember__runloop/index.d.ts
index b5fed6fdcb..79b3b5973b 100644
--- a/types/ember__runloop/index.d.ts
+++ b/types/ember__runloop/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @ember/runloop 3.0
+// Type definitions for non-npm package @ember/runloop 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Frunloop
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ember__service/index.d.ts b/types/ember__service/index.d.ts
index 20eb513f89..45918f4bbb 100644
--- a/types/ember__service/index.d.ts
+++ b/types/ember__service/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @ember/service 3.0
+// Type definitions for non-npm package @ember/service 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Fservice
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ember__string/ember__string-tests.ts b/types/ember__string/ember__string-tests.ts
index 1f045b849d..500c67546e 100644
--- a/types/ember__string/ember__string-tests.ts
+++ b/types/ember__string/ember__string-tests.ts
@@ -1,4 +1,4 @@
-import { dasherize, camelize, capitalize, classify, decamelize, htmlSafe, loc, underscore, w } from '@ember/string';
+import { dasherize, camelize, capitalize, classify, decamelize, htmlSafe, loc, underscore, w, isHTMLSafe } from '@ember/string';
 import { SafeString } from 'handlebars';
 
 dasherize(); // $ExpectError
@@ -36,3 +36,11 @@ loc("_Hello %@ %@", ["John", "Smith"]);  // $ExpectType string
 const handlebarsSafeString: SafeString = htmlSafe('lorem ipsum...');
 htmlSafe('lorem ipsum...'); // $ExpectType SafeString
 const regularString: string = htmlSafe('lorem ipsum...'); // $ExpectError
+
+function isSafeTest(a: string|Handlebars.SafeString) {
+  if (isHTMLSafe(a)) {
+      a = a.toString();
+  }
+
+  camelize(a);
+}
diff --git a/types/ember__string/index.d.ts b/types/ember__string/index.d.ts
index 8a2a46c022..c25da1f823 100644
--- a/types/ember__string/index.d.ts
+++ b/types/ember__string/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @ember/string 3.0
+// Type definitions for non-npm package @ember/string 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Fstring
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -11,8 +11,8 @@ export function capitalize(str: string): string;
 export function classify(str: string): string;
 export function dasherize(str: string): string;
 export function decamelize(str: string): string;
-export function htmlSafe(str: string): Handlebars.SafeString;
-export function isHTMLSafe(str: string): boolean;
+export function htmlSafe(str: string): SafeString;
+export function isHTMLSafe(str: any): str is SafeString;
 export function loc(template: string, args?: string[]): string;
 export function underscore(str: string): string;
 export function w(str: string): string[];
diff --git a/types/ember__test/index.d.ts b/types/ember__test/index.d.ts
index 350bb90897..60fddb6473 100644
--- a/types/ember__test/index.d.ts
+++ b/types/ember__test/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @ember/test 3.0
+// Type definitions for non-npm package @ember/test 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Ftest
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ember__utils/index.d.ts b/types/ember__utils/index.d.ts
index 4489602a23..70574e4a76 100644
--- a/types/ember__utils/index.d.ts
+++ b/types/ember__utils/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @ember/utils 3.0
+// Type definitions for non-npm package @ember/utils 3.0
 // Project: http://emberjs.com/
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/emoji-mart/index.d.ts b/types/emoji-mart/index.d.ts
index a92bcb77ff..8ea741ca9f 100644
--- a/types/emoji-mart/index.d.ts
+++ b/types/emoji-mart/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for emoji-mart 2.8
 // Project: https://github.com/missive/emoji-mart
-// Definitions by: Jessica Franco <https://github.com/Kovensky>
+// Definitions by: Jessica Franco <https://github.com/Jessidhia>
 //                 Nick Winans <https://github.com/Nicell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/emoji-regex/index.d.ts b/types/emoji-regex/index.d.ts
index edff690dc7..15e1cd272e 100644
--- a/types/emoji-regex/index.d.ts
+++ b/types/emoji-regex/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for emoji-regex 7.0
-// Project: https://github.com/mathiasbynens/emoji-regex
+// Project: https://github.com/mathiasbynens/emoji-regex, https://mths.be/emoji-regex
 // Definitions by: iKBAHT <https://github.com/iKBAHT>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/emojione/index.d.ts b/types/emojione/index.d.ts
index 000a5e9940..92399fdf9a 100644
--- a/types/emojione/index.d.ts
+++ b/types/emojione/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for emojione 2.2
-// Project: https://github.com/Ranks/emojione
+// Project: https://github.com/Ranks/emojione, http://www.emojione.com
 // Definitions by: Danilo Bargen <https://github.com/dbrgn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/empty-dir/index.d.ts b/types/empty-dir/index.d.ts
index 0f623a991d..44e50c606f 100644
--- a/types/empty-dir/index.d.ts
+++ b/types/empty-dir/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for empty-dir 1.0
-// Project: https://github.com/js-cli/js-empty-dir
+// Project: https://github.com/gulpjs/empty-dir
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/enquire.js/index.d.ts b/types/enquire.js/index.d.ts
index d7dcafdc30..e28895bf29 100644
--- a/types/enquire.js/index.d.ts
+++ b/types/enquire.js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for enquire.js 2.1
-// Project: https://github.com/WickyNilliams/enquire.js/
+// Project: https://github.com/WickyNilliams/enquire.js/, http://wicky.nillia.ms/enquire.js
 // Definitions by: Christian Rackerseder <https://github.com/screendriver>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/entities/index.d.ts b/types/entities/index.d.ts
index 46f7c11116..3047f845e3 100644
--- a/types/entities/index.d.ts
+++ b/types/entities/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for entities 1.1
-// Project: https://github.com/fb55/node-entities
+// Project: https://github.com/fb55/entities
 // Definitions by: Alice Klipper <https://github.com/aliceklipper>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/enzyme-adapter-react-15/index.d.ts b/types/enzyme-adapter-react-15/index.d.ts
index 06659d75b9..77312f3da0 100644
--- a/types/enzyme-adapter-react-15/index.d.ts
+++ b/types/enzyme-adapter-react-15/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for enzyme-adapter-react-15 1.0
-// Project: https://github.com/airbnb/enzyme
+// Project: https://github.com/airbnb/enzyme, http://airbnb.io/enzyme
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/enzyme-adapter-react-16/index.d.ts b/types/enzyme-adapter-react-16/index.d.ts
index 3e567d956b..257b292055 100644
--- a/types/enzyme-adapter-react-16/index.d.ts
+++ b/types/enzyme-adapter-react-16/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for enzyme-adapter-react-16 1.0
-// Project: https://github.com/airbnb/enzyme
+// Project: https://github.com/airbnb/enzyme, http://airbnb.io/enzyme
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/enzyme/enzyme-tests.tsx b/types/enzyme/enzyme-tests.tsx
index 0711243d0c..87b4d032e8 100644
--- a/types/enzyme/enzyme-tests.tsx
+++ b/types/enzyme/enzyme-tests.tsx
@@ -35,6 +35,10 @@ interface MyComponentState {
     stateProperty: string;
 }
 
+function toComponentType<T>(Component: ComponentClass<T> | StatelessComponent<T>): ComponentClass<T> | StatelessComponent<T> {
+  return Component;
+}
+
 class MyComponent extends Component<MyComponentProps, MyComponentState> {
     handleEcho(value: string) {
         return value;
@@ -59,6 +63,8 @@ const MyStatelessComponent = (props: StatelessProps) => <span />;
 
 const AnotherStatelessComponent = (props: AnotherStatelessProps) => <span />;
 
+const ComponentType = toComponentType(MyComponent);
+
 // Enzyme.configure
 function configureTest() {
     const configureAdapter: { adapter: EnzymeAdapter } = { adapter: {} };
@@ -76,8 +82,8 @@ function ShallowWrapperTest() {
     let shallowWrapper: ShallowWrapper<MyComponentProps, MyComponentState> =
         shallow<MyComponentProps, MyComponentState>(<MyComponent stringProp="value" numberProp={1} />);
 
-    let reactElement: ReactElement<any>;
-    let reactElements: Array<ReactElement<any>>;
+    let reactElement: ReactElement;
+    let reactElements: ReactElement[];
     let domElement: Element;
     let boolVal: boolean;
     let stringVal: string;
@@ -478,8 +484,8 @@ function ReactWrapperTest() {
     let reactWrapper: ReactWrapper<MyComponentProps, MyComponentState> =
         mount<MyComponentProps, MyComponentState>(<MyComponent stringProp="value" numberProp={1} />);
 
-    let reactElement: ReactElement<any>;
-    let reactElements: Array<ReactElement<any>>;
+    let reactElement: ReactElement;
+    let reactElements: ReactElement[];
     let domElement: Element;
     let boolVal: boolean;
     let stringVal: string;
@@ -859,6 +865,14 @@ function ReactWrapperTest() {
         reactWrapper = new ReactWrapper<MyComponentProps, MyComponentState>(<MyComponent stringProp="1" numberProp={1} />, undefined, { attachTo: document.createElement('div') });
         reactWrapper = new ReactWrapper<MyComponentProps, MyComponentState>(<MyComponent stringProp="1" numberProp={1} />, reactWrapper, { attachTo: document.createElement('div') });
     }
+
+    function test_component_type() {
+      const wrapper1 = shallow(<div><ComponentType stringProp={"S"} numberProp={1} /></div>);
+      wrapper1.find<MyComponentProps>(ComponentType).props().stringProp; // $ExpectType string
+
+      const wrapper2 = mount(<div><ComponentType stringProp={"S"} numberProp={1} /></div>);
+      wrapper2.find<MyComponentProps>(ComponentType).props().stringProp; // $ExpectType string
+    }
 }
 
 // CheerioWrapper
diff --git a/types/enzyme/index.d.ts b/types/enzyme/index.d.ts
index 0818b4e5ce..257beb21fc 100644
--- a/types/enzyme/index.d.ts
+++ b/types/enzyme/index.d.ts
@@ -27,7 +27,9 @@ export interface ComponentClass<Props> {
     new(props: Props, context?: any): Component<Props>;
 }
 
-export type StatelessComponent<Props> = (props: Props, context?: any) => JSX.Element;
+export type StatelessComponent<Props> = (props: Props, context?: any) => JSX.Element | null;
+
+export type ComponentType<Props> = ComponentClass<Props> | StatelessComponent<Props>;
 
 /**
  * Many methods in Enzyme's API accept a selector as an argument. Selectors in Enzyme can fall into one of the
@@ -55,32 +57,32 @@ export interface CommonWrapper<P = {}, S = {}, C = Component<P, S>> {
     /**
      * Returns whether or not the current wrapper has a node anywhere in it's render tree that looks like the one passed in.
      */
-    contains(node: ReactElement<any> | Array<ReactElement<any>> | string): boolean;
+    contains(node: ReactElement | ReactElement[] | string): boolean;
 
     /**
      * Returns whether or not a given react element exists in the shallow render tree.
      */
-    containsMatchingElement(node: ReactElement<any> | Array<ReactElement<any>>): boolean;
+    containsMatchingElement(node: ReactElement | ReactElement[]): boolean;
 
     /**
      * Returns whether or not all the given react elements exists in the shallow render tree
      */
-    containsAllMatchingElements(nodes: Array<ReactElement<any>> | Array<Array<ReactElement<any>>>): boolean;
+    containsAllMatchingElements(nodes: ReactElement[] | ReactElement[][]): boolean;
 
     /**
      * Returns whether or not one of the given react elements exists in the shallow render tree.
      */
-    containsAnyMatchingElements(nodes: Array<ReactElement<any>> | Array<Array<ReactElement<any>>>): boolean;
+    containsAnyMatchingElements(nodes: ReactElement[] | ReactElement[][]): boolean;
 
     /**
      * Returns whether or not the current render tree is equal to the given node, based on the expected value.
      */
-    equals(node: ReactElement<any>): boolean;
+    equals(node: ReactElement): boolean;
 
     /**
      * Returns whether or not a given react element matches the shallow render tree.
      */
-    matchesElement(node: ReactElement<any>): boolean;
+    matchesElement(node: ReactElement): boolean;
 
     /**
      * Returns whether or not the current node has a className prop including the passed in class name.
@@ -128,27 +130,27 @@ export interface CommonWrapper<P = {}, S = {}, C = Component<P, S>> {
     /**
      * Returns the node at a given index of the current wrapper.
      */
-    get(index: number): ReactElement<any>;
+    get(index: number): ReactElement;
 
     /**
      * Returns the wrapper's underlying node.
      */
-    getNode(): ReactElement<any>;
+    getNode(): ReactElement;
 
     /**
      * Returns the wrapper's underlying nodes.
      */
-    getNodes(): Array<ReactElement<any>>;
+    getNodes(): ReactElement[];
 
     /**
      * Returns the wrapper's underlying node.
      */
-    getElement(): ReactElement<any>;
+    getElement(): ReactElement;
 
     /**
      * Returns the wrapper's underlying node.
      */
-    getElements(): Array<ReactElement<any>>;
+    getElements(): ReactElement[];
 
     /**
      * Returns the outer most DOMComponent of the current wrapper.
@@ -372,8 +374,8 @@ export class ShallowWrapper<P = {}, S = {}, C = Component> {
      * Find every node in the render tree that matches the provided selector.
      * @param selector The selector to match.
      */
-    find<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
     find<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, never>;
+    find<P2>(component: ComponentType<P2>): ShallowWrapper<P2, any>;
     find(props: EnzymePropSelector): ShallowWrapper<any, any>;
     find(selector: string): ShallowWrapper<HTMLAttributes, any>;
 
@@ -381,8 +383,8 @@ export class ShallowWrapper<P = {}, S = {}, C = Component> {
      * Removes nodes in the current wrapper that do not match the provided selector.
      * @param selector The selector to match.
      */
-    filter<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
     filter<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, never>;
+    filter<P2>(component: ComponentType<P2>): ShallowWrapper<P2, any>;
     filter(props: EnzymePropSelector | string): ShallowWrapper<P, S>;
 
     /**
@@ -394,8 +396,8 @@ export class ShallowWrapper<P = {}, S = {}, C = Component> {
      * Returns a new wrapper with all of the children of the node(s) in the current wrapper. Optionally, a selector
      * can be provided and it will filter the children by this selector.
      */
-    children<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
     children<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, never>;
+    children<P2>(component: ComponentType<P2>): ShallowWrapper<P2, any>;
     children(selector: string): ShallowWrapper<HTMLAttributes, any>;
     children(props?: EnzymePropSelector): ShallowWrapper<any, any>;
 
@@ -425,8 +427,8 @@ export class ShallowWrapper<P = {}, S = {}, C = Component> {
      *
      * Note: can only be called on a wrapper of a single node.
      */
-    parents<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
     parents<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, never>;
+    parents<P2>(component: ComponentType<P2>): ShallowWrapper<P2, any>;
     parents(selector: string): ShallowWrapper<HTMLAttributes, any>;
     parents(props?: EnzymePropSelector): ShallowWrapper<any, any>;
 
@@ -436,8 +438,8 @@ export class ShallowWrapper<P = {}, S = {}, C = Component> {
      *
      * Note: can only be called on a wrapper of a single node.
      */
-    closest<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
     closest<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, never>;
+    closest<P2>(component: ComponentType<P2>): ShallowWrapper<P2, any>;
     closest(props: EnzymePropSelector): ShallowWrapper<any, any>;
     closest(selector: string): ShallowWrapper<HTMLAttributes, any>;
 
@@ -487,8 +489,8 @@ export class ReactWrapper<P = {}, S = {}, C = Component> {
      * Find every node in the render tree that matches the provided selector.
      * @param selector The selector to match.
      */
-    find<P2>(component: ComponentClass<P2>): ReactWrapper<P2, any>;
     find<P2>(statelessComponent: StatelessComponent<P2>): ReactWrapper<P2, never>;
+    find<P2>(component: ComponentType<P2>): ReactWrapper<P2, any>;
     find(props: EnzymePropSelector): ReactWrapper<any, any>;
     find(selector: string): ReactWrapper<HTMLAttributes, any>;
 
@@ -501,16 +503,16 @@ export class ReactWrapper<P = {}, S = {}, C = Component> {
      * Removes nodes in the current wrapper that do not match the provided selector.
      * @param selector The selector to match.
      */
-    filter<P2>(component: ComponentClass<P2>): ReactWrapper<P2, any>;
     filter<P2>(statelessComponent: StatelessComponent<P2>): ReactWrapper<P2, never>;
+    filter<P2>(component: ComponentType<P2>): ReactWrapper<P2, any>;
     filter(props: EnzymePropSelector | string): ReactWrapper<P, S>;
 
     /**
      * Returns a new wrapper with all of the children of the node(s) in the current wrapper. Optionally, a selector
      * can be provided and it will filter the children by this selector.
      */
-    children<P2>(component: ComponentClass<P2>): ReactWrapper<P2, any>;
     children<P2>(statelessComponent: StatelessComponent<P2>): ReactWrapper<P2, never>;
+    children<P2>(component: ComponentType<P2>): ReactWrapper<P2, any>;
     children(selector: string): ReactWrapper<HTMLAttributes, any>;
     children(props?: EnzymePropSelector): ReactWrapper<any, any>;
 
@@ -526,8 +528,8 @@ export class ReactWrapper<P = {}, S = {}, C = Component> {
      *
      * Note: can only be called on a wrapper of a single node.
      */
-    parents<P2>(component: ComponentClass<P2>): ReactWrapper<P2, any>;
     parents<P2>(statelessComponent: StatelessComponent<P2>): ReactWrapper<P2, never>;
+    parents<P2>(component: ComponentType<P2>): ReactWrapper<P2, any>;
     parents(selector: string): ReactWrapper<HTMLAttributes, any>;
     parents(props?: EnzymePropSelector): ReactWrapper<any, any>;
 
@@ -537,8 +539,8 @@ export class ReactWrapper<P = {}, S = {}, C = Component> {
      *
      * Note: can only be called on a wrapper of a single node.
      */
-    closest<P2>(component: ComponentClass<P2>): ReactWrapper<P2, any>;
     closest<P2>(statelessComponent: StatelessComponent<P2>): ReactWrapper<P2, never>;
+    closest<P2>(component: ComponentType<P2>): ReactWrapper<P2, any>;
     closest(props: EnzymePropSelector): ReactWrapper<any, any>;
     closest(selector: string): ReactWrapper<HTMLAttributes, any>;
 
@@ -617,7 +619,7 @@ export class EnzymeAdapter {
 }
 
 /**
- * Configure enzyme to use the correct adapter for the react verstion
+ * Configure enzyme to use the correct adapter for the react version
  * This is enabling the Enzyme configuration with adapters in TS
  */
 export function configure(options: {
diff --git a/types/eslint/eslint-tests.ts b/types/eslint/eslint-tests.ts
index ed211d220e..6d175716b3 100644
--- a/types/eslint/eslint-tests.ts
+++ b/types/eslint/eslint-tests.ts
@@ -539,4 +539,12 @@ ruleTester.run('my-rule', rule, {
     ]
 });
 
+ruleTester.run('simple-valid-test', rule, {
+    valid: [
+        'foo',
+        'bar',
+        { code: 'foo', options: [{ allowFoo: true }] },
+    ]
+});
+
 //#endregion
diff --git a/types/eslint/index.d.ts b/types/eslint/index.d.ts
index 01f39ee83e..f1a585046c 100644
--- a/types/eslint/index.d.ts
+++ b/types/eslint/index.d.ts
@@ -540,7 +540,7 @@ export class RuleTester {
         name: string,
         rule: Rule.RuleModule,
         tests: {
-            valid?: RuleTester.ValidTestCase[];
+            valid?: Array<string | RuleTester.ValidTestCase>;
             invalid?: RuleTester.InvalidTestCase[];
         },
     ): void;
diff --git a/types/espruino/index.d.ts b/types/espruino/index.d.ts
index cb6151e85a..caca393a85 100644
--- a/types/espruino/index.d.ts
+++ b/types/espruino/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Espruino 1.94
-// Project: http://www.espruino.com/
+// Project: http://www.espruino.com/, https://github.com/espruino/espruinotools
 // Definitions by: Stanislav Berkov <https://github.com/stasberkov>
 //                 Jurand Niemczycki <https://github.com/createdbyjurand>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
diff --git a/types/eth-sig-util/eth-sig-util-tests.ts b/types/eth-sig-util/eth-sig-util-tests.ts
new file mode 100644
index 0000000000..33f5840d05
--- /dev/null
+++ b/types/eth-sig-util/eth-sig-util-tests.ts
@@ -0,0 +1,98 @@
+import * as util from 'eth-sig-util';
+
+const hex32 = '1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef';
+const buffer32 = Buffer.from(hex32, 'hex');
+
+util.concatSig(28, buffer32, buffer32);
+util.normalize(hex32);
+util.normalize(42);
+
+////////////////////////////////////////////////////////////////////////////////
+// Personal message signing utils
+
+const messageSig = util.personalSign(buffer32, { data: 'test data' });
+util.recoverPersonalSignature({ data: 'test data', sig: messageSig });
+util.extractPublicKey({ data: 'test data', sig: messageSig });
+
+////////////////////////////////////////////////////////////////////////////////
+// EIP-712 legacy draft utils
+
+const legacyTypedData = [{
+    type: 'uint32',
+    name: 'testValue',
+    value: 42,
+}, {
+    type: 'string',
+    name: 'testName',
+    value: 'test value',
+}];
+util.typedSignatureHash(legacyTypedData);
+const typedSigLegacy = util.signTypedDataLegacy(buffer32, { data: legacyTypedData });
+util.recoverTypedSignatureLegacy({ data: legacyTypedData, sig: typedSigLegacy });
+
+////////////////////////////////////////////////////////////////////////////////
+// Elliptic curve encryption utils
+
+util.getEncryptionPublicKey(hex32);
+const encPubkey = util.getEncryptionPublicKey(buffer32);
+const encMessage = util.encrypt(encPubkey, { data: 'test data' }, 'x25519-xsalsa20-poly1305');
+util.decrypt(encMessage, buffer32);
+util.decrypt(encMessage, hex32);
+const encData = util.encryptSafely(encPubkey, { data: legacyTypedData }, 'x25519-xsalsa20-poly1305');
+util.decryptSafely(encData, buffer32);
+util.decryptSafely(encData, hex32);
+
+////////////////////////////////////////////////////////////////////////////////
+// EIP-712 current draft utils
+
+// Sample data from the official EIP-712 example:
+// https://github.com/ethereum/EIPs/blob/master/assets/eip-712/Example.js
+const typedData = {
+    types: {
+        EIP712Domain: [
+            { name: 'name', type: 'string' },
+            { name: 'version', type: 'string' },
+            { name: 'chainId', type: 'uint256' },
+            { name: 'verifyingContract', type: 'address' },
+        ],
+        Person: [
+            { name: 'name', type: 'string' },
+            { name: 'wallet', type: 'address' }
+        ],
+        Mail: [
+            { name: 'from', type: 'Person' },
+            { name: 'to', type: 'Person' },
+            { name: 'contents', type: 'string' }
+        ],
+    },
+    primaryType: 'Mail',
+    domain: {
+        name: 'Ether Mail',
+        version: '1',
+        chainId: 1,
+        verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC',
+    },
+    message: {
+        from: {
+            name: 'Cow',
+            wallet: '0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826',
+        },
+        to: {
+            name: 'Bob',
+            wallet: '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB',
+        },
+        contents: 'Hello, Bob!',
+    },
+};
+const typedMessage = typedData.message;
+const types = typedData.types;
+const primaryType = typedData.primaryType;
+util.TypedDataUtils.encodeData(primaryType, typedMessage, types);
+util.TypedDataUtils.encodeType(primaryType, types);
+util.TypedDataUtils.findTypeDependencies(primaryType, types);
+util.TypedDataUtils.hashStruct(primaryType, typedMessage, types);
+util.TypedDataUtils.hashType(primaryType, types);
+util.TypedDataUtils.sanitizeData(typedData);
+util.TypedDataUtils.sign(typedData);
+const typedSig = util.signTypedData(buffer32, { data: typedData });
+util.recoverTypedSignature({ data: typedData, sig: typedSig });
diff --git a/types/eth-sig-util/index.d.ts b/types/eth-sig-util/index.d.ts
new file mode 100644
index 0000000000..61369ddc86
--- /dev/null
+++ b/types/eth-sig-util/index.d.ts
@@ -0,0 +1,184 @@
+// Type definitions for eth-sig-util 2.1
+// Project: https://github.com/MetaMask/eth-sig-util#readme
+// Definitions by: Artur Kozak <https://github.com/quezak>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+/**
+ * @returns a 0x-prefixed 130-byte signature.
+ */
+export function concatSig(v: number, r: Buffer, s: Buffer): string;
+
+/**
+ * @param input a number or a hex string (either 0x-prefixed or not).
+ * @returns a 0x-prefixed hex string.
+ */
+export function normalize(input: string | number): string;
+
+////////////////////////////////////////////////////////////////////////////////
+// Personal message signing utils
+
+export interface MessageData<T = any> { data: T; }
+
+export interface SignedMessageData<T = any> extends MessageData<T> { sig: string; }
+
+export function personalSign(privateKey: Buffer, message: MessageData): string;
+
+export function recoverPersonalSignature(message: SignedMessageData): string;
+
+export function extractPublicKey(message: SignedMessageData): string;
+
+////////////////////////////////////////////////////////////////////////////////
+// EIP-712 legacy draft utils
+
+export interface EIP712LegacyField {
+    type: string;
+    name: string;
+    value: any;
+}
+
+export type EIP712LegacyData = ReadonlyArray<EIP712LegacyField>;
+
+export function typedSignatureHash(data: EIP712LegacyData): string;
+
+export function signTypedDataLegacy(
+    privateKey: Buffer,
+    message: MessageData<EIP712LegacyData>,
+): string;
+
+export function recoverTypedSignatureLegacy(
+    message: SignedMessageData<EIP712LegacyData>,
+): string;
+
+////////////////////////////////////////////////////////////////////////////////
+// Elliptic curve encryption utils
+
+export type EncryptionType = 'x25519-xsalsa20-poly1305';
+
+export interface EncryptedData {
+    version: EncryptionType;
+    nonce: string;
+    ephemPublicKey: string;
+    ciphertext: string;
+}
+
+/**
+ * @param receiverPublicKey a 32-byte base64 string, e.g. from @see `getEncryptionPublicKey`
+ * @param data a utf-8 string to be encrypted
+ * @param version one of the supported encryption schemes, @see `EncryptionType`
+ */
+export function encrypt(
+    receiverPublicKey: string,
+    data: MessageData<string>,
+    version: EncryptionType,
+): EncryptedData;
+
+/**
+ * Same as @see `encrypt`, but encrypts a JSON object.
+ */
+export function encryptSafely(
+    receiverPublicKey: string,
+    data: MessageData,
+    version: EncryptionType,
+): EncryptedData;
+
+/**
+ * @param encryptedData result of @see `encrypt`.
+ * @param receiverPrivateKey should be a 32-byte Buffer or *not* 0x-prefixed hex string.
+ */
+export function decrypt(
+    encryptedData: EncryptedData,
+    receiverPrivateKey: string | Buffer,
+): string;
+
+/**
+ * @param encryptedData result of @see `encryptSafely`.
+ * @param receiverPrivateKey should be a 32-byte Buffer or *not* 0x-prefixed hex string.
+ */
+export function decryptSafely(
+    encryptedData: EncryptedData,
+    receiverPrivateKey: string | Buffer,
+): any;
+
+/**
+ * @param privateKey should be a 32-byte Buffer or *not* 0x-prefixed hex string.
+ * @returns a 32-byte public key as a base64 string.
+ */
+export function getEncryptionPublicKey(privateKey: string | Buffer): string;
+
+////////////////////////////////////////////////////////////////////////////////
+// EIP-712 current draft utils
+
+export interface EIP712TypeProperty {
+    name: string;
+    type: string;
+}
+
+/**
+ * Maps type name to an array describing its properties' types.
+ * Should include the `EIP712Domain` struct description.
+ */
+export interface EIP712Types {
+    [name: string]: ReadonlyArray<EIP712TypeProperty>;
+}
+
+export interface EIP712Message {
+    [key: string]: any;
+}
+
+/**
+ * The standard requires to use at least one of these fields.
+ * @see https://github.com/ethereum/EIPs/blob/master/EIPS/eip-712.md#definition-of-domainseparator
+ */
+export interface EIP712Domain {
+    name?: string;
+    version?: string;
+    chainId?: string | number;
+    verifyingContract?: string;
+    salt?: string;
+}
+
+export interface EIP712TypedData {
+    types: EIP712Types;
+    primaryType: string;
+    domain: EIP712Domain;
+    message: EIP712Message;
+}
+
+export namespace TypedDataUtils {
+    function encodeData(primaryType: string, data: EIP712Message, types: EIP712Types): Buffer;
+
+    function encodeType(primaryType: string, types: EIP712Types): string;
+
+    function findTypeDependencies(
+        primaryType: string, types: EIP712Types,
+    ): string[];
+
+    function hashStruct(primaryType: string, data: EIP712Message, types: EIP712Types): Buffer;
+
+    function hashType(primaryType: string, types: EIP712Types): Buffer;
+
+    function sanitizeData(data: EIP712TypedData): EIP712TypedData;
+
+    /**
+     * @returns hash of the typed data as defined by EIP712 (contrary to the function's name)
+     * @see https://github.com/ethereum/EIPs/blob/master/EIPS/eip-712.md#specification
+     */
+    function sign(data: EIP712TypedData): Buffer;
+}
+
+/**
+ * A JSON Schema object equivalent to the EIP712Message type.
+ */
+export const TYPED_MESSAGE_SCHEMA: any;
+
+export function signTypedData(
+    privateKey: Buffer,
+    msgParams: MessageData<EIP712TypedData>,
+): string;
+
+export function recoverTypedSignature(
+    msgParams: SignedMessageData<EIP712TypedData>,
+): string;
diff --git a/types/eth-sig-util/tsconfig.json b/types/eth-sig-util/tsconfig.json
new file mode 100644
index 0000000000..18e346c208
--- /dev/null
+++ b/types/eth-sig-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",
+        "eth-sig-util-tests.ts"
+    ]
+}
diff --git a/types/eth-sig-util/tslint.json b/types/eth-sig-util/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/eth-sig-util/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 9208712d59..98ea94a6fa 100644
--- a/types/ethereumjs-abi/index.d.ts
+++ b/types/ethereumjs-abi/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ethereumjs-abi 0.6
-// Project: https://github.com/ethereumjs/ethereumjs-abi
+// Project: https://github.com/ethereumjs/ethereumjs-abi, https://github.com/axic/ethereumjs-abi
 // Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/eureka-js-client/eureka-js-client-tests.ts b/types/eureka-js-client/eureka-js-client-tests.ts
index f9382655cb..5e4329e50a 100644
--- a/types/eureka-js-client/eureka-js-client-tests.ts
+++ b/types/eureka-js-client/eureka-js-client-tests.ts
@@ -10,13 +10,13 @@ const client = new Eureka({
     port: 8080,
     vipAddress: 'jq.test.something.com',
     dataCenterInfo: {
-      name: 'MyOwn',
-    },
+      name: 'MyOwn'
+    }
   },
   eureka: {
     // eureka server host / port
     host: '192.168.99.100',
-    port: 32768,
+    port: 32768
   }
 });
 
@@ -34,13 +34,13 @@ const newerClient = new Eureka({
     vipAddress: 'jq.test.something.com',
     dataCenterInfo: {
       '@class': 'com.netflix.appinfo.InstanceInfo$DefaultDataCenterInfo',
-      name: 'MyOwn',
-    },
+      name: 'MyOwn'
+    }
   },
   eureka: {
     // eureka server host / port
     host: '192.168.99.100',
-    port: 32768,
+    port: 32768
   }
 });
 
@@ -49,6 +49,17 @@ const ymlInitClient = new Eureka({
   filename: 'eureka-config'
 });
 
+// example using middleware to set-up HTTP authentication (https://www.npmjs.com/package/eureka-js-client#providing-custom-request-middleware)
+const middlewareClient = new Eureka({
+  requestMiddleware: (requestOpts, done) => {
+    requestOpts.auth = {
+      user: 'username',
+      password: 'somepassword'
+    };
+    done(requestOpts);
+  }
+});
+
 // Test callbacks
 newerClient.start((err: Error) => {});
 newerClient.start(() => {});
diff --git a/types/eureka-js-client/index.d.ts b/types/eureka-js-client/index.d.ts
index ff63b02340..f6a9ec8a85 100644
--- a/types/eureka-js-client/index.d.ts
+++ b/types/eureka-js-client/index.d.ts
@@ -3,10 +3,11 @@
 // Definitions by: Ilko Hoffmann <https://github.com/Schnillz>
 //                 Karl O. <https://github.com/karl-run>
 //                 Tom Barton <https://github.com/tombarton>
+//                 Josh Sullivan <https://github.com/jpsullivan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export class Eureka {
-    constructor(config: EurekaClient.EurekaConfig | EurekaClient.EurekaYmlConfig)
+    constructor(config: EurekaClient.EurekaConfig | EurekaClient.EurekaYmlConfig | EurekaClient.EurekaMiddlewareConfig);
     start(cb?: (err: Error, ...rest: any[]) => void): void;
     stop(cb?: (err: Error, ...rest: any[]) => void): void;
     getInstancesByAppId(appId: string): EurekaClient.EurekaInstanceConfig[];
@@ -19,6 +20,7 @@ export namespace EurekaClient {
     type DataCenterName = 'Netflix' | 'Amazon' | 'MyOwn';
 
     interface EurekaConfig {
+        requestMiddleware?: EurekaMiddlewareConfig;
         instance: EurekaInstanceConfig;
         eureka: EurekaClientConfig;
     }
@@ -80,8 +82,11 @@ export namespace EurekaClient {
         cwd: string;
         filename?: string;
     }
+    interface EurekaMiddlewareConfig {
+        requestMiddleware: (requestOpts: any, done: (opts: any) => void) => void;
+    }
     interface LegacyPortWrapper {
-        '$': number;
+        $: number;
         '@enabled': boolean;
     }
     interface PortWrapper {
diff --git a/types/exceljs/index.d.ts b/types/exceljs/index.d.ts
index 2d8c482cf6..df863c981b 100644
--- a/types/exceljs/index.d.ts
+++ b/types/exceljs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for exceljs 0.5
-// Project: https://github.com/guyonroche/exceljs
+// Project: https://github.com/exceljs/exceljs
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 //                 Ali Taheri Moghaddar <https://github.com/alitaheri>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/expect-puppeteer/index.d.ts b/types/expect-puppeteer/index.d.ts
index b77bc948bd..018e342ce8 100644
--- a/types/expect-puppeteer/index.d.ts
+++ b/types/expect-puppeteer/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Josh Goldberg <https://github.com/JoshuaKGoldberg>
 //                 Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
 /// <reference types="jest" />
 
diff --git a/types/expect/index.d.ts b/types/expect/index.d.ts
index 0e7ea18e91..38a5ff6747 100644
--- a/types/expect/index.d.ts
+++ b/types/expect/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Expect 1.20
-// Project: https://github.com/mjackson/expect
+// Project: https://github.com/facebook/jest
 // Definitions by: Justin Reidy <https://github.com/jmreidy>, Risto Keravuori <https://github.com/merrywhether>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/expired/expired-tests.ts b/types/expired/expired-tests.ts
new file mode 100644
index 0000000000..b03818ff13
--- /dev/null
+++ b/types/expired/expired-tests.ts
@@ -0,0 +1,29 @@
+import expired = require('expired');
+
+const headers = `
+Age: 0
+Cache-Control: public, max-age=300
+Content-Encoding: gzip
+Content-Type: application/json;charset=utf-8
+Date: Fri, 23 Dec 2016 05:50:31 GMT
+Last-Modified: Fri, 23 Dec 2016 05:23:23 GMT`;
+
+expired(headers); // $ExpectType boolean
+expired.in(headers); // $ExpectType number
+expired.on(headers); // $ExpectType Date
+
+const parsedHeaders = {
+    age: '0',
+    'cache-control': 'public, max-age=300',
+    'content-encoding': 'gzip',
+    'content-type': 'application/json;charset=utf-8',
+    date: 'Fri, 23 Dec 2016 05:50:31 GMT',
+    'last-modified': 'Fri, 23 Dec 2016 05:23:23 GMT',
+};
+
+expired(parsedHeaders); // $ExpectType boolean
+
+const date = new Date();
+
+expired(headers, date); // $ExpectType boolean
+expired.in(headers, date); // $ExpectType number
diff --git a/types/expired/index.d.ts b/types/expired/index.d.ts
new file mode 100644
index 0000000000..2ff9fad895
--- /dev/null
+++ b/types/expired/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for expired 1.3
+// Project: https://github.com/lukechilds/expired
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = expired;
+
+declare const expired: expired;
+
+interface expired {
+    /**
+     * @returns A boolean relating to whether the resource has expired or not.
+     * `true` means it's expired, `false` means it's fresh.
+     */
+    (headers: expired.Headers, compareWith?: Date): boolean;
+    /**
+     * @returns The amount of milliseconds from the current date until the resource will expire.
+     * If the resource has already expired it will return a negative integer.
+     */
+    in(headers: expired.Headers, compareWith?: Date): number;
+    /**
+     * @returns A JavaScript `Date` object for the date the resource will expire.
+     */
+    on(headers: expired.Headers): Date;
+}
+
+declare namespace expired {
+    type Headers = string | { [header: string]: string | string[] | undefined };
+}
diff --git a/types/expired/tsconfig.json b/types/expired/tsconfig.json
new file mode 100644
index 0000000000..4602fb95b1
--- /dev/null
+++ b/types/expired/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "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-tests.ts"
+    ]
+}
diff --git a/types/expired/tslint.json b/types/expired/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/expired/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index 62a7dcbb91..10045e57e6 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Text, AccessibilityInfo } from 'react-native';
+import { Text } from 'react-native';
 
 import {
     Accelerometer,
@@ -154,7 +154,6 @@ Audio.setAudioModeAsync({
     interruptionModeIOS: 2,
     interruptionModeAndroid: 1,
     allowsRecordingIOS: true,
-    playThroughEarpieceAndroid: false
 });
 Audio.setIsEnabledAsync(true);
 
@@ -233,7 +232,7 @@ Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE === 3;
 Audio.RECORDING_OPTIONS_PRESET_HIGH_QUALITY;
 Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY;
 async () => {
-    const result = await Audio.Sound.create({uri: 'uri'}, {
+    const result = await Audio.Sound.createAsync({uri: 'uri'}, {
         volume: 0.55,
         rate: 16.5
     }, null, true);
@@ -262,13 +261,13 @@ async () => {
     <AppLoading />
 );
 
-const barCodeScannedCallback = () => {};
+const barcodeReadCallback = () => {};
 () => (
     <BarCodeScanner
         type="front"
         torchMode="off"
         barCodeTypes={[BarCodeScanner.Constants.BarCodeType.aztec]}
-        onBarCodeScanned={barCodeScannedCallback} />
+        onBarCodeScanned={barcodeReadCallback} />
 );
 
 () => (
@@ -408,7 +407,7 @@ async () => {
 };
 
 async () => {
-    const result = await ImageManipulator.manipulate('url', [
+    const result = await ImageManipulator.manipulateAsync('url', [
         { rotate: 90 },
         { resize: { width: 300 } },
         { resize: { height: 300 } },
@@ -963,7 +962,7 @@ const userLocationCallback = (event: EventUserLocation) =>  console.log(event);
 // #endregion
 
 async () => {
-    const updateEventListener: Updates.UpdateEventListener = ({ type, manifest, message }) => {
+    const updateEventListener: Updates.UpdateEventListener = ({ type }) => {
         switch (type) {
             case Updates.EventType.DOWNLOAD_STARTED:
             case Updates.EventType.DOWNLOAD_PROGRESS:
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 1b24c3151c..8b488f9b59 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for expo 31.0
-// Project: https://github.com/expo/expo-sdk
+// Type definitions for expo 32.0
+// Project: https://github.com/expo/expo/tree/master/packages/expo
 // Definitions by: Konstantin Kai <https://github.com/KonstantinKai>
 //                 Martynas Kadiša <https://github.com/martynaskadisa>
 //                 Jan Aagaard <https://github.com/janaagaard75>
@@ -15,6 +15,7 @@
 //                 Pavel Ihm <https://github.com/ihmpavel>
 //                 Bartosz Dotryw <https://github.com/burtek>
 //                 Jason Killian <https://github.com/jkillian>
+//                 Satyajit Sahoo <https://github.com/satya164>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -22,11 +23,21 @@ export * from 'react-native-maps';
 export { default as MapView } from 'react-native-maps';
 
 import { EventSubscription } from 'fbemitter';
-import { Component, ComponentClass, ComponentType, Ref } from 'react';
-import { ImageRequireSource, ImageURISource, LinkingStatic as ReactNativeLinkingStatic, StyleProp, ViewProps, ViewStyle } from 'react-native';
+import { Component, ComponentClass, Ref, ComponentType } from 'react';
+import {
+    ColorPropType,
+    ImageRequireSource,
+    ImageURISource,
+    LinkingStatic as ReactNativeLinkingStatic,
+    NativeEventEmitter,
+    ViewProps,
+    ViewStyle,
+    Permission,
+    StyleProp
+} from 'react-native';
 
 export type Axis = number;
-export type BarCodeScannedCallback = (params: { type: string; data: string; }) => void;
+export type BarCodeScannedCallback = (result: { type: string; data: string; }) => void;
 export type Md5 = string;
 export type Orientation = 'portrait' | 'landscape';
 export type RequireSource = ImageRequireSource;
@@ -401,9 +412,6 @@ export namespace Audio {
 
         /** an enum selecting how your experience’s audio should interact with the audio from other apps on Android: */
         interruptionModeAndroid: InterruptionModeAndroid;
-
-        /** Boolean selecting if audio should go to earpiece (only on Android). */
-        playThroughEarpieceAndroid: boolean;
     }
 
     function setIsEnabledAsync(value: boolean): Promise<void>;
@@ -420,7 +428,7 @@ export namespace Audio {
          * - `sound`: The newly created and loaded Sound object.
          * - `status`: The PlaybackStatus of the Sound object. See the AV documentation for further information.
          */
-        static create(
+        static createAsync(
             /**
              * The source of the sound. The following forms are supported:
              *
@@ -565,7 +573,7 @@ export interface PlaybackStatusToSet {
     volume?: number;
 }
 
-export type PlaybackSource = RequireSource | { uri: string, headers?: { [header: string]: string }, overrideFileExtensionAndroid?: string } | Asset;
+export type PlaybackSource = RequireSource | { uri: string } | Asset;
 
 export class PlaybackObject {
     /**
@@ -769,10 +777,10 @@ export namespace Brightness {
  * Camera
  */
 export interface PictureOptions {
-    quality?: number;
-    base64?: boolean;
-    exif?: boolean;
-    onPictureSaved?: (data: PictureResponse) => void;
+  quality?: number;
+  base64?: boolean;
+  exif?: boolean;
+  onPictureSaved?: (data: PictureResponse) => void;
 }
 
 export interface PictureResponse {
@@ -797,24 +805,28 @@ export class CameraObject {
 }
 
 export interface CameraProps extends ViewProps {
-    autoFocus?: string | number | boolean;
-    barCodeTypes?: Array<string | number>;
-    faceDetectionClassifications?: number;
-    faceDetectionLandmarks?: number;
-    faceDetectionMode?: number;
-    flashMode?: string | number;
+    zoom?: number;
+    ratio?: string;
     /** 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;
-    onBarCodeScanned?: BarCodeScannedCallback;
+    type?: number | string;
     onCameraReady?: () => void;
+    useCamera2Api?: boolean;
+    flashMode?: number | string;
+    whiteBalance?: number | string;
+    autoFocus?: string | boolean | number;
+    pictureSize?: string;
+    videoStabilizationMode?: number;
+    onMountError?: (error: { message: string }) => void;
+    barCodeScannerSettings?: { barCodeTypes?: Array<string | number>; };
+    onBarCodeScanned?: BarCodeScannedCallback;
+    faceDetectorSettings?: {
+        mode?: number;
+        runClassifications?: number;
+        detectLandmarks?: number;
+    };
     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 {
@@ -1540,15 +1552,62 @@ export namespace FacebookAds {
         setMediaCachePolicy(cachePolicy: MediaCachePolicy): void;
     }
 
-    function withNativeAd(component: Component<{
-        icon?: string;
-        coverImage?: string;
-        title?: string;
-        subtitle?: string;
-        description?: string;
-        callToActionText?: string;
+    interface NativeAd {
+        /**
+         * The headline the advertiser entered when they created their ad. This is usually the ad's main
+         * title.
+         */
+        headline?: string;
+
+        /**
+         * The link description which is additional information that the advertiser may have entered
+         */
+        linkDescription?: string;
+
+        /**
+         * The name of the Facebook Page or mobile app that represents the business running the ad
+         */
+        advertiserName?: string;
+
+        /**
+         * The ad's social context, such as, "Over half a million users"
+         */
         socialContext?: string;
-    }>): Component<{ adsManager: NativeAdsManager }, { ad: any, canRequestAds: boolean }>;
+
+        /**
+         * The call-to-action phrase of the ad, such as, "Install Now"
+         */
+        callToActionText?: string;
+
+        /**
+         * The body text, truncated to 90 characters, that contains the text the advertiser entered when
+         * they created their ad to tell people what the ad promotes
+         */
+        bodyText?: string;
+
+        /**
+         * The word "ad", translated into the viewer's language
+         */
+        adTranslation?: string;
+
+        /**
+         * The word "promoted", translated into the viewer's language
+         */
+        promotedTranslation?: string;
+
+        /**
+         * The word "sponsored", translated into the viewer's language
+         */
+        sponsoredTranslation?: string;
+    }
+
+    function withNativeAd<P>(component: Component<P & { nativeAd: NativeAd }>): Component<
+        {
+            adsManager: NativeAdsManager,
+            onAdLoaded?: ((ad: NativeAd) => void) | null;
+        } & P,
+        { ad: NativeAd | null, canRequestAds: boolean }
+    >;
 
     /**
      * Banner View
@@ -1564,6 +1623,16 @@ export namespace FacebookAds {
 
     class BannerView extends Component<BannerViewProps> { }
 
+    type AdTriggerViewProps<P> = {
+        renderInteractiveComponent?: (props: P) => React.ReactElement<P>;
+    } & P;
+
+    class AdTriggerView<P> extends Component<AdTriggerViewProps<P>> { }
+
+    class AdIconView extends Component { }
+
+    class AdMediaView extends Component { }
+
     /**
      * Ad Settings
      */
@@ -1657,6 +1726,8 @@ export namespace FaceDetector {
  * FileSystem
  */
 export namespace FileSystem {
+    type EncodingType = "utf8" | "base64";
+
     type FileInfo = {
         exists: true;
         isDirectory: boolean;
@@ -1669,6 +1740,16 @@ export namespace FileSystem {
         isDirectory: false;
     };
 
+    interface ReadingOptions {
+        encoding?: EncodingType;
+        position?: number;
+        length?: number;
+    }
+
+    interface WritingOptions {
+        encoding?: EncodingType;
+    }
+
     interface DownloadResult {
         uri: string;
         status: number;
@@ -1680,8 +1761,8 @@ export namespace FileSystem {
     const cacheDirectory: string;
 
     function getInfoAsync(fileUri: string, options?: { md5?: string, size?: boolean; }): Promise<FileInfo>;
-    function readAsStringAsync(fileUri: string): Promise<string>;
-    function writeAsStringAsync(fileUri: string, contents: string): Promise<void>;
+    function readAsStringAsync(fileUri: string, options?: ReadingOptions): Promise<string>;
+    function writeAsStringAsync(fileUri: string, contents: string, options?: WritingOptions): Promise<void>;
     function deleteAsync(fileUri: string, options?: { idempotent: boolean; }): Promise<void>;
     function moveAsync(options: { from: string, to: string; }): Promise<void>;
     function copyAsync(options: { from: string, to: string; }): Promise<void>;
@@ -1742,6 +1823,14 @@ export namespace LocalAuthentication {
         error: string
     };
 
+    interface AuthenticationTypeType {
+        FINGERPRINT: number;
+        FACIAL_RECOGNITION: number;
+    }
+
+    /** Determine the auhentication types supported on the device. */
+    function supportedAuthenticationTypesAsync(): Promise<AuthenticationTypeType[]>;
+
     /** Determine whether a face or fingerprint scanner is available on the device. */
     function hasHardwareAsync(): Promise<boolean>;
 
@@ -1887,8 +1976,6 @@ export namespace ImageManipulator {
         format?: 'jpeg' | 'png';
     }
 
-    function manipulate(uri: string, actions: Action[], saveOptions?: SaveOptions): Promise<ImageResult>;
-
     function manipulateAsync(uri: string, actions: Action[], saveOptions?: SaveOptions): Promise<ImageResult>;
 }
 
@@ -2075,9 +2162,10 @@ export const Linking: LinkingStatic;
  */
 export namespace Location {
     interface LocationOptions {
-        enableHighAccuracy?: boolean;
+        accuracy: number;
         timeInterval?: number;
         distanceInterval?: number;
+        timeout?: number;
     }
 
     interface LocationProps {
@@ -2120,6 +2208,20 @@ export namespace Location {
         name: string;
     }
 
+    interface LocationTaskOptions {
+        accuracy?: number;
+        showsBackgroundLocationIndicator?: boolean;
+    }
+
+    interface Region {
+        identifier?: string;
+        latitude: number;
+        longitude: number;
+        radius: number;
+        notifyOnEnter?: boolean;
+        notifyOnExit?: boolean;
+    }
+
     type LocationCallback = (data: LocationData) => void;
 
     function getCurrentPositionAsync(options: LocationOptions): Promise<LocationData>;
@@ -2127,8 +2229,16 @@ export namespace Location {
     function getProviderStatusAsync(): Promise<ProviderStatus>;
     function getHeadingAsync(): Promise<HeadingStatus>;
     function watchHeadingAsync(callback: (status: HeadingStatus) => void): EventSubscription;
-    function geocodeAsync(address: string): Promise<Coords[]>;
+    function geocodeAsync(address: string): Promise<Coords>;
     function reverseGeocodeAsync(location: LocationProps): Promise<GeocodeData[]>;
+    function requestPermissionsAsync(): Promise<void>;
+    function hasServicesEnabledAsync(): Promise<boolean>;
+    function startgeocodUpdatesAsync(taskName: string, options: LocationTaskOptions): Promise<void>;
+    function stopLocationUpdatesAsync(taskName: string): Promise<void>;
+    function hasStartedLocationUpdatesAsync(taskName: string): Promise<boolean>;
+    function startGeofencingAsync(taskName: string, regions: Region[]): Promise<void>;
+    function stopGeofencingAsync(taskName: string): Promise<void>;
+    function hasStartedGeofencingAsync(taskName: string): Promise<boolean>;
     function setApiKey(key: string): void;
 }
 
@@ -2166,46 +2276,72 @@ export namespace Notifications {
             sound?: boolean
         };
         android?: {
-            sound?: boolean;
+            channelId?: string;
             icon?: string;
             color?: string;
-            priority?: 'min' | 'low' | 'high' | 'max';
             sticky?: boolean;
-            vibrate?: boolean | number[];
-            link?: string;
         };
     }
 
-    interface SchedulingOptions {
-        time: Date | number;
-        repeat?: 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year';
-        intervalMs?: number;
-    }
-
-    interface ChannelAndroid {
-        name: string;
-        description?: string;
-        sound?: boolean;
-        priority?: 'min' | 'low' | 'default' | 'high' | 'max';
-        vibrate?: boolean | number[];
-        badge?: boolean;
-    }
-
     type LocalNotificationId = string | number;
 
-    function addListener(listener: (notification: Notification) => any): EventSubscription;
+    interface Channel {
+        name: string;
+        description?: string;
+        priority?: string;
+        sound?: boolean;
+        vibrate?: boolean | number[];
+        badge?: boolean;
+    }
+
+    interface ActionType {
+        actionId: string;
+        buttonTitle: string;
+        isDestructive?: boolean;
+        isAuthenticationRequired?: boolean;
+        textInput?: {
+          submitButtonTitle: string;
+          placeholder: string;
+        };
+    }
+
+    function createCategoryAsync(categoryId: string, actions: ActionType[]): Promise<void>;
+    function deleteCategoryAsync(categoryId: string): Promise<void>;
     function getExpoPushTokenAsync(): Promise<string>;
-    function presentLocalNotificationAsync(localNotification: LocalNotification): Promise<LocalNotificationId>;
-    function scheduleLocalNotificationAsync(
-        localNotification: LocalNotification,
-        schedulingOptions: SchedulingOptions
-    ): Promise<LocalNotificationId>;
-    function dismissNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
-    function dismissAllNotificationsAsync(): Promise<void>;
-    function cancelScheduledNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
-    function cancelAllScheduledNotificationsAsync(): Promise<void>;
-    function createChannelAndroidAsync(id: string, channel: ChannelAndroid): Promise<void>;
+    function getDevicePushTokenAsync(config: {
+        gcmSenderId?: string;
+    }): Promise<{ type: string; data: string }>;
+    function createChannelAndroidAsync(id: string, channel: Channel): Promise<void>;
     function deleteChannelAndroidAsync(id: string): Promise<void>;
+
+    /* Shows a notification instantly */
+    function presentLocalNotificationAsync(
+        notification: LocalNotification
+    ): Promise<LocalNotificationId>;
+
+    /** Schedule a notification at a later date */
+    function scheduleLocalNotificationAsync(
+        notification: LocalNotification,
+        options?: {
+          time?: Date | number;
+          repeat?: 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year';
+          intervalMs?: number;
+        }
+    ): Promise<LocalNotificationId>;
+
+    /** Dismiss currently shown notification with ID (Android only) */
+    function dismissNotificationAsync(notificationId: LocalNotificationId): Promise<void>;
+
+    /** Dismiss all currently shown notifications (Android only) */
+    function dismissAllNotificationsAsync(): Promise<void>;
+
+    /** Cancel scheduled notification notification with ID */
+    function cancelScheduledNotificationAsync(notificationId: LocalNotificationId): Promise<void>;
+
+    /** Cancel all scheduled notifications */
+    function cancelAllScheduledNotificationsAsync(): Promise<void>;
+
+    function addListener(listener: (notification: Notification) => any): EventSubscription;
     function getBadgeNumberAsync(): Promise<number>;
     function setBadgeNumberAsync(number: number): Promise<void>;
 }
@@ -2332,11 +2468,14 @@ export namespace Segment {
     function identify(userId: string): void;
     function identifyWithTraits(userId: string, traits: object): void;
     function track(event: string): void;
+    function alias(newId: string, options?: { [key: string]: any }): Promise<boolean>;
     function reset(): void;
     function trackWithProperties(event: string, properties: object): void;
     function screen(screenName: string): void;
     function screenWithProperties(screenName: string, properties: object): void;
     function flush(): void;
+    function getEnabledAsync(): void;
+    function setEnabledAsync(enabled: boolean): void;
 }
 
 /**
@@ -2350,7 +2489,7 @@ export namespace Speech {
         onStart?: () => void;
         onStopped?: () => void;
         onDone?: () => void;
-        onError?: (error: string) => void;
+        onError?: (error: Error) => void;
     }
 
     function speak(text: string, options?: SpeechOptions): void;
@@ -2389,7 +2528,7 @@ export namespace SQLite {
 
     interface ResultSet {
         insertId: number;
-        rowAffected: number;
+        rowsAffected: number;
         rows: {
             length: number;
             item: (index: number) => any;
@@ -2451,6 +2590,8 @@ export interface SvgCommonProps {
 export interface SvgRectProps extends SvgCommonProps {
     width: number | string;
     height: number | string;
+    rx?: number | string;
+    ry?: number | string;
 }
 
 export interface SvgCircleProps extends SvgCommonProps {
@@ -2561,13 +2702,14 @@ export class Svg extends Component<{ width: number, height: number, viewBox?: st
  * Take Snapshot
  */
 export function takeSnapshotAsync(
-    view?: (number | React.ReactElement<any>),
+    node: number | React.ReactElement | React.RefObject<any>,
     options?: {
-        width?: number,
-        height?: number,
-        format?: 'png' | 'jpg' | 'jpeg' | 'webm',
-        quality?: number,
-        result?: 'file' | 'base64' | 'data-uri',
+        width?: number;
+        height?: number;
+        format: 'png' | 'jpg' | 'raw' | 'webm';
+        quality: number;
+        snapshotContentContainer: boolean;
+        result: "tmpfile" | "base64" | "data-uri" | "zip-base64";
     }
 ): Promise<string>;
 
diff --git a/types/expo/v23/index.d.ts b/types/expo/v23/index.d.ts
index b5c327f6a1..34f589c187 100644
--- a/types/expo/v23/index.d.ts
+++ b/types/expo/v23/index.d.ts
@@ -1517,7 +1517,7 @@ export class RadialGradient extends Component<SvgCommonProps> { }
  * Take Snapshot
  */
 export function takeSnapshotAsync(
-    view?: (number | React.ReactElement<any>),
+    view?: (number | React.ReactElement),
     options?: {
         width?: number,
         height?: number,
diff --git a/types/expo/v24/index.d.ts b/types/expo/v24/index.d.ts
index 35d1e9be92..aa348eb80d 100644
--- a/types/expo/v24/index.d.ts
+++ b/types/expo/v24/index.d.ts
@@ -1949,6 +1949,8 @@ export interface SvgCommonProps {
 export interface SvgRectProps extends SvgCommonProps {
     width: number | string;
     height: number | string;
+    rx?: number | string;
+    ry?: number | string;
 }
 
 export interface SvgCircleProps extends SvgCommonProps {
@@ -2056,7 +2058,7 @@ export class Svg extends Component<{ width: number, height: number }> {
  * Take Snapshot
  */
 export function takeSnapshotAsync(
-    view?: (number | React.ReactElement<any>),
+    view?: (number | React.ReactElement),
     options?: {
         width?: number,
         height?: number,
diff --git a/types/expo/v25/index.d.ts b/types/expo/v25/index.d.ts
index 766c055911..d65cd76913 100644
--- a/types/expo/v25/index.d.ts
+++ b/types/expo/v25/index.d.ts
@@ -1978,6 +1978,8 @@ export interface SvgCommonProps {
 export interface SvgRectProps extends SvgCommonProps {
     width: number | string;
     height: number | string;
+    rx?: number | string;
+    ry?: number | string;
 }
 
 export interface SvgCircleProps extends SvgCommonProps {
@@ -2085,7 +2087,7 @@ export class Svg extends Component<{ width: number, height: number }> {
  * Take Snapshot
  */
 export function takeSnapshotAsync(
-    view?: (number | React.ReactElement<any>),
+    view?: (number | React.ReactElement),
     options?: {
         width?: number,
         height?: number,
diff --git a/types/expo/v26/index.d.ts b/types/expo/v26/index.d.ts
index 9804579e66..32e00de424 100644
--- a/types/expo/v26/index.d.ts
+++ b/types/expo/v26/index.d.ts
@@ -2006,6 +2006,8 @@ export interface SvgCommonProps {
 export interface SvgRectProps extends SvgCommonProps {
     width: number | string;
     height: number | string;
+    rx?: number | string;
+    ry?: number | string;
 }
 
 export interface SvgCircleProps extends SvgCommonProps {
@@ -2113,7 +2115,7 @@ export class Svg extends Component<{ width: number, height: number, viewBox?: st
  * Take Snapshot
  */
 export function takeSnapshotAsync(
-    view?: (number | React.ReactElement<any>),
+    view?: (number | React.ReactElement),
     options?: {
         width?: number,
         height?: number,
diff --git a/types/expo/v27/index.d.ts b/types/expo/v27/index.d.ts
index a80fb657ee..dd5e2b90f2 100644
--- a/types/expo/v27/index.d.ts
+++ b/types/expo/v27/index.d.ts
@@ -2083,6 +2083,8 @@ export interface SvgCommonProps {
 export interface SvgRectProps extends SvgCommonProps {
     width: number | string;
     height: number | string;
+    rx?: number | string;
+    ry?: number | string;
 }
 
 export interface SvgCircleProps extends SvgCommonProps {
@@ -2192,7 +2194,7 @@ export class Svg extends Component<{ width: number, height: number, viewBox?: st
  * Take Snapshot
  */
 export function takeSnapshotAsync(
-    view?: (number | React.ReactElement<any>),
+    view?: (number | React.ReactElement),
     options?: {
         width?: number,
         height?: number,
diff --git a/types/expo/v30/index.d.ts b/types/expo/v30/index.d.ts
index d5891bad2d..f1b318414e 100644
--- a/types/expo/v30/index.d.ts
+++ b/types/expo/v30/index.d.ts
@@ -2083,6 +2083,8 @@ export interface SvgCommonProps {
 export interface SvgRectProps extends SvgCommonProps {
     width: number | string;
     height: number | string;
+    rx?: number | string;
+    ry?: number | string;
 }
 
 export interface SvgCircleProps extends SvgCommonProps {
@@ -2193,7 +2195,7 @@ export class Svg extends Component<{ width: number, height: number, viewBox?: st
  * Take Snapshot
  */
 export function takeSnapshotAsync(
-    view?: (number | React.ReactElement<any>),
+    view?: (number | React.ReactElement),
     options?: {
         width?: number,
         height?: number,
diff --git a/types/expo/v31/expo-tests.tsx b/types/expo/v31/expo-tests.tsx
new file mode 100644
index 0000000000..10045e57e6
--- /dev/null
+++ b/types/expo/v31/expo-tests.tsx
@@ -0,0 +1,1263 @@
+import * as React from 'react';
+import { Text } from 'react-native';
+
+import {
+    Accelerometer,
+    AdMobAppEvent,
+    AdMobBanner,
+    AdMobInterstitial,
+    AdMobRewarded,
+    Amplitude,
+    AppLoading,
+    Asset,
+    Audio,
+    AuthSession,
+    BarCodeScanner,
+    BlurView,
+    Brightness,
+    Calendar,
+    Camera,
+    CameraObject,
+    Constants,
+    Contacts,
+    DocumentPicker,
+    EdgeInsets,
+    EdgePadding,
+    EventUserLocation,
+    Facebook,
+    FacebookAds,
+    FaceDetector,
+    FileSystem,
+    Haptic,
+    ImageManipulator,
+    ImagePicker,
+    IntentLauncherAndroid,
+    KeepAwake,
+    KmlMapEvent,
+    LinearGradient,
+    Linking,
+    Location,
+    MailComposer,
+    MapEvent,
+    MapStyleElement,
+    MapView,
+    MediaLibrary,
+    Permissions,
+    PublisherBanner,
+    Region,
+    registerRootComponent,
+    ScreenOrientation,
+    SecureStore,
+    Svg,
+    Updates
+} from 'expo';
+
+const reverseGeocode: Promise<Location.GeocodeData[]> = Location.reverseGeocodeAsync({
+    latitude: 0,
+    longitude: 0
+});
+
+Accelerometer.addListener((obj) => {
+    obj.x;
+    obj.y;
+    obj.z;
+});
+Accelerometer.removeAllListeners();
+Accelerometer.setUpdateInterval(1000);
+
+() => (
+    <AdMobBanner
+        bannerSize="leaderboard"
+        adUnitID="ca-app-pub-3940256099942544/6300978111"
+        testDeviceID="EMULATOR"
+        didFailToReceiveAdWithError={(error: string) => console.log(error)}
+        style={{ flex: 1 }}
+    />
+);
+
+() => (
+    <PublisherBanner
+        bannerSize="leaderboard"
+        adUnitID="ca-app-pub-3940256099942544/6300978111"
+        testDeviceID="EMULATOR"
+        didFailToReceiveAdWithError={(error: string) => console.log(error)}
+        onAdMobDispatchAppEvent={(event: AdMobAppEvent) => console.log(event)}
+        style={{ flex: 1 }}
+    />
+);
+
+AdMobInterstitial.setAdUnitID('ca-app-pub-3940256099942544/1033173712'); // Test ID, Replace with your-admob-unit-id
+AdMobInterstitial.setTestDeviceID('EMULATOR');
+async () => {
+    await AdMobInterstitial.requestAdAsync();
+    await AdMobInterstitial.showAdAsync();
+};
+
+AdMobRewarded.setAdUnitID('ca-app-pub-3940256099942544/1033173712'); // Test ID, Replace with your-admob-unit-id
+AdMobRewarded.setTestDeviceID('EMULATOR');
+async () => {
+    await AdMobRewarded.requestAdAsync();
+    await AdMobRewarded.showAdAsync();
+};
+
+Amplitude.initialize('key');
+Amplitude.setUserId('userId');
+Amplitude.setUserProperties({key: 1});
+Amplitude.clearUserProperties();
+Amplitude.logEvent('name');
+Amplitude.logEventWithProperties('event', {key: 'value'});
+Amplitude.setGroup('type', ['value']);
+
+const asset = Asset.fromModule(1);
+asset.downloadAsync();
+Asset.loadAsync(1);
+Asset.loadAsync([1, 2, 3]);
+const asset1 = new Asset({
+    uri: 'uri',
+    type: 'type',
+    name: 'name',
+    hash: 'hash',
+    width: 122,
+    height: 122
+});
+
+const url = AuthSession.getRedirectUrl();
+AuthSession.dismiss();
+AuthSession.startAsync({
+    authUrl: 'url1',
+    returnUrl: 'url2'
+}).then(result => {
+    switch (result.type) {
+        case 'success':
+            result.event;
+            result.params;
+            break;
+        case 'error':
+            result.errorCode;
+            result.params;
+            result.event;
+            break;
+        case 'dismissed':
+        case 'cancel':
+            result.type;
+            break;
+    }
+});
+AuthSession.startAsync({
+    authUrl: 'url1',
+    returnUrl: undefined
+});
+
+Audio.setAudioModeAsync({
+    shouldDuckAndroid: false,
+    playsInSilentModeIOS: true,
+    interruptionModeIOS: 2,
+    interruptionModeAndroid: 1,
+    allowsRecordingIOS: true,
+});
+Audio.setIsEnabledAsync(true);
+
+Audio.INTERRUPTION_MODE_IOS_MIX_WITH_OTHERS === 0;
+Audio.INTERRUPTION_MODE_IOS_DO_NOT_MIX === 1;
+Audio.INTERRUPTION_MODE_IOS_DUCK_OTHERS === 2;
+
+Audio.INTERRUPTION_MODE_ANDROID_DO_NOT_MIX === 1;
+Audio.INTERRUPTION_MODE_ANDROID_DUCK_OTHERS === 2;
+
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_DEFAULT === 0;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_THREE_GPP === 1;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG_4 === 2;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_NB === 3;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_WB === 4;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADIF === 5;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADTS === 6;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_RTP_AVP === 7;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG2TS === 8;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_WEBM === 9;
+
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_DEFAULT === 0;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_NB === 1;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_WB === 2;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC === 3;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_HE_AAC === 4;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC_ELD === 5;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_VORBIS === 6;
+
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_LINEARPCM === 'lpcm';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AC3 === 'ac-3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_60958AC3 === 'cac3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLEIMA4 === 'ima4';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC === 'aac ';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4CELP === 'celp';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4HVXC === 'hvxc';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4TWINVQ === 'twvq';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE3 === 'MAC3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE6 === 'MAC6';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ULAW === 'ulaw';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ALAW === 'alaw';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN === 'QDMC';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN2 === 'QDM2';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_QUALCOMM === 'Qclp';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER1 === '.mp1';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER2 === '.mp2';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER3 === '.mp3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLELOSSLESS === 'alac';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE === 'aach';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_LD === 'aacl';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD === 'aace';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_SBR === 'aacf';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_V2 === 'aacg';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE_V2 === 'aacp';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_SPATIAL === 'aacs';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR === 'samr';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR_WB === 'sawb';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AUDIBLE === 'AUDB';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ILBC === 'ilbc';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_DVIINTELIMA === 0x6d730011;
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MICROSOFTGSM === 0x6d730031;
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AES3 === 'aes3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ENHANCEDAC3 === 'ec-3';
+
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_MIN === 0;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_LOW === 0x20;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_MEDIUM === 0x40;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_HIGH === 0x60;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_MAX === 0x7f;
+
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_CONSTANT === 0;
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_LONG_TERM_AVERAGE === 1;
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE_CONSTRAINED === 2;
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE === 3;
+
+Audio.RECORDING_OPTIONS_PRESET_HIGH_QUALITY;
+Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY;
+async () => {
+    const result = await Audio.Sound.createAsync({uri: 'uri'}, {
+        volume: 0.55,
+        rate: 16.5
+    }, null, true);
+
+    const sound = result.sound;
+    const status = result.status;
+
+    if (!status.isLoaded) {
+        status.error;
+    } else {
+        status.didJustFinish;
+        // etc.
+    }
+
+    const _status = await sound.getStatusAsync();
+    await sound.loadAsync({uri: 'uri'});
+};
+
+() => (
+    <AppLoading
+        startAsync={() => Promise.resolve()}
+        onFinish={() => {}}
+        onError={(error) => console.log(error)} />
+);
+() => (
+    <AppLoading />
+);
+
+const barcodeReadCallback = () => {};
+() => (
+    <BarCodeScanner
+        type="front"
+        torchMode="off"
+        barCodeTypes={[BarCodeScanner.Constants.BarCodeType.aztec]}
+        onBarCodeScanned={barcodeReadCallback} />
+);
+
+() => (
+    <BlurView
+        tint="dark"
+        intensity={2} />
+);
+
+async () => {
+    await Brightness.setBrightnessAsync(0.65);
+    await Brightness.setSystemBrightnessAsync(0.75);
+    const br1 = await Brightness.getBrightnessAsync();
+    const br2 = await Brightness.getSystemBrightnessAsync();
+};
+
+Camera.Constants.AutoFocus;
+Camera.Constants.Type;
+Camera.Constants.FlashMode;
+Camera.Constants.WhiteBalance;
+Camera.Constants.VideoQuality;
+Camera.Constants.BarCodeType;
+() => {
+    return(<Camera ref={(component: any) => {
+        if (component) {
+            component.recordAsync();
+        }
+    }} />);
+};
+async (camera: CameraObject) => {
+    const picture = await camera.takePictureAsync({
+        quality: 0.5,
+        base64: true,
+        exif: true
+    });
+
+    picture.uri;
+    picture.width;
+    picture.height;
+    picture.exif;
+    picture.base64;
+
+    camera.takePictureAsync({
+        quality: 1,
+        onPictureSaved: pic => {
+            pic.uri;
+            pic.width;
+            pic.height;
+            pic.exif;
+            pic.base64;
+        }
+    });
+};
+
+async () => {
+    const result = await DocumentPicker.getDocumentAsync();
+
+    if (result.type === 'success') {
+        result.name;
+        result.uri;
+        result.size;
+    }
+};
+
+async () => {
+    const { type, expires, token } = await Facebook.logInWithReadPermissionsAsync("appId");
+};
+
+() => (
+    <FacebookAds.BannerView
+        type="large"
+        placementId="str"
+        onPress={() => {}}
+        onError={() => {}} />
+);
+
+async () => {
+    const info = await FileSystem.getInfoAsync('file');
+
+    info.exists;
+    info.isDirectory;
+
+    if (info.exists) {
+        info.md5;
+        info.uri;
+        info.size;
+        info.modificationTime;
+    }
+
+    const string: string = await FileSystem.readAsStringAsync('file');
+    await FileSystem.writeAsStringAsync('file', 'content');
+    await FileSystem.deleteAsync('file');
+    await FileSystem.moveAsync({ from: 'from', to: 'to'});
+    await FileSystem.copyAsync({ from: 'from', to: 'to' });
+    await FileSystem.makeDirectoryAsync('dir');
+    const dirs: string[] = await FileSystem.readDirectoryAsync('dir');
+    const result = await FileSystem.downloadAsync('from', 'to');
+
+    result.headers;
+    result.status;
+    result.uri;
+    result.md5;
+};
+
+async () => {
+    // Video test
+    const result = await ImagePicker.launchImageLibraryAsync({
+        mediaTypes: ImagePicker.MediaTypeOptions.Videos,
+    });
+
+    if (!result.cancelled) {
+        result.uri;
+        result.width;
+        result.height;
+        result.duration;
+        result.type;
+    }
+};
+
+async () => {
+    // Image test
+    const result = await ImagePicker.launchImageLibraryAsync({
+        mediaTypes: ImagePicker.MediaTypeOptions.Images,
+        base64: true,
+        aspect: [4, 3],
+        quality: 1,
+        exif: true,
+    });
+
+    if (!result.cancelled) {
+        result.uri;
+        result.width;
+        result.height;
+        result.exif;
+        result.base64;
+        result.type;
+    }
+};
+
+async () => {
+    const result = await ImageManipulator.manipulateAsync('url', [
+        { rotate: 90 },
+        { resize: { width: 300 } },
+        { resize: { height: 300 } },
+        { resize: { height: 300, width: 300 } },
+    ], {
+        compress: 0.75
+    });
+
+    result.height;
+    result.uri;
+    result.width;
+};
+
+async () => {
+    const result = await ImageManipulator.manipulateAsync('url', [
+        { rotate: 360 },
+        { resize: { width: 300 } },
+        { resize: { height: 300 } },
+        { resize: { height: 300, width: 300 } },
+    ], {
+        compress: 0.75
+    });
+
+    result.height;
+    result.uri;
+    result.width;
+};
+
+FaceDetector.Constants.Mode.fast;
+FaceDetector.Constants.Mode.accurate;
+FaceDetector.Constants.Landmarks.all;
+FaceDetector.Constants.Landmarks.none;
+FaceDetector.Constants.Classifications.all;
+FaceDetector.Constants.Classifications.none;
+async () => {
+    const result = await FaceDetector.detectFaces('url', {
+        mode: FaceDetector.Constants.Mode.fast,
+        detectLandmarks: FaceDetector.Constants.Landmarks.all,
+        runClassifications: FaceDetector.Constants.Classifications.none
+    });
+
+    result.faces[0];
+};
+
+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'] || '');
+};
+
+// #region securestore
+async () => {
+    await SecureStore.setItemAsync('some-key', 'some-val', {
+        keychainService: "some-service",
+        keychainAccessible: SecureStore.WHEN_PASSCODE_SET_THIS_DEVICE_ONLY,
+    });
+    const result = await SecureStore.getItemAsync('some-key', { keychainService: "some-service" });
+    if (result != null) {
+        result.slice() === 'some-val';
+    }
+    await SecureStore.deleteItemAsync('some-key', { keychainService: "some-service" });
+};
+
+const allSecureStoreKeychainAccessibleValues: number[] = [
+    SecureStore.WHEN_UNLOCKED,
+    SecureStore.AFTER_FIRST_UNLOCK,
+    SecureStore.ALWAYS,
+    SecureStore.WHEN_UNLOCKED_THIS_DEVICE_ONLY,
+    SecureStore.WHEN_PASSCODE_SET_THIS_DEVICE_ONLY,
+    SecureStore.AFTER_FIRST_UNLOCK_THIS_DEVICE_ONLY,
+    SecureStore.ALWAYS_THIS_DEVICE_ONLY,
+];
+// #endregion
+
+() => (
+    <Svg width={100} height={50}>
+        <Svg.Rect
+            x={25}
+            y={5}
+            width={150}
+            height={50}
+            fill='rgb(0,0,255)'
+            strokeWidth={3}
+            stroke='rgb(0,0,0)'
+            transform="translate(0, 0)"
+        />
+        <Svg.Circle
+            cx={50}
+            cy={50}
+            r={50}
+            fill="pink"
+            transform="translate(0, 0)"
+        />
+        <Svg.Ellipse
+            cx={55}
+            cy={55}
+            rx={50}
+            ry={30}
+            stroke="purple"
+            strokeWidth={2}
+            fill="yellow"
+            transform="translate(0, 0)"
+        />
+        <Svg.Line
+            x1={0}
+            y1={0}
+            x2={100}
+            y2={100}
+            stroke="red"
+            strokeWidth={2}
+            transform="translate(0, 0)"
+        />
+        <Svg.Polygon
+            points="40,5 70,80 25,95"
+            fill="lime"
+            stroke="purple"
+            strokeWidth={1}
+            transform="translate(0, 0)"
+        />
+        <Svg.Polyline
+            points="10,10 20,12 30,20 40,60 60,70 95,90"
+            fill="none"
+            stroke="black"
+            strokeWidth={3}
+            transform="translate(0, 0)"
+        />
+        <Svg.Text
+            fill="none"
+            stroke="purple"
+            fontSize={20}
+            fontWeight="bold"
+            x={100}
+            y={20}
+            textAnchor="middle"
+            transform="translate(0, 0)"
+        >
+            STROKED TEXT
+        </Svg.Text>
+        <Svg.Defs>
+            <Svg.Path
+                id="path"
+                d=""
+            />
+        </Svg.Defs>
+        <Svg.G transform="translate(0, 0)" y={20}>
+            <Svg.Text fill="blue" transform={{ translateX: 0, translateY: 0 }}>
+                <Svg.TextPath href="#path" startOffset="-10%">
+                    We go up and down,
+                    <Svg.TSpan fill="red" dy="5,5,5">then up again</Svg.TSpan>
+                </Svg.TextPath>
+            </Svg.Text>
+            <Svg.Path
+                d=""
+                fill="none"
+                stroke="red"
+                strokeWidth={1}
+            />
+        </Svg.G>
+        <Svg.Use href="#shape" transform="translate(0, 0)" x="20" y="0" />
+        <Svg.Use href="#shape" transform={{ translateX: 0, translateY: 0 }} 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"/>
+        </Svg.Symbol>
+        <Svg.Defs>
+            <Svg.ClipPath id="clip">
+                <Svg.Circle cx="50%" cy="50%" r="40%"/>
+            </Svg.ClipPath>
+            <Svg.RadialGradient id="grad" cx="50%" cy="50%" rx="50%" ry="50%" fx="50%" fy="50%" gradientUnits="userSpaceOnUse">
+                <Svg.Stop
+                    offset="0%"
+                    stopColor="#ff0"
+                    stopOpacity="1"
+                />
+            </Svg.RadialGradient>
+            <Svg.LinearGradient id="grad" x1="0" y1="0" x2="170" y2="0">
+                <Svg.Stop offset="1" stopColor="red" stopOpacity="1" />
+            </Svg.LinearGradient>
+        </Svg.Defs>
+    </Svg>
+);
+
+() => (
+    <Svg width={100} height={50} preserveAspectRatio="none" />
+);
+
+IntentLauncherAndroid.ACTION_ACCESSIBILITY_SETTINGS === 'android.settings.ACCESSIBILITY_SETTINGS';
+IntentLauncherAndroid.ACTION_APP_NOTIFICATION_REDACTION === 'android.settings.ACTION_APP_NOTIFICATION_REDACTION';
+IntentLauncherAndroid.ACTION_CONDITION_PROVIDER_SETTINGS === 'android.settings.ACTION_CONDITION_PROVIDER_SETTINGS';
+IntentLauncherAndroid.ACTION_NOTIFICATION_LISTENER_SETTINGS === 'android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS';
+IntentLauncherAndroid.ACTION_PRINT_SETTINGS === 'android.settings.ACTION_PRINT_SETTINGS';
+IntentLauncherAndroid.ACTION_ADD_ACCOUNT_SETTINGS === 'android.settings.ADD_ACCOUNT_SETTINGS';
+IntentLauncherAndroid.ACTION_AIRPLANE_MODE_SETTINGS === 'android.settings.AIRPLANE_MODE_SETTINGS';
+IntentLauncherAndroid.ACTION_APN_SETTINGS === 'android.settings.APN_SETTINGS';
+IntentLauncherAndroid.ACTION_APPLICATION_DETAILS_SETTINGS === 'android.settings.APPLICATION_DETAILS_SETTINGS';
+IntentLauncherAndroid.ACTION_APPLICATION_DEVELOPMENT_SETTINGS === 'android.settings.APPLICATION_DEVELOPMENT_SETTINGS';
+IntentLauncherAndroid.ACTION_APPLICATION_SETTINGS === 'android.settings.APPLICATION_SETTINGS';
+IntentLauncherAndroid.ACTION_APP_NOTIFICATION_SETTINGS === 'android.settings.APP_NOTIFICATION_SETTINGS';
+IntentLauncherAndroid.ACTION_APP_OPS_SETTINGS === 'android.settings.APP_OPS_SETTINGS';
+IntentLauncherAndroid.ACTION_BATTERY_SAVER_SETTINGS === 'android.settings.BATTERY_SAVER_SETTINGS';
+IntentLauncherAndroid.ACTION_BLUETOOTH_SETTINGS === 'android.settings.BLUETOOTH_SETTINGS';
+IntentLauncherAndroid.ACTION_CAPTIONING_SETTINGS === 'android.settings.CAPTIONING_SETTINGS';
+IntentLauncherAndroid.ACTION_CAST_SETTINGS === 'android.settings.CAST_SETTINGS';
+IntentLauncherAndroid.ACTION_DATA_ROAMING_SETTINGS === 'android.settings.DATA_ROAMING_SETTINGS';
+IntentLauncherAndroid.ACTION_DATE_SETTINGS === 'android.settings.DATE_SETTINGS';
+IntentLauncherAndroid.ACTION_DEVICE_INFO_SETTINGS === 'android.settings.DEVICE_INFO_SETTINGS';
+IntentLauncherAndroid.ACTION_DEVICE_NAME === 'android.settings.DEVICE_NAME';
+IntentLauncherAndroid.ACTION_DISPLAY_SETTINGS === 'android.settings.DISPLAY_SETTINGS';
+IntentLauncherAndroid.ACTION_DREAM_SETTINGS === 'android.settings.DREAM_SETTINGS';
+IntentLauncherAndroid.ACTION_HARD_KEYBOARD_SETTINGS === 'android.settings.HARD_KEYBOARD_SETTINGS';
+IntentLauncherAndroid.ACTION_HOME_SETTINGS === 'android.settings.HOME_SETTINGS';
+IntentLauncherAndroid.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS === 'android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS';
+IntentLauncherAndroid.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS === 'android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS';
+IntentLauncherAndroid.ACTION_INPUT_METHOD_SETTINGS === 'android.settings.INPUT_METHOD_SETTINGS';
+IntentLauncherAndroid.ACTION_INPUT_METHOD_SUBTYPE_SETTINGS === 'android.settings.INPUT_METHOD_SUBTYPE_SETTINGS';
+IntentLauncherAndroid.ACTION_INTERNAL_STORAGE_SETTINGS === 'android.settings.INTERNAL_STORAGE_SETTINGS';
+IntentLauncherAndroid.ACTION_LOCALE_SETTINGS === 'android.settings.LOCALE_SETTINGS';
+IntentLauncherAndroid.ACTION_LOCATION_SOURCE_SETTINGS === 'android.settings.LOCATION_SOURCE_SETTINGS';
+IntentLauncherAndroid.ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS === 'android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS';
+IntentLauncherAndroid.ACTION_MANAGE_APPLICATIONS_SETTINGS === 'android.settings.MANAGE_APPLICATIONS_SETTINGS';
+IntentLauncherAndroid.ACTION_MANAGE_DEFAULT_APPS_SETTINGS === 'android.settings.MANAGE_DEFAULT_APPS_SETTINGS';
+IntentLauncherAndroid.ACTION_MEMORY_CARD_SETTINGS === 'android.settings.MEMORY_CARD_SETTINGS';
+IntentLauncherAndroid.ACTION_MONITORING_CERT_INFO === 'android.settings.MONITORING_CERT_INFO';
+IntentLauncherAndroid.ACTION_NETWORK_OPERATOR_SETTINGS === 'android.settings.NETWORK_OPERATOR_SETTINGS';
+IntentLauncherAndroid.ACTION_NFCSHARING_SETTINGS === 'android.settings.NFCSHARING_SETTINGS';
+IntentLauncherAndroid.ACTION_NFC_PAYMENT_SETTINGS === 'android.settings.NFC_PAYMENT_SETTINGS';
+IntentLauncherAndroid.ACTION_NFC_SETTINGS === 'android.settings.NFC_SETTINGS';
+IntentLauncherAndroid.ACTION_NIGHT_DISPLAY_SETTINGS === 'android.settings.NIGHT_DISPLAY_SETTINGS';
+IntentLauncherAndroid.ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS === 'android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS';
+IntentLauncherAndroid.ACTION_NOTIFICATION_SETTINGS === 'android.settings.NOTIFICATION_SETTINGS';
+IntentLauncherAndroid.ACTION_PAIRING_SETTINGS === 'android.settings.PAIRING_SETTINGS';
+IntentLauncherAndroid.ACTION_PRIVACY_SETTINGS === 'android.settings.PRIVACY_SETTINGS';
+IntentLauncherAndroid.ACTION_QUICK_LAUNCH_SETTINGS === 'android.settings.QUICK_LAUNCH_SETTINGS';
+IntentLauncherAndroid.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS === 'android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS';
+IntentLauncherAndroid.ACTION_SECURITY_SETTINGS === 'android.settings.SECURITY_SETTINGS';
+IntentLauncherAndroid.ACTION_SETTINGS === 'android.settings.SETTINGS';
+IntentLauncherAndroid.ACTION_SHOW_ADMIN_SUPPORT_DETAILS === 'android.settings.SHOW_ADMIN_SUPPORT_DETAILS';
+IntentLauncherAndroid.ACTION_SHOW_INPUT_METHOD_PICKER === 'android.settings.SHOW_INPUT_METHOD_PICKER';
+IntentLauncherAndroid.ACTION_SHOW_REGULATORY_INFO === 'android.settings.SHOW_REGULATORY_INFO';
+IntentLauncherAndroid.ACTION_SHOW_REMOTE_BUGREPORT_DIALOG === 'android.settings.SHOW_REMOTE_BUGREPORT_DIALOG';
+IntentLauncherAndroid.ACTION_SOUND_SETTINGS === 'android.settings.SOUND_SETTINGS';
+IntentLauncherAndroid.ACTION_STORAGE_MANAGER_SETTINGS === 'android.settings.STORAGE_MANAGER_SETTINGS';
+IntentLauncherAndroid.ACTION_SYNC_SETTINGS === 'android.settings.SYNC_SETTINGS';
+IntentLauncherAndroid.ACTION_SYSTEM_UPDATE_SETTINGS === 'android.settings.SYSTEM_UPDATE_SETTINGS';
+IntentLauncherAndroid.ACTION_TETHER_PROVISIONING_UI === 'android.settings.TETHER_PROVISIONING_UI';
+IntentLauncherAndroid.ACTION_TRUSTED_CREDENTIALS_USER === 'android.settings.TRUSTED_CREDENTIALS_USER';
+IntentLauncherAndroid.ACTION_USAGE_ACCESS_SETTINGS === 'android.settings.USAGE_ACCESS_SETTINGS';
+IntentLauncherAndroid.ACTION_USER_DICTIONARY_INSERT === 'android.settings.USER_DICTIONARY_INSERT';
+IntentLauncherAndroid.ACTION_USER_DICTIONARY_SETTINGS === 'android.settings.USER_DICTIONARY_SETTINGS';
+IntentLauncherAndroid.ACTION_USER_SETTINGS === 'android.settings.USER_SETTINGS';
+IntentLauncherAndroid.ACTION_VOICE_CONTROL_AIRPLANE_MODE === 'android.settings.VOICE_CONTROL_AIRPLANE_MODE';
+IntentLauncherAndroid.ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE === 'android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE';
+IntentLauncherAndroid.ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE === 'android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE';
+IntentLauncherAndroid.ACTION_VOICE_INPUT_SETTINGS === 'android.settings.VOICE_INPUT_SETTINGS';
+IntentLauncherAndroid.ACTION_VPN_SETTINGS === 'android.settings.VPN_SETTINGS';
+IntentLauncherAndroid.ACTION_VR_LISTENER_SETTINGS === 'android.settings.VR_LISTENER_SETTINGS';
+IntentLauncherAndroid.ACTION_WEBVIEW_SETTINGS === 'android.settings.WEBVIEW_SETTINGS';
+IntentLauncherAndroid.ACTION_WIFI_IP_SETTINGS === 'android.settings.WIFI_IP_SETTINGS';
+IntentLauncherAndroid.ACTION_WIFI_SETTINGS === 'android.settings.WIFI_SETTINGS';
+IntentLauncherAndroid.ACTION_WIRELESS_SETTINGS === 'android.settings.WIRELESS_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_AUTOMATION_SETTINGS === 'android.settings.ZEN_MODE_AUTOMATION_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_EVENT_RULE_SETTINGS === 'android.settings.ZEN_MODE_EVENT_RULE_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS === 'android.settings.ZEN_MODE_EXTERNAL_RULE_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_PRIORITY_SETTINGS === 'android.settings.ZEN_MODE_PRIORITY_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_SCHEDULE_RULE_SETTINGS === 'android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_SETTINGS === 'android.settings.ZEN_MODE_SETTINGS';
+
+KeepAwake.activate();
+KeepAwake.deactivate();
+
+() => (
+    <LinearGradient
+        colors={['#fff']}
+        start={[1, 1]} />
+);
+
+() => (
+    <LinearGradient
+        colors={['#fff']}
+        style={{ flex: 1 }} />
+);
+
+Permissions.CAMERA === 'camera';
+Permissions.CAMERA_ROLL === 'cameraRoll';
+Permissions.AUDIO_RECORDING === 'audioRecording';
+Permissions.CONTACTS === 'contacts';
+Permissions.NOTIFICATIONS === 'notifications';
+Permissions.SYSTEM_BRIGHTNESS === 'systemBrightness';
+Permissions.USER_FACING_NOTIFICATIONS === 'userFacingNotifications';
+Permissions.REMINDERS === 'reminders';
+async () => {
+    const result = await Permissions.askAsync(Permissions.CAMERA, Permissions.CONTACTS);
+
+    result.status === 'granted';
+    result.status === 'denied';
+    result.status === 'undetermined';
+
+    result.expires === 'never';
+};
+
+ScreenOrientation.Orientation.ALL;
+ScreenOrientation.allow(ScreenOrientation.Orientation.ALL);
+
+class __TestEntry__ extends React.Component {
+    render() {
+        return(
+            <Text>test</Text>
+        );
+    }
+}
+registerRootComponent(__TestEntry__);
+
+Calendar.EntityTypes.EVENT === 'event';
+Calendar.EntityTypes.REMINDER === 'reminder';
+
+Calendar.CalendarType.LOCAL === 'local';
+Calendar.CalendarType.CALDAV === 'caldav';
+Calendar.CalendarType.EXCHANGE === 'exchange';
+Calendar.CalendarType.SUBSCRIBED === 'subscribed';
+Calendar.CalendarType.BIRTHDAYS === 'birthdays';
+
+async () => {
+    const result = await Calendar.getCalendarsAsync(Calendar.EntityTypes.EVENT);
+    result.length;
+
+    const calendar = result[0];
+    calendar.id === '';
+    calendar.title === '';
+    calendar.sourceId === '';
+    calendar.type === Calendar.CalendarType.BIRTHDAYS;
+    calendar.color === '';
+    calendar.entityType === Calendar.EntityTypes.EVENT;
+    calendar.allowsModifications === true;
+    calendar.allowedAvailabilities === [''];
+    calendar.isPrimary === true;
+    calendar.name === '';
+    calendar.ownerAccount === '';
+    calendar.timeZone === '';
+    calendar.allowedReminders === [''];
+    calendar.allowedAttendeeTypes === [''];
+    calendar.isVisible === false;
+    calendar.isSynced === false;
+    calendar.accessLevel === Calendar.CalendarAccessLevel.CONTRIBUTOR;
+
+    if (calendar.source) {
+        calendar.source.id === '';
+        calendar.source.type === '';
+        calendar.source.name === '';
+        calendar.source.isLocalAccount === false;
+    }
+
+    const id1 =  await Calendar.createCalendarAsync({
+        accessLevel: Calendar.CalendarAccessLevel.EDITOR
+    });
+
+    id1 === '';
+
+    const id2 = await Calendar.updateCalendarAsync('1234', {
+        isVisible: false
+    });
+
+    id2 === '';
+
+    const id3 = await Calendar.updateCalendarAsync('1234', null);
+
+    await Calendar.deleteCalendarAsync('1234');
+
+    const events = await Calendar.getEventsAsync(
+        ['123', '124'],
+        new Date(),
+        new Date()
+    );
+
+    const event1 = events[0];
+
+    event1.accessLevel === Calendar.EventAccessLevel.CONFIDENTIAL;
+    event1.alarms === [];
+    event1.allDay === true;
+    event1.availability === Calendar.Availability.FREE;
+    event1.calendarId === '';
+    event1.creationDate === '';
+    event1.endDate === '';
+    event1.endTimeZone === '';
+    event1.guestsCanInviteOthers === true;
+    event1.guestsCanModify === true;
+    event1.guestsCanSeeGuests === false;
+    event1.id === '';
+    event1.instanceId === '';
+    event1.isDetached === false;
+
+    const event2 = await Calendar.getEventAsync('123', {
+        futureEvents: true
+    });
+
+    const eventId1 = await Calendar.createEventAsync('123');
+
+    const eventId2 = await Calendar.updateEventAsync('1234');
+
+    await Calendar.deleteEventAsync('1234');
+
+    const attendees = await Calendar.getAttendeesForEventAsync('123');
+
+    const aId1 = await Calendar.createAttendeeAsync('123');
+
+    const aId2 = await Calendar.updateAttendeeAsync('123');
+
+    await Calendar.deleteAttendeeAsync('123');
+
+    const reminders = await Calendar.getRemindersAsync(['123']);
+
+    const reminder = await Calendar.getReminderAsync('123');
+
+    const remId1 = await Calendar.createReminderAsync('123');
+
+    const remId2 = await Calendar.updateReminderAsync('123');
+
+    await Calendar.deleteReminderAsync('123');
+
+    const sources = await Calendar.getSourcesAsync();
+
+    const source = await Calendar.getSourceAsync('123');
+
+    Calendar.openEventInCalendar('123');
+};
+
+async () => {
+    const result = await MailComposer.composeAsync({
+        subject: 'sss'
+    });
+
+    result.status === 'saved';
+};
+
+// #region MapView
+const initialRegion: Region = {
+  latitude: 0,
+  longitude: 0,
+  latitudeDelta: 0,
+  longitudeDelta: 0,
+};
+
+const edgePadding: EdgePadding = {
+  top: 0,
+  right: 0,
+  bottom: 0,
+  left: 0,
+};
+
+const edgeInsets: EdgeInsets = {
+  top: 0,
+  right: 0,
+  bottom: 0,
+  left: 0,
+};
+
+const mapStyleElements: MapStyleElement[] = [{
+  featureType: 'featureType',
+  elementType: 'elementType',
+  stylers: [{}, {}],
+}];
+
+const mapEventCallback = (event: MapEvent) => console.log(event);
+const regionCallback = (region: Region) =>  console.log(region);
+const kmlCallback = (kml: KmlMapEvent) =>  console.log(kml);
+const userLocationCallback = (event: EventUserLocation) =>  console.log(event);
+
+() => (
+    <MapView
+        provider="google"
+        customMapStyle={mapStyleElements}
+        customMapStyleString="some-string"
+        showsUserLocation={true}
+        userLocationAnnotationTitle="title"
+        showsMyLocationButton={true}
+        followsUserLocation={true}
+        showsPointsOfInterest={true}
+        showsCompass={true}
+        zoomEnabled={true}
+        zoomControlEnabled={true}
+        rotateEnabled={true}
+        cacheEnabled={true}
+        loadingEnabled={true}
+        loadingBackgroundColor="#000"
+        loadingIndicatorColor="#000"
+        scrollEnabled={true}
+        pitchEnabled={true}
+        toolbarEnabled={true}
+        moveOnMarkerPress={true}
+        showsScale={true}
+        showsBuildings={true}
+        showsTraffic={true}
+        showsIndoors={true}
+        showsIndoorLevelPicker={true}
+        mapType="standard"
+        region={initialRegion}
+        initialRegion={initialRegion}
+        liteMode={true}
+        mapPadding={edgePadding}
+        maxDelta={0}
+        minDelta={0}
+        legalLabelInsets={edgeInsets}
+
+        onMapReady={() => ({})}
+        onKmlReady={kmlCallback}
+        onRegionChange={regionCallback}
+        onRegionChangeComplete={regionCallback}
+        onPress={mapEventCallback}
+        onLongPress={mapEventCallback}
+        onUserLocationChange={userLocationCallback}
+        onPanDrag={mapEventCallback}
+        onPoiClick={(event: MapEvent<{ placeId: string, name: string }>) => console.log(event)}
+        onMarkerPress={(event: MapEvent<{ action: 'marker-press', id: string }>) =>  console.log(event)}
+        onMarkerSelect={(event: MapEvent<{ action: 'marker-select', id: string }>) => console.log(event)}
+        onMarkerDeselect={(event: MapEvent<{ action: 'marker-deselect', id: string }>) => console.log(event)}
+        onCalloutPress={(event: MapEvent<{ action: 'callout-press' }>) => console.log(event)}
+        onMarkerDragStart={mapEventCallback}
+        onMarkerDrag={mapEventCallback}
+        onMarkerDragEnd={mapEventCallback}
+
+        minZoomLevel={0}
+        maxZoomLevel={0}
+        kmlSrc="src"
+        style={{ flex: 1 }}
+    />
+);
+// #endregion
+
+async () => {
+    const updateEventListener: Updates.UpdateEventListener = ({ type }) => {
+        switch (type) {
+            case Updates.EventType.DOWNLOAD_STARTED:
+            case Updates.EventType.DOWNLOAD_PROGRESS:
+            case Updates.EventType.DOWNLOAD_FINISHED:
+            case Updates.EventType.NO_UPDATE_AVAILABLE:
+            case Updates.EventType.ERROR:
+                return true;
+        }
+    };
+
+    Updates.reload();
+
+    Updates.reloadFromCache();
+
+    Updates.addListener(updateEventListener);
+
+    const updateCheckResult = await Updates.checkForUpdateAsync();
+
+    if (updateCheckResult.isAvailable) {
+        console.log(updateCheckResult.manifest);
+    }
+
+    Updates.fetchUpdateAsync({ eventListener: updateEventListener });
+
+    const bundleFetchResult = await Updates.fetchUpdateAsync();
+
+    if (bundleFetchResult.isNew) {
+        console.log(bundleFetchResult.manifest);
+    }
+};
+
+async () => {
+  const asset: MediaLibrary.Asset = await MediaLibrary.createAssetAsync('some-url');
+  const getAssetsOptions: MediaLibrary.GetAssetsOptions = {
+    first: 0,
+    after: 'lastAssetId',
+    album: 'albumId',
+    sortBy: MediaLibrary.SortBy.creationTime,
+    mediaType: MediaLibrary.MediaType.photo
+  };
+  const assetsList: MediaLibrary.GetAssetsResult = await MediaLibrary.getAssetsAsync(getAssetsOptions);
+  const endCursor: string = assetsList.endCursor;
+  const hasNextPage: boolean = assetsList.hasNextPage;
+  const totalCount: number = assetsList.totalCount;
+  const asset1: MediaLibrary.Asset = await MediaLibrary.getAssetInfoAsync(asset);
+  if (await MediaLibrary.deleteAssetsAsync(assetsList.assets)) {
+    console.log('assets deleted');
+  }
+  const albums: MediaLibrary.Album[] = await MediaLibrary.getAlbumsAsync();
+  const album: MediaLibrary.Album | null = await MediaLibrary.getAlbumAsync('albumName');
+  const album1: MediaLibrary.Album = await MediaLibrary.createAlbumAsync('albumName', asset1);
+  if (await MediaLibrary.addAssetsToAlbumAsync([asset, asset1], album1, true)) {
+    console.log('assets added');
+  }
+
+  const moments: MediaLibrary.Album[] = await MediaLibrary.getMomentsAsync();
+
+  switch (getAssetsOptions.mediaType) {
+    case MediaLibrary.MediaType.audio:
+    case MediaLibrary.MediaType.photo:
+    case MediaLibrary.MediaType.video:
+    case MediaLibrary.MediaType.unknow:
+      return true;
+  }
+
+  switch (getAssetsOptions.sortBy) {
+    case MediaLibrary.SortBy.default:
+    case MediaLibrary.SortBy.id:
+    case MediaLibrary.SortBy.creationTime:
+    case MediaLibrary.SortBy.modificationTime:
+    case MediaLibrary.SortBy.mediaType:
+    case MediaLibrary.SortBy.width:
+    case MediaLibrary.SortBy.height:
+    case MediaLibrary.SortBy.duration:
+      return true;
+  }
+};
+
+// #region MediaLibrary
+async () => {
+  const mlAsset: MediaLibrary.Asset = await MediaLibrary.createAssetAsync('localUri');
+  const mlAssetResult: MediaLibrary.GetAssetsResult = await MediaLibrary.getAssetsAsync({
+    first: 0,
+    after: '',
+    album: 'Album',
+    sortBy: MediaLibrary.SortBy.creationTime,
+    mediaType: MediaLibrary.MediaType.photo
+  });
+  const mlAsset1: MediaLibrary.Asset = await MediaLibrary.getAssetInfoAsync(mlAsset);
+  const areDeleted: boolean = await MediaLibrary.deleteAssetsAsync([mlAsset]);
+  const albums: MediaLibrary.Album[] = await MediaLibrary.getAlbumsAsync();
+  const album: MediaLibrary.Album = await MediaLibrary.getAlbumAsync('album');
+  const album1: MediaLibrary.Album = await MediaLibrary.createAlbumAsync('album', mlAsset);
+  const areAddedToAlbum: boolean = await MediaLibrary.addAssetsToAlbumAsync([mlAsset, mlAsset1], 'album');
+  const areDeletedFromAlbum: boolean = await MediaLibrary.removeAssetsFromAlbumAsync([mlAsset, mlAsset1], 'album');
+  const momuents: MediaLibrary.Album[] = await MediaLibrary.getMomentsAsync();
+};
+//#endregion
+
+// #region Haptic
+Haptic.impact(Haptic.ImpactStyles.Heavy);
+Haptic.impact(Haptic.ImpactStyles.Light);
+Haptic.impact(Haptic.ImpactStyles.Medium);
+
+Haptic.notification(Haptic.NotificationType.Error);
+Haptic.notification(Haptic.NotificationType.Success);
+Haptic.notification(Haptic.NotificationType.Error);
+
+Haptic.selection();
+// #endregion
+
+// #region Constants
+async () => {
+    const appOwnerShip = Constants.appOwnership;
+    const expoVersion = Constants.expoVersion;
+    const installationId = Constants.installationId;
+    const deviceId = Constants.deviceId;
+    const deviceName = Constants.deviceName;
+    const deviceYearClass = Constants.deviceYearClass;
+    const isDevice = Constants.isDevice;
+    const platform = Constants.platform;
+    const sessionId = Constants.sessionId;
+    const statusBarHeight = Constants.statusBarHeight;
+    const systemFonts = Constants.systemFonts;
+    const manifest = Constants.manifest;
+    const linkingUri = Constants.linkingUri;
+    const userAgent: string = await Constants.getWebViewUserAgentAsync();
+};
+// #endregion
+
+// #region Contacts
+Contacts.Fields.ID === 'id';
+Contacts.Fields.Name === 'name';
+Contacts.Fields.FirstName === 'firstName';
+Contacts.Fields.MiddleName === 'middleName';
+Contacts.Fields.LastName === 'lastName';
+Contacts.Fields.NamePrefix === 'namePrefix';
+Contacts.Fields.NameSuffix === 'nameSuffix';
+Contacts.Fields.PhoneticFirstName === 'phoneticFirstName';
+Contacts.Fields.PhoneticMiddleName === 'phoneticMiddleName';
+Contacts.Fields.PhoneticLastName === 'phoneticLastName';
+Contacts.Fields.Birthday === 'birthday';
+Contacts.Fields.Emails === 'emails';
+Contacts.Fields.PhoneNumbers === 'phoneNumbers';
+Contacts.Fields.Addresses === 'addresses';
+Contacts.Fields.InstantMessageAddresses === 'instantMessageAddresses';
+Contacts.Fields.UrlAddresses === 'urlAddresses';
+Contacts.Fields.Company === 'company';
+Contacts.Fields.JobTitle === 'jobTitle';
+Contacts.Fields.Department === 'department';
+Contacts.Fields.ImageAvailable === 'imageAvailable';
+Contacts.Fields.Image === 'image';
+Contacts.Fields.Note === 'note';
+Contacts.Fields.Dates === 'dates';
+Contacts.Fields.Relationships === 'relationships';
+Contacts.Fields.Nickname === 'nickname';
+Contacts.Fields.RawImage === 'rawImage';
+Contacts.Fields.MaidenName === 'maidenName';
+Contacts.Fields.ContactType === 'contactType';
+Contacts.Fields.SocialProfiles === 'socialProfiles';
+Contacts.Fields.NonGregorianBirthday === 'nonGregorianBirthday';
+
+const contact: Contacts.Contact = {
+    [Contacts.Fields.ID]: 'id',
+    [Contacts.Fields.Name]: 'name',
+    [Contacts.Fields.FirstName]: 'firstName',
+    [Contacts.Fields.MiddleName]: 'middleName',
+    [Contacts.Fields.LastName]: 'lastName',
+    [Contacts.Fields.NamePrefix]: 'namePrefix',
+    [Contacts.Fields.NameSuffix]: 'nameSuffix',
+    [Contacts.Fields.PhoneticFirstName]: 'phoneticFirstName',
+    [Contacts.Fields.PhoneticMiddleName]: 'phoneticMiddleName',
+    [Contacts.Fields.PhoneticLastName]: 'phoneticLastName',
+    [Contacts.Fields.Birthday]: {
+        day: 1,
+        month: 1,
+        year: 2010,
+        format: Contacts.CalendarFormats.Gregorian,
+        id: 'id',
+        label: 'label'
+    },
+    [Contacts.Fields.Emails]: [{
+        email: 'email',
+        isPrimary: true,
+        id: 'id',
+        label: 'label'
+    }],
+    [Contacts.Fields.PhoneNumbers]: [{
+        number: 'number',
+        isPrimary: true,
+        digits: 'digits',
+        countryCode: 'countryCode',
+        id: 'id',
+        label: 'label'
+    }],
+    [Contacts.Fields.Addresses]: [{
+        street: 'street',
+        city: 'city',
+        country: 'country',
+        region: 'region',
+        neighborhood: 'neighborhood',
+        postalCode: 'postalCode',
+        poBox: 'poBox',
+        isoCountryCode: 'isoCountryCode',
+        id: 'id',
+        label: 'label'
+    }],
+    [Contacts.Fields.InstantMessageAddresses]: [{
+        service: 'service',
+        username: 'username',
+        localizedProfile: 'localizedProfile',
+        id: 'id',
+        label: 'label'
+    }],
+    [Contacts.Fields.UrlAddresses]: [{
+        url: 'url',
+        id: 'id',
+        label: 'label'
+    }],
+    [Contacts.Fields.Company]: 'company',
+    [Contacts.Fields.JobTitle]: 'jobTitle',
+    [Contacts.Fields.Department]: 'department',
+    [Contacts.Fields.ImageAvailable]: true,
+    [Contacts.Fields.Image]: {
+        uri: 'uri'
+    },
+    [Contacts.Fields.Note]: 'note',
+    [Contacts.Fields.Dates]: [{
+        day: 1,
+        month: 1,
+        year: 2010,
+        format: Contacts.CalendarFormats.Gregorian,
+        id: 'id',
+        label: 'label'
+    }],
+    [Contacts.Fields.Relationships]: [{
+        name: 'name',
+        id: 'id',
+        label: 'label'
+    }],
+    [Contacts.Fields.Nickname]: 'nickname',
+    [Contacts.Fields.RawImage]: {
+        uri: 'uri'
+    },
+    [Contacts.Fields.MaidenName]: 'maidenName',
+    [Contacts.Fields.ContactType]: Contacts.ContactTypes.Person,
+    [Contacts.Fields.SocialProfiles]: [{
+        service: 'service',
+        username: 'username',
+        localizedProfile: 'localizedProfile',
+        url: 'url',
+        userId: 'userId',
+        id: 'id',
+        label: 'label'
+    }],
+    [Contacts.Fields.NonGregorianBirthday]: {
+        day: 1,
+        month: 1,
+        year: 2010,
+        format: Contacts.CalendarFormats.Hebrew,
+        id: 'id',
+        label: 'label'
+    }
+};
+
+async () => {
+    const response1: Contacts.ContactResponse = await Contacts.getContactsAsync();
+    const response2: Contacts.ContactResponse = await Contacts.getContactsAsync({ id: 'contactId' });
+
+    const response3: Contacts.Contact = await Contacts.getContactByIdAsync('contactId');
+    const response4: Contacts.Contact = await Contacts.getContactByIdAsync('contactId', [Contacts.Fields.Name]);
+
+    const response5: string = await Contacts.addContactAsync(contact);
+    const response6: string = await Contacts.addContactAsync(contact, 'containerId');
+
+    const response7: string = await Contacts.updateContactAsync(contact);
+    await Contacts.removeContactAsync('contactId');
+    const response8: string = await Contacts.writeContactToFileAsync({ id: 'contactId' });
+    await Contacts.presentFormAsync('contactId');
+    await Contacts.addExistingGroupToContainerAsync('groupId', 'containerId');
+
+    const response9: string = await Contacts.createGroupAsync('groupId');
+    const response10: string = await Contacts.createGroupAsync('groupId', 'containerId');
+
+    await Contacts.updateGroupNameAsync('groupName', 'groupId');
+    await Contacts.removeGroupAsync('groupId');
+    await Contacts.addExistingContactToGroupAsync('contactId', 'groupId');
+    await Contacts.removeContactFromGroupAsync('contactId', 'groupId');
+
+    const response11 = await Contacts.getGroupsAsync({ groupName: 'groupName' });
+    response11.forEach((_: Contacts.Group) => _);
+
+    const response12: string = await Contacts.getDefaultContainerIdAsync();
+
+    const response13 = await Contacts.getContainersAsync({ containerId: 'containerId' });
+    response13.forEach((_: Contacts.Container) => _);
+};
+// #endregion
diff --git a/types/expo/v31/index.d.ts b/types/expo/v31/index.d.ts
new file mode 100644
index 0000000000..a3ce2caced
--- /dev/null
+++ b/types/expo/v31/index.d.ts
@@ -0,0 +1,3606 @@
+// Type definitions for expo 31.0
+// Project: https://github.com/expo/expo-sdk
+// Definitions by: Konstantin Kai <https://github.com/KonstantinKai>
+//                 Martynas Kadiša <https://github.com/martynaskadisa>
+//                 Jan Aagaard <https://github.com/janaagaard75>
+//                 Sergio Sánchez <https://github.com/ssanchezmarc>
+//                 Fernando Helwanger <https://github.com/fhelwanger>
+//                 Umidbek Karimov <https://github.com/umidbekkarimov>
+//                 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>
+//                 Martin Olsson <https://github.com/mo>
+//                 Levan Basharuli <https://github.com/levansuper>
+//                 Pavel Ihm <https://github.com/ihmpavel>
+//                 Bartosz Dotryw <https://github.com/burtek>
+//                 Jason Killian <https://github.com/jkillian>
+//                 Satyajit Sahoo <https://github.com/satya164>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+export * from 'react-native-maps';
+export { default as MapView } from 'react-native-maps';
+
+import { EventSubscription } from 'fbemitter';
+import { Component, ComponentClass, Ref, ComponentType } from 'react';
+import {
+    ColorPropType,
+    ImageRequireSource,
+    ImageURISource,
+    LinkingStatic as ReactNativeLinkingStatic,
+    NativeEventEmitter,
+    ViewProps,
+    ViewStyle,
+    Permission,
+    StyleProp
+} from 'react-native';
+
+export type Axis = number;
+export type BarCodeScannedCallback = (result: { type: string; data: string; }) => void;
+export type Md5 = string;
+export type Orientation = 'portrait' | 'landscape';
+export type RequireSource = ImageRequireSource;
+export type ResizeModeContain = 'contain';
+export type ResizeModeCover = 'cover';
+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 {
+    interface AccelerometerObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    /**
+     * Subscribe for updates to the accelerometer.
+     * @param listener A callback that is invoked when an accelerometer update is available. When invoked, the listener is provided a single argumument that is an object containing keys x, y, z.
+     * @returns An EventSubscription object that you can call remove() on when you would like to unsubscribe the listener.
+     */
+    function addListener(listener: (obj: AccelerometerObject) => any): EventSubscription;
+
+    /** Remove all listeners. */
+    function removeAllListeners(): void;
+
+    /**
+     * Subscribe for updates to the accelerometer.
+     * @param intervalMs Desired interval in milliseconds between accelerometer updates.
+     */
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Admob
+ */
+export type AdMobBannerSize =
+    | 'banner'
+    | 'largeBanner'
+    | 'mediumRectangle'
+    | 'fullBanner'
+    | 'leaderboard'
+    | 'smartBannerPortrait'
+    | 'smartBannerLandscape';
+export interface AdMobBannerProperties extends ViewProps {
+    bannerSize?: AdMobBannerSize;
+    adUnitID?: string;
+    testDeviceID?: string;
+    didFailToReceiveAdWithError?(errorDescription: string): void;
+    adViewDidReceiveAd?(): void;
+    adViewWillPresentScreen?(): void;
+    adViewWillDismissScreen?(): void;
+    adViewDidDismissScreen?(): void;
+    adViewWillLeaveApplication?(): void;
+}
+
+export class AdMobBanner extends Component<AdMobBannerProperties> { }
+export interface AdMobAppEvent {
+    name: string;
+    info: string;
+}
+export interface PublisherBannerProperties extends AdMobBannerProperties {
+    onAdMobDispatchAppEvent?(event: AdMobAppEvent): void;
+}
+export class PublisherBanner extends Component<PublisherBannerProperties> { }
+
+export type AdMobInterstitialEmptyEvent =
+    | 'interstitialDidLoad'
+    | 'interstitialDidOpen'
+    | 'interstitialDidClose'
+    | 'interstitialWillLeaveApplication';
+export type AdMobInterstitialEvent = AdMobInterstitialEmptyEvent | 'interstitialDidFailToLoad';
+export namespace AdMobInterstitial {
+    function setAdUnitID(id: string): void;
+    function setTestDeviceID(id: string): void;
+    function requestAdAsync(): Promise<void>;
+    function showAdAsync(): Promise<void>;
+    function dismissAdAsync(): Promise<void>;
+    function getIsReadyAsync(): Promise<boolean>;
+    function addEventListener(event: 'interstitialDidFailToLoad', handler: (error: string) => void): void;
+    function addEventListener(event: AdMobInterstitialEmptyEvent, handler: () => void): void;
+    function removeEventListener(event: 'interstitialDidFailToLoad', handler: (error: string) => void): void;
+    function removeEventListener(event: AdMobInterstitialEmptyEvent, handler: () => void): void;
+    function removeAllListeners(): void;
+}
+
+export type AdMobRewardedEmptyEvent =
+    | 'rewardedVideoDidLoad'
+    | 'rewardedVideoDidOpen'
+    | 'rewardedVideoDidStart'
+    | 'rewardedVideoDidClose'
+    | 'rewardedVideoWillLeaveApplication';
+export type AdMobRewardedEvent = AdMobRewardedEmptyEvent | 'rewardedVideoDidRewardUser' | 'rewardedVideoDidFailToLoad';
+export namespace AdMobRewarded {
+    function setAdUnitID(id: string): void;
+    function setTestDeviceID(id: string): void;
+    function requestAdAsync(): Promise<void>;
+    function showAdAsync(): Promise<void>;
+    function dismissAdAsync(): Promise<void>;
+    function getIsReadyAsync(): Promise<boolean>;
+    function addEventListener(event: 'rewardedVideoDidRewardUser', handler: (type: string, amount: number) => void): void;
+    function addEventListener(event: 'rewardedVideoDidFailToLoad', handler: (error: string) => void): void;
+    function addEventListener(event: AdMobRewardedEmptyEvent, handler: () => void): void;
+    function removeEventListener(event: 'rewardedVideoDidRewardUser', handler: (type: string, amount: number) => void): void;
+    function removeEventListener(event: 'rewardedVideoDidFailToLoad', handler: (error: string) => void): void;
+    function removeEventListener(event: AdMobRewardedEmptyEvent, handler: () => void): void;
+    function removeAllListeners(): void;
+}
+
+/**
+ * Provides access to Amplitude mobile analytics which basically lets you log various events to the Cloud. This module wraps Amplitude’s iOS and Android SDKs.
+ *
+ * Note: Session tracking may not work correctly when running Experiences in the main Expo app. It will work correctly if you create a standalone app.
+ */
+export namespace Amplitude {
+    /** Initializes Amplitude with your Amplitude API key. */
+    function initialize(apiKey: string): void;
+
+    /** Assign a user ID to the current user. If you don’t have a system for user IDs you don’t need to call this. */
+    function setUserId(userId: string): void;
+
+    /** Set properties for the current user. */
+    function setUserProperties(userProperties: HashMap): void;
+
+    /** Clear properties set by `setUserProperties()`. */
+    function clearUserProperties(): void;
+
+    /** Log an event to Amplitude. */
+    function logEvent(eventName: string): void;
+
+    /** Log an event to Amplitude with custom properties. */
+    function logEventWithProperties(
+        eventName: string,
+
+        /** A map of custom properties. */
+        properties: HashMap
+    ): void;
+
+    /** Add the current user to a group. */
+    function setGroup(
+        /** The group name, e.g. `'sports'`. */
+        groupType: string,
+
+        /** An array of group names, e.g. `['tennis', 'soccer']`. */
+        groupNames: string[]
+    ): void;
+}
+
+// #region AppLoading
+/** The following props are recommended, but optional for the sake of backwards compatibility (they were introduced in SDK21). If you do not provide any props, you are responsible for coordinating loading assets, handling errors, and updating state to unmount the `AppLoading` component. */
+export interface AppLoadingProps {
+    /** A `function` that returns a `Promise`. The `Promise` should resolve when the app is done loading data and assets. */
+    startAsync?: () => Promise<void>;
+
+    /** Required if you provide `startAsync`. Called when `startAsync` resolves or rejects. This should be used to set state and unmount the `AppLoading` component. */
+    onFinish?: () => void;
+
+    /** If `startAsync` throws an error, it is caught and passed into the function provided to `onError`. */
+    onError?: (error: Error) => void;
+}
+
+/**
+ * A React component that tells Expo to keep the app loading screen open if it is the first and only component rendered in your app. When it is removed, the loading screen will disappear and your app will be visible.
+ *
+ * This is incredibly useful to let you download and cache fonts, logo and icon images and other assets that you want to be sure the user has on their device for an optimal experience before rendering they start using the app.
+ */
+export class AppLoading extends Component<AppLoadingProps> { }
+// #endregion AppLoading
+
+/** This module provides an interface to Expo’s asset system. An asset is any file that lives alongside the source code of your app that the app needs at runtime. Examples include images, fonts and sounds. Expo’s asset system integrates with React Native’s, so that you can refer to files with require('path/to/file'). This is how you refer to static image files in React Native for use in an Image component, for example. */
+export class Asset {
+    constructor({ name, type, hash, uri, width, height }: {
+        name: string;
+        type: string;
+        hash: string;
+        uri: string;
+        width?: number;
+        height?: number;
+    });
+
+    /** The MD5 hash of the asset’s data. */
+    hash: Md5;
+
+    /** The name of the asset file without the extension. Also without the part from @ onward in the filename (used to specify scale factor for images). */
+    name: string;
+
+    /** The extension of the asset filename. */
+    type: string;
+
+    /** A URI that points to the asset’s data on the remote server. When running the published version of your app, this refers to the the location on Expo’s asset server where Expo has stored your asset. When running the app from XDE during development, this URI points to XDE’s server running on your computer and the asset is served directly from your computer. */
+    uri: string;
+
+    /** If the asset has been downloaded (by calling `downloadAsync()`), the `file://` URI pointing to the local file on the device that contains the asset data. */
+    localUri: string;
+
+    /** If the asset is an image, the width of the image data divided by the scale factor. The scale factor is the number after `@` in the filename, or `1` if not present. */
+    width?: number;
+
+    /** If the asset is an image, the height of the image data divided by the scale factor. The scale factor is the number after `@` in the filename, or `1` if not present. */
+    height?: number;
+
+    downloading: boolean;
+    downloaded: boolean;
+    downloadCallbacks: Array<{ resolve: () => any, reject: (e?: any) => any }>;
+
+    /** Downloads the asset data to a local file in the device’s cache directory. Once the returned promise is fulfilled without error, the localUri field of this asset points to a local file containing the asset data. The asset is only downloaded if an up-to-date local file for the asset isn’t already present due to an earlier download. */
+    downloadAsync(): Promise<void>;
+
+    /** Returns the `Expo.Asset` instance representing an asset given its module. */
+    static fromModule(module: RequireSource): Asset;
+
+    /**
+     * A helper that wraps `Expo.Asset.fromModule(module).downloadAsync` for convenience.
+     * @param moduleIds An array of `require('path/to/file')`. Can also be just one module without an Array.
+     */
+    static loadAsync(module: RequireSource[] | RequireSource): Promise<void>;
+}
+
+/**
+ * Provides basic sample playback and recording.
+ *
+ * Note that Expo does not yet support backgrounding, so audio is not available to play in the background of your experience. Audio also automatically stops if headphones / bluetooth audio devices are disconnected.
+ */
+export namespace Audio {
+    enum InterruptionModeIos {
+        /** This is the default option. If this option is set, your experience’s audio is mixed with audio playing in background apps. */
+        INTERRUPTION_MODE_IOS_MIX_WITH_OTHERS = 0,
+
+        /** If this option is set, your experience’s audio interrupts audio from other apps. */
+        INTERRUPTION_MODE_IOS_DO_NOT_MIX = 1,
+
+        /** If this option is set, your experience’s audio lowers the volume ("ducks") of audio from other apps while your audio plays. */
+        INTERRUPTION_MODE_IOS_DUCK_OTHERS = 2
+    }
+
+    const INTERRUPTION_MODE_IOS_MIX_WITH_OTHERS: 0;
+    const INTERRUPTION_MODE_IOS_DO_NOT_MIX: 1;
+    const INTERRUPTION_MODE_IOS_DUCK_OTHERS: 2;
+
+    enum InterruptionModeAndroid {
+        /** If this option is set, your experience’s audio interrupts audio from other apps. */
+        INTERRUPTION_MODE_ANDROID_DO_NOT_MIX = 1,
+
+        /** This is the default option. If this option is set, your experience’s audio lowers the volume ("ducks") of audio from other apps while your audio plays. */
+        INTERRUPTION_MODE_ANDROID_DUCK_OTHERS = 2
+    }
+
+    const INTERRUPTION_MODE_ANDROID_DO_NOT_MIX: 1;
+    const INTERRUPTION_MODE_ANDROID_DUCK_OTHERS: 2;
+
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_DEFAULT: 0;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_THREE_GPP: 1;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG_4: 2;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_NB: 3;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_WB: 4;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADIF: 5;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADTS: 6;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_RTP_AVP: 7;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG2TS: 8;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_WEBM: 9;
+
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_DEFAULT: 0;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_NB: 1;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_WB: 2;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC: 3;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_HE_AAC: 4;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC_ELD: 5;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_VORBIS: 6;
+
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_LINEARPCM: 'lpcm';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AC3: 'ac-3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_60958AC3: 'cac3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLEIMA4: 'ima4';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC: 'aac ';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4CELP: 'celp';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4HVXC: 'hvxc';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4TWINVQ: 'twvq';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE3: 'MAC3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE6: 'MAC6';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ULAW: 'ulaw';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ALAW: 'alaw';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN: 'QDMC';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN2: 'QDM2';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_QUALCOMM: 'Qclp';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER1: '.mp1';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER2: '.mp2';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER3: '.mp3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLELOSSLESS: 'alac';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE: 'aach';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_LD: 'aacl';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD: 'aace';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_SBR: 'aacf';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_V2: 'aacg';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE_V2: 'aacp';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_SPATIAL: 'aacs';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR: 'samr';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR_WB: 'sawb';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AUDIBLE: 'AUDB';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ILBC: 'ilbc';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_DVIINTELIMA: 0x6d730011;
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MICROSOFTGSM: 0x6d730031;
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AES3: 'aes3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ENHANCEDAC3: 'ec-3';
+
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_MIN: 0;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_LOW: 0x20;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_MEDIUM: 0x40;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_HIGH: 0x60;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_MAX: 0x7f;
+
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_CONSTANT: 0;
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_LONG_TERM_AVERAGE: 1;
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE_CONSTRAINED: 2;
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE: 3;
+
+    type RecordingStatus = {
+        canRecord: false,
+        isDoneRecording: false
+    } | {
+        canRecord: true,
+        isRecording: boolean,
+        durationMillis: number
+    } | {
+        canRecord: false,
+        isDoneRecording: true,
+        durationMillis: number
+    };
+
+    const RECORDING_OPTIONS_PRESET_HIGH_QUALITY: RecordingOptions;
+    const RECORDING_OPTIONS_PRESET_LOW_QUALITY: RecordingOptions;
+
+    interface RecordingOptions {
+        android: {
+            extension: string;
+            outputFormat: number;
+            audioEncoder: number;
+            sampleRate?: number;
+            numberOfChannels?: number;
+            bitRate?: number;
+            maxFileSize?: number;
+        };
+        ios: {
+            extension: string;
+            outputFormat?: string | number;
+            audioQuality: number;
+            sampleRate: number;
+            numberOfChannels: number;
+            bitRate: number;
+            bitRateStrategy?: number;
+            bitDepthHint?: number;
+            linearPCMBitDepth?: number;
+            linearPCMIsBigEndian?: boolean;
+            linearPCMIsFloat?: boolean;
+        };
+    }
+
+    interface AudioMode {
+        /** Boolean selecting if your experience’s audio should play in silent mode on iOS. This value defaults to `false`. */
+        playsInSilentModeIOS: boolean;
+
+        /** Boolean selecting if recording is enabled on iOS. This value defaults to `false`. NOTE: when this flag is set to true, playback may be routed to the phone receiver instead of to the speaker. */
+        allowsRecordingIOS: boolean;
+
+        /** Enum selecting how your experience’s audio should interact with the audio from other apps on iOS. */
+        interruptionModeIOS: InterruptionModeIos;
+
+        /** Boolean selecting if your experience’s audio should automatically be lowered in volume ("duck") if audio from another app interrupts your experience. This value defaults to true. If false, audio from other apps will pause your audio. */
+        shouldDuckAndroid: boolean;
+
+        /** an enum selecting how your experience’s audio should interact with the audio from other apps on Android: */
+        interruptionModeAndroid: InterruptionModeAndroid;
+    }
+
+    function setIsEnabledAsync(value: boolean): Promise<void>;
+    function setAudioModeAsync(mode: AudioMode): Promise<void>;
+
+    /** This class represents a sound corresponding to an Asset or URL. */
+    class Sound extends PlaybackObject {
+        constructor();
+
+        /**
+         * Creates and loads a sound from source, with optional `initialStatus`, `onPlaybackStatusUpdate`, and `downloadFirst`.
+         *
+         * @returns A `Promise` that is rejected if creation failed, or fulfilled with the following dictionary if creation succeeded:
+         * - `sound`: The newly created and loaded Sound object.
+         * - `status`: The PlaybackStatus of the Sound object. See the AV documentation for further information.
+         */
+        static createAsync(
+            /**
+             * The source of the sound. The following forms are supported:
+             *
+             * - A dictionary of the form `{ uri: 'http://path/to/file' }` with a network URL pointing to an audio file on the web.
+             * - `require('path/to/file')` for an audio file asset in the source code directory.
+             * - An `Expo.Asset` object for an audio file asset.
+             */
+            source: PlaybackSource,
+
+            /** The initial intended PlaybackStatusToSet of the sound, whose values will override the default initial playback status. This value defaults to `{}` if no parameter is passed. */
+            initialStatus?: PlaybackStatusToSet,
+
+            /** A function taking a single parameter PlaybackStatus. This value defaults to `null` if no parameter is passed. */
+            onPlaybackStatusUpdate?: ((status: PlaybackStatus) => void) | null,
+
+            /** If set to true, the system will attempt to download the resource to the device before loading. This value defaults to `true`. Note that at the moment, this will only work for `source`s of the form `require('path/to/file')` or `Asset` objects. */
+            downloadFirst?: boolean
+        ): Promise<{ sound: Sound, status: PlaybackStatus }>;
+    }
+
+    class Recording {
+        constructor();
+
+        /** Gets the `status` of the `Recording`. */
+        getStatusAsync(): Promise<RecordingStatus>;
+
+        /** Sets a function to be called regularly with the `status` of the `Recording`. */
+        setOnRecordingStatusUpdate(onRecordingStatusUpdate?: (status: RecordingStatus) => void): void;
+
+        /** Sets the interval with which onRecordingStatusUpdate is called while the recording can record. This value defaults to 500 milliseconds. */
+        setProgressUpdateInterval(progressUpdateIntervalMillis: number): void;
+
+        /** Loads the recorder into memory and prepares it for recording. This must be called before calling `startAsync()`. This method can only be called if the `Recording` instance has never yet been prepared. */
+        prepareToRecordAsync(
+            /** Options for the recording, including sample rate, bitrate, channels, format, encoder, and extension. If no options are passed to `prepareToRecordAsync()`, the recorder will be created with options `Expo.Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY`. */
+            options?: RecordingOptions
+        ): Promise<RecordingStatus>;
+
+        /** Begins recording. This method can only be called if the `Recording` has been prepared. */
+        startAsync(): Promise<RecordingStatus>;
+
+        /**
+         * Pauses recording. This method can only be called if the Recording has been prepared.
+         *
+         * NOTE: This is only available on Android API version 24 and later.
+         */
+        pauseAsync(): Promise<RecordingStatus>;
+
+        /** Stops the recording and deallocates the recorder from memory. This reverts the Recording instance to an unprepared state, and another Recording instance must be created in order to record again. This method can only be called if the `Recording` has been prepared. */
+        stopAndUnloadAsync(): Promise<RecordingStatus>;
+
+        /**
+         * Gets the local URI of the Recording. Note that this will only succeed once the Recording is prepared to record.
+         *
+         * @returns A string with the local URI of the `Recording`, or `null` if the `Recording` is not prepared to record.
+         */
+        getURI(): string | null | undefined;
+
+        /**
+         * Creates and loads a new `Sound` object to play back the `Recording`. Note that this will only succeed once the `Recording` is done recording (once `stopAndUnloadAsync()` has been called).
+         *
+         * @returns A Promise that is rejected if creation failed, or fulfilled with the following dictionary if creation succeeded:
+         * - `sound`: the newly created and loaded Sound object.
+         * - `status`: the PlaybackStatus of the Sound object.
+         */
+        createNewLoadedSound(
+            /** The initial intended `PlaybackStatusToSet` of the sound, whose values will override the default initial playback status. This value defaults to `{}` if no parameter is passed. */
+            initialStatus?: PlaybackStatusToSet,
+
+            /** A function taking a single parameter `PlaybackStatus`. This value defaults to `null` if no parameter is passed. */
+            onPlaybackStatusUpdate?: ((status: PlaybackStatus) => void) | null
+        ): Promise<{ sound: Sound, status: PlaybackStatus }>;
+    }
+}
+
+/**
+ * AuthSession
+ */
+export namespace AuthSession {
+    type StartAsyncResponse = {
+        type: 'cancel';
+    } | {
+        type: 'dismissed';
+    } | {
+        type: 'success';
+        params: HashMap;
+        event: HashMap;
+    } | {
+        type: 'error';
+        params: HashMap;
+        errorCode: string;
+        event: HashMap;
+    };
+
+    function startAsync(options: { authUrl: string; returnUrl?: string; }): Promise<StartAsyncResponse>;
+    function dismiss(): void;
+    function getRedirectUrl(): string;
+}
+
+// #region AV
+/**
+ * AV
+ */
+export type PlaybackStatus = {
+    isLoaded: false;
+    androidImplementation?: string;
+
+    /** Populated exactly once when an error forces the object to unload. */
+    error?: string;
+} | {
+    isLoaded: true;
+    androidImplementation?: string;
+    uri: string;
+    progressUpdateIntervalMillis: number;
+    durationMillis?: number;
+    positionMillis: number;
+    playableDurationMillis?: number;
+    shouldPlay: boolean;
+    isPlaying: boolean;
+    isBuffering: boolean;
+    rate: number;
+    shouldCorrectPitch: boolean;
+    volume: number;
+    isMuted: boolean;
+    isLooping: boolean;
+
+    /** True exactly once when the track plays to finish. */
+    didJustFinish: boolean;
+};
+
+export interface PlaybackStatusToSet {
+    androidImplementation?: string;
+    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;
+
+export class PlaybackObject {
+    /**
+     * Gets the `PlaybackStatus` of the `playbackObject`.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject`.
+     */
+    getStatusAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * Loads the media from source into memory and prepares it for playing. This must be called before calling setStatusAsync() or any of the convenience set status methods. This method can only be called if the playbackObject is in an unloaded state.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once it is loaded, or rejects if loading failed. The `Promise` will also reject if the `playbackObject` was already loaded. See below for details on `PlaybackStatus`.
+     */
+    loadAsync(
+        /**
+         * The source of the media. The following forms are supported:
+         * - A dictionary of the form `{ uri: 'http://path/to/file' }` with a network URL pointing to a media file on the web.
+         * - `require('path/to/file')` for a media file asset in the source code directory.
+         * - An `Expo.Asset object` for a media file asset.
+         */
+        source: PlaybackSource,
+
+        /** The initial intended `PlaybackStatusToSet` of the `playbackObject`, whose values will override the default initial playback status. This value defaults to `{}` if no parameter is passed. See below for details on `PlaybackStatusToSet` and the default initial playback status. */
+        initialStatus?: PlaybackStatusToSet,
+
+        /** If set to `true`, the system will attempt to download the resource to the device before loading. This value defaults to true. Note that at the moment, this will only work for sources of the form `require('path/to/file')` or `Expo.Asset` objects. */
+        downloadFirst?: boolean
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: false })`. */
+    pauseAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: true })`.
+     *
+     * Playback may not start immediately after calling this function for reasons such as buffering. Make sure to update your UI based on the `isPlaying` and `isBuffering` properties of the `PlaybackStatus`.
+     */
+    playAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: true, positionMillis: millis })`.
+     *
+     * Playback may not start immediately after calling this function for reasons such as buffering. Make sure to update your UI based on the isPlaying and `isBuffering` properties of the `PlaybackStatus`.
+     */
+    playFromPositionAsync(
+        /** The desired position of playback in milliseconds. */
+        positionMillis: number,
+
+        /** This is equivalent to `playbackObject.setStatusAsync({ positionMillis: millis, seekMillisToleranceBefore: toleranceMillisBefore, seekMillisToleranceAfter: toleranceMillisAfter })`. The tolerances are used only on iOS. */
+        tolerances?: {
+            toleranceMillisBefore: number,
+            toleranceMillisAfter: number
+        }
+    ): Promise<PlaybackStatus>;
+
+    /**
+     * Replays the item. When using `playFromPositionAsync(0)` the item is seeked to the position at `0` ms. On iOS this method uses internal implementation of the player and is able to play the item from the beginning immediately.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once the new status has been set successfully, or rejects if setting the new status failed.
+     */
+    replayAsync(
+        /** The new `PlaybackStatusToSet` of the `playbackObject`, whose values will override the current playback status. */
+        status: PlaybackStatusToSet
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ isLooping: value })`. */
+    setIsLoopingAsync(
+        /** A boolean describing if the media should play once (`false`) or loop indefinitely (`true`). */
+        isLooping: boolean
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ isMuted: value })`. */
+    setIsMutedAsync(
+        /**  A boolean describing if the audio of this media should be muted. */
+        isMuted: boolean
+    ): Promise<PlaybackStatus>;
+
+    /**
+     * Sets a function to be called regularly with the `PlaybackStatus` of the `playbackObject`. See below for details on `PlaybackStatus` and an example use case of this function.
+     *
+     * `onPlaybackStatusUpdate` will be called whenever a call to the API for this `playbackObject` completes (such as `setStatusAsync()`, `getStatusAsync()`, or `unloadAsync()`), and will also be called at regular intervals while the media is in the loaded state. Set `progressUpdateIntervalMillis` via `setStatusAsync()` or `setProgressUpdateIntervalAsync()` to modify the interval with which `onPlaybackStatusUpdate` is called while loaded.
+     */
+    setOnPlaybackStatusUpdate(
+        /** A function taking a single parameter `PlaybackStatus`. */
+        onPlaybackStatusUpdate?: (status: PlaybackStatus) => void
+    ): void;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ positionMillis: millis })`. */
+    setPositionAsync(
+        positionMillis: number,
+
+        /** This is equivalent to `playbackObject.setStatusAsync({ positionMillis: millis, seekMillisToleranceBefore: toleranceMillisBefore, seekMillisToleranceAfter: toleranceMillisAfter })`. The tolerances are used only on iOS. */
+        tolerances?: {
+            toleranceMillisBefore: number,
+            toleranceMillisAfter: number
+        }
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ progressUpdateIntervalMillis: millis })`. */
+    setProgressUpdateIntervalAsync(
+        /** The new minimum interval in milliseconds between calls of `onPlaybackStatusUpdate`. */
+        progressUpdateIntervalMillis: number
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ rate: value, shouldCorrectPitch: shouldCorrectPitch })`. */
+    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>;
+
+    /** Sets a new `PlaybackStatusToSet` on the `playbackObject`. This method can only be called if the media has been loaded. Return a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once the new status has been set successfully, or rejects if setting the new status failed. */
+    setStatusAsync(
+        /** The new `PlaybackStatusToSet` of the `playbackObject`, whose values will override the current playback status. */
+        status: PlaybackStatusToSet
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ volume: value })`. */
+    setVolumeAsync(
+        /** A number between `0.0` (silence) and `1.0` (maximum volume). */
+        volume: number
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: false, positionMillis: 0 })`. */
+    stopAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * Unloads the media from memory. `loadAsync()` must be called again in order to be able to play the media.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once it is unloaded, or rejects if unloading failed. See below for details on `PlaybackStatus`.
+     */
+    unloadAsync(): Promise<PlaybackStatus>;
+}
+// #endregion
+
+// #region BarCodeScanner
+/**
+ * BarCodeScanner
+ */
+export interface BarCodeScannerProps extends ViewProps {
+    type?: 'front' | 'back';
+    torchMode?: 'on' | 'off';
+    barCodeTypes?: string[];
+    onBarCodeScanned?: BarCodeScannedCallback;
+}
+
+export class BarCodeScanner extends Component<BarCodeScannerProps> {
+    static Constants: {
+        TorchMode: {
+            on: string;
+            off: string
+        }
+    } & CameraConstants;
+}
+// #endregion
+
+// #region BlurView
+/**
+ * BlurView
+ */
+export interface BlurViewProps extends ViewProps {
+    tint: 'light' | 'default' | 'dark';
+    intensity: number;
+}
+export class BlurView extends Component<BlurViewProps> { }
+// #endregion
+
+/**
+ * An API to get and set screen brightness.
+ */
+export namespace Brightness {
+    /** 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
+/**
+ * Camera
+ */
+export interface PictureOptions {
+  quality?: number;
+  base64?: boolean;
+  exif?: boolean;
+  onPictureSaved?: (data: PictureResponse) => void;
+}
+
+export interface PictureResponse {
+    uri: string;
+    width: number;
+    height: number;
+    exif: string;
+    base64: string;
+}
+
+export interface RecordingOptions {
+    quality?: string | number;
+    maxDuration?: number;
+    maxFileSize?: number;
+}
+
+export class CameraObject {
+    takePictureAsync(options?: PictureOptions): Promise<PictureResponse>;
+    recordAsync(options: RecordingOptions): Promise<{ uri: string; }>;
+    stopRecording(): void;
+    getSupportedRatiosAsync(): Promise<string[]>; // Android only
+}
+
+export interface CameraProps extends ViewProps {
+    zoom?: number;
+    ratio?: string;
+    /** 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;
+    type?: number | string;
+    onCameraReady?: () => void;
+    useCamera2Api?: boolean;
+    flashMode?: number | string;
+    whiteBalance?: number | string;
+    autoFocus?: string | boolean | number;
+    pictureSize?: string;
+    videoStabilizationMode?: number;
+    onMountError?: (error: { message: string }) => void;
+    barCodeScannerSettings?: { barCodeTypes?: Array<string | number>; };
+    onBarCodeScanned?: BarCodeScannedCallback;
+    faceDetectorSettings?: {
+        mode?: number;
+        runClassifications?: number;
+        detectLandmarks?: number;
+    };
+    onFacesDetected?: (options: { faces: TrackedFaceFeature[] }) => void;
+    ref?: Ref<CameraObject>;
+}
+
+export interface CameraConstants {
+    readonly Type: {
+        back: string;
+        front: string;
+    };
+    readonly FlashMode: {
+        on: string;
+        off: string;
+        auto: string;
+        torch: string;
+    };
+    readonly AutoFocus: {
+        on: string;
+        off: string;
+    };
+    readonly WhiteBalance: {
+        auto: string;
+        sunny: string;
+        cloudy: string;
+        shadow: string;
+        fluorescent: string;
+        incandescent: string;
+    };
+    readonly VideoQuality: {
+        [videoQuality: string]: number;
+    };
+    readonly BarCodeType: {
+        aztec: string;
+        codabar: string;
+        code39: string;
+        code93: string;
+        code128: string;
+        code138: string;
+        code39mod43: string;
+        datamatrix: string;
+        ean13: string;
+        ean8: string;
+        interleaved2of5: string;
+        itf14: string;
+        maxicode: string;
+        pdf417: string;
+        rss14: string;
+        rssexpanded: string;
+        upc_a: string;
+        upc_e: string;
+        upc_ean: string;
+        qr: string;
+    };
+}
+
+export class Camera extends Component<CameraProps> {
+    static readonly Constants: CameraConstants;
+}
+// #endregion
+
+/**
+ * Constants
+ */
+export namespace Constants {
+    const appOwnership: 'expo' | 'standalone' | 'guest';
+    const expoVersion: string;
+    const installationId: string;
+    const deviceId: string;
+    const deviceName: string;
+    const deviceYearClass: number;
+    const isDevice: boolean;
+
+    interface Platform {
+        ios?: {
+            platform: string;
+            model: string;
+            userInterfaceIdiom: string;
+            buildNumber: string;
+        };
+        android?: {
+            versionCode: string;
+        };
+    }
+    const platform: Platform;
+    const sessionId: string;
+    const statusBarHeight: number;
+    const systemFonts: string[];
+
+    interface Manifest {
+        name: string;
+        description?: string;
+        slug?: string;
+        sdkVersion?: string;
+        version?: string;
+        orientation?: Orientation;
+        primaryColor?: string;
+        privacy?: 'public' | 'unlisted';
+        scheme?: string;
+        icon?: string;
+        platforms?: string[];
+        githubUrl?: string;
+        notification?: {
+            icon?: string,
+            color?: string,
+            androidMode?: 'default' | 'collapse',
+            androidCollapsedTitle?: string
+        };
+        loading?: {
+            icon?: string,
+            exponentIconColor?: 'white' | 'blue',
+            exponentIconGrayscale?: 1 | 0,
+            backgroundImage?: string,
+            backgroundColor?: string,
+            hideExponentText?: boolean
+        };
+        appKey?: string;
+        androidStatusBar?: {
+            barStyle?: 'light-content' | 'dark-content',
+            backgroundColor?: string
+        };
+        androidShowExponentNotificationInShellApp?: boolean;
+        extra?: {
+            [propName: string]: any
+        };
+        rnCliPath?: any;
+        entryPoint?: string;
+        packagerOpts?: {
+            hostType?: string,
+            dev?: boolean,
+            strict?: boolean,
+            minify?: boolean,
+            urlType?: string,
+            urlRandomness?: string,
+            lanType?: string,
+            [propName: string]: any
+        };
+        ignoreNodeModulesValidation?: any;
+        nodeModulesPath?: string;
+        ios?: {
+            bundleIdentifier?: string,
+            buildNumber?: string,
+            config?: {
+                usesNonExemptEncryption?: boolean,
+                googleSignIn?: {
+                    reservedClientId: string
+                }
+            },
+            supportsTablet?: boolean,
+            infoPlist?: any
+        };
+        android?: {
+            package?: string,
+            versionCode?: string,
+            config?: {
+                fabric?: {
+                    apiKey: string,
+                    buildSecret: string
+                },
+                googleMaps?: {
+                    apiKey: string
+                },
+                googleSignIn?: {
+                    apiKey: string,
+                    certificateHash: string
+                }
+            }
+        };
+        facebookScheme?: any;
+        facebookAppId?: string;
+        facebookDisplayName?: string;
+        splash?: {
+            backgroundColor?: string;
+            resizeMode?: ResizeModeContain | ResizeModeCover;
+            image?: string;
+        };
+        assetBundlePatterns?: string[];
+        releaseChannel: string;
+        [propName: string]: any;
+    }
+    const manifest: Manifest;
+    const linkingUri: string;
+
+    function getWebViewUserAgentAsync(): Promise<string>;
+}
+
+/**
+ * Contacts
+ */
+export namespace Contacts {
+    // Constants
+
+    namespace Fields {
+        type ID = 'id';
+        type Name = 'name';
+        type FirstName = 'firstName';
+        type MiddleName = 'middleName';
+        type LastName = 'lastName';
+        type NamePrefix = 'namePrefix';
+        type NameSuffix = 'nameSuffix';
+        type PhoneticFirstName = 'phoneticFirstName';
+        type PhoneticMiddleName = 'phoneticMiddleName';
+        type PhoneticLastName = 'phoneticLastName';
+        type Birthday = 'birthday';
+        type Emails = 'emails';
+        type PhoneNumbers = 'phoneNumbers';
+        type Addresses = 'addresses';
+        type InstantMessageAddresses = 'instantMessageAddresses';
+        type UrlAddresses = 'urlAddresses';
+        type Company = 'company';
+        type JobTitle = 'jobTitle';
+        type Department = 'department';
+        type ImageAvailable = 'imageAvailable';
+        type Image = 'image';
+        type Note = 'note';
+        type Dates = 'dates';
+        type Relationships = 'relationships';
+        type Nickname = 'nickname';
+        type RawImage = 'rawImage';
+        type MaidenName = 'maidenName';
+        type ContactType = 'contactType';
+        type SocialProfiles = 'socialProfiles';
+        type NonGregorianBirthday = 'nonGregorianBirthday';
+
+        const ID: ID;
+        const Name: Name;
+        const FirstName: FirstName;
+        const MiddleName: MiddleName;
+        const LastName: LastName;
+        const NamePrefix: NamePrefix;
+        const NameSuffix: NameSuffix;
+        const PhoneticFirstName: PhoneticFirstName;
+        const PhoneticMiddleName: PhoneticMiddleName;
+        const PhoneticLastName: PhoneticLastName;
+        const Birthday: Birthday;
+        const Emails: Emails;
+        const PhoneNumbers: PhoneNumbers;
+        const Addresses: Addresses;
+        const InstantMessageAddresses: InstantMessageAddresses;
+        const UrlAddresses: UrlAddresses;
+        const Company: Company;
+        const JobTitle: JobTitle;
+        const Department: Department;
+        const ImageAvailable: ImageAvailable;
+        const Image: Image;
+        const Note: Note;
+        const Dates: Dates;
+        const Relationships: Relationships;
+        const Nickname: Nickname;
+        const RawImage: RawImage;
+        const MaidenName: MaidenName;
+        const ContactType: ContactType;
+        const SocialProfiles: SocialProfiles;
+        const NonGregorianBirthday: NonGregorianBirthday;
+    }
+
+    type Field =
+        | Fields.ID
+        | Fields.Name
+        | Fields.FirstName
+        | Fields.MiddleName
+        | Fields.LastName
+        | Fields.NamePrefix
+        | Fields.NameSuffix
+        | Fields.PhoneticFirstName
+        | Fields.PhoneticMiddleName
+        | Fields.PhoneticLastName
+        | Fields.Birthday
+        | Fields.Emails
+        | Fields.PhoneNumbers
+        | Fields.Addresses
+        | Fields.InstantMessageAddresses
+        | Fields.UrlAddresses
+        | Fields.Company
+        | Fields.JobTitle
+        | Fields.Department
+        | Fields.ImageAvailable
+        | Fields.Image
+        | Fields.Note
+        | Fields.Dates
+        | Fields.Relationships
+        | Fields.Nickname
+        | Fields.RawImage
+        | Fields.MaidenName
+        | Fields.ContactType
+        | Fields.SocialProfiles
+        | Fields.NonGregorianBirthday;
+
+    namespace FormTypes {
+        type New = 'new';
+        type Unknown = 'unknown';
+        type Default = 'default';
+
+        const New: New;
+        const Unknown: Unknown;
+        const Default: Default;
+    }
+
+    type FormType = FormTypes.New | FormTypes.Unknown | FormTypes.Default;
+
+    /**
+     * iOS Only
+     */
+    namespace ContactTypes {
+        type Person = 'person';
+        type Company = 'company';
+
+        const Person: Person;
+        const Company: Company;
+    }
+
+    type ContactType = ContactTypes.Person | ContactTypes.Company;
+
+    namespace SortTypes {
+        type FirstName = 'firstName';
+        type LastName = 'lastName';
+        type UserDefault = 'userDefault';
+
+        const FirstName: FirstName;
+        const LastName: LastName;
+        const UserDefault: UserDefault;
+    }
+
+    type SortType = SortTypes.FirstName | SortTypes.LastName | SortTypes.UserDefault;
+
+    /**
+     * iOS Only
+     */
+    namespace ContainerTypes {
+        type Local = 'local';
+        type Exchange = 'exchange';
+        type CardDAV = 'cardDAV';
+        type Unassigned = 'unassigned';
+
+        const Local: Local;
+        const Exchange: Exchange;
+        const CardDAV: CardDAV;
+        const Unassigned: Unassigned;
+    }
+
+    type ContainerType = ContainerTypes.Local | ContainerTypes.Exchange | ContainerTypes.CardDAV | ContainerTypes.Unassigned;
+
+    namespace CalendarFormats {
+        type Gregorian = 'gregorian';
+        type Chinese = 'chinese';
+        type Hebrew = 'hebrew';
+        type Islamic = 'islamic';
+
+        const Gregorian: Gregorian;
+        const Chinese: Chinese;
+        const Hebrew: Hebrew;
+        const Islamic: Islamic;
+    }
+
+    type CalendarFormat = CalendarFormats.Gregorian | CalendarFormats.Chinese | CalendarFormats.Hebrew | CalendarFormats.Islamic;
+
+    // Types
+
+    /**
+     * A set of fields that define information about a single entity.
+     */
+    interface Contact {
+        id: string;
+        name: string;
+        firstName?: string;
+        middleName?: string;
+        lastName?: string;
+        maidenName?: string;
+        namePrefix?: string;
+        nameSuffix?: string;
+        nickname?: string;
+        phoneticFirstName?: string;
+        phoneticMiddleName?: string;
+        phoneticLastName?: string;
+        company?: string;
+        jobTitle?: string;
+        department?: string;
+        note?: string;
+        imageAvailable?: boolean;
+        image?: Image;
+        rawImage?: Image;
+        contactType: ContactType;
+        birthday?: ContactDate;
+        dates?: ContactDate[];
+        relationships?: Relationship[];
+        emails?: Email[];
+        phoneNumbers?: PhoneNumber[];
+        addresses?: Address[];
+        instantMessageAddresses?: InstantMessageAddress[];
+        urlAddresses?: UrlAddress[];
+        /**
+         * iOS only
+         */
+        nonGregorianBirthday?: ContactDate;
+        /**
+         * iOS only
+         */
+        socialProfiles?: SocialProfile[];
+    }
+
+    interface ContactDate {
+        day: number;
+        month: number;
+        year: number;
+        format: CalendarFormat;
+        id: string;
+        label: string;
+    }
+
+    interface Relationship {
+        name: string;
+        id: string;
+        label: string;
+    }
+
+    interface Email {
+        email: string;
+        isPrimary: boolean;
+        id: string;
+        label: string;
+    }
+
+    interface PhoneNumber {
+        number: string;
+        isPrimary: boolean;
+        digits: string;
+        countryCode: string;
+        id: string;
+        label: string;
+    }
+
+    interface Address {
+        street: string;
+        city: string;
+        country: string;
+        region: string;
+        neighborhood: string;
+        postalCode: string;
+        poBox: string;
+        isoCountryCode: string;
+        id: string;
+        label: string;
+    }
+
+    /**
+     * iOS only
+     */
+    interface SocialProfile {
+        service: string;
+        username: string;
+        localizedProfile: string;
+        url: string;
+        userId: string;
+        id: string;
+        label: string;
+    }
+
+    interface InstantMessageAddress {
+        service: string;
+        username: string;
+        localizedProfile: string;
+        id: string;
+        label: string;
+    }
+
+    interface UrlAddress {
+        url: string;
+        id: string;
+        label: string;
+    }
+
+    /**
+     * Information regarding thumbnail images
+     */
+    interface Image {
+        uri: string;
+        /**
+         * iOS only
+         * In Android you can get dimensions using `ReactNative.Image.getSize`
+         */
+        width?: number;
+        /**
+         * iOS only
+         * In Android you can get dimensions using `ReactNative.Image.getSize`
+         */
+        height?: number;
+        /**
+         * Avoid using Base 64 in React Native
+         * iOS only
+         */
+        base64?: string;
+    }
+
+    /**
+     * A parent to contacts. A contact can belong to multiple groups.
+     * iOS Only
+     */
+    interface Group {
+        id: string;
+        name: string;
+    }
+
+    /**
+     * A parent to contacts and groups.
+     * iOS Only
+     */
+    interface Container {
+        id: string;
+        name: string;
+    }
+
+    /**
+     * Denotes the functionality of a native contact form
+     */
+    interface FormOptions {
+        displayedPropertyKeys?: Field[];
+        message?: string;
+        alternateName?: string;
+        cancelButtonTitle?: string;
+        groupId?: string;
+        allowsEditing?: boolean;
+        allowsActions?: boolean;
+        shouldShowLinkedContacts?: boolean;
+        isNew?: boolean;
+        preventAnimation?: boolean;
+    }
+
+    /**
+     * Used to query contacts from the user's device
+     */
+    interface ContactQuery {
+        fields?: Field[];
+        pageSize?: number;
+        pageOffset?: number;
+        id?: string;
+        /** Android Only */
+        sort?: SortType;
+        /** iOS Only */
+        name?: string;
+        /** iOS Only */
+        groupId?: string;
+        /** iOS Only */
+        containerID?: string;
+        /** iOS Only */
+        rawContacts?: boolean;
+    }
+
+    interface ContactResponse {
+        data: Contact[];
+        /**
+         * This will be true if there are more contacts to retrieve beyond what is returned
+         */
+        hasNextPage: boolean;
+        /**
+         * `true` if there are previous contacts that weren't retrieved due to `pageOffset`
+         */
+        hasPreviousPage: boolean;
+    }
+
+    /**
+     * Used to query native contact groups.
+     * iOS Only
+     */
+    interface GroupQuery {
+        groupName?: string;
+        groupId?: string;
+        containerId?: string;
+    }
+
+    /**
+     * Used to query native contact containers.
+     * iOS Only
+     */
+    interface ContainerQuery {
+        contactId?: string;
+        groupId?: string;
+        containerId?: string;
+    }
+
+    // Methods
+
+    /**
+     * Return a list of contacts that fit a given criteria. You can get all of the contacts by passing no criteria.
+     */
+    function getContactsAsync(contactQuery?: ContactQuery): Promise<ContactResponse>;
+    /**
+     * Returns a contact matching the input id. Used for gathering precise data about a contact.
+     */
+    function getContactByIdAsync(contactId: string, fields?: Field[]): Promise<Contact>;
+
+    // iOS Only - temporary
+    /**
+     * Creates a new contact and adds it to the system.
+     * iOS Only - temporary
+     */
+    function addContactAsync(contact: Contact, containerId?: string): Promise<string>;
+    /**
+     * Mutate the information of an existing contact.
+     * iOS Only - temporary
+     */
+    function updateContactAsync(contact: Contact): Promise<string>;
+    /**
+     * Delete a contact from the system.
+     * iOS Only - temporary
+     */
+    function removeContactAsync(contactId: string): Promise<void>;
+    /**
+     * Query a set of contacts and write them to a local uri that can be used for sharing with `ReactNative.Share`.
+     * iOS Only - temporary
+     */
+    function writeContactToFileAsync(contactQuery: ContactQuery): Promise<string>;
+
+    // iOS Only
+    /**
+     * Present a native form for manipulating contacts.
+     * iOS Only
+     */
+    function presentFormAsync(contactId: string, contact?: Contact, formOptions?: FormOptions): Promise<void>;
+    /**
+     * Add a group to a container.
+     * iOS Only
+     */
+    function addExistingGroupToContainerAsync(groupId: string, containerId: string): Promise<void>;
+    /**
+     * Create a group with a name, and add it to a container. If the container is undefined, the default container will be targeted.
+     * iOS Only
+     */
+    function createGroupAsync(groupName: string, containerId?: string): Promise<string>;
+    /**
+     * Change the name of an existing group.
+     * iOS Only
+     */
+    function updateGroupNameAsync(groupName: string, groupId: string): Promise<void>;
+    /**
+     * Delete a group from the device.
+     * iOS Only
+     */
+    function removeGroupAsync(groupId: string): Promise<void>;
+    /**
+     * Add a contact as a member to a group. A contact can be a member of multiple groups.
+     * iOS Only
+     */
+    function addExistingContactToGroupAsync(contactId: string, groupId: string): Promise<void>;
+    /**
+     * Remove a contact's membership from a given group. This will not delete the contact.
+     * iOS Only
+     */
+    function removeContactFromGroupAsync(contactId: string, groupId: string): Promise<void>;
+    /**
+     * Query and return a list of system groups.
+     * iOS Only
+     */
+    function getGroupsAsync(query: GroupQuery): Promise<Group[]>;
+    /**
+     * Get the default container's ID.
+     * iOS Only
+     */
+    function getDefaultContainerIdAsync(): Promise<string>;
+    /**
+     * Query a list of system containers.
+     * iOS Only
+     */
+    function getContainersAsync(containerQuery: ContainerQuery): Promise<Container[]>;
+}
+
+/**
+ * DocumentPicker
+ */
+export namespace DocumentPicker {
+    interface Options {
+        type?: string;
+    }
+
+    type Response = {
+        type: 'success';
+        uri: string;
+        name: string;
+        size: number;
+    } | {
+        type: 'cancel';
+    };
+
+    function getDocumentAsync(options?: Options): Promise<Response>;
+}
+
+/**
+ * ErrorRecovery
+ */
+export namespace ErrorRecovery {
+    function setRecoveryProps(props: HashMap): void;
+}
+
+/**
+ * Facebook
+ */
+export namespace Facebook {
+    interface Options {
+        permissions?: string[];
+        behavior?: 'web' | 'native' | 'browser' | 'system';
+    }
+    interface Response {
+        type: 'cancel' | 'success';
+        token?: string;
+        expires?: number;
+    }
+    function logInWithReadPermissionsAsync(appId: string, options?: Options): Promise<Response>;
+}
+
+/**
+ * Facebook Ads
+ */
+export namespace FacebookAds {
+    /**
+     * Interstitial Ads
+     */
+    namespace InterstitialAdManager {
+        function showAd(placementId: string): Promise<boolean>;
+    }
+
+    /**
+     * Native Ads
+     */
+    type MediaCachePolicy = 'none' | 'icon' | 'image' | 'all';
+    class NativeAdsManager {
+        constructor(placementId: string, numberOfAdsToRequest?: number);
+        disableAutoRefresh(): void;
+        setMediaCachePolicy(cachePolicy: MediaCachePolicy): void;
+    }
+
+    interface NativeAd {
+        /**
+         * The headline the advertiser entered when they created their ad. This is usually the ad's main
+         * title.
+         */
+        headline?: string;
+
+        /**
+         * The link description which is additional information that the advertiser may have entered
+         */
+        linkDescription?: string;
+
+        /**
+         * The name of the Facebook Page or mobile app that represents the business running the ad
+         */
+        advertiserName?: string;
+
+        /**
+         * The ad's social context, such as, "Over half a million users"
+         */
+        socialContext?: string;
+
+        /**
+         * The call-to-action phrase of the ad, such as, "Install Now"
+         */
+        callToActionText?: string;
+
+        /**
+         * The body text, truncated to 90 characters, that contains the text the advertiser entered when
+         * they created their ad to tell people what the ad promotes
+         */
+        bodyText?: string;
+
+        /**
+         * The word "ad", translated into the viewer's language
+         */
+        adTranslation?: string;
+
+        /**
+         * The word "promoted", translated into the viewer's language
+         */
+        promotedTranslation?: string;
+
+        /**
+         * The word "sponsored", translated into the viewer's language
+         */
+        sponsoredTranslation?: string;
+    }
+
+    function withNativeAd<P>(component: Component<P & { nativeAd: NativeAd }>): Component<
+        {
+            adsManager: NativeAdsManager,
+            onAdLoaded?: ((ad: NativeAd) => void) | null;
+        } & P,
+        { ad: NativeAd | null, canRequestAds: boolean }
+    >;
+
+    /**
+     * Banner View
+     */
+    type AdType = 'large' | 'rectangle' | 'standard';
+
+    interface BannerViewProps {
+        type: AdType;
+        placementId: string;
+        onPress: () => void;
+        onError: () => void;
+    }
+
+    class BannerView extends Component<BannerViewProps> { }
+
+    type AdTriggerViewProps<P> = {
+        renderInteractiveComponent?: (props: P) => React.ReactElement<P>;
+    } & P;
+
+    class AdTriggerView<P> extends Component<AdTriggerViewProps<P>> { }
+
+    class AdIconView extends Component { }
+
+    class AdMediaView extends Component { }
+
+    /**
+     * Ad Settings
+     */
+    namespace AdSettings {
+        const currentDeviceHash: string;
+        function addTestDevice(device: string): void;
+        function clearTestDevices(): void;
+        type SDKLogLevel = 'none' | 'debug' | 'verbose' | 'warning' | 'error' | 'notification';
+        function setLogLevel(logLevel: SDKLogLevel): void;
+        function setIsChildDirected(isDirected: boolean): void;
+        function setMediationService(mediationService: string): void;
+        function setUrlPrefix(urlPrefix: string): void;
+    }
+}
+
+/**
+ * FaceDetector
+ */
+export interface Point {
+    x: Axis;
+    y: Axis;
+}
+
+export interface FaceFeature {
+    bounds: {
+        size: {
+            width: number;
+            height: number;
+        },
+        origin: Point;
+    };
+    smilingProbability?: number;
+    leftEarPosition?: Point;
+    rightEarPosition?: Point;
+    leftEyePosition?: Point;
+    leftEyeOpenProbability?: number;
+    rightEyePosition?: Point;
+    rightEyeOpenProbability?: number;
+    leftCheekPosition?: Point;
+    rightCheekPosition?: Point;
+    leftMouthPosition?: Point;
+    mouthPosition?: Point;
+    rightMouthPosition?: Point;
+    bottomMouthPosition?: Point;
+    noseBasePosition?: Point;
+    yawAngle?: number;
+    rollAngle?: number;
+}
+
+export interface TrackedFaceFeature extends FaceFeature {
+    faceID?: number;
+}
+
+export namespace FaceDetector {
+    interface DetectFaceResult {
+        faces: FaceFeature[];
+        image: {
+            uri: string;
+            width: number;
+            height: number;
+            orientation: number;
+        };
+    }
+    interface Mode {
+        fast: 'fast';
+        accurate: 'accurate';
+    }
+    interface _Shared {
+        all: 'all';
+        none: 'none';
+    }
+    type Landmarks = _Shared;
+    type Classifications = _Shared;
+    interface _Constants {
+        Mode: Mode;
+        Landmarks: Landmarks;
+        Classifications: Classifications;
+    }
+
+    const Constants: _Constants;
+
+    interface DetectionOptions {
+        mode?: keyof Mode;
+        detectLandmarks?: keyof Landmarks;
+        runClassifications?: keyof Classifications;
+    }
+
+    function detectFaces(uri: string, options?: DetectionOptions): Promise<DetectFaceResult>;
+}
+/**
+ * FileSystem
+ */
+export namespace FileSystem {
+    type EncodingType = "utf8" | "base64";
+
+    type FileInfo = {
+        exists: true;
+        isDirectory: boolean;
+        uri: string;
+        size: number;
+        modificationTime: number;
+        md5?: Md5;
+    } | {
+        exists: false;
+        isDirectory: false;
+    };
+
+    interface ReadingOptions {
+        encoding?: EncodingType;
+        position?: number;
+        length?: number;
+    }
+
+    interface WritingOptions {
+        encoding?: EncodingType;
+    }
+
+    interface DownloadResult {
+        uri: string;
+        status: number;
+        headers: { [name: string]: string };
+        md5?: Md5;
+    }
+
+    const documentDirectory: string;
+    const cacheDirectory: string;
+
+    function getInfoAsync(fileUri: string, options?: { md5?: string, size?: boolean; }): Promise<FileInfo>;
+    function readAsStringAsync(fileUri: string, options?: ReadingOptions): Promise<string>;
+    function writeAsStringAsync(fileUri: string, contents: string, options?: WritingOptions): Promise<void>;
+    function deleteAsync(fileUri: string, options?: { idempotent: boolean; }): Promise<void>;
+    function moveAsync(options: { from: string, to: string; }): Promise<void>;
+    function copyAsync(options: { from: string, to: string; }): Promise<void>;
+    function makeDirectoryAsync(dirUri: string, options?: { intermediates: boolean }): Promise<void>;
+    function readDirectoryAsync(dirUri: string): Promise<string[]>;
+    function downloadAsync(uri: string, fileUri: string, options?: { md5?: boolean; }): Promise<DownloadResult>;
+    function createDownloadResumable(
+        uri: string,
+        fileUri: string,
+        options?: DownloadOptions,
+        callback?: (totalBytesWritten: number, totalBytesExpectedToWrite: number) => void,
+        resumeData?: string | null
+    ): DownloadResumable;
+
+    interface PauseResult {
+        url: string;
+        fileUri: string;
+        options: { md5: boolean; };
+        resumeData: string;
+    }
+
+    interface DownloadOptions {
+        md5?: boolean;
+        headers?: { [name: string]: string };
+    }
+
+    interface DownloadProgressData {
+        totalBytesWritten: number;
+        totalBytesExpectedToWrite: number;
+    }
+
+    type DownloadProgressCallback = (data: DownloadProgressData) => void;
+
+    class DownloadResumable {
+        constructor(
+            url: string,
+            fileUri: string,
+            options: DownloadOptions,
+            callback?: DownloadProgressCallback,
+            resumeData?: string
+        );
+
+        downloadAsync(): Promise<DownloadResult>;
+        pauseAsync(): Promise<PauseResult>;
+        resumeAsync(): Promise<DownloadResult>;
+        savable(): PauseResult;
+    }
+}
+
+/** Use TouchID/FaceID (iOS) or the Fingerprint API (Android) to authenticate the user with a fingerprint scan. */
+export namespace LocalAuthentication {
+    type LocalAuthenticationResult = {
+        success: true
+    } | {
+        success: false,
+
+        /** Error code in the case where authentication fails. */
+        error: string
+    };
+
+    interface AuthenticationTypeType {
+        FINGERPRINT: number;
+        FACIAL_RECOGNITION: number;
+    }
+
+    /** Determine the auhentication types supported on the device. */
+    function supportedAuthenticationTypesAsync(): Promise<AuthenticationTypeType[]>;
+
+    /** Determine whether a face or fingerprint scanner is available on the device. */
+    function hasHardwareAsync(): Promise<boolean>;
+
+    /** Determine whether the device has saved fingerprints or facial data to use for authentication. */
+    function isEnrolledAsync(): Promise<boolean>;
+
+    /**
+     * Attempts to authenticate via Fingerprint. Android: When using the fingerprint module on Android, you need to provide a UI component to prompt the user to scan their fingerprint, as the OS has no default alert for it.
+     *
+     * @param promptMessage A message that is shown alongside the TouchID/FaceID prompt. (iOS only)
+     */
+    function authenticateAsync(promptMessageIOS?: string): Promise<LocalAuthenticationResult>;
+
+    /** Cancels the fingerprint authentication flow. (Android only) */
+    function cancelAuthenticate(): void;
+}
+
+/**
+ * Font
+ */
+export namespace Font {
+    interface FontMap {
+        [name: string]: RequireSource;
+    }
+
+    function loadAsync(name: string, url: string): Promise<void>;
+    function loadAsync(map: FontMap): Promise<void>;
+}
+
+// #region GLView
+export interface ExpoWebGLRenderingContext extends WebGLRenderingContext {
+    endFrameEXP(): void;
+}
+
+/**
+ * A View that acts as an OpenGL ES render target. On mounting, an OpenGL ES
+ * context is created. Its drawing buffer is presented as the contents of
+ * the View every frame.
+ */
+export interface GLViewProps extends ViewProps {
+    /**
+     * A function that will be called when the OpenGL ES context is created.
+     * Passes an object with a WebGLRenderingContext interface as an argument.
+     */
+    onContextCreate(gl: ExpoWebGLRenderingContext): void;
+
+    /** Number of MSAA samples to use on iOS. Defaults to 4. Ignored on Android. */
+    msaaSamples?: number;
+}
+
+export class GLView extends Component<GLViewProps, { msaaSamples: number }> { }
+// #endregion
+
+/**
+ * Google
+ */
+export namespace Google {
+    interface LogInConfig {
+        androidClientId?: string;
+        androidStandaloneAppClientId?: string;
+        iosClientId?: string;
+        iosStandaloneAppClientId?: string;
+        webClientId?: string;
+        behavior?: 'system' | 'web';
+        scopes?: string[];
+    }
+
+    type LogInResult = {
+        type: 'cancel';
+    } | {
+        type: 'success';
+        accessToken: string;
+        idToken?: string;
+        refreshToken?: string;
+        serverAuthCode?: string;
+        user: {
+            id: string;
+            name: string;
+            givenName: string;
+            familyName: string;
+            photoUrl?: string;
+            email?: string;
+        }
+    };
+
+    function logInAsync(config: LogInConfig): Promise<LogInResult>;
+}
+
+/** Access the device gyroscope sensor to respond to changes in rotation in 3d space. */
+export namespace Gyroscope {
+    interface GyroscopeObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    /** A callback that is invoked when an gyroscope update is available. */
+    function addListener(listener: (obj: GyroscopeObject) => any): EventSubscription;
+
+    /** Remove all listeners. */
+    function removeAllListeners(): void;
+
+    /** Subscribe for updates to the gyroscope. */
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * 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;
+        height: number;
+        base64?: string;
+    }
+
+    interface SaveOptions {
+        base64?: boolean;
+        /** 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';
+    }
+
+    function manipulateAsync(uri: string, actions: Action[], saveOptions?: SaveOptions): Promise<ImageResult>;
+}
+
+/**
+ * Image Picker
+ */
+export namespace ImagePicker {
+    interface ImageInfo {
+        uri: string;
+        width: number;
+        height: number;
+        type: 'video' | 'image';
+        base64?: string;
+        exif?: object;
+        duration?: number;
+    }
+
+    type ImageResult = { cancelled: true } | ({ cancelled: false } & ImageInfo);
+
+    interface _MediaTypeOptions {
+        All: 'All';
+        Videos: 'Videos';
+        Images: 'Images';
+    }
+
+    const MediaTypeOptions: _MediaTypeOptions;
+
+    interface ImageLibraryOptions {
+        allowsEditing?: boolean;
+        aspect?: [number, number];
+        quality?: number;
+        base64?: boolean;
+        exif?: boolean;
+        mediaTypes?: keyof _MediaTypeOptions;
+    }
+
+    /**
+     * require Permissions.CAMERA_ROLL
+     */
+    function launchImageLibraryAsync(options?: ImageLibraryOptions): Promise<ImageResult>;
+
+    interface CameraOptions {
+        allowsEditing?: boolean;
+        aspect?: [number, number];
+        quality?: number;
+        base64?: boolean;
+        exif?: boolean;
+    }
+
+    /**
+     * require Permissions.CAMERA_ROLL
+     */
+    function launchCameraAsync(options?: CameraOptions): Promise<ImageResult>;
+}
+
+/**
+ * IntentLauncherAndroid
+ */
+export namespace IntentLauncherAndroid {
+    const ACTION_ACCESSIBILITY_SETTINGS: 'android.settings.ACCESSIBILITY_SETTINGS';
+    const ACTION_APP_NOTIFICATION_REDACTION: 'android.settings.ACTION_APP_NOTIFICATION_REDACTION';
+    const ACTION_CONDITION_PROVIDER_SETTINGS: 'android.settings.ACTION_CONDITION_PROVIDER_SETTINGS';
+    const ACTION_NOTIFICATION_LISTENER_SETTINGS: 'android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS';
+    const ACTION_PRINT_SETTINGS: 'android.settings.ACTION_PRINT_SETTINGS';
+    const ACTION_ADD_ACCOUNT_SETTINGS: 'android.settings.ADD_ACCOUNT_SETTINGS';
+    const ACTION_AIRPLANE_MODE_SETTINGS: 'android.settings.AIRPLANE_MODE_SETTINGS';
+    const ACTION_APN_SETTINGS: 'android.settings.APN_SETTINGS';
+    const ACTION_APPLICATION_DETAILS_SETTINGS: 'android.settings.APPLICATION_DETAILS_SETTINGS';
+    const ACTION_APPLICATION_DEVELOPMENT_SETTINGS: 'android.settings.APPLICATION_DEVELOPMENT_SETTINGS';
+    const ACTION_APPLICATION_SETTINGS: 'android.settings.APPLICATION_SETTINGS';
+    const ACTION_APP_NOTIFICATION_SETTINGS: 'android.settings.APP_NOTIFICATION_SETTINGS';
+    const ACTION_APP_OPS_SETTINGS: 'android.settings.APP_OPS_SETTINGS';
+    const ACTION_BATTERY_SAVER_SETTINGS: 'android.settings.BATTERY_SAVER_SETTINGS';
+    const ACTION_BLUETOOTH_SETTINGS: 'android.settings.BLUETOOTH_SETTINGS';
+    const ACTION_CAPTIONING_SETTINGS: 'android.settings.CAPTIONING_SETTINGS';
+    const ACTION_CAST_SETTINGS: 'android.settings.CAST_SETTINGS';
+    const ACTION_DATA_ROAMING_SETTINGS: 'android.settings.DATA_ROAMING_SETTINGS';
+    const ACTION_DATE_SETTINGS: 'android.settings.DATE_SETTINGS';
+    const ACTION_DEVICE_INFO_SETTINGS: 'android.settings.DEVICE_INFO_SETTINGS';
+    const ACTION_DEVICE_NAME: 'android.settings.DEVICE_NAME';
+    const ACTION_DISPLAY_SETTINGS: 'android.settings.DISPLAY_SETTINGS';
+    const ACTION_DREAM_SETTINGS: 'android.settings.DREAM_SETTINGS';
+    const ACTION_HARD_KEYBOARD_SETTINGS: 'android.settings.HARD_KEYBOARD_SETTINGS';
+    const ACTION_HOME_SETTINGS: 'android.settings.HOME_SETTINGS';
+    const ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS: 'android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS';
+    const ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS: 'android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS';
+    const ACTION_INPUT_METHOD_SETTINGS: 'android.settings.INPUT_METHOD_SETTINGS';
+    const ACTION_INPUT_METHOD_SUBTYPE_SETTINGS: 'android.settings.INPUT_METHOD_SUBTYPE_SETTINGS';
+    const ACTION_INTERNAL_STORAGE_SETTINGS: 'android.settings.INTERNAL_STORAGE_SETTINGS';
+    const ACTION_LOCALE_SETTINGS: 'android.settings.LOCALE_SETTINGS';
+    const ACTION_LOCATION_SOURCE_SETTINGS: 'android.settings.LOCATION_SOURCE_SETTINGS';
+    const ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS: 'android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS';
+    const ACTION_MANAGE_APPLICATIONS_SETTINGS: 'android.settings.MANAGE_APPLICATIONS_SETTINGS';
+    const ACTION_MANAGE_DEFAULT_APPS_SETTINGS: 'android.settings.MANAGE_DEFAULT_APPS_SETTINGS';
+    const ACTION_MEMORY_CARD_SETTINGS: 'android.settings.MEMORY_CARD_SETTINGS';
+    const ACTION_MONITORING_CERT_INFO: 'android.settings.MONITORING_CERT_INFO';
+    const ACTION_NETWORK_OPERATOR_SETTINGS: 'android.settings.NETWORK_OPERATOR_SETTINGS';
+    const ACTION_NFCSHARING_SETTINGS: 'android.settings.NFCSHARING_SETTINGS';
+    const ACTION_NFC_PAYMENT_SETTINGS: 'android.settings.NFC_PAYMENT_SETTINGS';
+    const ACTION_NFC_SETTINGS: 'android.settings.NFC_SETTINGS';
+    const ACTION_NIGHT_DISPLAY_SETTINGS: 'android.settings.NIGHT_DISPLAY_SETTINGS';
+    const ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS: 'android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS';
+    const ACTION_NOTIFICATION_SETTINGS: 'android.settings.NOTIFICATION_SETTINGS';
+    const ACTION_PAIRING_SETTINGS: 'android.settings.PAIRING_SETTINGS';
+    const ACTION_PRIVACY_SETTINGS: 'android.settings.PRIVACY_SETTINGS';
+    const ACTION_QUICK_LAUNCH_SETTINGS: 'android.settings.QUICK_LAUNCH_SETTINGS';
+    const ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS: 'android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS';
+    const ACTION_SECURITY_SETTINGS: 'android.settings.SECURITY_SETTINGS';
+    const ACTION_SETTINGS: 'android.settings.SETTINGS';
+    const ACTION_SHOW_ADMIN_SUPPORT_DETAILS: 'android.settings.SHOW_ADMIN_SUPPORT_DETAILS';
+    const ACTION_SHOW_INPUT_METHOD_PICKER: 'android.settings.SHOW_INPUT_METHOD_PICKER';
+    const ACTION_SHOW_REGULATORY_INFO: 'android.settings.SHOW_REGULATORY_INFO';
+    const ACTION_SHOW_REMOTE_BUGREPORT_DIALOG: 'android.settings.SHOW_REMOTE_BUGREPORT_DIALOG';
+    const ACTION_SOUND_SETTINGS: 'android.settings.SOUND_SETTINGS';
+    const ACTION_STORAGE_MANAGER_SETTINGS: 'android.settings.STORAGE_MANAGER_SETTINGS';
+    const ACTION_SYNC_SETTINGS: 'android.settings.SYNC_SETTINGS';
+    const ACTION_SYSTEM_UPDATE_SETTINGS: 'android.settings.SYSTEM_UPDATE_SETTINGS';
+    const ACTION_TETHER_PROVISIONING_UI: 'android.settings.TETHER_PROVISIONING_UI';
+    const ACTION_TRUSTED_CREDENTIALS_USER: 'android.settings.TRUSTED_CREDENTIALS_USER';
+    const ACTION_USAGE_ACCESS_SETTINGS: 'android.settings.USAGE_ACCESS_SETTINGS';
+    const ACTION_USER_DICTIONARY_INSERT: 'android.settings.USER_DICTIONARY_INSERT';
+    const ACTION_USER_DICTIONARY_SETTINGS: 'android.settings.USER_DICTIONARY_SETTINGS';
+    const ACTION_USER_SETTINGS: 'android.settings.USER_SETTINGS';
+    const ACTION_VOICE_CONTROL_AIRPLANE_MODE: 'android.settings.VOICE_CONTROL_AIRPLANE_MODE';
+    const ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE: 'android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE';
+    const ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE: 'android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE';
+    const ACTION_VOICE_INPUT_SETTINGS: 'android.settings.VOICE_INPUT_SETTINGS';
+    const ACTION_VPN_SETTINGS: 'android.settings.VPN_SETTINGS';
+    const ACTION_VR_LISTENER_SETTINGS: 'android.settings.VR_LISTENER_SETTINGS';
+    const ACTION_WEBVIEW_SETTINGS: 'android.settings.WEBVIEW_SETTINGS';
+    const ACTION_WIFI_IP_SETTINGS: 'android.settings.WIFI_IP_SETTINGS';
+    const ACTION_WIFI_SETTINGS: 'android.settings.WIFI_SETTINGS';
+    const ACTION_WIRELESS_SETTINGS: 'android.settings.WIRELESS_SETTINGS';
+    const ACTION_ZEN_MODE_AUTOMATION_SETTINGS: 'android.settings.ZEN_MODE_AUTOMATION_SETTINGS';
+    const ACTION_ZEN_MODE_EVENT_RULE_SETTINGS: 'android.settings.ZEN_MODE_EVENT_RULE_SETTINGS';
+    const ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS: 'android.settings.ZEN_MODE_EXTERNAL_RULE_SETTINGS';
+    const ACTION_ZEN_MODE_PRIORITY_SETTINGS: 'android.settings.ZEN_MODE_PRIORITY_SETTINGS';
+    const ACTION_ZEN_MODE_SCHEDULE_RULE_SETTINGS: 'android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS';
+    const ACTION_ZEN_MODE_SETTINGS: 'android.settings.ZEN_MODE_SETTINGS';
+
+    function startActivityAsync(activity: string, data?: HashMap): Promise<boolean>;
+}
+
+/**
+ * KeepAwake
+ */
+export class KeepAwake extends Component {
+    static activate(): void;
+    static deactivate(): void;
+}
+
+// #region LinearGradient
+/**
+ * LinearGradient
+ */
+export interface LinearGradientProps {
+    colors: string[];
+    start?: [number, number];
+    end?: [number, number];
+    locations?: number[];
+    style?: StyleProp<ViewStyle>;
+}
+
+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
+ */
+export namespace Location {
+    interface LocationOptions {
+        enableHighAccuracy?: boolean;
+        timeInterval?: number;
+        distanceInterval?: number;
+        timeout?: number;
+    }
+
+    interface LocationProps {
+        latitude: number;
+        longitude: number;
+    }
+
+    interface Coords extends LocationProps {
+        altitude: number;
+        accuracy: number;
+    }
+
+    interface LocationData {
+        coords: {
+            heading: number;
+            speed: number
+        } & Coords;
+        timestamp: number;
+    }
+
+    interface ProviderStatus {
+        locationServicesEnabled: boolean;
+        gpsAvailable?: boolean;
+        networkAvailable?: boolean;
+        passiveAvailable?: boolean;
+    }
+
+    interface HeadingStatus {
+        magHeading: number;
+        trueHeading: number;
+        accuracy: number;
+    }
+
+    interface GeocodeData {
+        city: string;
+        street: string;
+        region: string;
+        postalCode: string;
+        country: string;
+        name: string;
+    }
+
+    type LocationCallback = (data: LocationData) => void;
+
+    function getCurrentPositionAsync(options: LocationOptions): Promise<LocationData>;
+    function watchPositionAsync(options: LocationOptions, callback: LocationCallback): EventSubscription;
+    function getProviderStatusAsync(): Promise<ProviderStatus>;
+    function getHeadingAsync(): Promise<HeadingStatus>;
+    function watchHeadingAsync(callback: (status: HeadingStatus) => void): EventSubscription;
+    function geocodeAsync(address: string): Promise<Coords>;
+    function reverseGeocodeAsync(location: LocationProps): Promise<GeocodeData[]>;
+    function setApiKey(key: string): void;
+}
+
+/**
+ * Magnetometer
+ */
+export namespace Magnetometer {
+    interface MagnetometerObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    function addListener(listener: (obj: MagnetometerObject) => any): EventSubscription;
+    function removeAllListeners(): void;
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Notifications
+ */
+export namespace Notifications {
+    interface Notification {
+        origin: 'selected' | 'received';
+        data: any;
+        remote: boolean;
+        isMultiple: boolean;
+    }
+
+    interface LocalNotification {
+        title: string;
+        body?: string;
+        data?: any;
+        ios?: {
+            sound?: boolean
+        };
+        android?: {
+            sound?: boolean;
+            icon?: string;
+            color?: string;
+            priority?: 'min' | 'low' | 'high' | 'max';
+            sticky?: boolean;
+            vibrate?: boolean | number[];
+            link?: string;
+        };
+    }
+
+    interface SchedulingOptions {
+        time: Date | number;
+        repeat?: 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year';
+        intervalMs?: number;
+    }
+
+    interface ChannelAndroid {
+        name: string;
+        description?: string;
+        sound?: boolean;
+        priority?: 'min' | 'low' | 'default' | 'high' | 'max';
+        vibrate?: boolean | number[];
+        badge?: boolean;
+    }
+
+    type LocalNotificationId = string | number;
+
+    function addListener(listener: (notification: Notification) => any): EventSubscription;
+    function getExpoPushTokenAsync(): Promise<string>;
+    function presentLocalNotificationAsync(localNotification: LocalNotification): Promise<LocalNotificationId>;
+    function scheduleLocalNotificationAsync(
+        localNotification: LocalNotification,
+        schedulingOptions: { time: Date | number, repeat?: 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year' }
+    ): Promise<LocalNotificationId>;
+    function dismissNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
+    function dismissAllNotificationsAsync(): Promise<void>;
+    function cancelScheduledNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
+    function cancelAllScheduledNotificationsAsync(): Promise<void>;
+    function createChannelAndroidAsync(id: string, channel: ChannelAndroid): Promise<void>;
+    function deleteChannelAndroidAsync(id: string): Promise<void>;
+    function getBadgeNumberAsync(): Promise<number>;
+    function setBadgeNumberAsync(number: number): Promise<void>;
+}
+
+/**
+ * Pedometer
+ */
+export namespace Pedometer {
+    function isAvailableAsync(): Promise<boolean>;
+    function getStepCountAsync(start: Date, end: Date): Promise<{ steps: number; }>;
+    function watchStepCount(callback: (params: { steps: number; }) => void): EventSubscription;
+}
+
+/**
+ * Permissions
+ */
+export namespace Permissions {
+    type PermissionType = 'audioRecording' | 'calendar' |
+    'cameraRoll' | 'camera' | 'contacts' | 'location' | 'reminders' |
+    'notifications' | 'systemBrightness' | 'userFacingNotifications' | 'SMS';
+    type PermissionStatus = 'undetermined' | 'granted' | 'denied';
+    type PermissionExpires = 'never';
+
+    interface PermissionDetailsLocationIOS {
+        scope: 'whenInUse' | 'always';
+    }
+
+    interface PermissionDetailsLocationAndroid {
+        scope: 'fine' | 'coarse' | 'none';
+    }
+
+    interface SinglePermissionResponse {
+        status: PermissionStatus;
+        expires: PermissionExpires;
+        ios?: PermissionDetailsLocationIOS;
+        android?: PermissionDetailsLocationAndroid;
+    }
+
+    interface PermissionResponse {
+        status: PermissionStatus;
+        expires: PermissionExpires;
+        permissions: {
+            [key in PermissionType]: SinglePermissionResponse
+        };
+    }
+
+    function getAsync(...permissionTypes: PermissionType[]): Promise<PermissionResponse>;
+    function askAsync(...permissionTypes: PermissionType[]): Promise<PermissionResponse>;
+
+    const AUDIO_RECORDING: 'audioRecording';
+    const CALENDAR: 'calendar';
+    const CAMERA_ROLL: 'cameraRoll';
+    const CAMERA: 'camera';
+    const CONTACTS: 'contacts';
+    const LOCATION: 'location';
+    const NOTIFICATIONS: 'notifications';
+    const REMINDERS: 'reminders';
+    const SYSTEM_BRIGHTNESS: 'systemBrightness';
+    const USER_FACING_NOTIFICATIONS: 'userFacingNotifications';
+    /**
+     * Will be removed in SDK 32
+     */
+    const SMS: 'SMS';
+}
+
+/**
+ * Register Root Component
+ */
+export function registerRootComponent(component: ComponentType): void;
+
+/**
+ * ScreenOrientation
+ */
+export namespace ScreenOrientation {
+    interface Orientations {
+        ALL: 'ALL';
+        ALL_BUT_UPSIDE_DOWN: 'ALL_BUT_UPSIDE_DOWN';
+        PORTRAIT: 'PORTRAIT';
+        PORTRAIT_UP: 'PORTRAIT_UP';
+        PORTRAIT_DOWN: 'PORTRAIT_DOWN';
+        LANDSCAPE: 'LANDSCAPE';
+        LANDSCAPE_LEFT: 'LANDSCAPE_LEFT';
+        LANDSCAPE_RIGHT: 'LANDSCAPE_RIGHT';
+    }
+
+    const Orientation: Orientations;
+
+    function allow(orientation: keyof Orientations): void;
+}
+
+/**
+ * SecureStore
+ */
+export namespace SecureStore {
+    interface SecureStoreOptions {
+        keychainService?: string;
+    }
+
+    interface SecureStoreSetOptions extends SecureStoreOptions {
+        keychainAccessible?: number;
+    }
+
+    function setItemAsync(key: string, value: string, options?: SecureStoreSetOptions): Promise<void>;
+    function getItemAsync(key: string, options?: SecureStoreOptions): Promise<string | null>;
+    function deleteItemAsync(key: string, options?: SecureStoreOptions): Promise<void>;
+
+    const WHEN_UNLOCKED: number;
+    const AFTER_FIRST_UNLOCK: number;
+    const ALWAYS: number;
+    const WHEN_UNLOCKED_THIS_DEVICE_ONLY: number;
+    const WHEN_PASSCODE_SET_THIS_DEVICE_ONLY: number;
+    const AFTER_FIRST_UNLOCK_THIS_DEVICE_ONLY: number;
+    const ALWAYS_THIS_DEVICE_ONLY: number;
+}
+
+/**
+ * Segment
+ */
+export namespace Segment {
+    function initialize(keys: {
+        androidWriteKey: string;
+        iosWriteKey: string;
+    }): void;
+    function identify(userId: string): void;
+    function identifyWithTraits(userId: string, traits: object): void;
+    function track(event: string): void;
+    function alias(newId: string, options?: { [key: string]: any }): Promise<boolean>;
+    function reset(): void;
+    function trackWithProperties(event: string, properties: object): void;
+    function screen(screenName: string): void;
+    function screenWithProperties(screenName: string, properties: object): void;
+    function flush(): void;
+    function getEnabledAsync(): void;
+    function setEnabledAsync(enabled: boolean): void;
+}
+
+/**
+ * Speech
+ */
+export namespace Speech {
+    interface SpeechOptions {
+        language?: string;
+        pitch?: number;
+        rate?: number;
+        onStart?: () => void;
+        onStopped?: () => void;
+        onDone?: () => void;
+        onError?: (error: Error) => void;
+    }
+
+    function speak(text: string, options?: SpeechOptions): void;
+    function stop(): void;
+    function isSpeakingAsync(): Promise<boolean>;
+
+    /** Available on iOS only */
+    function pause(): void;
+
+    /** Available on iOS only */
+    function resume(): void;
+}
+
+/**
+ * SQLite
+ */
+export namespace SQLite {
+    type Error = any;
+
+    interface Database {
+        transaction(
+            callback: (transaction: Transaction) => any,
+            error?: (error: Error) => any,     // TODO def of error
+            success?: () => any
+        ): void;
+    }
+
+    interface Transaction {
+        executeSql(
+            sqlStatement: string,
+            arguments?: string[] | number[],
+            success?: (transaction: Transaction, resultSet: ResultSet) => any,
+            error?: (transaction: Transaction, error: Error) => any
+        ): void;
+    }
+
+    interface ResultSet {
+        insertId: number;
+        rowsAffected: number;
+        rows: {
+            length: number;
+            item: (index: number) => any;
+            _array: HashMap[];
+        };
+    }
+
+    function openDatabase(
+        name: string | {
+            name: string,
+            version?: string,
+            description?: string,
+            size?: number,
+            callback?: () => any
+        },
+        version?: string,
+        description?: string,
+        size?: number,
+        callback?: () => any
+    ): any;
+}
+
+// #region Svg
+/**
+ * Svg
+ */
+export interface SvgCommonProps {
+    fill?: string;
+    fillOpacity?: number | string;
+    fillRule?: 'nonzero' | 'evenodd';
+    opacity?: number | string;
+    stroke?: string;
+    strokeWidth?: number | string;
+    strokeOpacity?: number | string;
+    strokeLinecap?: string;
+    strokeLineJoin?: string;
+    strokeDasharray?: any[];
+    strokeDashoffset?: any;
+    transform?: string | object;
+    x?: number | string;
+    y?: number | string;
+    rotate?: number | string;
+    rotation?: number | string;
+    scale?: number | string;
+    origin?: number | string;
+    originX?: number | string;
+    originY?: number | string;
+    id?: string;
+    disabled?: boolean;
+    onPress?: () => any;
+    onPressIn?: () => any;
+    onPressOut?: () => any;
+    onLongPress?: () => any;
+    delayPressIn?: number;
+    delayPressOut?: number;
+    delayLongPress?: number;
+}
+
+export interface SvgRectProps extends SvgCommonProps {
+    width: number | string;
+    height: number | string;
+}
+
+export interface SvgCircleProps extends SvgCommonProps {
+    cx: number | string;
+    cy: number | string;
+    r: number | string;
+}
+
+export interface SvgEllipseProps extends SvgCommonProps {
+    cx: number | string;
+    cy: number | string;
+    rx: number | string;
+    ry: number | string;
+}
+
+export interface SvgLineProps extends SvgCommonProps {
+    x1: number | string;
+    y1: number | string;
+    x2: number | string;
+    y2: number | string;
+}
+
+export interface SvgPolyProps extends SvgCommonProps {
+    points: string;
+}
+
+export interface SvgPathProps extends SvgCommonProps {
+    d: string;
+}
+
+export interface SvgTextProps extends SvgCommonProps {
+    textAnchor?: string;
+    fontSize?: number | string;
+    fontWeight?: string;
+}
+
+export interface SvgTSpanProps extends SvgTextProps {
+    dx?: string;
+    dy?: string;
+}
+
+export interface SvgTextPathProps extends SvgCommonProps {
+    href?: string;
+    startOffset?: string;
+}
+
+export interface SvgUseProps extends SvgCommonProps {
+    href: string;
+    x: number | string;
+    y: number | string;
+    width?: number | string;
+    height?: number | string;
+}
+
+export interface SvgSymbolProps extends SvgCommonProps {
+    viewBox: string;
+    preserveAspectRatio?: string;
+    width: number | string;
+    height: number | string;
+}
+
+export interface SvgLinearGradientProps extends SvgCommonProps {
+    x1: number | string;
+    x2: number | string;
+    y1: number | string;
+    y2: number | string;
+}
+
+export interface SvgRadialGradientProps extends SvgCommonProps {
+    cx: number | string;
+    cy: number | string;
+    rx: number | string;
+    ry: number | string;
+    fx: number | string;
+    fy: number | string;
+    gradientUnits?: string;
+}
+
+export interface SvgStopProps extends SvgCommonProps {
+    offset?: string;
+    stopColor?: string;
+    stopOpacity?: string;
+}
+
+export class Svg extends Component<{ width: number, height: number, viewBox?: string, preserveAspectRatio?: string }> {
+    static Circle: ComponentClass<SvgCircleProps>;
+    static ClipPath: ComponentClass<SvgCommonProps>;
+    static Defs: ComponentClass;
+    static Ellipse: ComponentClass<SvgEllipseProps>;
+    static G: ComponentClass<SvgCommonProps>;
+    static Line: ComponentClass<SvgLineProps>;
+    static LinearGradient: ComponentClass<SvgLinearGradientProps>;
+    static Path: ComponentClass<SvgPathProps>;
+    static Polygon: ComponentClass<SvgPolyProps>;
+    static Polyline: ComponentClass<SvgPolyProps>;
+    static RadialGradient: ComponentClass<SvgRadialGradientProps>;
+    static Rect: ComponentClass<SvgRectProps>;
+    static Stop: ComponentClass<SvgStopProps>;
+    static Symbol: ComponentClass<SvgSymbolProps>;
+    static Text: ComponentClass<SvgTextProps>;
+    static TextPath: ComponentClass<SvgTextPathProps>;
+    static TSpan: ComponentClass<SvgTSpanProps>;
+    static Use: ComponentClass<SvgUseProps>;
+}
+// #endregion
+
+/**
+ * Take Snapshot
+ */
+export function takeSnapshotAsync(
+    view?: (number | React.ReactElement),
+    options?: {
+        width?: number,
+        height?: number,
+        format?: 'png' | 'jpg' | 'jpeg' | 'webm',
+        quality?: number,
+        result?: 'file' | 'base64' | 'data-uri',
+    }
+): Promise<string>;
+
+/** Helpful utility functions that don’t fit anywhere else, including some localization and internationalization methods. */
+export namespace Util {
+    /** Returns the current device country code. */
+    function getCurrentDeviceCountryAsync(): Promise<string>;
+
+    /** Returns the current device locale as a string. */
+    function getCurrentLocaleAsync(): Promise<string>;
+
+    /** Returns the current device time zone name. */
+    function getCurrentTimeZoneAsync(): Promise<string>;
+
+    /** Reloads the current experience. This will fetch and load the newest available JavaScript supported by the device’s Expo environment. This is useful for triggering an update of your experience if you have published a new version. */
+    function reload(): void;
+
+    /** _Android only_. Invokes a callback when a new version of your app is successfully downloaded in the background. */
+    function addNewVersionListenerExperimental(listener: (event: {
+        manifest: object;
+    }) => void): { remove(): void; };
+}
+
+// #region Video
+/**
+ * Expo Video
+ */
+export interface NaturalSize {
+    width: number;
+    height: number;
+    orientation: Orientation;
+}
+
+export interface ReadyForDisplayEvent {
+    naturalSize: NaturalSize;
+    status: PlaybackStatus;
+}
+
+export enum FullscreenUpdateVariants {
+    IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT = 0,
+    IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT = 1,
+    IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS = 2,
+    IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS = 3
+}
+
+export interface FullscreenUpdateEvent {
+    fullscreenUpdate: FullscreenUpdateVariants;
+    status: PlaybackStatus;
+}
+
+export interface VideoProps {
+    source?: PlaybackSource | null;
+    posterSource?: URISource | RequireSource;
+
+    resizeMode?: ResizeModeContain | ResizeModeCover | ResizeModeStretch;
+    useNativeControls?: boolean;
+    usePoster?: boolean;
+
+    onPlaybackStatusUpdate?: (status: PlaybackStatus) => void;
+    onReadyForDisplay?: (event: ReadyForDisplayEvent) => void;
+    onIOSFullscreenUpdate?: (event: FullscreenUpdateEvent) => void;
+
+    onLoadStart?: () => void;
+    onLoad?: (status: PlaybackStatus) => void;
+    onError?: (error: string) => void;
+
+    status?: PlaybackStatusToSet;
+    progressUpdateIntervalMillis?: number;
+    positionMillis?: number;
+    shouldPlay?: boolean;
+    rate?: number;
+    shouldCorrectPitch?: boolean;
+    volume?: number;
+    isMuted?: boolean;
+    isLooping?: boolean;
+
+    scaleX?: number;
+    scaleY?: number;
+    translateX?: number;
+    translateY?: number;
+    rotation?: number;
+    ref?: Ref<PlaybackObject>;
+    style?: StyleProp<ViewStyle>;
+}
+
+export interface VideoState {
+    showPoster: boolean;
+}
+
+export class Video extends Component<VideoProps, VideoState> {
+    static RESIZE_MODE_CONTAIN: ResizeModeContain;
+    static RESIZE_MODE_COVER: ResizeModeCover;
+    static RESIZE_MODE_STRETCH: ResizeModeStretch;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS;
+}
+// #endregion
+
+/**
+ * Web Browser
+ */
+export namespace WebBrowser {
+    function openBrowserAsync(url: string): Promise<{ type: 'cancelled' | 'dismissed' }>;
+    function openAuthSessionAsync(url: string, redirectUrl?: string): Promise<{ type: 'cancelled' | 'dismissed' }>;
+    function dismissBrowser(): Promise<{ type: 'dismissed' }>;
+}
+
+// #region Calendar
+/**
+ * Calendar
+ *
+ * Provides an API for interacting with the device’s system calendars, events, reminders, and associated records.
+ */
+export namespace Calendar {
+    interface Calendar {
+        /** Internal ID that represents this calendar on the device */
+        id?: string;
+
+        /** Visible name of the calendar */
+        title?: string;
+
+        sourceId?: string; // iOS
+
+        /** Object representing the source to be used for the calendar */
+        source?: Source;
+
+        /** Type of calendar this object represents */
+        type?: CalendarType; // iOS
+
+        /** Color used to display this calendar’s events */
+        color?: string;
+
+        /** Whether the calendar is used in the Calendar or Reminders OS app */
+        entityType?: EntityTypes; // iOS
+
+        /** Boolean value that determines whether this calendar can be modified */
+        allowsModifications?: boolean;
+
+        /** Availability types that this calendar supports */
+        allowedAvailabilities?: Availability[];
+
+        /** Boolean value indicating whether this is the device’s primary calendar */
+        isPrimary?: boolean; // Android
+
+        /** Internal system name of the calendar */
+        name?: string; // Android
+
+        /** Name for the account that owns this calendar */
+        ownerAccount?: string; // Android
+
+        /** Time zone for the calendar */
+        timeZone?: string; // Android
+
+        /** Alarm methods that this calendar supports */
+        allowedReminders?: AlarmMethod[]; // Android
+
+        /** Attendee types that this calendar supports */
+        allowedAttendeeTypes?: AttendeeType[]; // Android
+
+        /** Indicates whether the OS displays events on this calendar */
+        isVisible?: boolean; // Android
+
+        /** Indicates whether this calendar is synced and its events stored on the device */
+        isSynced?: boolean; // Android
+
+        /** Level of access that the user has for the calendar */
+        accessLevel?: CalendarAccessLevel; // Android
+    }
+
+    interface Source {
+        /** Internal ID that represents this source on the device */
+        id?: string; // iOS only ??
+
+        /** Type of account that owns this calendar */
+        type?: string;
+
+        /** Name for the account that owns this calendar */
+        name?: string;
+
+        /** Whether this source is the local phone account */
+        isLocalAccount?: boolean; // Android
+    }
+
+    interface Event {
+        /** Internal ID that represents this event on the device */
+        id?: string;
+
+        /** ID of the calendar that contains this event */
+        calendarId?: string;
+
+        /** Visible name of the event */
+        title?: string;
+
+        /** Location field of the event */
+        location?: string;
+
+        /** Date when the event record was created */
+        creationDate?: string; // iOS
+
+        /** Date when the event record was last modified */
+        lastModifiedDate?: string; // iOS
+
+        /** Time zone the event is scheduled in */
+        timeZone?: string;
+
+        /** Time zone for the event end time */
+        endTimeZone?: string; // Android
+
+        /** URL for the event */
+        url?: string; // iOS
+
+        /** Description or notes saved with the event */
+        notes?: string;
+
+        /** Array of Alarm objects which control automated reminders to the user */
+        alarms?: Alarm[];
+
+        /** Object representing rules for recurring or repeating events. Null for one-time events. */
+        recurrenceRule?: RecurrenceRule;
+
+        /** Date object or string representing the time when the event starts */
+        startDate?: string | Date;
+
+        /** Date object or string representing the time when the event ends */
+        endDate?: string | Date;
+
+        /** For recurring events, the start date for the first (original) instance of the event */
+        originalStartDate?: string; // iOS
+
+        /** Boolean value indicating whether or not the event is a detached (modified) instance of a recurring event */
+        isDetached?: boolean; // iOS
+
+        /** Whether the event is displayed as an all-day event on the calendar */
+        allDay?: boolean;
+
+        /** The availability setting for the event */
+        availability?: Availability; // Availability
+
+        /** Status of the event */
+        status?: EventStatus; // Status
+
+        /** Organizer of the event, as an Attendee object */
+        organizer?: string; // Organizer - iOS
+
+        /** Email address of the organizer of the event */
+        organizerEmail?: string; // Android
+
+        /** User’s access level for the event */
+        accessLevel?: EventAccessLevel; // Android,
+
+        /** Whether invited guests can modify the details of the event */
+        guestsCanModify?: boolean; // Android,
+
+        /** Whether invited guests can invite other guests */
+        guestsCanInviteOthers?: boolean; // Android
+
+        /** Whether invited guests can see other guests */
+        guestsCanSeeGuests?: boolean; // Android
+
+        /** For detached (modified) instances of recurring events, the ID of the original recurring event */
+        originalId?: string; // Android
+
+        /** For instances of recurring events, volatile ID representing this instance; not guaranteed to always refer to the same instance */
+        instanceId?: string; // Android
+    }
+
+    interface Attendee {
+        /** Internal ID that represents this attendee on the device */
+        id?: string; // Android
+
+        /** Indicates whether or not this attendee is the current OS user */
+        isCurrentUser?: boolean; // iOS
+
+        /** Displayed name of the attendee */
+        name?: string;
+
+        /** Role of the attendee at the event */
+        role?: AttendeeRole;
+
+        /** Status of the attendee in relation to the event */
+        status?: AttendeeStatus;
+
+        /** Type of the attendee */
+        type?: AttendeeType;
+
+        /** URL for the attendee */
+        url?: string; // iOS
+
+        /** Email address of the attendee */
+        email?: string; // Android
+    }
+
+    interface Reminder {
+        /** Internal ID that represents this reminder on the device */
+        id?: string;
+
+        /** ID of the calendar that contains this reminder */
+        calendarId?: string;
+
+        /** Visible name of the reminder */
+        title?: string;
+
+        /** Location field of the reminder */
+        location?: string;
+
+        /** Date when the reminder record was created */
+        creationDate?: string;
+
+        /** Date when the reminder record was last modified */
+        lastModifiedDate?: string;
+
+        /** Time zone the reminder is scheduled in */
+        timeZone?: string;
+
+        /** URL for the reminder */
+        url?: string;
+
+        /** Description or notes saved with the reminder */
+        notes?: string;
+
+        /** Array of Alarm objects which control automated alarms to the user about the task */
+        alarms?: Alarm[];
+
+        /** Object representing rules for recurring or repeated reminders. Null for one-time tasks. */
+        recurrenceRule?: RecurrenceRule;
+
+        /** Date object or string representing the start date of the reminder task */
+        startDate?: string;
+
+        /** Date object or string representing the time when the reminder task is due */
+        dueDate?: string;
+
+        /** Indicates whether or not the task has been completed */
+        completed?: boolean;
+
+        /** Date object or string representing the date of completion, if completed is true */
+        completionDate?: string;
+    }
+
+    interface Alarm {
+        /** Date object or string representing an absolute time the alarm should occur; overrides relativeOffset and structuredLocation if specified alongside either */
+        absoluteDate?: string; // iOS
+
+        /** Number of minutes from the startDate of the calendar item that the alarm should occur; use negative values to have the alarm occur before the startDate */
+        relativeOffset?: string;
+        structuredLocation?: {
+            // iOS
+            title?: string;
+            proximity?: string; // Proximity
+            radius?: number;
+            coords?: {
+                latitude?: number;
+                longitude?: number;
+            };
+        };
+
+        /** Method of alerting the user that this alarm should use; on iOS this is always a notification */
+        method?: AlarmMethod; // Method, Android
+    }
+
+    interface RecurrenceRule {
+        /** How often the calendar item should recur */
+        frequency: Frequency; // Frequency
+
+        /** Interval at which the calendar item should recur. For example, an interval: 2 with frequency: DAILY would yield an event that recurs every other day. Defaults to 1 . */
+        interval?: number;
+
+        /** Date on which the calendar item should stop recurring; overrides occurrence if both are specified */
+        endDate?: string;
+
+        /** Number of times the calendar item should recur before stopping */
+        occurrence?: number;
+    }
+
+    enum EntityTypes {
+        EVENT = 'event',
+        REMINDER = 'reminder',
+    }
+
+    enum CalendarType {
+        LOCAL = 'local',
+        CALDAV = 'caldav',
+        EXCHANGE = 'exchange',
+        SUBSCRIBED = 'subscribed',
+        BIRTHDAYS = 'birthdays'
+    }
+
+    enum Availability {
+        NOT_SUPPORTED = 'notSupported', // iOS
+        BUSY = 'busy',
+        FREE = 'free',
+        TENTATIVE = 'tentative',
+        UNAVAILABLE = 'unavailable' // iOS
+    }
+
+    enum AlarmMethod {
+        ALARM = 'alarm',
+        ALERT = 'alert',
+        EMAIL = 'email',
+        SMS = 'sms',
+        DEFAULT = 'default',
+    }
+
+    enum AttendeeType {
+        UNKNOWN = 'unknown', // iOS
+        PERSON = 'person', // iOS
+        ROOM = 'room', // iOS
+        GROUP = 'group', // iOS
+        RESOURCE = 'resource',
+        OPTIONAL = 'optional', // Android
+        REQUIRED = 'required', // Android
+        NONE = 'none' // Android
+    }
+
+    enum CalendarAccessLevel {
+        CONTRIBUTOR = 'contributor',
+        EDITOR = 'editor',
+        FREEBUSY = 'freebusy',
+        OVERRIDE = 'override',
+        OWNER = 'owner',
+        READ = 'read',
+        RESPOND = 'respond',
+        ROOT = 'root',
+        NONE = 'none'
+    }
+
+    enum EventAccessLevel {
+        CONFIDENTIAL = 'confidential',
+        PRIVATE = 'private',
+        PUBLIC = 'public',
+        DEFAULT = 'default'
+    }
+
+    enum EventStatus {
+        NONE = 'none',
+        CONFIRMED = 'confirmed',
+        TENTATIVE = 'tentative',
+        CANCELED = 'canceled'
+    }
+
+    enum AttendeeRole {
+        UNKNOWN = 'unknown', // iOS
+        REQUIRED = 'required', // iOS
+        OPTIONAL = 'optional', // iOS
+        CHAIR = 'chair', // iOS
+        NON_PARTICIPANT = 'nonParticipant', // iOS
+        ATTENDEE = 'attendee', // Android
+        ORGANIZER = 'organizer', // Android
+        PERFORMER = 'performer', // Android
+        SPEAKER = 'speaker', // Android
+        NONE = 'none' // Android
+    }
+
+    enum AttendeeStatus {
+        UNKNOWN = 'unknown', // iOS
+        PENDING = 'pending', // iOS
+        ACCEPTED = 'accepted',
+        DECLINED = 'declined',
+        TENTATIVE = 'tentative',
+        DELEGATED = 'delegated', // iOS
+        COMPLETED = 'completed', // iOS
+        IN_PROCESS = 'inProcess', // iOS
+        INVITED = 'invited', // Android
+        NONE = 'none' // Android
+    }
+
+    enum Frequency {
+        DAILY = 'daily',
+        WEEKLY = 'weekly',
+        MONTHLY = 'monthly',
+        YEARLY = 'yearly'
+    }
+
+    enum ReminderStatus {
+        COMPLETED = 'completed',
+        INCOMPLETE = 'incomplete'
+    }
+
+    interface RecurringEventOptions {
+        futureEvents?: boolean;
+        instanceStartDate?: string;
+    }
+
+    /** Gets an array of calendar objects with details about the different calendars stored on the device. */
+    function getCalendarsAsync(
+        /** (iOS only) Not required, but if defined, filters the returned calendars to a specific entity type.  */
+        entityType?: EntityTypes
+    ): Promise<Calendar[]>;
+
+    /** Creates a new calendar on the device, allowing events to be added later and displayed. */
+    function createCalendarAsync(details: Calendar): Promise<string>;
+
+    /** Updates the provided details of an existing calendar stored on the device. To remove a property, explicitly set it to null in details */
+    function updateCalendarAsync(id: string, details?: Calendar | null): Promise<string>;
+
+    /** Deletes an existing calendar and all associated events/reminders/attendees from the device. Use with caution. */
+    function deleteCalendarAsync(id: string): Promise<void>;
+
+    /** Returns all events in a given set of calendars over a specified time period. */
+    function getEventsAsync(
+        /** Array of IDs of calendars to search for events in. Required. */
+        calendarIds: string[],
+
+        /** Beginning of time period to search for events in. Required. */
+        startDate: Date,
+
+        /** End of time period to search for events in. Required. */
+        endDate: Date
+    ): Promise<Event[]>;
+
+    /** Returns a specific event selected by ID. If a specific instance of a recurring event is desired, the start date of this instance must also be provided, as instances of recurring events do not have their own unique and stable IDs on either iOS or Android. */
+    function getEventAsync(
+        /** ID of the event to return. Required. */
+        id: string,
+
+        /** A map of options for recurring events */
+        recurringEventOptions?: RecurringEventOptions
+    ): Promise<Event>;
+
+    /** Creates a new event on the specified calendar. */
+    function createEventAsync(
+        /** ID of the calendar to create this event in. Required. */
+        calendarId: string,
+        details?: Event
+    ): Promise<string>;
+
+    /** Updates the provided details of an existing calendar stored on the device. To remove a property, explicitly set it to null in details */
+    function updateEventAsync(
+        /** ID of the event to be updated. Required. */
+        id: string,
+
+        /** A map of properties to be updated  */
+        details?: Event | null,
+
+        /** A map of options for recurring events */
+        recurrentEventOptions?: RecurringEventOptions
+    ): Promise<string>;
+
+    /** Deletes an existing event from the device. Use with caution. */
+    function deleteEventAsync(
+        /** ID of the event to be deleted. Required. */
+        id: string,
+
+        /** A map of options for recurring events */
+        recurringEventOptions?: RecurringEventOptions
+    ): Promise<void>;
+
+    /** Gets all attendees for a given event (or instance of a recurring event). */
+    function getAttendeesForEventAsync(
+        /** ID of the event to return attendees for. Required. */
+        eventId: string,
+
+        /** A map of options for recurring events */
+        recurrentEventOptions?: RecurringEventOptions
+    ): Promise<Attendee[]>;
+
+    /** Available on Android only. Creates a new attendee record and adds it to the specified event. Note that if eventId specifies a recurring event, this will add the attendee to every instance of the event. */
+    function createAttendeeAsync(
+        /**  ID of the event to add this attendee to. Required. */
+        eventId: string,
+
+        /** A map of details for the attendee to be created  */
+        details?: Attendee
+    ): Promise<string>;
+
+    /** Available on Android only. Updates an existing attendee record. To remove a property, explicitly set it to null in details. */
+    function updateAttendeeAsync(
+        /** ID of the attendee record to be updated. Required. */
+        id: string,
+
+        /** A map of properties to be updated  */
+        details?: Attendee | null
+    ): Promise<string>;
+
+    /** Available on Android only. Deletes an existing attendee record from the device. Use with caution. */
+    function deleteAttendeeAsync(id: string): Promise<void>;
+
+    /** Available on iOS only. Returns a list of reminders matching the provided criteria. */
+    function getRemindersAsync(
+        /**  Array of IDs of calendars to search for reminders in. Required. */
+        calendarIds: string[],
+
+        status?: ReminderStatus,
+
+        /** Beginning of time period to search for reminders in. Required if status is defined. */
+        startDate?: Date,
+
+        /** End of time period to search for reminders in. Required if status is defined. */
+        endDate?: Date
+    ): Promise<Reminder[]>;
+
+    /** Available on iOS only. Returns a specific reminder selected by ID. */
+    function getReminderAsync(id: string): Promise<Reminder>;
+
+    /** Available on iOS only. Creates a new reminder on the specified calendar. */
+    function createReminderAsync(
+        /** ID of the calendar to create this reminder in. Required. */
+        calendarId: string,
+
+        /** A map of details for the reminder to be created */
+        details?: Reminder
+    ): Promise<string>;
+
+    /** Available on iOS only. Updates the provided details of an existing reminder stored on the device. To remove a property, explicitly set it to null in details. */
+    function updateReminderAsync(
+        /** ID of the reminder to be updated. Required. */
+        id: string,
+
+        /** A map of properties to be updated */
+        details?: Reminder | null
+    ): Promise<string>;
+
+    /** Available on iOS only. Deletes an existing reminder from the device. Use with caution. */
+    function deleteReminderAsync(id: string): Promise<void>;
+
+    /** Available on iOS only. */
+    function getSourcesAsync(): Promise<Source[]>;
+
+    /** Available on iOS only. Returns a specific source selected by ID. */
+    function getSourceAsync(id: string): Promise<Source>;
+
+    /** Available on Android only. Sends an intent to open the specified event in the OS Calendar app. */
+    function openEventInCalendar(
+        /** ID of the event to open. Required. */
+        id: string
+    ): void;
+}
+// #endregion
+
+// #region MailComposer
+/**
+ * An API to compose mails using OS specific UI.
+ */
+export namespace MailComposer {
+    interface ComposeOptions {
+        /** An array of e-mail addressess of the recipients. */
+        recipients?: string[];
+
+        /** An array of e-mail addressess of the CC recipients. */
+        ccRecipients?: string[];
+
+        /** An array of e-mail addressess of the BCC recipients. */
+        bccRecipients?: string[];
+
+        /** Subject of the mail. */
+        subject?: string;
+
+        /** Body of the mail. */
+        body?: string;
+
+        /** Whether the body contains HTML tags so it could be formatted properly. Not working perfectly on Android. */
+        isHtml?: boolean;
+
+        /** An array of app’s internal file uris to attach. */
+        attachments?: string[];
+    }
+
+    /** Resolves to a promise with object containing status field that could be either sent, saved or cancelled. Android does not provide such info so it always resolves to sent. */
+    function composeAsync(
+        /** A map defining the data to fill the mail */
+        options: ComposeOptions
+    ): Promise<{ status: 'sent' | 'saved' | 'cancelled' }>;
+}
+// #endregion
+
+export namespace Updates {
+    namespace EventType {
+        /** A new update is available and has started downloading. */
+        type DownloadStart = 'downloadStart';
+        /** A new update is currently being downloaded and will be stored in the device's cache. */
+        type DownloadProgress = 'downloadProgress';
+        /** A new update has finished downloading and is now stored in the device's cache. */
+        type DownloadFinished = 'downloadFinished';
+        /** No updates are available, and the most up-to-date bundle of this experience is already running. */
+        type NoUpdateAvailable = 'noUpdateAvailable';
+        /** An error occurred trying to fetch the latest update. */
+        type Error = 'error';
+
+        /** A new update is available and has started downloading. */
+        const DOWNLOAD_STARTED: DownloadStart;
+        /** A new update is currently being downloaded and will be stored in the device's cache. */
+        const DOWNLOAD_PROGRESS: DownloadProgress;
+        /** A new update has finished downloading and is now stored in the device's cache. */
+        const DOWNLOAD_FINISHED: DownloadFinished;
+        /** No updates are available, and the most up-to-date bundle of this experience is already running. */
+        const NO_UPDATE_AVAILABLE: NoUpdateAvailable;
+        /** An error occurred trying to fetch the latest update. */
+        const ERROR: Error;
+    }
+
+    interface UpdateCheck {
+        /** True if an update is available, false if you're already running the most up-to-date JS bundle. */
+        isAvailable: boolean;
+        /** If `isAvailable` is true, the manifest of the available update. Undefined otherwise. */
+        manifest?: Constants.Manifest;
+    }
+
+    interface UpdateBundle {
+        /** True if the fetched bundle is new (i.e. a different version that the what's currently running). */
+        isNew: boolean;
+        /** Manifest of the fetched update. */
+        manifest: Constants.Manifest;
+    }
+
+    /** An object that is passed into each event listener when a new version is available. */
+    interface UpdateEvent {
+        /** Type of the event */
+        type: EventType.DownloadStart
+            | EventType.DownloadProgress
+            | EventType.DownloadFinished
+            | EventType.NoUpdateAvailable
+            | EventType.Error;
+        /** If `type === Expo.Updates.EventType.DOWNLOAD_FINISHED`, the manifest of the newly downloaded update. Undefined otherwise. */
+        manifest?: Constants.Manifest;
+        /** If `type === Expo.Updates.EventType.ERROR`, the error message. Undefined otherwise. */
+        message?: string;
+    }
+
+    /** An optional params object passed to fetchUpdateAsync. */
+    interface FetchUpdateAsyncParams {
+        eventListener: UpdateEventListener;
+    }
+
+    type UpdateEventListener = (event: UpdateEvent) => any;
+
+    /**
+     * Invokes a callback when updates-related events occur,
+     * either on the initial app load or as a result of a call to `Expo.Updates.fetchUpdateAsync`.
+     */
+    function addListener(listener: UpdateEventListener): EventSubscription;
+
+    /**
+     * Check if a new published version of your project is available.
+     * Does not actually download the update.
+     * Rejects if `updates.enabled` is `false` in app.json.
+     */
+    function checkForUpdateAsync(): Promise<UpdateCheck>;
+
+    /**
+     * Downloads the most recent published version of your experience to the device's local cache.
+     * Rejects if `updates.enabled` is `false` in app.json.
+     */
+    function fetchUpdateAsync(params?: FetchUpdateAsyncParams): Promise<UpdateBundle>;
+
+    /**
+     * Immediately reloads the current experience.
+     * This will use your app.json updates configuration to fetch and load the newest available JS supported by the device's Expo environment.
+     * This is useful for triggering an update of your experience if you have published a new version.
+     */
+    function reload(): void;
+
+    /**
+     * Immediately reloads the current experience using the most recent cached version.
+     * This is useful for triggering an update of your experience if you have published and already downloaded a new version.
+     */
+    function reloadFromCache(): void;
+}
+
+// #region MediaLibrary
+/**
+ * https://docs.expo.io/versions/latest/sdk/media-library
+ * Provides access to user's media library
+ * Requires Permissions.CAMERA_ROLL permissions.
+ */
+
+export namespace MediaLibrary {
+  /**
+   * Creates an asset from existing file. The most common use case is to save a picture taken by Camera.
+   */
+  function createAssetAsync(localUri: string): Promise<Asset>;
+
+  /**
+   * Fetches a page of assets matching the provided criteria.
+   */
+  function getAssetsAsync(options: GetAssetsOptions): Promise<GetAssetsResult>;
+
+  /**
+   * Provides more informations about an asset, including GPS location, local URI and EXIF metadata.
+   */
+  function getAssetInfoAsync(asset: string | Asset): Promise<Asset>;
+
+  /**
+   * Deletes assets from the library. On iOS it deletes assets from all albums they belong to, while on Android it keeps all copies of them
+   * (album is strictly connected to the asset). Also, there is additional dialog on iOS that requires user to confirm this action.
+   */
+  function deleteAssetsAsync(asset: string[] | Asset[]): Promise<boolean>;
+
+  /**
+   * Queries for user-created albums in media gallery.
+   */
+  function getAlbumsAsync(): Promise<Album[]>;
+
+  /**
+   * Queries for an album with a specific name.
+   */
+  function getAlbumAsync(albumName: string): Promise<Album>;
+
+  /**
+   * Creates an album with given name and initial asset.
+   * The asset parameter is required on Android, since it's not possible to create empty album on this platform.
+   */
+  function createAlbumAsync(albumName: string, asset: string | Asset): Promise<Album>;
+
+  /**
+   * Adds array of assets to the album.
+   * On Android, by default it copies assets from the current album to provided one, however it's also possible to move them by passing false as copyAssets argument.
+   * In case they're copied you should keep in mind that getAssetsAsync will return duplicated assets.
+   */
+  function addAssetsToAlbumAsync(assets: Asset[], album: string | Album, copyAssets?: boolean /* default true */): Promise<boolean>;
+
+  /**
+   * Removes given assets from album.
+   * On Android, album will be automatically deleted if there are no more assets inside.
+   */
+  function removeAssetsFromAlbumAsync(assets: Asset[], album: string | Album): Promise<boolean>;
+
+  /**
+   * Available on iOS only. Fetches a list of moments, which is a group of assets taken around the same place and time.
+   */
+  function getMomentsAsync(): Promise<Album[]>;
+
+  enum MediaType {
+    audio = 'audio',
+    photo = 'photo',
+    video = 'video',
+    unknow = 'unknow'
+  }
+
+  enum SortBy {
+    default = 'default',
+    id = 'id',
+    creationTime = 'creationTime',
+    modificationTime = 'modificationTime',
+    mediaType = 'mediaType',
+    width = 'width',
+    height = 'height',
+    duration = 'duration'
+  }
+
+  // region Asset
+  interface AssetAndroid {
+    albumId?: string;
+  }
+
+  interface AssetIos {
+    mediaSubtypes?: MediaType[];
+    // *
+    orientation: number;
+    // *
+    isFavorite: boolean;
+  }
+
+  interface Asset extends AssetAndroid, AssetIos {
+    id: string;
+    filename: string;
+    uri: string;
+    mediaType: string;
+    width: number;
+    height: number;
+    creationTime: number;
+    modificationTime: number;
+    duration: number;
+    // *
+    localUri?: string;
+    // *
+    location?: Location.LocationProps;
+    // *
+    exif?: object;
+  }
+
+  /**
+   * These fields can be obtained only by calling getAssetInfoAsync method
+   */
+  //#endregion
+
+  // #region Album
+  interface AlbumIos {
+    type?: string;
+    // *
+    startTime: number;
+    // *
+    endTime: number;
+    // *
+    approximateLocation?: Location.LocationProps;
+    // *
+    locationNames?: string[];
+  }
+
+  /**
+   * These fields apply only to albums whose type is moment
+   */
+
+  interface Album extends AlbumIos {
+    id: string;
+    title: string;
+    assetCount: number;
+  }
+  // #endregion
+
+  interface GetAssetsOptions {
+    first?: number;
+    after?: string;
+    album?: string | Album;
+    sortBy?: SortBy;
+    mediaType?: MediaType;
+  }
+
+  interface GetAssetsResult {
+    assets: Asset[];
+    endCursor: string;
+    hasNextPage: boolean;
+    totalCount: number;
+  }
+}
+// #endregion
+
+// #region Haptic
+/**
+ * https://docs.expo.io/versions/latest/sdk/haptic
+ * Provides haptic feedback for iOS 10+ devices using the Taptic Engine.
+ * If this is used in Android the device will use ReactNative.Vibrate instead, it's best to just avoid this.
+ */
+export namespace Haptic {
+  /**
+   * Used to let a user know when a selection change has been registered
+   */
+  function selection(): void;
+  function notification(notificationType?: NotificationType): void;
+  function impact(impactStyles?: ImpactStyles): void;
+
+  enum ImpactStyles {
+    Light = 'light',
+    Medium = 'medium',
+    Heavy = 'heavy'
+  }
+
+  enum NotificationType {
+    Success = 'success',
+    Warning = 'warning',
+    Error = 'error'
+  }
+}
+// #endregion
diff --git a/types/expo/v31/tsconfig.json b/types/expo/v31/tsconfig.json
new file mode 100644
index 0000000000..ae698d5f5e
--- /dev/null
+++ b/types/expo/v31/tsconfig.json
@@ -0,0 +1,30 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "expo": [
+                "expo/v31"
+            ],
+            "expo/*": [
+                "expo/v31/*"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "expo-tests.tsx"
+    ]
+}
diff --git a/types/expo/v31/tslint.json b/types/expo/v31/tslint.json
new file mode 100644
index 0000000000..8270136207
--- /dev/null
+++ b/types/expo/v31/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "void-return": false,
+        "max-line-length": false
+    }
+}
diff --git a/types/expo__vector-icons/expo__vector-icons-tests.tsx b/types/expo__vector-icons/expo__vector-icons-tests.tsx
index 7d918c917f..33e1056957 100644
--- a/types/expo__vector-icons/expo__vector-icons-tests.tsx
+++ b/types/expo__vector-icons/expo__vector-icons-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { View, Text, TabBarIOS } from 'react-native';
-import { createIconSet, MaterialIcons, FontAwesome, Ionicons } from 'expo__vector-icons';
+import { createIconSet, MaterialIcons, FontAwesome, AntDesign } from 'expo__vector-icons';
 
 const glyphMap = {
   custom: 58918
@@ -48,7 +48,7 @@ class TabTest extends React.Component<{}, { selectedTab: string }> {
   render() {
     return (
       <TabBarIOS barTintColor="white">
-        <Ionicons.TabBarItemIOS
+        <AntDesign.TabBarItemIOS
           title="Tab1"
           iconName="ios-keypad-outline"
           selectedIconName="ios-keypad"
@@ -58,9 +58,9 @@ class TabTest extends React.Component<{}, { selectedTab: string }> {
           onPress={() => this.setState({ selectedTab: 'tab1' })}
         >
           <View />
-        </Ionicons.TabBarItemIOS>
+        </AntDesign.TabBarItemIOS>
 
-        <Ionicons.TabBarItemIOS
+        <AntDesign.TabBarItemIOS
           title="Tab2"
           iconName="ios-bookmark-outline"
           selectedIconName="ios-bookmark"
@@ -70,7 +70,7 @@ class TabTest extends React.Component<{}, { selectedTab: string }> {
           onPress={() => this.setState({ selectedTab: 'tab2' })}
         >
           <View />
-        </Ionicons.TabBarItemIOS>
+        </AntDesign.TabBarItemIOS>
       </TabBarIOS>
     );
   }
diff --git a/types/expo__vector-icons/index.d.ts b/types/expo__vector-icons/index.d.ts
index 529142c0e9..dc8f45103d 100644
--- a/types/expo__vector-icons/index.d.ts
+++ b/types/expo__vector-icons/index.d.ts
@@ -1,13 +1,16 @@
-// Type definitions for @expo/vector-icons 6.2
-// Project: https://github.com/expo/vector-icons
+// Type definitions for @expo/vector-icons 9.0
+// Project: https://github.com/expo/vector-icons, https://expo.github.io/vector-icons
 // Definitions by: Hyeonsu Lee <https://github.com/incleaf>
+//                 Robert Ying <https://github.com/robertying>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 import * as React from 'react';
 import { TextProps } from 'react-native';
+import { Icon } from 'react-native-vector-icons/Icon';
 
 export { createIconSet, createIconSetFromFontello, createIconSetFromIcoMoon } from 'react-native-vector-icons';
+export { Icon as AntDesign };
 export { default as Entypo } from 'react-native-vector-icons/Entypo';
 export { default as EvilIcons } from 'react-native-vector-icons/EvilIcons';
 export { default as Feather } from 'react-native-vector-icons/Feather';
diff --git a/types/express-oauth-server/index.d.ts b/types/express-oauth-server/index.d.ts
index 0a5a1162ea..b76daba19a 100644
--- a/types/express-oauth-server/index.d.ts
+++ b/types/express-oauth-server/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for express-oauth-server 2.0
-// Project: https://github.com/oauthjs/express-oauth-server#readme
+// Project: https://github.com/oauthjs/express-oauth-server#readme, https://github.com/seegno/express-oauth-server
 // Definitions by: Arne Schubert <https://github.com/atd-schubert>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/express-promise-router/index.d.ts b/types/express-promise-router/index.d.ts
index 507f6d0e40..29e1b9eb99 100644
--- a/types/express-promise-router/index.d.ts
+++ b/types/express-promise-router/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for express-promise-router 2.0
-// Project: https://github.com/express-promise-router/express-promise-router
+// Project: https://github.com/express-promise-router/express-promise-router, https://github.com/alex-whitney/express-promise-router
 // Definitions by: Anjun Wang <https://github.com/wanganjun>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/express-session/index.d.ts b/types/express-session/index.d.ts
index d26fbb6af8..7368c0ad4f 100644
--- a/types/express-session/index.d.ts
+++ b/types/express-session/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for express-session 1.15
-// Project: https://www.npmjs.org/package/express-session
+// Project: https://github.com/expressjs/session
 // Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
 //                 Jacob Bogers <https://github.com/jacobbogers>
 //                 Naoto Yokoyama <https://github.com/builtinnya>
diff --git a/types/express-unless/express-unless-tests.ts b/types/express-unless/express-unless-tests.ts
index 4a90728f1c..859d72286d 100644
--- a/types/express-unless/express-unless-tests.ts
+++ b/types/express-unless/express-unless-tests.ts
@@ -1,11 +1,19 @@
-
-import express = require('express');
-import unless = require('express-unless');
+import express = require("express");
+import unless = require("express-unless");
 
 var app = express();
 
-var middleware:unless.RequestHandler = function (req, res, next) {
+var middleware: unless.RequestHandler = function(req, res, next) {
     next();
-}
+};
 middleware.unless = unless;
-app.use(middleware.unless({ method: 'OPTIONS' }));
\ No newline at end of file
+app.use(middleware.unless({ method: "OPTIONS" }));
+app.use(middleware.unless(req => req.path === "test"));
+
+app.use(middleware.unless({ path: "/index", useOriginalUrl: true }));
+app.use(middleware.unless({ path: /home/g, ext: ".jpg" }));
+app.use(middleware.unless({ path: { url: "/index" }, ext: [ ".html", ".htm" ] }));
+app.use(middleware.unless({ path: { url: "/index", methods: [ "GET", "POST" ] } }));
+app.use(middleware.unless({ path: [ "/index", "/home", /home/i, { url: "/main", methods: [ "GET" ] }, { url: /home/i } ] }));
+app.use(middleware.unless({ path: [ "/index", "/home", /home/i, { url: "/main", method: "GET" }, { url: /home/i } ] }));
+app.use(middleware.unless({ path: [ "/index", "/home", /home/i, { url: "/main", method: [ "GET" ] }, { url: /home/i } ] }));
\ No newline at end of file
diff --git a/types/express-unless/index.d.ts b/types/express-unless/index.d.ts
index 7d7056f766..601cc199fc 100644
--- a/types/express-unless/index.d.ts
+++ b/types/express-unless/index.d.ts
@@ -1,19 +1,25 @@
-// Type definitions for express-unless
+// Type definitions for express-unless 0.5
 // Project: https://www.npmjs.org/package/express-unless
 // Definitions by: Wonshik Kim <https://github.com/wokim>
+//                 Joao Vieira <https://github.com/joaovieira>
+//                 Michal Kaminski <https://github.com/michal-b-kaminski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import express = require('express');
+import express = require("express");
 
 declare function unless(options: unless.Options): express.RequestHandler;
+declare function unless(options: unless.Options["custom"]): express.RequestHandler;
 
 declare namespace unless {
+    type pathFilter = string | RegExp | { url: string | RegExp, methods?: string[], method?: string | string[] };
+
     export interface Options {
         custom?: (req: express.Request) => boolean;
-        path?: any; // TODO: union type 'string|string[]' is not supported yet
-        ext?: any; // TODO: union type 'string|string[]' is not supported yet
-        method?: any; // TODO: union type 'string|string[]' is not supported yet
+        path?: pathFilter | pathFilter[];
+        ext?: string | string[];
+        method?: string | string[];
+        useOriginalUrl?: boolean;
     }
     export interface RequestHandler extends express.RequestHandler {
         unless?: typeof unless;
diff --git a/types/express-winston/express-winston-tests.ts b/types/express-winston/express-winston-tests.ts
index f370abdb5d..5d48bdd897 100644
--- a/types/express-winston/express-winston-tests.ts
+++ b/types/express-winston/express-winston-tests.ts
@@ -18,7 +18,7 @@ app.use(expressWinston.logger({
   meta: true,
   metaField: 'metaField',
   msg: 'msg',
-  requestFilter: (req, prop) => true,
+  requestFilter: (req, prop) => req[prop],
   requestWhitelist: ['foo', 'bar'],
   skip: (req, res) => false,
   statusLevels: ({ error: 'error', success: 'success', warn: 'warn' }),
@@ -69,8 +69,8 @@ app.use(expressWinston.errorLogger({
 
 expressWinston.bodyBlacklist.push('potato');
 expressWinston.bodyWhitelist.push('apple');
-expressWinston.defaultRequestFilter = (req: express.Request, prop: string) => true;
-expressWinston.defaultResponseFilter = (res: express.Response, prop: string) => true;
+expressWinston.defaultRequestFilter = (req: expressWinston.FilterRequest, prop: string) => req[prop];
+expressWinston.defaultResponseFilter = (res: expressWinston.FilterResponse, prop: string) => res[prop];
 expressWinston.defaultSkip = () => true;
 expressWinston.ignoredRoutes.push('/ignored');
 expressWinston.responseWhitelist.push('body');
diff --git a/types/express-winston/index.d.ts b/types/express-winston/index.d.ts
index 462f3df1b3..f7ae04319b 100644
--- a/types/express-winston/index.d.ts
+++ b/types/express-winston/index.d.ts
@@ -8,10 +8,18 @@ import { ErrorRequestHandler, Handler, Request, Response } from 'express';
 import * as winston from 'winston';
 import * as Transport from 'winston-transport';
 
+export interface FilterRequest extends Request {
+  [other: string]: any;
+}
+
+export interface FilterResponse extends Response {
+  [other: string]: any;
+}
+
 export type DynamicMetaFunction = (req: Request, res: Response, err: Error) => object;
 export type DynamicLevelFunction = (req: Request, res: Response, err: Error) => string;
-export type RequestFilter = (req: Request, propName: string) => boolean;
-export type ResponseFilter = (res: Response, propName: string) => boolean;
+export type RequestFilter = (req: FilterRequest, propName: string) => any;
+export type ResponseFilter = (res: FilterResponse, propName: string) => any;
 export type RouteFilter = (req: Request, res: Response) => boolean;
 
 export interface BaseLoggerOptions {
diff --git a/types/extend/index.d.ts b/types/extend/index.d.ts
index b94d1a7cb1..fe9f48a62d 100644
--- a/types/extend/index.d.ts
+++ b/types/extend/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for extend 3.0
-// Project: https://www.npmjs.com/package/extend
+// Project: https://github.com/justmoon/node-extend
 // Definitions by: Stefan Steinhart <https://github.com/reppners>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/extract-text-webpack-plugin/index.d.ts b/types/extract-text-webpack-plugin/index.d.ts
index f0cc7bf65c..ae073a1be8 100644
--- a/types/extract-text-webpack-plugin/index.d.ts
+++ b/types/extract-text-webpack-plugin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for extract-text-webpack-plugin 3.0
-// Project: https://github.com/webpack-contrib/extract-text-webpack-plugin
+// Project: http://github.com/webpack-contrib/extract-text-webpack-plugin
 // Definitions by: flying-sheep <https://github.com/flying-sheep>, kayo <https://github.com/katyo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/extsprintf/index.d.ts b/types/extsprintf/index.d.ts
index 29d073b4c5..352d84848a 100644
--- a/types/extsprintf/index.d.ts
+++ b/types/extsprintf/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for extsprintf 1.4
-// Project: https://github.com/joyent/node-extsprintf#readme
+// Project: https://github.com/joyent/node-extsprintf#readme, https://github.com/davepacheco/node-extsprintf
 // Definitions by: Alex Hankins <https://github.com/AlexHankins>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/ez-plus/index.d.ts b/types/ez-plus/index.d.ts
index 3a372108d3..c94fb1c403 100644
--- a/types/ez-plus/index.d.ts
+++ b/types/ez-plus/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jQuery ElevateZoom Plus Plugin 1.2
-// Project: https://github.com/igorlino/elevatezoom-plus
+// Project: https://github.com/igorlino/elevatezoom-plus, http://igorlino.github.io/elevatezoom-plus
 // Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/fabric/fabric-impl.d.ts b/types/fabric/fabric-impl.d.ts
index 15087ab8d3..5cc59d0941 100644
--- a/types/fabric/fabric-impl.d.ts
+++ b/types/fabric/fabric-impl.d.ts
@@ -614,6 +614,10 @@ interface IPatternOptions {
 	 * The source for the pattern
 	 */
 	source: string | HTMLImageElement;
+    /**
+     * Transform matrix to change the pattern, imported from svgs
+     */
+    patternTransform?: number[];
 }
 export interface Pattern extends IPatternOptions { }
 export class Pattern {
@@ -2236,7 +2240,20 @@ interface IObjectOptions {
 	 */
 	clipTo?: Function;
 
-	/**
+    /**
+     * A fabricObject that, without stroke define a clipping area with their shape. filled in black
+     * the clipPath object gets used when the object has rendered, and the context is placed in the center
+     * of the object cacheCanvas.
+     * If you want 0,0 of a clipPath to align with an object center, use clipPath.originX/Y to 'center'
+     */
+    clipPath?: Object;
+
+    /**
+     * When set to `true`, object's cache will be rerendered next render call.
+     */
+    dirty?: boolean;
+
+    /**
 	 * When `true`, object horizontal movement is locked
 	 */
 	lockMovementX?: boolean;
@@ -3757,7 +3774,18 @@ interface IAllFilters {
 		 */
 		fromObject(object: any): IBrightnessFilter
 	};
-	Convolute: {
+    ColorMatrix: {
+        new(options?: {
+            /** Filter matrix */
+            matrix?: number[]
+        }): IColorMatrix;
+        /**
+         * Returns filter instance from an object representation
+         * @param object Object to create an instance from
+         */
+        fromObject(object: any): IColorMatrix
+    };
+    Convolute: {
 		new(options?: {
 			opaque?: boolean,
 			/** Filter matrix */
@@ -3945,6 +3973,13 @@ interface IBrightnessFilter extends IBaseFilter {
 	 */
 	applyTo(canvasEl: HTMLCanvasElement): void;
 }
+interface IColorMatrix extends IBaseFilter {
+    /**
+     * Applies filter to canvas element
+     * @param canvasEl Canvas element to apply filter to
+     */
+    applyTo(canvasEl: HTMLCanvasElement): void;
+}
 interface IConvoluteFilter extends IBaseFilter {
 	/**
 	 * Applies filter to canvas element
@@ -4625,6 +4660,11 @@ interface IUtilMisc {
 	 */
 	qrDecompose(a: number[]): { angle: number, scaleX: number, scaleY: number, skewX: number, skewY: number, translateX: number, translateY: number };
 
+    /**
+     * Creates a transform matrix with the specified scale and skew
+     */
+    customTransformMatrix(scaleX: number, scaleY: number, skewX: number): number[];
+
 	/**
 	 * Returns string representation of function body
 	 * @param fn Function to get body of
diff --git a/types/facebook-instant-games/index.d.ts b/types/facebook-instant-games/index.d.ts
index c0722b11ec..859c0e1ea0 100644
--- a/types/facebook-instant-games/index.d.ts
+++ b/types/facebook-instant-games/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for facebook-instant-games 6.2
+// Type definitions for non-npm package facebook-instant-games 6.2
 // Project: https://developers.facebook.com/docs/games/instant-games
 // Definitions by: Menushka Weeratunga <https://github.com/menushka>, Øyvind Johansen Amundrud <https://github.com/oyvindjam>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/falcor/index.d.ts b/types/falcor/index.d.ts
index 683f040d3f..72d900e213 100644
--- a/types/falcor/index.d.ts
+++ b/types/falcor/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for falcor 0.1
-// Project: http://netflix.github.io/falcor/
+// Project: http://netflix.github.io/falcor/, https://github.com/netflix/falcor
 // Definitions by: Quramy <https://github.com/Quramy>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
diff --git a/types/fancy-log/index.d.ts b/types/fancy-log/index.d.ts
index 2fbdb3f0d2..882a78075f 100644
--- a/types/fancy-log/index.d.ts
+++ b/types/fancy-log/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for fancy-log 1.3
-// Project: https://github.com/js-cli/fancy-log
+// Project: https://github.com/gulpjs/fancy-log
 // Definitions by: Pine Mizune <https://github.com/pine>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/fancybox/fancybox-tests.ts b/types/fancybox/fancybox-tests.ts
index ea6cb7bed4..2528e10af2 100644
--- a/types/fancybox/fancybox-tests.ts
+++ b/types/fancybox/fancybox-tests.ts
@@ -1,145 +1,78 @@
 $('.fancybox').fancybox();
 $('.fancybox').fancybox({
-    padding: 0,
-    openEffect: 'elastic'
+    gutter: 0,
+    transitionEffect: 'slide'
 });
-$.fancybox([
-    { href: 'img1.jpg', title: 'Title' },
-    { href: 'img2.jpg', title: 'Title' }
+$.fancybox.open([
+    { src: 'img1.jpg', type: 'image' },
+    { src: 'img2.jpg', type: 'image', opts: { caption: (instance, elem) => "Test" } }
 ]);
-$.fancybox({ href: 'image.jpg', title: 'Lorem lipsum' });
-$.fancybox(['image.jpg', 'image.jpg']);
-$.fancybox('image.jpg');
-$.fancybox('<h1>Lorem lipsum</h1>');
+$.fancybox.open({ src: 'image.jpg', opts: { caption: "Test" } });
+$.fancybox.open('image.jpg');
+$.fancybox.open('<h1>Lorem lipsum</h1>');
 
-$.fancybox.cancel();
 $.fancybox.close(true);
-$.fancybox.play();
-$.fancybox.next();
-$.fancybox.prev();
-$.fancybox.jumpto(1);
-$.fancybox.reposition();
-$.fancybox.update();
-$.fancybox.toggle();
-$.fancybox.showLoading();
-$.fancybox.hideLoading();
-$(".selector").fancybox({ type: 'image' });
-$("#single_1").fancybox({
-    helpers: {
-        title: {
-            type: 'float'
-        }
-    }
-});
-$("#single_2").fancybox({
-    openEffect: 'elastic',
-    closeEffect: 'elastic',
-    helpers: {
-        title: {
-            type: 'inside'
-        }
-    }
-});
-$(".fancybox").fancybox({
-    openEffect: 'none',
-    closeEffect: 'none'
-});
-$(".various").fancybox({
-    maxWidth: 800,
-    maxHeight: 600,
-    fitToView: false,
-    width: '70%',
-    height: '70%',
-    autoSize: false,
-    closeClick: false,
-    openEffect: 'none',
-    closeEffect: 'none'
-});
+
 $(".fancybox-button").fancybox({
-    prevEffect: 'none',
-    nextEffect: 'none',
-    closeBtn: false,
-    helpers: {
-        title: { type: 'inside' },
-        buttons: {}
-    }
+    afterClose: () => { },
+    afterLoad: () => { },
+    afterShow: () => { },
+    beforeClose: () => { },
+    beforeLoad: () => { },
+    beforeShow: () => { },
+    clickContent: "next",
+    clickOutside: () => "close",
+    clickSlide: "zoom",
+    dblclickContent: "nextOrClose",
+    dblclickOutside: "toggleControls",
+    dblclickSlide: () => "nextOrClose",
+    onInit: () => { },
+    onActivate: () => { },
+    onDeactivate: () => { }
 });
 $(".fancybox-thumb").fancybox({
-    prevEffect: 'none',
-    nextEffect: 'none',
-    helpers: {
-        title: {
-            type: 'outside'
-        },
-        thumbs: {
-            width: 50,
-            height: 50
-        }
-    }
-});
-$('.fancybox-media').fancybox({
-    openEffect: 'none',
-    closeEffect: 'none',
-    helpers: {
-        media: {}
-    }
-});
-$(".fancybox").fancybox({
-    helpers: {
-        title: null
-    }
-});
-$(".fancybox").fancybox({
-    helpers: {
-        overlay: null
-    }
-});
-$(".fancybox").fancybox({
-    helpers: {
-        title: {
-            type: 'inside'
-        },
-        overlay: {
-            showEarly: false
-        }
-    }
-});
-$(".fancybox").fancybox({
-    helpers: {
-        thumbs: {
-            width: 50,
-            height: 50
-        }
-    }
-});
-$(".fancybox").fancybox({
-    beforeLoad: () => {
-        this.title = this.title ? `Image ${this.index + 1} of ${this.group.length} - ${this.title}` : `Image ${this.index + 1} of ${this.group.length}`;
-    }
-});
-$.fancybox('<div><h1>Lorem Lipsum</h1><p>Lorem lipsum</p></div>', {
-    title: 'Custom Title'
-});
-$.fancybox($("#inline"), {
-    title: 'Custom Title'
-});
-$.fancybox({
-    href: 'example.jpg',
-    title: 'Custom Title'
-});
-$.fancybox([
-    {
-        href: 'example1.jpg',
-        title: 'Custom Title 1'
+    animationDuration: 300,
+    animationEffect: "fade",
+    arrows: true,
+    autoFocus: true,
+    backFocus: false,
+    baseClass: "some-class",
+    baseTpl: "<div></div>",
+    btnTpl: {
+        download: "<div></div>"
     },
-    {
-        href: 'example2.jpg',
-        title: 'Custom Title 2'
-    }
-], {
-    padding: 0
-});
-
-$(".fancybox").fancybox({
-    margin: [20, 60, 20, 60]
+    buttons: ["close", "download"],
+    caption: "Test",
+    defaultType: "image",
+    errorTpl: "",
+    fullScreen: { autostart: false },
+    gutter: 50,
+    hash: false,
+    hideScrollbar: false,
+    i18n: { en: { CLOSE: "Close this" } },
+    idleTime: 500,
+    iframe: { preload: false },
+    parentEl: "body",
+    preventCaptionOverlap: true,
+    protect: false,
+    slideClass: "some-slide-class",
+    slideShow: { autoStart: false, speed: 1000 },
+    smallBtn: false,
+    spinnerTpl: "<div></div>",
+    thumbs: { axis: "x" },
+    image: { preload: false },
+    toolbar: true,
+    touch: { vertical: false },
+    transitionDuration: 300,
+    transitionEffect: "rotate",
+    trapFocus: false,
+    video: { autoStart: false },
+    wheel: false,
+    zoomOpacity: "auto",
+    modal: true,
+    loop: false,
+    lang: "en",
+    keyboard: false,
+    infobar: false,
+    ajax: { settings: { data: { fancybox: true } } }
 });
diff --git a/types/fancybox/index.d.ts b/types/fancybox/index.d.ts
index f890625969..568948de6f 100644
--- a/types/fancybox/index.d.ts
+++ b/types/fancybox/index.d.ts
@@ -1,131 +1,793 @@
-// Type definitions for fancyBox 2.1
+// Type definitions for non-npm package fancyBox 3.5
 // Project: https://github.com/fancyapps/fancyBox
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
+//                 SPWizard01 <https://github.com/SPWizard01>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 3.1
 
 /// <reference types="jquery" />
 
-interface FancyboxOptions extends FancyboxCallback {
-    padding?: any; // number or []
-    margin?: any; // number or []
-    width?: any; // number or []
-    height?: any; // number or []
-    minWidth?: number;
-    minHeight?: number;
-    maxWidth?: number;
-    maxHeight?: number;
-    autoSize?: boolean;
-    autoHeight?: boolean;
-    autoWidth?: boolean;
-    autoResize?: boolean;
-    autoCenter?: boolean;
-    fitToView?: boolean;
-    aspectRatio?: boolean;
-    topRatio?: number;
-    leftRatio?: number;
-    scrolling?: string;
-    wrapCSS?: string;
-    arrows?: boolean;
-    closeBtn?: boolean;
-    closeClick?: boolean;
-    nextClick?: boolean;
-    mouseWheel?: boolean;
-    autoPlay?: boolean;
-    playSpeed?: number;
-    preload?: number;
-    modal?: boolean;
-    loop?: boolean;
-    ajax?: any;
-    iframe?: any;
-    swf?: any;
-    keys?: any;
-    direction?: any;
-    scrollOutside?: boolean;
+type FancyBoxInteractionTypes = "close" | "next" | "nextOrClose" | "toggleControls" | "zoom" | false;
+
+type FancyBoxInteractionMethod = (slide?: FancyBoxSlide, event?: JQuery.Event) => FancyBoxInteractionTypes;
+
+type FancyBoxInteractions = FancyBoxInteractionTypes | FancyBoxInteractionMethod;
+
+interface FancyBoxPlainObject {
+    [key: string]: string | number | boolean | (() => void);
+}
+
+interface FancyBoxGroupItemWithFilledProps extends FancyBoxGroupItem {
+    $thumb?: JQuery;
+    thumb?;
+    contentType?: string;
     index?: number;
-    type?: string;
-    href?: string;
-    content?: string;
-    title?: string;
-    tpl?: any;
-
-    openEffect?: string;
-    closeEffect?: string;
-    nextEffect?: string;
-    prevEffect?: string;
-
-    openSpeed?: number;
-    closeSpeed?: number;
-    nextSpeed?: number;
-    prevSpeed?: number;
-
-    openEasing?: string;
-    closeEasing?: string;
-    nextEasing?: string;
-    prevEasing?: string;
-
-    openOpacity?: boolean;
-    closeOpacity?: boolean;
-
-    openMethod?: string;
-    closeMethod?: string;
-    nextMethod?: string;
-    prevMethod?: string;
-
-    helpers?: any;
-    live?: boolean;
-    parent?: string;
 }
 
-interface FancyboxMethods {
-    open(group?: any[], options?: FancyboxOptions): void;
-    cancel(): void;
-    close(force?: boolean): void;
-    play(): void;
-    next(): void;
-    prev(): void;
-    jumpto(index?: number): void;
-    reposition(): void;
-    update(): void;
+interface FancyBoxGroupItem {
+    src: string;
+    type?: "image" | "inline" | "ajax" | "iframe" | "html";
+    opts?: FancyBoxOptions;
+}
+
+interface FancyBoxSlide extends FancyBoxGroupItemWithFilledProps {
+    $content?: JQuery;
+    $image?: JQuery;
+    $slide?: JQuery;
+    $spinner?: JQuery;
+    $iframe?: JQuery<HTMLIFrameElement>;
+    forcedDuration?: number;
+    height: number;
+    isComplete: boolean;
+    isLoaded: boolean;
+    isLoading: boolean;
+    isRevealed: boolean;
+    contentSource?: string;
+    pos: number;
+    width: number;
+}
+
+interface FancyBoxImageOption {
+    /**
+     * Wait for images to load before displaying
+     *   true  - wait for image to load and then display;
+     *   false - display thumbnail and load the full-sized image over top,
+     *               requires predefined image dimensions (`data-width` and `data-height` attributes)
+     */
+    preload: boolean;
+}
+
+interface FancyBoxAjaxOption {
+    /**
+     * Object containing settings for ajax request
+     */
+    settings: JQueryAjaxSettings;
+}
+
+interface FancyBoxIframeSettings {
+    /**
+     * Iframe template
+     */
+    tpl?: string;
+    /**
+     * Preload iframe before displaying it
+     * This allows to calculate iframe content width and height
+     * (note: Due to "Same Origin Policy", you can't get cross domain data).
+     */
+    preload?: boolean;
+    /**
+     * Custom CSS styling for iframe wrapping element
+     * You can use this to set custom iframe dimensions
+     */
+    css?: FancyBoxPlainObject;
+    /**
+     * Iframe tag attributes
+     */
+    attr?: FancyBoxPlainObject;
+}
+
+interface FancyBoxVideoOptions {
+    tpl?: string;
+    format?: string;
+    autoStart?: boolean;
+}
+
+interface FancyBoxButtonTemplateOptions {
+    download?: string;
+    zoom?: string;
+    close?: string;
+    arrowLeft?: string;
+    arrowRight?: string;
+    /**
+     * This small close button will be appended to your html/inline/ajax content by default,
+     * if "smallBtn" option is not set to false
+     */
+    smallBtn?: string;
+}
+
+interface FancyBoxTouchOptions {
+    /**
+     *  Allow to drag content vertically
+     */
+    vertical?: boolean;
+    /**
+     * Continue movement after releasing mouse/touch when panning
+     */
+    momentum?: boolean;
+}
+
+interface FancyThumbsOptions {
+    /**
+     * Display thumbnails on opening
+     */
+    autoStart?: boolean;
+    /**
+     * Hide thumbnail grid when closing animation starts
+     */
+    hideOnClose?: boolean;
+    /**
+     * Container is injected into this element
+     */
+    parentEl?: string;
+    /**
+     * Vertical (y) or horizontal (x) scrolling
+     */
+    axis?: "x" | "y";
+}
+
+interface FancyBoxInternationalizatioObject {
+    CLOSE?: string;
+    NEXT?: string;
+    PREV?: string;
+    ERROR?: string;
+    PLAY_START?: string;
+    PLAY_STOP?: string;
+    FULL_SCREEN?: string;
+    THUMBS?: string;
+    DOWNLOAD?: string;
+    SHARE?: string;
+    ZOOM?: string;
+}
+
+interface FancyBoxInternationalizationOptions {
+    [key: string]: FancyBoxInternationalizatioObject;
+}
+
+interface FancyBoxButtonTypes {
+    "zoom": string;
+    "share": string;
+    "slideShow": string;
+    "fullScreen": string;
+    "download": string;
+    "thumbs": string;
+    "close": string;
+}
+
+interface FancyBoxOptions {
+    /**
+     * Close existing modals
+     * Set this to false if you do not need to stack multiple instances
+     */
+    closeExisting?: boolean;
+    /**
+     * Enable infinite gallery navigation
+     */
+    loop?: boolean;
+    /**
+     * Horizontal space between slides
+     */
+    gutter?: number;
+    /**
+     * Enable keyboard navigation
+     */
+    keyboard?: boolean;
+    /**
+     * Should allow caption to overlap the content
+     */
+    preventCaptionOverlap?: boolean;
+    /**
+     * Should display navigation arrows at the screen edges
+     */
+    arrows?: boolean;
+    /**
+     * Should display counter at the top left corner
+     */
+    infobar?: boolean;
+    /**
+     * Should display close button (using `btnTpl.smallBtn` template) over the content
+     * Can be true, false, "auto"
+     * If "auto" - will be automatically enabled for "html", "inline" or "ajax" items
+     */
+    smallBtn?: boolean | "auto";
+    /**
+     * Should display toolbar (buttons at the top)
+     * Can be true, false, "auto"
+     * If "auto" - will be automatically hidden if "smallBtn" is enabled
+     */
+    toolbar?: boolean | "auto";
+    /**
+     * What buttons should appear in the top right corner.
+     * Buttons will be created using templates from `btnTpl` option
+     * and they will be placed into toolbar (class="fancybox-toolbar"` element)
+     */
+    buttons?: Array<keyof FancyBoxButtonTypes>;
+    /**
+     * Detect "idle" time in seconds
+     */
+    idleTime?: number;
+    /**
+     * Disable right-click and use simple image protection for images
+     */
+    protect?: boolean;
+    /**
+     * Shortcut to make content "modal" - disable keyboard navigtion, hide buttons, etc
+     */
+    modal?: boolean;
+    image?: FancyBoxImageOption;
+    ajax?: FancyBoxAjaxOption;
+    iframe?: FancyBoxIframeSettings;
+    /**
+     * For HTML5 video only
+     */
+    video?: FancyBoxVideoOptions;
+    /**
+     * Default content type if cannot be detected automatically
+     */
+    defaultType?: "image" | "inline" | "ajax" | "iframe" | "html";
+    /**
+     * Open/close animation type
+     * Possible values:
+     * false                    - disable
+     * "zoom"               - zoom images from/to thumbnail
+     * "fade"
+     * "zoom-in-out"
+     */
+    animationEffect?: boolean | "zoom" | "fade" | "zoom-in-out";
+    /**
+     * Duration in ms for open/close animation
+     */
+    animationDuration?: number;
+    /**
+     * Should image change opacity while zooming
+     * If opacity is "auto", then opacity will be changed if image and thumbnail have different aspect ratios
+     */
+    zoomOpacity?: "auto" | boolean;
+    /**
+     * Transition effect between slides
+     * Possible values:
+     * false
+     * "fade"
+     * "slide"
+     * "circular"
+     * "tube"
+     * "zoom-in-out"
+     * "rotate"
+     */
+    transitionEffect?: "fade" | "slide" | "circular" | "tube" | "zoom-in-out" | "rotate" | boolean;
+    /**
+     * Duration in ms for transition animation
+     */
+    transitionDuration?: number;
+    /**
+     * Custom CSS class for slide element
+     */
+    slideClass?: string;
+    /**
+     * Custom CSS class for layout
+     */
+    baseClass?: string;
+    /**
+     * Base template for layout
+     */
+    baseTpl?: string;
+    /**
+     * Loading indicator template
+     */
+    spinnerTpl?: string;
+    /**
+     * Error message template
+     */
+    errorTpl?: string;
+    /**
+     * Button templates
+     */
+    btnTpl?: FancyBoxButtonTemplateOptions;
+    /**
+     * Container is injected into this element
+     */
+    parentEl?: string;
+    /**
+     * Hide browser vertical scrollbars; use at your own risk
+     */
+    hideScrollbar?: boolean;
+    /**
+     * Try to focus on the first focusable element after opening
+     */
+    autoFocus?: boolean;
+    /**
+     * Put focus back to active element after closing
+     */
+    backFocus?: boolean;
+    /**
+     * Do not let user to focus on element outside modal content
+     */
+    trapFocus?: boolean;
+    fullScreen?: { autostart: boolean };
+    /**
+     * Set `touch: false` to disable panning/swiping
+     */
+    touch?: FancyBoxTouchOptions | false;
+    /**
+     * Hash value when initializing manually,
+     * set `false` to disable hash change
+     */
+    hash?: any;
+    /**
+     * Customize or add new media types
+     * Example:
+     * media : {
+     *   youtube : {
+     *     params : {
+     *       autoplay : 0
+     *     }
+     *   }
+     * }
+     */
+    media?: FancyBoxPlainObject;
+    slideShow?: { autoStart?: boolean; speed?: number; };
+    thumbs?: FancyThumbsOptions;
+    /**
+     * Use mousewheel to navigate gallery
+     * If 'auto' - enabled for images only
+     */
+    wheel?: "auto" | false;
+    /**
+     * When instance has been initialized
+     */
+    onInit?(instance: FancyBoxInstance): void;
+    /**
+     * Before the content of a slide is being loaded
+     */
+    beforeLoad?(instance: FancyBoxInstance, current: FancyBoxSlide): void;
+    /**
+     * When the content of a slide is done loading
+     */
+    afterLoad?(instance: FancyBoxInstance, current: FancyBoxSlide): void;
+    /**
+     * Before open animation starts
+     */
+    beforeShow?(instance: FancyBoxInstance, current: FancyBoxSlide): void;
+    /**
+     * When content is done loading and animating
+     */
+    afterShow?(instance: FancyBoxInstance, current: FancyBoxSlide): void;
+    /**
+     * Before the instance attempts to close. Return false to cancel the close.
+     */
+    beforeClose?(instance: FancyBoxInstance, current: FancyBoxSlide): void;
+    /**
+     * After instance has been closed
+     */
+    afterClose?(instance: FancyBoxInstance, current: FancyBoxSlide): void;
+    /**
+     * When instance is brought to front
+     */
+    onActivate?(instance: FancyBoxInstance): void;
+    /**
+     * When other instance has been activated
+     */
+    onDeactivate?(instance: FancyBoxInstance): void;
+    /**
+     * Clicked on the content
+     */
+    clickContent?: FancyBoxInteractions;
+    /**
+     * Clicked on the slide
+     */
+    clickSlide?: FancyBoxInteractions;
+    /**
+     * Clicked on the background (backdrop) element;
+     * if you have not changed the layout, then most likely you need to use `clickSlide` option
+     */
+    clickOutside?: FancyBoxInteractions;
+    /**
+     * Same as previous two, but for double click
+     */
+    dblclickContent?: FancyBoxInteractions;
+    /**
+     * Same as previous two, but for double click
+     */
+    dblclickSlide?: FancyBoxInteractions;
+    /**
+     * Same as previous two, but for double click
+     */
+    dblclickOutside?: FancyBoxInteractions;
+    lang?: string;
+    i18n?: FancyBoxInternationalizationOptions;
+    caption?: string | ((instance: FancyBoxInstance, current: FancyBoxSlide) => string);
+}
+
+interface FancyBoxRefs {
+    bg: JQuery;
+    caption: JQuery;
+    container: JQuery;
+    infobar: JQuery;
+    inner: JQuery;
+    navigation: JQuery;
+    stage: JQuery;
+    toolbar: JQuery;
+}
+
+interface FancyBoxFullScreen {
+    enabled(): boolean;
+    exit(): void;
+    isFullscreen(): boolean;
+    request(elem: HTMLElement): void;
+    toggle(elem: HTMLElement): void;
+}
+
+interface FancyBoxGestures {
+    $bg: JQuery;
+    $container: JQuery;
+    $stage: JQuery;
+    instance: FancyBoxInstance;
+    destroy(): void;
+    endPanning(): void;
+    endSwiping(swiping: "x" | "y", scrolling: boolean): void;
+    endZooming(): void;
+    limitMovement(): void;
+    limitPosition(newOffsetX: number, newOffsetY: number, newWidth: number, newHeight: number): void;
+    onPan(): void;
+    onSwipe(e: JQuery.Event): void;
+    onTap(e: JQuery.Event): void;
+    onZoom(): void;
+    onscroll(e: JQuery.ScrollEvent): void;
+    ontouchend(e: JQuery.TouchEndEvent): void;
+    ontouchmove(e: JQuery.TouchMoveEvent): void;
+    ontouchstart(e: JQuery.TouchStartEvent): void;
+}
+
+interface FancyBoxSlideShow {
+    $button?: JQuery;
+    $progress: JQuery;
+    instance: FancyBoxInstance;
+    clear(): void;
+    init(): void;
+    isActive: boolean;
+    set(force: boolean): void;
+    start(): void;
+    stop(): void;
+    timer?: number;
     toggle(): void;
-    showLoading(): void;
-    hideLoading(): void;
-
-    (options: FancyboxOptions): void;
-    (selector: string, options?: FancyboxOptions): void;
-    (selector: JQuery, options?: FancyboxOptions): void;
-    (group?: any[], options?: FancyboxOptions): void;
 }
 
-interface FancyboxCallback {
-    onCancel?: Function;
-    beforeLoad?: Function;
-    afterLoad?: Function;
-    beforeShow?: Function;
-    afterShow?: Function;
-    beforeClose?: Function;
-    afterClose?: Function;
-    onUpdate?: Function;
-    onPlayStart?: Function;
-    onPlayEnd?: Function;
+interface FancyThumbs {
+    $button?: JQuery;
+    $grid?: JQuery;
+    $list?: JQuery;
+    instance: FancyBoxInstance;
+    opts: FancyThumbsOptions;
+    create(): void;
+    focus(duration: number): void;
+    hide(): void;
+    init(instance: FancyBoxInstance): void;
+    isActive: boolean;
+    isVisible: boolean;
+    show(): void;
+    toggle(): void;
+    update(): void;
 }
 
-interface FancyboxThumbnailHelperOptions {
+interface FancyBoxInstanceMethods {
+    /**
+     * Activates current instance - brings container to the front and enables keyboard,
+     * notifies other instances about deactivating
+     */
+    activate(): void;
+    /**
+     * Populate current group with fresh content
+     * Check if each object has valid type and content
+     * @param content
+     */
+    addContent(content: FancyBoxPlainObject | JQuery): void;
+    /**
+     * Attach an event handler functions for:
+     *   - navigation buttons
+     *   - browser scrolling, resizing;
+     *   - focusing
+     *   - keyboard
+     *   - detecting inactivity
+     */
+    addEvents(): void;
+    /**
+     * Prevent caption overlap,
+     * fix css inconsistency across browsers
+     * @param slide
+     */
+    adjustCaption(slide: FancyBoxSlide): void;
+    /**
+     * Simple hack to fix inconsistency across browsers, described here (affects Edge, too):
+     * https://bugzilla.mozilla.org/show_bug.cgi?id=748518
+     * @param slide
+     */
+    adjustLayout(slide: FancyBoxSlide): void;
+    /**
+     * Adjustments after slide content has been loaded
+     * @param slide
+     */
+    afterLoad(slide: FancyBoxSlide): void;
+    /**
+     * Check if image dimensions exceed parent element
+     * @param nextWidth
+     * @param nextHeight
+     */
+    canPan(nextWidth?: number, nextHeight?: number): boolean;
+    /**
+     * Horizontally center slide
+     * @param duration
+     */
+    centerSlide(duration: number): void;
+    /**
+     * Check if image has srcset and get the source
+     * @param slide
+     */
+    checkSrcset(slide: FancyBoxSlide): void;
+    /**
+     * Final adjustments after removing the instance
+     * @param e
+     */
+    cleanUp(e: JQuery.Event): void;
+    /**
+     * Close current or all instances
+     * @param e
+     * @param duration
+     */
+    close(e: JQuery.Event, duration?: number): void;
+    /**
+     * Final adjustments after current gallery item is moved to position
+     * and it`s content is loaded
+     */
+    complete(): void;
+    /**
+     * Create new "slide" element
+     * These are gallery items  that are actually added to DOM
+     * @param pos
+     */
+    createSlide(pos: number): FancyBoxSlide;
+    /**
+     * Try to find and focus on the first focusable element
+     * @param e
+     * @param firstRun
+     */
+    focus(e: JQuery.Event, firstRun: boolean): void;
+    /**
+     * Calculate image size to fit inside viewport
+     * @param slide
+     */
+    getFitPos(slide: FancyBoxSlide): FancyBoxGetFitPosResults;
+    /**
+     * Check if we can and have to zoom from thumbnail
+     * @param slide
+     */
+    getThumbPos(slide: FancyBoxSlide): FancyBoxThumbPos;
+    /**
+     * Hide toolbar and caption
+     * @param andCaption
+     */
+    hideControls(andCaption: boolean): void;
+    /**
+     * Remove loading icon from the slide
+     * @param slide
+     */
+    hideLoading(slide: FancyBoxSlide): void;
+    /**
+     * Create DOM structure
+     */
+    init(): void;
+    /**
+     * Check if current slide is moved (swiped)
+     * @param slide
+     */
+    isMoved(slide: FancyBoxSlide): boolean;
+    /**
+     * Check if current image dimensions are smaller than actual
+     * @param nextWidth
+     * @param nextHeight
+     */
+    isScaledDown(nextWidth?: number, nextHeight?: number): boolean;
+    /**
+     * Check if current slide is zoomable
+     */
+    isZoomable(): boolean;
+    /**
+     * Switch to selected gallery item
+     * @param pos
+     * @param duration
+     */
+    jumpTo(pos: number, duration: number): void;
+    /**
+     * Load content into the slide
+     * @param slide
+     */
+    loadSlide(slide: FancyBoxSlide): void;
+    /**
+     * Change to next gallery item
+     * @param duration
+     */
+    next(duration: number): void;
+    /**
+     * Preload next and previous slides
+     * @param type
+     */
+    preload(type: string): void;
+    /**
+     * Change to previous gallery item
+     * @param duration
+     */
+    previous(duration: number): void;
+    /**
+     * Remove events added by the core
+     */
+    removeEvents(): void;
+    /**
+     * Computes the slide size from image size and maxWidth/maxHeight
+     * @param slide
+     * @param imgWidth
+     * @param imgHeight
+     */
+    resolveImageSlideSize(slide: FancyBoxSlide, imgWidth: number, imgHeight: number): void;
+    /**
+     * Make content visible
+     * This method is called right after content has been loaded or
+     * user navigates gallery and transition should start
+     * @param slide
+     */
+    revealContent(slide: FancyBoxSlide): void;
+    /**
+     * Scale image to the actual size of the image;
+     * x and y values should be relative to the slide
+     * @param x
+     * @param y
+     * @param duration
+     */
+    scaleToActual(x?: number, y?: number, duration?: number): void;
+    /**
+     * Scale image to fit inside parent element
+     * @param duration
+     */
+    scaleToFit(duration: number): void;
+    /**
+     * Create full-size image
+     * @param slide
+     */
+    setBigImage(slide: FancyBoxSlide): void;
+    /**
+     * Wrap and append content to the slide
+     * @param slide
+     * @param content
+     */
+    setContent(slide: FancyBoxSlide, content: JQuery | string): void;
+    /**
+     * Display error message
+     * @param slide
+     */
+    setError(slide: FancyBoxSlide): void;
+    /**
+     * Create iframe wrapper, iframe and bindings
+     * @param slide
+     */
+    setIframe(slide: FancyBoxSlide): void;
+    /**
+     * Use thumbnail image, if possible
+     * @param slide
+     */
+    setImage(slide: FancyBoxSlide): void;
+    /**
+     * Show toolbar and caption
+     */
+    showControls(): void;
+    /**
+     * Show loading icon inside the slide
+     * @param slide
+     */
+    showLoading(slide: FancyBoxSlide): void;
+    /**
+     * Toggle toolbar and caption
+     */
+    toggleControls(): void;
+    /**
+     * Simple i18n support - replaces object keys found in template
+     * with corresponding values
+     * @param obj
+     * @param str
+     */
+    translate(obj: any, str: string): string;
+    /**
+     * Call callback and trigger an event
+     * @param name
+     * @param slide
+     */
+    trigger(name: string, slide: FancyBoxSlide): void;
+    /**
+     * Update content size and position for all slides
+     * @param e
+     */
+    update(e): void;
+    /**
+     * Update infobar values, navigation button states and reveal caption
+     */
+    updateControls(): void;
+    /**
+     * Update cursor style depending if content can be zoomed
+     * @param nextWidth
+     * @param nextHeight
+     */
+    updateCursor(nextWidth: number, nextHeight: number): void;
+    /**
+     * Update slide content position and size
+     * @param slide
+     * @param e
+     */
+    updateSlide(slide: FancyBoxSlide, e?): void;
+}
+
+interface FancyBoxInstance extends FancyBoxInstanceMethods {
+    $caption?: JQuery;
+    $refs?: FancyBoxRefs;
+    $trigger?: JQuery;
+    FullScreen: FancyBoxFullScreen;
+    Guestures: FancyBoxGestures;
+    SlideShow: FancyBoxSlideShow;
+    Thumbs: FancyThumbs;
+    currIndex: number;
+    currPos: number;
+    current: FancyBoxSlide;
+    firstRun: boolean;
+    group: FancyBoxGroupItem[];
+    hasHiddenControls: boolean;
+    id: number;
+    idleInterval: number;
+    idleSecondsCounter: number;
+    isAnimating: boolean;
+    isIdle: boolean;
+    isVisible: boolean;
+    opts: FancyBoxOptions;
+    prevIndex: number;
+    prevPos: number;
+    slides: { [key: number]: FancyBoxSlide };
+}
+
+interface FancyBoxThumbPos extends FancyBoxGetFitPosResults {
+    scaleX?: number;
+    scaleY?: number;
+}
+
+interface FancyBoxGetFitPosResults {
+    top?: number;
+    left?: number;
     width?: number;
     height?: number;
-    source?: any;
-    position?: string;
 }
 
-interface FancyboxButtonHelperOptions {
-    tpl?: string;
-    position?: string;
+interface FancyBoxJQueryMethods {
+    animate($el: JQuery, to: FancyBoxThumbPos, duration: number, callback: () => void, leaveAnimationName: boolean): void;
+    close(all?: boolean): void;
+    defaults: FancyBoxOptions;
+    destroy(): void;
+    getInstance(command?: string | (() => void)): FancyBoxInstance;
+    getTranslate($el: JQuery): void;
+    isMobile: boolean;
+    open(items: JQuery | string | FancyBoxGroupItem[] | FancyBoxGroupItem, opts?: FancyBoxOptions, index?: number): FancyBoxInstance;
+    setTranslate($el: JQuery, props: { left?: number; top?: number; }): void;
+    stop($el: JQuery, callCallback: boolean): void;
+    use3d: string;
+    version: string;
 }
 
 interface JQuery {
-    fancybox: FancyboxMethods;
+    fancybox(options?: FancyBoxOptions): JQuery;
 }
 
 interface JQueryStatic {
-    fancybox: FancyboxMethods;
+    fancybox: FancyBoxJQueryMethods;
 }
diff --git a/types/fast64/index.d.ts b/types/fast64/index.d.ts
index 47f067859c..3526e44d84 100644
--- a/types/fast64/index.d.ts
+++ b/types/fast64/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for fast64 0.5
-// Project: https://github.com/superhuman/fast64
+// Project: https://github.com/superhuman/fast64, https://github.com/conradirwin/fast64
 // Definitions by: Rares Matei <https://github.com/rarmatei>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/fastify-cors/fastify-cors-tests.ts b/types/fastify-cors/fastify-cors-tests.ts
deleted file mode 100644
index 5fcd7e20d4..0000000000
--- a/types/fastify-cors/fastify-cors-tests.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import fastifyCors = require("fastify-cors");
-
-fastifyCors();
-
-const fastifyCorsOptions: fastifyCors.FastifyCorsOptions = {
-    origin: true,
-    allowedHeaders: "authorization,content-type",
-    methods: "GET,POST,PUT,PATCH,DELETE,OPTIONS",
-    credentials: true,
-    exposedHeaders: "authorization",
-    maxAge: 13000,
-    preflightContinue: false,
-    optionsSuccessStatus: 200,
-    preflight: false,
-};
-
-const fastifyCorsOptionsArray: fastifyCors.FastifyCorsOptions = {
-    origin: true,
-    allowedHeaders: ["authorization", "content-type"],
-    methods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
-    credentials: true,
-    exposedHeaders: ["authorization"],
-    maxAge: 13000,
-    preflightContinue: false,
-    optionsSuccessStatus: 200,
-    preflight: false,
-};
-
-const originString: fastifyCors.FastifyCorsOptions = {
-    origin: "*",
-    allowedHeaders: ["authorization", "content-type"],
-    methods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
-    credentials: true,
-    exposedHeaders: ["authorization"],
-    maxAge: 13000,
-    preflightContinue: false,
-    optionsSuccessStatus: 200,
-    preflight: false,
-};
-
-const originRegexp: fastifyCors.FastifyCorsOptions = {
-    origin: /\*/,
-    allowedHeaders: ["authorization", "content-type"],
-    methods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
-    credentials: true,
-    exposedHeaders: ["authorization"],
-    maxAge: 13000,
-    preflightContinue: false,
-    optionsSuccessStatus: 200,
-    preflight: false,
-};
-
-const originStringArray: fastifyCors.FastifyCorsOptions = {
-    origin: ["*", "something"],
-    allowedHeaders: ["authorization", "content-type"],
-    methods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
-    credentials: true,
-    exposedHeaders: ["authorization"],
-    maxAge: 13000,
-    preflightContinue: false,
-    optionsSuccessStatus: 200,
-    preflight: false,
-};
-
-const originRegexpArray: fastifyCors.FastifyCorsOptions = {
-    origin: [/\*/, /something/],
-    allowedHeaders: ["authorization", "content-type"],
-    methods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
-    credentials: true,
-    exposedHeaders: ["authorization"],
-    maxAge: 13000,
-    preflightContinue: false,
-    optionsSuccessStatus: 200,
-    preflight: false,
-};
-
-const originCallback: fastifyCors.FastifyCorsOptions = {
-    origin: (err: Error, allow: boolean) => {
-        throw err;
-    },
-    allowedHeaders: ["authorization", "content-type"],
-    methods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
-    credentials: true,
-    exposedHeaders: ["authorization"],
-    maxAge: 13000,
-    preflightContinue: false,
-    optionsSuccessStatus: 200,
-    preflight: false,
-};
diff --git a/types/fastify-cors/index.d.ts b/types/fastify-cors/index.d.ts
deleted file mode 100644
index 907689a72c..0000000000
--- a/types/fastify-cors/index.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// Type definitions for fastify-cors 0.1
-// Project: https://github.com/fastify/fastify-cors#readme
-// Definitions by: Jannik Keye <https://github.com/jannikkeye>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-type originCallback = (err: Error, allow: boolean) => void;
-
-/**
- * fastify-cors enables the use of CORS in a Fastify application.
- */
-declare function fastifyCors(): void;
-
-declare namespace fastifyCors {
-  /**
-   * Options for configuring the fastify-cors plugin.
-   */
-  interface FastifyCorsOptions {
-    /**
-     * Configures the Access-Control-Allow-Origin CORS header.
-     */
-    origin?: string | boolean | RegExp | string[] | RegExp[] | originCallback;
-    /**
-     * Configures the Access-Control-Allow-Credentials CORS header.
-     * Set to true to pass the header, otherwise it is omitted.
-     */
-    credentials?: boolean;
-    /**
-     * Configures the Access-Control-Expose-Headers CORS header.
-     * Expects a comma-delimited string (ex: 'Content-Range,X-Content-Range')
-     * or an array (ex: ['Content-Range', 'X-Content-Range']).
-     * If not specified, no custom headers are exposed.
-     */
-    exposedHeaders?: string | string[];
-    /**
-     * Configures the Access-Control-Allow-Headers CORS header.
-     * Expects a comma-delimited string (ex: 'Content-Type,Authorization')
-     * or an array (ex: ['Content-Type', 'Authorization']). If not
-     * specified, defaults to reflecting the headers specified in the
-     * request's Access-Control-Request-Headers header.
-     */
-    allowedHeaders?: string | string[];
-    /**
-     * Configures the Access-Control-Allow-Methods CORS header.
-     * Expects a comma-delimited string (ex: 'GET,PUT,POST') or an array (ex: ['GET', 'PUT', 'POST']).
-     */
-    methods?: string | string[];
-    /**
-     * Configures the Access-Control-Max-Age CORS header.
-     * Set to an integer to pass the header, otherwise it is omitted.
-     */
-    maxAge?: number;
-    /**
-     * Pass the CORS preflight response to the route handler (default: false).
-     */
-    preflightContinue?: boolean;
-    /**
-     * Provides a status code to use for successful OPTIONS requests,
-     * since some legacy browsers (IE11, various SmartTVs) choke on 204.
-     */
-    optionsSuccessStatus?: number;
-    /**
-     * Pass the CORS preflight response to the route handler (default: false).
-     */
-    preflight?: boolean;
-  }
-}
-
-export = fastifyCors;
diff --git a/types/fastify-cors/tsconfig.json b/types/fastify-cors/tsconfig.json
deleted file mode 100644
index 9e696b42e2..0000000000
--- a/types/fastify-cors/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "fastify-cors-tests.ts"
-    ]
-}
diff --git a/types/fastify-jwt/fastify-jwt-tests.ts b/types/fastify-jwt/fastify-jwt-tests.ts
deleted file mode 100644
index fc68ac8bcc..0000000000
--- a/types/fastify-jwt/fastify-jwt-tests.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import fastify = require("fastify");
-import fastifyJwt = require("fastify-jwt");
-
-const app = fastify();
-
-app.register<fastifyJwt.FastifyJwtOptions>(fastifyJwt, {
-  secret: "super-secret",
-});
-
-app.register<fastifyJwt.FastifyJwtOptions>(fastifyJwt, {
-  secret: (request, reply, callback) => {
-    return "";
-  },
-});
-
-app.get("/path", (request, reply) => {
-  request.jwtVerify();
-  request.jwtVerify({});
-  request.jwtVerify({}, () => "string");
-  request.jwtVerify(() => "string", () => "string");
-
-  reply.jwtSign("payload");
-  reply.jwtSign("payload", {});
-  reply.jwtSign("payload", {}, () => "string");
-  reply.jwtSign({ a: "b" }, {}, () => "string");
-  reply.jwtSign([], {}, () => "string");
-  reply.jwtSign(new Buffer("buffer"), {}, () => "string");
-  reply.jwtSign("payload", () => "string", () => "string");
-});
-
-app.jwt.sign({ a: "b" }, {}, (err, token) => {
-  if (err) {
-    throw err;
-  }
-
-  return token;
-});
-
-app.jwt.sign("string", { algorithm: "some-algorithm" }, (err, token) => {
-  if (err) {
-    throw err;
-  }
-
-  return token;
-});
-
-app.jwt.sign([], {}, (err, token) => {
-  if (err) {
-    throw err;
-  }
-
-  return token;
-});
-
-app.jwt.sign(new Buffer("buffer"), {}, (err, token) => {
-  if (err) {
-    throw err;
-  }
-
-  return token;
-});
-
-app.jwt.decode("some-token");
-app.jwt.decode("some-token");
-app.jwt.secret = "some-secret";
-app.jwt.verify("some-token", {}, (err) => {
-  if (err) {
-    throw err;
-  }
-
-  return true;
-});
diff --git a/types/fastify-jwt/index.d.ts b/types/fastify-jwt/index.d.ts
deleted file mode 100644
index 94e6249a3c..0000000000
--- a/types/fastify-jwt/index.d.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// Type definitions for fastify-jwt 0.4
-// Project: https://github.com/fastify/fastify-jwt#readme
-// Definitions by: Jannik Keye <https://github.com/jannikkeye>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
-import fastify = require("fastify");
-
-import { Secret, SignOptions, VerifyOptions, VerifyCallback, SignCallback, DecodeOptions } from 'jsonwebtoken';
-import { IncomingMessage, ServerResponse } from 'http';
-
-declare module "fastify" {
-  interface FastifyInstance<HttpServer, HttpRequest, HttpResponse> {
-      jwt: jwt;
-  }
-
-  interface SignFunction {
-    (payload: string | Buffer | object, options?: SignOptions): string;
-    (payload: string | Buffer | object, options?: SignOptions, callback?: SignCallback): void;
-  }
-
-  interface VerifyFunction {
-    (token: string, options?: VerifyOptions, callback?: VerifyCallback): void;
-    (token: string, options?: VerifyOptions): object | string;
-  }
-
-  interface jwt {
-      sign: SignFunction;
-      verify: VerifyFunction;
-      decode(token: string, options?: DecodeOptions): null | { [key: string]: any } | string;
-      secret: Secret;
-  }
-
-  interface FastifyRequest<HttpRequest> {
-      jwtVerify: (options?: VerifyOptions | VerifyCallback, next?: VerifyCallback) => Promise<null | { [key: string]: any } | string> | null | { [key: string]: any } | string;
-  }
-
-  interface FastifyReply<HttpResponse> {
-      jwtSign: (payload: string | Buffer | object, options?: SignOptions | SignCallback, next?: SignCallback) => void;
-  }
-}
-
-declare function fastifyJwt(): void;
-
-declare namespace fastifyJwt {
-    type SecretCallback = (request: fastify.FastifyRequest<IncomingMessage>, reply: string | Buffer | object, callback?: VerifyCallback | SignCallback) => void;
-
-    interface FastifyJwtOptions {
-        secret: string | SecretCallback;
-    }
-}
-
-export = fastifyJwt;
diff --git a/types/fastify-jwt/package.json b/types/fastify-jwt/package.json
deleted file mode 100644
index 5eb77c39fa..0000000000
--- a/types/fastify-jwt/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "fastify": ">=1.13.1 || 2.0.0-rc.1"
-    }
-}
diff --git a/types/fastify-jwt/tsconfig.json b/types/fastify-jwt/tsconfig.json
deleted file mode 100644
index a0149e0fe8..0000000000
--- a/types/fastify-jwt/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "fastify-jwt-tests.ts"
-    ]
-}
diff --git a/types/fastify-multipart/fastify-multipart-tests.ts b/types/fastify-multipart/fastify-multipart-tests.ts
deleted file mode 100644
index ef125ecfa6..0000000000
--- a/types/fastify-multipart/fastify-multipart-tests.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import fastify = require("fastify");
-import fastifyMultipart = require("fastify-multipart");
-
-const app = fastify();
-
-app.register<fastifyMultipart.FastifyMultipartOptions>(fastifyMultipart, {
-    limits: {
-            fieldNameSize: 200,
-            fieldSize: 200,
-            fields: 200,
-            fileSize: 200,
-            files: 2,
-            headerPairs: 200,
-    }
-});
-
-app.get("/path", (request) => {
-    const isMultiPart = request.isMultipart();
-    request.multipart((field, file, filename, encoding, mimetype) => {
-        console.log(field, file, filename, encoding, mimetype);
-    }, (err) => {
-        throw err;
-    });
-});
diff --git a/types/fastify-multipart/index.d.ts b/types/fastify-multipart/index.d.ts
deleted file mode 100644
index 9d43a15daf..0000000000
--- a/types/fastify-multipart/index.d.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-// Type definitions for fastify-multipart 0.5
-// Project: https://github.com/fastify/fastify-multipart#readme
-// Definitions by: Jannik Keye <https://github.com/jannikkeye>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-/// <reference types="node" />
-
-import busboy = require("busboy");
-import fastify = require("fastify");
-
-import { IncomingMessage, ServerResponse } from 'http';
-
-declare module "fastify" {
-    interface FastifyRequest<HttpRequest> {
-        isMultipart: () => boolean;
-        multipart: (handler: fastifyMultipart.MultipartHandler, next: (err: Error) => void) => busboy.Busboy;
-    }
-}
-
-declare function fastifyMultipart(): void;
-
-declare namespace fastifyMultipart {
-    type MultipartHandler = (
-        field: string,
-        file: any,
-        filename: string,
-        encoding: string,
-        mimetype: string,
-    ) => void;
-
-    interface FastifyMultipartOptions {
-        limits?: {
-            /**
-             * Max field name size in bytes
-             */
-            fieldNameSize?: number;
-
-            /**
-             * Max field value size in bytes
-             */
-            fieldSize?: number;
-
-            /**
-             * Max number of non-file fields
-             */
-            fields?: number;
-
-            /**
-             * For multipart forms, the max file size
-             */
-            fileSize?: number;
-
-            /**
-             * Max number of file fields
-             */
-            files?: number;
-
-            /**
-             * Max number of header key=>value pairs
-             */
-            headerPairs?: number;
-        };
-    }
-}
-
-export = fastifyMultipart;
diff --git a/types/fastify-multipart/tsconfig.json b/types/fastify-multipart/tsconfig.json
deleted file mode 100644
index e30babe0c1..0000000000
--- a/types/fastify-multipart/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "fastify-multipart-tests.ts"
-    ]
-}
diff --git a/types/fastify-rate-limit/fastify-rate-limit-tests.ts b/types/fastify-rate-limit/fastify-rate-limit-tests.ts
new file mode 100644
index 0000000000..ee79951f48
--- /dev/null
+++ b/types/fastify-rate-limit/fastify-rate-limit-tests.ts
@@ -0,0 +1,22 @@
+import fastifyRateLimit = require("fastify-rate-limit");
+import * as IORedis from 'ioredis';
+import { FastifyRequest, DefaultQuery } from "fastify";
+import { IncomingMessage } from "http";
+
+fastifyRateLimit();
+
+const fastifyRateLimitOptions: fastifyRateLimit.FastifyRateLimitOptions<FastifyRequest<IncomingMessage, DefaultQuery, {test: string}>> = {
+    max: 3,
+    timeWindow: 5000,
+    cache: 10000,
+    whitelist: ['127.0.0.1'],
+    redis: new IORedis({ host: '127.0.0.1' }),
+    skipOnError: true, // default false
+    keyGenerator: (req) => {
+        return req.headers['x-real-ip']
+        || req.headers['x-client-ip']
+        || req.headers['x-forwarded-for']
+        || req.params.test
+        || req.ip;
+    },
+};
diff --git a/types/fastify-rate-limit/index.d.ts b/types/fastify-rate-limit/index.d.ts
new file mode 100644
index 0000000000..888611ad72
--- /dev/null
+++ b/types/fastify-rate-limit/index.d.ts
@@ -0,0 +1,74 @@
+// Type definitions for fastify-rate-limit 2.0
+// Project: https://github.com/fastify/fastify-rate-limit#readme
+// Definitions by: Christian D <https://github.com/pc-jedi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { Redis } from "ioredis";
+import { FastifyRequest } from "fastify";
+import { IncomingMessage } from "http";
+
+declare function fastifyRateLimit(): void;
+
+declare namespace fastifyRateLimit {
+  interface FastifyRateLimitOptions<T = FastifyRequest<IncomingMessage>> {
+    /**
+     * Is the maximum number of requests a single client can perform inside a
+     * timeWindow.
+     *
+     * default: 1000
+     */
+    max?: number;
+
+    /**
+     * The duration of the time window, can be expressed in milliseconds (as a
+     * number) or as a string, see ms too see the supported formats
+     *
+     * default: 1000 * 60
+     */
+    timeWindow?: number;
+
+    /**
+     * This plugin internally uses a lru cache to handle the clients, you can
+     * change the size of the cache with this option.
+     *
+     * default: 5000
+     */
+    cache?: number;
+
+    /**
+     * Array of string of ips to exclude from rate limiting.
+     *
+     * default: []
+     */
+    whitelist?: string[];
+
+    /**
+     * By default this plugins uses an in-memory store, which is fast but if
+     * you application works on more than one server it is useless, since the
+     * data is store locally. You can pass a Redis client here and magically
+     * the issue is solved. To achieve the maximum speed, this plugins requires
+     * the use of ioredis.
+     *
+     * default: null
+     */
+    redis?: Redis;
+
+    /**
+     * If `true` it will skip errors generated by the storage (eg, redis not
+     * reachable).
+     *
+     * default: false
+     */
+    skipOnError?: boolean;
+
+    /**
+     * Function to generate a unique identifier for each incoming request.
+     *
+     * default: (req) => req.ip
+     */
+    keyGenerator?: (req: T) => string;
+  }
+}
+
+export = fastifyRateLimit;
diff --git a/types/fastify-multipart/package.json b/types/fastify-rate-limit/package.json
similarity index 100%
rename from types/fastify-multipart/package.json
rename to types/fastify-rate-limit/package.json
diff --git a/types/fastify-rate-limit/tsconfig.json b/types/fastify-rate-limit/tsconfig.json
new file mode 100644
index 0000000000..5dc0e91ea2
--- /dev/null
+++ b/types/fastify-rate-limit/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", "fastify-rate-limit-tests.ts"],
+    "exclude": ["node-modules"]
+}
diff --git a/types/fastify-rate-limit/tslint.json b/types/fastify-rate-limit/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/fastify-rate-limit/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/fastify-static/fastify-static-tests.ts b/types/fastify-static/fastify-static-tests.ts
deleted file mode 100644
index 630fc0ef52..0000000000
--- a/types/fastify-static/fastify-static-tests.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import path = require("path");
-import fastify = require("fastify");
-import fastifyStatic = require("fastify-static");
-
-const app = fastify();
-
-app.register<fastifyStatic.FastifyStaticOptions>(fastifyStatic, {
-    root: path.join(__dirname, "public"),
-    prefix: "/public/", // optional: default '/'
-    immutable: true,
-    maxAge: 42
-});
-
-app.get("/another/path", (req, reply) => {
-    reply.sendFile("myHtml.html"); // serving path.join(__dirname, 'public', 'myHtml.html') directly
-});
diff --git a/types/fastify-static/index.d.ts b/types/fastify-static/index.d.ts
deleted file mode 100644
index ef4eda1952..0000000000
--- a/types/fastify-static/index.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-// Type definitions for fastify-static 0.14
-// Project: https://github.com/fastify/fastify-static
-// Definitions by: Leonhard Melzer <https://github.com/leomelzer>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
-
-import fastify = require("fastify");
-
-import { Server, IncomingMessage, ServerResponse } from "http";
-
-declare module "fastify" {
-    interface FastifyReply<HttpResponse> {
-        sendFile(filename: string): FastifyReply<HttpResponse>;
-    }
-}
-
-declare function fastifyStatic(): void;
-
-declare namespace fastifyStatic {
-    interface FastifyStaticOptions {
-        root: string;
-        prefix?: string;
-        serve?: boolean;
-        decorateReply?: boolean;
-        schemaHide?: boolean;
-        setHeaders?: () => void;
-
-        // Passed on to `send`
-        acceptRanges?: boolean;
-        cacheControl?: boolean;
-        dotfiles?: boolean;
-        etag?: boolean;
-        extensions?: string[];
-        immutable?: boolean;
-        index?: string[];
-        lastModified?: boolean;
-        maxAge?: string | number;
-    }
-}
-
-export = fastifyStatic;
diff --git a/types/fastify-static/package.json b/types/fastify-static/package.json
deleted file mode 100644
index e8c68ab969..0000000000
--- a/types/fastify-static/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "fastify": "^1.11.2"
-    }
-}
diff --git a/types/fastify-static/tsconfig.json b/types/fastify-static/tsconfig.json
deleted file mode 100644
index bdfa7d40c6..0000000000
--- a/types/fastify-static/tsconfig.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": ["es6"],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictFunctionTypes": true,
-        "strictNullChecks": true,
-        "baseUrl": "../",
-        "typeRoots": ["../"],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": ["index.d.ts", "fastify-static-tests.ts"]
-}
diff --git a/types/favicons/index.d.ts b/types/favicons/index.d.ts
index 6bd3a4892e..730841dff9 100644
--- a/types/favicons/index.d.ts
+++ b/types/favicons/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for favicons 5.3
-// Project: https://github.com/evilebottnawi/favicons/blob/master/package.json
+// Project: https://github.com/itgalaxy/favicons
 // Definitions by: Mohsen Azimi <https://github.com/mohsen1>, Nikk Radetskiy <https://github.com/metsawyr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
@@ -9,7 +9,7 @@
 import { Duplex } from "stream";
 
 declare namespace favicons {
-     interface Configuration {
+    interface Configuration {
         /** Path for overriding default icons path @default "/" */
         path: string;
         /** Your application's name @default null */
@@ -38,6 +38,8 @@ declare namespace favicons {
         version: string;
         /** Print logs to console? @default false */
         logging: boolean;
+        /** Use nearest neighbor resampling to preserve hard edges on pixel art @default false */
+        pixel_art: boolean;
         /**
          * Platform Options:
          * - offset - offset in percentage
@@ -66,18 +68,18 @@ declare namespace favicons {
         }>;
     }
 
-     interface FavIconResponse {
+    interface FavIconResponse {
         images: Array<{ name: string; contents: Buffer }>;
         files: Array<{ name: string; contents: Buffer }>;
         html: string[];
     }
 
-     type Callback = (error: Error | null, response: FavIconResponse) => void;
+    type Callback = (error: Error | null, response: FavIconResponse) => void;
 
     /** You can programmatically access Favicons configuration (icon filenames, HTML, manifest files, etc) with this export */
-     const config: Configuration;
+    const config: Configuration;
 
-     function stream(configuration?: Configuration): Duplex;
+    function stream(configuration?: Configuration): Duplex;
 }
 /**
  * Generate favicons
diff --git a/types/feathersjs__authentication-client/index.d.ts b/types/feathersjs__authentication-client/index.d.ts
index 6594fb7e95..f2057900b9 100644
--- a/types/feathersjs__authentication-client/index.d.ts
+++ b/types/feathersjs__authentication-client/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @feathersjs/authentication-client 1.0
-// Project: http://feathersjs.com/
+// Project: https://feathersjs.com
 // Definitions by: Abraao Alves <https://github.com/AbraaoAlves>, Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.3
diff --git a/types/feathersjs__authentication-jwt/index.d.ts b/types/feathersjs__authentication-jwt/index.d.ts
index 16d79bb885..708dd32386 100644
--- a/types/feathersjs__authentication-jwt/index.d.ts
+++ b/types/feathersjs__authentication-jwt/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @feathersjs/authentication-jwt 1.0
-// Project: http://feathersjs.com/
+// Project: https://feathersjs.com
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.3
diff --git a/types/feathersjs__authentication-local/index.d.ts b/types/feathersjs__authentication-local/index.d.ts
index e16f9742b4..2af33c6dc6 100644
--- a/types/feathersjs__authentication-local/index.d.ts
+++ b/types/feathersjs__authentication-local/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @feathersjs/authentication-local 1.0
-// Project: http://feathersjs.com/
+// Project: https://feathersjs.com
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.3
diff --git a/types/feathersjs__authentication-oauth1/index.d.ts b/types/feathersjs__authentication-oauth1/index.d.ts
index fa993c1cd0..b54668293e 100644
--- a/types/feathersjs__authentication-oauth1/index.d.ts
+++ b/types/feathersjs__authentication-oauth1/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @feathersjs/authentication-oauth1 1.0
-// Project: http://feathersjs.com/
+// Project: https://feathersjs.com
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.3
diff --git a/types/feathersjs__authentication-oauth2/index.d.ts b/types/feathersjs__authentication-oauth2/index.d.ts
index 65e8989ae9..4f9d10a309 100644
--- a/types/feathersjs__authentication-oauth2/index.d.ts
+++ b/types/feathersjs__authentication-oauth2/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @feathersjs/authentication-oauth2 1.0
-// Project: http://feathersjs.com/
+// Project: https://feathersjs.com
 // Definitions by:  Jan Lohage <https://github.com/j2L4e>
 //                  Nick Bolles <https://github.com/NickBolles>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
diff --git a/types/feathersjs__authentication/index.d.ts b/types/feathersjs__authentication/index.d.ts
index 8094c6002a..ad8efeae3b 100644
--- a/types/feathersjs__authentication/index.d.ts
+++ b/types/feathersjs__authentication/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @feathersjs/authentication 2.1
-// Project: http://feathersjs.com/
+// Project: https://feathersjs.com
 // Definitions by:  Abraao Alves <https://github.com/AbraaoAlves>
 //                  Jan Lohage <https://github.com/j2L4e>
 //                  Nick Bolles <https://github.com/NickBolles>
diff --git a/types/feathersjs__configuration/index.d.ts b/types/feathersjs__configuration/index.d.ts
index abd7e53d70..b7cd6b463c 100644
--- a/types/feathersjs__configuration/index.d.ts
+++ b/types/feathersjs__configuration/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @feathersjs/configuration 1.0
-// Project: http://feathersjs.com/
+// Project: https://feathersjs.com
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.3
diff --git a/types/feathersjs__errors/index.d.ts b/types/feathersjs__errors/index.d.ts
index 056acff676..2e5c62a440 100644
--- a/types/feathersjs__errors/index.d.ts
+++ b/types/feathersjs__errors/index.d.ts
@@ -1,11 +1,26 @@
-// Type definitions for @feathersjs/errors 3.2
-// Project: http://feathersjs.com/
+// Type definitions for @feathersjs/errors 3.3
+// Project: https://feathersjs.com
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
+//                 RazzM13 <https://github.com/RazzM13>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.2
 
+export interface FeathersErrorJSON {
+    readonly name: string;
+    readonly message: string;
+    readonly code: number;
+    readonly className: string;
+    readonly data: any;
+    readonly errors: any;
+}
+
 export class FeathersError extends Error {
-    constructor(msg: string | Error, name: string, code: number, className: string, data: any)
+    readonly code: number;
+    readonly className: string;
+    readonly data: any;
+    readonly errors: any;
+    constructor(msg: string | Error, name: string, code: number, className: string, data: any);
+    toJSON(): FeathersErrorJSON;
 }
 
 export class BadRequest extends FeathersError {
diff --git a/types/feathersjs__express/index.d.ts b/types/feathersjs__express/index.d.ts
index 4dfaa0f8ee..a14e91832b 100644
--- a/types/feathersjs__express/index.d.ts
+++ b/types/feathersjs__express/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @feathersjs/express 1.1
-// Project: http://feathersjs.com/
+// Project: https://feathersjs.com
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 //                 Aleksey Klimenko <https://github.com/DadUndead>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
diff --git a/types/feathersjs__primus-client/index.d.ts b/types/feathersjs__primus-client/index.d.ts
index fb348379ea..de068b2b9c 100644
--- a/types/feathersjs__primus-client/index.d.ts
+++ b/types/feathersjs__primus-client/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @feathersjs/primus-client 1.0
-// Project: http://feathersjs.com/
+// Project: https://feathersjs.com
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.3
diff --git a/types/feathersjs__primus/index.d.ts b/types/feathersjs__primus/index.d.ts
index 5d93843822..a18d5d6fe3 100644
--- a/types/feathersjs__primus/index.d.ts
+++ b/types/feathersjs__primus/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @feathersjs/primus 3.0
-// Project: http://feathersjs.com/
+// Project: https://feathersjs.com
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.3
diff --git a/types/feathersjs__rest-client/index.d.ts b/types/feathersjs__rest-client/index.d.ts
index 65fdc93707..058b7a25fe 100644
--- a/types/feathersjs__rest-client/index.d.ts
+++ b/types/feathersjs__rest-client/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @feathersjs/rest-client 1.3
-// Project: http://feathersjs.com/
+// Project: https://feathersjs.com
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 
diff --git a/types/feathersjs__socket-commons/index.d.ts b/types/feathersjs__socket-commons/index.d.ts
index 043009fd5e..d075d3c90a 100644
--- a/types/feathersjs__socket-commons/index.d.ts
+++ b/types/feathersjs__socket-commons/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @feathersjs/socket-commons 3.1
-// Project: http://feathersjs.com/
+// Project: https://github.com/feathersjs/socket-commons
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.3
diff --git a/types/feathersjs__socketio-client/index.d.ts b/types/feathersjs__socketio-client/index.d.ts
index 83fd71b0ed..03d0efff59 100644
--- a/types/feathersjs__socketio-client/index.d.ts
+++ b/types/feathersjs__socketio-client/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @feathersjs/socketio-client 1.0
-// Project: http://feathersjs.com/
+// Project: https://feathersjs.com
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.3
diff --git a/types/feathersjs__socketio/index.d.ts b/types/feathersjs__socketio/index.d.ts
index f0e082bf45..02511a2537 100644
--- a/types/feathersjs__socketio/index.d.ts
+++ b/types/feathersjs__socketio/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @feathersjs/socketio 3.0
-// Project: http://feathersjs.com/
+// Project: https://feathersjs.com
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.3
diff --git a/types/feedparser/index.d.ts b/types/feedparser/index.d.ts
index 75f3dde979..f179e4b22a 100644
--- a/types/feedparser/index.d.ts
+++ b/types/feedparser/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for feedparser 2.2
-// Project: https://github.com/danmactough/node-feedparser
+// Project: http://github.com/danmactough/node-feedparser
 // Definitions by: Juan J. Jimenez-Anca <https://github.com/cortopy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/fetch-mock/index.d.ts b/types/fetch-mock/index.d.ts
index c9984dea89..0a9da3bd9c 100644
--- a/types/fetch-mock/index.d.ts
+++ b/types/fetch-mock/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for fetch-mock 7.2
-// Project: https://github.com/wheresrhys/fetch-mock
+// Project: https://github.com/wheresrhys/fetch-mock, http://www.wheresrhys.co.uk/fetch-mock
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 //                 Tamir Duberstein <https://github.com/tamird>
 //                 Risto Keravuori <https://github.com/merrywhether>
diff --git a/types/ffi-napi/index.d.ts b/types/ffi-napi/index.d.ts
index 6cfd439e13..9d9872a505 100644
--- a/types/ffi-napi/index.d.ts
+++ b/types/ffi-napi/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for node-ffi-napi 2.4
-// Project: https://github.com/node-ffi/node-ffi
+// Project: http://github.com/node-ffi-napi/node-ffi-napi
 // Definitions by: Keerthi Niranjan <https://github.com/keerthi16>, Kiran Niranjan <https://github.com/KiranNiranjan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/ffi/index.d.ts b/types/ffi/index.d.ts
index d8386a630a..b84b42e461 100644
--- a/types/ffi/index.d.ts
+++ b/types/ffi/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for node-ffi 0.2
-// Project: https://github.com/rbranson/node-ffi
+// Project: https://github.com/rbranson/node-ffi, http://github.com/node-ffi/node-ffi
 // Definitions by: Paul Loyd <https://github.com/loyd>, Waiting Song <https://github.com/waitingsong>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/filesize/index.d.ts b/types/filesize/index.d.ts
index e8905d906d..33d04b66ff 100644
--- a/types/filesize/index.d.ts
+++ b/types/filesize/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for filesize 4.0
-// Project: https://github.com/avoidwork/filesize.js
+// Project: https://github.com/avoidwork/filesize.js, https://filesizejs.com
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 //                 Renaud Chaput <https://github.com/renchap>
 //                 Roman Nuritdinov <https://github.com/Ky6uk>
diff --git a/types/findup-sync/index.d.ts b/types/findup-sync/index.d.ts
index 23df60a22f..f0b35d3baa 100644
--- a/types/findup-sync/index.d.ts
+++ b/types/findup-sync/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for findup-sync 2.0
-// Project: https://github.com/cowboy/node-findup-sync
+// Project: https://github.com/gulpjs/findup-sync
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 //                 Nathan Brown <https://github.com/ngbrown>
 //                 BendingBender <https://github.com/BendingBender>
diff --git a/types/fined/index.d.ts b/types/fined/index.d.ts
index 107a40760c..a3db89c053 100644
--- a/types/fined/index.d.ts
+++ b/types/fined/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for fined 1.1
-// Project: https://github.com/js-cli/fined#readme
+// Project: https://github.com/gulpjs/fined
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/firefox-webext-browser/index.d.ts b/types/firefox-webext-browser/index.d.ts
index 9b318f9b4b..c0a8896e56 100644
--- a/types/firefox-webext-browser/index.d.ts
+++ b/types/firefox-webext-browser/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for WebExtension Development in FireFox 65.0
+// Type definitions for non-npm package WebExtension Development in FireFox 65.0
 // Project: https://developer.mozilla.org/en-US/Add-ons/WebExtensions
 // Definitions by: Jasmin Bom <https://github.com/jsmnbom>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -3188,7 +3188,7 @@ declare namespace browser.storage {
      * @param changes Object mapping each key that changed to its corresponding `storage.StorageChange` for that item.
      * @param areaName The name of the storage area (`"sync"`, `"local"` or `"managed"`) the changes are for.
      */
-    const onChanged: WebExtEvent<(changes: StorageChange, areaName: string) => void>;
+    const onChanged: WebExtEvent<(changes: {[key: string]: StorageChange}, areaName: string) => void>;
 }
 
 /**
diff --git a/types/firmata/index.d.ts b/types/firmata/index.d.ts
index 21dfa03820..89f57bfe91 100644
--- a/types/firmata/index.d.ts
+++ b/types/firmata/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for firmata.js 0.19
-// Project: https://github.com/firmata/firmata.js
+// Project: http://www.github.com/firmata/firmata.js
 // Definitions by: Troy W. <https://github.com/troywweber7>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/first-mate/index.d.ts b/types/first-mate/index.d.ts
index 2fcc7141cb..7ef9d95170 100644
--- a/types/first-mate/index.d.ts
+++ b/types/first-mate/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for first-mate 7.x
-// Project: https://github.com/atom/first-mate/
+// Project: https://github.com/atom/first-mate/, http://atom.github.io/first-mate
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/fixed-data-table-2/index.d.ts b/types/fixed-data-table-2/index.d.ts
index 16b0c0f3c5..b0fbb19e16 100644
--- a/types/fixed-data-table-2/index.d.ts
+++ b/types/fixed-data-table-2/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for fixed-data-table-2 0.8
-// Project: https://github.com/schrodinger/fixed-data-table-2
+// Project: https://github.com/schrodinger/fixed-data-table-2, http://schrodinger.github.io/fixed-data-table-2
 // Definitions by: Ilya Petukhov <https://github.com/ilivit>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
@@ -30,7 +30,7 @@ export interface ColumnReorderEndEvent {
     reorderColumn: string;
 }
 
-export type ElementOrFunc<P> = string | React.ReactElement<any> | ((props: P) => (string | React.ReactElement<any>));
+export type ElementOrFunc<P> = string | React.ReactElement | ((props: P) => (string | React.ReactElement));
 
 export type TableRowEventHandler = (event: React.SyntheticEvent<Table>, rowIndex: number) => void;
 
@@ -616,7 +616,7 @@ export interface ColumnGroupProps extends React.ClassAttributes<ColumnGroup> {
      * You can also pass in a function that returns a react elemnt, with the
      * props object above passed in as the first parameter.
      */
-    header?: string | React.ReactElement<any> | ((props: ColumnGroupHeaderProps) => (string | React.ReactElement<any>));
+    header?: string | React.ReactElement | ((props: ColumnGroupHeaderProps) => (string | React.ReactElement));
 }
 
 export class ColumnGroup extends React.Component<ColumnGroupProps> {
diff --git a/types/fixed-data-table/fixed-data-table-tests.tsx b/types/fixed-data-table/fixed-data-table-tests.tsx
index 758b33d2a2..3c54d553bd 100644
--- a/types/fixed-data-table/fixed-data-table-tests.tsx
+++ b/types/fixed-data-table/fixed-data-table-tests.tsx
@@ -3,7 +3,7 @@ import { Table, Cell, Column, CellProps } from "fixed-data-table";
 
 // create your Table
 class MyTable1 extends React.Component {
-    render(): React.ReactElement<any> {
+    render(): React.ReactElement {
         return (
             <Table
                 rowsCount={100}
@@ -18,7 +18,7 @@ class MyTable1 extends React.Component {
 
 // create your Columns
 class MyTable2 extends React.Component {
-    render(): React.ReactElement<any> {
+    render(): React.ReactElement {
         return (
             <Table
                 rowsCount={100}
@@ -51,7 +51,7 @@ class MyTable3 extends React.Component<{}, MyTable3State> {
         ]
     };
 
-    render(): React.ReactElement<any> {
+    render(): React.ReactElement {
         return (
             <Table
                 rowsCount={this.state.myTableData.length}
@@ -85,7 +85,7 @@ interface MyCellProps extends CellProps {
 }
 
 class MyTextCell extends React.Component<MyCellProps> {
-    render(): React.ReactElement<any> {
+    render(): React.ReactElement {
         const {rowIndex, field, myData} = this.props;
 
         return (
@@ -101,7 +101,7 @@ class MyTextCell extends React.Component<MyCellProps> {
 }
 
 class MyLinkCell extends React.Component<MyCellProps> {
-    render(): React.ReactElement<any> {
+    render(): React.ReactElement {
         const {rowIndex, field, myData} = this.props;
         const link: string = myData[rowIndex][field];
 
@@ -133,7 +133,7 @@ class MyTable4 extends React.Component<{}, MyTable4State> {
         ]
     };
 
-    render(): React.ReactElement<any> {
+    render(): React.ReactElement {
         return (
             <Table
                 rowsCount={this.state.tableData.length}
@@ -162,7 +162,7 @@ class MyTable4 extends React.Component<{}, MyTable4State> {
 
 // Listen for events
 class MyTable5 extends React.Component {
-    render(): React.ReactElement<any> {
+    render(): React.ReactElement {
         return (
             <Table
                 rowsCount={100}
diff --git a/types/fixed-data-table/index.d.ts b/types/fixed-data-table/index.d.ts
index 4c0b7f176f..1e15cf7feb 100644
--- a/types/fixed-data-table/index.d.ts
+++ b/types/fixed-data-table/index.d.ts
@@ -291,7 +291,7 @@ declare namespace FixedDataTable {
           *
           * If you pass in a function, you will receive the same props object as the first argument.
           */
-        header?: string | React.ReactElement<any> | ((props: CellProps) => (string | React.ReactElement<any>));
+        header?: string | React.ReactElement | ((props: CellProps) => (string | React.ReactElement));
 
         /**
           * This is the body cell that will be cloned for this
@@ -315,7 +315,7 @@ declare namespace FixedDataTable {
           * If you pass in a function, you will receive the same
           * props object as the first argument.
           */
-        cell?: string | React.ReactElement<any> | ((props: CellProps) => (string | React.ReactElement<any>));
+        cell?: string | React.ReactElement | ((props: CellProps) => (string | React.ReactElement));
 
          /**
           * The footer cell for this column. This can either be a
@@ -338,7 +338,7 @@ declare namespace FixedDataTable {
           * If you pass in a function, you will receive the same
           * props object as the first argument.
           */
-        footer?: string | React.ReactElement<any> | ((props: CellProps) => (string | React.ReactElement<any>));
+        footer?: string | React.ReactElement | ((props: CellProps) => (string | React.ReactElement));
 
         /**
           * This is used to uniquely identify the column, and is not
@@ -440,7 +440,7 @@ declare namespace FixedDataTable {
           * If you pass in a function, you will receive the same props
           * object as the first argument.
           */
-	    header: string | React.ReactElement<any> | ((props: CellProps) => (string | React.ReactElement<any>));
+	    header: string | React.ReactElement | ((props: CellProps) => (string | React.ReactElement));
     }
 
     /**
diff --git a/types/flagged-respawn/index.d.ts b/types/flagged-respawn/index.d.ts
index eea62b2e8c..37e6dd85bd 100644
--- a/types/flagged-respawn/index.d.ts
+++ b/types/flagged-respawn/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for flagged-respawn 1.0
-// Project: https://github.com/js-cli/js-flagged-respawn
+// Project: https://github.com/gulpjs/flagged-respawn
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/flexmonster/index.d.ts b/types/flexmonster/index.d.ts
index 00a6c49bcb..2c5ea0b0ec 100644
--- a/types/flexmonster/index.d.ts
+++ b/types/flexmonster/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for flexmonster 2.6
-// Project: https://www.flexmonster.com/
+// Project: https://flexmonster.com
 // Definitions by:  Flexmonster <https://github.com/flexmonster>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/flickity/index.d.ts b/types/flickity/index.d.ts
index 07a9e03d9e..4d9a8a4c25 100644
--- a/types/flickity/index.d.ts
+++ b/types/flickity/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Flickity 2.0
-// Project: http://flickity.metafizzy.co/
+// Project: https://flickity.metafizzy.co
 // Definitions by: Chris McGrath <https://github.com/clmcgrath>
 //                 Michael Wagner <https://github.com/wagich>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/flowdoc/index.d.ts b/types/flowdoc/index.d.ts
index 8c32c6794c..151a514db2 100644
--- a/types/flowdoc/index.d.ts
+++ b/types/flowdoc/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for flowdoc 1.1
+// Type definitions for non-npm package flowdoc 1.1
 // Project: https://github.com/overflowapp/Flow
 // Definitions by: Stefan Mansson <https://github.com/animify>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/fluent-langneg/index.d.ts b/types/fluent-langneg/index.d.ts
index 28abe2c2d9..176cc46cf4 100644
--- a/types/fluent-langneg/index.d.ts
+++ b/types/fluent-langneg/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for fluent-langneg 0.1
-// Project: http://projectfluent.io
+// Project: http://projectfluent.io, https://projectfluent.org
 // Definitions by: Huy Nguyen <https://github.com/huy-nguyen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/force-graph/force-graph-tests.ts b/types/force-graph/force-graph-tests.ts
new file mode 100644
index 0000000000..a47b551e11
--- /dev/null
+++ b/types/force-graph/force-graph-tests.ts
@@ -0,0 +1,92 @@
+import ForceGraph from 'force-graph';
+
+const graph = ForceGraph();
+graph(new HTMLElement());
+
+graph
+    .graphData({nodes: [], links: []})
+    .nodeId('testNode')
+    .linkSource('source')
+    .linkTarget('target')
+    .width(100)
+    .height(100)
+    .backgroundColor('#FFF')
+    .nodeRelSize(4)
+    .nodeVal(1)
+    .nodeVal('val')
+    .nodeVal((node) => node.val)
+    .nodeLabel('name')
+    .nodeLabel((node) => node.name)
+    .nodeColor('color')
+    .nodeColor((node) => node.val)
+    .nodeAutoColorBy('color')
+    .nodeAutoColorBy((node) => node.val)
+    .nodeCanvasObject((node, ctx, scale) => {})
+    .linkLabel('name')
+    .linkLabel((link) => link.type)
+    .linkVisibility(true)
+    .linkVisibility((link) => true)
+    .linkColor('color')
+    .linkColor((link) => link.type)
+    .linkAutoColorBy('type')
+    .linkAutoColorBy((link) => link.type)
+    .linkWidth(1)
+    .linkWidth((link) => 1)
+    .linkCurvature(ForceGraph.LinkCurvatureType.Straight)
+    .linkCurvature('curvature')
+    .linkCurvature((link) => ForceGraph.LinkCurvatureType.Straight)
+    .linkCanvasObject((link, ctx, scale) => {})
+    .linkDirectionalArrowLength(0)
+    .linkDirectionalArrowLength('length')
+    .linkDirectionalArrowLength((link) => 0)
+    .linkDirectionalArrowColor('color')
+    .linkDirectionalArrowColor((link) => link.type)
+    .linkDirectionalArrowRelPos(0.5)
+    .linkDirectionalArrowRelPos('pos')
+    .linkDirectionalArrowRelPos((link) => 0.5)
+    .linkDirectionalParticles(0)
+    .linkDirectionalParticles('particles')
+    .linkDirectionalParticles((link) => 0)
+    .linkDirectionalParticleSpeed(0.01)
+    .linkDirectionalParticleSpeed('speed')
+    .linkDirectionalParticleSpeed((link) => 0.01)
+    .linkDirectionalParticleWidth(4)
+    .linkDirectionalParticleWidth('width')
+    .linkDirectionalParticleWidth((link) => 4)
+    .linkDirectionalParticleColor('color')
+    .linkDirectionalParticleColor((link) => link.type);
+
+graph.pauseAnimation();
+graph.resumeAnimation();
+graph.centerAt(0, 0, 0);
+graph.zoom(1.0, 0);
+
+graph
+    .dagMode('td')
+    .dagLevelDistance(1)
+    .d3AlphaDecay(0.0228)
+    .d3VelocityDecay(0.4)
+    .d3Force('link')
+    .d3Force('custom', (node) => 1)
+    .warmupTicks(0)
+    .cooldownTicks(Infinity)
+    .cooldownTime(15000)
+    .onEngineTick(() => {})
+    .onEngineStop(() => {});
+
+graph
+    .onNodeClick(() => {})
+    .onNodeRightClick(() => {})
+    .onNodeHover(() => {})
+    .onNodeDrag(() => {})
+    .onNodeDragEnd(() => {})
+    .onLinkClick(() => {})
+    .onLinkRightClick(() => {})
+    .onLinkHover(() => {})
+    .linkHoverPrecision(4)
+    .enableNodeDrag(true)
+    .enableZoomPanInteraction(true)
+    .enablePointerInteraction(true);
+
+// Test a property getter
+const nodeDraggingEnabled: boolean = graph.enableNodeDrag();
diff --git a/types/force-graph/index.d.ts b/types/force-graph/index.d.ts
new file mode 100644
index 0000000000..b9b056ce04
--- /dev/null
+++ b/types/force-graph/index.d.ts
@@ -0,0 +1,149 @@
+// Type definitions for force-graph >= 1.14
+// Project: https://github.com/vasturiano/force-graph
+// Definitions by: Peter Kimberley <https://github.com/p-kimberley>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function ForceGraph(): ForceGraph.ForceGraphInstance;
+
+declare namespace ForceGraph {
+    /**
+     * Interfaces
+     */
+
+    interface GraphData {
+        nodes: GraphNode[];
+        links: GraphLink[];
+    }
+
+    interface GraphEntity {
+        id: string;
+    }
+
+    interface GraphNode extends GraphEntity {
+        name: string;
+        val: any;
+    }
+
+    interface GraphNodeObject extends GraphNode {
+        x: number;
+        y: number;
+        index: number;
+    }
+
+    interface GraphLink extends GraphEntity {
+        type: string;
+        source: string | GraphNode;
+        target: string | GraphNode;
+    }
+
+    interface GraphLinkObject extends GraphLink {
+        source: GraphNode;
+        target: GraphNode;
+    }
+
+    /**
+     * Enums
+     */
+
+    enum LinkCurvatureType {
+        Straight = 0,
+        HalfLineLength = 1
+    }
+
+    /**
+     * Types
+     */
+
+    type NodeAccessorFn<T> = (node: GraphNodeObject) => T;
+    type NodeCanvasCallbackFn = (node: GraphNodeObject, canvasContext: CanvasRenderingContext2D, globalScale: number) => void;
+    type NodeEventCallback = (node: GraphNodeObject) => void;
+
+    type LinkAccessorFn<T> = (link: GraphLinkObject) => T;
+    type LinkCanvasCallbackFn = (link: GraphLinkObject, canvasContext: CanvasRenderingContext2D, globalScale: number) => void;
+    type LinkEventCallback = (link: GraphLinkObject) => void;
+
+    type DagMode = 'td' | 'bu' | 'lr' | 'rl' | 'radialout' | 'radialin';
+    type ForceFn = (node: { x: number, y: number }) => number;
+
+    /**
+     * Represents ForceGraph runtime object
+     * @example:
+     *  let forceGraph = ForceGraph();
+     *  forceGraph(myHtmlElement);
+     *  forceGraph.graphData([])
+     */
+
+    interface ForceGraphInstance {
+        (element: HTMLElement): ForceGraphInstance;
+
+        // Data input
+        graphData(data?: GraphData): ForceGraphInstance & GraphData;
+        nodeId(id?: string): ForceGraphInstance & string;
+        linkSource(source?: string): ForceGraphInstance & string;
+        linkTarget(target?: string): ForceGraphInstance & string;
+
+        // Container layout
+        width(width?: number): ForceGraphInstance & number;
+        height(height?: number): ForceGraphInstance & number;
+        backgroundColor(color?: string): ForceGraphInstance & string;
+
+        // Node styling
+        nodeRelSize(size?: number): ForceGraphInstance & number;
+        nodeVal(val?: number | string | NodeAccessorFn<number>): ForceGraphInstance & (number | string | NodeAccessorFn<number>);
+        nodeLabel(label?: string | NodeAccessorFn<string | undefined>): ForceGraphInstance & (string | NodeAccessorFn<string | undefined>);
+        nodeColor(color?: string | NodeAccessorFn<string>): ForceGraphInstance & (string | NodeAccessorFn<string>);
+        nodeAutoColorBy(attribute?: string | NodeAccessorFn<string>): ForceGraphInstance & (string | NodeAccessorFn<string>);
+        nodeCanvasObject(callback?: NodeCanvasCallbackFn): ForceGraphInstance & NodeCanvasCallbackFn;
+
+        // Link styling
+        linkLabel(label?: string | LinkAccessorFn<string | undefined>): ForceGraphInstance & (string | LinkAccessorFn<string | undefined>);
+        linkVisibility(visible?: boolean | string | LinkAccessorFn<boolean>): ForceGraphInstance & (boolean | string | LinkAccessorFn<boolean>);
+        linkColor(color?: string | LinkAccessorFn<string>): ForceGraphInstance & (string | LinkAccessorFn<string>);
+        linkAutoColorBy(attribute?: string | LinkAccessorFn<string>): ForceGraphInstance & (string | LinkAccessorFn<string>);
+        linkWidth(width?: number | string | LinkAccessorFn<number>): ForceGraphInstance & (number | string | LinkAccessorFn<number>);
+        linkCurvature(curvature?: LinkCurvatureType | string | LinkAccessorFn<LinkCurvatureType>): ForceGraphInstance;
+        linkCanvasObject(callback?: LinkCanvasCallbackFn): ForceGraphInstance & LinkCanvasCallbackFn;
+        linkDirectionalArrowLength(length?: number | string | LinkAccessorFn<number>): ForceGraphInstance & (number | string | LinkAccessorFn<number>);
+        linkDirectionalArrowColor(color?: string | LinkAccessorFn<string>): ForceGraphInstance & (string | LinkAccessorFn<string>);
+        linkDirectionalArrowRelPos(ratio?: number | string | LinkAccessorFn<number>): ForceGraphInstance & (number | string | LinkAccessorFn<number>);
+        linkDirectionalParticles(particleCount?: number | string | LinkAccessorFn<number>): ForceGraphInstance & (number | string | LinkAccessorFn<number>);
+        linkDirectionalParticleSpeed(speed?: number | string | LinkAccessorFn<number>): ForceGraphInstance & (number | string | LinkAccessorFn<number>);
+        linkDirectionalParticleWidth(width?: number | string | LinkAccessorFn<number>): ForceGraphInstance & (number | string | LinkAccessorFn<number>);
+        linkDirectionalParticleColor(color?: string | LinkAccessorFn<string>): ForceGraphInstance & (string | LinkAccessorFn<string>);
+
+        // Render control
+        pauseAnimation(): ForceGraphInstance;
+        stopAnimation(): ForceGraphInstance; // Alias for pauseAnimation()
+        resumeAnimation(): ForceGraphInstance;
+        centerAt(x?: number, y?: number, milliseconds?: number): ForceGraphInstance & {x: number, y: number};
+        zoom(zoomLevel?: number, duration?: number): ForceGraphInstance & number;
+
+        // Force engine configuration
+        dagMode(mode?: DagMode): ForceGraphInstance & DagMode;
+        dagLevelDistance(distance?: number): ForceGraphInstance & number;
+        d3AlphaDecay(decay?: number): ForceGraphInstance & number;
+        d3VelocityDecay(decay?: number): ForceGraphInstance & number;
+        d3Force(force: 'link' | 'charge' | 'center' | string, forceFn?: ForceFn): ForceGraphInstance & ForceFn;
+        warmupTicks(ticks?: number): ForceGraphInstance & number;
+        cooldownTicks(ticks?: number): ForceGraphInstance & number;
+        cooldownTime(milliseconds?: number): ForceGraphInstance & number;
+        onEngineTick(callback: () => void): ForceGraphInstance;
+        onEngineStop(callback: () => void): ForceGraphInstance;
+
+        // Interaction
+        onNodeClick(callback: NodeEventCallback): ForceGraphInstance;
+        onNodeRightClick(callback: NodeEventCallback): ForceGraphInstance;
+        onNodeHover(callback: (node?: GraphNodeObject, previousNode?: GraphNodeObject) => void): ForceGraphInstance;
+        onNodeDrag(callback: NodeEventCallback): ForceGraphInstance;
+        onNodeDragEnd(callback: NodeEventCallback): ForceGraphInstance;
+        onLinkClick(callback: LinkEventCallback): ForceGraphInstance;
+        onLinkRightClick(callback: LinkEventCallback): ForceGraphInstance;
+        onLinkHover(callback: (link?: GraphLinkObject, previousLink?: GraphLinkObject) => void): ForceGraphInstance;
+        linkHoverPrecision(precision?: number): ForceGraphInstance & number;
+        enableNodeDrag(enable?: boolean): ForceGraphInstance & boolean;
+        enableZoomPanInteraction(enable?: boolean): ForceGraphInstance & boolean;
+        enablePointerInteraction(enable?: boolean): ForceGraphInstance & boolean;
+    }
+}
+
+export default ForceGraph;
diff --git a/types/force-graph/tsconfig.json b/types/force-graph/tsconfig.json
new file mode 100644
index 0000000000..280a78f67a
--- /dev/null
+++ b/types/force-graph/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "exclude": [
+        "node_modules"
+    ],
+    "files": [
+        "index.d.ts",
+        "force-graph-tests.ts"
+    ]
+}
diff --git a/types/force-graph/tslint.json b/types/force-graph/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/force-graph/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/forge-apis/README.md b/types/forge-apis/README.md
new file mode 100644
index 0000000000..9da41d3d61
--- /dev/null
+++ b/types/forge-apis/README.md
@@ -0,0 +1,16 @@
+# Installation
+> `npm install --save @types/forge-apis`
+
+# Summary
+This package contains type definitions for Forge Node.js SDK (https://github.com/Autodesk-Forge/forge-api-nodejs-client).
+
+# Details
+Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/forge-apis
+
+Additional Details
+ * Last updated: Fri, 11 Jan 2019 10:39:13 GMT
+ * Dependencies: @types/three
+ * Global values: none
+
+# Credits
+<a href="mailto:forge.help@autodesk.com">Forge Partner Development</a>
diff --git a/types/forge-apis/forge-apis-tests.ts b/types/forge-apis/forge-apis-tests.ts
new file mode 100644
index 0000000000..d7031facb9
--- /dev/null
+++ b/types/forge-apis/forge-apis-tests.ts
@@ -0,0 +1,13 @@
+import { AuthClientTwoLegged, AuthClientThreeLegged, BucketsApi, HubsApi, FoldersApi, DerivativesApi } from 'forge-apis';
+
+const authClientTwoLegged: AuthClientTwoLegged = new AuthClientTwoLegged("", "", []);
+
+const authClientThreeLegged: AuthClientThreeLegged = new AuthClientThreeLegged("", "", "", []);
+
+const bucketsApi: BucketsApi = new BucketsApi();
+
+const hubsApi: HubsApi = new HubsApi();
+
+const foldersApi: FoldersApi = new FoldersApi();
+
+const derivativesApi: DerivativesApi = new DerivativesApi();
diff --git a/types/forge-apis/index.d.ts b/types/forge-apis/index.d.ts
new file mode 100644
index 0000000000..07dca58812
--- /dev/null
+++ b/types/forge-apis/index.d.ts
@@ -0,0 +1,193 @@
+// Type definitions for Forge-apis 0.4
+// Project: https://github.com/Autodesk-Forge/forge-api-nodejs-client
+// Definitions by: Autodesk Forge Partner Development <https://github.com/Autodesk-Forge>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+// Copyright (c) Autodesk, Inc. All rights reserved
+//
+// Permission to use, copy, modify, and distribute this software in
+// object code form for any purpose and without fee is hereby granted,
+// provided that the above copyright notice appears in all copies and
+// that both that copyright notice and the limited warranty and
+// restricted rights notice below appear in all supporting
+// documentation.
+//
+// AUTODESK PROVIDES THIS PROGRAM "AS IS" AND WITH ALL FAULTS.
+// AUTODESK SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTY OF
+// MERCHANTABILITY OR FITNESS FOR A PARTICULAR USE.  AUTODESK, INC.
+// DOES NOT WARRANT THAT THE OPERATION OF THE PROGRAM WILL BE
+// UNINTERRUPTED OR ERROR FREE.
+//
+
+export class AuthClientTwoLegged {
+    constructor(clientId: string, clientSecret: string, scope: string[]);
+
+    authenticate(): Promise<AuthToken>;
+    getCredentials(): AuthToken;
+    setCredentials(credentials: AuthToken): void;
+    isAuthorized(): boolean;
+}
+
+export class AuthClientThreeLegged {
+    constructor(clientId: string, clientSecret: string, redirectUri: string, scope: string[]);
+
+    generateAuthUrl(): string;
+    getToken(code: string): Promise<AuthToken>;
+    refreshToken(credentials: AuthToken): Promise<AuthToken>;
+}
+
+export interface ApiResponse {
+    body: any;
+    headers: any;
+    statusCode: number;
+}
+
+export interface ApiError {
+    statusCode: number;
+    statusMessage: string;
+}
+
+export class BucketsApi {
+    constructor();
+
+    createBucket(postBuckets: object, opts: object, credentials: AuthToken): Promise<ApiResponse>;
+    deleteBucket(bucketKey: string, credentials: AuthToken): Promise<ApiResponse>;
+    getBucketDetails(bucketKey: string, credentials: AuthToken): Promise<ApiResponse>;
+    getBuckets(options: object, credentials: AuthToken): Promise<ApiResponse>;
+}
+
+export class HubsApi {
+    constructor();
+
+    getHub(hubId: string, opts: object, credentials: AuthToken): Promise<ApiResponse>;
+    getHubs(opts: object, credentials: AuthToken): Promise<ApiResponse>;
+    getHubProjects(hubId: string, opts: object, credentials: AuthToken): Promise<ApiResponse>;
+}
+
+export class FoldersApi {
+    constructor();
+
+    getFolderContents(projectId: string, folderId: string, opts: object, credentials: AuthToken): Promise<ApiResponse>;
+}
+
+export interface JobPayload {
+    input: JobPayloadInput;
+    output: JobPayloadOutput;
+}
+
+export interface JobPayloadInput {
+    urn: string;
+    compressedUrn?: boolean;
+    rootFilename?: string;
+}
+
+export interface JobPayloadOutput {
+    formats: JobPayloadItem[];
+}
+
+export interface JobPayloadItem {
+    type: string;
+    views?: string[];
+    advanced?: {
+        applicationProtocol: string;
+        tolerance: number;
+    };
+    format?: string;
+    exportColor?: boolean;
+    exportFileStructure?: string;
+}
+
+export class DerivativesApi {
+    constructor();
+
+    deleteManifest(urn: string, credentials: AuthToken): Promise<ApiResponse>;
+    getDerivativeManifest(urn: string, derivativeUrn: string, opts: object, credentials: AuthToken): Promise<ApiResponse>;
+    getFormats(opts: object, credentials: AuthToken): Promise<ApiResponse>;
+    getManifest(urn: string, opts: object, credentials: AuthToken): Promise<ApiResponse>;
+    getMetadata(urn: string, opts: object, credentials: AuthToken): Promise<ApiResponse>;
+    getModelviewMetadata(urn: string, guid: string, opts: object, credentials: AuthToken): Promise<ApiResponse>;
+    getModelviewProperties(urn: string, guid: string, opts: object, credentials: AuthToken): Promise<ApiResponse>;
+    getThumbnail(urn: string, opts: object, credentials: AuthToken): Promise<ApiResponse>;
+    translate(job: JobPayload, opts: { xAdsForce?: boolean }, credentials: AuthToken): Promise<ApiResponse>;
+}
+
+export interface Credentials {
+    client_id: string;
+    client_secret: string;
+    grant_type: string;
+    scope?: string;
+}
+
+export interface AuthToken {
+    access_token: string;
+    expires_in: number;
+    token_type: string;
+    refresh_token?: string;
+}
+
+export namespace Dm {
+    interface BucketResponse {
+        bucketKey: string;
+        bucketOwner: string;
+        createdDate: number;
+        permissions: Array<{
+            access: string;
+            authId: string;
+        }>;
+        policyKey: string;
+    }
+
+    interface ItemResponse {
+        data: any[];
+        included: Item[];
+        jsonapi: {
+            version: string;
+        };
+        links: any;
+    }
+
+    interface Item {
+        attributes: {
+            createTime: string;
+            createUserId: string;
+            displayName: string;
+            extension: object;
+            fileType: string;
+            lastModifiedTime: string;
+            lastModifiedUserId: string;
+            mimeType: string;
+            name: string;
+            storageSize: number;
+            versionNumber: number;
+        };
+        id: string;
+        links: {
+            self: {
+                href: string;
+            };
+        };
+        relationships: {
+            derivatives: {
+                data: {
+                    id: string;
+                },
+                meta: {
+                    link: {
+                        href: string;
+                    }
+                }
+            },
+            item: any;
+            refs: any;
+            storage: {
+                data: {
+                    id: string;
+                    type: string;
+                }
+            };
+            thumbnail: any;
+        };
+        type: string;
+    }
+}
diff --git a/types/forge-apis/tsconfig.json b/types/forge-apis/tsconfig.json
new file mode 100644
index 0000000000..3e026ae2b1
--- /dev/null
+++ b/types/forge-apis/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",
+        "forge-apis-tests.ts"
+    ]
+}
diff --git a/types/terser/tslint.json b/types/forge-apis/tslint.json
similarity index 100%
rename from types/terser/tslint.json
rename to types/forge-apis/tslint.json
diff --git a/types/forge-viewer/README.md b/types/forge-viewer/README.md
index 50bc407084..005bd5f19e 100644
--- a/types/forge-viewer/README.md
+++ b/types/forge-viewer/README.md
@@ -13,4 +13,5 @@ Additional Details
  * Global values: none
 
 # Credits
-<a href="mailto:forge.help@autodesk.com">Forge Partner Development</a>
+- <a href="mailto:forge.help@autodesk.com">Forge Partner Development</a>
+- Alan Smith [@alansmithnbs](https://github.com/alansmithnbs)
diff --git a/types/forge-viewer/index.d.ts b/types/forge-viewer/index.d.ts
index 2834f2e4c1..bff0c637a0 100644
--- a/types/forge-viewer/index.d.ts
+++ b/types/forge-viewer/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Forge Viewer 6.3
 // Project: https://forge.autodesk.com/en/docs/viewer/v6/reference/javascript/viewer3d/
-// Definitions by: Autodesk Forge Partner Development <https://github.com/Autodesk-Forge>
+// Definitions by: Autodesk Forge Partner Development <https://github.com/Autodesk-Forge>, Alan Smith <https://github.com/alansmithnbs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -23,62 +23,358 @@
 
 declare namespace Autodesk {
     namespace Viewing {
-        // events
-        let ESCAPE_EVENT: string;
-        let PROGRESS_UPDATE_EVENT: string;
-        let FULLSCREEN_MODE_EVENT: string;
-        let NAVIGATION_MODE_CHANGED_EVENT: string;
-        let VIEWER_STATE_RESTORED_EVENT: string;
-        let VIEWER_RESIZE_EVENT: string;
-        let VIEWER_UNINITIALIZED: string;
-        let MODEL_ROOT_LOADED_EVENT: string;
-        let GEOMETRY_LOADED_EVENT: string;
-        let TOOLBAR_CREATED_EVENT: string;
-        let OBJECT_TREE_CREATED_EVENT: string;
-        let OBJECT_TREE_UNAVAILABLE_EVENT: string;
-        let MODEL_UNLOADED_EVENT: string;
-        let SELECTION_CHANGED_EVENT: string;
-        let AGGREGATE_SELECTION_CHANGED_EVENT: string;
-        let ISOLATE_EVENT: string;
-        let HIDE_EVENT: string;
-        let SHOW_EVENT: string;
-        let HIGHLIGHT_EVENT: string;
-        let CAMERA_CHANGE_EVENT: string;
-        let EXPLODE_CHANGE_EVENT: string;
-        let CUTPLANES_CHANGE_EVENT: string;
-        let TOOL_CHANGE_EVENT: string;
-        let RENDER_OPTION_CHANGED_EVENT: string;
-        let LAYER_VISIBILITY_CHANGED_EVENT: string;
-        let RESET_EVENT: string;
-        let ANIMATION_READY_EVENT: string;
+        enum ErrorCodes {
+          UNKNOWN_FAILURE = 1,
+          BAD_DATA = 2,
+          NETWORK_FAILURE = 3,
+          NETWORK_ACCESS_DENIED = 4,
+          NETWORK_FILE_NOT_FOUND = 5,
+          NETWORK_SERVER_ERROR = 6,
+          NETWORK_UNHANDLED_RESPONSE_CODE = 7,
+          BROWSER_WEBGL_NOT_SUPPORTED = 8,
+          BAD_DATA_NO_VIEWABLE_CONTENT = 9,
+          BROWSER_WEBGL_DISABLED = 10,
+          BAD_DATA_MODEL_IS_EMPTY = 11,
+          RTC_ERROR = 12,
+          UNSUPORTED_FILE_EXTENSION = 13,
+          VIEWER_INTERNAL_ERROR = 14,
+        }
 
         enum SelectionMode {
-            LEAF_OBJECT,
-            FIRST_OBJECT,
-            LAST_OBJECT
+          MIXED,
+          REGULAR,
+          OVERLAYED,
+          LEAF_OBJECT,
+          FIRST_OBJECT,
+          LAST_OBJECT,
+        }
+
+        enum ProgressState {
+          ROOT_LOADED,
+          LOADING,
+          RENDERING,
+        }
+
+        enum KeyCode {
+          BACKSPACE = 8,
+          TAB = 9,
+          ENTER = 13,
+          SHIFT = 16,
+          CONTROL = 17,
+          ALT = 18,
+          ESCAPE = 27,
+          SPACE = 32,
+          PAGEUP = 33,
+          PAGEDOWN = 34,
+          END = 35,
+          HOME = 36,
+          LEFT = 37,
+          UP = 38,
+          RIGHT = 39,
+          DOWN = 40,
+          INSERT = 45,
+          DELETE = 46,
+          ZERO = 48,
+          SEMICOLONMOZ = 59,
+          EQUALSMOZ = 61,
+          a = 65,
+          b = 66,
+          c = 67,
+          d = 68,
+          e = 69,
+          f = 70,
+          g = 71,
+          h = 72,
+          i = 73,
+          j = 74,
+          k = 75,
+          l = 76,
+          m = 77,
+          n = 78,
+          o = 79,
+          p = 80,
+          q = 81,
+          r = 82,
+          s = 83,
+          t = 84,
+          u = 85,
+          v = 86,
+          w = 87,
+          x = 88,
+          y = 89,
+          z = 90,
+          LCOMMAND = 91,
+          RCOMMAND = 93,
+          PLUS = 107,
+          PLUSMOZ = 171,
+          DASHMOZ = 109,
+          F1 = 112,
+          F2 = 113,
+          F3 = 114,
+          F4 = 115,
+          F5 = 116,
+          F6 = 117,
+          F7 = 118,
+          F8 = 119,
+          F9 = 120,
+          F10 = 121,
+          F11 = 122,
+          F12 = 123,
+          DASHMOZNEW = 173,
+          SEMICOLON = 186,
+          EQUALS = 187,
+          COMMA = 188,
+          DASH = 189,
+          PERIOD = 190,
+          SLASH = 191,
+          LBRACKET = 219,
+          RBRACKET = 221,
+          SINGLEQUOTE = 222,
+          COMMANDMOZ = 224,
+        }
+
+        interface ViewerEvent {
+          (event: any): void;
+        }
+
+        interface Viewer3DConfig {
+          startOnInitialize?: boolean;
+          theme?: 'dark-theme'|'light-theme'|string;
+          [key: string]: any;
+        }
+
+        interface ViewingApplicationOptions {
+          disableBrowserContextMenu?: boolean;
+          [key: string]: any;
+        }
+
+        interface ViewerConfig {
+          disableBrowserContextMenu?: boolean;
+          extensions?: string[];
+          useConsolidation?: boolean;
+          consolidationMemoryLimit?: number;
+          sharedPropertyDbPath?: string;
+          bubbleNode?: BubbleNode;
+          canvasConfig?: any;
+          startOnInitialize?: boolean;
+          experimental?: any[];
+          theme?: 'dark-theme'|'light-theme'|string;
+          [key: string]: any;
+        }
+
+        interface ItemSelectedObserver {
+          onItemSelected(viewer: Viewer3D): void;
+        }
+
+        interface SelectionVisibility {
+          hasVisible: boolean;
+          hasHidden: boolean;
+        }
+
+        interface ThumbnailOptions {
+          urn: string;
+          width: number;
+          height: number;
+          guid: string;
+          acmsession: (string);
+        }
+
+        interface FileLoaderOptions {
+          ids?: string;
+          sharedPropertyDbPath?: string;
+          [key: string]: any;
+        }
+
+        interface LoadModelOptions {
+          fileLoader?: FileLoader;
+          loadOptions?: object;
+          sharedPropertyDbPath?: string;
+          ids?: string;
+          [key: string]: any;
+        }
+
+        interface PropertyOptions {
+          propFilter?: string[];
+          ignoreHidden?: boolean;
+          [key: string]: any;
+        }
+
+        interface ResizePanelOptions {
+          dockingPanels?: UI.DockingPanel[];
+          viewer?: Viewer3D;
+          dimensions?: {
+            width: number;
+            height: number;
+          };
+        }
+
+        class FileLoader {
+          constructor(viewer: Viewer3D);
+
+          is3d(): boolean;
+          loadFile(url: string, options: FileLoaderOptions, onSuccess: () => void, onError: () => void): void;
+        }
+
+        interface ViewerItem {
+          children?: ViewerItem[];
+          guid: string;
+          hasThumbnail: boolean;
+          name: string;
+          parent: ViewerItem;
+          progress: string;
+          role: '3d'|'2d'|string;
+          size: number;
+          status: string;
+          success: string;
+          type: 'view'|'geometry'|string;
+          viewableID: string;
+        }
+
+        interface ExtensionOptions {
+          defaultModelStructureTitle: string;
+          extensions: string[];
+          startOnInitialize: boolean;
+          viewableName: string;
+          [key: string]: any;
+        }
+
+        const AGGREGATE_SELECTION_CHANGED_EVENT = 'aggregateSelection';
+        const ANIMATION_READY_EVENT = 'animationReady';
+        const CAMERA_CHANGE_EVENT = 'cameraChanged';
+        const CUTPLANES_CHANGE_EVENT = 'cutplanesChanged';
+        const ESCAPE_EVENT = 'escape';
+        const EXPLODE_CHANGE_EVENT = 'explodeChanged';
+        const EXTENSION_LOADED_EVENT = 'extensionLoaded';
+        const EXTENSION_UNLOADED_EVENT = 'extensionUnloaded';
+        const FINAL_FRAME_RENDERED_CHANGED_EVENT = 'finalFrameRenderedChanged';
+        const FIT_TO_VIEW_EVENT = 'fitToView';
+        const FRAGMENTS_LOADED_EVENT = 'fragmentsLoaded';
+        const FULLSCREEN_MODE_EVENT = 'fullscreenMode';
+        const GEOMETRY_LOADED_EVENT = 'geometryLoaded';
+        const HIDE_EVENT = 'hide';
+        const HYPERLINK_EVENT = 'hyperlink';
+        const ISOLATE_EVENT = 'isolate';
+        const LAYER_VISIBILITY_CHANGED_EVENT = 'layerVisibilityChanged';
+        const LOAD_MISSING_GEOMETRY = 'loadMissingGeometry';
+        const MODEL_ROOT_LOADED_EVENT = 'modelRootLoaded';
+        const MODEL_UNLOADED_EVENT = 'modelUnloaded';
+        const NAVIGATION_MODE_CHANGED_EVENT = 'navigationModeChanged';
+        const OBJECT_TREE_CREATED_EVENT = 'objectTreeCreated';
+        const OBJECT_TREE_UNAVAILABLE_EVENT = 'objectTreeUnavailable';
+        const PREF_CHANGED_EVENT = 'prefChanged';
+        const PREF_RESET_EVENT = 'prefReset';
+        const PROGRESS_UPDATE_EVENT = 'progressUpdate';
+        const RENDER_OPTION_CHANGED_EVENT = 'renderOptionChanged';
+        const RENDER_PRESENTED_EVENT = 'renderPresented';
+        const RESET_EVENT = 'reset';
+        const RESTORE_DEFAULT_SETTINGS_EVENT = 'restoreDefaultSettings';
+        const SELECTION_CHANGED_EVENT = 'selection';
+        const SHOW_EVENT = 'show';
+        const TEXTURES_LOADED_EVENT = 'texturesLoaded';
+        const TOOL_CHANGE_EVENT = 'toolChanged';
+        const TOOLBAR_CREATED_EVENT = 'toolbarCreated';
+        const VIEWER_INITIALIZED = 'viewerInitialized';
+        const VIEWER_RESIZE_EVENT = 'viewerResize';
+        const VIEWER_STATE_RESTORED_EVENT = 'viewerStateRestored';
+        const VIEWER_UNINITIALIZED = 'viewerUninitialized';
+
+        interface ViewerEventArgs {
+          target?: Viewer3D;
+          model?: ViewerItem;
+          type: string;
+          [key: string]: any;
+        }
+
+        interface BubbleNodeSearchProps {
+          role?: '3d'|'2d'|string;
+          type?: 'view'|'geometry'|string;
+          mime?: string;
+        }
+
+        class BubbleNode {
+          static MODEL_NODE: BubbleNodeSearchProps;
+          static GEOMETRY_SVF_NODE: BubbleNodeSearchProps;
+          static SHEET_NODE: BubbleNodeSearchProps;
+          static GEOMETRY_F2D_NODE: BubbleNodeSearchProps;
+          static VIEWABLE_NODE: BubbleNodeSearchProps;
+
+          parent: BubbleNode;
+          id: number;
+          data: ViewerItem;
+          isLeaf: boolean;
+          sharedPropertyDbPath: string;
+          lodNode: object;
+          children: BubbleNode[];
+
+          constructor(rawNode: object, parent?: BubbleNode);
+
+          findByGuid(guid: string): BubbleNode;
+          findParentGeom2Dor3D(): BubbleNode;
+          findPropertyDbPath(): string;
+          findViewableParent(): BubbleNode;
+          getLodNode(): boolean;
+          getNamedViews(): string[];
+          getPlacementTransform(): object;
+          getRootNode(): BubbleNode;
+          getTag(tag: string): any;
+          getViewableRootPath(): string;
+          guid(): string;
+          is2D(): boolean;
+          is2DGeom(): boolean;
+          is3D(): boolean;
+          is3DGeom(): boolean;
+          isGeometry(): boolean;
+          isGeomLeaf(): boolean;
+          isMetadata(): boolean;
+          isViewable(): boolean;
+          name(): string;
+          search(propsToMatch: BubbleNodeSearchProps): BubbleNode[];
+          searchByTag(tagsToMatch: object): BubbleNode[];
+          setTag(tag: string, value: any): void;
+          traverse(cb: () => void): boolean;
+          urn(searchParent: boolean): string;
         }
 
         let theExtensionManager: ExtensionManager;
 
         interface InitializerOptions {
             env?: string;
-            language?: string;
             webGLHelpLink?: string;
             getAccessToken?(callback?: (accessToken: string, expires: number) => void): void;
             refreshToken?(callback?: (accessToken: string, expires: number) => void): void;
+            language?: string;
+            accessToken?: string;
+            useADP?: boolean;
+            [key: string]: any;
         }
 
         function Initializer(options: InitializerOptions, callback?: () => void): void;
 
         class Document {
+            constructor(dataJSON: object, path: string, acmsession: string);
             static load(documentId: string, successCallback: (doc: Document) => void,
-            errorCallback: (errorCode: number, errorMsg: string, messages: any[]) => void, accessControlProperties: any): void;
+            errorCallback: (errorCode: ErrorCodes, errorMsg: string, messages: any[]) => void, accessControlProperties?: any): void;
             static getSubItemsWithProperties(item: object, properties: Properties, recursive: boolean): object[];
 
             acmSessionId: string;
 
+            getFullPath(urn: string): string;
+            getItemById(id: string): object;
+            getMessages(itemId: string, excludeGlobal: boolean): object;
+            getNumViews(item: object): number;
+            getParentId(item: string): string;
+            getPath(): string;
+            getPropertyDbPath(): string;
+            getRoot(): BubbleNode;
             getRootItem(): object;
-            getViewablePath(item: object): string;
+            getSubItemsWithProperties(item: object, properties: object, recursive: boolean): object;
+            getThumbnailOptions(item: object, width: number, height: number): ThumbnailOptions;
+            getThumbnailPath(item: string, width: number, height: number): string;
+            getViewableItems(document: Document): void;
+            getViewablePath(item: object, outLoadOptions?: object): string;
+            getViewGeometry(item: object): object;
+            load(documentId: string, onSuccessCallback: () => void, onErrorCallback: () => void, accessControlProperties?: object): void;
+            requestThumbnailWithSecurity(data: string, onComplete: (err: Error, response: any) => void): void;
         }
 
         class Extension {
@@ -91,10 +387,17 @@ declare namespace Autodesk {
         }
 
         class ExtensionManager {
-            registerExtension(extensionId: string, extension: any): boolean;
-            unregisterExtension(extensionId: string): boolean;
+          extensions: { [key: string]: Extension };
+          extensionsAsync: { [key: string]: Extension };
 
-            getExtension(extensionId: string): any;
+          registerExtension(extensionId: string, extension: object): boolean;
+          getExtension(extensionId: string): Extension|null;
+          unregisterExtension(extensionId: string): boolean;
+          registerExternalExtension(extensionId: string, urlPath: string): boolean;
+          getExternalPath(extensionId: string): string|null;
+          unregisterExternalExtension(extensionId: string): boolean;
+          getRegisteredExtensions(): Array<{ id: string, inMemory: boolean, isAsync: boolean}>;
+          popuplateOptions(options: any): void;
         }
 
         class InstanceTree {
@@ -237,41 +540,220 @@ declare namespace Autodesk {
             title: string;
         }
 
-        class Viewer3D {
-            id: number;
+        class ScreenMode {
+        }
 
+        abstract class ScreenModeDelegate {
+          constructor(viewer: Viewer3D);
+
+          doScreenModeChange(oldMode: ScreenMode, newMode: ScreenMode): void;
+          fullscreenEventListener(): void;
+          getEscapeMode(): ScreenMode | undefined;
+          getMode(): ScreenMode;
+          getNextMode(): ScreenMode | undefined;
+          isModeSupported(mode: ScreenMode): boolean;
+          onScreenModeChanged(oldMode: ScreenMode, newMode: ScreenMode): void;
+          setMode(mode: ScreenMode): boolean;
+          uninitialize(): void;
+        }
+
+        class AppScreenModeDelegate extends ScreenModeDelegate {
+          constructor(viewer: Viewer3D);
+        }
+
+        class NullScreenModeDelegate extends ScreenModeDelegate {
+          constructor(viewer: Viewer3D);
+        }
+
+        class Viewer3D {
+            constructor(container: HTMLElement, config?: Viewer3DConfig);
+
+            id: number;
+            activateLayerState(stateName: string): void;
+            activateExtension(extensionID: string, mode: string): boolean;
+            anyLayerHidden(): boolean;
+            applyCamera(camera: THREE.Camera, fit?: boolean): void;
+            areAllVisible(): boolean;
             clearSelection(): void;
             clearThemingColors(model: any): void;
             clientToWorld(point: THREE.Vector3): THREE.Vector3;
+            container: Element;
             createViewCube(): void;
+            deactivateExtension(extensionID: string): boolean;
             displayViewCube(display: boolean): void;
+            displayViewCubeUI(display: boolean): void;
+            explode(scale: number): void;
+            finish(): void;
             fitToView(objectIds?: number[], model?: Model): boolean;
-            getHiddenNodes(): number[];
+            getActiveNavigationTool(): string;
+            getAggregateSelection(callback?: () => void): object[];
+            getBimWalkToolPopup(): boolean;
+            getCamera(): any;
+            getClickConfig(what: string, where: string): string[] | null;
+            getCutPlanes(): object[];
+            getDefaultNavigationToolName(): object;
+            getDimensions(): object;
+            getExplodeScale(): number;
+            getExtensionModes(extensionID: string): string[];
+            getFirstPersonToolPopup(): boolean;
+            getFocalLength(): number;
+            getFOV(): number;
+            getVisibleModels(): Model[];
+            getHiddenModels(): any[]; // Array<RenderModel>;
+            getHiddenNodes(): any[];   // Array of nodes
+            getHotkeyManager(): any;
             getIsolatedNodes(): number[];
+            getLayerStates(): any[];
+            getLoadedExtensions(): any[];
+            getMemoryInfo(): any;
+            getNavigationLock(): boolean;
+            getNavigationLockSettings(): object;
+            getObjectTree(onSuccessCallback?: () => void, onErrorCallback?: () => void): void;
+            getProperties(dbid: number, onSuccessCallback?: () => void, onErrorCallback?: () => void): void;
+            getScreenShot(w?: number, h?: number, cb?: () => void): any; // DOMString
             getSelection(): number[];
             getSelectionCount(): number;
             getSelectionVisibility(): { hasVisible: boolean, hasHidden: boolean };
             getState(filter?: any): any;
             hide(node: number | number[]): void;
+            hideLines(hide: boolean): void;
+            hideModel(modelId: number): boolean;
+            hidePoints(hide: boolean): void;
             hideById(node: number): void;
             isolate(node: number | number[]): void;
             isolateById(dbIds: number | number[]): void;
+            initialize(): number | ErrorCodes;
+            initSettings(): void;
+            isExtensionActive(extensionID: string): boolean;
+            isExtensionLoaded(extensionID: string): boolean;
+            isLayerVisible(node: object): boolean;
+            isNodeVisible(nodeId: number, model?: Model): boolean;
+            joinLiveReview(sessionId: string): void;
+            leaveLiveReview(): void;
+            load(urn: string, sharedPropertyDbPath?: string, onSuccesfullCallback?: () => void,
+                            onErrorCallback?: (errorCode: ErrorCodes, errorMessage: string, statusCode: number, statusText: string) => void): any;
+            loadModel(urn: string, options?: any, onSuccesfullCallback?: () => void,
+                            onErrorCallback?: (errorCode: ErrorCodes, errorMessage: string, statusCode: number, statusText: string) => void): any;
+            loadDocumentNode(lmvDocument: Document, bubbleNode: BubbleNode, options?: object): void;
+            localize(): void;
+            modelHasTopology(): boolean;
+            playAnimation(callback?: () => void): void;
             registerContextMenuCallback(id: string, callback: (menu: ContextMenuItem[], status: ContextMenuCallbackStatus) => void): void;
             resize(): void;
             restoreState(state: any, filter?: any, immediate?: boolean): boolean;
             search(text: string, successCallback: (r: number[]) => void, errorCallback: (err: any) => void, attributeNames?: string[]): void;
             select(dbIds: number | number[]): void;
+            setActiveNavigationTool(toolName?: string): boolean;
+            setBackgroundColor(red: number, green: number, blue: number, red2: number, green2: number, blue2: number): void;
+            setBimWalkToolPopup(value: boolean): void;
+            setCanvasClickBehavior(config: object): void;
+            setClickConfig(what: string, where: string, newAction: string|string[]): boolean;
+            setClickToSetCOI(state: boolean, updatePrefs?: boolean): void;
+            setContextMenu(contextMenu: any): void; // ObjectContextMenu)
             setCutPlanes(planes: THREE.Vector4[]): void;
+            setDefaultContextMenu(): boolean;
+            setDefaultNavigationTool(toolName: string): void;
+            setDisplayEdges(show: boolean): void;
+            setEnvMapBackground(value: boolean): void;
+            setFirstPersonToolPopup(value: boolean): void;
+            setFocalLength(mm: number): void;
+            setFOV(degrees: number): void;
+            setGhosting(value: boolean): void;
+            setGrayscale(value: boolean): void;
+            setGroundReflection(value: boolean): void;
+            setGroundReflectionAlpha(alpha: number): void;
+            setGroundReflectionColor(color: THREE.Color): void;
+            setGroundShadow(value: boolean): void;
+            setGroundShadowAlpha(alpha: number): void;
+            setGroundShadowColor(color: THREE.Color): void;
+            setLayerVisible(nodes: any[], visible: boolean, isolate?: boolean): void;
+            setLightPreset(index: number): void;
+            setModelUnits(model: Model): void;
+            setNavigationLock(value: boolean): void;
+            setNavigationLockSettings(settings: { [key: string]: boolean }): void;
+            setOptimizeNavigation(value: boolean): void;
+            setOrbitPastWorldPoles(value: boolean): void;
+            setProgressiveRendering(value: boolean): void;
+            setQualityLevel(useSAO: boolean, useFXAA: boolean): void;
+            setRenderCache(value: boolean): void;
+            setReverseHorizontalLookDirection(value: boolean): void;
+            setReverseVerticalLookDirection(value: boolean): void;
+            setReverseZoomDirection(value: boolean): void;
+            setSelectionColor(color: THREE.Color, selectionType: SelectionMode): void;
             setSelectionMode(mode: SelectionMode): void;
+            setSwapBlackAndWhite(value: boolean): void;
+            setTheme(name: 'dark-theme'|'light-theme'|string): void;
             setThemingColor(dbId: number, color: THREE.Vector4, model?: any): void;
             setUp(config?: any): void;
+            setUseLeftHandedInput(value: boolean): void;
+            setUsePivotAlways(value: boolean): void;
             setViewCube(face: string): void;
+            setViewFromArray(params: any[]): void;
+            setViewFromFile(): void;
+            setViewFromViewBox(viewbox: any[], name?: string): void;
+            setZoomTowardsPivot(value: boolean): void;
             show(node: number | number[]): void;
             showAll(): void;
+            showModel(modelId: number): boolean;
+            start(url?: string, options?: LoadModelOptions,
+                  onSuccessCallback?: () => void,
+                  onErrorCallback?: () => void): number|ErrorCodes;
             tearDown(): void;
-            toggleSelect(dbid: number): void;
+            toggleSelect(dbid: number, selectionType: SelectionMode): void;
+            toggleVisibility(node: number): void;
+            toolbar: UI.ToolBar;
+            trackADPSettingsOptions(): void;
+            transferModel(): void;
+            uninitialize(): void;
             unregisterContextMenuCallback(id: string): void;
             worldToClient(point: THREE.Vector3): THREE.Vector3;
+
+            addEventListener(type: string,
+                    listener?: ViewerEvent,
+                    options?: boolean | AddEventListenerOptions): void;
+            dispatchEvent(evt: Event): boolean;
+            removeEventListener(type: string,
+                       listener?: ViewerEvent,
+                       options?: boolean | EventListenerOptions): void;
+        }
+
+        class ViewingApplication {
+          k3D: '3D';
+          bubble: BubbleNode;
+          appContainerId: string;
+          container: HTMLElement;
+          options: ViewingApplicationOptions;
+          myRegisteredViewers: any;
+          myDocument: Document;
+          myCurrentViewer: Viewer3D;
+          urn: string;
+          selectedItem: ViewerItem|null;
+          extensionCache: object;
+
+          constructor(containerId: string, options?: ViewingApplicationOptions);
+
+          addItemSelectedObserver(observer: ItemSelectedObserver): void;
+          finish(): void;
+          getCurrentViewer(): Viewer3D;
+          getDefaultGeometry(geometryItems: any[]): object;
+          getNamedViews(item: object): any[];
+          getSelectedItem(): object|null;
+          getViewer(config: Viewer3DConfig): Viewer3D;
+          getViewerContainer(): HTMLElement;
+          loadDocument(documentId: any,
+                       onDocumentLoad?: (document: Document) => void,
+                       onLoadFailed?: (errorCode: string, errorMsg: string, errors: any[]) => void,
+                       accessControlProperties?: object): void;
+          registerViewer(viewableType: string, viewerClass: any, config?: ViewerConfig): void;
+          selectItem(item: ViewerItem|BubbleNode,
+                     onSuccessCallback: (viewer: Viewer3D, item: ViewerItem) => void,
+                     onErrorCallback: (errorCode: ErrorCodes, errorMsg: string,
+                                       statusCode: string, statusText: string, messages: string) => void): boolean;
+          selectItemById(itemId: number,
+                         onItemSelectedCallback: (item: object, viewGeometryItem: object) => void,
+                         onItemFailedToSelectCallback: () => void): boolean;
+          setCurrentViewer(viewer: Viewer3D): void;
+          setDocument(docManifest: object): boolean;
         }
 
         class ViewingUtilities {
@@ -281,42 +763,60 @@ declare namespace Autodesk {
         namespace Private {
             function getHtmlTemplate(url: string, callback: (error: string, content: string) => void): void;
 
+            const env: string;
+
+            function formatValueWithUnits(value: number, units: string, type: number, precision: number): string;
+            function convertUnits(fromUnits: string, toUnits: string, calibrationFactor: number,
+                                  d: number, type: string): number;
+            function calculatePrecision(value: string|number): number;
+
+            interface PreferencesOptions {
+              localStorage?: boolean;
+              prefix?: string;
+            }
+
+            class Preferences {
+              constructor(viewer: Viewer3D, options: PreferencesOptions);
+
+              add(name: string, defaultValue: any, tags?: string[]|string): boolean;
+              addListeners(name: string, onChangedCallback: () => void, onResetCallback: () => void): void;
+              get(): any;
+              hasTag(name: string, tag: string): boolean;
+              load(defaultValues: object): void;
+              remove(name: string, removeFromWebStorage?: boolean): boolean;
+              removeListeners(name: string): void;
+              reset(tag?: string, include?: boolean): void;
+              set(name: string, value: any, notify?: boolean): boolean;
+              tag(tag: string, names?: string[]|string): void;
+              untag(tag: string, names?: string[]|string): void;
+            }
+
+            class ViewerState {
+              constructor(viewer: Viewer3D);
+
+              areEqual(viewerStateA: object, viewerStateB: object, filter?: object): boolean;
+              getSeedUrn(): string;
+              getState(filter?: object): object;
+              restoreState(viewerState: object, filter?: object, immediate?: boolean): boolean;
+            }
+
             class GuiViewer3D extends Viewer3D {
-                constructor(container: HTMLElement, config?: object);
+              canvas: HTMLCanvasElement;
 
-                canvas: HTMLCanvasElement;
-                container: Element;
-                toolController: ToolController;
-                impl: Viewer3DImpl;
-                model: Model;
-                navigation: Navigation;
+              toolController: ToolController;
+              impl: Viewer3DImpl;
+              model: Model;
+              navigation: Navigation;
 
-                getCamera(): UnifiedCamera;
-                getToolbar(create: boolean): UI.ToolBar;
-                initialize(): any;
-                load(urn: string, sharedPropertyDbPath?: string, onSuccesfullCallback?: () => void,
-                onErrorCallback?: (errorCode: number, errorMessage: string, statusCode: number, statusText: string) => void): any;
-                loadModel(urn: string, options?: any, onSuccesfullCallback?: () => void,
-                onErrorCallback?: (errorCode: number, errorMessage: string, statusCode: number, statusText: string) => void): any;
-                start(path?: string, options?: object): any;
-                finish(): any;
-                setUsePivotAlways(value: boolean): any;
-
-                setGroundShadow(param: boolean): void ;
-		            setGroundReflection(param: boolean): void ;
-		            setOptimizeNavigation(param: boolean): void ;
-                setQualityLevel(useSAO: boolean, useFXAA: boolean): void;
-
-                loadExtension(extensionId: string, options?: object): boolean;
-                unloadExtension(extensionId: string): boolean;
-                getExtension(extensionId: string): Extension;
-
-                addPanel(panel: UI.DockingPanel): boolean;
-                removePanel(panel: UI.DockingPanel): boolean;
-                resizePanels(options: any): void;
-
-                addEventListener(event: string, callback: (event: any) => void, useCapture?: boolean): void;
-                removeEventListener(event: string, callback: (event: any) => void, useCapture?: boolean): void;
+              addPanel(panel: UI.PropertyPanel): boolean;
+              getToolbar(create: boolean): UI.ToolBar;
+              removePanel(panel: UI.PropertyPanel): boolean;
+              resizePanels(options?: ResizePanelOptions): void;
+              setLayersPanel(layersPanel: UI.LayersPanel): boolean;
+              setModelStructurePanel(modelStructurePanel: UI.ModelStructurePanel): boolean;
+              setPropertyPanel(propertyPanel: UI.PropertyPanel): boolean;
+              setSettingsPanel(settingsPanel: UI.SettingsPanel): boolean;
+              updateToolbarButtons(): void;
             }
 
             interface HitTestResult {
@@ -378,113 +878,272 @@ declare namespace Autodesk {
         }
 
         namespace UI {
-            class Control {
-                container: HTMLElement;
+          interface DockingPanelOptions {
+            localizeTitle?: boolean;
+            [key: string]: any;
+          }
 
-                getId(): string;
-                isCollapsed(): boolean;
-                setCollapsed(collappsed: boolean): boolean;
-                setToolTip(toolTipText: string): void;
-                getToolTip(): string;
-                isVisible(): boolean;
-                setVisible(visible: boolean): boolean;
-            }
+          interface ScrollContainerOptions {
+            left: boolean;
+            heightAdjustment: number;
+            marginTop: number;
+            [key: string]: any;
+          }
 
-            class Button extends Control {
-                constructor(id: string, options?: any);
+          interface ContentSize {
+            height: number;
+            width: number;
+          }
 
-                setIcon(iconClass: string): void;
-                getState(): Button.State;
-                setState(state: Button.State): boolean;
-                onClick(event: MouseEvent): void;
-                onMouseOver(event: MouseEvent): void;
-                onMouseOut(event: MouseEvent): void;
-            }
+          interface ResizeOptions {
+            maxHeight: number;
+            [key: string]: any;
+          }
 
-            // NOTE: TypeScript doesn't support enum inside class
-            namespace Button {
-                enum State { ACTIVE, INACTIVE, DISABLED }
-            }
+          interface AddPropertyOptions {
+            localizeCategory: boolean;
+            localizeProperty: boolean;
+            [key: string]: any;
+          }
 
-            class ControlGroup extends Control {
-                constructor(id: string, options?: any);
+          interface ControlOptions {
+            collapsible?: boolean;
+            [key: string]: any;
+          }
 
-                addClass(name: string): void;
-                addControl(control: Control, options?: any): any;
-                removeControl(control: Control | string): any;
-                getControl(controlId: string): Control;
-                getNumberOfControls(): number;
-            }
+          interface AddControlOptions {
+            index?: object;
+            [key: string]: any;
+          }
 
-            class ToolBar extends ControlGroup {
-                addEventListener(event: string, callback: () => void): void;
-                getDimensions(): { width: number, height: number };
-            }
+          interface DisplayCategoryOptions {
+            localize?: boolean;
+            [key: string]: any;
+          }
 
-            namespace ToolBar {
-                 interface Event {
-                    SIZE_CHANGED: string;
-                    CONTROL_REMOVED: string;
-                    CONTROL_ADDED: string;
-                    COLLAPSED_CHANGED: string;
-                    VISIBILITY_CHANGED: string;
-                }
-            }
+          interface MenuItem {
+            title: string;
+            target: () => void | MenuItem[];
+          }
 
-            interface ClientRect {
-                bottom: number;
-                height: number;
-                left: number;
-                right: number;
-                top: number;
-                width: number;
-            }
+          const COLLAPSED_CHANGED = 'Control.VisibilityChanged';
+          const VISIBILITY_CHANGED = 'Control.CollapsedChanged';
+          const CONTROL_ADDED = 'ControlGroup.ControlAdded';
+          const CONTROL_REMOVED = 'ControlGroup.ControlRemoved';
+          const SIZE_CHANGED = 'ControlGroup.SizeChanged';
 
-            interface ContentSize {
-                height: number;
-                width: number;
-            }
+          class DockingPanel {
+            constructor(parentContainer: HTMLElement, id: string, title: string, options?: DockingPanelOptions);
 
-            class DockingPanel {
-                constructor(parentContainer: any, id: string, title: string, options?: any);
+            closer: HTMLElement;
+            container: HTMLElement;
+            content: Node;
+            title: HTMLElement;
+            titleLabel: string;
 
-                closer: HTMLElement;
-                container: any;
-                content: any;
-                id: string;
-                scrollContainer: HTMLElement;
-                title: string;
-                titleTable: string;
+            addEventListener(target: object, eventId: string, callback: () => void): void;
+            addVisibilityListener(callback: () => void): void;
+            createCloseButton(): HTMLElement;
+            createScrollContainer(options: ScrollContainerOptions): void;
+            createTitleBar(title: string): HTMLElement;
+            getContainerBoundingRect(): ClientRect;
+            getContentSize(): ContentSize;
+            initialize(): void;
+            initializeCloseHandler(closer: HTMLElement): void;
+            initializeMoveHandlers(mover: HTMLElement): void;
+            isVisible(): boolean;
+            onEndMove(event: MouseEvent, endX: number, endY: number): void;
+            onMove(event: MouseEvent, currentX: number, currentY: number): void;
+            onStartMove(event: MouseEvent, startX: number, startY: number): void;
+            onTitleClick(event: Event): void;
+            onTitleDoubleClick(event: Event): void;
+            removeEventListener(target: object, eventId: string, callback: () => void): boolean;
+            resizeToContent(options: ResizeOptions): void;
+            setTitle(text: string, options: DockingPanelOptions): void;
+            setVisible(show: boolean): void;
+            uninitialize(): void;
+            visibilityChanged(): void;
+          }
 
-                initialize(): void;
-                uninitialize(): void;
-                setVisible(show: boolean): void;
-                isVisible(): boolean;
-                getContentSize(): ContentSize;
-                resizeToContent(): void;
-                getContainerBoundingRect(): ClientRect;
-                setTitle(text: string, options: any): void;
-                createCloseButton(): HTMLElement;
-                createScrollContainer(options: {
-                    heightAdjustment?: number;
-                    left?: boolean;
-                    marginTop?: number;
-                }): void;
-                initializeMoveHandlers(mover: HTMLElement): void;
-                initializeCloseHandler(close: HTMLElement): void;
+          class LayersPanel extends DockingPanel {
+            build(): void;
+            createNode(node: object, parent: HTMLElement): void;
+            getNodeClass(node: object): string;
+            getNodeLabel(node: object): string;
+            isGroupCollapsed(node: object): boolean;
+            isGroupNode(node: object): boolean;
+            onClick(node: object, event: Event): void;
+            onDoubleClick(node: object, event: Event): void;
+            onIconClick(node: object, event: Event): void;
+            onImageClick(node: object, event: Event): void;
+            onRightClick(node: object, event: Event): void;
+            setGroupCollapsed(node: object, collapse: boolean): void;
+            setLayerVisible(node: object, collapse: boolean): void;
+            shouldInclude(node: object): boolean;
+            update(): void;
+          }
 
-                visibilityChanged(): void;
-                onStartMove(event: MouseEvent, startX: number, startY: number): void;
-                onEndMove(event: MouseEvent, endX: number, endY: number): void;
-                onMove(event: MouseEvent, currentX: number, currentY: number): void;
-                onTitleClick(event: Event): void;
-                onTitleDoubleClick(event: Event): void;
+          class PropertyPanel extends DockingPanel {
+            addProperty(name: string, value: string, category: string, options?: AddPropertyOptions): boolean;
+            areDefaultPropertiesShown(): void;
+            displayCategory(category: object, parent: HTMLElement, options: DisplayCategoryOptions): HTMLElement[];
+            displayProperty(property: object, parent: HTMLElement, options: DisplayCategoryOptions): HTMLElement[];
+            getCategoryClass(category: object): string;
+            getPropertyClass(property: object): string;
+            hasProperties(): boolean;
+            highlight(text: string, options: object): void;
+            isCategoryCollapsed(category: object): boolean;
+            onCategoryClick(category: object, event: Event): void;
+            onCategoryDoubleClick(category: object, event: Event): void;
+            onCategoryIconClick(category: object, event: Event): void;
+            onCategoryRightClick(category: object, event: Event): void;
+            onPropertyClick(property: object, event: Event): void;
+            onPropertyDoubleClick(property: object, event: Event): void;
+            onPropertyIconClick(property: object, event: Event): void;
+            onPropertyRightClick(property: object, event: Event): void;
+            removeAllProperties(): void;
+            removeProperty(name: string, value: string, category: string, options?: object): boolean;
+            setCategoryCollapsed(category: object, collapsed: boolean): void;
+            setProperties(properties: Array<{displayName: string, displayValue: any}>, options?: object): void;
+            showDefaultProperties(): void;
+            showNoProperties(): void;
+          }
 
-                addVisibilityListener(callback: (state: boolean) => void): void;
+          class SettingsPanel extends DockingPanel {
+            addCheckbox(tabId: string, caption: string, initialState: boolean,
+                        onchange: () => void, options?: object): string;
+            addControl(tabId: string, control: object|HTMLElement, options: object|undefined): string;
+            addDropDownMenu(tabId: string, caption: string, items: MenuItem[],
+                            initialItemIndex: number, onchange: () => void, options: object|undefined): string;
+            addSlider(tabId: string, caption: string, min: number, max: number, initialValue: number,
+                      onchange: () => void, options: object|undefined): string;
+            addTab(tabId: string, tabTitle: string, options: object|undefined): boolean;
+            getControl(controlId: string): object;
+            hasTab(tabId: string): boolean;
+            isTabSelected(tabId: string): boolean;
+            removeCheckbox(checkboxId: string|Control): boolean;
+            removeControl(controlId: string|Control): boolean;
+            removeDropdownMenu(dropdownMenuId: string|Control): boolean;
+            removeSlider(sliderId: string|Control): boolean;
+            removeTab(tabId: string): boolean;
+            selectTab(tabId: string): boolean;
+            setVisible(show: boolean, skipTransition?: boolean): void;
+          }
 
-                addEventListener(target: object, eventId: string, callback: (event: any) => void): void;
-                removeEventListener(target: object, eventId: string, callback: (event: any) => void): boolean;
-            }
+          class ModelStructurePanel extends DockingPanel {
+            addClass(id: string, className: string): boolean;
+            getNodeClass(node: object): string;
+            getNodeLabel(node: object): string;
+            isGroupCollapsed(node: object): boolean;
+            isGroupNode(node: object): boolean;
+            onClick(node: object, event: Event): void;
+            onDoubleClick(node: object, event: Event): void;
+            onHover(node: object, event: Event): void;
+            onIconClick(node: object, event: Event): void;
+            onRightClick(node: object, event: Event): void;
+            removeClass(id: string, className: string): boolean;
+            setGroupCollapsed(node: object, collapsed: boolean): void;
+            setModel(instanceTree: object, modelTitle: string): void; // InstanceTree?
+            setSelection(nodes: Model[]): void;
+            shouldInclude(node: Model): boolean;
+          }
+
+          class ObjectContextMenu {
+            constructor(viewer: Viewer3D);
+
+            buildMenu(event: Event, status: object): MenuItem[];
+            hide(): boolean;
+            show(event: Event): void;
+          }
+
+          class ControlEventArgs {
+            VISIBILITY_CHANGED: 'Control.VisibilityChanged';
+            COLLAPSED_CHANGED: 'Control.CollapsedChanged';
+            ACTIVE_BUTTON_CHANGED: 'RadioButtonGroup.ActiveButtonChanged';
+            STATE_CHANGED: 'Button.StateChanged';
+            CLICK: 'click';
+          }
+
+          class Control {
+            constructor(id?: string, options?: ControlOptions);
+
+            Event: ControlEventArgs;
+            addClass(cssClass: string): void;
+            getDimensions(): object;
+            getId(): string;
+            getPosition(): object;
+            getToolTip(): string;
+            isCollapsed(): boolean;
+            isCollapsible(): boolean;
+            isVisible(): boolean;
+            removeClass(cssClass: string): void;
+            setCollapsed(collapsed: boolean): boolean;
+            setToolTip(toolTipText: string): boolean;
+            setVisible(visible: boolean): boolean;
+
+            // Events
+            addEventListener(type: string,
+                             listener?: ViewerEvent,
+                             options?: boolean | AddEventListenerOptions): void;
+            dispatchEvent(evt: Event): boolean;
+            removeEventListener(type: string,
+                                listener?: ViewerEvent,
+                                options?: boolean | EventListenerOptions): void;
+          }
+
+          class ControlGroup extends Control {
+            container: HTMLElement;
+
+            addControl(control: Control, options?: AddControlOptions): boolean;
+            getControl(controlId: string): Control;
+            getControlId(index: number): string;
+            getNumberOfControls(): number;
+            indexOf(control: string|Control): number;
+            removeControl(control: string|Control): boolean;
+            setCollapsed(collapsed: boolean): boolean;
+          }
+
+          class ToolBar extends ControlGroup {
+            constructor(id: string, options?: object);
+          }
+
+          class RadioButtonGroup extends ControlGroup {
+            constructor(id: string, options?: object);
+
+            Event: ControlEventArgs;
+
+            addControl(control: Control, options: object): boolean;
+            getActiveButton(): Button;
+            removeControl(control: string | Control): boolean;
+          }
+
+          enum ControlStates {
+            ACTIVE = 0,
+            INACTIVE = 1,
+            DISABLED = 2
+          }
+
+          class Button extends Control {
+            constructor(id: string, options?: object);
+
+            State: ControlStates;
+            Event: ControlEventArgs;
+
+            getState(): ControlStates;
+            onClick: (event: Event) => void;
+            onMouseOut: (event: Event) => void;
+            onMouseOver: (event: Event) => void;
+            setIcon(iconClass: string): void;
+            setState(state: ControlStates): boolean;
+          }
+
+          class ComboButton extends Button {
+            constructor(id: string, options?: object);
+
+            addControl(): void;
+            restoreDefault(): void;
+            saveAsDefault(): void;
+          }
         }
     }
 }
diff --git a/types/form-serialize/index.d.ts b/types/form-serialize/index.d.ts
index b433f6b81b..a69263dd76 100644
--- a/types/form-serialize/index.d.ts
+++ b/types/form-serialize/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for form-serialize 0.7
-// Project: https://github.com/defunctzombie/form-serialize#readme
+// Project: https://github.com/defunctzombie/form-serialize#readme, https://github.com/shtylman/form-serialize
 // Definitions by: Tyler Johnson <https://github.com/tyler-johnson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/format-duration/index.d.ts b/types/format-duration/index.d.ts
index 06682200b2..8ba8595e34 100644
--- a/types/format-duration/index.d.ts
+++ b/types/format-duration/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for format-duration 1.0
-// Project: https://github.com/ungoldman/format-duration
+// Project: https://github.com/hypermodules/format-duration
 // Definitions by: Giles Roadnight <https://github.com/Roaders>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/format-unicorn/index.d.ts b/types/format-unicorn/index.d.ts
index 932e426091..89c2a75148 100644
--- a/types/format-unicorn/index.d.ts
+++ b/types/format-unicorn/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for format-unicorn 1.1
-// Project: https://github.com/tallesl/format-unicorn
+// Project: https://github.com/tallesl/node-format-unicorn
 // Definitions by: kruncher <https://github.com/kruncher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/freshy/index.d.ts b/types/freshy/index.d.ts
index 93b424143a..3e1d482f6a 100644
--- a/types/freshy/index.d.ts
+++ b/types/freshy/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for freshy 1.0
-// Project: https://github.com/krakenjs/freshy#readme
+// Project: https://github.com/krakenjs/freshy#readme, https://github.com/totherik/freshy
 // Definitions by: Nikita Volodin <https://github.com/qlonik>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/frisby/frisby-tests.ts b/types/frisby/frisby-tests.ts
index d0bb27ff20..65a7315790 100644
--- a/types/frisby/frisby-tests.ts
+++ b/types/frisby/frisby-tests.ts
@@ -18,4 +18,9 @@ describe('Test Suite 1', () => {
             .expect('status', 418)
             .done(done);
     });
+
+    it('should handle jest matchers', () => {
+      const str = 'bar';
+      expect(str).toHaveLength(3);
+    });
 });
diff --git a/types/frisby/index.d.ts b/types/frisby/index.d.ts
index 1bcd6fdabb..3c9fa4a22a 100644
--- a/types/frisby/index.d.ts
+++ b/types/frisby/index.d.ts
@@ -1,11 +1,11 @@
 // Type definitions for Frisby 2.0
-// Project: https://github.com/vlucas/frisby
+// Project: https://github.com/vlucas/frisby, http://frisbyjs.com
 // Definitions by: Christopher E. Woodland <https://github.com/cwoodland>
 //                 Johnny Li <https://github.com/johnny4753>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
-/// <reference types='jasmine'/>
+/// <reference types='jest'/>
 
 // #region Imports
 export import nodeFetch = require('node-fetch'); // Import all definitions from node-fetch.
diff --git a/types/fs-extra/fs-extra-tests.ts b/types/fs-extra/fs-extra-tests.ts
index dbe48cf971..9eab816f63 100644
--- a/types/fs-extra/fs-extra-tests.ts
+++ b/types/fs-extra/fs-extra-tests.ts
@@ -214,3 +214,7 @@ fs.writeFile("foo.txt", "i am foo", { encoding: "utf-8" });
 
 // $ExpectType Promise<string>
 fs.mkdtemp("foo");
+
+fs.copyFile("src", "dest").then();
+fs.copyFile("src", "dest", fs.constants.COPYFILE_EXCL).then();
+fs.copyFile("src", "dest", errorCallback);
diff --git a/types/fs-extra/index.d.ts b/types/fs-extra/index.d.ts
index c5eddbf416..c1b661daae 100644
--- a/types/fs-extra/index.d.ts
+++ b/types/fs-extra/index.d.ts
@@ -20,6 +20,10 @@ export function copy(src: string, dest: string, callback: (err: Error) => void):
 export function copy(src: string, dest: string, options: CopyOptions, callback: (err: Error) => void): void;
 export function copySync(src: string, dest: string, options?: CopyOptionsSync): void;
 
+export function copyFile(src: string, dest: string, flags?: number): Promise<void>;
+export function copyFile(src: string, dest: string, callback: (err: Error) => void): void;
+export function copyFile(src: string, dest: string, flags: number, callback: (err: Error) => void): void;
+
 export function move(src: string, dest: string, options?: MoveOptions): Promise<void>;
 export function move(src: string, dest: string, callback: (err: Error) => void): void;
 export function move(src: string, dest: string, options: MoveOptions, callback: (err: Error) => void): void;
diff --git a/types/fs-plus/index.d.ts b/types/fs-plus/index.d.ts
index 0151de2c73..8f1a46d04b 100644
--- a/types/fs-plus/index.d.ts
+++ b/types/fs-plus/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for fs-plus 3.0
-// Project: https://github.com/atom/fs-plus
+// Project: https://github.com/atom/fs-plus, http://atom.github.io/fs-plus
 // Definitions by: Daniel Perez Alvarez <https://github.com/unindented>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/fuzzaldrin/index.d.ts b/types/fuzzaldrin/index.d.ts
index ca9a64e819..58a605dfca 100644
--- a/types/fuzzaldrin/index.d.ts
+++ b/types/fuzzaldrin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for fuzzaldrin 2.1
-// Project: https://github.com/atom/fuzzaldrin
+// Project: https://github.com/atom/fuzzaldrin, http://atom.github.io/fuzzaldrin
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/fuzzyset.js/index.d.ts b/types/fuzzyset.js/index.d.ts
index 4e4bcfefb6..6d6ecb1f83 100644
--- a/types/fuzzyset.js/index.d.ts
+++ b/types/fuzzyset.js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for fuzzyset.js 0.0
-// Project: https://github.com/Glench/fuzzyset.js
+// Project: https://github.com/Glench/fuzzyset.js, http://glench.github.com/fuzzyset.js
 // Definitions by: Louis Grignon <https://github.com/lgrignon>
 //                Narain Sagar <https://github.com/narainsagar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/fuzzyset/index.d.ts b/types/fuzzyset/index.d.ts
index 2e97e3b47a..bff7b1b041 100644
--- a/types/fuzzyset/index.d.ts
+++ b/types/fuzzyset/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for fuzzset 1.0
-// Project: https://github.com/washt/fuzzyset
+// Project: http://github.com/washt/fuzzyset
 // Definitions by: Louis Grignon <https://github.com/lgrignon>
 //                Narain Sagar <https://github.com/narainsagar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.auth2/index.d.ts b/types/gapi.auth2/index.d.ts
index bd40ce9650..af6243ff2c 100644
--- a/types/gapi.auth2/index.d.ts
+++ b/types/gapi.auth2/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Sign-In API 0.0
+// Type definitions for non-npm package Google Sign-In API 0.0
 // Project: https://developers.google.com/identity/sign-in/web/
 // Definitions by: Derek Lawless <https://github.com/flawless2011>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -101,6 +101,16 @@ declare namespace gapi.auth2 {
      * Optional if fetch_basic_profile is not set to false.
      */
     scope?: string;
+    /**
+     * The UX mode to use for the sign-in flow.
+     * By default, it will open the consent flow in a popup.
+     */
+    ux_mode?: "popup" | "redirect";
+    /**
+     * If using ux_mode='redirect', this parameter allows you to override the default redirect_uri that will be used at the end of the consent flow.
+     * The default redirect_uri is the current URL stripped of query parameters and hash fragment.
+     */
+    redirect_uri?: string;
   }
 
   /**
diff --git a/types/gapi.client.acceleratedmobilepageurl/index.d.ts b/types/gapi.client.acceleratedmobilepageurl/index.d.ts
index 1c2c968f53..ccfc606e92 100644
--- a/types/gapi.client.acceleratedmobilepageurl/index.d.ts
+++ b/types/gapi.client.acceleratedmobilepageurl/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Accelerated Mobile Pages (AMP) URL API v1 1.0
+// Type definitions for non-npm package Google Accelerated Mobile Pages (AMP) URL API v1 1.0
 // Project: https://developers.google.com/amp/cache/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.adexchangebuyer/index.d.ts b/types/gapi.client.adexchangebuyer/index.d.ts
index b6ee95d192..75dcb97d6c 100644
--- a/types/gapi.client.adexchangebuyer/index.d.ts
+++ b/types/gapi.client.adexchangebuyer/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Ad Exchange Buyer API v1.4 1.4
+// Type definitions for non-npm package Google Ad Exchange Buyer API v1.4 1.4
 // Project: https://developers.google.com/ad-exchange/buyer-rest
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.adexchangebuyer2/index.d.ts b/types/gapi.client.adexchangebuyer2/index.d.ts
index 40ab26679b..4287d79559 100644
--- a/types/gapi.client.adexchangebuyer2/index.d.ts
+++ b/types/gapi.client.adexchangebuyer2/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Ad Exchange Buyer API II v2beta1 2.0
+// Type definitions for non-npm package Google Ad Exchange Buyer API II v2beta1 2.0
 // Project: https://developers.google.com/ad-exchange/buyer-rest/reference/rest/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.adexchangeseller/index.d.ts b/types/gapi.client.adexchangeseller/index.d.ts
index dd327ed5ae..84d8c70e9d 100644
--- a/types/gapi.client.adexchangeseller/index.d.ts
+++ b/types/gapi.client.adexchangeseller/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Ad Exchange Seller API v2.0 2.0
+// Type definitions for non-npm package Google Ad Exchange Seller API v2.0 2.0
 // Project: https://developers.google.com/ad-exchange/seller-rest/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.adexperiencereport/index.d.ts b/types/gapi.client.adexperiencereport/index.d.ts
index 8258568b1d..0921c587a2 100644
--- a/types/gapi.client.adexperiencereport/index.d.ts
+++ b/types/gapi.client.adexperiencereport/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Ad Experience Report API v1 1.0
+// Type definitions for non-npm package Google Google Ad Experience Report API v1 1.0
 // Project: https://developers.google.com/ad-experience-report/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.admin/index.d.ts b/types/gapi.client.admin/index.d.ts
index 9e82b6a06c..4d1cacdfd0 100644
--- a/types/gapi.client.admin/index.d.ts
+++ b/types/gapi.client.admin/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Admin Reports API reports_v1 1.0
+// Type definitions for non-npm package Google Admin Reports API reports_v1 1.0
 // Project: https://developers.google.com/admin-sdk/reports/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.adsense/index.d.ts b/types/gapi.client.adsense/index.d.ts
index ea9e5fa057..51ed436aa5 100644
--- a/types/gapi.client.adsense/index.d.ts
+++ b/types/gapi.client.adsense/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google AdSense Management API v1.4 1.4
+// Type definitions for non-npm package Google AdSense Management API v1.4 1.4
 // Project: https://developers.google.com/adsense/management/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.adsensehost/index.d.ts b/types/gapi.client.adsensehost/index.d.ts
index 1595d36c6c..55df0e770a 100644
--- a/types/gapi.client.adsensehost/index.d.ts
+++ b/types/gapi.client.adsensehost/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google AdSense Host API v4.1 4.1
+// Type definitions for non-npm package Google AdSense Host API v4.1 4.1
 // Project: https://developers.google.com/adsense/host/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.analytics/index.d.ts b/types/gapi.client.analytics/index.d.ts
index eeddb3f81f..a1a23a56d9 100644
--- a/types/gapi.client.analytics/index.d.ts
+++ b/types/gapi.client.analytics/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Analytics API v3 3.0
+// Type definitions for non-npm package Google Google Analytics API v3 3.0
 // Project: https://developers.google.com/analytics/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.analyticsreporting/index.d.ts b/types/gapi.client.analyticsreporting/index.d.ts
index e5e1b7aabe..9c2d842b2f 100644
--- a/types/gapi.client.analyticsreporting/index.d.ts
+++ b/types/gapi.client.analyticsreporting/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Analytics Reporting API v4 4.0
+// Type definitions for non-npm package Google Google Analytics Reporting API v4 4.0
 // Project: https://developers.google.com/analytics/devguides/reporting/core/v4/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.androiddeviceprovisioning/index.d.ts b/types/gapi.client.androiddeviceprovisioning/index.d.ts
index 0b896d6fbb..e391633ee1 100644
--- a/types/gapi.client.androiddeviceprovisioning/index.d.ts
+++ b/types/gapi.client.androiddeviceprovisioning/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Android Device Provisioning Partner API v1 1.0
+// Type definitions for non-npm package Google Android Device Provisioning Partner API v1 1.0
 // Project: https://developers.google.com/zero-touch/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.androidenterprise/index.d.ts b/types/gapi.client.androidenterprise/index.d.ts
index 1e81143609..ee7ec9b649 100644
--- a/types/gapi.client.androidenterprise/index.d.ts
+++ b/types/gapi.client.androidenterprise/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Play EMM API v1 1.0
+// Type definitions for non-npm package Google Google Play EMM API v1 1.0
 // Project: https://developers.google.com/android/work/play/emm-api
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.androidmanagement/index.d.ts b/types/gapi.client.androidmanagement/index.d.ts
index b24ccab3e5..67fea8c2ac 100644
--- a/types/gapi.client.androidmanagement/index.d.ts
+++ b/types/gapi.client.androidmanagement/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Android Management API v1 1.0
+// Type definitions for non-npm package Google Android Management API v1 1.0
 // Project: https://developers.google.com/android/management
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.androidpublisher/index.d.ts b/types/gapi.client.androidpublisher/index.d.ts
index beae0fb512..3c54a748e9 100644
--- a/types/gapi.client.androidpublisher/index.d.ts
+++ b/types/gapi.client.androidpublisher/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Play Developer API v2 2.0
+// Type definitions for non-npm package Google Google Play Developer API v2 2.0
 // Project: https://developers.google.com/android-publisher
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.appengine/index.d.ts b/types/gapi.client.appengine/index.d.ts
index 2b97368fb5..0644f59c46 100644
--- a/types/gapi.client.appengine/index.d.ts
+++ b/types/gapi.client.appengine/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google App Engine Admin API v1 1.0
+// Type definitions for non-npm package Google Google App Engine Admin API v1 1.0
 // Project: https://cloud.google.com/appengine/docs/admin-api/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.appsactivity/index.d.ts b/types/gapi.client.appsactivity/index.d.ts
index e8c9c49f18..77f773d30e 100644
--- a/types/gapi.client.appsactivity/index.d.ts
+++ b/types/gapi.client.appsactivity/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google G Suite Activity API v1 1.0
+// Type definitions for non-npm package Google G Suite Activity API v1 1.0
 // Project: https://developers.google.com/google-apps/activity/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.appstate/index.d.ts b/types/gapi.client.appstate/index.d.ts
index 9ae6561cb1..1441499c69 100644
--- a/types/gapi.client.appstate/index.d.ts
+++ b/types/gapi.client.appstate/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google App State API v1 1.0
+// Type definitions for non-npm package Google Google App State API v1 1.0
 // Project: https://developers.google.com/games/services/web/api/states
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.bigquery/index.d.ts b/types/gapi.client.bigquery/index.d.ts
index 813d668ea7..3ad4e6867b 100644
--- a/types/gapi.client.bigquery/index.d.ts
+++ b/types/gapi.client.bigquery/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google BigQuery API v2 2.0
+// Type definitions for non-npm package Google BigQuery API v2 2.0
 // Project: https://cloud.google.com/bigquery/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.bigquerydatatransfer/index.d.ts b/types/gapi.client.bigquerydatatransfer/index.d.ts
index 0bc090fdf5..8b5b9c59ce 100644
--- a/types/gapi.client.bigquerydatatransfer/index.d.ts
+++ b/types/gapi.client.bigquerydatatransfer/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google BigQuery Data Transfer API v1 1.0
+// Type definitions for non-npm package Google BigQuery Data Transfer API v1 1.0
 // Project: https://cloud.google.com/bigquery/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.blogger/index.d.ts b/types/gapi.client.blogger/index.d.ts
index 85240dfee5..77495efef0 100644
--- a/types/gapi.client.blogger/index.d.ts
+++ b/types/gapi.client.blogger/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Blogger API v3 3.0
+// Type definitions for non-npm package Google Blogger API v3 3.0
 // Project: https://developers.google.com/blogger/docs/3.0/getting_started
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.books/index.d.ts b/types/gapi.client.books/index.d.ts
index e0ca0a63af..82a1bb1213 100644
--- a/types/gapi.client.books/index.d.ts
+++ b/types/gapi.client.books/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Books API v1 1.0
+// Type definitions for non-npm package Google Books API v1 1.0
 // Project: https://developers.google.com/books/docs/v1/getting_started
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.calendar/index.d.ts b/types/gapi.client.calendar/index.d.ts
index 72196ee150..f704b2a839 100644
--- a/types/gapi.client.calendar/index.d.ts
+++ b/types/gapi.client.calendar/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Calendar API v3 3.0
+// Type definitions for non-npm package Google Calendar API v3 3.0
 // Project: https://developers.google.com/google-apps/calendar/firstapp
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.civicinfo/index.d.ts b/types/gapi.client.civicinfo/index.d.ts
index efa9098f8e..054a99e417 100644
--- a/types/gapi.client.civicinfo/index.d.ts
+++ b/types/gapi.client.civicinfo/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Civic Information API v2 2.0
+// Type definitions for non-npm package Google Google Civic Information API v2 2.0
 // Project: https://developers.google.com/civic-information
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.classroom/index.d.ts b/types/gapi.client.classroom/index.d.ts
index 68e2679cad..f65ea37218 100644
--- a/types/gapi.client.classroom/index.d.ts
+++ b/types/gapi.client.classroom/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Classroom API v1 1.0
+// Type definitions for non-npm package Google Google Classroom API v1 1.0
 // Project: https://developers.google.com/classroom/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.cloudbilling/index.d.ts b/types/gapi.client.cloudbilling/index.d.ts
index cd09fa5e15..a37934d481 100644
--- a/types/gapi.client.cloudbilling/index.d.ts
+++ b/types/gapi.client.cloudbilling/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Billing API v1 1.0
+// Type definitions for non-npm package Google Google Cloud Billing API v1 1.0
 // Project: https://cloud.google.com/billing/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.cloudbuild/index.d.ts b/types/gapi.client.cloudbuild/index.d.ts
index ca50422cfb..19936cd26b 100644
--- a/types/gapi.client.cloudbuild/index.d.ts
+++ b/types/gapi.client.cloudbuild/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Container Builder API v1 1.0
+// Type definitions for non-npm package Google Google Cloud Container Builder API v1 1.0
 // Project: https://cloud.google.com/container-builder/docs/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.clouddebugger/index.d.ts b/types/gapi.client.clouddebugger/index.d.ts
index 0fdb5167ce..c8ed08f770 100644
--- a/types/gapi.client.clouddebugger/index.d.ts
+++ b/types/gapi.client.clouddebugger/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Stackdriver Debugger API v2 2.0
+// Type definitions for non-npm package Google Stackdriver Debugger API v2 2.0
 // Project: http://cloud.google.com/debugger
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.clouderrorreporting/index.d.ts b/types/gapi.client.clouderrorreporting/index.d.ts
index a19854416f..b24bfd63e4 100644
--- a/types/gapi.client.clouderrorreporting/index.d.ts
+++ b/types/gapi.client.clouderrorreporting/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Stackdriver Error Reporting API v1beta1 1.0
+// Type definitions for non-npm package Google Stackdriver Error Reporting API v1beta1 1.0
 // Project: https://cloud.google.com/error-reporting/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.cloudfunctions/index.d.ts b/types/gapi.client.cloudfunctions/index.d.ts
index f3cd5cc4a2..b1ba0001d8 100644
--- a/types/gapi.client.cloudfunctions/index.d.ts
+++ b/types/gapi.client.cloudfunctions/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Functions API v1 1.0
+// Type definitions for non-npm package Google Google Cloud Functions API v1 1.0
 // Project: https://cloud.google.com/functions
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.cloudiot/index.d.ts b/types/gapi.client.cloudiot/index.d.ts
index eeb0647503..5e0d949464 100644
--- a/types/gapi.client.cloudiot/index.d.ts
+++ b/types/gapi.client.cloudiot/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud IoT API v1 1.0
+// Type definitions for non-npm package Google Google Cloud IoT API v1 1.0
 // Project: https://cloud.google.com/iot
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.cloudkms/index.d.ts b/types/gapi.client.cloudkms/index.d.ts
index 82f44805fd..2a68eef16d 100644
--- a/types/gapi.client.cloudkms/index.d.ts
+++ b/types/gapi.client.cloudkms/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Key Management Service (KMS) API v1 1.0
+// Type definitions for non-npm package Google Google Cloud Key Management Service (KMS) API v1 1.0
 // Project: https://cloud.google.com/kms/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.cloudmonitoring/index.d.ts b/types/gapi.client.cloudmonitoring/index.d.ts
index 6febf1d4e8..a6387fcb5c 100644
--- a/types/gapi.client.cloudmonitoring/index.d.ts
+++ b/types/gapi.client.cloudmonitoring/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Cloud Monitoring API v2beta2 2.0
+// Type definitions for non-npm package Google Cloud Monitoring API v2beta2 2.0
 // Project: https://cloud.google.com/monitoring/v2beta2/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.cloudresourcemanager/index.d.ts b/types/gapi.client.cloudresourcemanager/index.d.ts
index a2c8500ac6..46b7d6b600 100644
--- a/types/gapi.client.cloudresourcemanager/index.d.ts
+++ b/types/gapi.client.cloudresourcemanager/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Resource Manager API v1 1.0
+// Type definitions for non-npm package Google Google Cloud Resource Manager API v1 1.0
 // Project: https://cloud.google.com/resource-manager
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.cloudtasks/index.d.ts b/types/gapi.client.cloudtasks/index.d.ts
index 3e1d3f3c08..9e7ecf006d 100644
--- a/types/gapi.client.cloudtasks/index.d.ts
+++ b/types/gapi.client.cloudtasks/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Cloud Tasks API v2beta2 2.0
+// Type definitions for non-npm package Google Cloud Tasks API v2beta2 2.0
 // Project: https://cloud.google.com/cloud-tasks/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.cloudtrace/index.d.ts b/types/gapi.client.cloudtrace/index.d.ts
index ba868581d1..e4575983d8 100644
--- a/types/gapi.client.cloudtrace/index.d.ts
+++ b/types/gapi.client.cloudtrace/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Stackdriver Trace API v2 2.0
+// Type definitions for non-npm package Google Stackdriver Trace API v2 2.0
 // Project: https://cloud.google.com/trace
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.clouduseraccounts/index.d.ts b/types/gapi.client.clouduseraccounts/index.d.ts
index 75e8f0d852..623689a7ed 100644
--- a/types/gapi.client.clouduseraccounts/index.d.ts
+++ b/types/gapi.client.clouduseraccounts/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Cloud User Accounts API vm_alpha 0.0
+// Type definitions for non-npm package Google Cloud User Accounts API vm_alpha 0.0
 // Project: https://cloud.google.com/compute/docs/access/user-accounts/api/latest/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.compute/index.d.ts b/types/gapi.client.compute/index.d.ts
index fe53df316f..f19e0e9d10 100644
--- a/types/gapi.client.compute/index.d.ts
+++ b/types/gapi.client.compute/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Compute Engine API v1 1.0
+// Type definitions for non-npm package Google Compute Engine API v1 1.0
 // Project: https://developers.google.com/compute/docs/reference/latest/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.consumersurveys/index.d.ts b/types/gapi.client.consumersurveys/index.d.ts
index 41531fce6d..b30c9ccd81 100644
--- a/types/gapi.client.consumersurveys/index.d.ts
+++ b/types/gapi.client.consumersurveys/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Consumer Surveys API v2 2.0
+// Type definitions for non-npm package Google Consumer Surveys API v2 2.0
 // Project: undefined
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.container/index.d.ts b/types/gapi.client.container/index.d.ts
index 41fa31c25f..63a812d798 100644
--- a/types/gapi.client.container/index.d.ts
+++ b/types/gapi.client.container/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Container Engine API v1 1.0
+// Type definitions for non-npm package Google Google Container Engine API v1 1.0
 // Project: https://cloud.google.com/container-engine/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.content/index.d.ts b/types/gapi.client.content/index.d.ts
index f3b3b51845..856bb8971e 100644
--- a/types/gapi.client.content/index.d.ts
+++ b/types/gapi.client.content/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Content API for Shopping v2 2.0
+// Type definitions for non-npm package Google Content API for Shopping v2 2.0
 // Project: https://developers.google.com/shopping-content
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.customsearch/index.d.ts b/types/gapi.client.customsearch/index.d.ts
index 1722767845..5150210463 100644
--- a/types/gapi.client.customsearch/index.d.ts
+++ b/types/gapi.client.customsearch/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google CustomSearch API v1 1.0
+// Type definitions for non-npm package Google CustomSearch API v1 1.0
 // Project: https://developers.google.com/custom-search/v1/using_rest
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.dataflow/index.d.ts b/types/gapi.client.dataflow/index.d.ts
index 6c04dad9ea..24233b98f4 100644
--- a/types/gapi.client.dataflow/index.d.ts
+++ b/types/gapi.client.dataflow/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Dataflow API v1b3 1.0
+// Type definitions for non-npm package Google Google Dataflow API v1b3 1.0
 // Project: https://cloud.google.com/dataflow
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.dataproc/index.d.ts b/types/gapi.client.dataproc/index.d.ts
index cc9f6fcb8f..7482c05bad 100644
--- a/types/gapi.client.dataproc/index.d.ts
+++ b/types/gapi.client.dataproc/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Dataproc API v1 1.0
+// Type definitions for non-npm package Google Google Cloud Dataproc API v1 1.0
 // Project: https://cloud.google.com/dataproc/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.datastore/index.d.ts b/types/gapi.client.datastore/index.d.ts
index 83c124ce52..daaa81498c 100644
--- a/types/gapi.client.datastore/index.d.ts
+++ b/types/gapi.client.datastore/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Datastore API v1 1.0
+// Type definitions for non-npm package Google Google Cloud Datastore API v1 1.0
 // Project: https://cloud.google.com/datastore/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.deploymentmanager/index.d.ts b/types/gapi.client.deploymentmanager/index.d.ts
index 2528111b57..751f7d5e30 100644
--- a/types/gapi.client.deploymentmanager/index.d.ts
+++ b/types/gapi.client.deploymentmanager/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Deployment Manager API v2 2.0
+// Type definitions for non-npm package Google Google Cloud Deployment Manager API v2 2.0
 // Project: https://cloud.google.com/deployment-manager/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.dfareporting/index.d.ts b/types/gapi.client.dfareporting/index.d.ts
index 8914fbb3e5..7f4943869f 100644
--- a/types/gapi.client.dfareporting/index.d.ts
+++ b/types/gapi.client.dfareporting/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google DCM/DFA Reporting And Trafficking API v2.8 2.8
+// Type definitions for non-npm package Google DCM/DFA Reporting And Trafficking API v2.8 2.8
 // Project: https://developers.google.com/doubleclick-advertisers/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.discovery/index.d.ts b/types/gapi.client.discovery/index.d.ts
index 570928f44f..8c0ddb99d6 100644
--- a/types/gapi.client.discovery/index.d.ts
+++ b/types/gapi.client.discovery/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google APIs Discovery Service v1 1.0
+// Type definitions for non-npm package Google APIs Discovery Service v1 1.0
 // Project: https://developers.google.com/discovery/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.dlp/index.d.ts b/types/gapi.client.dlp/index.d.ts
index 29839bac80..c0b2987e66 100644
--- a/types/gapi.client.dlp/index.d.ts
+++ b/types/gapi.client.dlp/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google DLP API v2beta1 2.0
+// Type definitions for non-npm package Google DLP API v2beta1 2.0
 // Project: https://cloud.google.com/dlp/docs/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.dns/index.d.ts b/types/gapi.client.dns/index.d.ts
index c97f2c0240..2c23415082 100644
--- a/types/gapi.client.dns/index.d.ts
+++ b/types/gapi.client.dns/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud DNS API v1 1.0
+// Type definitions for non-npm package Google Google Cloud DNS API v1 1.0
 // Project: https://developers.google.com/cloud-dns
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.doubleclickbidmanager/index.d.ts b/types/gapi.client.doubleclickbidmanager/index.d.ts
index 13274ff247..92a905369e 100644
--- a/types/gapi.client.doubleclickbidmanager/index.d.ts
+++ b/types/gapi.client.doubleclickbidmanager/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google DoubleClick Bid Manager API v1 1.0
+// Type definitions for non-npm package Google DoubleClick Bid Manager API v1 1.0
 // Project: https://developers.google.com/bid-manager/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.doubleclicksearch/index.d.ts b/types/gapi.client.doubleclicksearch/index.d.ts
index f1e0a69436..104f5caa76 100644
--- a/types/gapi.client.doubleclicksearch/index.d.ts
+++ b/types/gapi.client.doubleclicksearch/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google DoubleClick Search API v2 2.0
+// Type definitions for non-npm package Google DoubleClick Search API v2 2.0
 // Project: https://developers.google.com/doubleclick-search/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.drive/index.d.ts b/types/gapi.client.drive/index.d.ts
index ca28f228e7..25b16f4230 100644
--- a/types/gapi.client.drive/index.d.ts
+++ b/types/gapi.client.drive/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Drive API v3 3.0
+// Type definitions for non-npm package Google Drive API v3 3.0
 // Project: https://developers.google.com/drive/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.firebasedynamiclinks/index.d.ts b/types/gapi.client.firebasedynamiclinks/index.d.ts
index 618a8845a6..0147742a2f 100644
--- a/types/gapi.client.firebasedynamiclinks/index.d.ts
+++ b/types/gapi.client.firebasedynamiclinks/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Firebase Dynamic Links API v1 1.0
+// Type definitions for non-npm package Google Firebase Dynamic Links API v1 1.0
 // Project: https://firebase.google.com/docs/dynamic-links/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.firebaseremoteconfig/index.d.ts b/types/gapi.client.firebaseremoteconfig/index.d.ts
index 22c96e59c8..d34b7b69b1 100644
--- a/types/gapi.client.firebaseremoteconfig/index.d.ts
+++ b/types/gapi.client.firebaseremoteconfig/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Firebase Remote Config API v1 1.0
+// Type definitions for non-npm package Google Firebase Remote Config API v1 1.0
 // Project: https://firebase.google.com/docs/remote-config/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.firebaserules/index.d.ts b/types/gapi.client.firebaserules/index.d.ts
index fbe2fb4da7..9569944244 100644
--- a/types/gapi.client.firebaserules/index.d.ts
+++ b/types/gapi.client.firebaserules/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Firebase Rules API v1 1.0
+// Type definitions for non-npm package Google Firebase Rules API v1 1.0
 // Project: https://firebase.google.com/docs/storage/security
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.firestore/index.d.ts b/types/gapi.client.firestore/index.d.ts
index 783434a8c7..f88eb9da7f 100644
--- a/types/gapi.client.firestore/index.d.ts
+++ b/types/gapi.client.firestore/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Firestore API v1beta1 1.0
+// Type definitions for non-npm package Google Google Cloud Firestore API v1beta1 1.0
 // Project: https://cloud.google.com/firestore
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.fitness/index.d.ts b/types/gapi.client.fitness/index.d.ts
index a5b2f034d5..3f19e81a14 100644
--- a/types/gapi.client.fitness/index.d.ts
+++ b/types/gapi.client.fitness/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Fitness v1 1.0
+// Type definitions for non-npm package Google Fitness v1 1.0
 // Project: https://developers.google.com/fit/rest/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.fusiontables/index.d.ts b/types/gapi.client.fusiontables/index.d.ts
index 95750c8f38..ceb70d4f1c 100644
--- a/types/gapi.client.fusiontables/index.d.ts
+++ b/types/gapi.client.fusiontables/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Fusion Tables API v2 2.0
+// Type definitions for non-npm package Google Fusion Tables API v2 2.0
 // Project: https://developers.google.com/fusiontables
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.games/index.d.ts b/types/gapi.client.games/index.d.ts
index cd40fe4c43..7c82f11563 100644
--- a/types/gapi.client.games/index.d.ts
+++ b/types/gapi.client.games/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Play Game Services API v1 1.0
+// Type definitions for non-npm package Google Google Play Game Services API v1 1.0
 // Project: https://developers.google.com/games/services/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.gamesconfiguration/index.d.ts b/types/gapi.client.gamesconfiguration/index.d.ts
index f36c73d73d..05db6054c6 100644
--- a/types/gapi.client.gamesconfiguration/index.d.ts
+++ b/types/gapi.client.gamesconfiguration/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Play Game Services Publishing API v1configuration 1.0
+// Type definitions for non-npm package Google Google Play Game Services Publishing API v1configuration 1.0
 // Project: https://developers.google.com/games/services
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.gamesmanagement/index.d.ts b/types/gapi.client.gamesmanagement/index.d.ts
index 48ea1c6c14..2610b27ea5 100644
--- a/types/gapi.client.gamesmanagement/index.d.ts
+++ b/types/gapi.client.gamesmanagement/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Play Game Services Management API v1management 1.0
+// Type definitions for non-npm package Google Google Play Game Services Management API v1management 1.0
 // Project: https://developers.google.com/games/services
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.genomics/index.d.ts b/types/gapi.client.genomics/index.d.ts
index 6ea50827b4..b5eb695133 100644
--- a/types/gapi.client.genomics/index.d.ts
+++ b/types/gapi.client.genomics/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Genomics API v1 1.0
+// Type definitions for non-npm package Google Genomics API v1 1.0
 // Project: https://cloud.google.com/genomics
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.gmail/index.d.ts b/types/gapi.client.gmail/index.d.ts
index 68fb9e2eb0..46a793a2cb 100644
--- a/types/gapi.client.gmail/index.d.ts
+++ b/types/gapi.client.gmail/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Gmail API v1 1.0
+// Type definitions for non-npm package Google Gmail API v1 1.0
 // Project: https://developers.google.com/gmail/api/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.groupsmigration/index.d.ts b/types/gapi.client.groupsmigration/index.d.ts
index 19204dc725..2f30887831 100644
--- a/types/gapi.client.groupsmigration/index.d.ts
+++ b/types/gapi.client.groupsmigration/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Groups Migration API v1 1.0
+// Type definitions for non-npm package Google Groups Migration API v1 1.0
 // Project: https://developers.google.com/google-apps/groups-migration/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.groupssettings/index.d.ts b/types/gapi.client.groupssettings/index.d.ts
index 763e19abcc..534aa88357 100644
--- a/types/gapi.client.groupssettings/index.d.ts
+++ b/types/gapi.client.groupssettings/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Groups Settings API v1 1.0
+// Type definitions for non-npm package Google Groups Settings API v1 1.0
 // Project: https://developers.google.com/google-apps/groups-settings/get_started
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.iam/index.d.ts b/types/gapi.client.iam/index.d.ts
index ccbb4a1fde..f4b25d93e0 100644
--- a/types/gapi.client.iam/index.d.ts
+++ b/types/gapi.client.iam/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Identity and Access Management (IAM) API v1 1.0
+// Type definitions for non-npm package Google Google Identity and Access Management (IAM) API v1 1.0
 // Project: https://cloud.google.com/iam/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.identitytoolkit/index.d.ts b/types/gapi.client.identitytoolkit/index.d.ts
index 7b5a219f2b..0537a31a4f 100644
--- a/types/gapi.client.identitytoolkit/index.d.ts
+++ b/types/gapi.client.identitytoolkit/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Identity Toolkit API v3 3.0
+// Type definitions for non-npm package Google Google Identity Toolkit API v3 3.0
 // Project: https://developers.google.com/identity-toolkit/v3/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.kgsearch/index.d.ts b/types/gapi.client.kgsearch/index.d.ts
index 44e6c53d67..e4d1e4bdd4 100644
--- a/types/gapi.client.kgsearch/index.d.ts
+++ b/types/gapi.client.kgsearch/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Knowledge Graph Search API v1 1.0
+// Type definitions for non-npm package Google Knowledge Graph Search API v1 1.0
 // Project: https://developers.google.com/knowledge-graph/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.language/index.d.ts b/types/gapi.client.language/index.d.ts
index 72a44ecd28..822a29e13b 100644
--- a/types/gapi.client.language/index.d.ts
+++ b/types/gapi.client.language/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Natural Language API v1 1.0
+// Type definitions for non-npm package Google Google Cloud Natural Language API v1 1.0
 // Project: https://cloud.google.com/natural-language/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.licensing/index.d.ts b/types/gapi.client.licensing/index.d.ts
index 06cd0946d0..d0f383e1c5 100644
--- a/types/gapi.client.licensing/index.d.ts
+++ b/types/gapi.client.licensing/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Enterprise License Manager API v1 1.0
+// Type definitions for non-npm package Google Enterprise License Manager API v1 1.0
 // Project: https://developers.google.com/google-apps/licensing/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.logging/index.d.ts b/types/gapi.client.logging/index.d.ts
index 057cc13926..9de3247cba 100644
--- a/types/gapi.client.logging/index.d.ts
+++ b/types/gapi.client.logging/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Stackdriver Logging API v2 2.0
+// Type definitions for non-npm package Google Stackdriver Logging API v2 2.0
 // Project: https://cloud.google.com/logging/docs/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.manufacturers/index.d.ts b/types/gapi.client.manufacturers/index.d.ts
index db2738ec35..ffb46622a3 100644
--- a/types/gapi.client.manufacturers/index.d.ts
+++ b/types/gapi.client.manufacturers/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Manufacturer Center API v1 1.0
+// Type definitions for non-npm package Google Manufacturer Center API v1 1.0
 // Project: https://developers.google.com/manufacturers/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.mirror/index.d.ts b/types/gapi.client.mirror/index.d.ts
index 4ff633511b..7b9e9fd2e7 100644
--- a/types/gapi.client.mirror/index.d.ts
+++ b/types/gapi.client.mirror/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Mirror API v1 1.0
+// Type definitions for non-npm package Google Google Mirror API v1 1.0
 // Project: https://developers.google.com/glass
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.ml/index.d.ts b/types/gapi.client.ml/index.d.ts
index 1801e3c6e2..2fe9e5aab2 100644
--- a/types/gapi.client.ml/index.d.ts
+++ b/types/gapi.client.ml/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Machine Learning Engine v1 1.0
+// Type definitions for non-npm package Google Google Cloud Machine Learning Engine v1 1.0
 // Project: https://cloud.google.com/ml/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.monitoring/index.d.ts b/types/gapi.client.monitoring/index.d.ts
index 7331defa60..db781325d5 100644
--- a/types/gapi.client.monitoring/index.d.ts
+++ b/types/gapi.client.monitoring/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Stackdriver Monitoring API v3 3.0
+// Type definitions for non-npm package Google Stackdriver Monitoring API v3 3.0
 // Project: https://cloud.google.com/monitoring/api/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.oauth2/index.d.ts b/types/gapi.client.oauth2/index.d.ts
index 50d11d3574..94273e5104 100644
--- a/types/gapi.client.oauth2/index.d.ts
+++ b/types/gapi.client.oauth2/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google OAuth2 API v2 2.0
+// Type definitions for non-npm package Google Google OAuth2 API v2 2.0
 // Project: https://developers.google.com/accounts/docs/OAuth2
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.oslogin/index.d.ts b/types/gapi.client.oslogin/index.d.ts
index fd570c4703..d6487d3005 100644
--- a/types/gapi.client.oslogin/index.d.ts
+++ b/types/gapi.client.oslogin/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud OS Login API v1alpha 1.0
+// Type definitions for non-npm package Google Google Cloud OS Login API v1alpha 1.0
 // Project: https://cloud.google.com/compute/docs/oslogin/rest/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.pagespeedonline/index.d.ts b/types/gapi.client.pagespeedonline/index.d.ts
index 510ddbc7c4..3f5ab335bd 100644
--- a/types/gapi.client.pagespeedonline/index.d.ts
+++ b/types/gapi.client.pagespeedonline/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google PageSpeed Insights API v2 2.0
+// Type definitions for non-npm package Google PageSpeed Insights API v2 2.0
 // Project: https://developers.google.com/speed/docs/insights/v2/getting-started
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.partners/index.d.ts b/types/gapi.client.partners/index.d.ts
index fd1ef4a8b1..ed098d081b 100644
--- a/types/gapi.client.partners/index.d.ts
+++ b/types/gapi.client.partners/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Partners API v2 2.0
+// Type definitions for non-npm package Google Google Partners API v2 2.0
 // Project: https://developers.google.com/partners/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.people/index.d.ts b/types/gapi.client.people/index.d.ts
index 77213e6306..5b6168ac47 100644
--- a/types/gapi.client.people/index.d.ts
+++ b/types/gapi.client.people/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google People API v1 1.0
+// Type definitions for non-npm package Google Google People API v1 1.0
 // Project: https://developers.google.com/people/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.playcustomapp/index.d.ts b/types/gapi.client.playcustomapp/index.d.ts
index c7abd49d01..fb7b652148 100644
--- a/types/gapi.client.playcustomapp/index.d.ts
+++ b/types/gapi.client.playcustomapp/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Play Custom App Publishing API v1 1.0
+// Type definitions for non-npm package Google Google Play Custom App Publishing API v1 1.0
 // Project: https://developers.google.com/android/work/play/custom-app-api
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.playmoviespartner/index.d.ts b/types/gapi.client.playmoviespartner/index.d.ts
index 99f4f2b275..cc1bdee1b6 100644
--- a/types/gapi.client.playmoviespartner/index.d.ts
+++ b/types/gapi.client.playmoviespartner/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Play Movies Partner API v1 1.0
+// Type definitions for non-npm package Google Google Play Movies Partner API v1 1.0
 // Project: https://developers.google.com/playmoviespartner/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.plus/index.d.ts b/types/gapi.client.plus/index.d.ts
index 71fd6fd938..7b5f7c91b9 100644
--- a/types/gapi.client.plus/index.d.ts
+++ b/types/gapi.client.plus/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google+ API v1 1.0
+// Type definitions for non-npm package Google Google+ API v1 1.0
 // Project: https://developers.google.com/+/api/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.plusdomains/index.d.ts b/types/gapi.client.plusdomains/index.d.ts
index f07cfd7483..c8f2023e97 100644
--- a/types/gapi.client.plusdomains/index.d.ts
+++ b/types/gapi.client.plusdomains/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google+ Domains API v1 1.0
+// Type definitions for non-npm package Google Google+ Domains API v1 1.0
 // Project: https://developers.google.com/+/domains/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.prediction/index.d.ts b/types/gapi.client.prediction/index.d.ts
index 0c0a8af350..5efc657bd4 100644
--- a/types/gapi.client.prediction/index.d.ts
+++ b/types/gapi.client.prediction/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Prediction API v1.6 1.6
+// Type definitions for non-npm package Google Prediction API v1.6 1.6
 // Project: https://developers.google.com/prediction/docs/developer-guide
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.proximitybeacon/index.d.ts b/types/gapi.client.proximitybeacon/index.d.ts
index af2db3bc79..f200372637 100644
--- a/types/gapi.client.proximitybeacon/index.d.ts
+++ b/types/gapi.client.proximitybeacon/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Proximity Beacon API v1beta1 1.0
+// Type definitions for non-npm package Google Google Proximity Beacon API v1beta1 1.0
 // Project: https://developers.google.com/beacons/proximity/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.pubsub/index.d.ts b/types/gapi.client.pubsub/index.d.ts
index fea2d4e8c1..b97f6f9193 100644
--- a/types/gapi.client.pubsub/index.d.ts
+++ b/types/gapi.client.pubsub/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Pub/Sub API v1 1.0
+// Type definitions for non-npm package Google Google Cloud Pub/Sub API v1 1.0
 // Project: https://cloud.google.com/pubsub/docs
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.qpxexpress/index.d.ts b/types/gapi.client.qpxexpress/index.d.ts
index 2ebaaa35b2..52ffb9f673 100644
--- a/types/gapi.client.qpxexpress/index.d.ts
+++ b/types/gapi.client.qpxexpress/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google QPX Express API v1 1.0
+// Type definitions for non-npm package Google QPX Express API v1 1.0
 // Project: http://developers.google.com/qpx-express
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.reseller/index.d.ts b/types/gapi.client.reseller/index.d.ts
index dd09c51e7e..e55e0573f2 100644
--- a/types/gapi.client.reseller/index.d.ts
+++ b/types/gapi.client.reseller/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Enterprise Apps Reseller API v1 1.0
+// Type definitions for non-npm package Google Enterprise Apps Reseller API v1 1.0
 // Project: https://developers.google.com/google-apps/reseller/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.resourceviews/index.d.ts b/types/gapi.client.resourceviews/index.d.ts
index 35960c3d95..2a594695e3 100644
--- a/types/gapi.client.resourceviews/index.d.ts
+++ b/types/gapi.client.resourceviews/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Compute Engine Instance Groups API v1beta2 1.0
+// Type definitions for non-npm package Google Google Compute Engine Instance Groups API v1beta2 1.0
 // Project: https://developers.google.com/compute/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.runtimeconfig/index.d.ts b/types/gapi.client.runtimeconfig/index.d.ts
index 9f2121e39c..f00aa85d6a 100644
--- a/types/gapi.client.runtimeconfig/index.d.ts
+++ b/types/gapi.client.runtimeconfig/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Runtime Configuration API v1 1.0
+// Type definitions for non-npm package Google Google Cloud Runtime Configuration API v1 1.0
 // Project: https://cloud.google.com/deployment-manager/runtime-configurator/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.safebrowsing/index.d.ts b/types/gapi.client.safebrowsing/index.d.ts
index c388a0327f..489563577c 100644
--- a/types/gapi.client.safebrowsing/index.d.ts
+++ b/types/gapi.client.safebrowsing/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Safe Browsing API v4 4.0
+// Type definitions for non-npm package Google Google Safe Browsing API v4 4.0
 // Project: https://developers.google.com/safe-browsing/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.script/index.d.ts b/types/gapi.client.script/index.d.ts
index 2679e97960..3512368f7f 100644
--- a/types/gapi.client.script/index.d.ts
+++ b/types/gapi.client.script/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Apps Script Execution API v1 1.0
+// Type definitions for non-npm package Google Google Apps Script Execution API v1 1.0
 // Project: https://developers.google.com/apps-script/execution/rest/v1/scripts/run
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.searchconsole/index.d.ts b/types/gapi.client.searchconsole/index.d.ts
index 47fb28f5b1..974cd6ce59 100644
--- a/types/gapi.client.searchconsole/index.d.ts
+++ b/types/gapi.client.searchconsole/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Search Console URL Testing Tools API v1 1.0
+// Type definitions for non-npm package Google Google Search Console URL Testing Tools API v1 1.0
 // Project: https://developers.google.com/webmaster-tools/search-console-api/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.servicecontrol/index.d.ts b/types/gapi.client.servicecontrol/index.d.ts
index f5459a386e..d66599e7dc 100644
--- a/types/gapi.client.servicecontrol/index.d.ts
+++ b/types/gapi.client.servicecontrol/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Service Control API v1 1.0
+// Type definitions for non-npm package Google Google Service Control API v1 1.0
 // Project: https://cloud.google.com/service-control/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.servicemanagement/index.d.ts b/types/gapi.client.servicemanagement/index.d.ts
index 005fbc9fcc..87b9a142e6 100644
--- a/types/gapi.client.servicemanagement/index.d.ts
+++ b/types/gapi.client.servicemanagement/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Service Management API v1 1.0
+// Type definitions for non-npm package Google Google Service Management API v1 1.0
 // Project: https://cloud.google.com/service-management/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.serviceuser/index.d.ts b/types/gapi.client.serviceuser/index.d.ts
index f66351e851..0b4a69173f 100644
--- a/types/gapi.client.serviceuser/index.d.ts
+++ b/types/gapi.client.serviceuser/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Service User API v1 1.0
+// Type definitions for non-npm package Google Google Service User API v1 1.0
 // Project: https://cloud.google.com/service-management/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.sheets/index.d.ts b/types/gapi.client.sheets/index.d.ts
index 1f9752d361..46aaa2a246 100644
--- a/types/gapi.client.sheets/index.d.ts
+++ b/types/gapi.client.sheets/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Sheets API v4 4.0
+// Type definitions for non-npm package Google Google Sheets API v4 4.0
 // Project: https://developers.google.com/sheets/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.siteverification/index.d.ts b/types/gapi.client.siteverification/index.d.ts
index e79b8a112c..eb51a656c7 100644
--- a/types/gapi.client.siteverification/index.d.ts
+++ b/types/gapi.client.siteverification/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Site Verification API v1 1.0
+// Type definitions for non-npm package Google Google Site Verification API v1 1.0
 // Project: https://developers.google.com/site-verification/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.slides/index.d.ts b/types/gapi.client.slides/index.d.ts
index 64e8527171..c435b2b279 100644
--- a/types/gapi.client.slides/index.d.ts
+++ b/types/gapi.client.slides/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Slides API v1 1.0
+// Type definitions for non-npm package Google Google Slides API v1 1.0
 // Project: https://developers.google.com/slides/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.sourcerepo/index.d.ts b/types/gapi.client.sourcerepo/index.d.ts
index f8f1f36434..f16ae012b5 100644
--- a/types/gapi.client.sourcerepo/index.d.ts
+++ b/types/gapi.client.sourcerepo/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Cloud Source Repositories API v1 1.0
+// Type definitions for non-npm package Google Cloud Source Repositories API v1 1.0
 // Project: https://cloud.google.com/source-repositories/docs/apis
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.spanner/index.d.ts b/types/gapi.client.spanner/index.d.ts
index bc8fef6963..477e6dd58d 100644
--- a/types/gapi.client.spanner/index.d.ts
+++ b/types/gapi.client.spanner/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Cloud Spanner API v1 1.0
+// Type definitions for non-npm package Google Cloud Spanner API v1 1.0
 // Project: https://cloud.google.com/spanner/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.spectrum/index.d.ts b/types/gapi.client.spectrum/index.d.ts
index 3f829d401d..765978e2a1 100644
--- a/types/gapi.client.spectrum/index.d.ts
+++ b/types/gapi.client.spectrum/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Spectrum Database API v1explorer 1.0
+// Type definitions for non-npm package Google Google Spectrum Database API v1explorer 1.0
 // Project: http://developers.google.com/spectrum
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.speech/index.d.ts b/types/gapi.client.speech/index.d.ts
index 18709d4433..0acc33f084 100644
--- a/types/gapi.client.speech/index.d.ts
+++ b/types/gapi.client.speech/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Speech API v1 1.0
+// Type definitions for non-npm package Google Google Cloud Speech API v1 1.0
 // Project: https://cloud.google.com/speech/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.sqladmin/index.d.ts b/types/gapi.client.sqladmin/index.d.ts
index de6ffd8409..a4b50215d1 100644
--- a/types/gapi.client.sqladmin/index.d.ts
+++ b/types/gapi.client.sqladmin/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Cloud SQL Administration API v1beta4 1.0
+// Type definitions for non-npm package Google Cloud SQL Administration API v1beta4 1.0
 // Project: https://cloud.google.com/sql/docs/reference/latest
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.storage/index.d.ts b/types/gapi.client.storage/index.d.ts
index 964e20cb9f..822e1a6be1 100644
--- a/types/gapi.client.storage/index.d.ts
+++ b/types/gapi.client.storage/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Cloud Storage JSON API v1 1.0
+// Type definitions for non-npm package Google Cloud Storage JSON API v1 1.0
 // Project: https://developers.google.com/storage/docs/json_api/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.storagetransfer/index.d.ts b/types/gapi.client.storagetransfer/index.d.ts
index 41a5e9cdef..91630423a9 100644
--- a/types/gapi.client.storagetransfer/index.d.ts
+++ b/types/gapi.client.storagetransfer/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Storage Transfer API v1 1.0
+// Type definitions for non-npm package Google Google Storage Transfer API v1 1.0
 // Project: https://cloud.google.com/storage/transfer
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.streetviewpublish/index.d.ts b/types/gapi.client.streetviewpublish/index.d.ts
index 50a363b410..48ea0fc8b6 100644
--- a/types/gapi.client.streetviewpublish/index.d.ts
+++ b/types/gapi.client.streetviewpublish/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Street View Publish API v1 1.0
+// Type definitions for non-npm package Google Street View Publish API v1 1.0
 // Project: https://developers.google.com/streetview/publish/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.surveys/index.d.ts b/types/gapi.client.surveys/index.d.ts
index f6613cff4c..e1499c1c60 100644
--- a/types/gapi.client.surveys/index.d.ts
+++ b/types/gapi.client.surveys/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Surveys API v2 2.0
+// Type definitions for non-npm package Google Surveys API v2 2.0
 // Project: undefined
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.tagmanager/index.d.ts b/types/gapi.client.tagmanager/index.d.ts
index d5ed4615e3..9430b2c1d4 100644
--- a/types/gapi.client.tagmanager/index.d.ts
+++ b/types/gapi.client.tagmanager/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Tag Manager API v2 2.0
+// Type definitions for non-npm package Google Tag Manager API v2 2.0
 // Project: https://developers.google.com/tag-manager/api/v2/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.taskqueue/index.d.ts b/types/gapi.client.taskqueue/index.d.ts
index 62fb53de93..97f4c6272c 100644
--- a/types/gapi.client.taskqueue/index.d.ts
+++ b/types/gapi.client.taskqueue/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google TaskQueue API v1beta2 1.0
+// Type definitions for non-npm package Google TaskQueue API v1beta2 1.0
 // Project: https://developers.google.com/appengine/docs/python/taskqueue/rest
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.tasks/index.d.ts b/types/gapi.client.tasks/index.d.ts
index 6de4e2b078..6fbb7c1d23 100644
--- a/types/gapi.client.tasks/index.d.ts
+++ b/types/gapi.client.tasks/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Tasks API v1 1.0
+// Type definitions for non-npm package Google Tasks API v1 1.0
 // Project: https://developers.google.com/google-apps/tasks/firstapp
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.testing/index.d.ts b/types/gapi.client.testing/index.d.ts
index 1b8460c3fc..07163219cd 100644
--- a/types/gapi.client.testing/index.d.ts
+++ b/types/gapi.client.testing/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Testing API v1 1.0
+// Type definitions for non-npm package Google Google Cloud Testing API v1 1.0
 // Project: https://developers.google.com/cloud-test-lab/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.toolresults/index.d.ts b/types/gapi.client.toolresults/index.d.ts
index c19db3d15e..c026012e07 100644
--- a/types/gapi.client.toolresults/index.d.ts
+++ b/types/gapi.client.toolresults/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Cloud Tool Results API v1beta3 1.0
+// Type definitions for non-npm package Google Cloud Tool Results API v1beta3 1.0
 // Project: https://firebase.google.com/docs/test-lab/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.translate/index.d.ts b/types/gapi.client.translate/index.d.ts
index 931e5b58d4..c56576e4a6 100644
--- a/types/gapi.client.translate/index.d.ts
+++ b/types/gapi.client.translate/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Translation API v2 2.0
+// Type definitions for non-npm package Google Google Cloud Translation API v2 2.0
 // Project: https://code.google.com/apis/language/translate/v2/getting_started.html
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.urlshortener/index.d.ts b/types/gapi.client.urlshortener/index.d.ts
index 49a0974342..132d0ecb7f 100644
--- a/types/gapi.client.urlshortener/index.d.ts
+++ b/types/gapi.client.urlshortener/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google URL Shortener API v1 1.0
+// Type definitions for non-npm package Google URL Shortener API v1 1.0
 // Project: https://developers.google.com/url-shortener/v1/getting_started
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.vault/index.d.ts b/types/gapi.client.vault/index.d.ts
index 2b5f6757be..65af28c5fb 100644
--- a/types/gapi.client.vault/index.d.ts
+++ b/types/gapi.client.vault/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Vault API v1 1.0
+// Type definitions for non-npm package Google Google Vault API v1 1.0
 // Project: https://developers.google.com/vault
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.videointelligence/index.d.ts b/types/gapi.client.videointelligence/index.d.ts
index 27d2802c5f..043508960a 100644
--- a/types/gapi.client.videointelligence/index.d.ts
+++ b/types/gapi.client.videointelligence/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Cloud Video Intelligence API v1beta1 1.0
+// Type definitions for non-npm package Google Cloud Video Intelligence API v1beta1 1.0
 // Project: https://cloud.google.com/video-intelligence/docs/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.vision/index.d.ts b/types/gapi.client.vision/index.d.ts
index 4ebde6d4fd..76a5fdba71 100644
--- a/types/gapi.client.vision/index.d.ts
+++ b/types/gapi.client.vision/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Cloud Vision API v1 1.0
+// Type definitions for non-npm package Google Google Cloud Vision API v1 1.0
 // Project: https://cloud.google.com/vision/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.webfonts/index.d.ts b/types/gapi.client.webfonts/index.d.ts
index cc8404580b..1cecd6afaf 100644
--- a/types/gapi.client.webfonts/index.d.ts
+++ b/types/gapi.client.webfonts/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Google Fonts Developer API v1 1.0
+// Type definitions for non-npm package Google Google Fonts Developer API v1 1.0
 // Project: https://developers.google.com/fonts/docs/developer_api
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.webmasters/index.d.ts b/types/gapi.client.webmasters/index.d.ts
index 50ec1f4bd8..5c8ae99db7 100644
--- a/types/gapi.client.webmasters/index.d.ts
+++ b/types/gapi.client.webmasters/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Search Console API v3 3.0
+// Type definitions for non-npm package Google Search Console API v3 3.0
 // Project: https://developers.google.com/webmaster-tools/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.youtube/index.d.ts b/types/gapi.client.youtube/index.d.ts
index 23f46a46f6..b39975c3d9 100644
--- a/types/gapi.client.youtube/index.d.ts
+++ b/types/gapi.client.youtube/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google YouTube Data API v3 3.0
+// Type definitions for non-npm package Google YouTube Data API v3 3.0
 // Project: https://developers.google.com/youtube/v3
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.youtubeanalytics/index.d.ts b/types/gapi.client.youtubeanalytics/index.d.ts
index 4637df148d..dc41fd91b4 100644
--- a/types/gapi.client.youtubeanalytics/index.d.ts
+++ b/types/gapi.client.youtubeanalytics/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google YouTube Analytics API v1 1.0
+// Type definitions for non-npm package Google YouTube Analytics API v1 1.0
 // Project: http://developers.google.com/youtube/analytics/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client.youtubereporting/index.d.ts b/types/gapi.client.youtubereporting/index.d.ts
index 976d7c7fc5..9a11b17d03 100644
--- a/types/gapi.client.youtubereporting/index.d.ts
+++ b/types/gapi.client.youtubereporting/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google YouTube Reporting API v1 1.0
+// Type definitions for non-npm package Google YouTube Reporting API v1 1.0
 // Project: https://developers.google.com/youtube/reporting/v1/reports/
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/gapi.client/index.d.ts b/types/gapi.client/index.d.ts
index f7b7b78a4a..ec8346c015 100644
--- a/types/gapi.client/index.d.ts
+++ b/types/gapi.client/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google API client 1.0
+// Type definitions for non-npm package Google API client 1.0
 // Project: https://developers.google.com
 // Definitions by: Bolisov Alexey <https://github.com/Bolisov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/generic-pool/generic-pool-tests.ts b/types/generic-pool/generic-pool-tests.ts
index 4b8a69aa93..09a46ccf84 100644
--- a/types/generic-pool/generic-pool-tests.ts
+++ b/types/generic-pool/generic-pool-tests.ts
@@ -29,12 +29,13 @@ const opts = {
     min: 2,
     maxWaitingClients: 2,
     testOnBorrow: true,
+    testOnReturn: true,
     acquireTimeoutMillis: 100,
     fifo: true,
     priorityRange: 5,
     autostart: false,
     evictionRunIntervalMillis: 200,
-    numTestsPerRun: 3,
+    numTestsPerEvictionRun: 3,
     softIdleTimeoutMillis: 100,
     idleTimeoutMillis: 5000
 };
diff --git a/types/generic-pool/index.d.ts b/types/generic-pool/index.d.ts
index 80a3c0e9df..14fea9497f 100644
--- a/types/generic-pool/index.d.ts
+++ b/types/generic-pool/index.d.ts
@@ -38,12 +38,13 @@ export interface Options {
     min?: number;
     maxWaitingClients?: number;
     testOnBorrow?: boolean;
+    testOnReturn?: boolean;
     acquireTimeoutMillis?: number;
     fifo?: boolean;
     priorityRange?: number;
     autostart?: boolean;
     evictionRunIntervalMillis?: number;
-    numTestsPerRun?: number;
+    numTestsPerEvictionRun?: number;
     softIdleTimeoutMillis?: number;
     idleTimeoutMillis?: number;
 }
diff --git a/types/geodesy/index.d.ts b/types/geodesy/index.d.ts
index 15a53796e0..24e1878f98 100644
--- a/types/geodesy/index.d.ts
+++ b/types/geodesy/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for geodesy 1.2
-// Project: https://github.com/chrisveness/geodesy
+// Project: https://github.com/chrisveness/geodesy, http://www.movable-type.co.uk/scripts/latlong.html
 // Definitions by: Denis Carriere <https://github.com/DenisCarriere>
 // 		   Gilbert Handy <https://github.com/HandyG52>
 //         Harry Nicholls <https://github.com/excelulous>
diff --git a/types/geojson/index.d.ts b/types/geojson/index.d.ts
index db8074e242..90beca01c1 100644
--- a/types/geojson/index.d.ts
+++ b/types/geojson/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for geojson 7946.0
-// Project: https://geojson.org/
+// Project: https://geojson.org/, https://github.com/caseycesari/geojson.js
 // Definitions by: Jacob Bruun <https://github.com/cobster>
 //                 Arne Schubert <https://github.com/atd-schubert>
 //                 Jeff Jacobson <https://github.com/JeffJacobson>
diff --git a/types/geopattern/index.d.ts b/types/geopattern/index.d.ts
index 5756fbda93..d718f055b5 100644
--- a/types/geopattern/index.d.ts
+++ b/types/geopattern/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for GeoPattern 1.2
-// Project: https://github.com/btmills/geopattern
+// Project: https://github.com/btmills/geopattern, http://btmills.github.io/geopattern/geopattern.html
 // Definitions by: Gaelan <https://github.com/Gaelan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/gestalt/index.d.ts b/types/gestalt/index.d.ts
index dd9ff81e41..77c88b6d35 100644
--- a/types/gestalt/index.d.ts
+++ b/types/gestalt/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for gestalt 0.75
-// Project: https://github.com/pinterest/gestalt
+// Project: https://github.com/pinterest/gestalt, https://pinterest.github.io/gestalt
 // Definitions by: Nicolás Serrano Arévalo <https://github.com/serranoarevalo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
@@ -786,7 +786,7 @@ export interface ToastProps {
     color?: "darkGray" | "orange";
     icon?: "arrow-circle-forward";
     text?: string | ReadonlyArray<string>;
-    thumbnail?: React.ReactElement<any>;
+    thumbnail?: React.ReactElement;
 }
 
 /*
diff --git a/types/getopts/index.d.ts b/types/getopts/index.d.ts
index a4c14bd75c..11e1c8e49c 100644
--- a/types/getopts/index.d.ts
+++ b/types/getopts/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for getopts 2.0
-// Project: https://github.com/getopts/getopts#readme
+// Project: https://github.com/jorgebucaran/getopts
 // Definitions by: Aleh Zasypkin <https://github.com/azasypkin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/giphy-api/giphy-api-tests.ts b/types/giphy-api/giphy-api-tests.ts
new file mode 100644
index 0000000000..c5fc86870e
--- /dev/null
+++ b/types/giphy-api/giphy-api-tests.ts
@@ -0,0 +1,36 @@
+import giphyApi = require('giphy-api');
+
+const cb = (err: Error, res: any) => {};
+
+const apiOptions: giphyApi.GiphyOptions = { https: true };
+giphyApi('API KEY HERE');
+giphyApi(apiOptions);
+giphyApi({ timeout: 60 });
+giphyApi({ apiKey: 'API KEY' });
+
+const searchOptions: giphyApi.SearchOptions = { q: 'pokemon', rating: 'g' };
+const giphy: giphyApi.Giphy = giphyApi();
+giphy.search('pokemon', cb);
+giphy.search('pokemon').then(res => {});
+giphy.search(searchOptions, cb);
+giphy.search({ q: 'pokemon', rating: 'g' }).then(res => {});
+
+giphy.id('feqkVgjJpYtjy', cb);
+giphy.id('feqkVgjJpYtjy').then(res => {});
+giphy.id(['feqkVgjJpYtjy'], cb);
+giphy.id(['feqkVgjJpYtjy']).then(res => {});
+
+giphy.translate('superman', cb);
+giphy.translate('superman').then(res => {});
+giphy.translate({ s: 'superman', rating: 'g', fmt: 'html' }, cb);
+giphy.translate({ s: 'superman', rating: 'g' }).then(res => {});
+
+giphy.random('superman', cb);
+giphy.random('superman').then(res => {});
+giphy.random({ tag: 'superman', rating: 'g' }, cb);
+giphy.random({ tag: 'superman', rating: 'g' }).then(res => {});
+
+giphy.trending(cb);
+giphy.trending().then(res => {});
+giphy.trending({ limit: 2, rating: 'g' });
+giphy.trending({ limit: 2, rating: 'g' }).then(res => {});
diff --git a/types/giphy-api/index.d.ts b/types/giphy-api/index.d.ts
new file mode 100644
index 0000000000..d121eff979
--- /dev/null
+++ b/types/giphy-api/index.d.ts
@@ -0,0 +1,179 @@
+// Type definitions for giphy-api 2.0
+// Project: https://github.com/austinkelleher/giphy-api
+// Definitions by: Christian Rackerseder <https://github.com/screendriver>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+type Rating = "y" | "g" | "pg" | "pg-13" | "r";
+type Format = "html" | "json";
+
+interface BaseOptions {
+    rating: Rating;
+    fmt?: Format;
+}
+
+interface TranslateOptions extends BaseOptions {
+    s: string;
+}
+
+interface RandomOptions extends BaseOptions {
+    tag: string;
+}
+
+interface TrendingOptions extends BaseOptions {
+    limit?: number;
+}
+
+interface BaseImage {
+    url: string;
+    width: string;
+    height: string;
+}
+
+type Callback = (err: Error, res: giphyApi.Result) => void;
+
+declare function giphyApi(apiKeyOrOptions?: string | giphyApi.GiphyOptions): giphyApi.Giphy;
+
+declare namespace giphyApi {
+    interface GiphyOptions {
+        https?: boolean;
+        timeout?: number;
+        apiKey?: string;
+    }
+
+    interface SearchOptions extends BaseOptions {
+        q: string;
+        limit?: number;
+        offset?: number;
+    }
+
+    interface Giphy {
+        search(queryOrOptions: string | SearchOptions, cb: Callback): void;
+        search(queryOrOptions: string | SearchOptions): Promise<Result>;
+        id(ids: string | string[], cb: Callback): void;
+        id(ids: string | string[]): Promise<Result>;
+        translate(termOrOptions: string | TranslateOptions, cb: Callback): void;
+        translate(termOrOptions: string | TranslateOptions): Promise<Result>;
+        random(tagOrOptions: string | RandomOptions, cb: Callback): void;
+        random(tagOrOptions: string | RandomOptions): Promise<Result>;
+        trending(options: TrendingOptions, cb: Callback): void;
+        trending(cb: Callback): void;
+        trending(options?: TrendingOptions): Promise<Result>;
+    }
+
+    interface Result {
+        data: [
+            {
+                type: string;
+                id: string;
+                slug: string;
+                url: string;
+                bitly_url: string;
+                embed_url: string;
+                username: string;
+                source: string;
+                rating: Rating;
+                content_url: string;
+                user?: {
+                    avatar_url: string;
+                    banner_url: string;
+                    profile_url: string;
+                    username: string;
+                    display_name: string;
+                    twitter: string;
+                },
+                source_tld: string;
+                source_post_url: string;
+                update_datetime: string;
+                create_datetime: string;
+                import_datetime: string;
+                trending_datetime: string;
+                title: string;
+                images: {
+                    fixed_height: BaseImage & {
+                        size: string;
+                        mp4: string;
+                        mp4_size: string;
+                        webp: string;
+                        webp_size: string;
+                    };
+                    fixed_height_still: BaseImage;
+                    fixed_height_downsampled: BaseImage & {
+                        size: string;
+                        webp: string;
+                        webp_size: string;
+                    };
+                    fixed_width: BaseImage & {
+                        size: string;
+                        mp4: string;
+                        mp4_size: string;
+                        webp: string;
+                        webp_size: string;
+                    };
+                    original_still: BaseImage;
+                    fixed_width_still: BaseImage;
+                    fixed_width_downsampled: BaseImage & {
+                        size: string;
+                        webp: string;
+                        webp_size: string;
+                    };
+                    fixed_height_small: BaseImage & {
+                        size: string;
+                        mp4: string;
+                        mp4_size: string;
+                        webp: string;
+                        webp_size: string;
+                    };
+                    fixed_height_small_still: BaseImage;
+                    fixed_width_small: BaseImage & {
+                        size: string;
+                        mp4: string;
+                        mp4_size: string;
+                        webp: string;
+                        webp_size: string;
+                    };
+                    fixed_width_small_still: BaseImage;
+                    downsized: BaseImage & {
+                        size: string;
+                    };
+                    downsized_still: BaseImage;
+                    downsized_large: BaseImage & {
+                        size: string;
+                    };
+                    downsized_medium: BaseImage & {
+                        size: string;
+                    };
+                    downsized_small: BaseImage & {
+                        size: string;
+                    };
+                    original: BaseImage & {
+                        size: string;
+                        frames: string;
+                        mp4: string;
+                        mp4_size: string;
+                        webp: string;
+                        webp_size: string;
+                    };
+                    looping: { mp4: string; };
+                    preview: {
+                        width: string;
+                        height: string;
+                        mp4: string;
+                        mp4_size: string;
+                    };
+                    preview_gif: BaseImage & {
+                        size: string;
+                    };
+                };
+            }
+        ];
+        pagination: { total_count: number; count: number; offset: number };
+        meta: {
+            status: number;
+            msg: string;
+            response_id: string;
+        };
+    }
+}
+
+export = giphyApi;
diff --git a/types/giphy-api/tsconfig.json b/types/giphy-api/tsconfig.json
new file mode 100644
index 0000000000..e8d707c5fb
--- /dev/null
+++ b/types/giphy-api/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "giphy-api-tests.ts"
+    ]
+}
diff --git a/types/giphy-api/tslint.json b/types/giphy-api/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/giphy-api/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/giraffe/index.d.ts b/types/giraffe/index.d.ts
index abce777c20..2f0223321c 100644
--- a/types/giraffe/index.d.ts
+++ b/types/giraffe/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for Giraffe
 // Project: https://github.com/barc/backbone.giraffe
 // Definitions by: Matt McCray <https://github.com/darthapo>
+//                 Julian Gonggrijp <https://github.com/jgonggrijp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -145,18 +146,12 @@ declare namespace Giraffe {
 
   namespace Contrib {
 
-    class Controller implements GiraffeObject, Backbone.Events {
-      on(eventName: string, callback?: (...args: any[]) => void, context?: any);
-      on(eventMap: Backbone.EventsHash);
+    class Controller extends Backbone.EventsMixin implements GiraffeObject, Backbone.Events {
+      /**
+       * Faulty overgeneralization of Backbone.Events.on, for historical
+       * reasons.
+       */
       on(eventName: any, callback?: any, context?: any)
-      off(eventName?: string, callback?: (...args: any[]) => void, context?: any)
-      trigger(eventName: string, ...args: any[])
-      bind(eventName: string, callback: (...args: any[]) => void, context?: any)
-      unbind(eventName?: string, callback?: (...args: any[]) => void, context?: any)
-      once(events: string, callback: (...args: any[]) => void, context?: any): any;
-      listenTo(object: any, events: string, callback: (...args: any[]) => void): any;
-      listenToOnce(object: any, events: string, callback: (...args: any[]) => void): any;
-      stopListening(object?: any, events?: string, callback?: (...args: any[]) => void): any;
 
       app: App;
     }
diff --git a/types/gl-react-native/index.d.ts b/types/gl-react-native/index.d.ts
index 8f0c38a96d..0ae45486be 100644
--- a/types/gl-react-native/index.d.ts
+++ b/types/gl-react-native/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for gl-react-native 3.15
-// Project: https://github.com/gre/gl-react
+// Project: https://github.com/gre/gl-react, https://github.com/projectseptemberinc/gl-react-native
 // Definitions by: Jussi Kinnula <https://github.com/jussikinnula>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/google-adwords-scripts/index.d.ts b/types/google-adwords-scripts/index.d.ts
index 5e71857a3a..6a95ebf922 100644
--- a/types/google-adwords-scripts/index.d.ts
+++ b/types/google-adwords-scripts/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google AdWords Scripts 1.0
+// Type definitions for non-npm package Google AdWords Scripts 1.0
 // Project: https://github.com/jafaircl/gaws
 // Definitions by: Jonathan Faircloth <https://github.com/jafaircl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/google-apps-script-oauth2/index.d.ts b/types/google-apps-script-oauth2/index.d.ts
index d5d9022849..2486a38e12 100644
--- a/types/google-apps-script-oauth2/index.d.ts
+++ b/types/google-apps-script-oauth2/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for google-apps-script-oauth2 24.0
+// Type definitions for non-npm package google-apps-script-oauth2 24.0
 // Project: https://github.com/googlesamples/apps-script-oauth2
 // Definitions by: dhayab <https://github.com/dhayab>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
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 209be25b19..9f7153a6bb 100644
--- a/types/google-apps-script/google-apps-script.base.d.ts
+++ b/types/google-apps-script/google-apps-script.base.d.ts
@@ -324,4 +324,3 @@ declare var Logger: GoogleAppsScript.Base.Logger;
 // conflicts with MimeType in lib.d.ts
 // declare var MimeType: GoogleAppsScript.Base.MimeType;
 declare var Session: GoogleAppsScript.Base.Session;
-declare var console: GoogleAppsScript.Base.console;
diff --git a/types/google-cloud__tasks/google-cloud__tasks-tests.ts b/types/google-cloud__tasks/google-cloud__tasks-tests.ts
new file mode 100644
index 0000000000..4539f345ff
--- /dev/null
+++ b/types/google-cloud__tasks/google-cloud__tasks-tests.ts
@@ -0,0 +1,18 @@
+import Tasks, { Queue } from "@google-cloud/tasks";
+
+const client = new Tasks({});
+
+const formattedParent = client.locationPath("[PROJECT]", "[LOCATION]");
+const queue: Partial<Queue> = {};
+const request = {
+  parent: formattedParent,
+  queue
+};
+client
+  .createQueue(request)
+  .then(([queue]) => {
+    const q = queue;
+  })
+  .catch(err => {
+    console.error(err);
+  });
diff --git a/types/google-cloud__tasks/index.d.ts b/types/google-cloud__tasks/index.d.ts
new file mode 100644
index 0000000000..c3347c8ea4
--- /dev/null
+++ b/types/google-cloud__tasks/index.d.ts
@@ -0,0 +1,1627 @@
+// Type definitions for @google-cloud/tasks 0.2
+// Project: https://github.com/googleapis/nodejs-tasks
+// Definitions by: Ifiok Jr. <https://github.com/ifiokjr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TypeScript Version: 2.8
+
+/// <reference types="node" />
+
+import { Transform } from "stream";
+export type GoogleError = any;
+export type GoogleAuthOptions = any;
+export type CallOptions = any;
+export type GoogleAuth = any;
+
+export interface CloudTasksConfig extends GoogleAuthOptions {
+  key?: string;
+  autoRetry?: boolean;
+  maxRetries?: number;
+  libName?: string;
+  libVersion?: string;
+  promise?: PromiseConstructor;
+}
+
+export interface AppEngineHttpQueue {
+  appEngineRoutingOverride: AppEngineRouting;
+}
+
+export interface AppEngineHttpRequest {
+  appEngineRouting: AppEngineRouting;
+  body: string;
+  headers: {
+    [key: string]: string;
+  };
+  httpMethod: string;
+  relativeUri: string;
+}
+
+export interface AppEngineRouting {
+  host: string;
+  instance: string;
+  service: string;
+  version: string;
+}
+
+export interface Attempt {
+  dispatchTime: string;
+  responseStatus: Status;
+  responseTime: string;
+  scheduleTime: string;
+}
+
+export interface Binding {
+  condition: Expr;
+  members: string[];
+  role: string;
+}
+
+export interface CreateTaskRequest {
+  responseView: View;
+  task: Partial<Task>;
+}
+
+export interface Expr {
+  description: string;
+  expression: string;
+  location: string;
+  title: string;
+}
+
+export interface ListLocationsResponse {
+  locations: Location[];
+  nextPageToken?: string;
+}
+
+export interface ListQueuesResponse {
+  nextPageToken?: string;
+  queues: Queue[];
+}
+
+export interface ListTasksResponse {
+  nextPageToken?: string;
+  tasks: Task[];
+}
+
+export interface Location {
+  displayName: string;
+  labels: {
+    [key: string]: string;
+  };
+  locationId: string;
+  metadata: object;
+  name: string;
+}
+
+export interface Policy {
+  bindings: Binding[];
+  etag: string;
+  version: number;
+}
+
+export interface Queue {
+  appEngineHttpQueue: AppEngineHttpQueue;
+  name: string;
+  purgeTime: string;
+  rateLimits: RateLimits;
+  retryConfig: RetryConfig;
+  state: string;
+}
+
+export interface RateLimits {
+  maxBurstSize: number;
+  maxConcurrentDispatches: number;
+  maxDispatchesPerSecond: number;
+}
+
+export interface RetryConfig {
+  maxAttempts: number;
+  maxBackoff: string;
+  maxDoublings: number;
+  maxRetryDuration: string;
+  minBackoff: string;
+}
+
+export interface RunTaskRequest {
+  responseView?: View;
+}
+
+export interface SetIamPolicyRequest {
+  policy: Partial<Policy>;
+}
+
+export interface Status {
+  code: number;
+  details: object[];
+  message: string;
+}
+
+/**
+ * `VIEW_UNSPECIFIED = 0;`
+ * When Unspecified. Defaults to the behaviour of BASIC.
+ *
+ * `BASIC = 1;`
+ * The basic view omits fields which can be large or can contain
+ * sensitive data.
+ * This view does not include the
+ * ([payload in AppEngineHttpRequest][google.cloud.tasks.v2beta2.AppEngineHttpRequest] and
+ * [payload in PullMessage][google.cloud.tasks.v2beta2.PullMessage.payload]). These payloads are
+ * desirable to return only when needed, because they can be large
+ * and because of the sensitivity of the data that you choose to
+ * store in it.
+ *
+ * `FULL = 2;`
+ * All information is returned.
+ *
+ * Authorization for [FULL][google.cloud.tasks.v2beta2.Task.View.FULL] requires
+ * `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+ * permission on the [Queue][google.cloud.tasks.v2beta2.Queue] resource.
+ */
+export type View = 0 | 1 | 2;
+
+export interface Task {
+  appEngineHttpRequest: AppEngineHttpRequest;
+  createTime: string;
+  dispatchCount: number;
+  firstAttempt: Attempt;
+  lastAttempt: Attempt;
+  name: string;
+  responseCount: number;
+  scheduleTime: string;
+  view: View;
+}
+
+export interface TestIamPermissionsRequest {
+  permissions?: string[];
+}
+
+export interface TestIamPermissionsResponse {
+  permissions?: string[];
+}
+
+export interface PromiseLike<T> extends Promise<T> {
+  /**
+   * Cancel the ongoing promise
+   */
+  cancel(): void;
+}
+
+export type Keys<T> = keyof T;
+
+export type EnhancedPick<
+  T,
+  Req extends keyof T,
+  Opt extends keyof T
+> = Required<Pick<T, Req>> & Partial<Pick<T, Req>>;
+
+export type ProjectIdCallback = (
+  err?: Error | null,
+  projectId?: string | null
+) => void;
+
+export type APICallback<T = any> = (
+  err: GoogleError | null,
+  response?: T
+) => void;
+
+export type APIPaginatedCallback<T = any, U = any, V = any> = (
+  err: GoogleError | null,
+  response?: T,
+  next?: U | null,
+  rawResponse?: V
+) => void;
+
+export interface CallOptionsWithPagination extends CallOptions {
+  autoPaginate: false;
+}
+
+export interface MethodOverload<T, R> {
+  (data: T, options?: CallOptions): PromiseLike<[R]>;
+  (data: T, options: CallOptions, callback: APICallback<R>): void;
+  (data: T, callback: APICallback<R>): void;
+}
+
+export interface PaginatedMethodOverload<T, R, U, V = T> {
+  (data: T, options: CallOptionsWithPagination): PromiseLike<[R, V, U]>;
+  (data: T, options?: CallOptions): PromiseLike<[R]>;
+  (data: T, options: CallOptions, callback: APICallback<R>): void;
+  (
+    data: T,
+    options: CallOptionsWithPagination,
+    callback: APIPaginatedCallback<R, V, U>
+  ): void;
+  (data: T, callback: APICallback<R>): void;
+}
+
+export interface ParentRequest {
+  /**
+   * The location name. For example: projects/PROJECT_ID/locations/LOCATION_ID
+   */
+  parent: string;
+}
+
+export interface ResourceRequest {
+  /**
+   * The resource for which the policy is being requested. resource is usually specified as a path. For example, a Project resource is specified as projects/{project}.
+   */
+  resource: string;
+}
+
+export interface ListRequestObject extends ParentRequest {
+  /**
+   * `filter` can be used to specify a subset of queues. Any Queue field can be used as a filter and several operators as supported.
+   * For example: <=, <, >=, >, !=, =, :. The filter syntax is the same as described in Stackdriver's Advanced Logs Filters.
+   * Sample filter "state: PAUSED".
+   * Note that using filters might cause fewer queues than the requested page_size to be returned.
+   */
+  filter?: string;
+
+  /**
+   * The maximum number of resources contained in the underlying API response. If page streaming is performed per-resource,
+   * this parameter does not affect the return value. If page streaming is performed per-page, this determines the maximum number of resources in a page.
+   */
+  pageSize?: number;
+}
+
+export interface NamedRequest {
+  /**
+   * The resource name of the queue. For example: projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID
+   */
+  name: string;
+}
+
+export type CreateNamedRequest<N extends string, T> = ParentRequest &
+  { [P in N]: T };
+export type UpdateNamedRequest<N extends string, T> = ParentRequest &
+  { [P in N]: T };
+
+/**
+ * Cloud Tasks allows developers to manage the execution of background
+ * work in their applications.
+ */
+export default class CloudTasksClient {
+  /**
+   * The DNS address for this API service.
+   * @default 'cloudtasks.googleapis.com'
+   */
+  static readonly servicePath: string;
+
+  /**
+   * The port for this API service.
+   * @default 443
+   */
+  static readonly port: number;
+
+  /**
+   * The scopes needed to make gRPC calls for every method defined
+   * in this service.
+   * @default ["https://www.googleapis.com/auth/cloud-platform"]
+   */
+  static readonlyscopes: string;
+
+  auth: GoogleAuth;
+
+  /**
+   * Construct an instance of CloudTasksClient.
+   *
+   * @param [options] - The configuration object. See the subsequent
+   *   parameters for more details.
+   * @param [options.credentials] - Credentials object.
+   * @param [options.credentials.client_email]
+   * @param [options.credentials.private_key]
+   * @param [options.email] - Account email address. Required when
+   *     using a .pem or .p12 keyFilename.
+   * @param [options.keyFilename] - Full path to the a .json, .pem, or
+   *     .p12 key downloaded from the Google Developers Console. If you provide
+   *     a path to a JSON file, the projectId option below is not necessary.
+   *     NOTE: .pem and .p12 require you to specify options.email as well.
+   * @param [options.port] - The port on which to connect to
+   *     the remote host.
+   * @param [options.projectId] - The project ID from the Google
+   *     Developer's Console, e.g. 'grape-spaceship-123'. We will also check
+   *     the environment variable GCLOUD_PROJECT for your project ID. If your
+   *     app is running in an environment which supports
+   *     {@link https://developers.google.com/identity/protocols/application-default-credentials Application Default Credentials},
+   *     your project ID will be detected automatically.
+   * @param [options.promise] - Custom promise module to use instead
+   *     of native Promises.
+   * @param [options.servicePath] - The domain name of the
+   *     API remote host.
+   */
+  constructor(config: CloudTasksConfig);
+
+  /**
+   * Return the project ID used by this class.
+   * @param callback - the callback to
+   *   be called with the current project Id.
+   */
+  getProjectId(): PromiseLike<string>;
+  getProjectId(callback: ProjectIdCallback): void;
+
+  // -------------------
+  // -- Service calls --
+  // -------------------
+
+  /**
+   * Lists queues.
+   *
+   * Queues are returned in lexicographical order.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.parent
+   *   Required.
+   *
+   *   The location name.
+   *   For example: `projects/PROJECT_ID/locations/LOCATION_ID`
+   * @param [request.filter]
+   *   `filter` can be used to specify a subset of queues. Any Queue
+   *   field can be used as a filter and several operators as supported.
+   *   For example: `<=, <, >=, >, !=, =, :`. The filter syntax is the same as
+   *   described in
+   *   [Stackdriver's Advanced Logs Filters](https://cloud.google.com/logging/docs/view/advanced_filters).
+   *
+   *   Sample filter "state: PAUSED".
+   *
+   *   Note that using filters might cause fewer queues than the
+   *   requested page_size to be returned.
+   * @param [request.pageSize]
+   *   The maximum number of resources contained in the underlying API
+   *   response. If page streaming is performed per-resource, this
+   *   parameter does not affect the return value. If page streaming is
+   *   performed per-page, this determines the maximum number of
+   *   resources in a page.
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is Array of [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *
+   *   When autoPaginate: false is specified through options, it contains the result
+   *   in a single response. If the response indicates the next page exists, the third
+   *   parameter is set to be used for the next request object. The fourth parameter keeps
+   *   the raw response object of an object representing [ListQueuesResponse]{@link google.cloud.tasks.v2beta3.ListQueuesResponse}.
+   *   The first element of the array is Array of [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *
+   *   When autoPaginate: false is specified through options, the array has three elements.
+   *   The first element is Array of [Queue]{@link google.cloud.tasks.v2beta3.Queue} in a single response.
+   *   The second element is the next request object if the response
+   *   indicates the next page exists, or null. The third element is
+   *   an object representing [ListQueuesResponse]{@link google.cloud.tasks.v2beta3.ListQueuesResponse}.
+   *
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * // Iterate over all elements.
+   * const formattedParent = client.locationPath('[PROJECT]', '[LOCATION]');
+   *
+   * client.listQueues({parent: formattedParent})
+   *   .then(responses => {
+   *     const resources = responses[0];
+   *     for (let i = 0; i < resources.length; i += 1) {
+   *       // doThingsWith(resources[i])
+   *     }
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   *
+   * // Or obtain the paged response.
+   * const formattedParent = client.locationPath('[PROJECT]', '[LOCATION]');
+   *
+   *
+   * const options = {autoPaginate: false};
+   * const callback = responses => {
+   *   // The actual resources in a response.
+   *   const resources = responses[0];
+   *   // The next request if the response shows that there are more responses.
+   *   const nextRequest = responses[1];
+   *   // The actual response object, if necessary.
+   *   // const rawResponse = responses[2];
+   *   for (let i = 0; i < resources.length; i += 1) {
+   *     // doThingsWith(resources[i]);
+   *   }
+   *   if (nextRequest) {
+   *     // Fetch the next page.
+   *     return client.listQueues(nextRequest, options).then(callback);
+   *   }
+   * }
+   * client.listQueues({parent: formattedParent}, options)
+   *   .then(callback)
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  listQueues: PaginatedMethodOverload<
+    ListRequestObject,
+    Queue[],
+    ListQueuesResponse
+  >;
+
+  /**
+   * Equivalent to {@link listQueues}, but returns a NodeJS Stream object.
+   *
+   * This fetches the paged responses for {@link listQueues} continuously
+   * and invokes the callback registered for 'data' event for each element in the
+   * responses.
+   *
+   * The returned object has 'end' method when no more elements are required.
+   *
+   * autoPaginate option will be ignored.
+   *
+   * @see {@link https://nodejs.org/api/stream.html}
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.parent
+   *   Required.
+   *
+   *   The location name.
+   *   For example: `projects/PROJECT_ID/locations/LOCATION_ID`
+   * @param [request.filter]
+   *   `filter` can be used to specify a subset of queues. Any Queue
+   *   field can be used as a filter and several operators as supported.
+   *   For example: `<=, <, >=, >, !=, =, :`. The filter syntax is the same as
+   *   described in
+   *   [Stackdriver's Advanced Logs Filters](https://cloud.google.com/logging/docs/view/advanced_filters).
+   *
+   *   Sample filter "state: PAUSED".
+   *
+   *   Note that using filters might cause fewer queues than the
+   *   requested page_size to be returned.
+   * @param [request.pageSize]
+   *   The maximum number of resources contained in the underlying API
+   *   response. If page streaming is performed per-resource, this
+   *   parameter does not affect the return value. If page streaming is
+   *   performed per-page, this determines the maximum number of
+   *   resources in a page.
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   *   An object stream which emits an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue} on 'data' event.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedParent = client.locationPath('[PROJECT]', '[LOCATION]');
+   * client.listQueuesStream({parent: formattedParent})
+   *   .on('data', element => {
+   *     // doThingsWith(element)
+   *   }).on('error', err => {
+   *     console.log(err);
+   *   });
+   */
+  listQueuesStream(
+    request: ListRequestObject,
+    options?: CallOptions
+  ): Transform;
+
+  /**
+   * Gets a queue.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The resource name of the queue. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The first element of the array is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * client.getQueue({name: formattedName})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  getQueue: MethodOverload<NamedRequest, Queue>;
+
+  /**
+   * Creates a queue.
+   *
+   * Queues created with this method allow tasks to live for a maximum of 31
+   * days. After a task is 31 days old, the task will be deleted regardless of whether
+   * it was dispatched or not.
+   *
+   * WARNING: Using this method may have unintended side effects if you are
+   * using an App Engine `queue.yaml` or `queue.xml` file to manage your queues.
+   * Read
+   * [Overview of Queue Management and queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml)
+   * before using this method.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.parent
+   *   Required.
+   *
+   *   The location name in which the queue will be created.
+   *   For example: `projects/PROJECT_ID/locations/LOCATION_ID`
+   *
+   *   The list of allowed locations can be obtained by calling Cloud
+   *   Tasks' implementation of
+   *   ListLocations.
+   * @param request.queue
+   *   Required.
+   *
+   *   The queue to create.
+   *
+   *   Queue's name cannot be the same as an existing queue.
+   *
+   *   This object should have the same structure as [Queue]{@link google.cloud.tasks.v2beta3.Queue}
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The first element of the array is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedParent = client.locationPath('[PROJECT]', '[LOCATION]');
+   * const queue = {};
+   * const request = {
+   *   parent: formattedParent,
+   *   queue: queue,
+   * };
+   * client.createQueue(request)
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  createQueue: MethodOverload<
+    CreateNamedRequest<"queue", Partial<Queue>>,
+    Queue
+  >;
+
+  /**
+   * Updates a queue.
+   *
+   * This method creates the queue if it does not exist and updates
+   * the queue if it does exist.
+   *
+   * Queues created with this method allow tasks to live for a maximum of 31
+   * days. After a task is 31 days old, the task will be deleted regardless of whether
+   * it was dispatched or not.
+   *
+   * WARNING: Using this method may have unintended side effects if you are
+   * using an App Engine `queue.yaml` or `queue.xml` file to manage your queues.
+   * Read
+   * [Overview of Queue Management and queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml)
+   * before using this method.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.queue
+   *   Required.
+   *
+   *   The queue to create or update.
+   *
+   *   The queue's name must be specified.
+   *
+   *   Output only fields cannot be modified using UpdateQueue.
+   *   Any value specified for an output only field will be ignored.
+   *   The queue's name cannot be changed.
+   *
+   *   This object should have the same structure as [Queue]{@link google.cloud.tasks.v2beta3.Queue}
+   * @param [request.updateMask]
+   *   A mask used to specify which fields of the queue are being updated.
+   *
+   *   If empty, then all fields will be updated.
+   *
+   *   This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask}
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The first element of the array is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const queue = {};
+   * client.updateQueue({queue: queue})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  updateQueue: MethodOverload<
+    UpdateNamedRequest<
+      "queue",
+      EnhancedPick<
+        Queue,
+        "name",
+        "appEngineHttpQueue" | "rateLimits" | "retryConfig"
+      >
+    >,
+    Queue
+  >;
+
+  /**
+   * Deletes a queue.
+   *
+   * This command will delete the queue even if it has tasks in it.
+   *
+   * Note: If you delete a queue, a queue with the same name can't be created
+   * for 7 days.
+   *
+   * WARNING: Using this method may have unintended side effects if you are
+   * using an App Engine `queue.yaml` or `queue.xml` file to manage your queues.
+   * Read
+   * [Overview of Queue Management and queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml)
+   * before using this method.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The queue name. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * client.deleteQueue({name: formattedName}).catch(err => {
+   *   console.error(err);
+   * });
+   */
+  deleteQueue: MethodOverload<NamedRequest, void>;
+
+  /**
+   * Purges a queue by deleting all of its tasks.
+   *
+   * All tasks created before this method is called are permanently deleted.
+   *
+   * Purge operations can take up to one minute to take effect. Tasks
+   * might be dispatched before the purge takes effect. A purge is irreversible.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The queue name. For example:
+   *   `projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The first element of the array is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * client.purgeQueue({name: formattedName})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  purgeQueue: MethodOverload<NamedRequest, Queue>;
+
+  /**
+   * Pauses the queue.
+   *
+   * If a queue is paused then the system will stop dispatching tasks
+   * until the queue is resumed via
+   * ResumeQueue. Tasks can still be added
+   * when the queue is paused. A queue is paused if its
+   * state is PAUSED.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The queue name. For example:
+   *   `projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The first element of the array is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * client.pauseQueue({name: formattedName})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  pauseQueue: MethodOverload<NamedRequest, Queue>;
+
+  /**
+   * Resume a queue.
+   *
+   * This method resumes a queue after it has been
+   * PAUSED or
+   * DISABLED. The state of a queue is stored
+   * in the queue's state; after calling this method it
+   * will be set to RUNNING.
+   *
+   * WARNING: Resuming many high-QPS queues at the same time can
+   * lead to target overloading. If you are resuming high-QPS
+   * queues, follow the 500/50/5 pattern described in
+   * [Managing Cloud Tasks Scaling Risks](https://cloud.google.com/tasks/docs/manage-cloud-task-scaling).
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The queue name. For example:
+   *   `projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The first element of the array is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * client.resumeQueue({name: formattedName})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  resumeQueue: MethodOverload<NamedRequest, Queue>;
+
+  /**
+   * Gets the access control policy for a Queue.
+   * Returns an empty policy if the resource exists and does not have a policy
+   * set.
+   *
+   * Authorization requires the following
+   * [Google IAM](https://cloud.google.com/iam) permission on the specified
+   * resource parent:
+   *
+   * * `cloudtasks.queues.getIamPolicy`
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.resource
+   *   REQUIRED: The resource for which the policy is being requested.
+   *   `resource` is usually specified as a path. For example, a Project
+   *   resource is specified as `projects/{project}`.
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}.
+   *   The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedResource = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * client.getIamPolicy({resource: formattedResource})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  getIamPolicy: MethodOverload<ResourceRequest, Policy>;
+
+  /**
+   * Sets the access control policy for a Queue. Replaces any existing
+   * policy.
+   *
+   * Note: The Cloud Console does not check queue-level IAM permissions yet.
+   * Project-level permissions are required to use the Cloud Console.
+   *
+   * Authorization requires the following
+   * [Google IAM](https://cloud.google.com/iam) permission on the specified
+   * resource parent:
+   *
+   * * `cloudtasks.queues.setIamPolicy`
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.resource
+   *   REQUIRED: The resource for which the policy is being specified.
+   *   `resource` is usually specified as a path. For example, a Project
+   *   resource is specified as `projects/{project}`.
+   * @param request.policy
+   *   REQUIRED: The complete policy to be applied to the `resource`. The size of
+   *   the policy is limited to a few 10s of KB. An empty policy is a
+   *   valid policy but certain Cloud Platform services (such as Projects)
+   *   might reject them.
+   *
+   *   This object should have the same structure as [Policy]{@link google.iam.v1.Policy}
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}.
+   *   The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedResource = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * const policy = {};
+   * const request = {
+   *   resource: formattedResource,
+   *   policy: policy,
+   * };
+   * client.setIamPolicy(request)
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  setIamPolicy: MethodOverload<ResourceRequest & SetIamPolicyRequest, Policy>;
+
+  /**
+   * Returns permissions that a caller has on a Queue.
+   * If the resource does not exist, this will return an empty set of
+   * permissions, not a NOT_FOUND error.
+   *
+   * Note: This operation is designed to be used for building permission-aware
+   * UIs and command-line tools, not for authorization checking. This operation
+   * may "fail open" without warning.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.resource
+   *   REQUIRED: The resource for which the policy detail is being requested.
+   *   `resource` is usually specified as a path. For example, a Project
+   *   resource is specified as `projects/{project}`.
+   * @param request.permissions
+   *   The set of permissions to check for the `resource`. Permissions with
+   *   wildcards (such as '*' or 'storage.*') are not allowed. For more
+   *   information see
+   *   [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions).
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}.
+   *   The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedResource = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * const permissions = [];
+   * const request = {
+   *   resource: formattedResource,
+   *   permissions: permissions,
+   * };
+   * client.testIamPermissions(request)
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  testIamPermissions: MethodOverload<
+    ResourceRequest & TestIamPermissionsRequest,
+    TestIamPermissionsResponse
+  >;
+
+  /**
+   * Lists the tasks in a queue.
+   *
+   * By default, only the BASIC view is retrieved
+   * due to performance considerations;
+   * response_view controls the
+   * subset of information which is returned.
+   *
+   * The tasks may be returned in any order. The ordering may change at any
+   * time.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.parent
+   *   Required.
+   *
+   *   The queue name. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+   * @param [request.responseView]
+   *   The response_view specifies which subset of the Task will be
+   *   returned.
+   *
+   *   By default response_view is BASIC; not all
+   *   information is retrieved by default because some data, such as
+   *   payloads, might be desirable to return only when needed because
+   *   of its large size or because of the sensitivity of data that it
+   *   contains.
+   *
+   *   Authorization for FULL requires
+   *   `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+   *   permission on the Task resource.
+   *
+   *   The number should be among the values of [View]{@link google.cloud.tasks.v2beta3.View}
+   * @param [request.pageSize]
+   *   The maximum number of resources contained in the underlying API
+   *   response. If page streaming is performed per-resource, this
+   *   parameter does not affect the return value. If page streaming is
+   *   performed per-page, this determines the maximum number of
+   *   resources in a page.
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is Array of [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *
+   *   When autoPaginate: false is specified through options, it contains the result
+   *   in a single response. If the response indicates the next page exists, the third
+   *   parameter is set to be used for the next request object. The fourth parameter keeps
+   *   the raw response object of an object representing [ListTasksResponse]{@link google.cloud.tasks.v2beta3.ListTasksResponse}.
+   *   The first element of the array is Array of [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *
+   *   When autoPaginate: false is specified through options, the array has three elements.
+   *   The first element is Array of [Task]{@link google.cloud.tasks.v2beta3.Task} in a single response.
+   *   The second element is the next request object if the response
+   *   indicates the next page exists, or null. The third element is
+   *   an object representing [ListTasksResponse]{@link google.cloud.tasks.v2beta3.ListTasksResponse}.
+   *
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * // Iterate over all elements.
+   * const formattedParent = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   *
+   * client.listTasks({parent: formattedParent})
+   *   .then(responses => {
+   *     const resources = responses[0];
+   *     for (let i = 0; i < resources.length; i += 1) {
+   *       // doThingsWith(resources[i])
+   *     }
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   *
+   * // Or obtain the paged response.
+   * const formattedParent = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   *
+   *
+   * const options = {autoPaginate: false};
+   * const callback = responses => {
+   *   // The actual resources in a response.
+   *   const resources = responses[0];
+   *   // The next request if the response shows that there are more responses.
+   *   const nextRequest = responses[1];
+   *   // The actual response object, if necessary.
+   *   // const rawResponse = responses[2];
+   *   for (let i = 0; i < resources.length; i += 1) {
+   *     // doThingsWith(resources[i]);
+   *   }
+   *   if (nextRequest) {
+   *     // Fetch the next page.
+   *     return client.listTasks(nextRequest, options).then(callback);
+   *   }
+   * }
+   * client.listTasks({parent: formattedParent}, options)
+   *   .then(callback)
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  listTasks: PaginatedMethodOverload<
+    ListRequestObject & RunTaskRequest,
+    Task[],
+    ListTasksResponse
+  >;
+
+  /**
+   * Equivalent to {@link listTasks}, but returns a NodeJS Stream object.
+   *
+   * This fetches the paged responses for {@link listTasks} continuously
+   * and invokes the callback registered for 'data' event for each element in the
+   * responses.
+   *
+   * The returned object has 'end' method when no more elements are required.
+   *
+   * autoPaginate option will be ignored.
+   *
+   * @see {@link https://nodejs.org/api/stream.html}
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.parent
+   *   Required.
+   *
+   *   The queue name. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+   * @param [request.responseView]
+   *   The response_view specifies which subset of the Task will be
+   *   returned.
+   *
+   *   By default response_view is BASIC; not all
+   *   information is retrieved by default because some data, such as
+   *   payloads, might be desirable to return only when needed because
+   *   of its large size or because of the sensitivity of data that it
+   *   contains.
+   *
+   *   Authorization for FULL requires
+   *   `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+   *   permission on the Task resource.
+   *
+   *   The number should be among the values of [View]{@link google.cloud.tasks.v2beta3.View}
+   * @param [request.pageSize]
+   *   The maximum number of resources contained in the underlying API
+   *   response. If page streaming is performed per-resource, this
+   *   parameter does not affect the return value. If page streaming is
+   *   performed per-page, this determines the maximum number of
+   *   resources in a page.
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   *   An object stream which emits an object representing [Task]{@link google.cloud.tasks.v2beta3.Task} on 'data' event.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedParent = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * client.listTasksStream({parent: formattedParent})
+   *   .on('data', element => {
+   *     // doThingsWith(element)
+   *   }).on('error', err => {
+   *     console.log(err);
+   *   });
+   */
+  listTasksStream(
+    request: ListRequestObject & RunTaskRequest,
+    options?: CallOptions
+  ): Transform;
+
+  /**
+   * Gets a task.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The task name. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`
+   * @param [request.responseView]
+   *   The response_view specifies which subset of the Task will be
+   *   returned.
+   *
+   *   By default response_view is BASIC; not all
+   *   information is retrieved by default because some data, such as
+   *   payloads, might be desirable to return only when needed because
+   *   of its large size or because of the sensitivity of data that it
+   *   contains.
+   *
+   *   Authorization for FULL requires
+   *   `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+   *   permission on the Task resource.
+   *
+   *   The number should be among the values of [View]{@link google.cloud.tasks.v2beta3.View}
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *   The first element of the array is an object representing [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.taskPath('[PROJECT]', '[LOCATION]', '[QUEUE]', '[TASK]');
+   * client.getTask({name: formattedName})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  getTask: MethodOverload<NamedRequest & RunTaskRequest, Task>;
+  /**
+   * Creates a task and adds it to a queue.
+   *
+   * Tasks cannot be updated after creation; there is no UpdateTask command.
+   *
+   * * For App Engine queues, the maximum task size is
+   *   100KB.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.parent
+   *   Required.
+   *
+   *   The queue name. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+   *
+   *   The queue must already exist.
+   * @param request.task
+   *   Required.
+   *
+   *   The task to add.
+   *
+   *   Task names have the following format:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`.
+   *   The user can optionally specify a task name. If a
+   *   name is not specified then the system will generate a random
+   *   unique task id, which will be set in the task returned in the
+   *   response.
+   *
+   *   If schedule_time is not set or is in the
+   *   past then Cloud Tasks will set it to the current time.
+   *
+   *   Task De-duplication:
+   *
+   *   Explicitly specifying a task ID enables task de-duplication.  If
+   *   a task's ID is identical to that of an existing task or a task
+   *   that was deleted or executed recently then the call will fail
+   *   with ALREADY_EXISTS.
+   *   If the task's queue was created using Cloud Tasks, then another task with
+   *   the same name can't be created for ~1hour after the original task was
+   *   deleted or executed. If the task's queue was created using queue.yaml or
+   *   queue.xml, then another task with the same name can't be created
+   *   for ~9days after the original task was deleted or executed.
+   *
+   *   Because there is an extra lookup cost to identify duplicate task
+   *   names, these CreateTask calls have significantly
+   *   increased latency. Using hashed strings for the task id or for
+   *   the prefix of the task id is recommended. Choosing task ids that
+   *   are sequential or have sequential prefixes, for example using a
+   *   timestamp, causes an increase in latency and error rates in all
+   *   task commands. The infrastructure relies on an approximately
+   *   uniform distribution of task ids to store and serve tasks
+   *   efficiently.
+   *
+   *   This object should have the same structure as [Task]{@link google.cloud.tasks.v2beta3.Task}
+   * @param [request.responseView]
+   *   The response_view specifies which subset of the Task will be
+   *   returned.
+   *
+   *   By default response_view is BASIC; not all
+   *   information is retrieved by default because some data, such as
+   *   payloads, might be desirable to return only when needed because
+   *   of its large size or because of the sensitivity of data that it
+   *   contains.
+   *
+   *   Authorization for FULL requires
+   *   `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+   *   permission on the Task resource.
+   *
+   *   The number should be among the values of [View]{@link google.cloud.tasks.v2beta3.View}
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *   The first element of the array is an object representing [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedParent = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * const task = {};
+   * const request = {
+   *   parent: formattedParent,
+   *   task: task,
+   * };
+   * client.createTask(request)
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  createTask: MethodOverload<CreateTaskRequest, Task>;
+
+  /**
+   * Deletes a task.
+   *
+   * A task can be deleted if it is scheduled or dispatched. A task
+   * cannot be deleted if it has executed successfully or permanently
+   * failed.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The task name. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.taskPath('[PROJECT]', '[LOCATION]', '[QUEUE]', '[TASK]');
+   * client.deleteTask({name: formattedName}).catch(err => {
+   *   console.error(err);
+   * });
+   */
+  deleteTask: MethodOverload<NamedRequest, void>;
+
+  /**
+   * Forces a task to run now.
+   *
+   * When this method is called, Cloud Tasks will dispatch the task, even if
+   * the task is already running, the queue has reached its RateLimits or
+   * is PAUSED.
+   *
+   * This command is meant to be used for manual debugging. For
+   * example, RunTask can be used to retry a failed
+   * task after a fix has been made or to manually force a task to be
+   * dispatched now.
+   *
+   * The dispatched task is returned. That is, the task that is returned
+   * contains the status after the task is dispatched but
+   * before the task is received by its target.
+   *
+   * If Cloud Tasks receives a successful response from the task's
+   * target, then the task will be deleted; otherwise the task's
+   * schedule_time will be reset to the time that
+   * RunTask was called plus the retry delay specified
+   * in the queue's RetryConfig.
+   *
+   * RunTask returns
+   * NOT_FOUND when it is called on a
+   * task that has already succeeded or permanently failed.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The task name. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`
+   * @param [request.responseView]
+   *   The response_view specifies which subset of the Task will be
+   *   returned.
+   *
+   *   By default response_view is BASIC; not all
+   *   information is retrieved by default because some data, such as
+   *   payloads, might be desirable to return only when needed because
+   *   of its large size or because of the sensitivity of data that it
+   *   contains.
+   *
+   *   Authorization for FULL requires
+   *   `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+   *   permission on the Task resource.
+   *
+   *   The number should be among the values of [View]{@link google.cloud.tasks.v2beta3.View}
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *   The first element of the array is an object representing [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.taskPath('[PROJECT]', '[LOCATION]', '[QUEUE]', '[TASK]');
+   * client.runTask({name: formattedName})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  runTask: MethodOverload<NamedRequest & RunTaskRequest, Task>;
+
+  // --------------------
+  // -- Path templates --
+  // --------------------
+
+  /**
+   * Return a fully-qualified project resource name string.
+   *
+   * @param project
+   */
+  projectPath(project: string): string;
+
+  /**
+   * Return a fully-qualified location resource name string.
+   *
+   * @param project
+   * @param location
+   */
+  locationPath(project: string, location: string): string;
+
+  /**
+   * Return a fully-qualified queue resource name string.
+   *
+   * @param project
+   * @param location
+   * @param queue
+   */
+  queuePath(project: string, location: string, queue: string): string;
+
+  /**
+   * Return a fully-qualified task resource name string.
+   *
+   * @param project
+   * @param location
+   * @param queue
+   * @param task
+   */
+  taskPath(
+    project: string,
+    location: string,
+    queue: string,
+    task: string
+  ): string;
+
+  /**
+   * Parse the projectName from a project resource.
+   *
+   * @param projectName
+   *   A fully-qualified path representing a project resources.
+   */
+  matchProjectFromProjectName(projectName: string): string;
+
+  /**
+   * Parse the locationName from a location resource.
+   *
+   * @param locationName
+   *   A fully-qualified path representing a location resources.
+   */
+  matchProjectFromLocationName(locationName: string): string;
+
+  /**
+   * Parse the locationName from a location resource.
+   *
+   * @param locationName
+   *   A fully-qualified path representing a location resources.
+   */
+  matchLocationFromLocationName(locationName: string): string;
+
+  /**
+   * Parse the queueName from a queue resource.
+   *
+   * @param queueName
+   *   A fully-qualified path representing a queue resources.
+   */
+  matchProjectFromQueueName(queueName: string): string;
+
+  /**
+   * Parse the queueName from a queue resource.
+   *
+   * @param queueName
+   *   A fully-qualified path representing a queue resources.
+   */
+  matchLocationFromQueueName(queueName: string): string;
+
+  /**
+   * Parse the queueName from a queue resource.
+   *
+   * @param queueName
+   *   A fully-qualified path representing a queue resources.
+   */
+  matchQueueFromQueueName(queueName: string): string;
+
+  /**
+   * Parse the taskName from a task resource.
+   *
+   * @param taskName
+   *   A fully-qualified path representing a task resources.
+   */
+  matchProjectFromTaskName(taskName: string): string;
+
+  /**
+   * Parse the taskName from a task resource.
+   *
+   * @param taskName
+   *   A fully-qualified path representing a task resources.
+   */
+  matchLocationFromTaskName(taskName: string): string;
+
+  /**
+   * Parse the taskName from a task resource.
+   *
+   * @param taskName
+   *   A fully-qualified path representing a task resources.
+   */
+  matchQueueFromTaskName(taskName: string): string;
+
+  /**
+   * Parse the taskName from a task resource.
+   *
+   * @param taskName
+   *   A fully-qualified path representing a task resources.
+   */
+  matchTaskFromTaskName(taskName: string): string;
+}
diff --git a/types/google-cloud__tasks/package.json b/types/google-cloud__tasks/package.json
new file mode 100644
index 0000000000..c4a850824a
--- /dev/null
+++ b/types/google-cloud__tasks/package.json
@@ -0,0 +1,14 @@
+{
+    "private": true,
+    "dependencies": {
+        "google-gax": "^0.22.1"
+    },
+    "types": "index",
+    "typesVersions": {
+        ">=3.1.0-0": {
+            "*": [
+                "ts3.1/*"
+            ]
+        }
+    }
+}
diff --git a/types/google-cloud__tasks/ts3.1/google-cloud__tasks-tests.ts b/types/google-cloud__tasks/ts3.1/google-cloud__tasks-tests.ts
new file mode 100644
index 0000000000..94a7ebcfa4
--- /dev/null
+++ b/types/google-cloud__tasks/ts3.1/google-cloud__tasks-tests.ts
@@ -0,0 +1,21 @@
+import Tasks, { Queue } from "@google-cloud/tasks";
+
+const client = new Tasks({});
+
+// $ExpectError
+const failedClient = new Tasks({ unrecognized: "" });
+
+const formattedParent = client.locationPath("[PROJECT]", "[LOCATION]");
+const queue: Partial<Queue> = {};
+const request = {
+  parent: formattedParent,
+  queue
+};
+client
+  .createQueue(request)
+  .then(([queue]) => {
+    const q = queue;
+  })
+  .catch(err => {
+    console.error(err);
+  });
diff --git a/types/google-cloud__tasks/ts3.1/index.d.ts b/types/google-cloud__tasks/ts3.1/index.d.ts
new file mode 100644
index 0000000000..6b09fdd06d
--- /dev/null
+++ b/types/google-cloud__tasks/ts3.1/index.d.ts
@@ -0,0 +1,1622 @@
+/// <reference types="node" />
+
+import { Transform } from "stream";
+import {
+  GoogleAuthOptions,
+  GoogleError,
+  CallOptions,
+  GoogleAuth
+} from "google-gax";
+
+export interface CloudTasksConfig extends GoogleAuthOptions {
+  key?: string;
+  autoRetry?: boolean;
+  maxRetries?: number;
+  libName?: string;
+  libVersion?: string;
+  promise?: PromiseConstructor;
+}
+
+export interface AppEngineHttpQueue {
+  appEngineRoutingOverride: AppEngineRouting;
+}
+
+export interface AppEngineHttpRequest {
+  appEngineRouting: AppEngineRouting;
+  body: string;
+  headers: {
+    [key: string]: string;
+  };
+  httpMethod: string;
+  relativeUri: string;
+}
+
+export interface AppEngineRouting {
+  host: string;
+  instance: string;
+  service: string;
+  version: string;
+}
+
+export interface Attempt {
+  dispatchTime: string;
+  responseStatus: Status;
+  responseTime: string;
+  scheduleTime: string;
+}
+
+export interface Binding {
+  condition: Expr;
+  members: string[];
+  role: string;
+}
+
+export interface CreateTaskRequest {
+  responseView: View;
+  task: Partial<Task>;
+}
+
+export interface Expr {
+  description: string;
+  expression: string;
+  location: string;
+  title: string;
+}
+
+export interface ListLocationsResponse {
+  locations: Location[];
+  nextPageToken?: string;
+}
+
+export interface ListQueuesResponse {
+  nextPageToken?: string;
+  queues: Queue[];
+}
+
+export interface ListTasksResponse {
+  nextPageToken?: string;
+  tasks: Task[];
+}
+
+export interface Location {
+  displayName: string;
+  labels: {
+    [key: string]: string;
+  };
+  locationId: string;
+  metadata: object;
+  name: string;
+}
+
+export interface Policy {
+  bindings: Binding[];
+  etag: string;
+  version: number;
+}
+
+export interface Queue {
+  appEngineHttpQueue: AppEngineHttpQueue;
+  name: string;
+  purgeTime: string;
+  rateLimits: RateLimits;
+  retryConfig: RetryConfig;
+  state: string;
+}
+
+export interface RateLimits {
+  maxBurstSize: number;
+  maxConcurrentDispatches: number;
+  maxDispatchesPerSecond: number;
+}
+
+export interface RetryConfig {
+  maxAttempts: number;
+  maxBackoff: string;
+  maxDoublings: number;
+  maxRetryDuration: string;
+  minBackoff: string;
+}
+
+export interface RunTaskRequest {
+  responseView?: View;
+}
+
+export interface SetIamPolicyRequest {
+  policy: Partial<Policy>;
+}
+
+export interface Status {
+  code: number;
+  details: object[];
+  message: string;
+}
+
+/**
+ * `VIEW_UNSPECIFIED = 0;`
+ * When Unspecified. Defaults to the behaviour of BASIC.
+ *
+ * `BASIC = 1;`
+ * The basic view omits fields which can be large or can contain
+ * sensitive data.
+ * This view does not include the
+ * ([payload in AppEngineHttpRequest][google.cloud.tasks.v2beta2.AppEngineHttpRequest] and
+ * [payload in PullMessage][google.cloud.tasks.v2beta2.PullMessage.payload]). These payloads are
+ * desirable to return only when needed, because they can be large
+ * and because of the sensitivity of the data that you choose to
+ * store in it.
+ *
+ * `FULL = 2;`
+ * All information is returned.
+ *
+ * Authorization for [FULL][google.cloud.tasks.v2beta2.Task.View.FULL] requires
+ * `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+ * permission on the [Queue][google.cloud.tasks.v2beta2.Queue] resource.
+ */
+export type View = 0 | 1 | 2;
+
+export interface Task {
+  appEngineHttpRequest: AppEngineHttpRequest;
+  createTime: string;
+  dispatchCount: number;
+  firstAttempt: Attempt;
+  lastAttempt: Attempt;
+  name: string;
+  responseCount: number;
+  scheduleTime: string;
+  view: View;
+}
+
+export interface TestIamPermissionsRequest {
+  permissions?: string[];
+}
+
+export interface TestIamPermissionsResponse {
+  permissions?: string[];
+}
+
+export interface PromiseLike<T> extends Promise<T> {
+  /**
+   * Cancel the ongoing promise
+   */
+  cancel(): void;
+}
+
+export type Keys<T> = keyof T;
+
+export type EnhancedPick<
+  T,
+  Req extends keyof T,
+  Opt extends keyof T
+> = Required<Pick<T, Req>> & Partial<Pick<T, Req>>;
+
+export type ProjectIdCallback = (
+  err?: Error | null,
+  projectId?: string | null
+) => void;
+
+export type APICallback<T = any> = (
+  err: GoogleError | null,
+  response?: T
+) => void;
+
+export type APIPaginatedCallback<T = any, U = any, V = any> = (
+  err: GoogleError | null,
+  response?: T,
+  next?: U | null,
+  rawResponse?: V
+) => void;
+
+export interface CallOptionsWithPagination extends CallOptions {
+  autoPaginate: false;
+}
+
+export interface MethodOverload<T, R> {
+  (data: T, options?: CallOptions): PromiseLike<[R]>;
+  (data: T, options: CallOptions, callback: APICallback<R>): void;
+  (data: T, callback: APICallback<R>): void;
+}
+
+export interface PaginatedMethodOverload<T, R, U, V = T> {
+  (data: T, options: CallOptionsWithPagination): PromiseLike<[R, V, U]>;
+  (data: T, options?: CallOptions): PromiseLike<[R]>;
+  (data: T, options: CallOptions, callback: APICallback<R>): void;
+  (
+    data: T,
+    options: CallOptionsWithPagination,
+    callback: APIPaginatedCallback<R, V, U>
+  ): void;
+  (data: T, callback: APICallback<R>): void;
+}
+
+export interface ParentRequest {
+  /**
+   * The location name. For example: projects/PROJECT_ID/locations/LOCATION_ID
+   */
+  parent: string;
+}
+
+export interface ResourceRequest {
+  /**
+   * The resource for which the policy is being requested. resource is usually specified as a path. For example, a Project resource is specified as projects/{project}.
+   */
+  resource: string;
+}
+
+export interface ListRequestObject extends ParentRequest {
+  /**
+   * `filter` can be used to specify a subset of queues. Any Queue field can be used as a filter and several operators as supported.
+   * For example: <=, <, >=, >, !=, =, :. The filter syntax is the same as described in Stackdriver's Advanced Logs Filters.
+   * Sample filter "state: PAUSED".
+   * Note that using filters might cause fewer queues than the requested page_size to be returned.
+   */
+  filter?: string;
+
+  /**
+   * The maximum number of resources contained in the underlying API response. If page streaming is performed per-resource,
+   * this parameter does not affect the return value. If page streaming is performed per-page, this determines the maximum number of resources in a page.
+   */
+  pageSize?: number;
+}
+
+export interface NamedRequest {
+  /**
+   * The resource name of the queue. For example: projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID
+   */
+  name: string;
+}
+
+export type CreateNamedRequest<N extends string, T> = ParentRequest &
+  { [P in N]: T };
+export type UpdateNamedRequest<N extends string, T> = ParentRequest &
+  { [P in N]: T };
+
+/**
+ * Cloud Tasks allows developers to manage the execution of background
+ * work in their applications.
+ */
+export default class CloudTasksClient {
+  /**
+   * The DNS address for this API service.
+   * @default 'cloudtasks.googleapis.com'
+   */
+  static readonly servicePath: string;
+
+  /**
+   * The port for this API service.
+   * @default 443
+   */
+  static readonly port: number;
+
+  /**
+   * The scopes needed to make gRPC calls for every method defined
+   * in this service.
+   * @default ["https://www.googleapis.com/auth/cloud-platform"]
+   */
+  static readonlyscopes: string;
+
+  auth: GoogleAuth;
+
+  /**
+   * Construct an instance of CloudTasksClient.
+   *
+   * @param [options] - The configuration object. See the subsequent
+   *   parameters for more details.
+   * @param [options.credentials] - Credentials object.
+   * @param [options.credentials.client_email]
+   * @param [options.credentials.private_key]
+   * @param [options.email] - Account email address. Required when
+   *     using a .pem or .p12 keyFilename.
+   * @param [options.keyFilename] - Full path to the a .json, .pem, or
+   *     .p12 key downloaded from the Google Developers Console. If you provide
+   *     a path to a JSON file, the projectId option below is not necessary.
+   *     NOTE: .pem and .p12 require you to specify options.email as well.
+   * @param [options.port] - The port on which to connect to
+   *     the remote host.
+   * @param [options.projectId] - The project ID from the Google
+   *     Developer's Console, e.g. 'grape-spaceship-123'. We will also check
+   *     the environment variable GCLOUD_PROJECT for your project ID. If your
+   *     app is running in an environment which supports
+   *     {@link https://developers.google.com/identity/protocols/application-default-credentials Application Default Credentials},
+   *     your project ID will be detected automatically.
+   * @param [options.promise] - Custom promise module to use instead
+   *     of native Promises.
+   * @param [options.servicePath] - The domain name of the
+   *     API remote host.
+   */
+  constructor(config: CloudTasksConfig);
+
+  /**
+   * Return the project ID used by this class.
+   * @param callback - the callback to
+   *   be called with the current project Id.
+   */
+  getProjectId(): PromiseLike<string>;
+  getProjectId(callback: ProjectIdCallback): void;
+
+  // -------------------
+  // -- Service calls --
+  // -------------------
+
+  /**
+   * Lists queues.
+   *
+   * Queues are returned in lexicographical order.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.parent
+   *   Required.
+   *
+   *   The location name.
+   *   For example: `projects/PROJECT_ID/locations/LOCATION_ID`
+   * @param [request.filter]
+   *   `filter` can be used to specify a subset of queues. Any Queue
+   *   field can be used as a filter and several operators as supported.
+   *   For example: `<=, <, >=, >, !=, =, :`. The filter syntax is the same as
+   *   described in
+   *   [Stackdriver's Advanced Logs Filters](https://cloud.google.com/logging/docs/view/advanced_filters).
+   *
+   *   Sample filter "state: PAUSED".
+   *
+   *   Note that using filters might cause fewer queues than the
+   *   requested page_size to be returned.
+   * @param [request.pageSize]
+   *   The maximum number of resources contained in the underlying API
+   *   response. If page streaming is performed per-resource, this
+   *   parameter does not affect the return value. If page streaming is
+   *   performed per-page, this determines the maximum number of
+   *   resources in a page.
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is Array of [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *
+   *   When autoPaginate: false is specified through options, it contains the result
+   *   in a single response. If the response indicates the next page exists, the third
+   *   parameter is set to be used for the next request object. The fourth parameter keeps
+   *   the raw response object of an object representing [ListQueuesResponse]{@link google.cloud.tasks.v2beta3.ListQueuesResponse}.
+   *   The first element of the array is Array of [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *
+   *   When autoPaginate: false is specified through options, the array has three elements.
+   *   The first element is Array of [Queue]{@link google.cloud.tasks.v2beta3.Queue} in a single response.
+   *   The second element is the next request object if the response
+   *   indicates the next page exists, or null. The third element is
+   *   an object representing [ListQueuesResponse]{@link google.cloud.tasks.v2beta3.ListQueuesResponse}.
+   *
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * // Iterate over all elements.
+   * const formattedParent = client.locationPath('[PROJECT]', '[LOCATION]');
+   *
+   * client.listQueues({parent: formattedParent})
+   *   .then(responses => {
+   *     const resources = responses[0];
+   *     for (let i = 0; i < resources.length; i += 1) {
+   *       // doThingsWith(resources[i])
+   *     }
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   *
+   * // Or obtain the paged response.
+   * const formattedParent = client.locationPath('[PROJECT]', '[LOCATION]');
+   *
+   *
+   * const options = {autoPaginate: false};
+   * const callback = responses => {
+   *   // The actual resources in a response.
+   *   const resources = responses[0];
+   *   // The next request if the response shows that there are more responses.
+   *   const nextRequest = responses[1];
+   *   // The actual response object, if necessary.
+   *   // const rawResponse = responses[2];
+   *   for (let i = 0; i < resources.length; i += 1) {
+   *     // doThingsWith(resources[i]);
+   *   }
+   *   if (nextRequest) {
+   *     // Fetch the next page.
+   *     return client.listQueues(nextRequest, options).then(callback);
+   *   }
+   * }
+   * client.listQueues({parent: formattedParent}, options)
+   *   .then(callback)
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  listQueues: PaginatedMethodOverload<
+    ListRequestObject,
+    Queue[],
+    ListQueuesResponse
+  >;
+
+  /**
+   * Equivalent to {@link listQueues}, but returns a NodeJS Stream object.
+   *
+   * This fetches the paged responses for {@link listQueues} continuously
+   * and invokes the callback registered for 'data' event for each element in the
+   * responses.
+   *
+   * The returned object has 'end' method when no more elements are required.
+   *
+   * autoPaginate option will be ignored.
+   *
+   * @see {@link https://nodejs.org/api/stream.html}
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.parent
+   *   Required.
+   *
+   *   The location name.
+   *   For example: `projects/PROJECT_ID/locations/LOCATION_ID`
+   * @param [request.filter]
+   *   `filter` can be used to specify a subset of queues. Any Queue
+   *   field can be used as a filter and several operators as supported.
+   *   For example: `<=, <, >=, >, !=, =, :`. The filter syntax is the same as
+   *   described in
+   *   [Stackdriver's Advanced Logs Filters](https://cloud.google.com/logging/docs/view/advanced_filters).
+   *
+   *   Sample filter "state: PAUSED".
+   *
+   *   Note that using filters might cause fewer queues than the
+   *   requested page_size to be returned.
+   * @param [request.pageSize]
+   *   The maximum number of resources contained in the underlying API
+   *   response. If page streaming is performed per-resource, this
+   *   parameter does not affect the return value. If page streaming is
+   *   performed per-page, this determines the maximum number of
+   *   resources in a page.
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   *   An object stream which emits an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue} on 'data' event.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedParent = client.locationPath('[PROJECT]', '[LOCATION]');
+   * client.listQueuesStream({parent: formattedParent})
+   *   .on('data', element => {
+   *     // doThingsWith(element)
+   *   }).on('error', err => {
+   *     console.log(err);
+   *   });
+   */
+  listQueuesStream(
+    request: ListRequestObject,
+    options?: CallOptions
+  ): Transform;
+
+  /**
+   * Gets a queue.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The resource name of the queue. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The first element of the array is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * client.getQueue({name: formattedName})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  getQueue: MethodOverload<NamedRequest, Queue>;
+
+  /**
+   * Creates a queue.
+   *
+   * Queues created with this method allow tasks to live for a maximum of 31
+   * days. After a task is 31 days old, the task will be deleted regardless of whether
+   * it was dispatched or not.
+   *
+   * WARNING: Using this method may have unintended side effects if you are
+   * using an App Engine `queue.yaml` or `queue.xml` file to manage your queues.
+   * Read
+   * [Overview of Queue Management and queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml)
+   * before using this method.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.parent
+   *   Required.
+   *
+   *   The location name in which the queue will be created.
+   *   For example: `projects/PROJECT_ID/locations/LOCATION_ID`
+   *
+   *   The list of allowed locations can be obtained by calling Cloud
+   *   Tasks' implementation of
+   *   ListLocations.
+   * @param request.queue
+   *   Required.
+   *
+   *   The queue to create.
+   *
+   *   Queue's name cannot be the same as an existing queue.
+   *
+   *   This object should have the same structure as [Queue]{@link google.cloud.tasks.v2beta3.Queue}
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The first element of the array is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedParent = client.locationPath('[PROJECT]', '[LOCATION]');
+   * const queue = {};
+   * const request = {
+   *   parent: formattedParent,
+   *   queue: queue,
+   * };
+   * client.createQueue(request)
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  createQueue: MethodOverload<
+    CreateNamedRequest<"queue", Partial<Queue>>,
+    Queue
+  >;
+
+  /**
+   * Updates a queue.
+   *
+   * This method creates the queue if it does not exist and updates
+   * the queue if it does exist.
+   *
+   * Queues created with this method allow tasks to live for a maximum of 31
+   * days. After a task is 31 days old, the task will be deleted regardless of whether
+   * it was dispatched or not.
+   *
+   * WARNING: Using this method may have unintended side effects if you are
+   * using an App Engine `queue.yaml` or `queue.xml` file to manage your queues.
+   * Read
+   * [Overview of Queue Management and queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml)
+   * before using this method.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.queue
+   *   Required.
+   *
+   *   The queue to create or update.
+   *
+   *   The queue's name must be specified.
+   *
+   *   Output only fields cannot be modified using UpdateQueue.
+   *   Any value specified for an output only field will be ignored.
+   *   The queue's name cannot be changed.
+   *
+   *   This object should have the same structure as [Queue]{@link google.cloud.tasks.v2beta3.Queue}
+   * @param [request.updateMask]
+   *   A mask used to specify which fields of the queue are being updated.
+   *
+   *   If empty, then all fields will be updated.
+   *
+   *   This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask}
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The first element of the array is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const queue = {};
+   * client.updateQueue({queue: queue})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  updateQueue: MethodOverload<
+    UpdateNamedRequest<
+      "queue",
+      EnhancedPick<
+        Queue,
+        "name",
+        "appEngineHttpQueue" | "rateLimits" | "retryConfig"
+      >
+    >,
+    Queue
+  >;
+
+  /**
+   * Deletes a queue.
+   *
+   * This command will delete the queue even if it has tasks in it.
+   *
+   * Note: If you delete a queue, a queue with the same name can't be created
+   * for 7 days.
+   *
+   * WARNING: Using this method may have unintended side effects if you are
+   * using an App Engine `queue.yaml` or `queue.xml` file to manage your queues.
+   * Read
+   * [Overview of Queue Management and queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml)
+   * before using this method.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The queue name. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * client.deleteQueue({name: formattedName}).catch(err => {
+   *   console.error(err);
+   * });
+   */
+  deleteQueue: MethodOverload<NamedRequest, void>;
+
+  /**
+   * Purges a queue by deleting all of its tasks.
+   *
+   * All tasks created before this method is called are permanently deleted.
+   *
+   * Purge operations can take up to one minute to take effect. Tasks
+   * might be dispatched before the purge takes effect. A purge is irreversible.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The queue name. For example:
+   *   `projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The first element of the array is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * client.purgeQueue({name: formattedName})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  purgeQueue: MethodOverload<NamedRequest, Queue>;
+
+  /**
+   * Pauses the queue.
+   *
+   * If a queue is paused then the system will stop dispatching tasks
+   * until the queue is resumed via
+   * ResumeQueue. Tasks can still be added
+   * when the queue is paused. A queue is paused if its
+   * state is PAUSED.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The queue name. For example:
+   *   `projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The first element of the array is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * client.pauseQueue({name: formattedName})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  pauseQueue: MethodOverload<NamedRequest, Queue>;
+
+  /**
+   * Resume a queue.
+   *
+   * This method resumes a queue after it has been
+   * PAUSED or
+   * DISABLED. The state of a queue is stored
+   * in the queue's state; after calling this method it
+   * will be set to RUNNING.
+   *
+   * WARNING: Resuming many high-QPS queues at the same time can
+   * lead to target overloading. If you are resuming high-QPS
+   * queues, follow the 500/50/5 pattern described in
+   * [Managing Cloud Tasks Scaling Risks](https://cloud.google.com/tasks/docs/manage-cloud-task-scaling).
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The queue name. For example:
+   *   `projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The first element of the array is an object representing [Queue]{@link google.cloud.tasks.v2beta3.Queue}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * client.resumeQueue({name: formattedName})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  resumeQueue: MethodOverload<NamedRequest, Queue>;
+
+  /**
+   * Gets the access control policy for a Queue.
+   * Returns an empty policy if the resource exists and does not have a policy
+   * set.
+   *
+   * Authorization requires the following
+   * [Google IAM](https://cloud.google.com/iam) permission on the specified
+   * resource parent:
+   *
+   * * `cloudtasks.queues.getIamPolicy`
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.resource
+   *   REQUIRED: The resource for which the policy is being requested.
+   *   `resource` is usually specified as a path. For example, a Project
+   *   resource is specified as `projects/{project}`.
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}.
+   *   The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedResource = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * client.getIamPolicy({resource: formattedResource})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  getIamPolicy: MethodOverload<ResourceRequest, Policy>;
+
+  /**
+   * Sets the access control policy for a Queue. Replaces any existing
+   * policy.
+   *
+   * Note: The Cloud Console does not check queue-level IAM permissions yet.
+   * Project-level permissions are required to use the Cloud Console.
+   *
+   * Authorization requires the following
+   * [Google IAM](https://cloud.google.com/iam) permission on the specified
+   * resource parent:
+   *
+   * * `cloudtasks.queues.setIamPolicy`
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.resource
+   *   REQUIRED: The resource for which the policy is being specified.
+   *   `resource` is usually specified as a path. For example, a Project
+   *   resource is specified as `projects/{project}`.
+   * @param request.policy
+   *   REQUIRED: The complete policy to be applied to the `resource`. The size of
+   *   the policy is limited to a few 10s of KB. An empty policy is a
+   *   valid policy but certain Cloud Platform services (such as Projects)
+   *   might reject them.
+   *
+   *   This object should have the same structure as [Policy]{@link google.iam.v1.Policy}
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}.
+   *   The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedResource = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * const policy = {};
+   * const request = {
+   *   resource: formattedResource,
+   *   policy: policy,
+   * };
+   * client.setIamPolicy(request)
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  setIamPolicy: MethodOverload<ResourceRequest & SetIamPolicyRequest, Policy>;
+
+  /**
+   * Returns permissions that a caller has on a Queue.
+   * If the resource does not exist, this will return an empty set of
+   * permissions, not a NOT_FOUND error.
+   *
+   * Note: This operation is designed to be used for building permission-aware
+   * UIs and command-line tools, not for authorization checking. This operation
+   * may "fail open" without warning.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.resource
+   *   REQUIRED: The resource for which the policy detail is being requested.
+   *   `resource` is usually specified as a path. For example, a Project
+   *   resource is specified as `projects/{project}`.
+   * @param request.permissions
+   *   The set of permissions to check for the `resource`. Permissions with
+   *   wildcards (such as '*' or 'storage.*') are not allowed. For more
+   *   information see
+   *   [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions).
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}.
+   *   The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedResource = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * const permissions = [];
+   * const request = {
+   *   resource: formattedResource,
+   *   permissions: permissions,
+   * };
+   * client.testIamPermissions(request)
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  testIamPermissions: MethodOverload<
+    ResourceRequest & TestIamPermissionsRequest,
+    TestIamPermissionsResponse
+  >;
+
+  /**
+   * Lists the tasks in a queue.
+   *
+   * By default, only the BASIC view is retrieved
+   * due to performance considerations;
+   * response_view controls the
+   * subset of information which is returned.
+   *
+   * The tasks may be returned in any order. The ordering may change at any
+   * time.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.parent
+   *   Required.
+   *
+   *   The queue name. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+   * @param [request.responseView]
+   *   The response_view specifies which subset of the Task will be
+   *   returned.
+   *
+   *   By default response_view is BASIC; not all
+   *   information is retrieved by default because some data, such as
+   *   payloads, might be desirable to return only when needed because
+   *   of its large size or because of the sensitivity of data that it
+   *   contains.
+   *
+   *   Authorization for FULL requires
+   *   `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+   *   permission on the Task resource.
+   *
+   *   The number should be among the values of [View]{@link google.cloud.tasks.v2beta3.View}
+   * @param [request.pageSize]
+   *   The maximum number of resources contained in the underlying API
+   *   response. If page streaming is performed per-resource, this
+   *   parameter does not affect the return value. If page streaming is
+   *   performed per-page, this determines the maximum number of
+   *   resources in a page.
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is Array of [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *
+   *   When autoPaginate: false is specified through options, it contains the result
+   *   in a single response. If the response indicates the next page exists, the third
+   *   parameter is set to be used for the next request object. The fourth parameter keeps
+   *   the raw response object of an object representing [ListTasksResponse]{@link google.cloud.tasks.v2beta3.ListTasksResponse}.
+   *   The first element of the array is Array of [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *
+   *   When autoPaginate: false is specified through options, the array has three elements.
+   *   The first element is Array of [Task]{@link google.cloud.tasks.v2beta3.Task} in a single response.
+   *   The second element is the next request object if the response
+   *   indicates the next page exists, or null. The third element is
+   *   an object representing [ListTasksResponse]{@link google.cloud.tasks.v2beta3.ListTasksResponse}.
+   *
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * // Iterate over all elements.
+   * const formattedParent = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   *
+   * client.listTasks({parent: formattedParent})
+   *   .then(responses => {
+   *     const resources = responses[0];
+   *     for (let i = 0; i < resources.length; i += 1) {
+   *       // doThingsWith(resources[i])
+   *     }
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   *
+   * // Or obtain the paged response.
+   * const formattedParent = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   *
+   *
+   * const options = {autoPaginate: false};
+   * const callback = responses => {
+   *   // The actual resources in a response.
+   *   const resources = responses[0];
+   *   // The next request if the response shows that there are more responses.
+   *   const nextRequest = responses[1];
+   *   // The actual response object, if necessary.
+   *   // const rawResponse = responses[2];
+   *   for (let i = 0; i < resources.length; i += 1) {
+   *     // doThingsWith(resources[i]);
+   *   }
+   *   if (nextRequest) {
+   *     // Fetch the next page.
+   *     return client.listTasks(nextRequest, options).then(callback);
+   *   }
+   * }
+   * client.listTasks({parent: formattedParent}, options)
+   *   .then(callback)
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  listTasks: PaginatedMethodOverload<
+    ListRequestObject & RunTaskRequest,
+    Task[],
+    ListTasksResponse
+  >;
+
+  /**
+   * Equivalent to {@link listTasks}, but returns a NodeJS Stream object.
+   *
+   * This fetches the paged responses for {@link listTasks} continuously
+   * and invokes the callback registered for 'data' event for each element in the
+   * responses.
+   *
+   * The returned object has 'end' method when no more elements are required.
+   *
+   * autoPaginate option will be ignored.
+   *
+   * @see {@link https://nodejs.org/api/stream.html}
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.parent
+   *   Required.
+   *
+   *   The queue name. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+   * @param [request.responseView]
+   *   The response_view specifies which subset of the Task will be
+   *   returned.
+   *
+   *   By default response_view is BASIC; not all
+   *   information is retrieved by default because some data, such as
+   *   payloads, might be desirable to return only when needed because
+   *   of its large size or because of the sensitivity of data that it
+   *   contains.
+   *
+   *   Authorization for FULL requires
+   *   `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+   *   permission on the Task resource.
+   *
+   *   The number should be among the values of [View]{@link google.cloud.tasks.v2beta3.View}
+   * @param [request.pageSize]
+   *   The maximum number of resources contained in the underlying API
+   *   response. If page streaming is performed per-resource, this
+   *   parameter does not affect the return value. If page streaming is
+   *   performed per-page, this determines the maximum number of
+   *   resources in a page.
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   *   An object stream which emits an object representing [Task]{@link google.cloud.tasks.v2beta3.Task} on 'data' event.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedParent = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * client.listTasksStream({parent: formattedParent})
+   *   .on('data', element => {
+   *     // doThingsWith(element)
+   *   }).on('error', err => {
+   *     console.log(err);
+   *   });
+   */
+  listTasksStream(
+    request: ListRequestObject & RunTaskRequest,
+    options?: CallOptions
+  ): Transform;
+
+  /**
+   * Gets a task.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The task name. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`
+   * @param [request.responseView]
+   *   The response_view specifies which subset of the Task will be
+   *   returned.
+   *
+   *   By default response_view is BASIC; not all
+   *   information is retrieved by default because some data, such as
+   *   payloads, might be desirable to return only when needed because
+   *   of its large size or because of the sensitivity of data that it
+   *   contains.
+   *
+   *   Authorization for FULL requires
+   *   `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+   *   permission on the Task resource.
+   *
+   *   The number should be among the values of [View]{@link google.cloud.tasks.v2beta3.View}
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *   The first element of the array is an object representing [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.taskPath('[PROJECT]', '[LOCATION]', '[QUEUE]', '[TASK]');
+   * client.getTask({name: formattedName})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  getTask: MethodOverload<NamedRequest & RunTaskRequest, Task>;
+  /**
+   * Creates a task and adds it to a queue.
+   *
+   * Tasks cannot be updated after creation; there is no UpdateTask command.
+   *
+   * * For App Engine queues, the maximum task size is
+   *   100KB.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.parent
+   *   Required.
+   *
+   *   The queue name. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+   *
+   *   The queue must already exist.
+   * @param request.task
+   *   Required.
+   *
+   *   The task to add.
+   *
+   *   Task names have the following format:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`.
+   *   The user can optionally specify a task name. If a
+   *   name is not specified then the system will generate a random
+   *   unique task id, which will be set in the task returned in the
+   *   response.
+   *
+   *   If schedule_time is not set or is in the
+   *   past then Cloud Tasks will set it to the current time.
+   *
+   *   Task De-duplication:
+   *
+   *   Explicitly specifying a task ID enables task de-duplication.  If
+   *   a task's ID is identical to that of an existing task or a task
+   *   that was deleted or executed recently then the call will fail
+   *   with ALREADY_EXISTS.
+   *   If the task's queue was created using Cloud Tasks, then another task with
+   *   the same name can't be created for ~1hour after the original task was
+   *   deleted or executed. If the task's queue was created using queue.yaml or
+   *   queue.xml, then another task with the same name can't be created
+   *   for ~9days after the original task was deleted or executed.
+   *
+   *   Because there is an extra lookup cost to identify duplicate task
+   *   names, these CreateTask calls have significantly
+   *   increased latency. Using hashed strings for the task id or for
+   *   the prefix of the task id is recommended. Choosing task ids that
+   *   are sequential or have sequential prefixes, for example using a
+   *   timestamp, causes an increase in latency and error rates in all
+   *   task commands. The infrastructure relies on an approximately
+   *   uniform distribution of task ids to store and serve tasks
+   *   efficiently.
+   *
+   *   This object should have the same structure as [Task]{@link google.cloud.tasks.v2beta3.Task}
+   * @param [request.responseView]
+   *   The response_view specifies which subset of the Task will be
+   *   returned.
+   *
+   *   By default response_view is BASIC; not all
+   *   information is retrieved by default because some data, such as
+   *   payloads, might be desirable to return only when needed because
+   *   of its large size or because of the sensitivity of data that it
+   *   contains.
+   *
+   *   Authorization for FULL requires
+   *   `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+   *   permission on the Task resource.
+   *
+   *   The number should be among the values of [View]{@link google.cloud.tasks.v2beta3.View}
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *   The first element of the array is an object representing [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedParent = client.queuePath('[PROJECT]', '[LOCATION]', '[QUEUE]');
+   * const task = {};
+   * const request = {
+   *   parent: formattedParent,
+   *   task: task,
+   * };
+   * client.createTask(request)
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  createTask: MethodOverload<CreateTaskRequest, Task>;
+
+  /**
+   * Deletes a task.
+   *
+   * A task can be deleted if it is scheduled or dispatched. A task
+   * cannot be deleted if it has executed successfully or permanently
+   * failed.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The task name. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.taskPath('[PROJECT]', '[LOCATION]', '[QUEUE]', '[TASK]');
+   * client.deleteTask({name: formattedName}).catch(err => {
+   *   console.error(err);
+   * });
+   */
+  deleteTask: MethodOverload<NamedRequest, void>;
+
+  /**
+   * Forces a task to run now.
+   *
+   * When this method is called, Cloud Tasks will dispatch the task, even if
+   * the task is already running, the queue has reached its RateLimits or
+   * is PAUSED.
+   *
+   * This command is meant to be used for manual debugging. For
+   * example, RunTask can be used to retry a failed
+   * task after a fix has been made or to manually force a task to be
+   * dispatched now.
+   *
+   * The dispatched task is returned. That is, the task that is returned
+   * contains the status after the task is dispatched but
+   * before the task is received by its target.
+   *
+   * If Cloud Tasks receives a successful response from the task's
+   * target, then the task will be deleted; otherwise the task's
+   * schedule_time will be reset to the time that
+   * RunTask was called plus the retry delay specified
+   * in the queue's RetryConfig.
+   *
+   * RunTask returns
+   * NOT_FOUND when it is called on a
+   * task that has already succeeded or permanently failed.
+   *
+   * @param request
+   *   The request object that will be sent.
+   * @param request.name
+   *   Required.
+   *
+   *   The task name. For example:
+   *   `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`
+   * @param [request.responseView]
+   *   The response_view specifies which subset of the Task will be
+   *   returned.
+   *
+   *   By default response_view is BASIC; not all
+   *   information is retrieved by default because some data, such as
+   *   payloads, might be desirable to return only when needed because
+   *   of its large size or because of the sensitivity of data that it
+   *   contains.
+   *
+   *   Authorization for FULL requires
+   *   `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+   *   permission on the Task resource.
+   *
+   *   The number should be among the values of [View]{@link google.cloud.tasks.v2beta3.View}
+   * @param [options]
+   *   Optional parameters. You can override the default settings for this call, e.g, timeout,
+   *   retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details.
+   * @param [callback]
+   *   The function which will be called with the result of the API call.
+   *
+   *   The second parameter to the callback is an object representing [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *   The first element of the array is an object representing [Task]{@link google.cloud.tasks.v2beta3.Task}.
+   *   The promise has a method named "cancel" which cancels the ongoing API call.
+   *
+   * @example
+   *
+   * import CloudTasks from '@google-cloud/tasks';
+   *
+   * const client = new tasks.v2beta3.CloudTasksClient({
+   *   // optional auth parameters.
+   * });
+   *
+   * const formattedName = client.taskPath('[PROJECT]', '[LOCATION]', '[QUEUE]', '[TASK]');
+   * client.runTask({name: formattedName})
+   *   .then(responses => {
+   *     const response = responses[0];
+   *     // doThingsWith(response)
+   *   })
+   *   .catch(err => {
+   *     console.error(err);
+   *   });
+   */
+  runTask: MethodOverload<NamedRequest & RunTaskRequest, Task>;
+
+  // --------------------
+  // -- Path templates --
+  // --------------------
+
+  /**
+   * Return a fully-qualified project resource name string.
+   *
+   * @param project
+   */
+  projectPath(project: string): string;
+
+  /**
+   * Return a fully-qualified location resource name string.
+   *
+   * @param project
+   * @param location
+   */
+  locationPath(project: string, location: string): string;
+
+  /**
+   * Return a fully-qualified queue resource name string.
+   *
+   * @param project
+   * @param location
+   * @param queue
+   */
+  queuePath(project: string, location: string, queue: string): string;
+
+  /**
+   * Return a fully-qualified task resource name string.
+   *
+   * @param project
+   * @param location
+   * @param queue
+   * @param task
+   */
+  taskPath(
+    project: string,
+    location: string,
+    queue: string,
+    task: string
+  ): string;
+
+  /**
+   * Parse the projectName from a project resource.
+   *
+   * @param projectName
+   *   A fully-qualified path representing a project resources.
+   */
+  matchProjectFromProjectName(projectName: string): string;
+
+  /**
+   * Parse the locationName from a location resource.
+   *
+   * @param locationName
+   *   A fully-qualified path representing a location resources.
+   */
+  matchProjectFromLocationName(locationName: string): string;
+
+  /**
+   * Parse the locationName from a location resource.
+   *
+   * @param locationName
+   *   A fully-qualified path representing a location resources.
+   */
+  matchLocationFromLocationName(locationName: string): string;
+
+  /**
+   * Parse the queueName from a queue resource.
+   *
+   * @param queueName
+   *   A fully-qualified path representing a queue resources.
+   */
+  matchProjectFromQueueName(queueName: string): string;
+
+  /**
+   * Parse the queueName from a queue resource.
+   *
+   * @param queueName
+   *   A fully-qualified path representing a queue resources.
+   */
+  matchLocationFromQueueName(queueName: string): string;
+
+  /**
+   * Parse the queueName from a queue resource.
+   *
+   * @param queueName
+   *   A fully-qualified path representing a queue resources.
+   */
+  matchQueueFromQueueName(queueName: string): string;
+
+  /**
+   * Parse the taskName from a task resource.
+   *
+   * @param taskName
+   *   A fully-qualified path representing a task resources.
+   */
+  matchProjectFromTaskName(taskName: string): string;
+
+  /**
+   * Parse the taskName from a task resource.
+   *
+   * @param taskName
+   *   A fully-qualified path representing a task resources.
+   */
+  matchLocationFromTaskName(taskName: string): string;
+
+  /**
+   * Parse the taskName from a task resource.
+   *
+   * @param taskName
+   *   A fully-qualified path representing a task resources.
+   */
+  matchQueueFromTaskName(taskName: string): string;
+
+  /**
+   * Parse the taskName from a task resource.
+   *
+   * @param taskName
+   *   A fully-qualified path representing a task resources.
+   */
+  matchTaskFromTaskName(taskName: string): string;
+}
diff --git a/types/google-cloud__tasks/ts3.1/tsconfig.json b/types/google-cloud__tasks/ts3.1/tsconfig.json
new file mode 100644
index 0000000000..08ba955879
--- /dev/null
+++ b/types/google-cloud__tasks/ts3.1/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "paths": {
+            "@google-cloud/tasks": ["google-cloud__tasks"]
+        },
+        "baseUrl": "../../",
+        "typeRoots": ["../../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "google-cloud__tasks-tests.ts"]
+}
diff --git a/types/google-cloud__tasks/ts3.1/tslint.json b/types/google-cloud__tasks/ts3.1/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/google-cloud__tasks/ts3.1/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/google-cloud__tasks/tsconfig.json b/types/google-cloud__tasks/tsconfig.json
new file mode 100644
index 0000000000..498e1217fc
--- /dev/null
+++ b/types/google-cloud__tasks/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "paths": {
+            "@google-cloud/tasks": ["google-cloud__tasks"]
+        },
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "google-cloud__tasks-tests.ts"]
+}
diff --git a/types/google-cloud__tasks/tslint.json b/types/google-cloud__tasks/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/google-cloud__tasks/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/google-map-react/index.d.ts b/types/google-map-react/index.d.ts
index 56686c94c1..b8a82062bc 100644
--- a/types/google-map-react/index.d.ts
+++ b/types/google-map-react/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for google-map-react 0.23
-// Project: https://github.com/istarkov/google-map-react
+// Project: https://github.com/google-map-react/google-map-react
 // Definitions by: Honza Brecka <https://github.com/honzabrecka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/google.fonts/index.d.ts b/types/google.fonts/index.d.ts
index b5741ff196..45f01ce6f4 100644
--- a/types/google.fonts/index.d.ts
+++ b/types/google.fonts/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Fonts API 1.0
+// Type definitions for non-npm package Google Fonts API 1.0
 // Project: https://developers.google.com/fonts/
 // Definitions by: Dan Marshall <https://github.com/danmarshall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/google.script.client-side/index.d.ts b/types/google.script.client-side/index.d.ts
index 566fbb7397..7d497fd6c2 100644
--- a/types/google.script.client-side/index.d.ts
+++ b/types/google.script.client-side/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script Client-side API 0.0
+// Type definitions for non-npm package Google Apps Script Client-side API 0.0
 // Project: https://developers.google.com/apps-script/guides/html/reference/host
 // Definitions by: clomie <https://github.com/clomie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/google__maps/index.d.ts b/types/google__maps/index.d.ts
index d393286dfe..f1df5d8f38 100644
--- a/types/google__maps/index.d.ts
+++ b/types/google__maps/index.d.ts
@@ -3107,7 +3107,7 @@ export interface QueryAutocompleteResult {
      * contains an `offset` value and a `length`.
      * These describe the location of the entered term in the prediction result text, so that the term can be highlighted if desired.
      */
-    matched_substring: PredictionSubstring[];
+    matched_substrings: PredictionSubstring[];
 }
 
 /** A Radar Search request must include at least one of `keyword`, `name`, or `type`. */
diff --git a/types/googlepay/index.d.ts b/types/googlepay/index.d.ts
index c085094fb4..a8d5603abd 100644
--- a/types/googlepay/index.d.ts
+++ b/types/googlepay/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Pay API 0.2
+// Type definitions for non-npm package Google Pay API 0.2
 // Project: https://developers.google.com/pay/api/web/
 // Definitions by: Florian Luccioni <https://github.com/Fluccioni>,
 //                 Radu Raicea <https://github.com/Radu-Raicea>,
diff --git a/types/graceful-fs/index.d.ts b/types/graceful-fs/index.d.ts
index 69e7a5dce9..750e651609 100644
--- a/types/graceful-fs/index.d.ts
+++ b/types/graceful-fs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for graceful-fs 4.1
-// Project: https://github.com/cowboy/graceful-fs
+// Project: https://github.com/isaacs/node-graceful-fs
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 //                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/graphlib-dot/index.d.ts b/types/graphlib-dot/index.d.ts
index 0a9eb1cb7a..f59a2dbbff 100644
--- a/types/graphlib-dot/index.d.ts
+++ b/types/graphlib-dot/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for graphlib-dot 0.6
-// Project: https://github.com/dagrejs/graphlib-dot
+// Project: https://github.com/dagrejs/graphlib-dot, https://github.com/cpettitt/graphlib-dot
 // Definitions by: Dom Parfitt <https://github.com/DomParfitt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/graphql-query-complexity/index.d.ts b/types/graphql-query-complexity/index.d.ts
index ba34b4f4e2..075b88cb40 100644
--- a/types/graphql-query-complexity/index.d.ts
+++ b/types/graphql-query-complexity/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for graphql-query-complexity 0.1
-// Project: https://github.com/ivome/graphql-query-complexity
+// Project: https://github.com/slicknode/graphql-query-complexity
 // Definitions by: Abhik Mitra <https://github.com/abhikmitra>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/graphql/index.d.ts b/types/graphql/index.d.ts
index abaa81294b..0206859643 100644
--- a/types/graphql/index.d.ts
+++ b/types/graphql/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for graphql 14.0
-// Project: https://www.npmjs.com/package/graphql
+// Project: https://github.com/graphql/graphql-js
 // Definitions by: TonyYang <https://github.com/TonyPythoneer>
 //                 Caleb Meredith <https://github.com/calebmer>
 //                 Dominic Watson <https://github.com/intellix>
@@ -17,6 +17,7 @@
 //                 Curtis Layne <https://github.com/clayne11>
 //                 Jonathan Cardoso <https://github.com/JCMais>
 //                 Pavel Lang <https://github.com/langpavel>
+//                 Mark Caudill <https://github.com/mc0>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
diff --git a/types/graphql/type/definition.d.ts b/types/graphql/type/definition.d.ts
index 97c16f305c..f491919a13 100644
--- a/types/graphql/type/definition.d.ts
+++ b/types/graphql/type/definition.d.ts
@@ -140,8 +140,8 @@ export function assertAbstractType(type: any): GraphQLAbstractType;
  * List Modifier
  *
  * A list is a kind of type marker, a wrapping type which points to another
- * type. Lists are often created within the context of defining the fields of
- * an object type.
+ * type. Lists are often created within the context of defining the fields
+ * of an object type.
  *
  * Example:
  *
@@ -342,36 +342,48 @@ export interface GraphQLScalarTypeConfig<TInternal, TExternal> {
  *     });
  *
  */
-export class GraphQLObjectType<TSource = any, TContext = any> {
+export class GraphQLObjectType<
+    TSource = any,
+    TContext = any,
+    TArgs = { [key: string]: any }
+> {
     name: string;
     description: Maybe<string>;
     astNode: Maybe<ObjectTypeDefinitionNode>;
     extensionASTNodes: Maybe<ReadonlyArray<ObjectTypeExtensionNode>>;
     isTypeOf: Maybe<GraphQLIsTypeOfFn<TSource, TContext>>;
 
-    constructor(config: GraphQLObjectTypeConfig<TSource, TContext>);
-    getFields(): GraphQLFieldMap<any, TContext>;
+    constructor(config: GraphQLObjectTypeConfig<TSource, TContext, TArgs>);
+    getFields(): GraphQLFieldMap<any, TContext, TArgs>;
     getInterfaces(): GraphQLInterfaceType[];
     toString(): string;
     toJSON(): string;
     inspect(): string;
 }
 
-export interface GraphQLObjectTypeConfig<TSource, TContext> {
+export interface GraphQLObjectTypeConfig<
+    TSource,
+    TContext,
+    TArgs = { [key: string]: any }
+> {
     name: string;
     interfaces?: Thunk<Maybe<GraphQLInterfaceType[]>>;
-    fields: Thunk<GraphQLFieldConfigMap<TSource, TContext>>;
+    fields: Thunk<GraphQLFieldConfigMap<TSource, TContext, TArgs>>;
     isTypeOf?: Maybe<GraphQLIsTypeOfFn<TSource, TContext>>;
     description?: Maybe<string>;
     astNode?: Maybe<ObjectTypeDefinitionNode>;
     extensionASTNodes?: Maybe<ReadonlyArray<ObjectTypeExtensionNode>>;
 }
 
-export type GraphQLTypeResolver<TSource, TContext> = (
+export type GraphQLTypeResolver<
+    TSource,
+    TContext,
+    TArgs = { [key: string]: any }
+> = (
     value: TSource,
     context: TContext,
     info: GraphQLResolveInfo
-) => MaybePromise<Maybe<GraphQLObjectType<TSource, TContext> | string>>;
+) => MaybePromise<Maybe<GraphQLObjectType<TSource, TContext, TArgs> | string>>;
 
 export type GraphQLIsTypeOfFn<TSource, TContext> = (
     source: TSource,
@@ -423,8 +435,8 @@ export interface GraphQLArgumentConfig {
     astNode?: Maybe<InputValueDefinitionNode>;
 }
 
-export type GraphQLFieldConfigMap<TSource, TContext> = {
-    [key: string]: GraphQLFieldConfig<TSource, TContext>;
+export type GraphQLFieldConfigMap<TSource, TContext, TArgs = { [key: string]: any }> = {
+    [key: string]: GraphQLFieldConfig<TSource, TContext, TArgs>;
 };
 
 export interface GraphQLField<TSource, TContext, TArgs = { [key: string]: any }> {
@@ -449,8 +461,12 @@ export interface GraphQLArgument {
 
 export function isRequiredArgument(arg: GraphQLArgument): boolean;
 
-export type GraphQLFieldMap<TSource, TContext> = {
-    [key: string]: GraphQLField<TSource, TContext>;
+export type GraphQLFieldMap<
+    TSource,
+    TContext,
+    TArgs = { [key: string]: any }
+> = {
+    [key: string]: GraphQLField<TSource, TContext, TArgs>;
 };
 
 /**
@@ -487,15 +503,19 @@ export class GraphQLInterfaceType {
     inspect(): string;
 }
 
-export interface GraphQLInterfaceTypeConfig<TSource, TContext> {
+export interface GraphQLInterfaceTypeConfig<
+    TSource,
+    TContext,
+    TArgs = { [key: string]: any }
+> {
     name: string;
-    fields: Thunk<GraphQLFieldConfigMap<TSource, TContext>>;
+    fields: Thunk<GraphQLFieldConfigMap<TSource, TContext, TArgs>>;
     /**
      * Optionally provide a custom type resolver function. If one is not provided,
      * the default implementation will call `isTypeOf` on each implementing
      * Object type.
      */
-    resolveType?: Maybe<GraphQLTypeResolver<TSource, TContext>>;
+    resolveType?: Maybe<GraphQLTypeResolver<TSource, TContext, TArgs>>;
     description?: Maybe<string>;
     astNode?: Maybe<InterfaceTypeDefinitionNode>;
     extensionASTNodes?: Maybe<ReadonlyArray<InterfaceTypeExtensionNode>>;
diff --git a/types/guardian__prosemirror-invisibles/guardian__prosemirror-invisibles-tests.ts b/types/guardian__prosemirror-invisibles/guardian__prosemirror-invisibles-tests.ts
index 38398d9830..6fb0ea627e 100644
--- a/types/guardian__prosemirror-invisibles/guardian__prosemirror-invisibles-tests.ts
+++ b/types/guardian__prosemirror-invisibles/guardian__prosemirror-invisibles-tests.ts
@@ -1,8 +1,12 @@
 import { Node } from 'prosemirror-model';
 import { Plugin } from 'prosemirror-state';
 
-import invisibles, { hardBreak, paragraph, space, Builder } from 'guardian__prosemirror-invisibles';
+import invisibles, { hardBreak, paragraph, space, Builder, character, node } from 'guardian__prosemirror-invisibles';
 
 const plugin1: Plugin = invisibles([hardBreak((node: Node) => true), paragraph(), space((char: string) => false)]);
 
-const plugin2: Plugin = invisibles([hardBreak(), paragraph((node: Node) => false), space()]);
+const a: Builder = character('letter-a')(char => char === 'a');
+
+const someNode: Builder = node('some-node', (node: Node, pos: number) => 1)((node: Node) => true);
+
+const plugin2: Plugin = invisibles([hardBreak(), paragraph((node: Node) => false), space(), a, someNode]);
diff --git a/types/guardian__prosemirror-invisibles/index.d.ts b/types/guardian__prosemirror-invisibles/index.d.ts
index f3453cd6ec..ccc1a00d4c 100644
--- a/types/guardian__prosemirror-invisibles/index.d.ts
+++ b/types/guardian__prosemirror-invisibles/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @guardian/prosemirror-invisibles 1.0
+// Type definitions for @guardian/prosemirror-invisibles 1.2
 // Project: https://github.com/guardian/prosemirror-invisibles
 // Definitions by: Daniil Dotsev <https://github.com/dddotsev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -17,6 +17,10 @@ export interface TextBetweenPosition {
 
 export default function(builders: Builder[]): Plugin;
 
+export function character(type: string): (predicate: (char: string) => boolean) => Builder;
+export function node(type: string, toPosition: (node: Node, pos: number) => number):
+  (predicate: (node: Node) => boolean) => Builder;
+
 export function hardBreak(predicate?: (node: Node) => boolean): Builder;
 export function paragraph(predicate?: (node: Node) => boolean): Builder;
 export function space(predicate?: (char: string) => boolean): Builder;
diff --git a/types/gulp-bump/index.d.ts b/types/gulp-bump/index.d.ts
index 4657dc06b2..52ef0fd487 100644
--- a/types/gulp-bump/index.d.ts
+++ b/types/gulp-bump/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for gulp-bump 2.8
-// Project: https://github.com/stevelacy/gulp-bump
+// Project: https://github.com/stevelacy/gulp-bump, http://github.com/stevelacy/gulp-bump
 // Definitions by: silkentrance <https://github.com/silkentrance>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/gulp-modernizr/index.d.ts b/types/gulp-modernizr/index.d.ts
index c9dc3a60b8..febbe67ff5 100644
--- a/types/gulp-modernizr/index.d.ts
+++ b/types/gulp-modernizr/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for gulp-modernizr 1.0
-// Project: https://github.com/doctyper/gulp-modernizr
+// Project: https://github.com/rejas/gulp-modernizr
 // Definitions by: remisery <https://github.com/remisery>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/gulp-pug/index.d.ts b/types/gulp-pug/index.d.ts
index 46a8a79239..92f7d6db88 100644
--- a/types/gulp-pug/index.d.ts
+++ b/types/gulp-pug/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for gulp-pug 3.3
-// Project: https://github.com/pugjs/gulp-pug#readme
+// Project: https://github.com/gulp-community/gulp-pug
 // Definitions by: remisery <https://github.com/remisery>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/handlebars-helpers/index.d.ts b/types/handlebars-helpers/index.d.ts
index 5a1de16bef..b7dbe8bc5c 100644
--- a/types/handlebars-helpers/index.d.ts
+++ b/types/handlebars-helpers/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for handlebars-helpers 0.5
-// Project: http://assemble.io/helpers/
+// Project: http://assemble.io/helpers/, https://github.com/helpers/handlebars-helpers
 // Definitions by: Toilal <https://github.com/Toilal>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index f66ae5a8ea..f14730e202 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for hapi 18.0
-// Project: https://github.com/hapijs/hapi
+// Project: https://github.com/hapijs/hapi, https://hapijs.com
 // Definitions by: Rafael Souza Fijalkowski <https://github.com/rafaelsouzaf>
 //                 Justin Simms <https://github.com/jhsimms>
 //                 Simon Schick <https://github.com/SimonSchick>
diff --git a/types/happypack/happypack-tests.ts b/types/happypack/happypack-tests.ts
new file mode 100644
index 0000000000..c0ab2d77cf
--- /dev/null
+++ b/types/happypack/happypack-tests.ts
@@ -0,0 +1,7 @@
+import * as happyPack from 'happypack';
+
+const ref: happyPack = new happyPack({
+	id: '1',
+    threads: 1,
+	loaders: ['ts-loader']
+});
diff --git a/types/happypack/index.d.ts b/types/happypack/index.d.ts
new file mode 100644
index 0000000000..13c212a3f8
--- /dev/null
+++ b/types/happypack/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for happypack 5.0
+// Project: https://github.com/amireh/happypack
+// Definitions by: Akash Vishwakarma <https://github.com/akashishu777>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { Plugin } from 'webpack';
+
+export = happypack;
+
+declare namespace happypack {
+    interface PluginOptions {
+        id?: string;
+        threads?: number;
+        loaders: any;
+    }
+}
+
+declare class happypack extends Plugin {
+    constructor(options: happypack.PluginOptions);
+}
diff --git a/types/happypack/tsconfig.json b/types/happypack/tsconfig.json
new file mode 100644
index 0000000000..bfd5e35551
--- /dev/null
+++ b/types/happypack/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "happypack-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/happypack/tslint.json b/types/happypack/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/happypack/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/har-format/index.d.ts b/types/har-format/index.d.ts
index 178d95314f..16f500a79d 100644
--- a/types/har-format/index.d.ts
+++ b/types/har-format/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for HAR 1.2
+// Type definitions for non-npm package HAR 1.2
 // Project: https://w3c.github.io/web-performance/specs/HAR/Overview.html
 // Definitions by: Michael Mrowetz <https://github.com/micmro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/hashtag-regex/index.d.ts b/types/hashtag-regex/index.d.ts
index 3540ce867b..ef6b53aeda 100644
--- a/types/hashtag-regex/index.d.ts
+++ b/types/hashtag-regex/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for hashtag-regex 2.0
-// Project: https://github.com/mathiasbynens/hashtag-regex
+// Project: https://github.com/mathiasbynens/hashtag-regex, https://mths.be/hashtag-regex
 // Definitions by: diogofcunha <https://github.com/diogofcunha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/haversine/index.d.ts b/types/haversine/index.d.ts
index 5f6d1e9173..91123614b2 100644
--- a/types/haversine/index.d.ts
+++ b/types/haversine/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for haversine 1.1
-// Project: https://github.com/njj/haversine
+// Project: https://github.com/njj/haversine, https://github.com/niix/haversine
 // Definitions by: Christian Rackerseder <https://github.com/screendriver>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/heatmap.js/index.d.ts b/types/heatmap.js/index.d.ts
index 265f17f5fb..c798943394 100644
--- a/types/heatmap.js/index.d.ts
+++ b/types/heatmap.js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for heatmap.js 2.0
-// Project: https://github.com/pa7/heatmap.js/
+// Project: https://github.com/pa7/heatmap.js/, https://www.patrick-wied.at/static/heatmapjs
 // Definitions by: Yang Guan <https://github.com/lookuptable>
 //                 Rhys van der Waerden <https://github.com/rhys-vdw>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/hedron/index.d.ts b/types/hedron/index.d.ts
index 8ce464c017..257f0086a6 100644
--- a/types/hedron/index.d.ts
+++ b/types/hedron/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Hedron 0.7
-// Project: https://github.com/JSBros/hedron
+// Project: https://github.com/JSBros/hedron, http://jsb.ro/hedron
 // Definitions by: Dmytro Borysov <https://github.com/dborysov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/hellojs/index.d.ts b/types/hellojs/index.d.ts
index 5b23b29e07..b139e760c6 100644
--- a/types/hellojs/index.d.ts
+++ b/types/hellojs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for hello.js 1.16
-// Project: http://adodson.com/hello.js/
+// Project: https://adodson.com/hello.js
 // Definitions by: Pavel Zika <https://github.com/PavelPZ>
 //                 Mikko Vuorinen <https://github.com/vuorinem>
 //                 Vincent Biret <https://github.com/baywet>
diff --git a/types/heredatalens/index.d.ts b/types/heredatalens/index.d.ts
index cb9a4d7807..d6c89d138f 100644
--- a/types/heredatalens/index.d.ts
+++ b/types/heredatalens/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for HERE Data Lens API for JavaScript 2.3
+// Type definitions for non-npm package HERE Data Lens API for JavaScript 2.3
 // Project: https://developer.here.com/
 // Definitions by: Bernd Hacker <https://github.com/denyo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/heremaps/index.d.ts b/types/heremaps/index.d.ts
index 918e464c09..98986df654 100644
--- a/types/heremaps/index.d.ts
+++ b/types/heremaps/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for HERE Maps API for JavaScript 3.0
+// Type definitions for non-npm package HERE Maps API for JavaScript 3.0
 // Project: https://developer.here.com/
 // Definitions by: Joshua Efiong <https://github.com/Josh-ES>
 //                 Bernd Hacker <https://github.com/denyo>
diff --git a/types/hexo-fs/index.d.ts b/types/hexo-fs/index.d.ts
index 89166b230c..6fc510b9a1 100644
--- a/types/hexo-fs/index.d.ts
+++ b/types/hexo-fs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for hexo-fs 0.2
-// Project: http://hexo.io/
+// Project: https://hexo.io
 // Definitions by: segayuu <https://github.com/segayuu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/hexo/hexo-tests.ts b/types/hexo/hexo-tests.ts
new file mode 100644
index 0000000000..3c00489c3a
--- /dev/null
+++ b/types/hexo/hexo-tests.ts
@@ -0,0 +1,462 @@
+import Hexo = require('hexo');
+import fs = require('fs');
+import Bunyan = require('bunyan');
+import { ParsedArgs } from 'minimist';
+import util = require('hexo-util');
+import http = require('http');
+
+const config: Hexo.InstanceOptions = {};
+config.debug = false;
+config.safe = false;
+config.silent = false;
+config.config = '_config.yml';
+
+let h: Hexo;
+h = hexo;
+h = new Hexo();
+h = new Hexo('./');
+h = new Hexo('./', config);
+
+const logger: Bunyan = h.log;
+console.log(h.base_dir);
+console.log(h.public_dir);
+console.log(h.source_dir);
+console.log(h.plugin_dir);
+console.log(h.script_dir);
+console.log(h.scaffold_dir);
+console.log(h.theme_dir);
+console.log(h.theme_script_dir);
+console.log(h.config_path);
+console.log(h.env.args);
+console.log(h.env.debug);
+console.log(h.env.safe);
+console.log(h.env.silent);
+console.log(h.env.env);
+console.log(h.env.version);
+console.log(h.env.init);
+console.log(h.config.title);
+console.log(h.config.subtitle);
+console.log(h.config.description);
+console.log(h.config.author);
+console.log(h.config.language);
+console.log(h.config.timezone);
+console.log(h.config.url);
+console.log(h.config.root);
+console.log(h.config.permalink);
+console.log(h.config.permalink_defaults);
+console.log(h.config.source_dir);
+console.log(h.config.public_dir);
+console.log(h.config.tag_dir);
+console.log(h.config.archive_dir);
+console.log(h.config.category_dir);
+console.log(h.config.code_dir);
+console.log(h.config.i18n_dir);
+console.log(h.config.skip_render);
+console.log(h.config.new_post_name);
+console.log(h.config.default_layout);
+console.log(h.config.titlecase);
+console.log(h.config.external_link);
+console.log(h.config.filename_case);
+console.log(h.config.render_drafts);
+console.log(h.config.post_asset_folder);
+console.log(h.config.relative_link);
+console.log(h.config.future);
+console.log(h.config.highlight.enable);
+console.log(h.config.highlight.line_number);
+console.log(h.config.highlight.auto_detect);
+console.log(h.config.highlight.tab_replace);
+console.log(h.config.default_category);
+console.log(h.config.category_map);
+console.log(h.config.tag_map);
+console.log(h.config.time_format);
+console.log(h.config.per_page);
+console.log(h.config.pagination_dir);
+console.log(h.config.theme);
+console.log(h.config.theme_config);
+console.log(h.config.deploy);
+console.log(h.config.include);
+console.log(h.config.exclude);
+console.log(h.config.ignore);
+
+h.init().then(async () => {
+    await h.watch();
+    h.unwatch();
+
+    await h.theme.watch();
+    h.theme.unwatch();
+
+    await h.source.watch();
+    h.source.unwatch();
+
+    await h.load();
+    h.call('config', {_: ['arg1']}, (err, value) => {});
+
+    await h.exit();
+});
+
+h.on('ready', () => {
+    h.on('deployBefore', () => {});
+    h.on('deployAfter', () => {});
+    h.on('exit', err => {
+        console.log(err);
+    });
+    h.on('generateBefore', () => {});
+    h.on('generateAfter', () => {});
+    h.on('new', param => {
+        const path: string = param.path;
+        const content: string = param.content;
+    });
+    h.on('processBefore', (type, path) => {
+        const t: Hexo.Box.File['type'] = type;
+        const p: string = path;
+    });
+    h.on('processAfter', (type, path) => {
+        const t: Hexo.Box.File['type'] = type;
+        const p: string = path;
+    });
+    h.on('ready', () => {});
+
+    {
+        let local: Hexo.Locals.Post[] = [];
+        const model = hexo.locals.get('posts');
+
+        local = model.toArray();
+        const count: number = model.count();
+        model.filter(v => true);
+        model.forEach(v => {});
+        model.map(v => v.name);
+    }
+
+    {
+        let local: Hexo.Locals.Page[] = [];
+        const model = hexo.locals.get('pages');
+
+        local = model.toArray();
+        const count: number = model.count();
+        model.filter(v => true);
+        model.forEach(v => {});
+        model.map(v => v.name);
+    }
+
+    {
+        let local: Hexo.Locals.Category[] = [];
+        const model = hexo.locals.get('categories');
+
+        local = model.toArray();
+        const count: number = model.count();
+        model.filter(v => true);
+        model.forEach(v => {});
+        model.map(v => v.name);
+    }
+
+    {
+        let local: Hexo.Locals.Tag[] = [];
+        const model = hexo.locals.get('tags');
+
+        local = model.toArray();
+        const count: number = model.count();
+        model.filter(v => true);
+        model.forEach(v => {});
+        model.map(v => v.name);
+    }
+
+    {
+        h.locals.set('some-data', () =>  'some vlue');
+        h.locals.remove('some-data');
+        h.locals.toObject();
+        h.locals.invalidate();
+    }
+
+    {
+        const route = h.route.get('index.html');
+        if (route) {
+            console.log(route.modified);
+            console.log(route.read());
+        }
+
+        const data: Hexo.Router.Data = {
+            data: 'some data',
+            modified: true,
+        };
+        data.data = new Buffer([]);
+        data.data = () => 'return';
+
+        let router: Hexo.Router;
+        router = h.route;
+        router = h.route.set('index.html', 'content');
+        router = h.route.set('index.html', new Buffer([]));
+        router = h.route.set('index.html', new util.Pattern(() => false));
+        router = h.route.set('index.html', { data: 'index', modified: false });
+
+        router = h.route.remove('index.html');
+
+        const list: string[] = h.route.list();
+        const format: string = h.route.format('/');
+    }
+
+    {
+        h.source.process(() => {});
+        h.source.addProcessor('path', file => {
+            console.log(file.source);
+            console.log(file.path);
+            console.log(file.type);
+            console.log(file.params);
+
+            file.read((err, content) => {
+                console.log(err, content.toString());
+                console.log(content);
+            });
+
+            file.read({encoding: 'utf8', flag: 'r'}, (err, content) => {
+                console.log(err, content.toString());
+                console.log(content);
+            });
+
+            file.readSync({encoding: 'utf8', flag: 'r'});
+
+            file.stat((err, stat) => {
+                console.log(err);
+                console.log(stat.mtime);
+                console.log(stat.ctime);
+                console.log(stat.atime);
+            });
+
+            file.stat().then(stat => {
+                console.log(stat.mtime);
+                console.log(stat.ctime);
+                console.log(stat.atime);
+            });
+
+            const stat: fs.Stats = file.statSync();
+
+            let render = '';
+            file.render({}, (err, result) => {
+                render = result;
+            });
+            file.render((err, result) => {
+                render = result;
+            });
+            file.render().then(result => {
+                render = result;
+            });
+            render = file.renderSync();
+        });
+    }
+
+    {
+        let _bool = true;
+        _bool = h.render.isRenderable('path');
+        _bool = h.render.isRenderableSync('path');
+
+        const option: Hexo.Render.Data = {
+            engine: 'ejs',
+            text: 'test',
+            path: __filename,
+        };
+
+        let _string = '';
+        h.render.render({text: 'example', engine: 'swig'}).then(result => {
+            _string = result;
+        });
+        h.render.render({path: __filename}).then(result => {
+            _string = result;
+        });
+        h.render.render({text: ''}, {foo: 'foo'}).then(result => {
+            _string = result;
+        });
+        _string = h.render.renderSync({text: 'example'});
+
+        _string = h.render.getOutput('ejs');
+    }
+
+    {
+        const data: Hexo.Post.Data = {};
+        data.title = 'Title';
+        data.slug = 'URL';
+        data.layout = 'layout_name';
+        data.path = 'path';
+        data.date = new Date();
+
+        h.post.create(data, false, () => {});
+        h.post.create(data, () => {});
+
+        h.post.publish(data, false, () => {});
+        h.post.publish(data, () => {});
+
+        const renderData: Hexo.Post.RenderData = {};
+        renderData.content = 'content';
+        renderData.engine = 'ejs';
+        h.post.render(null, renderData, () => {});
+    }
+
+    {
+        h.scaffold.get('post').then(result => '');
+        h.scaffold.set('post', '').then(() => {});
+        h.scaffold.remove('post').then(() => {});
+    }
+
+    {
+        const themeConfig: Hexo['config'] = h.theme.config;
+        let v: Hexo.View | undefined;
+        h.theme.setView('path-name', {});
+        v = h.theme.getView('post');
+        if (v) {
+            console.log(v.path);
+            console.log(v.source);
+
+            v.render().then(result => {});
+            v.renderSync();
+        }
+
+        h.theme.removeView('path-name');
+        h.theme.process(() => {});
+    }
+
+    {
+        const options: Hexo.extend.Console.Options = {};
+        options.usage = '[layout] <title>';
+        options.arguments = [
+            {name: 'layout', desc: 'Post layout'},
+            {name: 'title', desc: 'Post title'},
+        ];
+        options.options = [
+            {name: '-r, --replace', desc: 'Replace existing files'},
+        ];
+        options.desc = 'desc';
+
+        h.extend.console.register('name', 'description', options, args => {
+            const a: ParsedArgs = args;
+        });
+        h.extend.console.register('name', options, args => {});
+        h.extend.console.register('name', 'description', args => {});
+        h.extend.console.register('name', args => {});
+    }
+
+    {
+        h.extend.deployer.register('name', args => {
+            console.log(args.type);
+            console.log(args.someExtraArg);
+        });
+    }
+
+    {
+        h.extend.filter.register('before_post_render', data => data);
+        h.extend.filter.register('before_post_render', data => undefined);
+        h.extend.filter.register('before_post_render', data => undefined, 1);
+
+        h.extend.filter.register('after_post_render', data => data);
+        h.extend.filter.register('after_post_render', data => undefined);
+        h.extend.filter.register('after_post_render', data => undefined, 1);
+
+        h.extend.filter.register('before_exit', () => {});
+        h.extend.filter.register('before_exit', () => {}, 1);
+
+        h.extend.filter.register('before_generate', data => data);
+        h.extend.filter.register('before_generate', data => undefined);
+        h.extend.filter.register('before_generate', data => undefined, 1);
+
+        h.extend.filter.register('after_generate', () => {});
+        h.extend.filter.register('after_generate', () => {}, 1);
+
+        h.extend.filter.register('template_locals', locals => locals);
+        h.extend.filter.register('template_locals', locals => undefined);
+        h.extend.filter.register('template_locals', locals => undefined, 1);
+
+        h.extend.filter.register('after_init', () => {});
+        h.extend.filter.register('after_init', () => {}, 1);
+
+        h.extend.filter.register('new_post_path', (data, replace) => undefined);
+        h.extend.filter.register('new_post_path', (data, replace) => undefined, 1);
+
+        h.extend.filter.register('post_permalink', permalink => permalink);
+        h.extend.filter.register('post_permalink', permalink => permalink, 1);
+
+        h.extend.filter.register('after_render:html', (result, data) => result);
+        h.extend.filter.register('after_render:html', (result, data) => result, 1);
+
+        h.extend.filter.register('after_clean', () => {});
+        h.extend.filter.register('after_clean', () => {}, 1);
+
+        h.extend.filter.register('server_middleware', app => {
+            app.use((req: http.IncomingMessage, res: http.ServerResponse) => {
+                res.setHeader('X-Powered-By', 'Hexo');
+            });
+        });
+
+        const filter = (data: any) => data;
+        h.extend.filter.register('custom_filter', filter);
+        h.extend.filter.unregister('custom_filter', filter);
+
+        const options: Hexo.extend.Filter.Options = {};
+        options.args = ['foo', 'bar'];
+        options.context = h;
+        h.extend.filter.exec('custom_filter', options);
+        h.extend.filter.exec('custom_filter');
+        h.extend.filter.execSync('custom_filter', options);
+        h.extend.filter.execSync('custom_filter');
+    }
+
+    {
+        const ret: Hexo.extend.Generator.Return = {
+            data: {},
+            layout: 'layout-name',
+            path: '/',
+        };
+        h.extend.generator.register('name', local => ret);
+        h.extend.generator.register('name', local => [ret]);
+        h.extend.generator.register('name', local => {
+            console.log(local.data);
+            const categories: Hexo.Locals.Category[] = local.categories.toArray();
+            const pages: Hexo.Locals.Page[] = local.pages.toArray();
+            const posts: Hexo.Locals.Post[] = local.posts.toArray();
+            const tags: Hexo.Locals.Tag[] = local.tags.toArray();
+
+            return ret;
+        });
+    }
+
+    {
+        h.extend.helper.register('name', (...args) => {
+            return 'ret';
+        });
+    }
+
+    {
+        h.extend.migrator.register('name', args => {
+            const a: ParsedArgs = args;
+        });
+    }
+
+    {
+        let f: Hexo.Box.File;
+        h.extend.processor.register('pattern', file => f = file);
+        h.extend.processor.register(/pattern/, file => f = file);
+        h.extend.processor.register((str) => true , file => f = file);
+        h.extend.processor.register(file => f = file);
+    }
+
+    {
+        h.extend.renderer.register('ts', 'js', (data, options) => {
+            console.log(data.path);
+            console.log(data.text);
+            return 'result';
+        }, true);
+
+        h.extend.renderer.register('ts', 'js', (data, options) => Promise.resolve('result'), false);
+        h.extend.renderer.register('ts', 'js', (data, options) => Promise.resolve('result'));
+    }
+
+    {
+        const option: Hexo.extend.Tag.Options = {};
+        option.async = true;
+        option.ends = true;
+
+        h.extend.tag.register('name', (args, content) => {
+            if (content) {
+                const c: string = content;
+            }
+            const a: string[] = args;
+            return 'content';
+        });
+    }
+});
diff --git a/types/hexo/index.d.ts b/types/hexo/index.d.ts
new file mode 100644
index 0000000000..0f3a9dcc78
--- /dev/null
+++ b/types/hexo/index.d.ts
@@ -0,0 +1,976 @@
+// Type definitions for hexo 3.8
+// Project: https://hexo.io/
+// Definitions by: KentarouTakeda <https://github.com/kentarouTakeda>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import EventEmitter = require('events');
+import moment = require('moment');
+import { ParsedArgs } from 'minimist';
+import Logger = require('bunyan');
+import underscore = require('underscore');
+import connect = require('connect');
+import Stream = require('stream');
+import util = require('hexo-util');
+import fs = require('fs');
+
+declare global {
+    const hexo: Hexo;
+}
+
+interface HexoConfig {
+    [key: string]: any;
+    /**
+     * The title of your website
+     */
+    readonly title: string;
+
+    /**
+     * The subtitle of your website
+     */
+    readonly subtitle: string;
+
+    /**
+     * The description of your website
+     */
+    readonly description: string;
+
+    /*
+     * Your name
+     */
+    readonly author: string;
+
+    /**
+     * The language of your website. Use a 2-lettter ISO-639-1 code. Default is en.
+     */
+    readonly language: string;
+
+    /**
+     * The timezone of your website. Hexo uses the setting on your computer by default.
+     * You can find the list of available timezones [here]{@link https://en.wikipedia.org/wiki/List_of_tz_database_time_zones} .
+     * Some examples are `America/New_York` , `Japan` , and `UTC` .
+     */
+    readonly timezone: string;
+
+    /*
+     * The URL of your website
+     */
+    readonly url: string;
+
+    /**
+     * The root directory of your website
+     */
+    readonly root: string;
+
+    /**
+     * The permalink format of articles
+     */
+    readonly permalink: string;
+
+    /**
+     * Default values of each segment in permalink
+     */
+    readonly permalink_defaults: string|null;
+
+    /**
+     * Source folder. Where your content is stored
+     */
+    readonly source_dir: string;
+
+    /**
+     * Public folder. Where the static site will be generated
+     */
+    readonly public_dir: string;
+
+    /**
+     * Tag directory
+     */
+    readonly tag_dir: string;
+
+    /**
+     * Archive directory
+     */
+    readonly archive_dir: string;
+
+    /**
+     * Category directory
+     */
+    readonly category_dir: string;
+
+    /**
+     * Include code directory (subdirectory of source_dir)
+     */
+    readonly code_dir: string;
+
+    /**
+     * i18n directory
+     */
+    readonly i18n_dir: string;
+
+    /**
+     * Paths that will be copied to public raw, without being rendered. You can use glob expressions for path matching.
+     */
+    readonly skip_render: string|string[]|null;
+
+    /**
+     * The filename format for new posts
+     */
+    readonly new_post_name: string;
+
+    /**
+     * Default layout
+     */
+    readonly default_layout: string;
+
+    /**
+     * Transform titles into title case?
+     */
+    readonly titlecase: boolean;
+
+    /**
+     * Open external links in a new tab?
+     */
+    readonly external_link: boolean;
+
+    /**
+     * Transform filenames to 1 lower case; 2 upper case
+     */
+    readonly filename_case: number;
+
+    /**
+     * Display drafts?
+     */
+    readonly render_drafts: boolean;
+
+    /**
+     * Enable the Asset Folder?
+     */
+    readonly post_asset_folder: boolean;
+
+    /**
+     * Make links relative to the root folder?
+     */
+    readonly relative_link: boolean;
+
+    /**
+     * Display future posts?
+     */
+    readonly future: boolean;
+
+    /**
+     * Code block settings
+     */
+    readonly highlight: {
+        readonly enable: boolean;
+        readonly line_number: boolean;
+        readonly auto_detect: boolean;
+        readonly tab_replace: string|null;
+    };
+
+    /**
+     * Default category
+     */
+    readonly default_category: string;
+
+    /**
+     * Category slugs
+     */
+    readonly category_map: {[key: string]: string|number};
+
+    /**
+     * Tag slugs
+     */
+    readonly tag_map: {[key: string]: string|number};
+
+    /**
+     * Date format
+     * https://momentjs.com/
+     */
+    readonly date_format: string;
+
+    /**
+     * Time format
+     * https://momentjs.com/
+     */
+    readonly time_format: string;
+
+    /**
+     * The amount of posts displayed on a single page. 0 disables pagination
+     */
+    readonly per_page: number;
+
+    /**
+     * Pagination directory
+     */
+    readonly pagination_dir: string;
+
+    /**
+     * Theme name. false disables theming
+     */
+    readonly theme: string|false;
+
+    /**
+     * Theme configuration. Include any custom theme settings under this key to override theme defaults.
+     */
+    readonly theme_config: {[key: string]: string|number};
+
+    /**
+     * Deployment settings
+     */
+    readonly deploy: Hexo.extend.Deployer.Config | Hexo.extend.Deployer.Config | null;
+
+    /**
+     * Hexo by default ignores hidden files and folders, but setting this field will make Hexo process them
+     */
+    readonly include ?: string[];
+
+    /**
+     * Hexo process will ignore files list under this field
+     */
+    readonly exclude ?: string[];
+    readonly ignore: string[];
+}
+
+interface Model<T> {
+    /**
+     * Warehouse method
+     * https://hexojs.github.io/warehouse/
+     */
+    toArray(): T[];
+    /**
+     * Warehouse method
+     * https://hexojs.github.io/warehouse/
+     */
+    count(): number;
+    /**
+     * Warehouse method
+     * https://hexojs.github.io/warehouse/
+     */
+    forEach(fn: (v: T, i: number) => void): void;
+    /**
+     * Warehouse method
+     * https://hexojs.github.io/warehouse/
+     */
+    filter(fn: (v: T, i: number) => boolean): Model<T>;
+    /**
+     * Warehouse method
+     * https://hexojs.github.io/warehouse/
+     */
+    map<U>(fn: (v: T, i: number) => U): U[];
+}
+
+interface Site {
+    posts: Model<Hexo.Locals.Post>;
+    pages: Model<Hexo.Locals.Page>;
+    categories: Model<Hexo.Locals.Category>;
+    tags: Model<Hexo.Locals.Tag>;
+    data: {[key: string]: any};
+}
+
+declare class Hexo extends EventEmitter {
+    /**
+     * Create a Hexo instance.
+     * @param base the root directory of the website, `base_dir` .
+     * @param args an object containing the initialization options.
+     */
+    constructor(base?: string, args?: Hexo.InstanceOptions);
+
+    /**
+     * Load configuration and plugins.
+     */
+    init(): Promise<void>;
+
+    /**
+     * Loading all files in the `source` folder as well as the theme data.
+     */
+    load(fn?: (err: any, value: any) => void): Promise<any>;
+
+    /**
+     * The same things `load` does, but will also start watching for file changes continuously.
+     */
+    watch(fn?: (err: any, value: any) => void): Promise<any>;
+
+    unwatch(): void;
+
+    /**
+     * Any console command can be called explicitly using the call method on the Hexo instance.
+     */
+    call(name: string, args?: any, fn?: (err: any, value: any) => void): Promise<any>;
+    call(name: string, fn?: (err: any, value: any) => void): Promise<any>;
+
+    /**
+     * You should call the `exit` method upon successful or unsuccessful completion of a console command.
+     * This allows Hexo to exit gracefully and finish up important things such as saving the database.
+     */
+    exit(err?: any): Promise<void>;
+
+    /**
+     * Site settings in `_config.yml`
+     */
+    readonly config: HexoConfig;
+
+    readonly theme: Hexo.Theme;
+    readonly source: Hexo.Box;
+    readonly post: Hexo.Post;
+    readonly render: Hexo.Render;
+
+    /**
+     * Local variables are used for template rendering, which is the `site` variable in templates.
+     * https://hexo.io/api/locals
+     */
+    readonly locals: Hexo.Locals;
+
+    readonly base_dir: string;
+
+    /**
+     * Public folder. Where the static site will be generated
+     */
+    readonly public_dir: string;
+
+    /**
+     * Source folder. Where your content is stored
+     */
+    readonly source_dir: string;
+
+    readonly plugin_dir: string;
+    readonly script_dir: string;
+    readonly scaffold_dir: string;
+    readonly theme_dir: string;
+    readonly theme_script_dir: string;
+    readonly config_path: string;
+    readonly env: {
+      readonly args: ParsedArgs;
+      readonly debug: boolean;
+      readonly safe: boolean;
+      readonly silent: boolean;
+      readonly env: string;
+      readonly version: string;
+      readonly init: boolean;
+    };
+
+    /**
+     * Logger object
+     * https://www.npmjs.com/package/bunyan
+     */
+    readonly log: Logger;
+
+    readonly extend: {
+        /**
+         * The console forms the bridge between Hexo and its users. It registers and describes the available console commands.
+         */
+        readonly console: Hexo.extend.Console;
+        /**
+         * A deployer helps users quickly deploy their site to a remote server without complicated commands.
+         */
+        readonly deployer: Hexo.extend.Deployer;
+        /**
+         * A filter is used to modify some specified data. Hexo passes data to filters in sequence and the filters then modify the data one after the other.
+         */
+        readonly filter: Hexo.extend.Filter;
+        /**
+         * A generator builds routes based on processed files.
+         */
+        readonly generator: Hexo.extend.Generator;
+        /**
+         * A helper makes it easy to quickly add snippets to your templates. We recommend using helpers instead of templates when you’re dealing with more complicated code.
+         */
+        readonly helper: Hexo.extend.Helper;
+        /**
+         * A migrator helps users migrate from other systems to Hexo.
+         */
+        readonly migrator: Hexo.extend.Migrator;
+        /**
+         * A processor is used to process source files in the source folder.
+         */
+        readonly processor: Hexo.extend.Processor;
+        /**
+         * A renderer is used to render content.
+         */
+        readonly renderer: Hexo.extend.Renderer;
+        /**
+         * A tag allows users to quickly and easily insert snippets into their posts.
+         */
+        readonly tag: Hexo.extend.Tag;
+    };
+
+    readonly route: Hexo.Router;
+    readonly scaffold: Hexo.Scaffold;
+
+    /**
+     * Emitted before deployment begins.
+     */
+    on(ev: 'deployBefore', fn: () => void): this;
+
+    /**
+     * Emitted after deployment finishes.
+     */
+    on(ev: 'deployAfter', fn: () => void): this;
+
+    /**
+     * Emitted before Hexo exits.
+     */
+    on(ev: 'exit', fn: (err: any) => void): this;
+
+    /**
+     * Emitted before generation begins.
+     */
+    on(ev: 'generateBefore', fn: () => void): this;
+
+    /**
+     * Emitted after generation finishes.
+     */
+    on(ev: 'generateAfter', fn: () => void): this;
+
+    /**
+     * Emitted after a new post has been created. This event returns the post data:
+     */
+    on(ev: 'new', fn: (post: {path: string, content: string}) => void): this;
+
+    /**
+     * Emitted before processing begins. This event returns a path representing the root directory of the box.
+     */
+    on(ev: 'processBefore', fn: (type: Hexo.Box.File['type'], path: string) => void): this;
+
+    /**
+     * Emitted after processing finishes. This event returns a path representing the root directory of the box.
+     */
+    on(ev: 'processAfter', fn: (type: Hexo.Box.File['type'], path: string) => void): this;
+
+    /**
+     * Emitted after initialization finishes.
+     */
+    on(ev: 'ready', fn: () => void): this;
+}
+
+declare namespace Hexo {
+    interface InstanceOptions {
+        debug?: boolean;
+        safe?: boolean;
+        silent?: boolean;
+        config?: string;
+    }
+
+    interface Locals {
+        get(type: 'posts'): Model<Locals.Post>;
+        get(type: 'pages'): Model<Locals.Page>;
+        get(type: 'categories'): Model<Locals.Category>;
+        get(type: 'tags'): Model<Locals.Tag>;
+        /**
+         * Get a Variable
+         */
+        get(type: string): any;
+
+        /**
+         * Set a Variable
+         */
+        set(type: string, fn: () => any): this;
+
+        /**
+         * Remove a Variable
+         */
+        remove(type: string): this;
+
+        /**
+         * Get All Variable
+         */
+        toObject(): any;
+
+        /**
+         * Invalidate the cache
+         */
+        invalidate(): this;
+    }
+    namespace Locals {
+        interface Page {
+            title: string;
+            date: moment.Moment;
+            updated?: moment.Moment;
+            comments: boolean;
+            layout: string;
+            content: string;
+            excerpt?: string;
+            more?: string;
+            source: string;
+            full_source: string;
+            path: string;
+            permalink: string;
+            prev?: null|Page;
+            next?: null|Page;
+            raw?: string;
+            photos?: string[];
+            link?: string;
+            [key: string]: any;
+        }
+
+        interface Post extends Page {
+            published?: boolean;
+            categories?: string[];
+            tags: string[];
+        }
+
+        interface Tag {
+            name: string;
+            slug: string;
+            path: string;
+            permalink: string;
+            posts: Model<Post>;
+            length: number;
+        }
+        interface Category extends Tag {
+            parent: string;
+        }
+    }
+
+    namespace extend {
+        interface Console {
+            register(name: string, desc: string, options: Console.Options, fn: (args: ParsedArgs) => void): void;
+            register(name: string, options: Console.Options, fn: (args: ParsedArgs) => void): void;
+            register(name: string, desc: string, fn: (args: ParsedArgs) => void): void;
+            register(name: string, fn: (args: ParsedArgs) => void): void;
+        }
+        namespace Console {
+          interface Options {
+              /**
+               * The usage of a console command.
+               */
+              usage?: string;
+
+              /**
+               * The description of each argument of a console command.
+               */
+              arguments?: Array<{name: string, desc: string}>;
+
+              /**
+               * The description of each option of a console command.
+               */
+              options?: Array<{name: string, desc: string}>;
+
+              /**
+               * More detailed information about a console command.
+               */
+              desc?: string;
+          }
+        }
+
+        interface Deployer {
+            register(name: string, fn: (args: Deployer.Config) => void): void;
+        }
+        namespace Deployer {
+            interface Config {
+                readonly type: string|undefined;
+                readonly [key: string]: any;
+            }
+        }
+
+        interface Filter {
+            register(type: string, fn: (data: any, ...args: any[]) => any, priority?: number): void;
+
+            /**
+             * Executed before a post is rendered. Refer to post rendering to learn the execution steps.
+             */
+            register(type: 'before_post_render', fn: (data: { content: string, [key: string]: any }) => { content: string, [key: string]: any }|void, priority?: number): void;
+
+            /**
+             * Executed after a post is rendered. Refer to post rendering to learn the execution steps.
+             */
+            register(type: 'after_post_render', fn: (data: { content: string, [key: string]: any }) => { content: string, [key: string]: any }|void, priority?: number): void;
+
+            /**
+             * Executed before Hexo is about to exit – this will run right after `hexo.exit` is called.
+             */
+            register(type: 'before_exit', fn: () => void, priority?: number): void;
+
+            /**
+             * Executed before generation begins.
+             */
+            register(type: 'before_generate', fn: (data: any) => any, priority?: number): void;
+
+            /**
+             * Executed after generation finishes.
+             */
+            register(type: 'after_generate', fn: () => void, priority?: number): void;
+
+            /**
+             * Modify [local variables](https://hexo.io/docs/variables) in templates.
+             */
+            register(type: 'template_locals', fn: (locals: TemplateLocals) => TemplateLocals|void, priority?: number): void;
+
+            /**
+             * Executed after Hexo is initialized – this will run right after `hexo.init` completes.
+             */
+            register(type: 'after_init', fn: () => void, priority?: number): void;
+
+            /**
+             * Executed when creating a post to determine the path of new posts.
+             */
+            register(type: 'new_post_path', fn: (data: Post.Data, replace: boolean|undefined) => void, priority?: number): void;
+
+            /**
+             * Used to determine the permalink of posts.
+             */
+            register(type: 'post_permalink', fn: (permalink: string) => string, priority?: number): void;
+
+            /**
+             * Executed after rendering finishes. You can see rendering for more info.
+             */
+            register(type: 'after_render:html', fn: (result: string, data: {path: string, text: string, [key: string]: any}) => string|void, priority?: number): void;
+
+            /**
+             * Executed after generated files and cache are removed with hexo clean command.
+             */
+            register(type: 'after_clean', fn: () => void, priority?: number): void;
+
+            /**
+             * Add middleware to the server. app is a Connect instance.
+             */
+            register(type: 'server_middleware', fn: (app: connect.Server) => connect.Server|void, priority?: number): void;
+
+            unregister(type: string, fn: (...args: any[]) => any): void;
+            exec(type: string, data?: any, options?: Filter.Options): any;
+            execSync(type: string, data?: any, options?: Filter.Options): any;
+        }
+        namespace Filter {
+            interface Options {
+              /**
+               * `hexo` object.
+               */
+              context?: Hexo;
+              /**
+               * Arguments. This must be an array.
+               */
+              args?: any[];
+            }
+        }
+
+        interface Generator {
+            register(name: string, fn: (locals: Site) => Generator.Return| Generator.Return[]): void;
+        }
+        namespace Generator {
+            interface Return {
+              /**
+               * Path not including the prefixing `/` .
+               */
+              path: string;
+
+              /**
+               * Layout. Specify the layouts for rendering. The value can be a string or an array. If it’s ignored then the route will return data directly.
+               */
+              layout: string|string[];
+
+              data: any;
+            }
+        }
+
+        interface Helper {
+            register(name: string, fn: (...args: any[]) => any): void;
+        }
+
+        interface Migrator {
+            register(name: string, fn: (args: ParsedArgs, fn: (err: any) => void) => void): void;
+        }
+
+        interface Processor {
+            register(pattern: RegExp | string | ((str: string) => any), fn: (file: Box.File) => void): void;
+            register(fn: (file: Box.File) => void): void;
+        }
+
+        interface Renderer {
+            register(srcExt: string, outExt: string, fn: (data: HexoRendererData, options: any) => string, sync: true): void;
+            register(srcExt: string, outExt: string, fn: (data: HexoRendererData, options: any) => Promise<string>, sync: false): void;
+            register(srcExt: string, outExt: string, fn: (data: HexoRendererData, options: any) => Promise<string>): void;
+        }
+
+        interface Tag {
+            register(name: string, fn: (args: string[], content: string|undefined) => string, options?: Tag.Options): void;
+        }
+        namespace Tag {
+            interface Options {
+                ends?: boolean;
+                async?: boolean;
+            }
+        }
+    }
+
+    interface Router {
+        /**
+         * The `get` method returns a `Stream`.
+         */
+        get(path: string): Router.RouteStream|undefined;
+
+        /**
+         * The `set` method takes a string, a `Buffer` or a function.
+         */
+        set(path: string, data: string|Buffer|util.Pattern<boolean>|Router.Data): this;
+
+        /**
+         * Remove a Path
+         */
+        remove(path: string): this;
+
+        /**
+         * Get the List of Routes
+         */
+        list(): string[];
+
+        /**
+         * The `format` method transforms a string to a valid path.
+         */
+        format(path: string): string;
+    }
+    namespace Router {
+        interface Data {
+            data: string | Buffer | Callback;
+            modified: boolean;
+        }
+
+        interface RouteStream extends Stream.Readable {
+            readonly modified: boolean;
+        }
+
+        type Callback = ((err: any, result: string) => void) | (() => Promise<string>);
+    }
+
+    interface Scaffold {
+        /**
+         * Get a Scaffold
+         */
+        get(name: string, fn?: (err: any, result: string) => void): Promise<string>;
+        /**
+         * Set a Scaffold
+         */
+        set(name: string, content: string, fn?: (err: any) => void): Promise<void>;
+        /**
+         * Remove a Scaffold
+         */
+        remove(name: string, fn?: (err: any) => void): Promise<void>;
+    }
+
+    interface Box extends EventEmitter {
+        /**
+         * Loads all files in the folder.
+         */
+        process(fn: (err: any) => void): Promise<void>;
+        /**
+         * Loads all files in the folder and start watching for file changes.
+         */
+        watch(fn?: (err: any) => void): Promise<void>;
+        /**
+         * Stop watching.
+         */
+        unwatch(): void;
+
+        /**
+         * A processor is an essential element of `Box` and is used to process files.
+         * You can use path matching as described above to restrict what exactly the processor should process.
+         * Register a new processor with the `addProcessor` method.
+         */
+        addProcessor(pattern: string|RegExp|util.Pattern<boolean>, fn: (file: Box.File) => void): void;
+    }
+    namespace Box {
+        interface File {
+            /**
+             * Full path of the file
+             */
+            readonly source: string;
+
+            /**
+             * Relative path to the box of the file
+             */
+            readonly path: string;
+
+            /**
+             * File type. The value can be `create` , `update` , `skip`, `delete` .
+             */
+            readonly type: 'create' | 'update' |  'skip' | 'delete';
+
+            /**
+             * The information from path matching.
+             */
+            readonly params: any;
+
+            /**
+             * Read a file
+             */
+            read(option?: {encoding?: string|null, flag?: string}, fn?: (err: any, result: string|Buffer) => void): Promise<string|Buffer>;
+            read(fn?: (err: any, result: string|Buffer) => void): Promise<string|Buffer>;
+
+            /**
+             * Read a file synchronously
+             */
+            readSync(option?: {encoding?: string|null, flag?: string}): string|Buffer;
+
+            /**
+             * Read the status of a file
+             */
+            stat(fn?: (err: any, result: fs.Stats) => void): Promise<fs.Stats>;
+
+            /**
+             * Read the status of a file synchronously
+             */
+            statSync(): fs.Stats;
+
+            /**
+             * Render a file
+             */
+            render(fn?: (err: any, result: string) => void): Promise<string>;
+            render(option?: any, fn?: (err: any, result: string) => void): Promise<string>;
+
+            /**
+             * Render a file synchronously
+             */
+            renderSync(option?: any): string;
+        }
+    }
+
+    interface Render {
+        render(data: Render.Data, option?: any, fn?: (err: any, result: string) => void): Promise<string>;
+        render(data: Render.Data, fn?: (err: any, result: string) => void): Promise<string>;
+        renderSync(data: Render.Data, option?: any): string;
+
+        /**
+         * Check whether a file is renderable synchronously.
+         */
+        isRenderable(path: string): boolean;
+
+        /**
+         * Check whether a file is renderable.
+         */
+        isRenderableSync(path: string): boolean;
+
+        /**
+         * Get the Output Extension
+         */
+        getOutput(path: string): string;
+    }
+    namespace Render {
+        interface Data {
+            text?: string;
+            engine?: string;
+            path?: string;
+        }
+    }
+
+    interface Post {
+        /**
+         * Create a Post
+         */
+        create(data: Post.Data, replace?: boolean, fn?: (err: any) => void): Promise<void>;
+        create(data: Post.Data, fn?: (err: any) => void): Promise<void>;
+
+        /**
+         * Publish a Draft
+         */
+        publish(data: Post.Data, replace?: boolean, fn?: (err: any) => void): Promise<void>;
+        publish(data: Post.Data, fn?: (err: any) => void): Promise<void>;
+
+        render(source: string|null|undefined, data: Post.RenderData, fn: (err: any) => void): Promise<void>;
+    }
+    namespace Post {
+        interface Data {
+            title?: string;
+            slug?: string;
+            layout?: string;
+            path?: string;
+            date?: moment.MomentInput;
+        }
+      interface RenderData {
+          engine?: string;
+          content?: string;
+      }
+    }
+
+    interface Theme extends Box {
+        config: HexoConfig;
+
+        /**
+         * Get a View
+         */
+        getView(path: string): View|undefined;
+
+        /**
+         * Set a View
+         */
+        setView(path: string, data: any): void;
+
+        /**
+         * Remove a View
+         */
+        removeView(path: string): void;
+    }
+
+    interface View {
+        readonly path: string;
+        readonly source: string;
+
+        /**
+         * Remove a View
+         */
+        render(options?: any, fn?: (err: any, result: string) => void): Promise<string>;
+        render(fn: (err: any, result: string) => void): Promise<any>;
+
+        /**
+         * Remove a View synchronously.
+         */
+        renderSync(options?: any): string;
+    }
+}
+
+interface TemplateLocals {
+    /**
+     * Underscore object
+     */
+    _: underscore.UnderscoreStatic;
+    page: Hexo.Locals.Post | Hexo.Locals.Page | Hexo.Locals.Category | Hexo.Locals.Tag | IndexPage | ArchivePage | CategoryPage | TagPage;
+    path: string;
+    url: string;
+
+    /**
+     * Site settings in `_config.yml`
+     */
+    config: HexoConfig;
+    theme: HexoConfig;
+    env: Hexo['env'];
+    layout: string;
+    view_dir: string;
+    site: any;
+}
+
+interface IndexPage {
+    per_page?: number;
+    total?: number;
+    current?: number;
+    current_url?: string;
+    posts?: object;
+    prev?: number;
+    prev_link?: string;
+    next?: number;
+    next_link?: string;
+    path?: string;
+}
+
+interface ArchivePage extends IndexPage {
+    archive?: boolean;
+    year?: number;
+    month?: number;
+}
+
+interface CategoryPage extends IndexPage {
+    category: string;
+}
+
+interface TagPage extends IndexPage {
+    tag: string;
+}
+
+interface HexoRendererData {
+    /**
+     * File content.
+     */
+    readonly text: string;
+    /**
+     * File path.
+     */
+    readonly path?: string;
+}
+
+export = Hexo;
diff --git a/types/hexo/tsconfig.json b/types/hexo/tsconfig.json
new file mode 100644
index 0000000000..6e37a832a0
--- /dev/null
+++ b/types/hexo/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "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-tests.ts"
+    ]
+}
diff --git a/types/hexo/tslint.json b/types/hexo/tslint.json
new file mode 100644
index 0000000000..d2e0e4cec1
--- /dev/null
+++ b/types/hexo/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "unified-signatures": false
+    }
+
+}
diff --git a/types/hiredis/index.d.ts b/types/hiredis/index.d.ts
index 97a3f8d98c..727e4f4a03 100644
--- a/types/hiredis/index.d.ts
+++ b/types/hiredis/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for hiredis 0.5
-// Project: https://github.com/redis/hiredis-node
+// Project: http://github.com/redis/hiredis-node
 // Definitions by: Titan <https://github.com/titan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/historykana/index.d.ts b/types/historykana/index.d.ts
index c99c82de98..ee239be092 100644
--- a/types/historykana/index.d.ts
+++ b/types/historykana/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for HistoryKana 1.0
-// Project: https://github.com/terrierscript/historykana
+// Project: https://github.com/terrierscript/historykana, https://github.com/inuscript/historykana
 // Definitions by: shiratsuki <https://github.com/h-shiratsuki>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/hjson/index.d.ts b/types/hjson/index.d.ts
index 7b675657a7..0b69868a6f 100644
--- a/types/hjson/index.d.ts
+++ b/types/hjson/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for hjson 2.4
-// Project: https://github.com/hjson/hjson-js
+// Project: https://github.com/hjson/hjson-js, http://hjson.org
 // Definitions by: Mark van Straten <https://github.com/crunchie84>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/hls.js/index.d.ts b/types/hls.js/index.d.ts
index b5c3cdf3ba..52967890bd 100644
--- a/types/hls.js/index.d.ts
+++ b/types/hls.js/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: John G. Gainfort, Jr. <https://github.com/jgainfort>
 //                 Johan Brook <https://github.com/brookback>
 //                 Adrián Caballero <https://github.com/adripanico>
+//                 Alexey I. Berezin <https://github.com/beraliv>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -1734,6 +1735,11 @@ declare class Hls {
      * If set to false, the mode will be set to hidden.
      */
     subtitleDisplay: boolean;
+    /**
+     * (default: NaN)
+     * Return current download bandwidth in bits/s if available
+     */
+    bandwidthEstimate: number;
     /**
      * calling this method will:
      *      bind videoElement and hls instances
diff --git a/types/html-minifier/index.d.ts b/types/html-minifier/index.d.ts
index 2f1281c442..f49f533f9c 100644
--- a/types/html-minifier/index.d.ts
+++ b/types/html-minifier/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for html-minifier 3.5
-// Project: https://github.com/kangax/html-minifier
+// Project: https://github.com/kangax/html-minifier, https://kangax.github.io/html-minifier
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 //                 Riku <https://github.com/rikuayanokozy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/htmlbars-inline-precompile/index.d.ts b/types/htmlbars-inline-precompile/index.d.ts
index ab4bf9a1b7..3cc8e36066 100644
--- a/types/htmlbars-inline-precompile/index.d.ts
+++ b/types/htmlbars-inline-precompile/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for htmlbars-inline-precompile 1.0
+// Type definitions for non-npm package htmlbars-inline-precompile 1.0
 // Project: https://github.com/ember-cli/ember-cli-htmlbars-inline-precompile
 // Definitions by: Chris Krycho <https://github.com/chriskrycho>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/http-aws-es/http-aws-es-tests.ts b/types/http-aws-es/http-aws-es-tests.ts
index df432dbab4..18ae2b666c 100644
--- a/types/http-aws-es/http-aws-es-tests.ts
+++ b/types/http-aws-es/http-aws-es-tests.ts
@@ -1,42 +1,43 @@
-import { EnvironmentCredentials } from "aws-sdk/lib/core";
+import * as AWS from "aws-sdk";
 import { Client } from "elasticsearch";
 import HttpAmazonESConnector = require("http-aws-es");
 
 new Client({
-    amazonES: {
-        accessKey: "AKID",
+    awsConfig: new AWS.Config({
+        accessKeyId: "AKID",
         region: "us-east-1",
-        secretKey: "secret",
-    },
+        secretAccessKey: "secret",
+    }),
     connectionClass: HttpAmazonESConnector,
     host: "https://amazon-es-host.us-east-1.es.amazonaws.com",
 });
 
 new Client({
-    amazonES: {
-        accessKey: "AKID",
+    awsConfig: new AWS.Config({
+        accessKeyId: "AKID",
         region: "us-east-1",
-        secretKey: "secret",
-    },
+        secretAccessKey: "secret",
+    }),
     connectionClass: require("http-aws-es"),
     host: "https://amazon-es-host.us-east-1.es.amazonaws.com",
 });
 
-const myCredentials = new EnvironmentCredentials("AWS");
+const myCredentials = new AWS.EnvironmentCredentials("AWS");
+
 new Client({
-    amazonES: {
+    awsConfig: new AWS.Config({
         credentials: myCredentials,
         region: "us-east-1",
-    },
+    }),
     connectionClass: HttpAmazonESConnector,
     host: "https://amazon-es-host.us-east-1.es.amazonaws.com",
 });
 
 new Client({
-    amazonES: {
+    awsConfig: new AWS.Config({
         credentials: myCredentials,
         region: "us-east-1",
-    },
+    }),
     connectionClass: require("http-aws-es"),
     host: "https://amazon-es-host.us-east-1.es.amazonaws.com",
 });
diff --git a/types/http-aws-es/index.d.ts b/types/http-aws-es/index.d.ts
index 91e12604f8..2a6ca11629 100644
--- a/types/http-aws-es/index.d.ts
+++ b/types/http-aws-es/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for http-aws-es 1.1
+// Type definitions for http-aws-es 6.0
 // Project: https://github.com/TheDeveloper/http-aws-es#readme
 // Definitions by: Marco Gonzalez <https://github.com/marcogrcr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -7,18 +7,11 @@
 /// <reference types="node" />
 
 import * as e from "elasticsearch";
-import { Credentials } from "aws-sdk/lib/core";
+import * as AWS from "aws-sdk";
 
 declare module "elasticsearch" {
-    interface AmazonESOptions {
-        accessKey?: string;
-        credentials?: Credentials;
-        region: string;
-        secretKey?: string;
-    }
-
     interface ConfigOptions {
-        amazonES?: AmazonESOptions;
+        awsConfig?: AWS.Config;
     }
 }
 
diff --git a/types/http-cache-semantics/http-cache-semantics-tests.ts b/types/http-cache-semantics/http-cache-semantics-tests.ts
new file mode 100644
index 0000000000..73de43b370
--- /dev/null
+++ b/types/http-cache-semantics/http-cache-semantics-tests.ts
@@ -0,0 +1,19 @@
+const req = { url: 'https://foo.bar', method: 'GET', headers: { foo: 'bar' } };
+const res = { status: 200, headers: { foo: 'bar' } };
+
+import CachePolicy = require('http-cache-semantics');
+
+const policy = new CachePolicy(req, res);
+new CachePolicy(req, res, { shared: true });
+new CachePolicy(req, res, { cacheHeuristic: 0.1 });
+new CachePolicy(req, res, { immutableMinTimeToLive: 24 * 3600 * 1000 });
+new CachePolicy(req, res, { ignoreCargoCult: false });
+new CachePolicy(req, res, { trustServerDate: true });
+
+policy.storable(); // $ExpectType boolean
+policy.satisfiesWithoutRevalidation(req); // $ExpectType boolean
+policy.responseHeaders(); // $ExpectType Headers
+policy.timeToLive(); // $ExpectType number
+CachePolicy.fromObject(policy.toObject()); // $ExpectType CachePolicy
+policy.revalidationHeaders(req); // $ExpectType Headers
+policy.revalidatedPolicy(req, res); // $ExpectType RevalidationPolicy
diff --git a/types/http-cache-semantics/index.d.ts b/types/http-cache-semantics/index.d.ts
new file mode 100644
index 0000000000..40545f3e0a
--- /dev/null
+++ b/types/http-cache-semantics/index.d.ts
@@ -0,0 +1,170 @@
+// Type definitions for http-cache-semantics 4.0
+// Project: https://github.com/kornelski/http-cache-semantics#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = CachePolicy;
+
+declare class CachePolicy {
+    constructor(req: CachePolicy.Request, res: CachePolicy.Response, options?: CachePolicy.Options);
+
+    /**
+     * Returns `true` if the response can be stored in a cache.
+     * If it's `false` then you MUST NOT store either the request or the response.
+     */
+    storable(): boolean;
+
+    /**
+     * This is the most important method. Use this method to check whether the cached response is still fresh
+     * in the context of the new request.
+     *
+     * If it returns `true`, then the given `request` matches the original response this cache policy has been
+     * created with, and the response can be reused without contacting the server. Note that the old response
+     * can't be returned without being updated, see `responseHeaders()`.
+     *
+     * If it returns `false`, then the response may not be matching at all (e.g. it's for a different URL or method),
+     * or may require to be refreshed first (see `revalidationHeaders()`).
+     */
+    satisfiesWithoutRevalidation(newRequest: CachePolicy.Request): boolean;
+
+    /**
+     * Returns updated, filtered set of response headers to return to clients receiving the cached response.
+     * This function is necessary, because proxies MUST always remove hop-by-hop headers (such as `TE` and `Connection`)
+     * and update response's `Age` to avoid doubling cache time.
+     *
+     * @example
+     * cachedResponse.headers = cachePolicy.responseHeaders(cachedResponse);
+     */
+    responseHeaders(): CachePolicy.Headers;
+
+    /**
+     * Returns approximate time in milliseconds until the response becomes stale (i.e. not fresh).
+     *
+     * After that time (when `timeToLive() <= 0`) the response might not be usable without revalidation. However,
+     * there are exceptions, e.g. a client can explicitly allow stale responses, so always check with
+     * `satisfiesWithoutRevalidation()`.
+     */
+    timeToLive(): number;
+
+    /**
+     * Chances are you'll want to store the `CachePolicy` object along with the cached response.
+     * `obj = policy.toObject()` gives a plain JSON-serializable object.
+     */
+    toObject(): CachePolicy.CachePolicyObject;
+
+    /**
+     * `policy = CachePolicy.fromObject(obj)` creates an instance from object created by `toObject()`.
+     */
+    static fromObject(obj: CachePolicy.CachePolicyObject): CachePolicy;
+
+    /**
+     * Returns updated, filtered set of request headers to send to the origin server to check if the cached
+     * response can be reused. These headers allow the origin server to return status 304 indicating the
+     * response is still fresh. All headers unrelated to caching are passed through as-is.
+     *
+     * Use this method when updating cache from the origin server.
+     *
+     * @example
+     * updateRequest.headers = cachePolicy.revalidationHeaders(updateRequest);
+     */
+    revalidationHeaders(newRequest: CachePolicy.Request): CachePolicy.Headers;
+
+    /**
+     * Use this method to update the cache after receiving a new response from the origin server.
+     */
+    revalidatedPolicy(
+        revalidationRequest: CachePolicy.Request,
+        revalidationResponse: CachePolicy.Response
+    ): CachePolicy.RevalidationPolicy;
+}
+
+declare namespace CachePolicy {
+    interface Request {
+        url?: string;
+        method?: string;
+        headers: Headers;
+    }
+
+    interface Response {
+        status?: number;
+        headers: Headers;
+    }
+
+    interface Options {
+        /**
+         * If `true`, then the response is evaluated from a perspective of a shared cache (i.e. `private` is not
+         * cacheable and `s-maxage` is respected). If `false`, then the response is evaluated from a perspective
+         * of a single-user cache (i.e. `private` is cacheable and `s-maxage` is ignored).
+         * `true` is recommended for HTTP clients.
+         * @default true
+         */
+        shared?: boolean;
+        /**
+         * A fraction of response's age that is used as a fallback cache duration. The default is 0.1 (10%),
+         * e.g. if a file hasn't been modified for 100 days, it'll be cached for 100*0.1 = 10 days.
+         * @default 0.1
+         */
+        cacheHeuristic?: number;
+        /**
+         * A number of milliseconds to assume as the default time to cache responses with `Cache-Control: immutable`.
+         * Note that [per RFC](https://httpwg.org/specs/rfc8246.html#the-immutable-cache-control-extension)
+         * these can become stale, so `max-age` still overrides the default.
+         * @default 24*3600*1000 (24h)
+         */
+        immutableMinTimeToLive?: number;
+        /**
+         * If `true`, common anti-cache directives will be completely ignored if the non-standard `pre-check`
+         * and `post-check` directives are present. These two useless directives are most commonly found
+         * in bad StackOverflow answers and PHP's "session limiter" defaults.
+         * @default false
+         */
+        ignoreCargoCult?: boolean;
+        /**
+         * If `false`, then server's `Date` header won't be used as the base for `max-age`. This is against the RFC,
+         * but it's useful if you want to cache responses with very short `max-age`, but your local clock
+         * is not exactly in sync with the server's.
+         * @default true
+         */
+        trustServerDate?: boolean;
+    }
+
+    interface CachePolicyObject {
+        v: number;
+        t: number;
+        sh: boolean;
+        ch: number;
+        imm: number;
+        st: number;
+        resh: Headers;
+        rescc: { [key: string]: string };
+        m: string;
+        u?: string;
+        h?: string;
+        a: boolean;
+        reqh: Headers | null;
+        reqcc: { [key: string]: string };
+    }
+
+    interface Headers {
+        [header: string]: string | string[] | undefined;
+    }
+
+    interface RevalidationPolicy {
+        /**
+         * A new `CachePolicy` with HTTP headers updated from `revalidationResponse`. You can always replace
+         * the old cached `CachePolicy` with the new one.
+         */
+        policy: CachePolicy;
+        /**
+         * Boolean indicating whether the response body has changed.
+         *
+         * - If `false`, then a valid 304 Not Modified response has been received, and you can reuse the old
+         * cached response body.
+         * - If `true`, you should use new response's body (if present), or make another request to the origin
+         * server without any conditional headers (i.e. don't use `revalidationHeaders()` this time) to get
+         * the new resource.
+         */
+        modified: boolean;
+        matches: boolean;
+    }
+}
diff --git a/types/http-cache-semantics/tsconfig.json b/types/http-cache-semantics/tsconfig.json
new file mode 100644
index 0000000000..9940b3d2e6
--- /dev/null
+++ b/types/http-cache-semantics/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "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-cache-semantics-tests.ts"
+    ]
+}
diff --git a/types/http-cache-semantics/tslint.json b/types/http-cache-semantics/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/http-cache-semantics/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/hubot/index.d.ts b/types/hubot/index.d.ts
index 1b90a512af..656c492df6 100644
--- a/types/hubot/index.d.ts
+++ b/types/hubot/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for hubot 2.19
-// Project: https://github.com/github/hubot
+// Project: https://github.com/hubotio/hubot
 // Definitions by: Dirk Gadsden <https://github.com/dirk>
 //                 Kees C. Bakker <https://github.com/KeesCBakker>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/hyco-ws/index.d.ts b/types/hyco-ws/index.d.ts
index 68d0575fb5..3e0950b5cd 100644
--- a/types/hyco-ws/index.d.ts
+++ b/types/hyco-ws/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for hyco-ws 1.0
-// Project: https://github.com/Azure/azure-relay-node
+// Project: https://github.com/Azure/azure-relay-node, https://docs.microsoft.com/en-us/azure/service-bus-relay
 // Definitions by: Manuel Rodrigo Cabello <https://github.com/mrcabellom>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/i18n/i18n-tests.ts b/types/i18n/i18n-tests.ts
index 8f6deb423c..a24e4d4300 100644
--- a/types/i18n/i18n-tests.ts
+++ b/types/i18n/i18n-tests.ts
@@ -137,6 +137,16 @@ i18n.__({ phrase: 'Hello {{name}}', locale: 'fr' }, { name: 'Marcus' }); // Salu
  * __n()
  * https://github.com/mashpie/i18n-node#__n
  */
+// short syntax
+// global (this.locale == 'de')
+i18n.__n("%s cat", 1); // 1 Katze
+i18n.__n("%s cat", 3); // 3 Katzen
+
+// scoped via req object (req.locale == 'de')
+req.__n("%s cat", 1); // 1 Katze
+req.__n("%s cat", 3); // 3 Katzen
+
+// long syntax
 // global (this.locale == 'de')
 i18n.__n("%s cat", "%s cats", 1); // 1 Katze
 i18n.__n("%s cat", "%s cats", 3); // 3 Katzen
diff --git a/types/i18n/index.d.ts b/types/i18n/index.d.ts
index ee0f3d584f..678373be48 100644
--- a/types/i18n/index.d.ts
+++ b/types/i18n/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for i18n-node 0.8
-// Project: https://github.com/mashpie/i18n-node
+// Project: http://github.com/mashpie/i18n-node
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT>
 //                 FindQ <https://github.com/FindQ>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -192,6 +192,14 @@ declare namespace i18n {
 
     //#region __n()
 
+    /**
+     * Translate with plural condition the given phrase and count using locale configuration
+     * @param phrase - Short phrase to be translated. All plural options ("one", "few", other", ...) have to be provided by your translation file
+     * @param count - The number which allow to select from plural to singular
+     * @returns The translated phrase
+     */
+    function __n(phrase: string, count: number): string;
+
     /**
      * Translate with plural condition the given phrase and count using locale configuration
      * @param options - Options for plural translate
@@ -346,6 +354,14 @@ interface i18nAPI {
 
     //#region __n()
 
+    /**
+     * Translate with plural condition the given phrase and count using locale configuration
+     * @param phrase - Short phrase to be translated. All plural options ("one", "few", other", ...) have to be provided by your translation file
+     * @param count - The number which allow to select from plural to singular
+     * @returns The translated phrase
+     */
+    __n(phrase: string, count: number): string;
+
     /**
      * Translate with plural condition the given phrase and count using locale configuration
      * @param options - Options for plural translate
diff --git a/types/i18next-browser-languagedetector/index.d.ts b/types/i18next-browser-languagedetector/index.d.ts
index 6eec150445..88dbe79d8d 100644
--- a/types/i18next-browser-languagedetector/index.d.ts
+++ b/types/i18next-browser-languagedetector/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for i18next-browser-languagedetector 2.0
-// Project: http://i18next.com/
+// Project: http://i18next.com/, https://github.com/i18next/i18next-browser-languagedetector
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/i18next-xhr-backend/i18next-xhr-backend-tests.ts b/types/i18next-xhr-backend/i18next-xhr-backend-tests.ts
deleted file mode 100644
index 858b2b28f9..0000000000
--- a/types/i18next-xhr-backend/i18next-xhr-backend-tests.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import * as i18next from "i18next";
-import * as XHR from "i18next-xhr-backend";
-
-const options: XHR.BackendOptions = {
-    loadPath: "/locales/{{lng}}/{{ns}}.json",
-    addPath: "locales/add/{{lng}}/{{ns}}",
-    allowMultiLoading: false,
-    parse: (data: string) => data.replace(/a/g, ""),
-    crossDomain: false,
-    withCredentials: false,
-    ajax: (url: string, options: XHR.BackendOptions, callback: XHR.AjaxRequestCallback, data: {}) => { },
-    queryStringParams: { v: "1.3.5" }
-};
-
-i18next
-    .use(XHR)
-    .init({
-        backend: options
-    });
-
-const xhr = new XHR();
-xhr.init(options);
-const xhr2 = new XHR(null, options);
-const type: string = xhr.type;
-const newOptions: XHR.BackendOptions = xhr.options;
-xhr.create("en", "ns", "key", "value");
-xhr.create(["en", "us"], "ns", "key", "value");
-xhr.read("en", "ns", (error: any, result: string | false) => { });
-xhr.readMulti(["en"], ["ns"], (error: any, result: string | false) => { });
-xhr.loadUrl("someurl", (error: any, result: string) => { });
diff --git a/types/i18next-xhr-backend/index.d.ts b/types/i18next-xhr-backend/index.d.ts
deleted file mode 100644
index c4e8a41b4a..0000000000
--- a/types/i18next-xhr-backend/index.d.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-// Type definitions for i18next-xhr-backend 1.4
-// Project: https://github.com/i18next/i18next-xhr-backend
-// Definitions by: Jan Mühlemann <https://github.com/jamuhl>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-declare namespace I18NextXhrBackend {
-    type LoadPathOption = string | ((lngs: string[], namespaces: string[]) => string);
-
-    interface BackendOptions {
-        /**
-         * path where resources get loaded from, or a function
-         * returning a path:
-         * function(lngs, namespaces) { return customPath; }
-         * the returned path will interpolate lng, ns if provided like giving a static path
-         */
-        loadPath?: LoadPathOption;
-        /**
-         * path to post missing resources
-         */
-        addPath?: string;
-        /**
-         * your backend server supports multiLoading
-         * locales/resources.json?lng=de+en&ns=ns1+ns2
-         * set loadPath: '/locales/resources.json?lng={{lng}}&ns={{ns}}' to adapt to multiLoading
-         */
-        allowMultiLoading?: boolean;
-        /**
-         * parse data after it has been fetched
-         * in example use https://www.npmjs.com/package/json5
-         * here it removes the letter a from the json (bad idea)
-         */
-        parse?(data: string): string;
-        /**
-         * allow cross domain requests
-         */
-        crossDomain?: boolean;
-        /**
-         * allow credentials on cross domain requests
-         */
-        withCredentials?: boolean;
-        /**
-         * define a custom xhr function
-         * can be used to support XDomainRequest in IE 8 and 9
-         */
-        ajax?(url: string, options: BackendOptions, callback: AjaxRequestCallback, data: {} | string, cache: boolean): void;
-        /**
-         * adds parameters to resource URL. 'example.com' -> 'example.com?v=1.3.5'
-         */
-        queryStringParams?: { [key: string]: string };
-
-        /**
-         * @see https://github.com/i18next/i18next-xhr-backend/blob/281c7e235e1157b33122adacef1957252e5700f1/src/ajax.js#L52
-         */
-        customHeaders?: { [key: string]: string };
-    }
-
-    type AjaxRequestCallback = (response: string, x: XMLHttpRequest) => void;
-
-    type LoadCallback = (error: any, result: string | false) => void;
-}
-
-declare class I18NextXhrBackend {
-    constructor(services?: any, options?: I18NextXhrBackend.BackendOptions);
-    init(options?: I18NextXhrBackend.BackendOptions): void;
-    readMulti(languages: string[], namespaces: string[], callback: I18NextXhrBackend.LoadCallback): void;
-    read(language: string, namespace: string, callback: I18NextXhrBackend.LoadCallback): void;
-    loadUrl(url: string, callback: I18NextXhrBackend.LoadCallback): void;
-    create(languages: string | string[], namespace: string, key: string, fallbackValue: string): void;
-    type: "backend";
-    services: any;
-    options: I18NextXhrBackend.BackendOptions;
-}
-
-export = I18NextXhrBackend;
diff --git a/types/i18next-xhr-backend/tsconfig.json b/types/i18next-xhr-backend/tsconfig.json
deleted file mode 100644
index a7ca4c2adb..0000000000
--- a/types/i18next-xhr-backend/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "i18next-xhr-backend-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/idyll-compiler/index.d.ts b/types/idyll-compiler/index.d.ts
index 577dae2070..91b25eeb29 100644
--- a/types/idyll-compiler/index.d.ts
+++ b/types/idyll-compiler/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for idyll-compiler 3.1
-// Project: https://github.com/idyll-lang/idyll/tree/master/packages/idyll-compiler
+// Project: https://github.com/idyll-lang/idyll/tree/master/packages/idyll-compiler, https://github.com/idyll-lang/idyll
 // Definitions by: Thanh Ngo <https://github.com/iocat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/idyll/index.d.ts b/types/idyll/index.d.ts
index a2f1846a7a..2ad9751fde 100644
--- a/types/idyll/index.d.ts
+++ b/types/idyll/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for idyll 2.10
-// Project: https://github.com/idyll-lang/idyll/tree/master/packages/idyll-cli
+// Project: https://github.com/idyll-lang/idyll/tree/master/packages/idyll-cli, https://github.com/idyll-lang/idyll
 // Definitions by: Thanh Ngo <https://github.com/iocat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/ignite-ui/index.d.ts b/types/ignite-ui/index.d.ts
index 29d809964a..44620024ca 100644
--- a/types/ignite-ui/index.d.ts
+++ b/types/ignite-ui/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Ignite UI 18.1
+// Type definitions for Ignite UI 18.2
 // Project: https://github.com/IgniteUI/ignite-ui
 // Definitions by: Ignite UI <https://github.com/IgniteUI>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10897,6 +10897,12 @@ interface SeriesPointerUpEvent {
 
 interface SeriesPointerUpEventUIParam {}
 
+interface CalloutStyleUpdatingEvent {
+	(event: Event, ui: CalloutStyleUpdatingEventUIParam): void;
+}
+
+interface CalloutStyleUpdatingEventUIParam {}
+
 interface IgCategoryChart {
 	/**
 	 * Gets or sets the id of a template element to use for tooltips, or markup representing the tooltip template.
@@ -11066,6 +11072,12 @@ interface IgCategoryChart {
 	 */
 	isVerticalZoomEnabled?: boolean;
 
+	/**
+	 * Gets or sets whether the chart can highlight series through user interactions.
+	 * This property applies to Category Chart and Financial Chart controls.
+	 */
+	isSeriesHighlightingEnabled?: boolean;
+
 	/**
 	 * Gets or sets the rectangle representing the current scroll and zoom state of the chart.
 	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
@@ -11197,6 +11209,79 @@ interface IgCategoryChart {
 	alignsGridLinesToPixels?: boolean;
 	trendLinePeriod?: number;
 
+	/**
+	 * Gets or sets the style of tooltip to be displayed.
+	 *
+	 * Valid values:
+	 * "default" Display default tooltip for each series in the chart.
+	 * "item" Display individual tooltips for all series in the chart.
+	 * "category" Display combined tooltip for all series in the chart.
+	 * "none" Display no tooltips in the chart.
+	 */
+	toolTipType?: string;
+
+	/**
+	 * Gets or sets the crosshairs to be displayed.
+	 *
+	 * Valid values:
+	 * "default" Display default number of crosshair lines in the chart.
+	 * "none" Display no crosshair lines in the chart.
+	 * "horizontal" Display horizontal line of crosshairs in the chart.
+	 * "vertical" Display vertical line of crosshairs in the chart.
+	 * "both" Display both horizontal and vertical lines of crosshairs in the chart.
+	 */
+	crosshairsDisplayMode?: string;
+
+	/**
+	 * Gets or sets whether crosshairs will snap to the nearest data point.
+	 */
+	crosshairsSnapToData?: boolean;
+
+	/**
+	 * Gets or sets whether annotations are shown along the axis for crosshair values
+	 */
+	crosshairsAnnotationEnabled?: boolean;
+
+	/**
+	 * Gets or sets whether annotations for the final value of each series is displayed on the axis.
+	 */
+	finalValueAnnotationsVisible?: boolean;
+
+	/**
+	 * Gets or sets if callouts should be displayed.
+	 */
+	calloutsVisible?: boolean;
+
+	/**
+	 * Gets or sets if event annotations should be displayed.
+	 */
+	calloutStyleUpdatingEventEnabled?: boolean;
+
+	/**
+	 * Gets or sets the collection of callout data to be annotated.
+	 */
+	calloutsItemsSource?: any;
+
+	/**
+	 * Gets or sets the member path of the X data for the callouts.
+	 */
+	calloutsXMemberPath?: string;
+
+	/**
+	 * Gets or sets the member path of the Y data for the callouts.
+	 */
+	calloutsYMemberPath?: string;
+
+	/**
+	 * Gets or sets the member path of the label data for the callouts.
+	 */
+	calloutsLabelMemberPath?: string;
+
+	/**
+	 * Gets or sets the member path of the content data for the callouts.
+	 */
+	calloutsContentMemberPath?: string;
+
 	/**
 	 * Gets or sets function which takes an context object and returns a formatted label for the X-axis.
 	 */
@@ -11343,7 +11428,7 @@ interface IgCategoryChart {
 	xAxisLabel?: any;
 
 	/**
-	 * Gets or sets the format for labels along the Y-axis.
+	 * Gets or sets the property or string from which the labels are derived.
 	 */
 	yAxisLabel?: any;
 
@@ -11750,6 +11835,16 @@ interface IgCategoryChart {
 	 */
 	yAxisAbbreviateLargeNumbers?: boolean;
 
+	/**
+	 * Gets or sets whether the category should be highlighted when hovered
+	 */
+	isCategoryHighlightingEnabled?: boolean;
+
+	/**
+	 * Gets or sets whether the item should be highlighted when hovered
+	 */
+	isItemHighlightingEnabled?: boolean;
+
 	/**
 	 * The width of the chart.
 	 */
@@ -11832,6 +11927,11 @@ interface IgCategoryChart {
 	 */
 	seriesPointerUp?: SeriesPointerUpEvent;
 
+	/**
+	 * Occurs when the style of a callout is updated.
+	 */
+	calloutStyleUpdating?: CalloutStyleUpdatingEvent;
+
 	/**
 	 * Event which is raised before data binding.
 	 * Return false in order to cancel data binding.
@@ -12406,6 +12506,20 @@ interface JQuery {
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "isVerticalZoomEnabled", optionValue: boolean): void;
 
+	/**
+	 * Gets  whether the chart can highlight series through user interactions.
+	 * This property applies to Category Chart and Financial Chart controls.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "isSeriesHighlightingEnabled"): boolean;
+
+	/**
+	 * Sets whether the chart can highlight series through user interactions.
+	 * This property applies to Category Chart and Financial Chart controls.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "isSeriesHighlightingEnabled", optionValue: boolean): void;
+
 	/**
 	 * Gets  the rectangle representing the current scroll and zoom state of the chart.
 	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
@@ -12646,6 +12760,154 @@ interface JQuery {
 	igCategoryChart(optionLiteral: 'option', optionName: "trendLinePeriod"): number;
 	igCategoryChart(optionLiteral: 'option', optionName: "trendLinePeriod", optionValue: number): void;
 
+	/**
+	 * Gets  the style of tooltip to be displayed.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "toolTipType"): string;
+
+	/**
+	 * Sets the style of tooltip to be displayed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "toolTipType", optionValue: string): void;
+
+	/**
+	 * Gets  the crosshairs to be displayed.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "crosshairsDisplayMode"): string;
+
+	/**
+	 * Sets the crosshairs to be displayed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "crosshairsDisplayMode", optionValue: string): void;
+
+	/**
+	 * Gets  whether crosshairs will snap to the nearest data point.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "crosshairsSnapToData"): boolean;
+
+	/**
+	 * Sets whether crosshairs will snap to the nearest data point.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "crosshairsSnapToData", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether annotations are shown along the axis for crosshair values
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "crosshairsAnnotationEnabled"): boolean;
+
+	/**
+	 * Sets whether annotations are shown along the axis for crosshair values
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "crosshairsAnnotationEnabled", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether annotations for the final value of each series is displayed on the axis.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "finalValueAnnotationsVisible"): boolean;
+
+	/**
+	 * Sets whether annotations for the final value of each series is displayed on the axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "finalValueAnnotationsVisible", optionValue: boolean): void;
+
+	/**
+	 * Gets  if callouts should be displayed.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutsVisible"): boolean;
+
+	/**
+	 * Sets if callouts should be displayed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutsVisible", optionValue: boolean): void;
+
+	/**
+	 * Gets  if event annotations should be displayed.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutStyleUpdatingEventEnabled"): boolean;
+
+	/**
+	 * Sets if event annotations should be displayed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutStyleUpdatingEventEnabled", optionValue: boolean): void;
+
+	/**
+	 * Gets  the collection of callout data to be annotated.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutsItemsSource"): any;
+
+	/**
+	 * Sets the collection of callout data to be annotated.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutsItemsSource", optionValue: any): void;
+
+	/**
+	 * Gets  the member path of the X data for the callouts.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutsXMemberPath"): string;
+
+	/**
+	 * Sets the member path of the X data for the callouts.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutsXMemberPath", optionValue: string): void;
+
+	/**
+	 * Gets  the member path of the Y data for the callouts.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutsYMemberPath"): string;
+
+	/**
+	 * Sets the member path of the Y data for the callouts.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutsYMemberPath", optionValue: string): void;
+
+	/**
+	 * Gets  the member path of the label data for the callouts.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutsLabelMemberPath"): string;
+
+	/**
+	 * Sets the member path of the label data for the callouts.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutsLabelMemberPath", optionValue: string): void;
+
+	/**
+	 * Gets  the member path of the content data for the callouts.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutsContentMemberPath"): string;
+
+	/**
+	 * Sets the member path of the content data for the callouts.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutsContentMemberPath", optionValue: string): void;
+
 	/**
 	 * Gets  function which takes an context object and returns a formatted label for the X-axis.
 	 */
@@ -12995,12 +13257,12 @@ interface JQuery {
 	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabel", optionValue: any): void;
 
 	/**
-	 * Gets  the format for labels along the Y-axis.
+	 * Gets  the property or string from which the labels are derived.
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabel"): any;
 
 	/**
-	 * Sets the format for labels along the Y-axis.
+	 * Sets the property or string from which the labels are derived.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -13758,6 +14020,30 @@ interface JQuery {
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "yAxisAbbreviateLargeNumbers", optionValue: boolean): void;
 
+	/**
+	 * Gets  whether the category should be highlighted when hovered
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "isCategoryHighlightingEnabled"): boolean;
+
+	/**
+	 * Sets whether the category should be highlighted when hovered
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "isCategoryHighlightingEnabled", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether the item should be highlighted when hovered
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "isItemHighlightingEnabled"): boolean;
+
+	/**
+	 * Sets whether the item should be highlighted when hovered
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "isItemHighlightingEnabled", optionValue: boolean): void;
+
 	/**
 	 * The width of the chart.
 	 */
@@ -13954,6 +14240,18 @@ interface JQuery {
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "seriesPointerUp", optionValue: SeriesPointerUpEvent): void;
 
+	/**
+	 * Occurs when the style of a callout is updated.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutStyleUpdating"): CalloutStyleUpdatingEvent;
+
+	/**
+	 * Occurs when the style of a callout is updated.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "calloutStyleUpdating", optionValue: CalloutStyleUpdatingEvent): void;
+
 	/**
 	 * Event which is raised before data binding.
 	 * Return false in order to cancel data binding.
@@ -15245,7 +15543,7 @@ interface IgDataChartSeries {
 	 * Valid values:
 	 * "maximum" Consolidated items will be positioned using their maximum value.
 	 * "minimum" Consolidated items will be positioned using their minimum value.
-	 * "median" Consolidated items will be positioned using their median value.
+	 * "median" Consolidated items will be positioned at the midpoint of the range.
 	 * "relativeMinimum" Consolidated items will be positioned using the value nearest to the reference value of the corresponding axis.
 	 * "relativeMaximum" Consolidated items will be positioned using the value farthest from the reference value of the corresponding axis.
 	 */
@@ -15319,6 +15617,273 @@ interface IgDataChartSeries {
 	 */
 	hitTestMode?: string;
 
+	/**
+	 * Gets or sets the brush that specifies how the backgrounds for the callouts of the layer are painted.
+	 */
+	calloutBackground?: string;
+
+	/**
+	 * Gets or sets the strategy to use for avoiding collisions between the callouts in this layer. Leave unset for an automatic value.
+	 *
+	 * Valid values:
+	 * "auto" automatically decide the collision strategy.
+	 * "simulatedAnnealing" use a simulated annealing based collision strategy. This is higher quality, but takes longer, and is performed time-sliced in the background until an acceptable quality is reached.
+	 * "greedy" use a greedy algorithm to avoid collisions. This is cheap and predictable, but of comparatively low quality.
+	 * "greedyCenterOfMass" use a greedy algorithm with localized center of mass hints to avoid collisions. This is relatively cheap to perform, compared to the simulated annealing approach, but is of comparatively lower quality.
+	 */
+	calloutCollisionMode?: string;
+
+	/**
+	 * Gets or sets the brush that specifies how the leader lines for the callouts of the layer are painted.
+	 */
+	calloutLeaderBrush?: string;
+
+	/**
+	 * Gets or sets the brush that specifies how the outlines for the callouts of the layer are painted.
+	 */
+	calloutOutline?: string;
+
+	/**
+	 * Gets or sets the left padding to use withing the callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	calloutPaddingLeft?: number;
+
+	/**
+	 * Gets or sets the top padding to use withing the callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	calloutPaddingTop?: number;
+
+	/**
+	 * Gets or sets the right padding to use withing the callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	calloutPaddingRight?: number;
+
+	/**
+	 * Gets or sets the bottom padding to use withing the callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	calloutPaddingBottom?: number;
+
+	/**
+	 * Gets or sets the padding to add to the callout positioning. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	calloutPositionPadding?: number;
+
+	/**
+	 * Gets or sets the stroke thickness for the callout backing. Leave unset for an automatic value.
+	 */
+	calloutStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the color to use for the callout text. Leave unset for an automatic value.
+	 */
+	calloutTextColor?: string;
+
+	/**
+	 * Gets or sets the content mapping property for the callouts.
+	 */
+	contentMemberPath?: string;
+
+	/**
+	 * Gets or sets whether to allow the callouts to be variable distances from the target points, for suppporting collision modes.
+	 */
+	isCalloutOffsettingEnabled?: boolean;
+
+	/**
+	 * Gets or sets the key mapping property for the callouts.
+	 */
+	keyMemberPath?: string;
+
+	/**
+	 * Gets or sets the color to use for the axis annotation backing. Leave unset for an automatic value.
+	 */
+	axisAnnotationBackground?: string;
+
+	/**
+	 * Gets or sets the color to use for the x axis annotation backing. Leave unset for an automatic value.
+	 */
+	xAxisAnnotationBackground?: string;
+
+	/**
+	 * Gets or sets the color to use for the y axis annotation backing. Leave unset for an automatic value.
+	 */
+	yAxisAnnotationBackground?: string;
+
+	/**
+	 * Gets or sets the color to use for the axis annotation outline. Leave unset for an automatic value.
+	 */
+	axisAnnotationOutline?: string;
+
+	/**
+	 * Gets or sets the color to use for the x axis annotation outline. Leave unset for an automatic value.
+	 */
+	xAxisAnnotationOutline?: string;
+
+	/**
+	 * Gets or sets the color to use for the y axis annotation outline. Leave unset for an automatic value.
+	 */
+	yAxisAnnotationOutline?: string;
+
+	/**
+	 * Gets or sets the color to use for the axis annotation text. Leave unset for an automatic value.
+	 */
+	axisAnnotationTextColor?: string;
+
+	/**
+	 * Gets or sets the color to use for the x axis annotation text. Leave unset for an automatic value.
+	 */
+	xAxisAnnotationTextColor?: string;
+
+	/**
+	 * Gets or sets the color to use for the y axis annotation text. Leave unset for an automatic value.
+	 */
+	yAxisAnnotationTextColor?: string;
+
+	/**
+	 * Gets or sets the left padding to use withing the axis annotation callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	axisAnnotationPaddingLeft?: number;
+
+	/**
+	 * Gets or sets the left padding to use withing the x axis annotation callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	xAxisAnnotationPaddingLeft?: number;
+
+	/**
+	 * Gets or sets the left padding to use withing the y axis annotation callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	yAxisAnnotationPaddingLeft?: number;
+
+	/**
+	 * Gets or sets the top padding to use withing the axis annotation callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	axisAnnotationPaddingTop?: number;
+
+	/**
+	 * Gets or sets the top padding to use withing the x axis annotation callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	xAxisAnnotationPaddingTop?: number;
+
+	/**
+	 * Gets or sets the top padding to use withing the y axis annotation callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	yAxisAnnotationPaddingTop?: number;
+
+	/**
+	 * Gets or sets the right padding to use withing the axis annotation callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	axisAnnotationPaddingRight?: number;
+
+	/**
+	 * Gets or sets the right padding to use withing the x axis annotation callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	xAxisAnnotationPaddingRight?: number;
+
+	/**
+	 * Gets or sets the right padding to use withing the y axis annotation callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	yAxisAnnotationPaddingRight?: number;
+
+	/**
+	 * Gets or sets the bottom padding to use withing the axis annotation callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	axisAnnotationPaddingBottom?: number;
+
+	/**
+	 * Gets or sets the bottom padding to use withing the x axis annotation callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	xAxisAnnotationPaddingBottom?: number;
+
+	/**
+	 * Gets or sets the bottom padding to use withing the y axis annotation callout. Leaving this NaN will use an automatic value related to the axis label margins.
+	 */
+	yAxisAnnotationPaddingBottom?: number;
+
+	/**
+	 * Gets or sets the stroke thickness for the axis annotation backing. Leave unset for an automatic value.
+	 */
+	axisAnnotationStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the stroke thickness for the x axis annotation backing. Leave unset for an automatic value.
+	 */
+	xAxisAnnotationStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the stroke thickness for the y axis annotation backing. Leave unset for an automatic value.
+	 */
+	yAxisAnnotationStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the stroke thickness for the y axis annotation backing. Leave unset for an automatic value.
+	 *
+	 * Valid values:
+	 * "auto" a mode is selected automatically
+	 * "finalVisible" displays the last value visible.
+	 * "finalVisibleInterpolated" displays an interploated last value for when the series leaves view.
+	 * "final" displays the last value in the series, whether visible or not.
+	 */
+	finalValueSelectionMode?: string;
+
+	/**
+	 * Gets or sets the color to use for the horizontal line. Leave null for an automatic value.
+	 */
+	horizontalLineStroke?: string;
+
+	/**
+	 * Gets or sets the color to use for the vertical line. Leave null for an automatic value.
+	 */
+	verticalLineStroke?: string;
+
+	/**
+	 * Gets or sets whether to draw annotations over the axes where the crosshair meets with them.
+	 */
+	isAxisAnnotationEnabled?: boolean;
+
+	/**
+	 * Sets or gets a function which takes an object that produces a formatted label for displaying in the axis annotation.
+	 */
+	axisAnnoationFormatLabel?: any;
+
+	/**
+	 * Sets or gets a function which takes an object that produces a formatted label for displaying in the x axis annotation.
+	 */
+	xAxisAnnoationFormatLabel?: any;
+
+	/**
+	 * Sets or gets a function which takes an object that produces a formatted label for displaying in the y axis annotation.
+	 */
+	yAxisAnnoationFormatLabel?: any;
+
+	/**
+	 * Sets or gets a function which allows you to decide upon the label that gets used for an automatically created callout.
+	 */
+	calloutLabelUpdating?: any;
+
+	/**
+	 * Sets or gets a function which allows you to decide upon the content that gets used for an automatically created callout.
+	 */
+	calloutContentUpdating?: any;
+
+	/**
+	 * Sets or gets a function which allows you to decide upon the series that gets used for a data bound callout.
+	 */
+	calloutSeriesSelecting?: any;
+
+	/**
+	 * Gets or sets the precision to use displaying values for interpolated crosshair positions.
+	 */
+	axisAnnotationInterpolatedValuePrecision?: number;
+
+	/**
+	 * Gets or sets the precision to use displaying values for interpolated crosshair positions.
+	 */
+	xAxisAnnotationInterpolatedValuePrecision?: number;
+
+	/**
+	 * Gets or sets the precision to use displaying values for interpolated crosshair positions.
+	 */
+	yAxisAnnotationInterpolatedValuePrecision?: number;
+
 	/**
 	 * Option for IgDataChartSeries
 	 */
@@ -39491,6 +40056,12 @@ interface IgFinancialChart {
 	 */
 	isVerticalZoomEnabled?: boolean;
 
+	/**
+	 * Gets or sets whether the chart can highlight series through user interactions.
+	 * This property applies to Category Chart and Financial Chart controls.
+	 */
+	isSeriesHighlightingEnabled?: boolean;
+
 	/**
 	 * Gets or sets the rectangle representing the current scroll and zoom state of the chart.
 	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
@@ -39622,6 +40193,79 @@ interface IgFinancialChart {
 	alignsGridLinesToPixels?: boolean;
 	trendLinePeriod?: number;
 
+	/**
+	 * Gets or sets the style of tooltip to be displayed.
+	 *
+	 * Valid values:
+	 * "default" Display default tooltip for each series in the chart.
+	 * "item" Display individual tooltips for all series in the chart.
+	 * "category" Display combined tooltip for all series in the chart.
+	 * "none" Display no tooltips in the chart.
+	 */
+	toolTipType?: string;
+
+	/**
+	 * Gets or sets the crosshairs to be displayed.
+	 *
+	 * Valid values:
+	 * "default" Display default number of crosshair lines in the chart.
+	 * "none" Display no crosshair lines in the chart.
+	 * "horizontal" Display horizontal line of crosshairs in the chart.
+	 * "vertical" Display vertical line of crosshairs in the chart.
+	 * "both" Display both horizontal and vertical lines of crosshairs in the chart.
+	 */
+	crosshairsDisplayMode?: string;
+
+	/**
+	 * Gets or sets whether crosshairs will snap to the nearest data point.
+	 */
+	crosshairsSnapToData?: boolean;
+
+	/**
+	 * Gets or sets whether annotations are shown along the axis for crosshair values
+	 */
+	crosshairsAnnotationEnabled?: boolean;
+
+	/**
+	 * Gets or sets whether annotations for the final value of each series is displayed on the axis.
+	 */
+	finalValueAnnotationsVisible?: boolean;
+
+	/**
+	 * Gets or sets if callouts should be displayed.
+	 */
+	calloutsVisible?: boolean;
+
+	/**
+	 * Gets or sets if event annotations should be displayed.
+	 */
+	calloutStyleUpdatingEventEnabled?: boolean;
+
+	/**
+	 * Gets or sets the collection of callout data to be annotated.
+	 */
+	calloutsItemsSource?: any;
+
+	/**
+	 * Gets or sets the member path of the X data for the callouts.
+	 */
+	calloutsXMemberPath?: string;
+
+	/**
+	 * Gets or sets the member path of the Y data for the callouts.
+	 */
+	calloutsYMemberPath?: string;
+
+	/**
+	 * Gets or sets the member path of the label data for the callouts.
+	 */
+	calloutsLabelMemberPath?: string;
+
+	/**
+	 * Gets or sets the member path of the content data for the callouts.
+	 */
+	calloutsContentMemberPath?: string;
+
 	/**
 	 * Gets or sets function which takes an context object and returns a formatted label for the X-axis.
 	 */
@@ -39768,7 +40412,7 @@ interface IgFinancialChart {
 	xAxisLabel?: any;
 
 	/**
-	 * Gets or sets the format for labels along the Y-axis.
+	 * Gets or sets the property or string from which the labels are derived.
 	 */
 	yAxisLabel?: any;
 
@@ -40025,7 +40669,7 @@ interface IgFinancialChart {
 	chartTypePickerTemplate?: any;
 	trendLineTypePickerTemplate?: any;
 	volumeTypePickerTemplate?: any;
-	indicatorPickerTemplate?: any;
+	indicatorMenuTemplate?: any;
 	overlayPickerTemplate?: any;
 	toolbarHeight?: number;
 
@@ -40129,11 +40773,11 @@ interface IgFinancialChart {
 	yAxisAbbreviateLargeNumbers?: boolean;
 
 	/**
-	 * The type of series to display in the zoom slider pane.
+	 * Gets or sets type of series to display in the zoom slider pane.
 	 *
 	 * Valid values:
 	 * "none" Do not display the zoom slider pane.
-	 * "auto"
+	 * "auto" In the zoom slider pane, match the series type in the price pane.
 	 * "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.
@@ -40256,9 +40900,37 @@ interface IgFinancialChart {
 	 * When CustomIndicatorNames is set, the ApplyCustomIndicators event will be raised for each custom indicator name.
 	 */
 	customIndicatorNames?: any;
-	zoomSliderXAxisMajorStroke?: any;
+
+	/**
+	 * Gets or sets stroke brush of major gridlines on x-axis of the zoom slider pane
+	 */
+	zoomSliderXAxisMajorStroke?: string;
+
+	/**
+	 * Gets or sets thickness of major gridlines on x-axis of the zoom slider pane
+	 */
 	zoomSliderXAxisMajorStrokeThickness?: number;
 
+	/**
+	 * Gets or sets weather or not a legend is visible between toolbar and chart's plot area
+	 */
+	isLegendVisible?: boolean;
+
+	/**
+	 * Gets or sets a legend displayed between toolbar and chart's plot area
+	 */
+	financialChartLegend?: any;
+
+	/**
+	 * Gets or sets minimum value on x-axis
+	 */
+	xAxisMinimumValue?: any;
+
+	/**
+	 * Gets or sets maximum value on x-axis
+	 */
+	xAxisMaximumValue?: any;
+
 	/**
 	 * The width of the chart.
 	 */
@@ -40341,6 +41013,11 @@ interface IgFinancialChart {
 	 */
 	seriesPointerUp?: SeriesPointerUpEvent;
 
+	/**
+	 * Occurs when the style of a callout is updated.
+	 */
+	calloutStyleUpdating?: CalloutStyleUpdatingEvent;
+
 	/**
 	 * Event raised by the chart when custom indicator data is needed from the application.
 	 * During series rendering, event will be raised once for each value in the CustomIndicatorNames collection.
@@ -40921,6 +41598,20 @@ interface JQuery {
 	 */
 	igFinancialChart(optionLiteral: 'option', optionName: "isVerticalZoomEnabled", optionValue: boolean): void;
 
+	/**
+	 * Gets  whether the chart can highlight series through user interactions.
+	 * This property applies to Category Chart and Financial Chart controls.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "isSeriesHighlightingEnabled"): boolean;
+
+	/**
+	 * Sets whether the chart can highlight series through user interactions.
+	 * This property applies to Category Chart and Financial Chart controls.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "isSeriesHighlightingEnabled", optionValue: boolean): void;
+
 	/**
 	 * Gets  the rectangle representing the current scroll and zoom state of the chart.
 	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
@@ -41161,6 +41852,154 @@ interface JQuery {
 	igFinancialChart(optionLiteral: 'option', optionName: "trendLinePeriod"): number;
 	igFinancialChart(optionLiteral: 'option', optionName: "trendLinePeriod", optionValue: number): void;
 
+	/**
+	 * Gets  the style of tooltip to be displayed.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "toolTipType"): string;
+
+	/**
+	 * Sets the style of tooltip to be displayed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "toolTipType", optionValue: string): void;
+
+	/**
+	 * Gets  the crosshairs to be displayed.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "crosshairsDisplayMode"): string;
+
+	/**
+	 * Sets the crosshairs to be displayed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "crosshairsDisplayMode", optionValue: string): void;
+
+	/**
+	 * Gets  whether crosshairs will snap to the nearest data point.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "crosshairsSnapToData"): boolean;
+
+	/**
+	 * Sets whether crosshairs will snap to the nearest data point.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "crosshairsSnapToData", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether annotations are shown along the axis for crosshair values
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "crosshairsAnnotationEnabled"): boolean;
+
+	/**
+	 * Sets whether annotations are shown along the axis for crosshair values
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "crosshairsAnnotationEnabled", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether annotations for the final value of each series is displayed on the axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "finalValueAnnotationsVisible"): boolean;
+
+	/**
+	 * Sets whether annotations for the final value of each series is displayed on the axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "finalValueAnnotationsVisible", optionValue: boolean): void;
+
+	/**
+	 * Gets  if callouts should be displayed.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutsVisible"): boolean;
+
+	/**
+	 * Sets if callouts should be displayed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutsVisible", optionValue: boolean): void;
+
+	/**
+	 * Gets  if event annotations should be displayed.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutStyleUpdatingEventEnabled"): boolean;
+
+	/**
+	 * Sets if event annotations should be displayed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutStyleUpdatingEventEnabled", optionValue: boolean): void;
+
+	/**
+	 * Gets  the collection of callout data to be annotated.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutsItemsSource"): any;
+
+	/**
+	 * Sets the collection of callout data to be annotated.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutsItemsSource", optionValue: any): void;
+
+	/**
+	 * Gets  the member path of the X data for the callouts.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutsXMemberPath"): string;
+
+	/**
+	 * Sets the member path of the X data for the callouts.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutsXMemberPath", optionValue: string): void;
+
+	/**
+	 * Gets  the member path of the Y data for the callouts.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutsYMemberPath"): string;
+
+	/**
+	 * Sets the member path of the Y data for the callouts.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutsYMemberPath", optionValue: string): void;
+
+	/**
+	 * Gets  the member path of the label data for the callouts.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutsLabelMemberPath"): string;
+
+	/**
+	 * Sets the member path of the label data for the callouts.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutsLabelMemberPath", optionValue: string): void;
+
+	/**
+	 * Gets  the member path of the content data for the callouts.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutsContentMemberPath"): string;
+
+	/**
+	 * Sets the member path of the content data for the callouts.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutsContentMemberPath", optionValue: string): void;
+
 	/**
 	 * Gets  function which takes an context object and returns a formatted label for the X-axis.
 	 */
@@ -41510,12 +42349,12 @@ interface JQuery {
 	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabel", optionValue: any): void;
 
 	/**
-	 * Gets  the format for labels along the Y-axis.
+	 * Gets  the property or string from which the labels are derived.
 	 */
 	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabel"): any;
 
 	/**
-	 * Sets the format for labels along the Y-axis.
+	 * Sets the property or string from which the labels are derived.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -42016,8 +42855,8 @@ interface JQuery {
 	igFinancialChart(optionLiteral: 'option', optionName: "trendLineTypePickerTemplate", optionValue: any): void;
 	igFinancialChart(optionLiteral: 'option', optionName: "volumeTypePickerTemplate"): any;
 	igFinancialChart(optionLiteral: 'option', optionName: "volumeTypePickerTemplate", optionValue: any): void;
-	igFinancialChart(optionLiteral: 'option', optionName: "indicatorPickerTemplate"): any;
-	igFinancialChart(optionLiteral: 'option', optionName: "indicatorPickerTemplate", optionValue: any): void;
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorMenuTemplate"): any;
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorMenuTemplate", optionValue: any): void;
 	igFinancialChart(optionLiteral: 'option', optionName: "overlayPickerTemplate"): any;
 	igFinancialChart(optionLiteral: 'option', optionName: "overlayPickerTemplate", optionValue: any): void;
 	igFinancialChart(optionLiteral: 'option', optionName: "toolbarHeight"): number;
@@ -42218,13 +43057,13 @@ interface JQuery {
 	igFinancialChart(optionLiteral: 'option', optionName: "yAxisAbbreviateLargeNumbers", optionValue: boolean): void;
 
 	/**
-	 * The type of series to display in the zoom slider pane.
+	 * Gets  type of series to display in the zoom slider pane.
 	 */
 
 	igFinancialChart(optionLiteral: 'option', optionName: "zoomSliderType"): string;
 
 	/**
-	 * The type of series to display in the zoom slider pane.
+	 * Sets type of series to display in the zoom slider pane.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -42502,11 +43341,79 @@ 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;
+
+	/**
+	 * Gets  stroke brush of major gridlines on x-axis of the zoom slider pane
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "zoomSliderXAxisMajorStroke"): string;
+
+	/**
+	 * Sets stroke brush of major gridlines on x-axis of the zoom slider pane
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "zoomSliderXAxisMajorStroke", optionValue: string): void;
+
+	/**
+	 * Gets  thickness of major gridlines on x-axis of the zoom slider pane
+	 */
 	igFinancialChart(optionLiteral: 'option', optionName: "zoomSliderXAxisMajorStrokeThickness"): number;
+
+	/**
+	 * Sets thickness of major gridlines on x-axis of the zoom slider pane
+	 *
+	 * @optionValue New value to be set.
+	 */
 	igFinancialChart(optionLiteral: 'option', optionName: "zoomSliderXAxisMajorStrokeThickness", optionValue: number): void;
 
+	/**
+	 * Gets  weather or not a legend is visible between toolbar and chart's plot area
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "isLegendVisible"): boolean;
+
+	/**
+	 * Sets weather or not a legend is visible between toolbar and chart's plot area
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "isLegendVisible", optionValue: boolean): void;
+
+	/**
+	 * Gets  a legend displayed between toolbar and chart's plot area
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "financialChartLegend"): any;
+
+	/**
+	 * Sets a legend displayed between toolbar and chart's plot area
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "financialChartLegend", optionValue: any): void;
+
+	/**
+	 * Gets  minimum value on x-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisMinimumValue"): any;
+
+	/**
+	 * Sets minimum value on x-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisMinimumValue", optionValue: any): void;
+
+	/**
+	 * Gets  maximum value on x-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisMaximumValue"): any;
+
+	/**
+	 * Sets maximum value on x-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisMaximumValue", optionValue: any): void;
+
 	/**
 	 * The width of the chart.
 	 */
@@ -42703,6 +43610,18 @@ interface JQuery {
 	 */
 	igFinancialChart(optionLiteral: 'option', optionName: "seriesPointerUp", optionValue: SeriesPointerUpEvent): void;
 
+	/**
+	 * Occurs when the style of a callout is updated.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutStyleUpdating"): CalloutStyleUpdatingEvent;
+
+	/**
+	 * Occurs when the style of a callout is updated.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "calloutStyleUpdating", optionValue: CalloutStyleUpdatingEvent): void;
+
 	/**
 	 * Event raised by the chart when custom indicator data is needed from the application.
 	 * During series rendering, event will be raised once for each value in the CustomIndicatorNames collection.
@@ -47643,6 +48562,53 @@ interface IgGridFilteringColumnSetting {
 	 */
 	columnKey?: string;
 
+	/**
+	 * Specifies the type of editor to use for the column.
+	 *
+	 *
+	 * Valid values:
+	 * "text" An igTextEditor will be created
+	 * "mask" An igMaskEditor will be created
+	 * "date" An igDateEditor will be created
+	 * "datepicker" An igDatePicker will be created
+	 * "timepicker" An igTimePikcer will be created
+	 * "numeric" An igNumericEditor will be created
+	 * "checkbox" An igCheckboxEditor will be created
+	 * "currency" An igCurrencyEditor will be created
+	 * "percent" An igPercentEditor will be created
+	 * "combo" An igCombo editor is created. Both the JS and CSS files used by ui.igCombo should be available.
+	 * "rating" An igRating editor is created. Both the JS and CSS files used by ui.igRating should be available.
+	 */
+	editorType?: string;
+
+	/**
+	 * Specifies а custom editor provider instance. More information about editor providers can be found [here](http://www.igniteui.com/help/implementing-custom-editor-provider) and [here](http://www.igniteui.com/help/working-with-combo-editor-provider).
+	 * It should either extend $.ig.EditorProvider or have definitions for the following methods:
+	 * $.ig.EditorProvider = $.ig.EditorProvider|| $.ig.EditorProvider.extend({
+	 * createEditor: function (callbacks, key, editorOptions, tabIndex, format, element) {},
+	 * attachErrorEvents: function (errorShowing, errorShown, errorHidden) {},
+	 * getEditor: function () {},
+	 * refreshValue: function () {},
+	 * getValue: function () {},
+	 * setValue: function (val) {},
+	 * setSize: function (width, height) {},
+	 * setFocus: function () {},
+	 * removeFromParent: function () {},
+	 * destroy: function () {},
+	 * validator: function () {},
+	 * validate: function (noLabel) {},
+	 * isValid: function () {}
+	 * });
+	 *
+	 */
+	editorProvider?: any;
+
+	/**
+	 * Specifies options to initialize the corresponding editor with.
+	 *
+	 */
+	editorOptions?: any;
+
 	/**
 	 * Identifies the grid column by index. Either key or index must be set in every column setting.
 	 *
@@ -47688,6 +48654,10 @@ interface IgGridFilteringColumnSetting {
 	 * "thisYear"
 	 * "nextYear"
 	 * "lastYear"
+	 * "at"
+	 * "notAt"
+	 * "atBefore"
+	 * "atAfter"
 	 */
 	condition?: string|boolean;
 
@@ -47961,6 +48931,30 @@ interface IgGridFilteringLocale {
 	 */
 	nextYearLabel?: string;
 
+	/**
+	 * 'At' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
+	 */
+	atLabel?: string;
+
+	/**
+	 * 'Not at' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
+	 */
+	notAtLabel?: string;
+
+	/**
+	 * 'At or before' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
+	 */
+	atBeforeLabel?: string;
+
+	/**
+	 * 'At or after' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
+	 */
+	atAfterLabel?: string;
+
 	/**
 	 * 'Clear' label that is used for the predefined filtering conditions in the filter dropdowns.
 	 *
@@ -48447,8 +49441,8 @@ interface IgGridFiltering {
 	 *
 	 *
 	 * Valid values:
-	 * "string" The dialog window width in pixels (370px).
-	 * "number" The dialog window width in pixels as a number (370).
+	 * "string" The dialog window width in pixels (500px).
+	 * "number" The dialog window width in pixels as a number (500).
 	 */
 	filterDialogWidth?: string|number;
 
@@ -48546,13 +49540,14 @@ interface IgGridFiltering {
 	locale?: IgGridFilteringLocale;
 
 	/**
-	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
+	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><input></input></div><span>${label2}</span></div>".
 	 *
 	 */
 	filterDialogAddConditionTemplate?: string;
 
 	/**
-	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
+	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>"
+	 * and it is used when [filterDialogAddConditionTemplate](ui.iggridfiltering#options:filterDialogAddConditionTemplate) is applied
 	 *
 	 */
 	filterDialogAddConditionDropDownTemplate?: string;
@@ -48562,13 +49557,14 @@ interface IgGridFiltering {
 	 * Each DOM element which is used for selecting filter conditions/columns/filter expressions has "data-*" attribute.
 	 * E.g.: DOM element used for selecting column has attribute "data-af-col", for selecting filter condition - "data-af-cond", for filter expression- "data-af-expr".
 	 * NOTE: The template is supported only with <tr />.
-	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
+	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><input data-af-cond/></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
 	 *
 	 */
 	filterDialogFilterTemplate?: string;
 
 	/**
-	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
+	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>"
+	 * and it is used for custimizing DOM elemenent with attribute "data-af-cond".
 	 *
 	 */
 	filterDialogFilterConditionTemplate?: string;
@@ -49246,13 +50242,13 @@ interface JQuery {
 	igGridFiltering(optionLiteral: 'option', optionName: "locale", optionValue: IgGridFilteringLocale): void;
 
 	/**
-	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
+	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><input></input></div><span>${label2}</span></div>".
 	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionTemplate"): string;
 
 	/**
-	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
+	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><input></input></div><span>${label2}</span></div>".
 	 *
 	 *
 	 * @optionValue New value to be set.
@@ -49260,13 +50256,15 @@ interface JQuery {
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionTemplate", optionValue: string): void;
 
 	/**
-	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
+	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>"
+	 * and it is used when [filterDialogAddConditionTemplate](ui.iggridfiltering#options:filterDialogAddConditionTemplate) is applied
 	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionDropDownTemplate"): string;
 
 	/**
-	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
+	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>"
+	 * and it is used when [filterDialogAddConditionTemplate](ui.iggridfiltering#options:filterDialogAddConditionTemplate) is applied
 	 *
 	 *
 	 * @optionValue New value to be set.
@@ -49278,7 +50276,7 @@ interface JQuery {
 	 * Each DOM element which is used for selecting filter conditions/columns/filter expressions has "data-*" attribute.
 	 * E.g.: DOM element used for selecting column has attribute "data-af-col", for selecting filter condition - "data-af-cond", for filter expression- "data-af-expr".
 	 * NOTE: The template is supported only with <tr />.
-	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
+	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><input data-af-cond/></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
 	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterTemplate"): string;
@@ -49288,7 +50286,7 @@ interface JQuery {
 	 * Each DOM element which is used for selecting filter conditions/columns/filter expressions has "data-*" attribute.
 	 * E.g.: DOM element used for selecting column has attribute "data-af-col", for selecting filter condition - "data-af-cond", for filter expression- "data-af-expr".
 	 * NOTE: The template is supported only with <tr />.
-	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
+	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><input data-af-cond/></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
 	 *
 	 *
 	 * @optionValue New value to be set.
@@ -49296,13 +50294,15 @@ interface JQuery {
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterTemplate", optionValue: string): void;
 
 	/**
-	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
+	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>"
+	 * and it is used for custimizing DOM elemenent with attribute "data-af-cond".
 	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterConditionTemplate"): string;
 
 	/**
-	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
+	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>"
+	 * and it is used for custimizing DOM elemenent with attribute "data-af-cond".
 	 *
 	 *
 	 * @optionValue New value to be set.
@@ -49717,7 +50717,7 @@ interface IgGridColumnGroupOptions {
 
 interface IgGridColumn {
 	/**
-	 * Header text for the specified column.
+	 * Header text for the specified column. HTML and special characters should not be included as part of the header text content, because the browsers can interpret it and break the grid UI.
 	 *
 	 */
 	headerText?: string;
@@ -49742,6 +50742,7 @@ interface IgGridColumn {
 	 * Gets/Sets the type of formatting for cells of the column. Default value is null. Checkout [Formatting Dates, Numbers and Strings](http://www.igniteui.com/help/formatting-dates-numbers-and-strings) for details on the valid formatting specifiers.
 	 *
 	 * If dataType is "date", then supported formats are following: "date", "dateLong", "dateTime", "time", "timeLong", "MM/dd/yyyy", "MMM-d, yy, h:mm:ss tt", "dddd d MMM", etc.
+	 * If dataType is "time", then supported formats are following: "date", "dateLong", "dateTime", "time", "timeLong", "MMM-d, yy, h:mm:ss tt", etc.
 	 * If dataType is "number", then supported numeric formats are following: "number", "currency", "percent", "int", "double", "0.00", "#.0####", "0", "#.#######", etc.
 	 * The value of "double" will be similar to "number", but with unlimited maximum number of decimal places.
 	 * The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object.
@@ -49751,7 +50752,7 @@ interface IgGridColumn {
 	format?: string;
 
 	/**
-	 * Data type of the column cell values: string, number, bool, date, object.
+	 * Data type of the column cell values: string, number, bool, date, time, object.
 	 *
 	 *
 	 * Valid values:
@@ -49759,6 +50760,7 @@ interface IgGridColumn {
 	 * "number" Used when the data for the column is of type number
 	 * "boolean" Used when the data for the column is of type boolean
 	 * "date" Used when the data for the column is of type date
+	 * "time" Used when the data for the column is of type date and but only the time portion is important
 	 * "object" Used when the data for the column is of type object
 	 */
 	dataType?: string;
@@ -50629,11 +51631,12 @@ interface IgGrid {
 	aggregateTransactions?: boolean;
 
 	/**
-	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
+	 * Sets gets ability to automatically format text in cells for numeric, date and time columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
 	 *
 	 * Valid values:
 	 * "date" formats only Date columns
+	 * "time" formats only Time columns
 	 * "number" formats only number columns
 	 * "dateandnumber" formats both Date and number columns
 	 * "true" formats Date and number columns
@@ -51958,14 +52961,14 @@ interface JQuery {
 	igGrid(optionLiteral: 'option', optionName: "aggregateTransactions", optionValue: boolean): void;
 
 	/**
-	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
+	 * Sets gets ability to automatically format text in cells for numeric, date and time columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "autoFormat"): string|boolean;
 
 	/**
-	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
+	 * Sets gets ability to automatically format text in cells for numeric, date and time columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
 	 *
 	 * @optionValue New value to be set.
@@ -62382,9 +63385,25 @@ class EditorProviderDatePicker {
 }
 }
 
+declare namespace Infragistics {
+class EditorProviderTimePicker {
+	createEditor(callbacks: Object, key: Object, editorOptions: Object, tabIndex: Object, format: Object, element: Object, offset: Object): void;
+	setValue(value: Object, fe: Object, newOffset: Object): void;
+	textChanged(evt: Object, ui: Object): void;
+	setSize(width: Object, height: Object): void;
+	setFocus(): void;
+	removeFromParent(): void;
+	destroy(): void;
+	refreshValue(): void;
+	validator(): void;
+	isValid(): void;
+}
+}
+
 declare namespace Infragistics {
 class EditorProviderBoolean {
 	createEditor(callbacks: Object, key: Object, editorOptions: Object, tabIndex: Object, format: Object, element: Object): void;
+	keyDown(evt: Object, ui: Object): void;
 	valueChanged(evt: Object, ui: Object): void;
 	refreshValue(): void;
 	getValue(): void;
@@ -62724,7 +63743,7 @@ interface IgGridSortingLocale {
 	 * Custom sorted column tooltip in [igTemplating](http://www.igniteui.com/help/igtemplating-overview) format.
 	 *
 	 */
-	sortedColumnTooltipFormat?: string;
+	sortedColumnTooltip?: string;
 
 	/**
 	 * Unsorted column tooltip.
@@ -64604,7 +65623,7 @@ interface IgGridSummariesMethods {
 	selectCheckBox($checkbox: Object, isToSelect: boolean): void;
 
 	/**
-	 * Summary calculate the whole data for the specified column key, columnMethods and dataType (used when datasource is remote and dataType is date)
+	 * Summary calculate the whole data for the specified column key, columnMethods and dataType (used when datasource is remote and dataType is date or time)
 	 *
 	 * @param ck ColumnKey
 	 * @param columnMethods Array of column methods objects
@@ -65498,6 +66517,7 @@ interface IgGridUpdatingColumnSetting {
 	 * "mask" An igMaskEditor will be created
 	 * "date" An igDateEditor will be created
 	 * "datepicker" An igDatePicker will be created
+	 * "timepicker" An igTimePikcer will be created
 	 * "numeric" An igNumericEditor will be created
 	 * "checkbox" An igCheckboxEditor will be created
 	 * "currency" An igCurrencyEditor will be created
@@ -84998,6 +86018,12 @@ interface IgShapeChart {
 	 */
 	isVerticalZoomEnabled?: boolean;
 
+	/**
+	 * Gets or sets whether the chart can highlight series through user interactions.
+	 * This property applies to Category Chart and Financial Chart controls.
+	 */
+	isSeriesHighlightingEnabled?: boolean;
+
 	/**
 	 * Gets or sets the rectangle representing the current scroll and zoom state of the chart.
 	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
@@ -85129,6 +86155,79 @@ interface IgShapeChart {
 	alignsGridLinesToPixels?: boolean;
 	trendLinePeriod?: number;
 
+	/**
+	 * Gets or sets the style of tooltip to be displayed.
+	 *
+	 * Valid values:
+	 * "default" Display default tooltip for each series in the chart.
+	 * "item" Display individual tooltips for all series in the chart.
+	 * "category" Display combined tooltip for all series in the chart.
+	 * "none" Display no tooltips in the chart.
+	 */
+	toolTipType?: string;
+
+	/**
+	 * Gets or sets the crosshairs to be displayed.
+	 *
+	 * Valid values:
+	 * "default" Display default number of crosshair lines in the chart.
+	 * "none" Display no crosshair lines in the chart.
+	 * "horizontal" Display horizontal line of crosshairs in the chart.
+	 * "vertical" Display vertical line of crosshairs in the chart.
+	 * "both" Display both horizontal and vertical lines of crosshairs in the chart.
+	 */
+	crosshairsDisplayMode?: string;
+
+	/**
+	 * Gets or sets whether crosshairs will snap to the nearest data point.
+	 */
+	crosshairsSnapToData?: boolean;
+
+	/**
+	 * Gets or sets whether annotations are shown along the axis for crosshair values
+	 */
+	crosshairsAnnotationEnabled?: boolean;
+
+	/**
+	 * Gets or sets whether annotations for the final value of each series is displayed on the axis.
+	 */
+	finalValueAnnotationsVisible?: boolean;
+
+	/**
+	 * Gets or sets if callouts should be displayed.
+	 */
+	calloutsVisible?: boolean;
+
+	/**
+	 * Gets or sets if event annotations should be displayed.
+	 */
+	calloutStyleUpdatingEventEnabled?: boolean;
+
+	/**
+	 * Gets or sets the collection of callout data to be annotated.
+	 */
+	calloutsItemsSource?: any;
+
+	/**
+	 * Gets or sets the member path of the X data for the callouts.
+	 */
+	calloutsXMemberPath?: string;
+
+	/**
+	 * Gets or sets the member path of the Y data for the callouts.
+	 */
+	calloutsYMemberPath?: string;
+
+	/**
+	 * Gets or sets the member path of the label data for the callouts.
+	 */
+	calloutsLabelMemberPath?: string;
+
+	/**
+	 * Gets or sets the member path of the content data for the callouts.
+	 */
+	calloutsContentMemberPath?: string;
+
 	/**
 	 * Gets or sets function which takes an context object and returns a formatted label for the X-axis.
 	 */
@@ -85275,7 +86374,7 @@ interface IgShapeChart {
 	xAxisLabel?: any;
 
 	/**
-	 * Gets or sets the format for labels along the Y-axis.
+	 * Gets or sets the property or string from which the labels are derived.
 	 */
 	yAxisLabel?: any;
 
@@ -85715,6 +86814,11 @@ interface IgShapeChart {
 	 */
 	seriesPointerUp?: SeriesPointerUpEvent;
 
+	/**
+	 * Occurs when the style of a callout is updated.
+	 */
+	calloutStyleUpdating?: CalloutStyleUpdatingEvent;
+
 	/**
 	 * Event which is raised before data binding.
 	 * Return false in order to cancel data binding.
@@ -86325,6 +87429,20 @@ interface JQuery {
 	 */
 	igShapeChart(optionLiteral: 'option', optionName: "isVerticalZoomEnabled", optionValue: boolean): void;
 
+	/**
+	 * Gets  whether the chart can highlight series through user interactions.
+	 * This property applies to Category Chart and Financial Chart controls.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "isSeriesHighlightingEnabled"): boolean;
+
+	/**
+	 * Sets whether the chart can highlight series through user interactions.
+	 * This property applies to Category Chart and Financial Chart controls.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "isSeriesHighlightingEnabled", optionValue: boolean): void;
+
 	/**
 	 * Gets  the rectangle representing the current scroll and zoom state of the chart.
 	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
@@ -86565,6 +87683,154 @@ interface JQuery {
 	igShapeChart(optionLiteral: 'option', optionName: "trendLinePeriod"): number;
 	igShapeChart(optionLiteral: 'option', optionName: "trendLinePeriod", optionValue: number): void;
 
+	/**
+	 * Gets  the style of tooltip to be displayed.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "toolTipType"): string;
+
+	/**
+	 * Sets the style of tooltip to be displayed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "toolTipType", optionValue: string): void;
+
+	/**
+	 * Gets  the crosshairs to be displayed.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "crosshairsDisplayMode"): string;
+
+	/**
+	 * Sets the crosshairs to be displayed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "crosshairsDisplayMode", optionValue: string): void;
+
+	/**
+	 * Gets  whether crosshairs will snap to the nearest data point.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "crosshairsSnapToData"): boolean;
+
+	/**
+	 * Sets whether crosshairs will snap to the nearest data point.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "crosshairsSnapToData", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether annotations are shown along the axis for crosshair values
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "crosshairsAnnotationEnabled"): boolean;
+
+	/**
+	 * Sets whether annotations are shown along the axis for crosshair values
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "crosshairsAnnotationEnabled", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether annotations for the final value of each series is displayed on the axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "finalValueAnnotationsVisible"): boolean;
+
+	/**
+	 * Sets whether annotations for the final value of each series is displayed on the axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "finalValueAnnotationsVisible", optionValue: boolean): void;
+
+	/**
+	 * Gets  if callouts should be displayed.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutsVisible"): boolean;
+
+	/**
+	 * Sets if callouts should be displayed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutsVisible", optionValue: boolean): void;
+
+	/**
+	 * Gets  if event annotations should be displayed.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutStyleUpdatingEventEnabled"): boolean;
+
+	/**
+	 * Sets if event annotations should be displayed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutStyleUpdatingEventEnabled", optionValue: boolean): void;
+
+	/**
+	 * Gets  the collection of callout data to be annotated.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutsItemsSource"): any;
+
+	/**
+	 * Sets the collection of callout data to be annotated.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutsItemsSource", optionValue: any): void;
+
+	/**
+	 * Gets  the member path of the X data for the callouts.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutsXMemberPath"): string;
+
+	/**
+	 * Sets the member path of the X data for the callouts.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutsXMemberPath", optionValue: string): void;
+
+	/**
+	 * Gets  the member path of the Y data for the callouts.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutsYMemberPath"): string;
+
+	/**
+	 * Sets the member path of the Y data for the callouts.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutsYMemberPath", optionValue: string): void;
+
+	/**
+	 * Gets  the member path of the label data for the callouts.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutsLabelMemberPath"): string;
+
+	/**
+	 * Sets the member path of the label data for the callouts.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutsLabelMemberPath", optionValue: string): void;
+
+	/**
+	 * Gets  the member path of the content data for the callouts.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutsContentMemberPath"): string;
+
+	/**
+	 * Sets the member path of the content data for the callouts.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutsContentMemberPath", optionValue: string): void;
+
 	/**
 	 * Gets  function which takes an context object and returns a formatted label for the X-axis.
 	 */
@@ -86914,12 +88180,12 @@ interface JQuery {
 	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabel", optionValue: any): void;
 
 	/**
-	 * Gets  the format for labels along the Y-axis.
+	 * Gets  the property or string from which the labels are derived.
 	 */
 	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabel"): any;
 
 	/**
-	 * Sets the format for labels along the Y-axis.
+	 * Sets the property or string from which the labels are derived.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -87815,6 +89081,18 @@ interface JQuery {
 	 */
 	igShapeChart(optionLiteral: 'option', optionName: "seriesPointerUp", optionValue: SeriesPointerUpEvent): void;
 
+	/**
+	 * Occurs when the style of a callout is updated.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutStyleUpdating"): CalloutStyleUpdatingEvent;
+
+	/**
+	 * Occurs when the style of a callout is updated.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "calloutStyleUpdating", optionValue: CalloutStyleUpdatingEvent): void;
+
 	/**
 	 * Event which is raised before data binding.
 	 * Return false in order to cancel data binding.
@@ -90679,6 +91957,13 @@ interface JQuery {
 	igSplitter(optionLiteral: 'option', optionName: string, optionValue: any): JQuery;
 	igSplitter(methodName: string, ...methodParams: any[]): any;
 }
+interface IgSpreadsheetBrushes {
+	/**
+	 * Option for IgSpreadsheetBrushes
+	 */
+	[optionName: string]: any;
+}
+
 interface ActivePaneChangedEvent {
 	(event: Event, ui: ActivePaneChangedEventUIParam): void;
 }
@@ -90786,6 +92071,11 @@ interface EditModeExitingEventUIParam {
 	 * Gets the cell for which the control is exiting edit mode.
 	 */
 	cell?: string;
+
+	/**
+	 * Gets the edit text that will be used to update the cell(s).
+	 */
+	editText?: string;
 }
 
 interface EditModeExitedEvent {
@@ -90994,6 +92284,12 @@ interface IgSpreadsheet {
 	 */
 	activeCell?: string;
 
+	/**
+	 * Returns or sets an object with brushes for areas of the spreadsheet. The property name should be an item in the [SpreadsheetResourceId enumeration](ig.spreadsheet.SpreadsheetResourceId) and the property value a string representing a brush. These brushes override any css styling for the associated object.
+	 *
+	 */
+	brushes?: IgSpreadsheetBrushes;
+
 	/**
 	 * Returns or sets a boolean indicating whether the scroll lock key is toggled.
 	 * This property is used when certain keys are pressed while the control has focus. For example
@@ -91294,6 +92590,11 @@ interface IgSpreadsheetMethods {
 	 */
 	executeAction(action: Object): boolean;
 
+	/**
+	 * Exports visual data from the spreadsheet to aid in unit testing
+	 */
+	exportVisualData(): void;
+
 	/**
 	 * Shows the filter dialog for the specified relative column of the [filterSettings](ig.excel.worksheet#methods:filterSettings) of the [activeWorksheet](ui.igspreadsheet#options:activeWorksheet).
 	 *
@@ -91310,6 +92611,20 @@ interface IgSpreadsheetMethods {
 	 */
 	showFilterDialogForTable(worksheetTableColumn: Object, spreadsheetFilterDialogOption: Object): void;
 
+	/**
+	 * Shows the top or bottom dialog for the specified relative column of the [filterSettings](ig.excel.worksheet#methods:filterSettings) of the [activeWorksheet](ui.igspreadsheet#options:activeWorksheet).
+	 *
+	 * @param relativeColumnIndex A zero based column index relative to the [region](ig.excel.worksheetFilterSettings#methods:region) of the active worksheet.
+	 */
+	showTopOrBottomDialogForWorksheet(relativeColumnIndex: number): void;
+
+	/**
+	 * Shows the top or bottom dialog for the specified relative column of the [filterSettings](ig.excel.Worksheet#methods:filterSettings) of the [activeWorksheet](ui.igspreadsheet#options:activeWorksheet).
+	 *
+	 * @param worksheetTableColumn A [region](ig.excel.WorksheetTableColumn) whose filter is to be viewed or changed.
+	 */
+	showTopOrBottomDialogForTable(worksheetTableColumn: Object): void;
+
 	/**
 	 * Forces any pending deferred work to render on the spreadsheet before continuing
 	 */
@@ -91350,8 +92665,11 @@ interface JQuery {
 	igSpreadsheet(methodName: "getIsRenamingWorksheet"): boolean;
 	igSpreadsheet(methodName: "getPanes"): void;
 	igSpreadsheet(methodName: "executeAction", action: Object): boolean;
+	igSpreadsheet(methodName: "exportVisualData"): void;
 	igSpreadsheet(methodName: "showFilterDialogForWorksheet", relativeColumnIndex: number, spreadsheetFilterDialogOption: Object): void;
 	igSpreadsheet(methodName: "showFilterDialogForTable", worksheetTableColumn: Object, spreadsheetFilterDialogOption: Object): void;
+	igSpreadsheet(methodName: "showTopOrBottomDialogForWorksheet", relativeColumnIndex: number): void;
+	igSpreadsheet(methodName: "showTopOrBottomDialogForTable", worksheetTableColumn: Object): void;
 	igSpreadsheet(methodName: "flush"): void;
 	igSpreadsheet(methodName: "destroy"): void;
 	igSpreadsheet(methodName: "changeLocale", $container: Object): void;
@@ -91405,6 +92723,20 @@ interface JQuery {
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "activeCell", optionValue: string): void;
 
+	/**
+	 * Returns  an object with brushes for areas of the spreadsheet. The property name should be an item in the [SpreadsheetResourceId enumeration](ig.spreadsheet.SpreadsheetResourceId) and the property value a string representing a brush. These brushes override any css styling for the associated object.
+	 *
+	 */
+	igSpreadsheet(optionLiteral: 'option', optionName: "brushes"): IgSpreadsheetBrushes;
+
+	/**
+	 * Returns or sets an object with brushes for areas of the spreadsheet. The property name should be an item in the [SpreadsheetResourceId enumeration](ig.spreadsheet.SpreadsheetResourceId) and the property value a string representing a brush. These brushes override any css styling for the associated object.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igSpreadsheet(optionLiteral: 'option', optionName: "brushes", optionValue: IgSpreadsheetBrushes): void;
+
 	/**
 	 * Returns  a boolean indicating whether the scroll lock key is toggled.
 	 * This property is used when certain keys are pressed while the control has focus. For example
@@ -97640,8 +98972,8 @@ interface IgTreeGridFiltering {
 	 *
 	 *
 	 * Valid values:
-	 * "string" The dialog window width in pixels (370px).
-	 * "number" The dialog window width in pixels as a number (370).
+	 * "string" The dialog window width in pixels (500px).
+	 * "number" The dialog window width in pixels as a number (500).
 	 */
 	filterDialogWidth?: string|number;
 
@@ -97738,13 +99070,14 @@ interface IgTreeGridFiltering {
 	featureChooserTextAdvancedFilter?: string;
 
 	/**
-	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
+	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><input></input></div><span>${label2}</span></div>".
 	 *
 	 */
 	filterDialogAddConditionTemplate?: string;
 
 	/**
-	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
+	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>"
+	 * and it is used when [filterDialogAddConditionTemplate](ui.iggridfiltering#options:filterDialogAddConditionTemplate) is applied
 	 *
 	 */
 	filterDialogAddConditionDropDownTemplate?: string;
@@ -97754,13 +99087,14 @@ interface IgTreeGridFiltering {
 	 * Each DOM element which is used for selecting filter conditions/columns/filter expressions has "data-*" attribute.
 	 * E.g.: DOM element used for selecting column has attribute "data-af-col", for selecting filter condition - "data-af-cond", for filter expression- "data-af-expr".
 	 * NOTE: The template is supported only with <tr />.
-	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
+	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><input data-af-cond/></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
 	 *
 	 */
 	filterDialogFilterTemplate?: string;
 
 	/**
-	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
+	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>"
+	 * and it is used for custimizing DOM elemenent with attribute "data-af-cond".
 	 *
 	 */
 	filterDialogFilterConditionTemplate?: string;
@@ -98529,13 +99863,13 @@ interface JQuery {
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "featureChooserTextAdvancedFilter", optionValue: string): void;
 
 	/**
-	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
+	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><input></input></div><span>${label2}</span></div>".
 	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionTemplate"): string;
 
 	/**
-	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
+	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><input></input></div><span>${label2}</span></div>".
 	 *
 	 *
 	 * @optionValue New value to be set.
@@ -98543,13 +99877,15 @@ interface JQuery {
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionTemplate", optionValue: string): void;
 
 	/**
-	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
+	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>"
+	 * and it is used when [filterDialogAddConditionTemplate](ui.iggridfiltering#options:filterDialogAddConditionTemplate) is applied
 	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionDropDownTemplate"): string;
 
 	/**
-	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
+	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>"
+	 * and it is used when [filterDialogAddConditionTemplate](ui.iggridfiltering#options:filterDialogAddConditionTemplate) is applied
 	 *
 	 *
 	 * @optionValue New value to be set.
@@ -98561,7 +99897,7 @@ interface JQuery {
 	 * Each DOM element which is used for selecting filter conditions/columns/filter expressions has "data-*" attribute.
 	 * E.g.: DOM element used for selecting column has attribute "data-af-col", for selecting filter condition - "data-af-cond", for filter expression- "data-af-expr".
 	 * NOTE: The template is supported only with <tr />.
-	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
+	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><input data-af-cond/></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
 	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterTemplate"): string;
@@ -98571,7 +99907,7 @@ interface JQuery {
 	 * Each DOM element which is used for selecting filter conditions/columns/filter expressions has "data-*" attribute.
 	 * E.g.: DOM element used for selecting column has attribute "data-af-col", for selecting filter condition - "data-af-cond", for filter expression- "data-af-expr".
 	 * NOTE: The template is supported only with <tr />.
-	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
+	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><input data-af-cond/></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
 	 *
 	 *
 	 * @optionValue New value to be set.
@@ -98579,13 +99915,15 @@ interface JQuery {
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterTemplate", optionValue: string): void;
 
 	/**
-	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
+	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>"
+	 * and it is used for custimizing DOM elemenent with attribute "data-af-cond".
 	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterConditionTemplate"): string;
 
 	/**
-	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
+	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>"
+	 * and it is used for custimizing DOM elemenent with attribute "data-af-cond".
 	 *
 	 *
 	 * @optionValue New value to be set.
@@ -100078,11 +101416,12 @@ interface IgTreeGrid {
 	aggregateTransactions?: boolean;
 
 	/**
-	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
+	 * Sets gets ability to automatically format text in cells for numeric, date and time columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
 	 *
 	 * Valid values:
 	 * "date" formats only Date columns
+	 * "time" formats only Time columns
 	 * "number" formats only number columns
 	 * "dateandnumber" formats both Date and number columns
 	 * "true" formats Date and number columns
@@ -101613,14 +102952,14 @@ interface JQuery {
 	igTreeGrid(optionLiteral: 'option', optionName: "aggregateTransactions", optionValue: boolean): void;
 
 	/**
-	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
+	 * Sets gets ability to automatically format text in cells for numeric, date and time columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "autoFormat"): string|boolean;
 
 	/**
-	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
+	 * Sets gets ability to automatically format text in cells for numeric, date and time columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
 	 *
 	 * @optionValue New value to be set.
@@ -113340,6 +114679,12 @@ interface IgZoomSlider {
 	height?: string|number;
 	panTransitionDuration?: number;
 	maxZoomWidth?: number;
+
+	/**
+	 * 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;
 	actualPixelScalingRatio?: number;
 	windowRect?: any;
@@ -113387,6 +114732,10 @@ interface IgZoomSlider {
 	thumbCalloutTextStyle?: any;
 	propertyChanged?: PropertyChangedEvent;
 	resolvingAxisValue?: ResolvingAxisValueEvent;
+
+	/**
+	 * Occurs just after the current ZoomSlider's window rectangle is changed.
+	 */
 	windowRectChanged?: WindowRectChangedEvent;
 
 	/**
@@ -113447,7 +114796,21 @@ interface JQuery {
 	igZoomSlider(optionLiteral: 'option', optionName: "panTransitionDuration", optionValue: number): void;
 	igZoomSlider(optionLiteral: 'option', optionName: "maxZoomWidth"): number;
 	igZoomSlider(optionLiteral: 'option', optionName: "maxZoomWidth", optionValue: number): 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.
+	 */
 	igZoomSlider(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.
+	 */
 	igZoomSlider(optionLiteral: 'option', optionName: "pixelScalingRatio", optionValue: number): void;
 	igZoomSlider(optionLiteral: 'option', optionName: "actualPixelScalingRatio"): number;
 	igZoomSlider(optionLiteral: 'option', optionName: "actualPixelScalingRatio", optionValue: number): void;
@@ -113541,7 +114904,17 @@ interface JQuery {
 	igZoomSlider(optionLiteral: 'option', optionName: "propertyChanged", optionValue: PropertyChangedEvent): void;
 	igZoomSlider(optionLiteral: 'option', optionName: "resolvingAxisValue"): ResolvingAxisValueEvent;
 	igZoomSlider(optionLiteral: 'option', optionName: "resolvingAxisValue", optionValue: ResolvingAxisValueEvent): void;
+
+	/**
+	 * Occurs just after the current ZoomSlider's window rectangle is changed.
+	 */
 	igZoomSlider(optionLiteral: 'option', optionName: "windowRectChanged"): WindowRectChangedEvent;
+
+	/**
+	 * Occurs just after the current ZoomSlider's window rectangle is changed.
+	 *
+	 * @optionValue New value to be set.
+	 */
 	igZoomSlider(optionLiteral: 'option', optionName: "windowRectChanged", optionValue: WindowRectChangedEvent): void;
 	igZoomSlider(options: IgZoomSlider): JQuery;
 	igZoomSlider(optionLiteral: 'option', optionName: string): any;
@@ -113578,6 +114951,7 @@ interface IgniteUIStatic {
     loader(resources: string, callback: Function): IgLoader;
     loader(): IgLoader;
     OlapUtilities: any;
+    formatter(val: Date|number|string, type: string, format: string, notTemplate?: boolean, enableUTCDates?: boolean, dateOffset?: any, displayStyle?: string, labelText?: string, tabIndex?: string|number, reg?: any): string;
 }
 
 interface JQueryStatic {
diff --git a/types/imperium/index.d.ts b/types/imperium/index.d.ts
index 67eace244e..7ad399fe9c 100644
--- a/types/imperium/index.d.ts
+++ b/types/imperium/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for imperium 2.0
-// Project: https://www.npmjs.org/package/imperium
+// Project: https://github.com/terrajs/imperium
 // Definitions by: Gaetan SENN <https://github.com/gaetansenn>
 // Definitions: https://github.com/psnider/DefinitelyTyped/imperium
 // TypeScript Version: 2.7
diff --git a/types/inboxsdk/index.d.ts b/types/inboxsdk/index.d.ts
index abdfe413bf..f6adb9f229 100644
--- a/types/inboxsdk/index.d.ts
+++ b/types/inboxsdk/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for InboxSDK 2.0
+// Type definitions for non-npm package InboxSDK 2.0
 // Project: https://www.inboxsdk.com/
 // Definitions by: Raphaël Doursenaud <https://github.com/rdoursenaud>
 //                 Amiram Korach <https://github.com/amiram>
diff --git a/types/ink-text-input/index.d.ts b/types/ink-text-input/index.d.ts
new file mode 100644
index 0000000000..9aaadd330e
--- /dev/null
+++ b/types/ink-text-input/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for ink-text-input 2.0
+// Project: https://github.com/vadimdemedes/ink-text-input#readme
+// Definitions by: Łukasz Ostrowski <https://github.com/lukostry>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { Component } from 'ink';
+
+interface TextInputProps {
+    focus?: boolean;
+    onChange?: (value: string) => void;
+    onSubmit?: (value: string) => void;
+    placeholder?: string;
+    value?: string;
+}
+
+declare class TextInput extends Component<TextInputProps> { }
+
+export = TextInput;
diff --git a/types/ink-text-input/ink-text-input-tests.tsx b/types/ink-text-input/ink-text-input-tests.tsx
new file mode 100644
index 0000000000..82b63854a2
--- /dev/null
+++ b/types/ink-text-input/ink-text-input-tests.tsx
@@ -0,0 +1,47 @@
+/** @jsx h */
+import { h, Component } from 'ink';
+import TextInput from 'ink-text-input';
+// NOTE: `import TextInput = require('ink-text-input');` will work as well
+// For importing using ES6 default import as above,
+// `allowSyntheticDefaultImports` flag in compiler options needs to be set to `true`
+
+interface QueryState {
+    query: string;
+}
+
+class SearchQuery extends Component {
+    constructor() {
+        super();
+
+        this.state = {
+            query: ''
+        };
+
+        this.handleChange = this.handleChange.bind(this);
+        this.handleSubmit = this.handleSubmit.bind(this);
+    }
+
+    render(props: {}, state: QueryState) {
+        return (
+            <div>
+                Enter your query:
+
+				<TextInput
+                    value={state.query}
+                    onChange={this.handleChange}
+                    onSubmit={this.handleSubmit}
+                />
+            </div>
+        );
+    }
+
+    private handleChange(value: string) {
+        this.setState({
+            query: value,
+        });
+    }
+
+    private handleSubmit(value: string) {
+        console.log(value);
+    }
+}
diff --git a/types/ink-text-input/tsconfig.json b/types/ink-text-input/tsconfig.json
new file mode 100644
index 0000000000..2582b4325e
--- /dev/null
+++ b/types/ink-text-input/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "allowSyntheticDefaultImports": true,
+        "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",
+        "ink-text-input-tests.tsx"
+    ]
+}
diff --git a/types/ink-text-input/tslint.json b/types/ink-text-input/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ink-text-input/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/inputmask/index.d.ts b/types/inputmask/index.d.ts
new file mode 100644
index 0000000000..3f51fc2df4
--- /dev/null
+++ b/types/inputmask/index.d.ts
@@ -0,0 +1,787 @@
+// Type definitions for inputmask 4.0
+// Project: https://github.com/RobinHerbots/Inputmask
+// Definitions by: Daniel Mester Pirttijarvi <https://github.com/dmester>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+// The documentation is mainly copied from the source repo README.
+
+declare namespace Inputmask {
+    type Range = { start: string, end: string } | [string, string];
+
+    type PositionCaretOnClick =
+        "none" | "lvp" | "radixFocus" | "select" | "ignore";
+
+    type InputMode =
+        "verbatim" | "none" | "text" | "decimal" | "numeric" | "tel" | "search" | "email" | "url";
+
+    type Casing = "upper" | "lower" | "title";
+
+    type DefinitionValidator = (chrs: string, buffer: string[], pos: number, strict: boolean, opts: Options) =>
+        boolean | { pos: number, c: string };
+
+    interface Options {
+        /**
+         * Change the mask placeholder. Instead of "_", you can change the unfilled characters mask as you like, simply
+         * by adding the placeholder option. For example, placeholder: " " will change the default autofill with empty
+         * values.
+         *
+         * @default "_"
+         */
+        placeholder?: string;
+        /**
+         * Definition of the symbols used to indicate an optional part in the mask.
+         *
+         * @default { start: "[", end: "]" }
+         */
+        optionalmarker?: Range;
+        /**
+         * Definition of the symbols used to indicate a quantifier in the mask.
+         *
+         * @default { start: "{", end: "}" }
+         */
+        quantifiermarker?: Range;
+        /**
+         * Definition of the symbols used to indicate a group in the mask.
+         *
+         * @default { start: "(", end: ")" }
+         */
+        groupmarker?: Range;
+        /**
+         * Definition of the symbols used to indicate an alternator part in the mask.
+         *
+         * @default "|"
+         */
+        alternatormarker?: string;
+        /**
+         * Definition of the symbols used to escape a part in the mask.
+         *
+         * @default "\\"
+         */
+        escapeChar?: string;
+        /**
+         * The mask to use.
+         */
+        mask?: string | string[] | ((opts: Options) => string | string[]);
+        /**
+         * Use a regular expression as a mask. When using shorthands be aware that you need to double escape or use
+         * String.raw with a string literal.
+         */
+        regex?: string;
+        /**
+         * Execute a function when the mask is completed.
+         */
+        oncomplete?: () => void;
+        /**
+         * Execute a function when the mask is cleared.
+         */
+        onincomplete?: () => void;
+        /**
+         * Execute a function when the mask is cleared.
+         */
+        oncleared?: () => void;
+        /**
+         * Mask repeat function. Repeat the mask definition x-times.
+         * `*` ~ forever, otherwise specify an integer
+         *
+         * @default 0
+         */
+        repeat?: number | string;
+        /**
+         * Toggle to allocate as much possible or the opposite. Non-greedy repeat function. With the non-greedy option
+         * set to `false`, you can specify `*` as repeat. This makes an endless repeat.
+         *
+         * @default false
+         */
+        greedy?: boolean;
+        /**
+         * Automatically unmask the value when retrieved.
+         *
+         * When setting this option to true the plugin also expects the initial value from the server to be unmasked.
+         *
+         * @default false
+         */
+        autoUnmask?: boolean;
+        /**
+         * Remove the mask before submitting the form.
+         *
+         * @default false
+         */
+        removeMaskOnSubmit?: boolean;
+        /**
+         * Remove the empty mask on blur or when not empty removes the optional trailing part.
+         *
+         * @default true
+         */
+        clearMaskOnLostFocus?: boolean;
+        /**
+         * Toggle to insert or overwrite input. This option can be altered by pressing the Insert key.
+         *
+         * @default true
+         */
+        insertMode?: boolean;
+        /**
+         * Clear the incomplete input on blur.
+         *
+         * @default false
+         */
+        clearIncomplete?: boolean;
+        /**
+         * The alias to use.
+         *
+         * @default null
+         */
+        alias?: string;
+        /**
+         * Callback to implement autocomplete on certain keys for example.
+         */
+        onKeyDown?: (event: KeyboardEvent, buffer: string[], caretPos: number, opts: Options) => void;
+        /**
+         * Executes before masking the initial value to allow preprocessing of the initial value.
+         */
+        onBeforeMask?: (initialValue: string, opts: Options) => string;
+        /**
+         * This callback allows for preprocessing the pasted value before actually handling the value for masking.
+         * This can be useful for stripping away some characters before processing. You can also disable pasting
+         * a value by returning false in the `onBeforePaste` call.
+         */
+        onBeforePaste?: (pastedValue: string, opts: Options) => string;
+        /**
+         * Executes before writing to the masked element Use this to do some extra processing of the input. This can
+         * be useful when implementing an alias, ex. decimal alias, autofill the digits when leaving the inputfield.
+         */
+        onBeforeWrite?: (event: KeyboardEvent, buffer: string[], caretPos: number, opts: Options) => CommandObject;
+        /**
+         * Executes after unmasking to allow post-processing of the unmaskedvalue.
+         *
+         * @returns New unmasked value
+         */
+        onUnMask?: (maskedValue: string, unmaskedValue: string) => string;
+        /**
+         * Shows the mask when the input gets focus.
+         *
+         * @default true
+         */
+        showMaskOnFocus?: boolean;
+        /**
+         * Shows the mask when the input is hevered by the mouse cursor.
+         *
+         * @default true
+         */
+        showMaskOnHover?: boolean;
+        /**
+         * Callback function is executed on every keyvalidation with the key & result as parameter.
+         */
+        onKeyValidation?: (key: number, result: boolean) => void;
+        /**
+         * A character which can be used to skip an optional part of a mask.
+         *
+         * @default " "
+         */
+        skipOptionalPartCharacter?: string;
+        /**
+         * Numeric input direction. Keeps the caret at the end.
+         *
+         * @default false
+         */
+        numericInput?: boolean;
+        /**
+         * Align the input to the right
+         *
+         * By setting the rightAlign you can specify to right align an inputmask. This is only applied in combination of
+         * the `numericInput` option or the `dir-attribute`.
+         *
+         * @default true
+         */
+        rightAlign?: boolean;
+        /**
+         * Make escape behave like undo. (ctrl-Z) Pressing escape reverts the value to the value before focus.
+         *
+         * @default true
+         */
+        undoOnEscape?: boolean;
+        /**
+         * Define the radixpoint (decimal separator)
+         *
+         * @default ""
+         */
+        radixPoint?: string;
+        /**
+         * Define the groupseparator.
+         *
+         * @default ""
+         */
+        groupSeparator?: string;
+        /**
+         * Use in combination with the alternator syntax Try to keep the mask static while typing. Decisions to alter the
+         * mask will be postponed if possible.
+         *
+         * ex. $(selector).inputmask({ mask: ["+55-99-9999-9999", "+55-99-99999-9999", ], keepStatic: true });
+         *
+         * typing 1212345123 => should result in +55-12-1234-5123 type extra 4 => switch to +55-12-12345-1234
+         *
+         * When passing multiple masks (an array of masks) keepStatic is automatically set to true unless explicitly set
+         * through the options.
+         *
+         * @default null
+         */
+        keepStatic?: boolean | null;
+        /**
+         * When enabled the caret position is set after the latest valid position on TAB.
+         *
+         * @default true
+         */
+        positionCaretOnTab?: boolean;
+        /**
+         * Allows for tabbing through the different parts of the masked field.
+         *
+         * @default false
+         */
+        tabThrough?: boolean;
+        /**
+         * List with the supported input types
+         *
+         * @default ["text", "tel", "url", "password", "search"]
+         */
+        supportsInputType?: string[];
+        /**
+         * Specify keyCodes which should not be considered in the keypress event, otherwise the `preventDefault` will
+         * stop their default behavior especially in FF.
+         */
+        ignorables?: number[];
+        /**
+         * With this call-in (hook) you can override the default implementation of the isComplete function.
+         */
+        isComplete?: (buffer: string[], opts: Options) => boolean;
+        /**
+         * Hook to postValidate the result from isValid. Useful for validating the entry as a whole.
+         */
+        postValidation?: (buffer: string[], pos: number, currentResult: CommandObject, opts: Options) =>
+            boolean | CommandObject;
+        /**
+         * Hook to preValidate the input. Useful for validating regardless the definition. When return true, the normal
+         * validation kicks in, otherwise it is skipped.
+         */
+        preValidation?: (buffer: string[], pos: number, char: string, isSelection: boolean, opts: Options) =>
+            boolean | CommandObject;
+        /**
+         * The `staticDefinitionSymbol` option is used to indicate that the static entries in the mask can match a
+         * certain definition. Especially useful with alternators so that static element in the mask can match
+         * another alternation.
+         *
+         * @default undefined
+         */
+        staticDefinitionSymbol?: string;
+        /**
+         * Just in time masking. With the `jitMasking` option you can enable jit masking. The mask will only be
+         * visible for the user entered characters.
+         *
+         * @default false
+         */
+        jitMasking?: boolean;
+        /**
+         * Return nothing from the input `value` property when the user hasn't entered anything. If this is false,
+         * the mask might be returned.
+         *
+         * @default true
+         */
+        nullable?: boolean;
+        /**
+         * Disable value property patching
+         *
+         * @default false
+         */
+        noValuePatching?: boolean;
+        /**
+         * Positioning of the caret on click.
+         *
+         * Options:
+         *
+         * * `none`
+         * * `lvp` - based on the last valid position (default)
+         * * `radixFocus` - position caret to radixpoint on initial click
+         * * `select` - select the whole input
+         * * `ignore` - ignore the click and continue the mask
+         *
+         * @default "lvp"
+         */
+        positionCaretOnClick?: PositionCaretOnClick;
+        /**
+         * Apply casing at the mask-level.
+         *
+         * @default undefined
+         */
+        casing?: Casing;
+        /**
+         * Specify the inputmode - already in place for when browsers start to support them
+         * https://html.spec.whatwg.org/#input-modalities:-the-inputmode-attribute
+         *
+         * @default "verbatim"
+         */
+        inputmode?: InputMode;
+        /**
+         * Create a css styleable mask.
+         *
+         * You need to include the inputmask.css in your page to use this option.
+         *
+         * See the inputmask.css for more info about the used styling. You can override the
+         * Inputmask.prototype.positionColorMask`if you need some custom positioning.
+         *
+         * @default false
+         */
+        colorMask?: boolean;
+        /**
+         * Disables predictive text on mobile devices.
+         *
+         * What it does:
+         *
+         * * changes the input type to password => disables predictive text
+         * * enables the colorMask option which creates a div, which surrounds the input. So we type in the hidden
+         *   password input and render the mask in the a created div.
+         *
+         * To use the colorMask, you need to include the inputmask.css. You might need to add some css-tweaks to make
+         * it all visually correct in your page.
+         *
+         * @default false
+         */
+        disablePredictiveText?: boolean;
+        /**
+         * Specify to use the `data-inputmask` attributes or to ignore them.
+         *
+         * If you don't use data attributes you can disable the import by specifying `importDataAttributes: false`.
+         *
+         * @default true
+         */
+        importDataAttributes?: boolean;
+        /**
+         * Shift position of the mask entries on entry and deletion. In some cases shift the mask enties isn't desired.
+         *
+         * Ex. date masks. Shifting month to day makes no sense
+         *
+         * @default true
+         */
+        shiftPositions?: boolean;
+        /**
+         * Minimum value. This needs to be in the same format as the `inputFormat` when used with the datetime alias.
+         */
+        min?: string;
+        /**
+         * Maximum value. This needs to be in the same format as the `inputFormat` when used with the datetime alias.
+         */
+        max?: string;
+
+        /**
+         * Number of fractionalDigits.
+         *
+         * Possible values:
+         *
+         * * A number describing the number of fractional digits.
+         * * `*`
+         * * Quantifier syntax like `2,4`. When the quantifier syntax is used, the `digitsOptional` option is ignored
+         *
+         * @default "*"
+         */
+        digits?: string;
+        /**
+         * Specify wheter the digits are optional.
+         *
+         * @default true
+         */
+        digitsOptional?: boolean;
+        /**
+         * Enforces the decimal part when leaving the input field.
+         *
+         * @default false
+         */
+        enforceDigitsOnBlur?: boolean;
+        /**
+         * Define the grouping of the integer part.
+         *
+         * @default 3
+         */
+        groupSize?: number;
+        /**
+         * Enable grouping of the integer part.
+         *
+         * @default false
+         */
+        autoGroup?: boolean;
+        /**
+         * Allow to enter -.
+         *
+         * @default true
+         */
+        allowMinus?: boolean;
+        /**
+         * Define your negationSymbol.
+         *
+         * @default { front: "-", back: "" }
+         */
+        negationSymbol?: { front: string, back: string };
+        /**
+         * Number of integerDigits
+         *
+         * @default "+"
+         */
+        integerDigits?: string;
+        /**
+         * Specify wheter the integerdigits are optional.
+         *
+         * @default true
+         */
+        integerOptional?: boolean;
+        /**
+         * Define a prefix.
+         *
+         * @default ""
+         */
+        prefix?: string;
+        /**
+         * Define a suffix.
+         *
+         * @default ""
+         */
+        suffix?: string;
+        /**
+         * Do not allow assumption of decimals input without entering the radixpoint.
+         *
+         * @default true
+         */
+        decimalProtect?: boolean;
+        /**
+         * Define the step the ctrl-up & ctrl-down must take.
+         *
+         * @default 1
+         */
+        step?: number;
+        /**
+         * Make unmasking returning a number instead of a string.
+         *
+         * Be warned that using the unmaskAsNumber option together with jQuery.serialize will fail as serialize expects a string. (See issue #1288)
+         *
+         * @default false
+         */
+        unmaskAsNumber?: boolean;
+        /**
+         * Indicates whether the value passed for initialization is text or a number
+         *
+         * @default "text"
+         */
+        inputType?: "text" | "number";
+        /**
+         * Format used to input a date. This option is only effective for the datetime alias.
+         *
+         * Supported symbols
+         *
+         * * `d` - Day of the month as digits; no leading zero for single-digit days.
+         * * `dd` - Day of the month as digits; leading zero for single-digit days.
+         * * `ddd` - Day of the week as a three-letter abbreviation.
+         * * `dddd` - Day of the week as its full name.
+         * * `m` - Month as digits; no leading zero for single-digit months.
+         * * `mm` - Month as digits; leading zero for single-digit months.
+         * * `mmm` - Month as a three-letter abbreviation.
+         * * `mmmm` - Month as its full name.
+         * * `yy` - Year as last two digits; leading zero for years less than 10.
+         * * `yyyy` - Year as 4 digits.
+         * * `h` - Hours; no leading zero for single-digit hours (12-hour clock).
+         * * `hh` - Hours; leading zero for single-digit hours (12-hour clock).
+         * * `hhh` - Hours; no limit
+         * * `H` - Hours; no leading zero for single-digit hours (24-hour clock).
+         * * `HH` - Hours; leading zero for single-digit hours (24-hour clock).
+         * * `HHH` - Hours; no limit
+         * * `M` - Minutes; no leading zero for single-digit minutes. Uppercase M unlike CF timeFormat's m to avoid
+         *         conflict with months.
+         * * `MM` - Minutes; leading zero for single-digit minutes. Uppercase MM unlike CF timeFormat's mm to avoid
+         *          conflict with months.
+         * * `s` - Seconds; no leading zero for single-digit seconds.
+         * * `ss` - Seconds; leading zero for single-digit seconds.
+         * * `l` - Milliseconds. 3 digits.
+         * * `L` - Milliseconds. 2 digits.
+         * * `t` - Lowercase, single-character time marker string: a or p.
+         * * `tt` - Two-character time marker string: am or pm.
+         * * `T` - Single-character time marker string: A or P.
+         * * `TT` - Two-character time marker string: AM or PM.
+         * * `Z` - US timezone abbreviation, e.g. EST or MDT. With non-US timezones or in the Opera browser, the
+         *         GMT/UTC offset is returned, e.g. GMT-0500
+         * * `o` - GMT/UTC timezone offset, e.g. -0500 or +0230.
+         * * `S` - The date's ordinal suffix (st, nd, rd, or th). Works well with d.
+         *
+         * @default "isoDateTime"
+         */
+        inputFormat?: string;
+        /**
+         * Format of the unmasked value. This is only effective when used with the datetime alias.
+         */
+        outputFormat?: string;
+    }
+
+    interface Instance {
+        /**
+         * Return the default (empty) mask value.
+         */
+        getemptymask(): string;
+        /**
+         * The metadata of the actual mask provided in the mask definitions can be obtained by calling getmetadata. If
+         * only a mask is provided the mask definition will be returned by the getmetadata.
+         */
+        getmetadata(): any;
+        /**
+         * Check whether the returned value is masked or not; currently only works reliably when using `jquery.val` fn
+         * to retrieve the value
+         */
+        hasMaskedValue(): boolean;
+        /**
+         * Verify whether the current value is complete or not.
+         */
+        isComplete(): boolean;
+        /**
+         * Validate a given value against the mask.
+         */
+        isValid(): boolean;
+        /**
+         * Create a mask for the input.
+         *
+         * @param el Element selector, a single element or an array of elements.
+         */
+        mask(selectorOrElement: string | HTMLElement | ArrayLike<HTMLElement>): Instance;
+        /**
+         * Get an option on an existing inputmask.
+         *
+         * @param key Name of option to retrieve.
+         */
+        option(key: string): any;
+        /**
+         * Set an option on an existing inputmask. The option method is intented for adding extra options like
+         * callbacks, etc at a later time to the mask.
+         *
+         * When extra options are set the mask is automatically reapplied, unless you pas true for the `noremask`
+         * argument.
+         */
+        option(opts: Options, noremask?: boolean): Instance;
+        /**
+         * Remove the inputmask.
+         */
+        remove(): void;
+        /**
+         * The `setvalue` functionality is to set a value to the inputmask like you would do with `jQuery.val`, BUT it
+         * will trigger the internal event used by the inputmask always, whatever the case. This is particular useful
+         * when cloning an inputmask with jQuery.clone. Cloning an inputmask is not a fully functional clone. On the
+         * first event (`mouseenter`, `focus`, ...) the inputmask can detect if it where cloned and can reactivate the
+         * masking. However when setting the value with jQuery.val there is none of the events triggered in that case.
+         * The `setvalue` functionality does this for you.
+         */
+        setValue(value: string): void;
+        /**
+         * Gets the unmasked value.
+         */
+        unmaskedvalue(): string;
+    }
+
+    interface Definition {
+        validator: string | DefinitionValidator;
+        casing?: Casing;
+        cardinality?: number;
+        placeholder?: string;
+        definitionSymbol?: string;
+    }
+
+    interface InsertPosition {
+        /**
+         * Position to insert.
+         */
+        pos: number;
+        /**
+         * Character to insert.
+         */
+        c: string;
+    }
+
+    interface CommandObject {
+        /**
+         * Position to insert.
+         */
+        pos?: number;
+        /**
+         * Character to insert.
+         */
+        c?: string;
+        /**
+         * Position of the caret.
+         */
+        caret?: number;
+        /**
+         * Position(s) to remove.
+         */
+        remove?: number | number[];
+        /**
+         * Position(s) to add.
+         */
+        insert?: InsertPosition | InsertPosition[];
+        /**
+         * * `true` => refresh validPositions from the complete buffer .
+         * * `{ start: , end: }` => refresh from start to end.
+         */
+        refreshFromBuffer?: true | { start: number, end: number };
+    }
+
+    interface Static {
+        /**
+         * Creates a new Inputmask instance.
+         *
+         * @param maskOrAlias A mask pattern or a reference to a predefined alias.
+         * @param opts Mask options.
+         */
+        (maskOrAlias: string, opts?: Options): Instance;
+        /**
+         * Creates a new Inputmask instance.
+         *
+         * @param opts Mask options.
+         */
+        (opts?: Options): Instance;
+
+        /**
+         * Creates a new Inputmask instance.
+         *
+         * @param maskOrAlias A mask pattern or a reference to a predefined alias.
+         * @param opts Mask options.
+         */
+        new (maskOrAlias: string, opts?: Options): Instance;
+        /**
+         * Creates a new Inputmask instance.
+         *
+         * @param opts Mask options.
+         */
+        new (opts?: Options): Instance;
+
+        /**
+         * Extends the default inputmask options.
+         */
+        extendDefaults(opts: Options): void;
+        /**
+         * Add new definitions to this inputmask.
+         */
+        extendDefinitions(definitions: {
+            [key: string]: Definition,
+        }): void;
+        /**
+         * Extends the set of available mask aliases.
+         */
+        extendAliases(aliases: {
+            [key: string]: Options,
+        }): void;
+        /**
+         * Instead of masking an input element it is also possible to use the inputmask for formatting given values.
+         * Think of formatting values to show in jqGrid or on other elements then inputs.
+         *
+         * @param value Value to format.
+         * @param opts Mask options.
+         */
+        format(value: string, opts: Options): string;
+        /**
+         * Validate a given value against the mask.
+         *
+         * @param value Value to validate.
+         * @param opts Mask options.
+         */
+        isValid(value: string, opts: Options): boolean;
+        /**
+         * Remove the inputmask.
+         */
+        remove(selectorOrElement: string | HTMLElement | ArrayLike<HTMLElement>): void;
+        /**
+         * The setvalue functionality is to set a value to the inputmask like you would do with jQuery.val, BUT it will
+         * trigger the internal event used by the inputmask always, whatever the case. This is particular usefull when
+         * cloning an inputmask with jQuery.clone. Cloning an inputmask is not a fully functional clone. On the first
+         * event (mouseenter, focus, ...) the inputmask can detect if it where cloned and can reactivate the masking.
+         * However when setting the value with jQuery.val there is none of the events triggered in that case. The
+         * setvalue functionality does this for you.
+         */
+        setValue(selectorOrElement: string | HTMLElement | ArrayLike<HTMLElement>, value: string): void;
+        /**
+         * Unmask a given value against the mask.
+         *
+         * @param value Value to be unmasked.
+         * @param opts Mask options.
+         */
+        unmask(value: string, opts: Options): string;
+    }
+}
+
+declare global {
+    interface HTMLElement {
+        inputmask?: Inputmask.Instance;
+    }
+
+    interface JQuery {
+        /**
+         * Return the default (empty) mask value.
+         */
+        inputmask(method: "getemptymask"): string; // tslint:disable-line:unified-signatures
+        /**
+         * The metadata of the actual mask provided in the mask definitions can be obtained by calling getmetadata. If
+         * only a mask is provided the mask definition will be returned by the getmetadata.
+         */
+        inputmask(method: "getmetadata"): any;
+        /**
+         * Check whether the returned value is masked or not; currently only works reliably when using `jquery.val` fn
+         * to retrieve the value
+         */
+        inputmask(method: "hasMaskedValue"): boolean; // tslint:disable-line:unified-signatures
+        /**
+         * Verify whether the current value is complete or not.
+         */
+        inputmask(method: "isComplete"): boolean; // tslint:disable-line:unified-signatures
+        /**
+         * Validate a given value against the mask.
+         */
+        inputmask(method: "isValid"): boolean; // tslint:disable-line:unified-signatures
+        /**
+         * Get an option on an existing inputmask.
+         *
+         * @param key Name of option to retrieve.
+         */
+        inputmask(method: "option", key: string): any;
+        /**
+         * Set an option on an existing inputmask. The option method is intented for adding extra options like
+         * callbacks, etc at a later time to the mask.
+         *
+         * When extra options are set the mask is automatically reapplied, unless you pas true for the `noremask`
+         * argument.
+         */
+        inputmask(method: "option", opts: Inputmask.Options, noremask?: boolean): Inputmask.Instance;
+        /**
+         * Remove the inputmask.
+         */
+        inputmask(method: "remove"): void;
+        /**
+         * The `setvalue` functionality is to set a value to the inputmask like you would do with `jQuery.val`, BUT it
+         * will trigger the internal event used by the inputmask always, whatever the case. This is particular useful
+         * when cloning an inputmask with jQuery.clone. Cloning an inputmask is not a fully functional clone. On the
+         * first event (`mouseenter`, `focus`, ...) the inputmask can detect if it where cloned and can reactivate the
+         * masking. However when setting the value with jQuery.val there is none of the events triggered in that case.
+         * The `setvalue` functionality does this for you.
+         */
+        inputmask(method: "setValue", value: string): void;
+        /**
+         * Gets the unmasked value.
+         */
+        inputmask(method: "unmaskedvalue"): string; // tslint:disable-line:unified-signatures
+        /**
+         * Creates a new Inputmask instance.
+         *
+         * @param maskOrAlias A mask pattern or a reference to a predefined alias.
+         * @param opts Mask options.
+         */
+        inputmask(maskOrAlias: string, opts?: Inputmask.Options): Inputmask.Instance;
+        /**
+         * Creates a new Inputmask instance.
+         *
+         * @param opts Mask options.
+         */
+        inputmask(opts?: Inputmask.Options): Inputmask.Instance;
+    }
+}
+
+declare const Inputmask: Inputmask.Static;
+export = Inputmask;
+export as namespace Inputmask;
diff --git a/types/inputmask/test/inputmask-global-tests.ts b/types/inputmask/test/inputmask-global-tests.ts
new file mode 100644
index 0000000000..47cb434a5a
--- /dev/null
+++ b/types/inputmask/test/inputmask-global-tests.ts
@@ -0,0 +1,143 @@
+Inputmask({
+    mask: "(999) 999-9999",
+    placeholder: "_",
+    optionalmarker: [ "[", "]" ],
+    quantifiermarker: [ "{", "}" ],
+    groupmarker: [ "(", ")" ],
+    alternatormarker: "|",
+    escapeChar: "\\",
+    regex: undefined,
+    oncomplete: () => {},
+    onincomplete: () => {},
+    oncleared: () => {},
+    repeat: 0,
+    greedy: false,
+    autoUnmask: false,
+    removeMaskOnSubmit: false,
+    clearMaskOnLostFocus: true,
+    insertMode: true,
+    clearIncomplete: false,
+    alias: undefined,
+    onBeforeMask: undefined,
+    onBeforePaste: (pastedValue: string, opts: Inputmask.Options) => pastedValue,
+    onBeforeWrite: undefined,
+    onUnMask: undefined,
+    showMaskOnFocus: true,
+    showMaskOnHover: true,
+    onKeyValidation: () => {},
+    skipOptionalPartCharacter: " ",
+    numericInput: false,
+    rightAlign: false,
+    undoOnEscape: true,
+    keepStatic: null,
+    positionCaretOnTab: true,
+    tabThrough: false,
+    supportsInputType: [ "text", "tel", "url", "password", "search" ],
+    ignorables: [ 8, 9, 13, 19, 27, 33, 34, 35, 36, 37, 38, 39, 40, 45, 46, 93, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 0, 229 ],
+    isComplete: undefined,
+    preValidation: undefined,
+    postValidation: undefined,
+    staticDefinitionSymbol: undefined,
+    jitMasking: false,
+    nullable: true,
+    noValuePatching: false,
+    casing: undefined,
+    colorMask: false,
+    disablePredictiveText: false,
+    importDataAttributes: true,
+    shiftPositions: true,
+    digits: "*",
+    digitsOptional: true,
+    enforceDigitsOnBlur: false,
+    radixPoint: ".",
+    positionCaretOnClick: "radixFocus",
+    groupSize: 3,
+    groupSeparator: "",
+    autoGroup: false,
+    allowMinus: true,
+    negationSymbol: {
+        front: "-",
+        back: ""
+    },
+    integerDigits: "+",
+    integerOptional: true,
+    prefix: "",
+    suffix: "",
+    decimalProtect: true,
+    min: undefined,
+    max: undefined,
+    step: 1,
+    unmaskAsNumber: false,
+    inputType: "text",
+    inputmode: "numeric",
+}).mask("selector");
+
+Inputmask("9-a{1,3}9{1,3}").mask("selector");
+Inputmask("9", { repeat: 10 }).mask("selector");
+
+Inputmask({ regex: "\\d*" }).mask("selector");
+Inputmask({ regex: String.raw`\d*` }).mask("selector");
+
+function testMask() {
+    const inputElement = document.querySelector("input");
+    if (inputElement) {
+        Inputmask().mask(inputElement);
+        Inputmask().mask([inputElement, inputElement]);
+        Inputmask().mask(document.querySelectorAll("input"));
+        Inputmask().mask(document.getElementsByTagName("input"));
+    }
+}
+
+Inputmask.extendDefaults({
+	autoUnmask: true
+});
+Inputmask.extendDefinitions({
+	A: {
+		validator: "[A-Za-z\u0410-\u044F\u0401\u0451\u00C0-\u00FF\u00B5]",
+		casing: "upper"
+	},
+	'+': {
+		validator: "[0-9A-Za-z\u0410-\u044F\u0401\u0451\u00C0-\u00FF\u00B5]",
+		casing: "upper"
+	}
+});
+Inputmask.extendAliases({
+	numeric: {
+		mask: "r",
+		greedy: false
+	}
+});
+
+Inputmask.extendDefinitions({
+	f: {
+	  	validator: "[0-9\(\)\.\+/ ]"
+	},
+	j: {
+	  	validator: "(19|20)\\d{2}"
+	},
+	x: {
+		validator: "[0-2]",
+		definitionSymbol: "i"
+	},
+	y: {
+		validator: (chrs: string, buffer: string[], pos: number) => {
+			const valExp2 = new RegExp("2[0-5]|[01][0-9]");
+			return valExp2.test(buffer[pos - 1] + chrs);
+		},
+		definitionSymbol: "i"
+	},
+	z: {
+		validator: (chrs: string, buffer: string[], pos: number) => {
+			const valExp3 = new RegExp("25[0-5]|2[0-4][0-9]|[01][0-9][0-9]");
+			return valExp3.test(buffer[pos - 2] + buffer[pos - 1] + chrs);
+		},
+		definitionSymbol: "i"
+	}
+});
+
+function testElement(el: HTMLElement) {
+    const id: string = el.id;
+    if (el.inputmask) {
+        const unmasked: string = el.inputmask.unmaskedvalue();
+    }
+}
diff --git a/types/inputmask/test/inputmask-jquery-tests.ts b/types/inputmask/test/inputmask-jquery-tests.ts
new file mode 100644
index 0000000000..2ded13c9d5
--- /dev/null
+++ b/types/inputmask/test/inputmask-jquery-tests.ts
@@ -0,0 +1,81 @@
+/// <reference types="jquery" />
+
+$("#testmask").inputmask("remove");
+
+$(":input").inputmask();
+
+let value: string = $("#testmask").inputmask("unmaskedvalue");
+
+$("#testmask").inputmask({
+    mask: "(999) 999-9999",
+    placeholder: "_",
+    optionalmarker: [ "[", "]" ],
+    quantifiermarker: [ "{", "}" ],
+    groupmarker: [ "(", ")" ],
+    alternatormarker: "|",
+    escapeChar: "\\",
+    regex: undefined,
+    oncomplete: () => {},
+    onincomplete: () => {},
+    oncleared: () => {},
+    repeat: 0,
+    greedy: false,
+    autoUnmask: false,
+    removeMaskOnSubmit: false,
+    clearMaskOnLostFocus: true,
+    insertMode: true,
+    clearIncomplete: false,
+    alias: undefined,
+    onBeforeMask: undefined,
+    onBeforePaste: (pastedValue: string, opts: Inputmask.Options) => pastedValue,
+    onBeforeWrite: undefined,
+    onUnMask: undefined,
+    showMaskOnFocus: true,
+    showMaskOnHover: true,
+    onKeyValidation: () => {},
+    skipOptionalPartCharacter: " ",
+    numericInput: false,
+    rightAlign: false,
+    undoOnEscape: true,
+    keepStatic: null,
+    positionCaretOnTab: true,
+    tabThrough: false,
+    supportsInputType: [ "text", "tel", "url", "password", "search" ],
+    ignorables: [ 8, 9, 13, 19, 27, 33, 34, 35, 36, 37, 38, 39, 40, 45, 46, 93, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 0, 229 ],
+    isComplete: undefined,
+    preValidation: undefined,
+    postValidation: undefined,
+    staticDefinitionSymbol: undefined,
+    jitMasking: false,
+    nullable: true,
+    noValuePatching: false,
+    casing: undefined,
+    colorMask: false,
+    disablePredictiveText: false,
+    importDataAttributes: true,
+    shiftPositions: true,
+    digits: "*",
+    digitsOptional: true,
+    enforceDigitsOnBlur: false,
+    radixPoint: ".",
+    positionCaretOnClick: "radixFocus",
+    groupSize: 3,
+    groupSeparator: "",
+    autoGroup: false,
+    allowMinus: true,
+    negationSymbol: {
+        front: "-",
+        back: ""
+    },
+    integerDigits: "+",
+    integerOptional: true,
+    prefix: "",
+    suffix: "",
+    decimalProtect: true,
+    min: undefined,
+    max: undefined,
+    step: 1,
+    unmaskAsNumber: false,
+    inputType: "text",
+    inputmode: "numeric",
+});
diff --git a/types/inputmask/test/inputmask-module-tests.ts b/types/inputmask/test/inputmask-module-tests.ts
new file mode 100644
index 0000000000..11ceaa1cbe
--- /dev/null
+++ b/types/inputmask/test/inputmask-module-tests.ts
@@ -0,0 +1,145 @@
+import * as Inputmask from "inputmask";
+
+Inputmask({
+    mask: "(999) 999-9999",
+    placeholder: "_",
+    optionalmarker: [ "[", "]" ],
+    quantifiermarker: [ "{", "}" ],
+    groupmarker: [ "(", ")" ],
+    alternatormarker: "|",
+    escapeChar: "\\",
+    regex: undefined,
+    oncomplete: () => {},
+    onincomplete: () => {},
+    oncleared: () => {},
+    repeat: 0,
+    greedy: false,
+    autoUnmask: false,
+    removeMaskOnSubmit: false,
+    clearMaskOnLostFocus: true,
+    insertMode: true,
+    clearIncomplete: false,
+    alias: undefined,
+    onBeforeMask: undefined,
+    onBeforePaste: (pastedValue: string, opts: Inputmask.Options) => pastedValue,
+    onBeforeWrite: undefined,
+    onUnMask: undefined,
+    showMaskOnFocus: true,
+    showMaskOnHover: true,
+    onKeyValidation: () => {},
+    skipOptionalPartCharacter: " ",
+    numericInput: false,
+    rightAlign: false,
+    undoOnEscape: true,
+    keepStatic: null,
+    positionCaretOnTab: true,
+    tabThrough: false,
+    supportsInputType: [ "text", "tel", "url", "password", "search" ],
+    ignorables: [ 8, 9, 13, 19, 27, 33, 34, 35, 36, 37, 38, 39, 40, 45, 46, 93, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 0, 229 ],
+    isComplete: undefined,
+    preValidation: undefined,
+    postValidation: undefined,
+    staticDefinitionSymbol: undefined,
+    jitMasking: false,
+    nullable: true,
+    noValuePatching: false,
+    casing: undefined,
+    colorMask: false,
+    disablePredictiveText: false,
+    importDataAttributes: true,
+    shiftPositions: true,
+    digits: "*",
+    digitsOptional: true,
+    enforceDigitsOnBlur: false,
+    radixPoint: ".",
+    positionCaretOnClick: "radixFocus",
+    groupSize: 3,
+    groupSeparator: "",
+    autoGroup: false,
+    allowMinus: true,
+    negationSymbol: {
+        front: "-",
+        back: ""
+    },
+    integerDigits: "+",
+    integerOptional: true,
+    prefix: "",
+    suffix: "",
+    decimalProtect: true,
+    min: undefined,
+    max: undefined,
+    step: 1,
+    unmaskAsNumber: false,
+    inputType: "text",
+    inputmode: "numeric",
+}).mask("selector");
+
+Inputmask("9-a{1,3}9{1,3}").mask("selector");
+Inputmask("9", { repeat: 10 }).mask("selector");
+
+Inputmask({ regex: "\\d*" }).mask("selector");
+Inputmask({ regex: String.raw`\d*` }).mask("selector");
+
+function testMask() {
+    const inputElement = document.querySelector("input");
+    if (inputElement) {
+        Inputmask().mask(inputElement);
+        Inputmask().mask([inputElement, inputElement]);
+        Inputmask().mask(document.querySelectorAll("input"));
+        Inputmask().mask(document.getElementsByTagName("input"));
+    }
+}
+
+Inputmask.extendDefaults({
+	autoUnmask: true
+});
+Inputmask.extendDefinitions({
+	A: {
+		validator: "[A-Za-z\u0410-\u044F\u0401\u0451\u00C0-\u00FF\u00B5]",
+		casing: "upper"
+	},
+	'+': {
+		validator: "[0-9A-Za-z\u0410-\u044F\u0401\u0451\u00C0-\u00FF\u00B5]",
+		casing: "upper"
+	}
+});
+Inputmask.extendAliases({
+	numeric: {
+		mask: "r",
+		greedy: false
+	}
+});
+
+Inputmask.extendDefinitions({
+	f: {
+	  	validator: "[0-9\(\)\.\+/ ]"
+	},
+	j: {
+	  	validator: "(19|20)\\d{2}"
+	},
+	x: {
+		validator: "[0-2]",
+		definitionSymbol: "i"
+	},
+	y: {
+		validator: (chrs: string, buffer: string[], pos: number) => {
+			const valExp2 = new RegExp("2[0-5]|[01][0-9]");
+			return valExp2.test(buffer[pos - 1] + chrs);
+		},
+		definitionSymbol: "i"
+	},
+	z: {
+		validator: (chrs: string, buffer: string[], pos: number) => {
+			const valExp3 = new RegExp("25[0-5]|2[0-4][0-9]|[01][0-9][0-9]");
+			return valExp3.test(buffer[pos - 2] + buffer[pos - 1] + chrs);
+		},
+		definitionSymbol: "i"
+	}
+});
+
+function testElement(el: HTMLElement) {
+    const id: string = el.id;
+    if (el.inputmask) {
+        const unmasked: string = el.inputmask.unmaskedvalue();
+    }
+}
diff --git a/types/inputmask/tsconfig.json b/types/inputmask/tsconfig.json
new file mode 100644
index 0000000000..f65ca1af98
--- /dev/null
+++ b/types/inputmask/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
+    },
+    "files": [
+        "index.d.ts",
+        "test/inputmask-jquery-tests.ts",
+        "test/inputmask-global-tests.ts",
+        "test/inputmask-module-tests.ts"
+    ]
+}
diff --git a/types/inputmask/tslint.json b/types/inputmask/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/inputmask/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/insert-module-globals/index.d.ts b/types/insert-module-globals/index.d.ts
index 1fb0b6e7ba..d9f30cf834 100644
--- a/types/insert-module-globals/index.d.ts
+++ b/types/insert-module-globals/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for insert-module-globals 7.0
-// Project: https://github.com/substack/insert-module-globals
+// Project: https://github.com/browserify/insert-module-globals
 // Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/intercom-web/index.d.ts b/types/intercom-web/index.d.ts
index 3a40451a3a..7eaf555a13 100755
--- a/types/intercom-web/index.d.ts
+++ b/types/intercom-web/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Intercom Web API 2.8
+// Type definitions for non-npm package Intercom Web API 2.8
 // Project: https://docs.intercom.io/
 //            configure-intercom-for-your-product-or-site/
 //            customize-the-intercom-messenger/the-intercom-javascript-api
diff --git a/types/interpret/index.d.ts b/types/interpret/index.d.ts
index de51c842f8..875276dca4 100644
--- a/types/interpret/index.d.ts
+++ b/types/interpret/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for interpret 1.1
-// Project: https://github.com/tkellen/node-interpret
+// Project: https://github.com/gulpjs/interpret
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/iobroker/index.d.ts b/types/iobroker/index.d.ts
index 0479eceeb9..e9b2f64e67 100644
--- a/types/iobroker/index.d.ts
+++ b/types/iobroker/index.d.ts
@@ -1,8 +1,8 @@
 // Type definitions for ioBroker 1.4
-// Project: https://github.com/ioBroker/ioBroker
+// Project: https://github.com/ioBroker/ioBroker, http://iobroker.net
 // Definitions by: AlCalzone <https://github.com/AlCalzone>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
+// TypeScript Version: 3.2
 
 // Note: This is not the definition for the package `iobroker`,
 // which is just an installer, not a library.
@@ -296,14 +296,28 @@ declare global {
 
             /** attached history information */
             history?: any;
+
+            /** Custom settings for this state */
+            custom?: Record<string, any>;
         }
         interface ChannelCommon extends ObjectCommon {
             /** description of this channel */
             desc?: string;
+
+            // Only states can have common.custom
+            custom?: undefined;
         }
-        type OtherCommon = ObjectCommon & {
+        interface DeviceCommon extends ObjectCommon {
+            // Only states can have common.custom
+            custom?: undefined;
+             // TODO: any other definition for device?
+        }
+        interface OtherCommon extends ObjectCommon {
             [propName: string]: any;
-        };
+
+            // Only states can have common.custom
+            custom?: undefined;
+        }
 
         interface BaseObject {
             /** The ID of this object */
@@ -311,7 +325,7 @@ declare global {
             native: Record<string, any>;
             enums?: Record<string, string>;
             type: string; // specified in the derived interfaces
-            common: ObjectCommon;
+            common: StateCommon | ChannelCommon | DeviceCommon | OtherCommon;
             acl?: ObjectACL;
         }
 
@@ -335,10 +349,10 @@ declare global {
 
         interface DeviceObject extends BaseObject {
             type: "device";
-            common: ObjectCommon; // TODO: any definition for device?
+            common: DeviceCommon;
         }
         interface PartialDeviceObject extends Partial<Pick<DeviceObject, "_id" | "native" | "enums" | "type" | "acl">> {
-            common?: Partial<ObjectCommon>;
+            common?: Partial<DeviceCommon>;
         }
 
         interface OtherObject extends BaseObject {
@@ -350,11 +364,15 @@ declare global {
         }
 
         type Object = StateObject | ChannelObject | DeviceObject | OtherObject;
+
+        type SettableObjectWorker<T extends ioBroker.Object> =
+            Pick<T, Exclude<keyof T, "_id" | "acl">> & {
+                _id?: T["_id"];
+                acl?: T["acl"];
+            };
+
         // In set[Foreign]Object[NotExists] methods, the ID and acl of the object is optional
-        interface SettableObject extends Pick<ioBroker.Object, Exclude<keyof ioBroker.Object, "_id" | "acl">> {
-            _id?: ioBroker.Object["_id"];
-            acl?: ioBroker.Object["acl"];
-        }
+        type SettableObject = SettableObjectWorker<ioBroker.Object>;
         type PartialObject = PartialStateObject | PartialChannelObject | PartialDeviceObject | PartialOtherObject;
 
         /** Defines access rights for a single file */
@@ -1081,12 +1099,12 @@ declare global {
             setObject(id: string, obj: ioBroker.SettableObject, callback?: SetObjectCallback): void;
             setObject(id: string, obj: ioBroker.SettableObject, options: unknown, callback?: SetObjectCallback): void;
             /** Creates or overwrites an object in the object db */
-            setObjectAsync(id: string, obj: ioBroker.SettableObject, options?: unknown): Promise<CallbackReturnTypeOf<SetObjectCallback>>;
+            setObjectAsync(id: string, obj: ioBroker.SettableObject, options?: unknown): Promise<NonNullCallbackReturnTypeOf<SetObjectCallback>>;
             /** Creates an object in the object db. Existing objects are not overwritten. */
             setObjectNotExists(id: string, obj: ioBroker.SettableObject, callback?: SetObjectCallback): void;
             setObjectNotExists(id: string, obj: ioBroker.SettableObject, options: unknown, callback?: SetObjectCallback): void;
             /** Creates an object in the object db. Existing objects are not overwritten. */
-            setObjectNotExistsAsync(id: string, obj: ioBroker.SettableObject, options?: unknown): Promise<CallbackReturnTypeOf<SetObjectCallback>>;
+            setObjectNotExistsAsync(id: string, obj: ioBroker.SettableObject, options?: unknown): Promise<NonNullCallbackReturnTypeOf<SetObjectCallback>>;
             /** Get all states, channels and devices of this adapter */
             getAdapterObjects(callback: (objects: Record<string, ioBroker.Object>) => void): void;
             /** Get all states, channels and devices of this adapter */
@@ -1095,7 +1113,7 @@ declare global {
             extendObject(id: string, objPart: PartialObject, callback?: SetObjectCallback): void;
             extendObject(id: string, objPart: PartialObject, options: unknown, callback?: SetObjectCallback): void;
             /** Extend an object and create it if it might not exist */
-            extendObjectAsync(id: string, objPart: PartialObject, options?: unknown): Promise<CallbackReturnTypeOf<SetObjectCallback>>;
+            extendObjectAsync(id: string, objPart: PartialObject, options?: unknown): Promise<NonNullCallbackReturnTypeOf<SetObjectCallback>>;
             /**
              * Deletes an object from the object db
              * @param id - The id of the object without namespace
@@ -1133,17 +1151,17 @@ declare global {
             setForeignObject(id: string, obj: ioBroker.SettableObject, callback?: SetObjectCallback): void;
             setForeignObject(id: string, obj: ioBroker.SettableObject, options: unknown, callback?: SetObjectCallback): void;
             /** Creates or overwrites an object (which might not belong to this adapter) in the object db */
-            setForeignObjectAsync(id: string, obj: ioBroker.SettableObject, options?: unknown): Promise<CallbackReturnTypeOf<SetObjectCallback>>;
+            setForeignObjectAsync(id: string, obj: ioBroker.SettableObject, options?: unknown): Promise<NonNullCallbackReturnTypeOf<SetObjectCallback>>;
             /** Creates an object (which might not belong to this adapter) in the object db. Existing objects are not overwritten. */
             setForeignObjectNotExists(id: string, obj: ioBroker.SettableObject, callback?: SetObjectCallback): void;
             setForeignObjectNotExists(id: string, obj: ioBroker.SettableObject, options: unknown, callback?: SetObjectCallback): void;
             /** Creates an object (which might not belong to this adapter) in the object db. Existing objects are not overwritten. */
-            setForeignObjectNotExistsAsync(id: string, obj: ioBroker.SettableObject, options?: unknown): Promise<CallbackReturnTypeOf<SetObjectCallback>>;
+            setForeignObjectNotExistsAsync(id: string, obj: ioBroker.SettableObject, options?: unknown): Promise<NonNullCallbackReturnTypeOf<SetObjectCallback>>;
             /** Extend an object (which might not belong to this adapter) and create it if it might not exist */
             extendForeignObject(id: string, objPart: PartialObject, callback?: SetObjectCallback): void;
             extendForeignObject(id: string, objPart: PartialObject, options: unknown, callback?: SetObjectCallback): void;
             /** Extend an object (which might not belong to this adapter) and create it if it might not exist */
-            extendForeignObjectAsync(id: string, objPart: PartialObject, options?: unknown): Promise<CallbackReturnTypeOf<SetObjectCallback>>;
+            extendForeignObjectAsync(id: string, objPart: PartialObject, options?: unknown): Promise<NonNullCallbackReturnTypeOf<SetObjectCallback>>;
             /**
              * Finds an object by its ID or name
              * @param type - common.type of the state
@@ -1178,36 +1196,42 @@ declare global {
             setState(id: string, state: string | number | boolean | State | Partial<State>, options: unknown, callback?: SetStateCallback): void;
             setState(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown, callback?: SetStateCallback): void;
             /** Writes a value into the states DB. */
-            setStateAsync(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean): Promise<CallbackReturnTypeOf<SetStateCallback>>;
-            setStateAsync(id: string, state: string | number | boolean | State | Partial<State>, options?: unknown): Promise<CallbackReturnTypeOf<SetStateCallback>>;
-            setStateAsync(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown): Promise<CallbackReturnTypeOf<SetStateCallback>>;
+            setStateAsync(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean): Promise<NonNullCallbackReturnTypeOf<SetStateCallback>>;
+            setStateAsync(id: string, state: string | number | boolean | State | Partial<State>, options?: unknown): Promise<NonNullCallbackReturnTypeOf<SetStateCallback>>;
+            setStateAsync(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown): Promise<NonNullCallbackReturnTypeOf<SetStateCallback>>;
             /** Writes a value into the states DB only if it has changed. */
             setStateChanged(id: string, state: string | number | boolean | State | Partial<State>, callback?: SetStateChangedCallback): void;
             setStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, callback?: SetStateChangedCallback): void;
             setStateChanged(id: string, state: string | number | boolean | State | Partial<State>, options: unknown, callback?: SetStateChangedCallback): void;
             setStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown, callback?: SetStateChangedCallback): void;
             /** Writes a value into the states DB only if it has changed. */
-            setStateChangedAsync(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean): Promise<CallbackReturnTypeOf<SetStateChangedCallback>>;
-            setStateChangedAsync(id: string, state: string | number | boolean | State | Partial<State>, options?: unknown): Promise<CallbackReturnTypeOf<SetStateChangedCallback>>;
-            setStateChangedAsync(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown): Promise<CallbackReturnTypeOf<SetStateChangedCallback>>;
+            setStateChangedAsync(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean): Promise<NonNullCallbackReturnTypeOf<SetStateChangedCallback>>;
+            setStateChangedAsync(id: string, state: string | number | boolean | State | Partial<State>, options?: unknown): Promise<NonNullCallbackReturnTypeOf<SetStateChangedCallback>>;
+            setStateChangedAsync(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown): Promise<NonNullCallbackReturnTypeOf<SetStateChangedCallback>>;
             /** Writes a value (which might not belong to this adapter) into the states DB. */
             setForeignState(id: string, state: string | number | boolean | State | Partial<State>, callback?: SetStateCallback): void;
             setForeignState(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, callback?: SetStateCallback): void;
             setForeignState(id: string, state: string | number | boolean | State | Partial<State>, options: unknown, callback?: SetStateCallback): void;
             setForeignState(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown, callback?: SetStateCallback): void;
             /** Writes a value (which might not belong to this adapter) into the states DB. */
-            setForeignStateAsync(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean): Promise<CallbackReturnTypeOf<SetStateCallback>>;
-            setForeignStateAsync(id: string, state: string | number | boolean | State | Partial<State>, options?: unknown): Promise<CallbackReturnTypeOf<SetStateCallback>>;
-            setForeignStateAsync(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown): Promise<CallbackReturnTypeOf<SetStateCallback>>;
+            setForeignStateAsync(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean): Promise<NonNullCallbackReturnTypeOf<SetStateCallback>>;
+            setForeignStateAsync(id: string, state: string | number | boolean | State | Partial<State>, options?: unknown): Promise<NonNullCallbackReturnTypeOf<SetStateCallback>>;
+            setForeignStateAsync(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown): Promise<NonNullCallbackReturnTypeOf<SetStateCallback>>;
             /** Writes a value (which might not belong to this adapter) into the states DB only if it has changed. */
             setForeignStateChanged(id: string, state: string | number | boolean | State | Partial<State>, callback?: SetStateChangedCallback): void;
             setForeignStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, callback?: SetStateChangedCallback): void;
             setForeignStateChanged(id: string, state: string | number | boolean | State | Partial<State>, options: unknown, callback?: SetStateChangedCallback): void;
             setForeignStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown, callback?: SetStateChangedCallback): void;
             /** Writes a value (which might not belong to this adapter) into the states DB only if it has changed. */
-            setForeignStateChangedAsync(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean): Promise<CallbackReturnTypeOf<SetStateChangedCallback>>;
-            setForeignStateChangedAsync(id: string, state: string | number | boolean | State | Partial<State>, options?: unknown): Promise<CallbackReturnTypeOf<SetStateChangedCallback>>;
-            setForeignStateChangedAsync(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown): Promise<CallbackReturnTypeOf<SetStateChangedCallback>>;
+            setForeignStateChangedAsync(
+                id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean
+            ): Promise<NonNullCallbackReturnTypeOf<SetStateChangedCallback>>;
+            setForeignStateChangedAsync(
+                id: string, state: string | number | boolean | State | Partial<State>, options?: unknown
+            ): Promise<NonNullCallbackReturnTypeOf<SetStateChangedCallback>>;
+            setForeignStateChangedAsync(
+                id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown
+            ): Promise<NonNullCallbackReturnTypeOf<SetStateChangedCallback>>;
             // tslint:enable:unified-signatures
 
             /** Read a value from the states DB. */
@@ -1266,7 +1290,7 @@ declare global {
              * @param binary The data to be written
              * @param options (optional) Some internal options.
              */
-            setBinaryStateAsync(id: string, binary: Buffer, options?: unknown): Promise<CallbackReturnTypeOf<SetStateCallback>>;
+            setBinaryStateAsync(id: string, binary: Buffer, options?: unknown): Promise<NonNullCallbackReturnTypeOf<SetStateCallback>>;
             /**
              * Reads a binary state from Redis
              * @param id The id of the state
@@ -1296,7 +1320,7 @@ declare global {
             getEnums(enumList: EnumList, callback: GetEnumsCallback): void;
             getEnums(enumList: EnumList, options: unknown, callback: GetEnumsCallback): void;
             /** Returns the enum tree, filtered by the optional enum name */
-            getEnumsAsync(enumList: EnumList, options?: unknown): Promise<CallbackReturnTypeOf<GetEnumsCallback>>;
+            getEnumsAsync(enumList: EnumList, options?: unknown): Promise<NonNullCallbackReturnTypeOf<GetEnumsCallback>>;
 
             addChannelToEnum(enumName: string, addTo: string, parentDevice: string, channelName: string, callback?: ErrorCallback): void;
             addChannelToEnum(enumName: string, addTo: string, parentDevice: string, channelName: string, options: unknown, callback?: ErrorCallback): void;
@@ -1371,9 +1395,9 @@ declare global {
             createDevice(deviceName: string, common: Partial<ioBroker.ObjectCommon>, native: Record<string, any>, callback?: SetObjectCallback): void;
             createDevice(deviceName: string, common: Partial<ioBroker.ObjectCommon>, native: Record<string, any>, options: unknown, callback?: SetObjectCallback): void;
             /** creates an object with type device */
-            createDeviceAsync(deviceName: string, common?: Partial<ioBroker.ObjectCommon>): Promise<CallbackReturnTypeOf<SetObjectCallback>>;
-            createDeviceAsync(deviceName: string, common: Partial<ioBroker.ObjectCommon>, native?: Record<string, any>): Promise<CallbackReturnTypeOf<SetObjectCallback>>;
-            createDeviceAsync(deviceName: string, common: Partial<ioBroker.ObjectCommon>, native: Record<string, any>, options?: unknown): Promise<CallbackReturnTypeOf<SetObjectCallback>>;
+            createDeviceAsync(deviceName: string, common?: Partial<ioBroker.ObjectCommon>): Promise<NonNullCallbackReturnTypeOf<SetObjectCallback>>;
+            createDeviceAsync(deviceName: string, common: Partial<ioBroker.ObjectCommon>, native?: Record<string, any>): Promise<NonNullCallbackReturnTypeOf<SetObjectCallback>>;
+            createDeviceAsync(deviceName: string, common: Partial<ioBroker.ObjectCommon>, native: Record<string, any>, options?: unknown): Promise<NonNullCallbackReturnTypeOf<SetObjectCallback>>;
             /** deletes a device, its channels and states */
             deleteDevice(deviceName: string, callback?: ErrorCallback): void;
             deleteDevice(deviceName: string, options: unknown, callback?: ErrorCallback): void;
@@ -1389,14 +1413,14 @@ declare global {
                 native: Record<string, any>, options: unknown, callback?: SetObjectCallback
             ): void;
             /** Creates an object with type channel. It must be located under a device */
-            createChannelAsync(parentDevice: string, channelName: string, roleOrCommon?: string | Partial<ioBroker.ChannelCommon>): Promise<CallbackReturnTypeOf<SetObjectCallback>>;
+            createChannelAsync(parentDevice: string, channelName: string, roleOrCommon?: string | Partial<ioBroker.ChannelCommon>): Promise<NonNullCallbackReturnTypeOf<SetObjectCallback>>;
             createChannelAsync(
                 parentDevice: string, channelName: string, roleOrCommon: string | Partial<ioBroker.ChannelCommon>, native?: Record<string, any>
-            ): Promise<CallbackReturnTypeOf<SetObjectCallback>>;
+            ): Promise<NonNullCallbackReturnTypeOf<SetObjectCallback>>;
             createChannelAsync(
                 parentDevice: string, channelName: string, roleOrCommon: string | Partial<ioBroker.ChannelCommon>, native: Record<string, any>,
                 options?: unknown
-            ): Promise<CallbackReturnTypeOf<SetObjectCallback>>;
+            ): Promise<NonNullCallbackReturnTypeOf<SetObjectCallback>>;
             /** Deletes a channel and its states. It must have been created with `createChannel` */
             deleteChannel(channelName: string, options?: unknown, callback?: ErrorCallback): void;
             deleteChannel(parentDevice: string, channelName: string, options?: unknown, callback?: ErrorCallback): void;
@@ -1420,15 +1444,17 @@ declare global {
             /**
              * Creates a state and the corresponding object. It must be located in a channel under a device
              */
-            createStateAsync(parentDevice: string, parentChannel: string, stateName: string, roleOrCommon?: string | Partial<ioBroker.StateCommon>): Promise<CallbackReturnTypeOf<SetObjectCallback>>;
+            createStateAsync(
+                parentDevice: string, parentChannel: string, stateName: string, roleOrCommon?: string | Partial<ioBroker.StateCommon>
+            ): Promise<NonNullCallbackReturnTypeOf<SetObjectCallback>>;
             createStateAsync(
                 parentDevice: string, parentChannel: string, stateName: string, roleOrCommon: string | Partial<ioBroker.StateCommon>,
                 native?: Record<string, any>
-            ): Promise<CallbackReturnTypeOf<SetObjectCallback>>;
+            ): Promise<NonNullCallbackReturnTypeOf<SetObjectCallback>>;
             createStateAsync(
                 parentDevice: string, parentChannel: string, stateName: string, roleOrCommon: string | Partial<ioBroker.StateCommon>,
                 native: Record<string, any>, options?: unknown
-            ): Promise<CallbackReturnTypeOf<SetObjectCallback>>;
+            ): Promise<NonNullCallbackReturnTypeOf<SetObjectCallback>>;
             /** Deletes a state. It must have been created with `createState` */
             deleteState(stateName: string, options?: unknown, callback?: ErrorCallback): void;
             deleteState(parentChannel: string, stateName: string, options?: unknown, callback?: ErrorCallback): void;
@@ -1451,7 +1477,7 @@ declare global {
              * @param options (optional) Some internal options.
              * @param callback Is called when the operation has finished (successfully or not)
              */
-            getDevicesAsync(options?: unknown): Promise<Array<GetObjectsItem<DeviceObject>>>;
+            getDevicesAsync(options?: unknown): Promise<DeviceObject[]>;
 
             /**
              * Returns a list of all channels in this adapter instance
@@ -1476,9 +1502,9 @@ declare global {
              * @param parentDevice (optional) Name of the parent device to filter the channels by
              * @param options (optional) Some internal options.
              */
-            getChannelsOfAsync(): Promise<Array<GetObjectsItem<ChannelObject>>>;
+            getChannelsOfAsync(): Promise<ChannelObject[]>;
             // tslint:disable-next-line:unified-signatures
-            getChannelsOfAsync(parentDevice: string, options?: unknown): Promise<Array<GetObjectsItem<ChannelObject>>>;
+            getChannelsOfAsync(parentDevice: string, options?: unknown): Promise<ChannelObject[]>;
 
             /**
              * Returns a list of all states in this adapter instance
@@ -1498,9 +1524,9 @@ declare global {
              * @param options (optional) Some internal options.
              */
             // tslint:disable:unified-signatures
-            getStatesOfAsync(): Promise<Array<GetObjectsItem<StateObject>>>;
-            getStatesOfAsync(parentDevice: string, parentChannel?: string): Promise<Array<GetObjectsItem<StateObject>>>;
-            getStatesOfAsync(parentDevice: string, parentChannel: string, options?: unknown): Promise<Array<GetObjectsItem<StateObject>>>;
+            getStatesOfAsync(): Promise<StateObject[]>;
+            getStatesOfAsync(parentDevice: string, parentChannel?: string): Promise<StateObject[]>;
+            getStatesOfAsync(parentDevice: string, parentChannel: string, options?: unknown): Promise<StateObject[]>;
             // tslint:enable:unified-signatures
 
             // ==============================
@@ -1518,7 +1544,7 @@ declare global {
              * @param adapterName - adapter name. If adapter name is null, default will be the name of the current adapter.
              * @param path - path to directory without adapter name. E.g. If you want to read "/vis.0/main/views.json", here must be "/main/views.json" and _adapter must be equal to "vis.0".
              */
-            readDirAsync(adapterName: string | null, path: string, options?: unknown): Promise<CallbackReturnTypeOf<ReadDirCallback>>;
+            readDirAsync(adapterName: string | null, path: string, options?: unknown): Promise<NonNullCallbackReturnTypeOf<ReadDirCallback>>;
 
             mkDir(adapterName: string | null, path: string, callback: ErrorCallback): void;
             mkDir(adapterName: string | null, path: string, options: unknown, callback: ErrorCallback): void;
@@ -1601,11 +1627,11 @@ declare global {
             removeAllListeners(event?: "ready" | "unload" | "stateChange" | "objectChange" | "message"): this;
         } // end interface Adapter
 
-        type ReadyHandler = () => void;
-        type ObjectChangeHandler = (id: string, obj: ioBroker.Object | null | undefined) => void;
-        type StateChangeHandler = (id: string, obj: State | null | undefined) => void;
-        type MessageHandler = (obj: Message) => void;
-        type UnloadHandler = (callback: EmptyCallback) => void;
+        type ReadyHandler = () => void | Promise<void>;
+        type ObjectChangeHandler = (id: string, obj: ioBroker.Object | null | undefined) => void | Promise<void>;
+        type StateChangeHandler = (id: string, obj: State | null | undefined) => void | Promise<void>;
+        type MessageHandler = (obj: Message) => void | Promise<void>;
+        type UnloadHandler = (callback: EmptyCallback) => void | Promise<void>;
 
         type EmptyCallback = () => void;
         type ErrorCallback = (err?: string) => void;
@@ -1641,10 +1667,13 @@ declare global {
             value: T;
         }
         // This is a version used by GetDevices/GetChannelsOf/GetStatesOf
-        type GetObjectsCallback3<T extends BaseObject> = (err: string | null, result?: Array<GetObjectsItem<T>>) => void;
+        type GetObjectsCallback3<T extends BaseObject> = (err: string | null, result?: T[]) => void;
 
         type SecondParameterOf<T extends (...args: any[]) => any> = T extends (arg0: any, arg1: infer R, ...args: any[]) => any ? R : never;
-        type CallbackReturnTypeOf<T extends (...args: any[]) => any> = Exclude<SecondParameterOf<T>, null | undefined>;
+        /** Infers the return type from a callback-style API and strips out null and undefined */
+        type NonNullCallbackReturnTypeOf<T extends (...args: any[]) => any> = Exclude<SecondParameterOf<T>, null | undefined>;
+        /** Infers the return type from a callback-style API and and leaves null and undefined in */
+        type CallbackReturnTypeOf<T extends (...args: any[]) => any> = SecondParameterOf<T>;
         type GetStateCallback = (err: string | null, state: State | null | undefined) => void;
         type GetStatesCallback = (err: string | null, states: Record<string, State>) => void;
         /** Version of the callback used by States.getStates */
diff --git a/types/iobroker/iobroker-tests.ts b/types/iobroker/iobroker-tests.ts
index 21233e20fd..0b707098fa 100644
--- a/types/iobroker/iobroker-tests.ts
+++ b/types/iobroker/iobroker-tests.ts
@@ -20,6 +20,16 @@ adapter
     ;
 adapter.removeAllListeners();
 
+// Test adapter constructor options
+let adapterOptions: ioBroker.AdapterOptions = {
+    name: "foo",
+    ready: readyHandler,
+    stateChange: stateChangeHandler,
+    objectChange: objectChangeHandler,
+    message: messageHandler,
+    unload: unloadHandler,
+};
+
 function readyHandler() { }
 
 function stateChangeHandler(id: string, state: ioBroker.State | null | undefined) {
@@ -149,6 +159,13 @@ adapter.setForeignStateChangedAsync("state.name", "value").then(id => id.toLower
 adapter.setForeignStateChangedAsync("state.name", "value", true).then(id => id.toLowerCase());
 adapter.setForeignStateChangedAsync("state.name", { val: "value", ack: true }).then(id => id.toLowerCase());
 
+adapter.getState("state.id", (err, state) => state && state.from.toLowerCase());
+adapter.getStateAsync("state.id").then(state => state && state.from.toLowerCase());
+adapter.getForeignState("state.id", (err, state) => state && state.from.toLowerCase());
+adapter.getForeignStateAsync("state.id").then(state => state && state.from.toLowerCase());
+adapter.getBinaryState("state.id", (err, state) => state && state.writeUInt16BE(0, 0));
+adapter.getBinaryStateAsync("state.id").then(state => state && state.writeUInt16BE(0, 0));
+
 adapter.setObject("obj.id", { type: "state", common: { name: "foo" }, native: {} });
 adapter.setObject("obj.id", { type: "state", common: { name: "foo" }, native: {} }, (err, id) => { });
 adapter.setForeignObject("obj.id", { type: "state", common: { name: "foo" }, native: {} });
@@ -168,8 +185,8 @@ adapter.setForeignObjectNotExistsAsync("obj.id", { type: "state", common: { name
 adapter.getObject("obj.id", (err, obj) => { });
 adapter.getForeignObject("obj.id", (err, obj) => { });
 
-adapter.getObjectAsync("obj.id").then(obj => obj._id.toLowerCase());
-adapter.getForeignObjectAsync("obj.id").then(obj => obj._id.toLowerCase());
+adapter.getObjectAsync("obj.id").then(obj => obj && obj._id.toLowerCase());
+adapter.getForeignObjectAsync("obj.id").then(obj => obj && obj._id.toLowerCase());
 
 adapter.getForeignObjects("*", (err, objs) => objs["foo"]._id.toLowerCase());
 adapter.getForeignObjectsAsync("*").then(objs => objs["foo"]._id.toLowerCase());
@@ -202,8 +219,8 @@ switch (adapter.log.level) {
 
 adapter.sendTo("foo.0", "command", "message");
 adapter.sendTo("foo.0", "message");
-adapter.sendTo("foo.0", "command", {msg: "message"});
-adapter.sendTo("foo.0", {msg: "message"});
+adapter.sendTo("foo.0", "command", { msg: "message" });
+adapter.sendTo("foo.0", { msg: "message" });
 
 function handleMessageResponse(response?: ioBroker.Message) {
     if (!response) return;
@@ -219,28 +236,28 @@ function handleMessageResponse(response?: ioBroker.Message) {
 }
 adapter.sendTo("foo.0", "command", "message", handleMessageResponse);
 adapter.sendTo("foo.0", "message", handleMessageResponse);
-adapter.sendTo("foo.0", "command", {msg: "message"}, handleMessageResponse);
-adapter.sendTo("foo.0", {msg: "message"}, handleMessageResponse);
+adapter.sendTo("foo.0", "command", { msg: "message" }, handleMessageResponse);
+adapter.sendTo("foo.0", { msg: "message" }, handleMessageResponse);
 
 adapter.sendToAsync("foo.0", "command", "message").then(handleMessageResponse);
 adapter.sendToAsync("foo.0", "message").then(handleMessageResponse);
-adapter.sendToAsync("foo.0", "command", {msg: "message"}).then(handleMessageResponse);
-adapter.sendToAsync("foo.0", {msg: "message"}).then(handleMessageResponse);
+adapter.sendToAsync("foo.0", "command", { msg: "message" }).then(handleMessageResponse);
+adapter.sendToAsync("foo.0", { msg: "message" }).then(handleMessageResponse);
 
 adapter.sendToHost("host-foo", "command", "message");
 adapter.sendToHost("host-foo", "message");
-adapter.sendToHost("host-foo", "command", {msg: "message"});
-adapter.sendToHost("host-foo", {msg: "message"});
+adapter.sendToHost("host-foo", "command", { msg: "message" });
+adapter.sendToHost("host-foo", { msg: "message" });
 
 adapter.sendToHost("host-foo", "command", "message", handleMessageResponse);
 adapter.sendToHost("host-foo", "message", handleMessageResponse);
-adapter.sendToHost("host-foo", "command", {msg: "message"}, handleMessageResponse);
-adapter.sendToHost("host-foo", {msg: "message"}, handleMessageResponse);
+adapter.sendToHost("host-foo", "command", { msg: "message" }, handleMessageResponse);
+adapter.sendToHost("host-foo", { msg: "message" }, handleMessageResponse);
 
 adapter.sendToHostAsync("host-foo", "command", "message").then(handleMessageResponse);
 adapter.sendToHostAsync("host-foo", "message").then(handleMessageResponse);
-adapter.sendToHostAsync("host-foo", "command", {msg: "message"}).then(handleMessageResponse);
-adapter.sendToHostAsync("host-foo", {msg: "message"}).then(handleMessageResponse);
+adapter.sendToHostAsync("host-foo", "command", { msg: "message" }).then(handleMessageResponse);
+adapter.sendToHostAsync("host-foo", { msg: "message" }).then(handleMessageResponse);
 
 function handleError(err?: string) { }
 adapter.subscribeStates("*", handleError);
@@ -252,3 +269,58 @@ adapter.subscribeStatesAsync("*").catch(handleError);
 adapter.subscribeForeignStatesAsync("*").catch(handleError);
 adapter.unsubscribeStatesAsync("*").catch(handleError);
 adapter.unsubscribeForeignStatesAsync("*").catch(handleError);
+
+// Repro from https://github.com/ioBroker/adapter-core/issues/3
+const repro1: ioBroker.ObjectChangeHandler = (id, obj) => {
+    if (!obj || !obj.common) return;
+    if (obj.common.custom) {
+        const test1: ioBroker.StateCommon = obj.common;
+    }
+    obj
+        && obj.common
+        && obj.common.custom
+        && obj.common.custom["adapter.0"]
+        && obj.common.custom["adapter.0"].enabled
+        ;
+};
+
+// Repro from https://github.com/ioBroker/adapter-core/issues/4
+function repro2() {
+    // Prepare custom object
+    const obj = {
+        common: {
+            custom: {
+                "adapter.namespace": { start_day: null as any }
+            }
+        }
+    };
+    adapter.extendForeignObject("obj.id", obj, (err) => { });
+}
+
+// repro from https://github.com/ioBroker/adapter-core/issues/6
+function repro3() {
+    adapter.getDevices((error, deviceList) => {
+        if (deviceList) {
+            deviceList; // $ExpectType DeviceObject[]
+        }
+    });
+    adapter.getDevicesAsync().then(list => {
+        list; // $ExpectType DeviceObject[]
+    });
+    adapter.getChannels((error, channelList) => {
+        if (channelList) {
+            channelList; // $ExpectType ChannelObject[]
+        }
+    });
+    adapter.getChannelsOfAsync().then(list => {
+        list; // $ExpectType ChannelObject[]
+    });
+    adapter.getStatesOf((error, stateList) => {
+        if (stateList) {
+            stateList; // $ExpectType StateObject[]
+        }
+    });
+    adapter.getStatesOfAsync().then(list => {
+        list; // $ExpectType StateObject[]
+    });
+}
diff --git a/types/ion-rangeslider/index.d.ts b/types/ion-rangeslider/index.d.ts
index 9788741b77..3b5a8d8d75 100644
--- a/types/ion-rangeslider/index.d.ts
+++ b/types/ion-rangeslider/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ion-rangeslider 2.2
-// Project: https://github.com/IonDen/ion.rangeSlider/
+// Project: https://github.com/IonDen/ion.rangeSlider/, http://ionden.com/a/plugins/ion.rangeslider/en.html
 // Definitions by: Karel van de Plassche <https://github.com/Karel-van-de-Plassche>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/iopipe__iopipe/index.d.ts b/types/iopipe__iopipe/index.d.ts
index 338de9ca58..fc2fed4f9e 100644
--- a/types/iopipe__iopipe/index.d.ts
+++ b/types/iopipe__iopipe/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for iopipe__iopipe 1.12
-// Project: https://github.com/iopipe/iopipe (Does not have to be to GitHub, but prefer linking to a source code repository rather than to a project website.)
+// Project: https://github.com/iopipe/iopipe, https://github.com/iopipe/the-meta-package
 // Definitions by: Javon Harper <https://github.com/javonharper>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
@@ -22,7 +22,7 @@ declare namespace iopipe {
         timeoutWindow?: number;
     }
 
-    type FunctionWrapper = (handler: any) => void;
+    type FunctionWrapper = <T>(handler: T) => T;
 }
 
 export = iopipe;
diff --git a/types/iopipe__iopipe/iopipe__iopipe-tests.ts b/types/iopipe__iopipe/iopipe__iopipe-tests.ts
index f5bd387dc8..0132de3e01 100644
--- a/types/iopipe__iopipe/iopipe__iopipe-tests.ts
+++ b/types/iopipe__iopipe/iopipe__iopipe-tests.ts
@@ -14,4 +14,4 @@ function run(event: any, context: any, callback?: any)  {
   iopipe.mark.end("my-db-call");
 }
 
-iopipe(config)(run);
+export default iopipe(config)(run);
diff --git a/types/ioredis/index.d.ts b/types/ioredis/index.d.ts
index d5f829c8fe..743c3c061a 100644
--- a/types/ioredis/index.d.ts
+++ b/types/ioredis/index.d.ts
@@ -489,6 +489,8 @@ declare namespace IORedis {
         xack(key: KeyType, group: string, ...ids: string[]): any;
 
         xadd(key: KeyType, id: string, ...args: string[]): any;
+        xadd(key: KeyType, maxLenOption: 'MAXLEN' | 'maxlen', count: number, ...args: string[]): any;
+        xadd(key: KeyType, maxLenOption: 'MAXLEN' | 'maxlen', approximate: '~', count: number, ...args: string[]): any;
 
         xclaim(key: KeyType, group: string, consumer: string, minIdleTime: number, ...args: any[]): any;
 
diff --git a/types/ioredis/ioredis-tests.ts b/types/ioredis/ioredis-tests.ts
index 9950a8543f..89e4120f0e 100644
--- a/types/ioredis/ioredis-tests.ts
+++ b/types/ioredis/ioredis-tests.ts
@@ -177,6 +177,8 @@ new Redis.Cluster([{
 
 redis.xack('streamName', 'groupName', 'id');
 redis.xadd('streamName', '*', 'field', 'name');
+redis.xadd('streamName', 'MAXLEN', 100, '*', 'field', 'name');
+redis.xadd('streamName', 'MAXLEN', '~', 100, '*', 'field', 'name');
 redis.xclaim('streamName', 'groupName', 'consumerName', 3600000, 'id');
 redis.xdel('streamName', 'id');
 redis.xgroup('CREATE', 'streamName', 'groupName', '$');
diff --git a/types/irc/index.d.ts b/types/irc/index.d.ts
index a7b163ca6e..6c222c428d 100644
--- a/types/irc/index.d.ts
+++ b/types/irc/index.d.ts
@@ -8,8 +8,8 @@
 /** This library provides IRC client functionality. */
 
 import events = require('events');
-import crypto = require('crypto');
 import net = require('net');
+import tls = require('tls');
 
 /** This library provides IRC client functionality. */
 declare namespace NodeIRC {
@@ -287,7 +287,7 @@ declare namespace NodeIRC {
          * Should SSL be used? Can either be true or crypto credentials.
          * @default false
          */
-        secure?: boolean | crypto.Credentials;
+        secure?: boolean | tls.SecureContext;
 
         /**
          * Should we accept self-signed certificates?
diff --git a/types/isomorphic-fetch/index.d.ts b/types/isomorphic-fetch/index.d.ts
index 7fbc0d8ed2..948296cff6 100644
--- a/types/isomorphic-fetch/index.d.ts
+++ b/types/isomorphic-fetch/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for isomorphic-fetch 0.0
-// Project: https://github.com/matthew-andrews/isomorphic-fetch
+// Project: https://github.com/matthew-andrews/isomorphic-fetch/issues
 // Definitions by: Todd Lucas <https://github.com/toddlucas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/isotope-layout/index.d.ts b/types/isotope-layout/index.d.ts
index 5e1f0623e4..5662da48f7 100644
--- a/types/isotope-layout/index.d.ts
+++ b/types/isotope-layout/index.d.ts
@@ -1,7 +1,8 @@
 // Type definitions for isotope 3.0
-// Project: http://isotope.metafizzy.co/
+// Project: https://isotope.metafizzy.co
 // Definitions by: Anže Videnič <https://github.com/avidenic>
 //                 Mălin Brândușe <https://github.com/malinushj>
+//                 SPWizard01 <https://github.com/SPWizard01>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -30,7 +31,7 @@ declare namespace Isotope {
          * If set to a string, that value is used as a selector.
          * If filter is set to a function, that function checks each item and returns true or false if the item should be shown or hidden.
          */
-        filter?: string | (() => boolean);
+        filter?: string | ((itemElement: HTMLElement) => boolean);
         /**
          * Items are arranged into rows. Rows progress vertically. Similar to what you would expect from a layout that uses CSS floats. fitRows works well for items that have the same height.
          */
diff --git a/types/isotope-layout/isotope-layout-tests.ts b/types/isotope-layout/isotope-layout-tests.ts
index 776412b2c2..d37475cefa 100644
--- a/types/isotope-layout/isotope-layout-tests.ts
+++ b/types/isotope-layout/isotope-layout-tests.ts
@@ -70,8 +70,8 @@ let $grid = $('.grid').isotope({
 
 // test the ones not used in upper test
 $grid = $('.grid').isotope({
-    filter: (): boolean => {
-        return true;
+    filter: (itemElem): boolean => {
+        return itemElem ? true : false;
     },
     sortAscending: {
         key: true
diff --git a/types/jasmine-data_driven_tests/index.d.ts b/types/jasmine-data_driven_tests/index.d.ts
index 6e6a070eaa..553987ef60 100644
--- a/types/jasmine-data_driven_tests/index.d.ts
+++ b/types/jasmine-data_driven_tests/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Jasmine Data Driven Tests 1.0
-// Project: https://github.com/gburghardt/jasmine-data_driven_tests
+// Project: https://github.com/gburghardt/jasmine-data_driven_tests, https://github.com/dakolech/jasmine-data_driven_tests
 // Definitions by: Anthony MacKinnon <https://github.com/AnthonyMacKinnon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
@@ -34,6 +34,6 @@ interface JasmineDataDrivenTest {
         assertion: (arg0: T, arg1: U, done: () => void) => void): void;
     <T>(
         description: string,
-        dataset: T[],
+        dataset: T[] | Array<[T]>,
         assertion: (value: T, done: () => void) => void): void;
 }
diff --git a/types/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts b/types/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts
index 6689159b58..0523a28af0 100644
--- a/types/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts
+++ b/types/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts
@@ -37,6 +37,13 @@ xall("A data driven test can be pending",
     }
 );
 
+all("A data set must consist of array-wrapped arrays, if test expects single array input",
+    [[[1, 2]], [[3, 4]], [[5, 6]]],
+    (numberArray: number[]) => {
+        expect(numberArray.length).toBe(2);
+    }
+);
+
 describe("A suite", () => {
     let a: number;
 
diff --git a/types/jasmine-enzyme/index.d.ts b/types/jasmine-enzyme/index.d.ts
index bc37eda9bf..d64a73e6f6 100644
--- a/types/jasmine-enzyme/index.d.ts
+++ b/types/jasmine-enzyme/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jasmine-enzyme 3.6
-// Project: https://github.com/blainekasten/enzyme-matchers/blob/master/packages/jasmine-enzyme/README.md
+// Project: https://github.com/formidablelabs/enzyme-matchers/packages/jasmine-enzyme
 // Definitions by: Umar Bolatov <https://github.com/bolatovumar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/jasmine/index.d.ts b/types/jasmine/index.d.ts
index f87dd67ece..1bc099bcad 100644
--- a/types/jasmine/index.d.ts
+++ b/types/jasmine/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Jasmine 3.3
-// Project: https://jasmine.github.io/
+// Project: http://jasmine.github.io
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 //                 Theodore Brown <https://github.com/theodorejb>
 //                 David Pärsson <https://github.com/davidparsson>
diff --git a/types/jasmine_dom_matchers/index.d.ts b/types/jasmine_dom_matchers/index.d.ts
index b3a625f08c..f60cd4265e 100644
--- a/types/jasmine_dom_matchers/index.d.ts
+++ b/types/jasmine_dom_matchers/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jasmine_dom_matchers 1.4
-// Project: https://github.com/charleshansen/jasmine_dom_matchers
+// Project: http://github.com/charleshansen/jasmine_dom_matchers
 // Definitions by: Yaroslav Admin <https://github.com/devoto13>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/jest-axe/index.d.ts b/types/jest-axe/index.d.ts
index 60375e3605..506236773f 100644
--- a/types/jest-axe/index.d.ts
+++ b/types/jest-axe/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nickcolley/jest-axe
 // Definitions by: Josh Goldberg <https://github.com/JoshuaKGoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 3.0
 
 /// <reference types="jest" />
 
diff --git a/types/jest-diff/index.d.ts b/types/jest-diff/index.d.ts
index b296c07f91..022626ab2c 100644
--- a/types/jest-diff/index.d.ts
+++ b/types/jest-diff/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jest-diff 20.0
-// Project: https://github.com/facebook/jest/tree/master/packages/jest-diff
+// Project: https://github.com/facebook/jest/tree/master/packages/jest-diff, https://github.com/facebook/jest
 // Definitions by: Alex Coles <https://github.com/myabc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/jest-docblock/index.d.ts b/types/jest-docblock/index.d.ts
index 6e5c7d7eb0..6c1e59f2d0 100644
--- a/types/jest-docblock/index.d.ts
+++ b/types/jest-docblock/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jest-docblock 21.0
-// Project: https://github.com/facebook/jest/tree/master/packages/jest-docblock
+// Project: https://github.com/facebook/jest/tree/master/packages/jest-docblock, https://github.com/facebook/jest
 // Definitions by: Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/jest-each/index.d.ts b/types/jest-each/index.d.ts
index f370d16e6e..3d6ecf1609 100644
--- a/types/jest-each/index.d.ts
+++ b/types/jest-each/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jest-each 0.3
-// Project: https://github.com/mattphillips/jest-each
+// Project: https://github.com/facebook/jest
 // Definitions by: Michael Utz <https://github.com/theutz>, Nick McCurdy <https://github.com/nickmccurdy>
 // Definitions: <https://github.com/DefinitelyTyped/DefinitelyTyped>
 // TypeScript Version: 2.2
diff --git a/types/jest-get-type/index.d.ts b/types/jest-get-type/index.d.ts
index e43fbcf7ab..ecc0a3de61 100644
--- a/types/jest-get-type/index.d.ts
+++ b/types/jest-get-type/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jest-get-type 21.0
-// Project: https://github.com/facebook/jest/tree/master/packages/jest-get-type
+// Project: https://github.com/facebook/jest/tree/master/packages/jest-get-type, https://github.com/facebook/jest
 // Definitions by: Alex Coles <https://github.com/myabc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/jest-image-snapshot/index.d.ts b/types/jest-image-snapshot/index.d.ts
index c15e435cc9..10d6a2a17d 100644
--- a/types/jest-image-snapshot/index.d.ts
+++ b/types/jest-image-snapshot/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for jest-image-snapshot 2.4
+// Type definitions for jest-image-snapshot 2.8
 // Project: https://github.com/americanexpress/jest-image-snapshot#readme
 // Definitions by: Janeene Beeforth <https://github.com/dawnmist>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 3.0
 
 /// <reference types="jest" />
 
@@ -26,10 +26,18 @@ export interface MatchImageSnapshotOptions {
      * Absolute path of a directory to keep the snapshot in.
      */
     customSnapshotsDir?: string;
+    /**
+     * A custom absolute path of a directory to keep this diff in
+     */
+    customDiffDir?: string;
     /**
      * A custom name to give this snapshot. If not provided, one is computed automatically.
      */
     customSnapshotIdentifier?: string;
+    /**
+     * Changes diff image layout direction, default is horizontal.
+     */
+    diffDirection?: 'horizontal' | 'vertical';
     /**
      * Removes coloring from the console output, useful if storing the results to a file.
      * Defaults to false.
@@ -47,6 +55,10 @@ export interface MatchImageSnapshotOptions {
      * Defaults to 'pixel'.
      */
     failureThresholdType?: 'pixel' | 'percent';
+    /**
+     * Updates a snapshot even if it passed the threshold against the existing one, defaults to false.
+     */
+    updatePassedSnapshot?: boolean;
 }
 
 /**
@@ -55,7 +67,7 @@ export interface MatchImageSnapshotOptions {
  *   import { toMatchImageSnapshot } from 'jest-image-snapshot';
  *   expect.extend({ toMatchImageSnapshot });
  */
-export function toMatchImageSnapshot(): { message(): string; pass: boolean; };
+export function toMatchImageSnapshot(options?: MatchImageSnapshotOptions): { message(): string; pass: boolean; };
 
 /**
  * Configurable function that can be passed to jest's expect.extend.
@@ -69,7 +81,7 @@ export function configureToMatchImageSnapshot(options: MatchImageSnapshotOptions
 declare global {
     namespace jest {
         interface Matchers<R> {
-            toMatchImageSnapshot(): R;
+            toMatchImageSnapshot(options?: MatchImageSnapshotOptions): R;
         }
     }
 }
diff --git a/types/jest-image-snapshot/jest-image-snapshot-tests.ts b/types/jest-image-snapshot/jest-image-snapshot-tests.ts
index a2ccb8c777..07f6debed7 100644
--- a/types/jest-image-snapshot/jest-image-snapshot-tests.ts
+++ b/types/jest-image-snapshot/jest-image-snapshot-tests.ts
@@ -1,5 +1,5 @@
 // Typescript Version: 2.3
-import { toMatchImageSnapshot, configureToMatchImageSnapshot } from 'jest-image-snapshot';
+import { toMatchImageSnapshot, configureToMatchImageSnapshot, MatchImageSnapshotOptions } from 'jest-image-snapshot';
 
 it('should be able to use toMatchImageSnapshot in a test', () => {
     expect.extend({ toMatchImageSnapshot });
@@ -21,3 +21,22 @@ it('should be able to use configureToMatchImageSnapshot in a test', () => {
 
     expect('Me').toMatchImageSnapshot();
 });
+
+it('Should be able to use configuration directly in toMatchImageSnapshot', () => {
+    expect.extend({ toMatchImageSnapshot });
+
+    const options: MatchImageSnapshotOptions = {
+        noColors: true,
+        customDiffConfig: {
+            threshold: 5,
+            includeAA: false
+        },
+        customDiffDir: './diffs',
+        diffDirection: 'vertical',
+        updatePassedSnapshot: true,
+        failureThreshold: 10,
+        failureThresholdType: 'percent'
+    };
+
+    expect('Me').toMatchImageSnapshot(options);
+});
diff --git a/types/jest-in-case/index.d.ts b/types/jest-in-case/index.d.ts
index 02d7d08af9..9762bc39d3 100644
--- a/types/jest-in-case/index.d.ts
+++ b/types/jest-in-case/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/thinkmill/jest-in-case#readme
 // Definitions by: Geovani de Souza <https://github.com/geovanisouza92>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 3.0
 
 /// <reference types="jest" />
 /// <reference types="node" />
diff --git a/types/jest-in-case/jest-in-case-tests.ts b/types/jest-in-case/jest-in-case-tests.ts
index 283ade76c1..b38ccff0bc 100644
--- a/types/jest-in-case/jest-in-case-tests.ts
+++ b/types/jest-in-case/jest-in-case-tests.ts
@@ -11,10 +11,10 @@ function subtract(minuend: number, subtrahend: number) {
 }
 
 beforeEach(() => {
-    jest.spyOn(global, 'describe').mockImplementation((title, fn) => fn());
-    jest.spyOn(global, 'test').mockImplementation((name, fn) => fn());
-    global.test.skip = jest.fn((name, fn) => fn());
-    global.test.only = jest.fn((name, fn) => fn());
+    jest.spyOn(global, 'describe').mockImplementation((title, fn) => (fn as () => void)());
+    jest.spyOn(global, 'test').mockImplementation((name, fn) => (fn as () => void)());
+    global.test.skip = jest.fn((_: string, fn: jest.EmptyFunction) => fn());
+    global.test.only = jest.fn((_: string, fn: jest.EmptyFunction) => fn());
 });
 
 afterEach(() => {
@@ -54,8 +54,8 @@ test('array', () => {
 });
 
 test('object', () => {
-    jest.spyOn(global, 'describe').mockImplementation((title, fn) => fn());
-    jest.spyOn(global, 'test').mockImplementation((name, fn) => fn());
+    jest.spyOn(global, 'describe').mockImplementation((title, fn) => (fn as () => void)());
+    jest.spyOn(global, 'test').mockImplementation((name, fn) => (fn as () => void)());
 
     const title = 'add(augend, addend)';
 
diff --git a/types/jest-json-schema/index.d.ts b/types/jest-json-schema/index.d.ts
index 67f1c51f7e..b2133526dc 100644
--- a/types/jest-json-schema/index.d.ts
+++ b/types/jest-json-schema/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/americanexpress/jest-json-schema#readme
 // Definitions by: Igor Korolev <https://github.com/deadNightTiger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 3.0
 
 /// <reference types="jest" />
 import * as ajv from "ajv";
diff --git a/types/jest-matcher-utils/index.d.ts b/types/jest-matcher-utils/index.d.ts
index 54e6db67b3..069c4b6c9a 100644
--- a/types/jest-matcher-utils/index.d.ts
+++ b/types/jest-matcher-utils/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jest-matcher-utils 21.0
-// Project: https://github.com/facebook/jest/tree/master/packages/jest-get-type
+// Project: https://github.com/facebook/jest
 // Definitions by: Alex Coles <https://github.com/myabc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/jest-matchers/index.d.ts b/types/jest-matchers/index.d.ts
index 3b028f8929..705f993ea3 100644
--- a/types/jest-matchers/index.d.ts
+++ b/types/jest-matchers/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/facebook/jest#readme
 // Definitions by: Joscha Feth <https://github.com/joscha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 3.0
 
 /// <reference types="jest" />
 export = expect;
diff --git a/types/jest-plugin-context/index.d.ts b/types/jest-plugin-context/index.d.ts
index da2698b78e..10f486fb8e 100644
--- a/types/jest-plugin-context/index.d.ts
+++ b/types/jest-plugin-context/index.d.ts
@@ -1,8 +1,8 @@
 // Type definitions for jest-plugin-context 2.9
-// Project: https://github.com/negativetwelve/jest-plugins/tree/master/packages/jest-plugin-context
+// Project: https://github.com/negativetwelve/jest-plugins/tree/master/packages/jest-plugin-context, https://github.com/negativetwelve/jest-plugins
 // Definitions by: Jonas Heinrich <https://github.com/jonasheinrich>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 3.0
 
 /// <reference types="jest" />
 
diff --git a/types/jest-plugin-set/index.d.ts b/types/jest-plugin-set/index.d.ts
index 05d96335cb..f822544ed2 100644
--- a/types/jest-plugin-set/index.d.ts
+++ b/types/jest-plugin-set/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jest-plugin-set 2.9
-// Project: https://github.com/negativetwelve/jest-plugins/tree/master/packages/jest-plugin-set
+// Project: https://github.com/negativetwelve/jest-plugins/tree/master/packages/jest-plugin-set, https://github.com/negativetwelve/jest-plugins
 // Definitions by: Jonas Heinrich <https://github.com/jonasheinrich>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/jest-specific-snapshot/index.d.ts b/types/jest-specific-snapshot/index.d.ts
index 61a65a416a..0e0a43d895 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.8
+// TypeScript Version: 3.0
 
 /// <reference types="jest" />
 
diff --git a/types/jest-validate/index.d.ts b/types/jest-validate/index.d.ts
index 5ad3d9b4d3..477e475182 100644
--- a/types/jest-validate/index.d.ts
+++ b/types/jest-validate/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jest-validate 21.0
-// Project: https://github.com/facebook/jest/tree/master/packages/jest-validate
+// Project: https://github.com/facebook/jest/tree/master/packages/jest-validate, https://github.com/facebook/jest
 // Definitions by: Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/jest-when/index.d.ts b/types/jest-when/index.d.ts
index 0579419425..9a9fb9a55f 100644
--- a/types/jest-when/index.d.ts
+++ b/types/jest-when/index.d.ts
@@ -2,26 +2,21 @@
 // Project: https://github.com/timkindberg/jest-when#readme
 // Definitions by: Alden Taylor <https://github.com/aldentaylor>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 3.0
 
 /// <reference types="jest" />
 
-export interface When {
-  <T>(fn: jest.Mocked<T> | jest.Mock<T>): When;
-
-  // due to no-unnecessary-generics lint rule, the generics have been replaced with 'any'
-  // calledWith<T>(...matchers: any[]): PartialMockInstance<T>;
-  // expectCalledWith<T>(...matchers: any[]): PartialMockInstance<T>;
-  calledWith(...matchers: any[]): When;
-
-  expectCalledWith(...matchers: any[]): When;
-
-  mockReturnValue: (value: any) => jest.MockInstance<any>['mockReturnValue'] & When;
-  mockReturnValueOnce: (value: any) => jest.MockInstance<any>['mockReturnValue'] & When;
-  mockResolvedValue: (value: any) => jest.MockInstance<any>['mockReturnValue'] & When;
-  mockResolvedValueOnce: (value: any) => jest.MockInstance<any>['mockReturnValue'] & When;
-  mockRejectedValue: (value: any) => jest.MockInstance<any>['mockReturnValue'] & When;
-  mockRejectedValueOnce: (value: any) => jest.MockInstance<any>['mockReturnValue'] & When;
+export interface WhenMock<T = any, Y extends any[] = any> extends jest.Mock<T, Y> {
+  calledWith(...matchers: Y): WhenMock<T, Y>;
+  expectCalledWith(...matchers: Y): WhenMock<T, Y>;
+  mockReturnValue(value: T): WhenMock<T, Y>;
+  mockReturnValueOnce(value: T): WhenMock<T, Y>;
+  mockResolvedValue(value: jest.ResolvedValue<T>): WhenMock<T, Y>;
+  mockResolvedValueOnce(value: jest.ResolvedValue<T>): WhenMock<T, Y>;
+  mockRejectedValue(value: jest.RejectedValue<T>): WhenMock<T, Y>;
+  mockRejectedValueOnce(value: jest.RejectedValue<T>): WhenMock<T, Y>;
 }
 
+export type When = <T, Y extends any[]>(fn: jest.Mock<T, Y>) => WhenMock<T, Y>;
+
 export const when: When;
diff --git a/types/jest-when/jest-when-tests.ts b/types/jest-when/jest-when-tests.ts
index 179ea2fae1..55744218ce 100644
--- a/types/jest-when/jest-when-tests.ts
+++ b/types/jest-when/jest-when-tests.ts
@@ -31,16 +31,20 @@ describe('mock-when test', () => {
 
   it('Supports compound declarations:', () => {
     const fn = jest.fn();
-    when(fn).calledWith(1).mockReturnValue('no');
+    when(fn).calledWith(1).mockReturnValueOnce('no').mockReturnValue('yes');
     when(fn).calledWith(2).mockReturnValue('way?');
-    when(fn).calledWith(3).mockReturnValue('yes');
-    when(fn).calledWith(4).mockReturnValue('way!');
+    when(fn).calledWith(3).mockResolvedValueOnce('no');
+    when(fn).calledWith(3).mockResolvedValue('yes');
+    when(fn).calledWith(4).mockRejectedValueOnce('no');
+    when(fn).calledWith(4).mockRejectedValue('yes');
 
     expect(fn(1)).toEqual('no');
+    expect(fn(1)).toEqual('yes');
     expect(fn(2)).toEqual('way?');
-    expect(fn(3)).toEqual('yes');
-    expect(fn(4)).toEqual('way!');
-    expect(fn(5)).toEqual(undefined);
+    expect(fn(3)).resolves.toEqual('no');
+    expect(fn(3)).resolves.toEqual('yes');
+    expect(fn(4)).rejects.toEqual('no');
+    expect(fn(4)).rejects.toEqual('yes');
   });
 
   it('Supports chained calls:', () => {
diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 368ed83353..f0382d2cb5 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Jest 23.3
+// Type definitions for Jest 24.0
 // Project: http://facebook.github.io/jest/
 // Definitions by: Asana <https://asana.com>
 //                 Ivo Stratev <https://github.com/NoHomey>
@@ -17,8 +17,11 @@
 //                 Martin Hochel <https://github.com/hotell>
 //                 Sebastian Sebald <https://github.com/sebald>
 //                 Andy <https://github.com/andys8>
+//                 Antoine Brault <https://github.com/antoinebrault>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 3.0
+
+/// <reference types="jest-diff" />
 
 declare var beforeAll: jest.Lifecycle;
 declare var beforeEach: jest.Lifecycle;
@@ -114,11 +117,11 @@ declare namespace jest {
     /**
      * Creates a mock function. Optionally takes a mock implementation.
      */
-    function fn<T extends {}>(implementation: (...args: any[]) => T): Mock<T>;
+    function fn(): Mock;
     /**
      * Creates a mock function. Optionally takes a mock implementation.
      */
-    function fn<T>(implementation?: (...args: any[]) => any): Mock<T>;
+    function fn<T, Y extends any[]>(implementation?: (...args: Y) => T): Mock<T, Y>;
     /**
      * Use the automatic mocking system to generate a mocked version of the given module.
      */
@@ -126,7 +129,7 @@ declare namespace jest {
     /**
      * Returns whether the given function is a mock function.
      */
-    function isMockFunction(fn: any): fn is Mock<any>;
+    function isMockFunction(fn: any): fn is Mock;
     /**
      * Mocks a module with an auto-mocked version when it is being required.
      */
@@ -151,6 +154,11 @@ declare namespace jest {
      * useful to isolate modules where local state might conflict between tests.
      */
     function resetModules(): typeof jest;
+    /**
+     * Runs failed tests n-times until they pass or until the max number of retries is exhausted.
+     * This only works with jest-circus!
+     */
+    function retryTimes(numRetries: number): typeof jest;
     /**
      * Exhausts tasks queued by setImmediate().
      */
@@ -212,7 +220,9 @@ declare namespace jest {
      *   spy.mockRestore();
      * });
      */
-    function spyOn<T extends {}, M extends keyof T>(object: T, method: M, accessType?: 'get' | 'set'): SpyInstance<T[M]>;
+    function spyOn<T extends {}, M extends NonFunctionPropertyNames<T>>(object: T, method: M, accessType: 'get'): SpyInstance<T[M], []>;
+    function spyOn<T extends {}, M extends NonFunctionPropertyNames<T>>(object: T, method: M, accessType: 'set'): SpyInstance<void, [T[M]]>;
+    function spyOn<T extends {}, M extends FunctionPropertyNames<T>>(object: T, method: M): T[M] extends (...args: any[]) => any ? SpyInstance<ReturnType<T[M]>, ArgsType<T[M]>> : never;
     /**
      * Indicates that the module system should never return a mocked version of
      * the specified module from require() (e.g. that it should always return the real module).
@@ -232,6 +242,12 @@ declare namespace jest {
     }
 
     type EmptyFunction = () => void;
+    type ArgsType<T> = T extends (...args: infer A) => any ? A : never;
+    type RejectedValue<T> = T extends PromiseLike<any> ? any : never;
+    type ResolvedValue<T> = T extends PromiseLike<infer U> ? U | T : never;
+    // see https://github.com/Microsoft/TypeScript/issues/25215
+    type NonFunctionPropertyNames<T> = { [K in keyof T]: T[K] extends (...args: any[]) => any ? never : K }[keyof T] & string;
+    type FunctionPropertyNames<T> = { [K in keyof T]: T[K] extends (...args: any[]) => any ? K : never }[keyof T] & string;
 
     interface DoneCallback {
         (...args: any[]): any;
@@ -274,6 +290,10 @@ declare namespace jest {
          * Skips running this test in the current file.
          */
         skip: It;
+        /**
+         * Sketch out which tests to write in the future.
+         */
+        todo: It;
         /**
          * Experimental and should be avoided.
          */
@@ -337,6 +357,7 @@ declare namespace jest {
         utils: {
             readonly EXPECTED_COLOR: (text: string) => string;
             readonly RECEIVED_COLOR: (text: string) => string;
+            diff: typeof import('jest-diff');
             ensureActualIsNumber(actual: any, matcherName?: string): void;
             ensureExpectedIsNumber(actual: any, matcherName?: string): void;
             ensureNoExpected(actual: any, matcherName?: string): void;
@@ -776,12 +797,12 @@ declare namespace jest {
         new (...args: any[]): any;
     }
 
-    interface Mock<T = {}> extends Function, MockInstance<T> {
-        new (...args: any[]): T;
-        (...args: any[]): any;
+    interface Mock<T = any, Y extends any[] = any> extends Function, MockInstance<T, Y> {
+        new (...args: Y): T;
+        (...args: Y): T;
     }
 
-    interface SpyInstance<T = {}> extends MockInstance<T> {}
+    interface SpyInstance<T = any, Y extends any[] = any> extends MockInstance<T, Y> {}
 
     /**
      * Wrap module with mock definitions
@@ -795,14 +816,14 @@ declare namespace jest {
      *  myApi.myApiMethod.mockImplementation(() => "test");
      */
     type Mocked<T> = {
-        [P in keyof T]: T[P] & MockInstance<T[P]>;
+        [P in keyof T]: T[P] extends (...args: any[]) => any ? MockInstance<ReturnType<T[P]>, ArgsType<T[P]>>: T[P];
     } & T;
 
-    interface MockInstance<T> {
+    interface MockInstance<T, Y extends any[]> {
         /** Returns the mock name string set by calling `mockFn.mockName(value)`. */
         getMockName(): string;
         /** Provides access to the mock's metadata */
-        mock: MockContext<T>;
+        mock: MockContext<T, Y>;
         /**
          * Resets all information stored in the mockFn.mock.calls and mockFn.mock.instances arrays.
          *
@@ -842,7 +863,7 @@ declare namespace jest {
          *
          * Note: `jest.fn(implementation)` is a shorthand for `jest.fn().mockImplementation(implementation)`.
          */
-        mockImplementation(fn?: (...args: any[]) => any): Mock<T>;
+        mockImplementation(fn?: (...args: Y) => T): Mock<T, Y>;
         /**
          * 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.
@@ -858,9 +879,9 @@ declare namespace jest {
          *
          * myMockFn((err, val) => console.log(val)); // false
          */
-        mockImplementationOnce(fn: (...args: any[]) => any): Mock<T>;
+        mockImplementationOnce(fn: (...args: Y) => T): Mock<T, Y>;
         /** Sets the name of the mock`. */
-        mockName(name: string): Mock<T>;
+        mockName(name: string): Mock<T, Y>;
         /**
          * Just a simple sugar function for:
          *
@@ -870,7 +891,7 @@ declare namespace jest {
          *     return this;
          *   });
          */
-        mockReturnThis(): Mock<T>;
+        mockReturnThis(): Mock<T, Y>;
         /**
          * Accepts a value that will be returned whenever the mock function is called.
          *
@@ -882,7 +903,7 @@ declare namespace jest {
          * mock.mockReturnValue(43);
          * mock(); // 43
          */
-        mockReturnValue(value: any): Mock<T>;
+        mockReturnValue(value: T): Mock<T, Y>;
         /**
          * 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
@@ -899,11 +920,11 @@ declare namespace jest {
          * console.log(myMockFn(), myMockFn(), myMockFn(), myMockFn());
          *
          */
-        mockReturnValueOnce(value: any): Mock<T>;
+        mockReturnValueOnce(value: T): Mock<T, Y>;
         /**
          * Simple sugar function for: `jest.fn().mockImplementation(() => Promise.resolve(value));`
          */
-        mockResolvedValue(value: any): Mock<T>;
+        mockResolvedValue(value: ResolvedValue<T>): Mock<T, Y>;
         /**
          * Simple sugar function for: `jest.fn().mockImplementationOnce(() => Promise.resolve(value));`
          *
@@ -923,7 +944,7 @@ declare namespace jest {
          * });
          *
          */
-        mockResolvedValueOnce(value: any): Mock<T>;
+        mockResolvedValueOnce(value: ResolvedValue<T>): Mock<T, Y>;
         /**
          * Simple sugar function for: `jest.fn().mockImplementation(() => Promise.reject(value));`
          *
@@ -935,7 +956,7 @@ declare namespace jest {
          *   await asyncMock(); // throws "Async error"
          * });
          */
-        mockRejectedValue(value: any): Mock<T>;
+        mockRejectedValue(value: RejectedValue<T>): Mock<T, Y>;
 
         /**
          * Simple sugar function for: `jest.fn().mockImplementationOnce(() => Promise.reject(value));`
@@ -953,32 +974,41 @@ declare namespace jest {
          * });
          *
          */
-        mockRejectedValueOnce(value: any): Mock<T>;
+        mockRejectedValueOnce(value: RejectedValue<T>): Mock<T, Y>;
     }
 
     /**
-     * Represents the result of a single call to a mock function.
+     * Represents the result of a single call to a mock function with a return value.
      */
-    interface MockResult {
-        /**
-         * True if the function threw.
-         * False if the function returned.
-         */
-        isThrow: boolean;
-        /**
-         * The value that was either thrown or returned by the function.
-         */
+    interface MockResultReturn<T> {
+        type: 'return';
+        value: T;
+    }
+    /**
+     * Represents the result of a single incomplete call to a mock function.
+     */
+    interface MockResultIncomplete {
+        type: 'incomplete';
+        value: undefined;
+    }
+    /**
+     * Represents the result of a single call to a mock function with a thrown error.
+     */
+    interface MockResultThrow {
+        type: 'throw';
         value: any;
     }
 
-    interface MockContext<T> {
-        calls: any[][];
+    type MockResult<T> = MockResultReturn<T> | MockResultThrow | MockResultIncomplete;
+
+    interface MockContext<T, Y extends any[]> {
+        calls: Y[];
         instances: T[];
         invocationCallOrder: number[];
         /**
          * List of results of calls to the mock function.
          */
-        results: MockResult[];
+        results: Array<MockResult<T>>;
     }
 }
 
diff --git a/types/jest/jest-tests.ts b/types/jest/jest-tests.ts
index 4164e009e4..69e68ab6f7 100644
--- a/types/jest/jest-tests.ts
+++ b/types/jest/jest-tests.ts
@@ -83,6 +83,12 @@ it.skip("name", () => {}, 9001);
 it.skip("name", async () => {}, 9001);
 it.skip("name", (callback: jest.DoneCallback) => {}, 9001);
 
+it.todo("name", () => {});
+it.todo("name", async () => {});
+it.todo("name", () => {}, 9001);
+it.todo("name", async () => {}, 9001);
+it.todo("name", (callback: jest.DoneCallback) => {}, 9001);
+
 it.concurrent("name", () => {});
 it.concurrent("name", async () => {});
 it.concurrent("name", () => {}, 9001);
@@ -107,6 +113,12 @@ fit.skip("name", () => {}, 9001);
 fit.skip("name", async () => {}, 9001);
 fit.skip("name", (callback: jest.DoneCallback) => {}, 9001);
 
+fit.todo("name", () => {});
+fit.todo("name", async () => {});
+fit.todo("name", () => {}, 9001);
+fit.todo("name", async () => {}, 9001);
+fit.todo("name", (callback: jest.DoneCallback) => {}, 9001);
+
 fit.concurrent("name", () => {});
 fit.concurrent("name", async () => {});
 fit.concurrent("name", () => {}, 9001);
@@ -131,6 +143,12 @@ xit.skip("name", () => {}, 9001);
 xit.skip("name", async () => {}, 9001);
 xit.skip("name", (callback: jest.DoneCallback) => {}, 9001);
 
+xit.todo("name", () => {});
+xit.todo("name", async () => {});
+xit.todo("name", () => {}, 9001);
+xit.todo("name", async () => {}, 9001);
+xit.todo("name", (callback: jest.DoneCallback) => {}, 9001);
+
 xit.concurrent("name", () => {});
 xit.concurrent("name", async () => {});
 xit.concurrent("name", () => {}, 9001);
@@ -155,6 +173,12 @@ test.skip("name", () => {}, 9001);
 test.skip("name", async () => {}, 9001);
 test.skip("name", (callback: jest.DoneCallback) => {}, 9001);
 
+test.todo("name", () => {});
+test.todo("name", async () => {});
+test.todo("name", () => {}, 9001);
+test.todo("name", async () => {}, 9001);
+test.todo("name", (callback: jest.DoneCallback) => {}, 9001);
+
 test.concurrent("name", () => {});
 test.concurrent("name", async () => {});
 test.concurrent("name", () => {}, 9001);
@@ -179,6 +203,12 @@ xtest.skip("name", () => {}, 9001);
 xtest.skip("name", async () => {}, 9001);
 xtest.skip("name", (callback: jest.DoneCallback) => {}, 9001);
 
+xtest.todo("name", () => {});
+xtest.todo("name", async () => {});
+xtest.todo("name", () => {}, 9001);
+xtest.todo("name", async () => {}, 9001);
+xtest.todo("name", (callback: jest.DoneCallback) => {}, 9001);
+
 xtest.concurrent("name", () => {});
 xtest.concurrent("name", async () => {});
 xtest.concurrent("name", () => {}, 9001);
@@ -237,6 +267,7 @@ jest
     .mock("moduleName", jest.fn(), { virtual: true })
     .resetModuleRegistry()
     .resetModules()
+    .retryTimes(3)
     .runAllImmediates()
     .runAllTicks()
     .runAllTimers()
@@ -259,12 +290,48 @@ jest.requireMock("./thisAlwaysReturnsTheMock");
 
 /* Mocks and spies */
 
-const mock1: jest.Mock = jest.fn();
-const mock2: jest.Mock<undefined> = jest.fn<undefined>(() => undefined);
-const mock3: jest.Mock<string> = jest.fn(() => "abc");
-const mock4: jest.Mock<"abc"> = jest.fn((): "abc" => "abc");
-const mock5: jest.Mock<string> = jest.fn((...args: string[]) => args.join(""));
-const mock6: jest.Mock = jest.fn((arg: {}) => arg);
+// $ExpectType Mock<any, any>
+const mock1: jest.Mock<number> = jest.fn();
+// $ExpectType Mock<undefined, []>
+const mock2 = jest.fn(() => undefined);
+// $ExpectType Mock<string, []>
+const mock3 = jest.fn(() => "abc");
+// $ExpectType Mock<"abc", []>
+const mock4 = jest.fn((): "abc" => "abc");
+// $ExpectType Mock<string, string[]>
+const mock5 = jest.fn((...args: string[]) => args.join(""));
+// $ExpectType Mock<{}, [{}]>
+const mock6 = jest.fn((arg: {}) => arg);
+// $ExpectType Mock<number, [number]>
+const mock7 = jest.fn((arg: number) => arg);
+// $ExpectType Mock<number, [number]>
+const mock8: jest.Mock = jest.fn((arg: number) => arg);
+// $ExpectType Mock<Promise<boolean>, [number, string, {}, [], boolean]>
+const mock9 = jest.fn((a: number, _b: string, _c: {}, _iReallyDontCare: [], _makeItStop: boolean) => Promise.resolve(_makeItStop));
+// $ExpectType Mock<never, []>
+const mock10 = jest.fn(() => { throw new Error(); });
+// $ExpectType Mock<unknown, [unknown]>
+const mock11 = jest.fn((arg: unknown) => arg);
+interface TestApi {
+    test(x: number): string;
+}
+// $ExpectType Mock<string, [number]>
+const mock12 = jest.fn<ReturnType<TestApi["test"]>, jest.ArgsType<TestApi["test"]>>();
+
+// $ExpectType number
+mock1('test');
+
+// $ExpectError
+mock7('abc');
+// $ExpectError
+mock7.mockImplementation((arg: string) => 1);
+
+// compiles because mock8 is declared as jest.Mock<{}, any>
+mock8('abc');
+mock8.mockImplementation((arg: string) => 1);
+
+// mockImplementation not required to declare all arguments
+mock9.mockImplementation((a: number) => Promise.resolve(a === 0));
 
 const genMockModule1: {} = jest.genMockFromModule("moduleName");
 const genMockModule2: { a: "b" } = jest.genMockFromModule<{ a: "b" }>("moduleName");
@@ -278,8 +345,8 @@ if (jest.isMockFunction(maybeMock)) {
 }
 
 const mockName: string = jest.fn().getMockName();
-const mockContextVoid: jest.MockContext<void> = jest.fn<void>().mock;
-const mockContextString: jest.MockContext<string> = jest.fn(() => "").mock;
+const mockContextVoid = jest.fn().mock;
+const mockContextString = jest.fn(() => "").mock;
 
 jest.fn().mockClear();
 
@@ -289,24 +356,50 @@ jest.fn().mockRestore();
 
 const spiedTarget = {
     returnsVoid(): void { },
+    setValue(value: string): void {
+        this.value = value;
+    },
     returnsString(): string {
         return "";
     }
 };
 
+class SpiedTargetClass {
+    private _value = 3;
+    private _value2 = '';
+    get value() {
+        return this._value;
+    }
+    set value(value) {
+        this._value = value;
+    }
+    get value2() {
+        return this._value2;
+    }
+    set value2(value2) {
+        this._value2 = value2;
+    }
+}
+const spiedTarget2 = new SpiedTargetClass();
+
+// $ExpectError
+jest.spyOn(spiedTarget, "setValue", "get");
+// $ExpectError
+jest.spyOn(spiedTarget2, "value");
+
 const spy1 = jest.spyOn(spiedTarget, "returnsVoid");
-const spy2 = jest.spyOn(spiedTarget, "returnsVoid", "get");
-const spy3 = jest.spyOn(spiedTarget, "returnsString", "set");
+const spy3 = jest.spyOn(spiedTarget, "returnsString");
 const spy1Name: string = spy1.getMockName();
 
-const spy2Calls: any[][] = spy2.mock.calls;
+const spy1Calls: Array<[]> = spy1.mock.calls;
 
-spy2.mockClear();
-spy2.mockReset();
+spy1.mockClear();
+spy1.mockReset();
 
-const spy3Mock: jest.Mock<() => string> = spy3
+const spy3Mock = spy3
     .mockImplementation(() => "")
     .mockImplementation()
+    // $ExpectError
     .mockImplementation((arg: {}) => arg)
     .mockImplementation((...args: string[]) => args.join(""))
     .mockImplementationOnce(() => "")
@@ -320,10 +413,91 @@ const spy3Mock: jest.Mock<() => string> = spy3
     .mockRejectedValueOnce("value");
 
 let spy4: jest.SpyInstance;
-
+// $ExpectType SpyInstance<string, []>
 spy4 = jest.spyOn(spiedTarget, "returnsString");
+// compiles because spy4 is declared as jest.SpyInstance<any, any>
+spy4.mockImplementation(() => 1);
 spy4.mockRestore();
 
+// $ExpectType SpyInstance<number, []>
+const spy5 = jest.spyOn(spiedTarget2, "value", "get");
+// $ExpectError
+spy5.mockReturnValue('5');
+
+// $ExpectType SpyInstance<void, [number]>
+const spy6 = jest.spyOn(spiedTarget2, "value", "set");
+
+// should compile
+jest.fn().mockImplementation((test: number) => test);
+jest.fn().mockResolvedValue(1);
+
+interface Type1 { a: number; }
+interface Type2 { b: number; }
+class TestMocked {
+    field: string;
+    test1(x: Type1): Promise<Type1> {
+        return Promise.resolve(x);
+    }
+    test2(x: Promise<Type1>): Promise<Type1> {
+        return x;
+    }
+    test3(x: Promise<Type1>): Promise<Type2> {
+        return x.then(() => ({ b: 1 }));
+    }
+    test4(x: Type1): Type1 {
+        return x;
+    }
+}
+
+const mocked: jest.Mocked<TestMocked> = new TestMocked() as any;
+mocked.test1.mockImplementation(() => Promise.resolve({ a: 1 }));
+mocked.test1.mockReturnValue(Promise.resolve({ a: 1 }));
+// $ExpectType Mock<Promise<Type1>, [Type1]>
+mocked.test1.mockResolvedValue({ a: 1 });
+mocked.test1.mockResolvedValueOnce({ a: 1 });
+// $ExpectType Mock<Promise<Type1>, [Type1]>
+mocked.test1.mockResolvedValue(Promise.resolve({ a: 1 }));
+mocked.test1.mockResolvedValueOnce(Promise.resolve({ a: 1 }));
+// $ExpectType Mock<Promise<Type1>, [Promise<Type1>]>
+mocked.test2.mockResolvedValue({ a: 1 });
+mocked.test2.mockResolvedValueOnce({ a: 1 });
+// $ExpectType Mock<Promise<Type1>, [Promise<Type1>]>
+mocked.test2.mockResolvedValue(Promise.resolve({ a: 1 }));
+mocked.test2.mockResolvedValueOnce(Promise.resolve({ a: 1 }));
+// $ExpectType Mock<Promise<Type2>, [Promise<Type1>]>
+mocked.test3.mockResolvedValue({ b: 1 });
+mocked.test3.mockResolvedValueOnce({ b: 1 });
+// $ExpectType Mock<Promise<Type2>, [Promise<Type1>]>
+mocked.test3.mockResolvedValue(Promise.resolve({ b: 1 }));
+mocked.test3.mockResolvedValueOnce(Promise.resolve({ b: 1 }));
+mocked.test3.mockRejectedValue(new Error());
+mocked.test3.mockRejectedValueOnce(new Error());
+// $ExpectError
+mocked.test4.mockResolvedValue({ a: 1 });
+// $ExpectError
+mocked.test4.mockResolvedValueOnce({ a: 1 });
+// $ExpectError
+mocked.test4.mockResolvedValue(Promise.resolve({ a: 1 }));
+// $ExpectError
+mocked.test4.mockResolvedValueOnce(Promise.resolve({ a: 1 }));
+// $ExpectError
+mocked.test4.mockRejectedValue(new Error());
+// $ExpectError
+mocked.test4.mockRejectedValueOnce(new Error());
+
+const mockResult = jest.fn(() => 1).mock.results[0];
+switch (mockResult.type) {
+    case 'return':
+        mockResult.value; // $ExpectType number
+        break;
+    case 'incomplete':
+        mockResult.value; // $ExpectType undefined
+        break;
+    case 'throw':
+        mockResult.value; // $ExpectType any
+        break;
+}
+
 /* Snapshot serialization */
 
 const snapshotSerializerPlugin: jest.SnapshotSerializerPlugin = {
@@ -471,6 +645,8 @@ expect.extend({
         const expectedColor = this.utils.EXPECTED_COLOR("blue");
         const receivedColor = this.utils.EXPECTED_COLOR("red");
 
+        const diff: string = this.utils.diff({}, {});
+
         this.utils.ensureActualIsNumber({});
         this.utils.ensureActualIsNumber({}, "matcher");
 
diff --git a/types/jest/tsconfig.json b/types/jest/tsconfig.json
index 8a02004840..20bc02a53b 100644
--- a/types/jest/tsconfig.json
+++ b/types/jest/tsconfig.json
@@ -13,6 +13,7 @@
         "typeRoots": [
             "../"
         ],
+        "target": "es5",
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/jexl/index.d.ts b/types/jexl/index.d.ts
index e47e8c3257..dace08345d 100644
--- a/types/jexl/index.d.ts
+++ b/types/jexl/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jexl 1.1
-// Project: https://github.com/TechnologyAdvice/jexl
+// Project: https://github.com/tomfrost/jexl
 // Definitions by: Marcin Tomczyk <https://github.com/m-tomczyk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/jfs/index.d.ts b/types/jfs/index.d.ts
index eafed6befe..8383f58981 100644
--- a/types/jfs/index.d.ts
+++ b/types/jfs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jfs 0.2
-// Project: https://github.com/flosse/json-file-store
+// Project: http://github.com/flosse/json-file-store
 // Definitions by: Tomasz Łaziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/jira-client/index.d.ts b/types/jira-client/index.d.ts
index 59a92a2961..24121b6635 100644
--- a/types/jira-client/index.d.ts
+++ b/types/jira-client/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jira-client 6.4
-// Project: https://github.com/jira-node/node-jira-client
+// Project: http://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
diff --git a/types/jju/index.d.ts b/types/jju/index.d.ts
index f8bf96d639..141af0ed6b 100644
--- a/types/jju/index.d.ts
+++ b/types/jju/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jju 1.4
-// Project: https://github.com/rlidwka/jju
+// Project: https://github.com/rlidwka/jju, http://rlidwka.github.io/jju
 // Definitions by: Elizabeth Craig <https://github.com/ecraig12345>
 //                 Alex Kocharin <https://github.com/rlidwka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/joi/index.d.ts b/types/joi/index.d.ts
index 8f5e7b7a2a..4ecf403a6f 100644
--- a/types/joi/index.d.ts
+++ b/types/joi/index.d.ts
@@ -488,7 +488,6 @@ export interface BooleanSchema extends AnySchema {
     /**
      * Allows the values provided to truthy and falsy as well as the "true" and "false" default conversion
      * (when not in strict() mode) to be matched in a case insensitive manner.
-     * @param enabled
      */
     insensitive(enabled?: boolean): this;
 }
@@ -792,6 +791,11 @@ export interface ObjectSchema extends AnySchema {
      */
     length(limit: number): this;
 
+    /**
+     * Requires the object to be a Joi schema instance.
+     */
+    schema(): this;
+
     /**
      * Specify validation rules for unknown keys matching a pattern.
      *
diff --git a/types/joi/joi-tests.ts b/types/joi/joi-tests.ts
index af85cab0ac..4dbc784756 100644
--- a/types/joi/joi-tests.ts
+++ b/types/joi/joi-tests.ts
@@ -706,6 +706,8 @@ objSchema = objSchema.nand(str, str);
 objSchema = objSchema.nand(str, str, str);
 objSchema = objSchema.nand(strArr);
 
+objSchema = objSchema.schema();
+
 objSchema = objSchema.or(str);
 objSchema = objSchema.or(str, str);
 objSchema = objSchema.or(str, str, str);
diff --git a/types/jquery-countdown/index.d.ts b/types/jquery-countdown/index.d.ts
index 38a411c524..54b9101dcf 100644
--- a/types/jquery-countdown/index.d.ts
+++ b/types/jquery-countdown/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jQuery Countdown 2.2
-// Project: https://github.com/hilios/jQuery.countdown
+// Project: https://github.com/hilios/jQuery.countdown, http://hilios.github.io/jquery.countdown
 // Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/jquery-lazyload/index.d.ts b/types/jquery-lazyload/index.d.ts
index 28563a774d..c263ce0dab 100644
--- a/types/jquery-lazyload/index.d.ts
+++ b/types/jquery-lazyload/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for JQuery Lazy Load 1.9
-// Project: https://github.com/tuupola/jquery_lazyload
+// Project: https://github.com/tuupola/jquery_lazyload, http://www.appelsiini.net/projects/lazyload
 // Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/jquery-loading-overlay/index.d.ts b/types/jquery-loading-overlay/index.d.ts
index ff5fa59976..820f6f49b4 100644
--- a/types/jquery-loading-overlay/index.d.ts
+++ b/types/jquery-loading-overlay/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for JQuery Loading Overlay 1.0
-// Project: https://github.com/jgerigmeyer/jquery-loading-overlay
+// Project: https://github.com/jgerigmeyer/jquery-loading-overlay, http://jgerigmeyer.github.io/jquery-loading-overlay
 // Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/jquery-match-height/index.d.ts b/types/jquery-match-height/index.d.ts
index 2c2a69db67..ee2a6b7462 100644
--- a/types/jquery-match-height/index.d.ts
+++ b/types/jquery-match-height/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jquery-match-height 0.7
-// Project: https://github.com/liabru/jquery-match-height
+// Project: https://github.com/liabru/jquery-match-height, http://brm.io/jquery-match-height
 // Definitions by: Andrea Briganti <https://github.com/kbytesys>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/jquery-notifier/index.d.ts b/types/jquery-notifier/index.d.ts
index bf9d0ff93b..e06fbcfe50 100644
--- a/types/jquery-notifier/index.d.ts
+++ b/types/jquery-notifier/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for notifier 1.0
+// Type definitions for non-npm package notifier 1.0
 // Project: https://github.com/allipierre/jquery-notifier
 // Definitions by: Alli Pierre Yotti <https://github.com/allipierre>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/jquery-toast-plugin/index.d.ts b/types/jquery-toast-plugin/index.d.ts
index db95a9961c..a01b6db1d4 100644
--- a/types/jquery-toast-plugin/index.d.ts
+++ b/types/jquery-toast-plugin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jquery-toast-plugin 1.3
-// Project: https://github.com/kamranahmedse/jquery-toast-plugin
+// Project: https://github.com/kamranahmedse/jquery-toast-plugin, http://www.kamranahmed.info/toast
 // Definitions by: Viqas Hussain <https://github.com/viqashussain>
 //                 Andrew Stegmaier <https://github.com/astegmaier>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/jquery-toastmessage-plugin/index.d.ts b/types/jquery-toastmessage-plugin/index.d.ts
index f7801a662b..1d15209076 100644
--- a/types/jquery-toastmessage-plugin/index.d.ts
+++ b/types/jquery-toastmessage-plugin/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jquery-toastmessage-plugin 0.2
+// Type definitions for non-npm package jquery-toastmessage-plugin 0.2
 // Project: https://github.com/akquinet/jquery-toastmessage-plugin
 // Definitions by: Joe Skeen <https://github.com/joeskeen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/jquery.nicescroll/index.d.ts b/types/jquery.nicescroll/index.d.ts
index 8228ae5209..9e4aca7774 100644
--- a/types/jquery.nicescroll/index.d.ts
+++ b/types/jquery.nicescroll/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jquery.nicescroll 3.7
-// Project: https://nicescroll.areaaperta.com
+// Project: https://nicescroll.areaaperta.com, https://github.com/inuyaksa/jquery.nicescroll
 // Definitions by: Bohdan Stupak <https://github.com/Wkalmar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/jquery.notify/index.d.ts b/types/jquery.notify/index.d.ts
index 9dcf3e5d49..62121a7323 100644
--- a/types/jquery.notify/index.d.ts
+++ b/types/jquery.notify/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jquery.notify 1.5
+// Type definitions for non-npm package jquery.notify 1.5
 // Project: https://github.com/ehynds/jquery-notify (jQuery Notify UI Widget by Eric Hynds)
 // Definitions by: Sergei Dorogin <https://github.com/evil-shrike>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/jquery.pin/index.d.ts b/types/jquery.pin/index.d.ts
index df132c6571..ee4f9e0ca7 100644
--- a/types/jquery.pin/index.d.ts
+++ b/types/jquery.pin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for JQuery Pin 1.0
-// Project: https://github.com/webpop/jquery.pin
+// Project: https://github.com/webpop/jquery.pin, https://github.com/koyeo/jquery.pin
 // Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/jquery.soap/index.d.ts b/types/jquery.soap/index.d.ts
index 36674a677b..9a802163e4 100644
--- a/types/jquery.soap/index.d.ts
+++ b/types/jquery.soap/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jQuery.SOAP 1.6.7
+// Type definitions for jQuery.SOAP 1.7
 // Project: https://github.com/doedje/jquery.soap
 // Definitions by: Roland Greim <https://github.com/tigerxy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
@@ -72,6 +72,7 @@ declare namespace JQuerySOAP {
         SOAPHeader?: Object;
         statusCode?: Object;
         success?: (SOAPResponse: SOAPResponse) => void;
+        timeout?: number;
         url?: string;
         wss?: Object;
     }
diff --git a/types/jquery.soap/tslint.json b/types/jquery.soap/tslint.json
index a41bf5d19a..a0357daa61 100644
--- a/types/jquery.soap/tslint.json
+++ b/types/jquery.soap/tslint.json
@@ -7,7 +7,6 @@
         "ban-types": false,
         "callable-types": false,
         "comment-format": false,
-        "dt-header": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.stickem/index.d.ts b/types/jquery.stickem/index.d.ts
index 50e759635e..b92e01c741 100644
--- a/types/jquery.stickem/index.d.ts
+++ b/types/jquery.stickem/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jquery.stickem.js 1.4
+// Type definitions for non-npm package jquery.stickem.js 1.4
 // Project: https://github.com/davist11/jQuery-Stickem
 // Definitions by: David Paz <https://github.com/davidmpaz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/jquery.tools/index.d.ts b/types/jquery.tools/index.d.ts
index f22e7aa6fe..22013a71e3 100644
--- a/types/jquery.tools/index.d.ts
+++ b/types/jquery.tools/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jQuery TOOLS 1.2
+// Type definitions for non-npm package jQuery TOOLS 1.2
 // Project: https://github.com/jquerytools/jquerytools
 // Definitions by: Joe Skeen <https://github.com/joeskeen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/jquery.validation/index.d.ts b/types/jquery.validation/index.d.ts
index 373c051596..bfbfd636b4 100644
--- a/types/jquery.validation/index.d.ts
+++ b/types/jquery.validation/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jquery.validation 1.16
+// Type definitions for non-npm package jquery.validation 1.16
 // Project: http://jqueryvalidation.org/
 // Definitions by: François de Campredon <https://github.com/fdecampredon>, John Reilly <https://github.com/johnnyreilly>, Anže Videnič <https://github.com/avidenic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/js-cookie/index.d.ts b/types/js-cookie/index.d.ts
index 6cd3c89169..7b90b4ecd5 100644
--- a/types/js-cookie/index.d.ts
+++ b/types/js-cookie/index.d.ts
@@ -33,7 +33,7 @@ declare namespace Cookies {
         secure?: boolean;
     }
 
-    interface CookiesStatic {
+    interface CookiesStatic<T extends object = object> {
         /**
          * Allows default cookie attributes to be accessed, changed, or reset
          */
@@ -42,7 +42,7 @@ declare namespace Cookies {
         /**
          * Create a cookie
          */
-        set(name: string, value: string | object, options?: CookieAttributes): void;
+        set(name: string, value: string | T, options?: CookieAttributes): void;
 
         /**
          * Read cookie
@@ -79,7 +79,7 @@ declare namespace Cookies {
          * or SDK. Note: The noConflict method is not necessary when using
          * AMD or CommonJS, thus it is not exposed in those environments.
          */
-        noConflict(): CookiesStatic;
+        noConflict?(): CookiesStatic<T>;
 
         /**
          * Create a new instance of the api that overrides the default
@@ -88,10 +88,11 @@ declare namespace Cookies {
          * will run the converter first for each cookie. The returned
          * string will be used as the cookie value.
          */
-        withConverter(converter: CookieConverter | { write: CookieConverter; read: CookieConverter; }): CookiesStatic;
+        withConverter<TConv extends object>(converter: CookieReadConverter | { write: CookieWriteConverter<TConv>; read: CookieReadConverter; }): CookiesStatic<TConv>;
     }
 
-    type CookieConverter = (value: string, name: string) => string;
+    type CookieWriteConverter<T extends object> = (value: string | T, name: string) => string;
+    type CookieReadConverter = (value: string, name: string) => string;
 }
 
 declare const Cookies: Cookies.CookiesStatic;
diff --git a/types/js-cookie/js-cookie-tests.ts b/types/js-cookie/js-cookie-tests.ts
index 683b401d8b..df30d90975 100644
--- a/types/js-cookie/js-cookie-tests.ts
+++ b/types/js-cookie/js-cookie-tests.ts
@@ -19,8 +19,8 @@ Cookies.get();
 Cookies.remove('name');
 Cookies.remove('name', { path: '' });
 
-const Cookies2 = Cookies.noConflict();
-Cookies2; // $ExpectType CookiesStatic
+const Cookies2 = Cookies.noConflict!();
+Cookies2; // $ExpectType CookiesStatic<object>
 
 Cookies.set('name', { foo: 'bar' });
 
@@ -40,12 +40,14 @@ cookies.get('escaped');
 Cookies.defaults.path = '';
 delete Cookies.defaults.path;
 
-const PHPCookies = Cookies.withConverter({
+const PHPCookies = Cookies.withConverter<object>({
     write(value) {
-        return encodeURIComponent(value)
+        value; // $ExpectType string | object
+        return encodeURIComponent(value as string)
             .replace(/%(23|24|26|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
     },
     read(value) {
+        value; // $ExpectType string
         return value
             .replace(/\+/g, ' ')
             .replace(/(%[0-9A-Z]{2})+/g, decodeURIComponent);
diff --git a/types/js.spec/index.d.ts b/types/js.spec/index.d.ts
index cf3b095443..887ccf99c0 100644
--- a/types/js.spec/index.d.ts
+++ b/types/js.spec/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for js.spec 1.0
-// Project: http://js-spec.online
+// Project: http://js-spec.online, https://github.com/prayerslayer/js.spec
 // Definitions by: Matt Bishop <https://github.com/mattbishop>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/jscodeshift/index.d.ts b/types/jscodeshift/index.d.ts
new file mode 100644
index 0000000000..e19423d928
--- /dev/null
+++ b/types/jscodeshift/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for jscodeshift 0.6
+// Project: https://github.com/facebook/jscodeshift#readme
+// Definitions by: Brie Bunge <https://github.com/brieb>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.9
+
+import core = require("./src/core");
+
+export = core;
diff --git a/types/jscodeshift/package.json b/types/jscodeshift/package.json
new file mode 100644
index 0000000000..a501c0f28d
--- /dev/null
+++ b/types/jscodeshift/package.json
@@ -0,0 +1,7 @@
+{
+    "private": true,
+    "dependencies": {
+        "ast-types": "0.12.1",
+        "recast": "0.17.2"
+    }
+}
diff --git a/types/jscodeshift/src/Collection.d.ts b/types/jscodeshift/src/Collection.d.ts
new file mode 100644
index 0000000000..2cab87b153
--- /dev/null
+++ b/types/jscodeshift/src/Collection.d.ts
@@ -0,0 +1,131 @@
+import recast = require("recast");
+import JSXElement = require("./collections/JSXElement");
+import NodeCollection = require("./collections/Node");
+import VariableDeclarator = require("./collections/VariableDeclarator");
+
+type ASTPath<N> = recast.NodePath<N, N>;
+
+export interface Collection<N>
+    extends NodeCollection.TraversalMethods,
+        NodeCollection.MutationMethods<N>,
+        VariableDeclarator.GlobalMethods,
+        VariableDeclarator.TransformMethods<N>,
+        JSXElement.GlobalMethods,
+        JSXElement.TraversalMethods {
+    /**
+     * @param paths An array of AST paths
+     * @param parent A parent collection
+     * @param types An array of types all the paths in the collection
+     *  have in common. If not passed, it will be inferred from the paths.
+     */
+    new (paths: Array<ASTPath<N>>, parent: Collection<any>, types?: Array<recast.Type<any>>): this;
+
+    /**
+     * Returns a new collection containing the nodes for which the callback returns true.
+     */
+    filter<S extends N>(
+        callback: (path: ASTPath<N>, i: number, paths: Array<ASTPath<N>>) => path is ASTPath<S>
+    ): Collection<S>;
+    filter(
+        callback: (path: ASTPath<N>, i: number, paths: Array<ASTPath<N>>) => boolean
+    ): Collection<N>;
+
+    /**
+     * Executes callback for each node/path in the collection.
+     */
+    forEach(callback: (path: ASTPath<N>, i: number, paths: Array<ASTPath<N>>) => void): this;
+
+    /**
+     * Tests whether at-least one path passes the test implemented by the provided callback.
+     */
+    some(callback: (path: ASTPath<N>, i: number, paths: Array<ASTPath<N>>) => boolean): boolean;
+
+    /**
+     * Tests whether all paths pass the test implemented by the provided callback.
+     */
+    every(callback: (path: ASTPath<N>, i: number, paths: Array<ASTPath<N>>) => boolean): boolean;
+
+    /**
+     * Executes the callback for every path in the collection and returns a new
+     * collection from the return values (which must be paths).
+     *
+     * The callback can return null to indicate to exclude the element from the
+     * new collection.
+     *
+     * If an array is returned, the array will be flattened into the result
+     * collection.
+     *
+     * @param callback
+     * @param type Force the new collection to be of a specific type
+     */
+    map<T = recast.ASTNode>(
+        callback: (
+            path: ASTPath<N>,
+            i: number,
+            paths: Array<ASTPath<N>>
+        ) => ASTPath<T> | Array<ASTPath<T>> | null | undefined,
+        type: recast.Type<any>
+    ): Collection<T>;
+
+    /** Returns the number of elements in this collection. */
+    size(): number;
+
+    /** Returns the number of elements in this collection. */
+    length: number;
+
+    /** Returns an array of AST nodes in this collection. */
+    nodes(): N[];
+
+    /** Returns an array of ASTPaths in this this collection. */
+    paths(): Array<ASTPath<N>>;
+
+    getAST(): Array<ASTPath<any>>;
+
+    /**
+     * Converts the AST back to a string, using recast.
+     * @param options directly passed to recast's printer
+     */
+    toSource(options?: recast.Options): string;
+
+    /**
+     * Returns a new collection containing only the element at position index.
+     * In case of a negative index, the element is taken from the end:
+     *   .at(0)  - first element
+     *   .at(-1) - last element
+     */
+    at(index: number): Collection<N>;
+
+    /** Calls "get" on the first path (same as "collection.paths(0).get(...)"). */
+    get(...fields: Array<string | number>): any;
+
+    /**
+     * Returns the type(s) of the collection. This is only used for unit tests,
+     * don't think other consumers would need it.
+     */
+    getTypes(): string[];
+
+    /**
+     * Returns true if this collection has the type 'type'.
+     */
+    isOfType(type: recast.Type<any>): boolean;
+}
+
+export function fromPaths(...args: any[]): any;
+
+export function fromNodes(...args: any[]): any;
+
+/**
+ * This function adds the provided methods to the prototype of the corresponding
+ * typed collection. If no type is passed, the methods are added to
+ * Collection.prototype and are available for all collections.
+ *
+ * @param methods Methods to add to the prototype
+ * @param type Optional type to add the methods to
+ */
+export function registerMethods(methods: object, type?: recast.Type<any>): void;
+
+export function hasConflictingRegistration(...args: any[]): any;
+
+export function setDefaultCollectionType(...args: any[]): any;
+
+export {}; // shut off automatic exporting
diff --git a/types/jscodeshift/src/collections/JSXElement.d.ts b/types/jscodeshift/src/collections/JSXElement.d.ts
new file mode 100644
index 0000000000..0490e40f76
--- /dev/null
+++ b/types/jscodeshift/src/collections/JSXElement.d.ts
@@ -0,0 +1,71 @@
+import nodes = require("ast-types/gen/nodes");
+import recast = require("recast");
+import Collection = require("../Collection");
+
+type ASTPath<N> = recast.NodePath<N, N>;
+type JSXElement = nodes.JSXElement;
+
+export interface GlobalMethods {
+    /**
+     * Finds all JSXElements optionally filtered by name
+     */
+    findJSXElements(name?: string): Collection.Collection<JSXElement>;
+
+    /**
+     * Finds all JSXElements by module name. Given
+     *
+     *     var Bar = require('Foo');
+     *     <Bar />
+     *
+     * findJSXElementsByModuleName('Foo') will find <Bar />, without having to
+     * know the variable name.
+     */
+    findJSXElementsByModuleName(moduleName: string): Collection.Collection<JSXElement>;
+}
+
+type Defined<T> = T extends undefined ? never : T;
+type JSXElementChild = Defined<JSXElement["children"]>[0];
+
+export interface TraversalMethods {
+    /**
+     * Returns all child nodes, including literals and expressions.
+     * This method only applies to JSXElement typed collections.
+     */
+    childNodes(): Collection.Collection<JSXElementChild>;
+
+    /**
+     * Returns all children that are JSXElements.
+     * This method only applies to JSXElement typed collections.
+     */
+    childElements(): Collection.Collection<JSXElement>;
+}
+
+interface Filter {
+    (path: ASTPath<any>): boolean;
+}
+
+export interface FilterMethods {
+    /**
+     * Filter method for attributes.
+     */
+    hasAttributes(attributeFilter: { [attributeName: string]: any }): Filter;
+
+    /**
+     * Filter elements which contain a specific child type
+     */
+    hasChildren(name: string): Filter;
+}
+
+export interface MappingMethods {
+    /**
+     * Given a JSXElement, returns its "root" name. E.g. it would return "Foo" for
+     * both <Foo /> and <Foo.Bar />.
+     */
+    getRootName(path: ASTPath<any>): string;
+}
+
+export function register(): void;
+export const filters: FilterMethods;
+export const mappings: MappingMethods;
+
+export {}; // shut off automatic exporting
diff --git a/types/jscodeshift/src/collections/Node.d.ts b/types/jscodeshift/src/collections/Node.d.ts
new file mode 100644
index 0000000000..d1e74f314d
--- /dev/null
+++ b/types/jscodeshift/src/collections/Node.d.ts
@@ -0,0 +1,57 @@
+import nodes = require("ast-types/gen/nodes");
+import recast = require("recast");
+import Collection = require("../Collection");
+
+type ASTPath<N> = recast.NodePath<N, N>;
+
+export interface TraversalMethods {
+    /**
+     * Find nodes of a specific type within the nodes of this collection.
+     */
+    find<T>(type: recast.Type<T>, filter?: ((value: any) => boolean) | object): Collection.Collection<T>;
+
+    /**
+     * Returns a collection containing the paths that create the scope of the
+     * currently selected paths. Dedupes the paths.
+     */
+    closestScope(): Collection.Collection<nodes.ASTNode>;
+
+    /**
+     * Traverse the AST up and finds the closest node of the provided type.
+     */
+    closest<T>(type: recast.Type<T>, filter?: any): Collection.Collection<T>;
+
+    /**
+     * Finds the declaration for each selected path. Useful for member expressions
+     * or JSXElements. Expects a callback function that maps each path to the name
+     * to look for.
+     *
+     * If the callback returns a falsy value, the element is skipped.
+     */
+    getVariableDeclarators(nameGetter: (...args: any[]) => any): Collection.Collection<nodes.VariableDeclarator>;
+}
+
+export interface MutationMethods<N> {
+    /**
+     * Simply replaces the selected nodes with the provided node. If a function
+     * is provided it is executed for every node and the node is replaced with the
+     * functions return value.
+     */
+    replaceWith<T>(nodes: T | T[] | ((path: ASTPath<N>, i: number) => T)): Collection.Collection<T>;
+
+    /**
+     * Inserts a new node before the current one.
+     */
+    insertBefore(insert: any): Collection.Collection<N>;
+
+    /**
+     * Inserts a new node after the current one.
+     */
+    insertAfter(insert: any): Collection.Collection<N>;
+
+    remove(): Collection.Collection<N>;
+}
+
+export function register(): void;
+
+export {}; // shut off automatic exporting
diff --git a/types/jscodeshift/src/collections/VariableDeclarator.d.ts b/types/jscodeshift/src/collections/VariableDeclarator.d.ts
new file mode 100644
index 0000000000..eb7c8bcdfd
--- /dev/null
+++ b/types/jscodeshift/src/collections/VariableDeclarator.d.ts
@@ -0,0 +1,39 @@
+import nodes = require("ast-types/gen/nodes");
+import recast = require("recast");
+import Collection = require("../Collection");
+
+type ASTPath<N> = recast.NodePath<N, N>;
+
+export interface GlobalMethods {
+    /**
+     * Finds all variable declarators, optionally filtered by name.
+     */
+    findVariableDeclarators(name?: string): Collection.Collection<nodes.VariableDeclarator>;
+}
+
+export interface TransformMethods<N> {
+    /**
+     * Renames a variable and all its occurrences.
+     * This method only applies to VariableDeclarator typed collections.
+     */
+    renameTo(newName: string): Collection.Collection<N>;
+}
+
+interface Filter {
+    (path: ASTPath<any>): boolean;
+}
+
+export interface FilterMethods {
+    /**
+     * Returns a function that returns true if the provided path is a variable
+     * declarator and requires one of the specified module names.
+     *
+     * @param names A module name or an array of module names
+     */
+    requiresModule(names: string | string[]): Filter;
+}
+
+export function register(): void;
+export const filters: FilterMethods;
+
+export {}; // shut off automatic exporting
diff --git a/types/jscodeshift/src/core.d.ts b/types/jscodeshift/src/core.d.ts
new file mode 100644
index 0000000000..9b9f48305d
--- /dev/null
+++ b/types/jscodeshift/src/core.d.ts
@@ -0,0 +1,363 @@
+import nodes = require("ast-types/gen/nodes");
+import recast = require("recast");
+import Collection = require("./Collection");
+import template = require("./template");
+import VariableDeclarator = require("./collections/VariableDeclarator");
+import JSXElement = require("./collections/JSXElement");
+
+declare namespace core {
+    type Parser = recast.Parser;
+
+    interface Filters {
+        JSXElement: JSXElement.FilterMethods;
+        VariableDeclarator: VariableDeclarator.FilterMethods;
+    }
+
+    interface Mappings {
+        JSXElement: JSXElement.MappingMethods;
+    }
+
+    interface Plugin {
+        (core: Core): void;
+    }
+
+    interface FileInfo {
+        /** The absolute path to the current file. */
+        path: string;
+        /** The source code of the current file. */
+        source: string;
+    }
+
+    interface Stats {
+        /**
+         * Helper function to collect data during --dry runs.
+         * This function keeps a counter for how often it was called with a specific argument.
+         * The result is shown in the console. Useful for finding out how many files match a criterion.
+         */
+        (name: string, quantity?: number): void;
+    }
+
+    type ASTPath<N = ASTNode> = recast.NodePath<N, N>;
+
+    interface Core {
+        (source: string, options?: Options): Collection.Collection<any>;
+        (source: ASTNode | ASTNode[] | ASTPath | ASTPath[]): Collection.Collection<any>;
+
+        registerMethods: typeof Collection.registerMethods;
+
+        types: typeof recast.default.types;
+
+        match(
+            path: ASTNode | ASTPath,
+            filter: ((path: ASTNode) => boolean) | ASTNode
+        ): boolean;
+
+        /** template, bound to default parser */
+        template: template.Template;
+
+        filters: Filters;
+
+        mappings: Mappings;
+
+        /**
+         * Utility function for registering plugins.
+         *
+         * Plugins are simple functions that are passed the core jscodeshift instance.
+         * They should extend jscodeshift by calling `registerMethods`, etc.
+         * This method guards against repeated registrations (the plugin callback will only be called once).
+         */
+        use(plugin: Plugin): void;
+
+        /**
+         * Returns a version of the core jscodeshift function "bound" to a specific
+         * parser.
+         */
+        withParser(parser: string | Parser): JSCodeshift;
+    }
+
+    type JSCodeshift = Core & recast.NamedTypes & recast.Builders;
+
+    interface API {
+        j: JSCodeshift;
+        jscodeshift: JSCodeshift;
+        stats: Stats;
+        report: (msg: string) => void;
+    }
+
+    interface Options {
+        [option: string]: any;
+    }
+
+    interface Transform {
+        /**
+         * If a string is returned and it is different from passed source, the transform is considered to be successful.
+         * If a string is returned but it's the same as the source, the transform is considered to be unsuccessful.
+         * If nothing is returned, the file is not supposed to be transformed (which is ok).
+         */
+        (file: FileInfo, api: API, options: Options): string | null | undefined | void;
+    }
+
+    type ASTNode = nodes.ASTNode;
+
+    type AnyTypeAnnotation = nodes.AnyTypeAnnotation;
+    type ArrayExpression = nodes.ArrayExpression;
+    type ArrayPattern = nodes.ArrayPattern;
+    type ArrayTypeAnnotation = nodes.ArrayTypeAnnotation;
+    type ArrowFunctionExpression = nodes.ArrowFunctionExpression;
+    type AssignmentExpression = nodes.AssignmentExpression;
+    type AssignmentPattern = nodes.AssignmentPattern;
+    type AwaitExpression = nodes.AwaitExpression;
+    type BigIntLiteral = nodes.BigIntLiteral;
+    type BinaryExpression = nodes.BinaryExpression;
+    type BindExpression = nodes.BindExpression;
+    type Block = nodes.Block;
+    type BlockStatement = nodes.BlockStatement;
+    type BooleanLiteral = nodes.BooleanLiteral;
+    type BooleanLiteralTypeAnnotation = nodes.BooleanLiteralTypeAnnotation;
+    type BooleanTypeAnnotation = nodes.BooleanTypeAnnotation;
+    type BreakStatement = nodes.BreakStatement;
+    type CallExpression = nodes.CallExpression;
+    type CatchClause = nodes.CatchClause;
+    type ClassBody = nodes.ClassBody;
+    type ClassDeclaration = nodes.ClassDeclaration;
+    type ClassExpression = nodes.ClassExpression;
+    type ClassImplements = nodes.ClassImplements;
+    type ClassMethod = nodes.ClassMethod;
+    type ClassPrivateMethod = nodes.ClassPrivateMethod;
+    type ClassPrivateProperty = nodes.ClassPrivateProperty;
+    type ClassProperty = nodes.ClassProperty;
+    type ClassPropertyDefinition = nodes.ClassPropertyDefinition;
+    type Comment = nodes.Comment;
+    type CommentBlock = nodes.CommentBlock;
+    type CommentLine = nodes.CommentLine;
+    type ComprehensionBlock = nodes.ComprehensionBlock;
+    type ComprehensionExpression = nodes.ComprehensionExpression;
+    type ConditionalExpression = nodes.ConditionalExpression;
+    type ContinueStatement = nodes.ContinueStatement;
+    type DebuggerStatement = nodes.DebuggerStatement;
+    type Declaration = nodes.Declaration;
+    type DeclareClass = nodes.DeclareClass;
+    type DeclaredPredicate = nodes.DeclaredPredicate;
+    type DeclareExportAllDeclaration = nodes.DeclareExportAllDeclaration;
+    type DeclareExportDeclaration = nodes.DeclareExportDeclaration;
+    type DeclareFunction = nodes.DeclareFunction;
+    type DeclareInterface = nodes.DeclareInterface;
+    type DeclareModule = nodes.DeclareModule;
+    type DeclareModuleExports = nodes.DeclareModuleExports;
+    type DeclareOpaqueType = nodes.DeclareOpaqueType;
+    type DeclareTypeAlias = nodes.DeclareTypeAlias;
+    type DeclareVariable = nodes.DeclareVariable;
+    type Decorator = nodes.Decorator;
+    type Directive = nodes.Directive;
+    type DirectiveLiteral = nodes.DirectiveLiteral;
+    type DoExpression = nodes.DoExpression;
+    type DoWhileStatement = nodes.DoWhileStatement;
+    type EmptyStatement = nodes.EmptyStatement;
+    type EmptyTypeAnnotation = nodes.EmptyTypeAnnotation;
+    type ExistentialTypeParam = nodes.ExistentialTypeParam;
+    type ExistsTypeAnnotation = nodes.ExistsTypeAnnotation;
+    type ExportAllDeclaration = nodes.ExportAllDeclaration;
+    type ExportBatchSpecifier = nodes.ExportBatchSpecifier;
+    type ExportDeclaration = nodes.ExportDeclaration;
+    type ExportDefaultDeclaration = nodes.ExportDefaultDeclaration;
+    type ExportDefaultSpecifier = nodes.ExportDefaultSpecifier;
+    type ExportNamedDeclaration = nodes.ExportNamedDeclaration;
+    type ExportNamespaceSpecifier = nodes.ExportNamespaceSpecifier;
+    type ExportSpecifier = nodes.ExportSpecifier;
+    type Expression = nodes.Expression;
+    type ExpressionStatement = nodes.ExpressionStatement;
+    type File = nodes.File;
+    type Flow = nodes.Flow;
+    type FlowPredicate = nodes.FlowPredicate;
+    type FlowType = nodes.FlowType;
+    type ForAwaitStatement = nodes.ForAwaitStatement;
+    type ForInStatement = nodes.ForInStatement;
+    type ForOfStatement = nodes.ForOfStatement;
+    type ForStatement = nodes.ForStatement;
+    type Function = nodes.Function;
+    type FunctionDeclaration = nodes.FunctionDeclaration;
+    type FunctionExpression = nodes.FunctionExpression;
+    type FunctionTypeAnnotation = nodes.FunctionTypeAnnotation;
+    type FunctionTypeParam = nodes.FunctionTypeParam;
+    type GeneratorExpression = nodes.GeneratorExpression;
+    type GenericTypeAnnotation = nodes.GenericTypeAnnotation;
+    type Identifier = nodes.Identifier;
+    type IfStatement = nodes.IfStatement;
+    type Import = nodes.Import;
+    type ImportDeclaration = nodes.ImportDeclaration;
+    type ImportDefaultSpecifier = nodes.ImportDefaultSpecifier;
+    type ImportNamespaceSpecifier = nodes.ImportNamespaceSpecifier;
+    type ImportSpecifier = nodes.ImportSpecifier;
+    type InferredPredicate = nodes.InferredPredicate;
+    type InterfaceDeclaration = nodes.InterfaceDeclaration;
+    type InterfaceExtends = nodes.InterfaceExtends;
+    type InterfaceTypeAnnotation = nodes.InterfaceTypeAnnotation;
+    type InterpreterDirective = nodes.InterpreterDirective;
+    type IntersectionTypeAnnotation = nodes.IntersectionTypeAnnotation;
+    type JSXAttribute = nodes.JSXAttribute;
+    type JSXClosingElement = nodes.JSXClosingElement;
+    type JSXClosingFragment = nodes.JSXClosingFragment;
+    type JSXElement = nodes.JSXElement;
+    type JSXEmptyExpression = nodes.JSXEmptyExpression;
+    type JSXExpressionContainer = nodes.JSXExpressionContainer;
+    type JSXFragment = nodes.JSXFragment;
+    type JSXIdentifier = nodes.JSXIdentifier;
+    type JSXMemberExpression = nodes.JSXMemberExpression;
+    type JSXNamespacedName = nodes.JSXNamespacedName;
+    type JSXOpeningElement = nodes.JSXOpeningElement;
+    type JSXOpeningFragment = nodes.JSXOpeningFragment;
+    type JSXSpreadAttribute = nodes.JSXSpreadAttribute;
+    type JSXSpreadChild = nodes.JSXSpreadChild;
+    type JSXText = nodes.JSXText;
+    type LabeledStatement = nodes.LabeledStatement;
+    type Line = nodes.Line;
+    type Literal = nodes.Literal;
+    type LogicalExpression = nodes.LogicalExpression;
+    type MemberExpression = nodes.MemberExpression;
+    type MemberTypeAnnotation = nodes.MemberTypeAnnotation;
+    type MetaProperty = nodes.MetaProperty;
+    type MethodDefinition = nodes.MethodDefinition;
+    type MixedTypeAnnotation = nodes.MixedTypeAnnotation;
+    type ModuleSpecifier = nodes.ModuleSpecifier;
+    type NewExpression = nodes.NewExpression;
+    type Node = nodes.Node;
+    type Noop = nodes.Noop;
+    type NullableTypeAnnotation = nodes.NullableTypeAnnotation;
+    type NullLiteral = nodes.NullLiteral;
+    type NullLiteralTypeAnnotation = nodes.NullLiteralTypeAnnotation;
+    type NullTypeAnnotation = nodes.NullTypeAnnotation;
+    type NumberLiteralTypeAnnotation = nodes.NumberLiteralTypeAnnotation;
+    type NumberTypeAnnotation = nodes.NumberTypeAnnotation;
+    type NumericLiteral = nodes.NumericLiteral;
+    type NumericLiteralTypeAnnotation = nodes.NumericLiteralTypeAnnotation;
+    type ObjectExpression = nodes.ObjectExpression;
+    type ObjectMethod = nodes.ObjectMethod;
+    type ObjectPattern = nodes.ObjectPattern;
+    type ObjectProperty = nodes.ObjectProperty;
+    type ObjectTypeAnnotation = nodes.ObjectTypeAnnotation;
+    type ObjectTypeCallProperty = nodes.ObjectTypeCallProperty;
+    type ObjectTypeIndexer = nodes.ObjectTypeIndexer;
+    type ObjectTypeInternalSlot = nodes.ObjectTypeInternalSlot;
+    type ObjectTypeProperty = nodes.ObjectTypeProperty;
+    type ObjectTypeSpreadProperty = nodes.ObjectTypeSpreadProperty;
+    type OpaqueType = nodes.OpaqueType;
+    type OptionalCallExpression = nodes.OptionalCallExpression;
+    type OptionalMemberExpression = nodes.OptionalMemberExpression;
+    type ParenthesizedExpression = nodes.ParenthesizedExpression;
+    type Pattern = nodes.Pattern;
+    type Position = nodes.Position;
+    type Printable = nodes.Printable;
+    type PrivateName = nodes.PrivateName;
+    type Program = nodes.Program;
+    type Property = nodes.Property;
+    type PropertyPattern = nodes.PropertyPattern;
+    type QualifiedTypeIdentifier = nodes.QualifiedTypeIdentifier;
+    type RegExpLiteral = nodes.RegExpLiteral;
+    type RestElement = nodes.RestElement;
+    type RestProperty = nodes.RestProperty;
+    type ReturnStatement = nodes.ReturnStatement;
+    type SequenceExpression = nodes.SequenceExpression;
+    type SourceLocation = nodes.SourceLocation;
+    type Specifier = nodes.Specifier;
+    type SpreadElement = nodes.SpreadElement;
+    type SpreadElementPattern = nodes.SpreadElementPattern;
+    type SpreadProperty = nodes.SpreadProperty;
+    type SpreadPropertyPattern = nodes.SpreadPropertyPattern;
+    type Statement = nodes.Statement;
+    type StringLiteral = nodes.StringLiteral;
+    type StringLiteralTypeAnnotation = nodes.StringLiteralTypeAnnotation;
+    type StringTypeAnnotation = nodes.StringTypeAnnotation;
+    type Super = nodes.Super;
+    type SwitchCase = nodes.SwitchCase;
+    type SwitchStatement = nodes.SwitchStatement;
+    type TaggedTemplateExpression = nodes.TaggedTemplateExpression;
+    type TemplateElement = nodes.TemplateElement;
+    type TemplateLiteral = nodes.TemplateLiteral;
+    type ThisExpression = nodes.ThisExpression;
+    type ThisTypeAnnotation = nodes.ThisTypeAnnotation;
+    type ThrowStatement = nodes.ThrowStatement;
+    type TryStatement = nodes.TryStatement;
+    type TSAnyKeyword = nodes.TSAnyKeyword;
+    type TSArrayType = nodes.TSArrayType;
+    type TSAsExpression = nodes.TSAsExpression;
+    type TSBooleanKeyword = nodes.TSBooleanKeyword;
+    type TSCallSignatureDeclaration = nodes.TSCallSignatureDeclaration;
+    type TSConditionalType = nodes.TSConditionalType;
+    type TSConstructorType = nodes.TSConstructorType;
+    type TSConstructSignatureDeclaration = nodes.TSConstructSignatureDeclaration;
+    type TSDeclareFunction = nodes.TSDeclareFunction;
+    type TSDeclareMethod = nodes.TSDeclareMethod;
+    type TSEnumDeclaration = nodes.TSEnumDeclaration;
+    type TSEnumMember = nodes.TSEnumMember;
+    type TSExportAssignment = nodes.TSExportAssignment;
+    type TSExpressionWithTypeArguments = nodes.TSExpressionWithTypeArguments;
+    type TSExternalModuleReference = nodes.TSExternalModuleReference;
+    type TSFunctionType = nodes.TSFunctionType;
+    type TSHasOptionalTypeAnnotation = nodes.TSHasOptionalTypeAnnotation;
+    type TSHasOptionalTypeParameters = nodes.TSHasOptionalTypeParameters;
+    type TSImportEqualsDeclaration = nodes.TSImportEqualsDeclaration;
+    type TSIndexedAccessType = nodes.TSIndexedAccessType;
+    type TSIndexSignature = nodes.TSIndexSignature;
+    type TSInferType = nodes.TSInferType;
+    type TSInterfaceBody = nodes.TSInterfaceBody;
+    type TSInterfaceDeclaration = nodes.TSInterfaceDeclaration;
+    type TSIntersectionType = nodes.TSIntersectionType;
+    type TSLiteralType = nodes.TSLiteralType;
+    type TSMappedType = nodes.TSMappedType;
+    type TSMethodSignature = nodes.TSMethodSignature;
+    type TSModuleBlock = nodes.TSModuleBlock;
+    type TSModuleDeclaration = nodes.TSModuleDeclaration;
+    type TSNamespaceExportDeclaration = nodes.TSNamespaceExportDeclaration;
+    type TSNeverKeyword = nodes.TSNeverKeyword;
+    type TSNonNullExpression = nodes.TSNonNullExpression;
+    type TSNullKeyword = nodes.TSNullKeyword;
+    type TSNumberKeyword = nodes.TSNumberKeyword;
+    type TSObjectKeyword = nodes.TSObjectKeyword;
+    type TSOptionalType = nodes.TSOptionalType;
+    type TSParameterProperty = nodes.TSParameterProperty;
+    type TSParenthesizedType = nodes.TSParenthesizedType;
+    type TSPropertySignature = nodes.TSPropertySignature;
+    type TSQualifiedName = nodes.TSQualifiedName;
+    type TSRestType = nodes.TSRestType;
+    type TSStringKeyword = nodes.TSStringKeyword;
+    type TSSymbolKeyword = nodes.TSSymbolKeyword;
+    type TSThisType = nodes.TSThisType;
+    type TSTupleType = nodes.TSTupleType;
+    type TSType = nodes.TSType;
+    type TSTypeAliasDeclaration = nodes.TSTypeAliasDeclaration;
+    type TSTypeAnnotation = nodes.TSTypeAnnotation;
+    type TSTypeAssertion = nodes.TSTypeAssertion;
+    type TSTypeLiteral = nodes.TSTypeLiteral;
+    type TSTypeOperator = nodes.TSTypeOperator;
+    type TSTypeParameter = nodes.TSTypeParameter;
+    type TSTypeParameterDeclaration = nodes.TSTypeParameterDeclaration;
+    type TSTypeParameterInstantiation = nodes.TSTypeParameterInstantiation;
+    type TSTypePredicate = nodes.TSTypePredicate;
+    type TSTypeQuery = nodes.TSTypeQuery;
+    type TSTypeReference = nodes.TSTypeReference;
+    type TSUndefinedKeyword = nodes.TSUndefinedKeyword;
+    type TSUnionType = nodes.TSUnionType;
+    type TSUnknownKeyword = nodes.TSUnknownKeyword;
+    type TSVoidKeyword = nodes.TSVoidKeyword;
+    type TupleTypeAnnotation = nodes.TupleTypeAnnotation;
+    type TypeAlias = nodes.TypeAlias;
+    type TypeAnnotation = nodes.TypeAnnotation;
+    type TypeCastExpression = nodes.TypeCastExpression;
+    type TypeofTypeAnnotation = nodes.TypeofTypeAnnotation;
+    type TypeParameter = nodes.TypeParameter;
+    type TypeParameterDeclaration = nodes.TypeParameterDeclaration;
+    type TypeParameterInstantiation = nodes.TypeParameterInstantiation;
+    type UnaryExpression = nodes.UnaryExpression;
+    type UnionTypeAnnotation = nodes.UnionTypeAnnotation;
+    type UpdateExpression = nodes.UpdateExpression;
+    type VariableDeclaration = nodes.VariableDeclaration;
+    type VariableDeclarator = nodes.VariableDeclarator;
+    type Variance = nodes.Variance;
+    type VoidTypeAnnotation = nodes.VoidTypeAnnotation;
+    type WhileStatement = nodes.WhileStatement;
+    type WithStatement = nodes.WithStatement;
+    type YieldExpression = nodes.YieldExpression;
+}
+
+declare const core: core.JSCodeshift;
+export = core;
diff --git a/types/jscodeshift/src/template.d.ts b/types/jscodeshift/src/template.d.ts
new file mode 100644
index 0000000000..cfc0a3c543
--- /dev/null
+++ b/types/jscodeshift/src/template.d.ts
@@ -0,0 +1,18 @@
+import recast = require("recast");
+
+export = template;
+
+declare const template: typeof withParser;
+
+declare function withParser(parser: recast.Parser): template.Template;
+
+declare namespace template {
+    interface Template {
+        /** Tagged template function. Parses the string as source and returns an array of Statement AST nodes. */
+        statements(...args: any[]): any;
+        /** Tagged template function. Parses the string as source and returns an Statement AST node. */
+        statement(...args: any[]): any;
+        /** Tagged template function. Parses the string as source and returns an Expression AST node. */
+        expression(...args: any[]): any;
+    }
+}
diff --git a/types/jscodeshift/test/js-transforms/README.md b/types/jscodeshift/test/js-transforms/README.md
new file mode 100644
index 0000000000..f314daaa44
--- /dev/null
+++ b/types/jscodeshift/test/js-transforms/README.md
@@ -0,0 +1,2 @@
+Sample jscodeshift transforms taken from https://github.com/jhgg/js-transforms
+and converted to TypeScript, for use as real-world test cases.
diff --git a/types/jscodeshift/test/js-transforms/bind-this-to-bind-expression.ts b/types/jscodeshift/test/js-transforms/bind-this-to-bind-expression.ts
new file mode 100644
index 0000000000..1c6d8cda56
--- /dev/null
+++ b/types/jscodeshift/test/js-transforms/bind-this-to-bind-expression.ts
@@ -0,0 +1,25 @@
+/**
+ * This transform converts stuff like:
+ *
+ *  let x = this.foo.bind(this);
+ *
+ *  to
+ *
+ *  let x = ::this.foo;
+ *
+ */
+import j = require("jscodeshift");
+
+const transform: j.Transform = (file, api) => {
+  const j = api.jscodeshift;
+  return j(file.source)
+    // Find stuff that looks like this.xyz.bind(this)
+    .find(j.CallExpression, {callee: {object: {object: j.ThisExpression}, property: {name: 'bind'}}})
+    // Ensure that .bind() is being called with only one argument, and that argument is "this".
+    .filter(p => p.value.arguments.length === 1 && p.value.arguments[0].type === "ThisExpression")
+    // We can now replace it with ::this.xyz
+    .replaceWith(p => j.bindExpression(null, (p.value.callee as j.MemberExpression).object))
+    .toSource();
+};
+
+export = transform;
diff --git a/types/jscodeshift/test/js-transforms/call-expression-bind-this-to-arrow-function-expression.ts b/types/jscodeshift/test/js-transforms/call-expression-bind-this-to-arrow-function-expression.ts
new file mode 100644
index 0000000000..09cdf3f29e
--- /dev/null
+++ b/types/jscodeshift/test/js-transforms/call-expression-bind-this-to-arrow-function-expression.ts
@@ -0,0 +1,60 @@
+/**
+ * Converts
+ * onClick(function(a, b) {
+ *   return a + b;
+ * }.bind(this),
+ * function(b, c) {
+ *   return 1;
+ * }.bind(this));
+ *
+ * onClick(function(a) {
+ *   var a = 1;
+ *   return a;
+ * }.bind(this));
+ *
+ * var a = function(c) { return c; }.bind(this);
+ *
+ * to
+ * onClick((a, b) => a + b,
+ * (b, c) => 1);
+ *
+ * onClick(a => {
+ *   var a = 1;
+ *   return a;
+ * });
+ *
+ * var a = c => c;
+ *
+ */
+import { Transform, MemberExpression, FunctionExpression, ArrowFunctionExpression } from "jscodeshift";
+
+const transform: Transform = (file, api) => {
+  const j = api.jscodeshift;
+
+  return j(file.source)
+    // We're looking for a CallExpression that's calling .bind() onto a FunctionExpression.
+  	.find(j.CallExpression, {callee: {property: {name: 'bind'}, object: {type: 'FunctionExpression'}}})
+    // Verify that .bind() is only being called with `this` as it's sole arguments.
+    .filter(p => p.value.arguments.length === 1 && p.value.arguments[0].type === "ThisExpression")
+  	.replaceWith(p => {
+      const callee = p.value.callee as MemberExpression;
+      const object = callee.object as FunctionExpression;
+      // Grab the function body. Since we looked for the CallExpression originally, the "callee.object" would refer
+      // to the FunctionExpression that's being called .bind(this) on. We need the body of that function
+      // to transform into an ArrowFunctionExpression.
+    	let body: ArrowFunctionExpression['body'] = object.body;
+      // We can get a bit clever here. If we have a function that consists of a single return statement in it's body,
+      // we can transform it to the more compact arrowFunctionExpression (a, b) => a + b, vs (a + b) => { return a + b }
+      let useExpression = false;
+      if (body.type === 'BlockStatement' && body.body.length === 1) {
+        const first = body.body[0];
+        if (first.type === "ReturnStatement") {
+          useExpression = true;
+          body = first.argument!;
+        }
+      }
+
+      return j.arrowFunctionExpression(object.params, body, useExpression);
+    })
+    .toSource();
+};
diff --git a/types/jscodeshift/test/js-transforms/function-expression-to-arrow-function-expression.ts b/types/jscodeshift/test/js-transforms/function-expression-to-arrow-function-expression.ts
new file mode 100644
index 0000000000..b960c920cd
--- /dev/null
+++ b/types/jscodeshift/test/js-transforms/function-expression-to-arrow-function-expression.ts
@@ -0,0 +1,53 @@
+/**
+ * Converts a FunctionExpression to an ArrowFunctionExpression when safe to do so.
+ *
+ * var a = function(a, b) {
+ * 	return a + b;
+ * }
+ *
+ * var b = function(a, b) {
+ *  	var c = 0;
+ *   	return a + b + c;
+ * }
+ *
+ * var a = function(a, b) {
+ *  	return a + b + this.c;
+ * }
+ *
+ * var a = (a, b) => a + b
+ *
+ * var b = (a, b) => {
+ *  	var c = 0;
+ *   	return a + b + c;
+ * }
+ *
+ * var a = function(a, b) {
+ *  	return a + b + this.c;
+ * }
+ */
+import { Transform, ArrowFunctionExpression } from "jscodeshift";
+
+const transform: Transform = (file, api) => {
+  const j = api.jscodeshift;
+
+  return j(file.source)
+    .find(j.FunctionExpression)
+    // We check for this expression, as if it's in a function expression, we don't want to re-bind "this" by
+    // using the arrowFunctionExpression. As that could potentially have some unintended consequences.
+    .filter(p => j(p).find(j.ThisExpression).size() === 0)
+    .replaceWith(p => {
+      let body: ArrowFunctionExpression['body'] = p.value.body;
+      // We can get a bit clever here. If we have a function that consists of a single return statement in it's body,
+      // we can transform it to the more compact arrowFunctionExpression (a, b) => a + b, vs (a + b) => { return a + b }
+      let useExpression = false;
+      if (body.type === 'BlockStatement' && body.body.length === 1) {
+        const first = body.body[0];
+        if (first.type === "ReturnStatement") {
+          useExpression = true;
+          body = first.argument!;
+        }
+      }
+      return j.arrowFunctionExpression(p.value.params, body, useExpression);
+    })
+    .toSource();
+};
diff --git a/types/jscodeshift/test/js-transforms/props-to-destructuring.ts b/types/jscodeshift/test/js-transforms/props-to-destructuring.ts
new file mode 100644
index 0000000000..db4caff58c
--- /dev/null
+++ b/types/jscodeshift/test/js-transforms/props-to-destructuring.ts
@@ -0,0 +1,142 @@
+/**
+ * Transforms:
+ * class C extends React.Component() {
+ *  render() {
+ *   return <div foo={this.props.foo} bar={this.props.bar} />
+ *  }
+ * }
+ *
+ * To:
+ *
+ * class C extends React.Component() {
+ *  render() {
+ *   const {
+ *    foo,
+ *    bar
+ *   } = this.props;
+ *
+ *   return <div foo={foo} bar={bar} />
+ *  }
+ * }
+ *
+ */
+import { Transform, VariableDeclarator, ObjectPattern, Identifier } from "jscodeshift";
+
+// tslint:disable-next-line max-line-length
+const keywordsStr = 'this function if return var else for new in typeof while case break try catch delete throw switch continue default instanceof do void finally with debugger implements interface package private protected public static class enum export extends import super true false null abstract boolean byte char const double final float goto int long native short synchronized throws transient volatile';
+const keywords = keywordsStr.split(' ').reduce<{ [key: string]: boolean }>((f, k) => {
+  f[k] = true;
+  return f;
+}, {});
+const isKeyword = (k: string) => keywords.hasOwnProperty(k);
+
+const transform: Transform = (file, api) => {
+  const j = api.jscodeshift;
+  const {statement} = j.template;
+
+  return j(file.source)
+    .find(j.FunctionExpression)
+    .replaceWith(p => {
+      // console.log(p);
+      const root = j(p.value);
+      const variablesToReplace: { [name: string]: boolean } = {};
+
+      // Figure out if the variable was defined from props, so that we can re-use that definition.
+      const isFromProps = (name: string, resolvedScope: any) => {
+        return resolvedScope.getBindings()[name].every(
+            (p: any) => {
+            const decl = j(p).closest(j.VariableDeclarator);
+              // What happens when our VariableDeclarator is too high up the parent AST?
+
+            if (!decl.size()) return false;
+            const node: VariableDeclarator = decl.nodes()[0];
+
+            if (!(node.init != null &&
+              node.init.type === 'MemberExpression' &&
+              node.init.object.type === 'ThisExpression' &&
+              node.init.property.type === 'Identifier' &&
+              node.init.property.name === 'props'))
+              return false;
+
+            // Check for the case where it could be aliased (i.e.) { baz: foo } = this.props;
+            // In this case, we won't do a substitution.
+            if (p.parentPath.value.type === 'Property' && p.parentPath.value.key.name !== name)
+              return false;
+
+            return true;
+          }
+        );
+      };
+
+      // Transform "this.props.xyz" to "xyz", and record what we've transformed.
+      // Transform as long as we don't have "xyz" already defined in the scope.
+      root
+        .find(j.MemberExpression, {
+          object: {
+            type: 'MemberExpression',
+            object: {type: 'ThisExpression'},
+            property: {name: 'props'}
+          }
+        })
+        .filter(e => {
+          const resolvedScope = e.scope.lookup((e.value.property as Identifier).name);
+          // If the scope is null, that means that this property isn't defined in the scope yet,
+          // and we can use it. Otherwise, if it is defined, we should see if it was defined from `this.props`
+          // if none of these cases are true, we can't do substitution.
+          return resolvedScope === null || isFromProps((e.value.property as Identifier).name, resolvedScope);
+        })
+        // Ensure that our substitution won't cause us to define a keyword, i.e. `this.props.while` won't
+        // get converted into `while`.
+        .filter(p => !isKeyword((p.value.property as Identifier).name))
+        // Now, do the replacement, `this.props.xyz` => `xyz`.
+        .replaceWith(p => p.value.property as Identifier)
+        // Finally, mark the variable as something we will need to define earlier in the function,
+        // if it's not already defined.
+        .forEach(p => {
+          // Is this prop already defined somewhere else.
+          if (!p.scope.lookup(p.value.name))
+            variablesToReplace[p.value.name] = true;
+        });
+
+      // Create property definitions for variables that we've replaced.
+      const properties = Object.keys(variablesToReplace)
+        .sort()
+        .map(k => {
+          const prop = j.property('init', j.identifier(k), j.identifier(k));
+          prop.shorthand = true;
+          return prop;
+        });
+
+      // We have no properties to inject, so we can bail here.
+      if (!properties.length)
+        return p.value;
+
+      // See if we already have a VariableDeclarator like { a, b, c } = this.props;
+      const propDefinitions = root
+        .find(j.VariableDeclarator, {
+          id: {type: 'ObjectPattern'},
+          init: {type: 'MemberExpression', object: {type: 'ThisExpression'}, property: {name: 'props'}}
+        });
+
+      if (propDefinitions.size()) {
+        const nodePath = propDefinitions.paths()[0];
+        const node = nodePath.value;
+        // TODO(brieb): support narrowing based on second argument to `find`
+        const newPattern = j.objectPattern((node.id as ObjectPattern).properties.concat(properties));
+        nodePath.replace(j.variableDeclarator(newPattern, node.init));
+        return p.value;
+      }
+
+      // Otherwise, we'll have to create our own, as none were suitable for use.
+      // Create the variable definition `const { xyz } = this.props;`
+      const decl = statement`const { ${properties} } = this.props;`;
+
+      // Add the variable definition to the top of the function expression body.
+      return j.functionExpression(
+        p.value.id,
+        p.value.params,
+        j.blockStatement([decl].concat(p.value.body.body))
+      );
+    }
+  ).toSource();
+};
diff --git a/types/jscodeshift/test/js-transforms/pure-to-composite-component.ts b/types/jscodeshift/test/js-transforms/pure-to-composite-component.ts
new file mode 100644
index 0000000000..6d1a30c378
--- /dev/null
+++ b/types/jscodeshift/test/js-transforms/pure-to-composite-component.ts
@@ -0,0 +1,64 @@
+/** For when you've gone too pure and want to go back. */
+/**
+ * Converts
+ * let HistoryItem = (props) => {
+ *   const {
+ *     item
+ *   } = props;
+ *   return <li>{item}</li>;
+ * };
+ *
+ * let X = (props) => <div>foo</div>;
+ *
+ * to
+ *
+ * class HistoryItem extends Component {
+ *   render() {
+ *     const {
+ *       item
+ *     } = this.props;
+ *     return <li>{item}</li>;
+ *   }
+ * }
+ *
+ * class X extends Component {
+ *   render() {
+ *     return <div>foo</div>;
+ *   }
+ * }
+ */
+
+import { Transform, ASTNode } from "jscodeshift";
+
+const transform: Transform = (file, api) => {
+  const j = api.jscodeshift;
+  const {statement} = j.template;
+
+  function hasJSXElement(ast: ASTNode) {
+    return j(ast).find(j.JSXElement).size() > 0;
+  }
+
+  return j(file.source)
+    .find(j.VariableDeclaration)
+    .filter(p => p.value.declarations.length === 1)
+    .replaceWith(p => {
+      const decl = p.value.declarations[0];
+      if (decl.type === "VariableDeclarator" && decl.init != null) {
+        if (decl.init.type !== 'ArrowFunctionExpression' ||
+          (!hasJSXElement(decl.init.body) && decl.init.body.type !== "JSXElement"))
+          return p.value;
+
+        let body: any = decl.init.body;
+        body = body.type === "JSXElement" ? j.returnStatement(body) : body = body.body;
+
+        j(body)
+          .find(j.Identifier, {name: 'props'})
+          .replaceWith(p => j.memberExpression(j.thisExpression(), j.identifier('props')));
+
+        return statement`class ${decl.id} extends Component {
+          render() { ${body} }
+        }`;
+      }
+    })
+    .toSource();
+};
diff --git a/types/jscodeshift/test/jscodeshift-tests.ts b/types/jscodeshift/test/jscodeshift-tests.ts
new file mode 100644
index 0000000000..f426eb37b7
--- /dev/null
+++ b/types/jscodeshift/test/jscodeshift-tests.ts
@@ -0,0 +1,75 @@
+import { ASTNode, FileInfo, API, Transform, Parser } from "jscodeshift";
+
+// Can define transform with `function`.
+function replaceWithFooTransform(fileInfo: FileInfo, api: API) {
+    return api
+        .jscodeshift(fileInfo.source)
+        .findVariableDeclarators("foo")
+        .renameTo("bar")
+        .toSource();
+}
+
+// Can define transform with arrow function, using `Transform` type.
+const reverseIdentifiersTransform: Transform = (file, api) => {
+    const j = api.jscodeshift;
+
+    return j(file.source)
+        .find(j.Identifier)
+        .forEach(path => {
+            j(path).replaceWith(
+                j.identifier(
+                    path.node.name
+                        .split("")
+                        .reverse()
+                        .join("")
+                )
+            );
+        })
+        .toSource();
+};
+
+// Can define a custom parser.
+const parser: Parser = {
+    parse(source, options) {
+        // return estree compatible AST
+        return { type: "root" };
+    }
+};
+
+// Can pass options to recast
+const transformWithRecastFormattingOptions: Transform = (file, { j }) => {
+    return j(file.source).toSource({ quote: "single" });
+};
+
+const transformWithRecastParseOptions: Transform = (file, { j }) => {
+    return j(file.source, {
+        /* ...passes options to recast's parse method... */
+    }).toSource();
+};
+
+// `ASTNode` supports type narrowing.
+{
+    const node = ({} as any) as ASTNode;
+    if (node.type === "CatchClause") {
+        // $ExpectType CatchClause
+        node;
+
+        if (node.param && node.param.type === "Identifier") {
+            // $ExpectType Identifier
+            node.param;
+
+            if (
+                node.param.typeAnnotation &&
+                node.param.typeAnnotation.type === "TSTypeAnnotation"
+            ) {
+                // $ExpectType TSTypeAnnotation
+                node.param.typeAnnotation;
+
+                if (node.param.typeAnnotation.typeAnnotation.type === "TSArrayType") {
+                    // $ExpectType TSArrayType
+                    node.param.typeAnnotation.typeAnnotation;
+                }
+            }
+        }
+    }
+}
diff --git a/types/jscodeshift/tsconfig.json b/types/jscodeshift/tsconfig.json
new file mode 100644
index 0000000000..5937bd483a
--- /dev/null
+++ b/types/jscodeshift/tsconfig.json
@@ -0,0 +1,34 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "src/core.d.ts",
+        "src/Collection.d.ts",
+        "src/collections/JSXElement.d.ts",
+        "src/collections/Node.d.ts",
+        "src/collections/VariableDeclarator.d.ts",
+        "src/template.d.ts",
+        "test/jscodeshift-tests.ts",
+        "test/js-transforms/bind-this-to-bind-expression.ts",
+        "test/js-transforms/call-expression-bind-this-to-arrow-function-expression.ts",
+        "test/js-transforms/function-expression-to-arrow-function-expression.ts",
+        "test/js-transforms/props-to-destructuring.ts",
+        "test/js-transforms/pure-to-composite-component.ts"
+    ]
+}
diff --git a/types/jscodeshift/tslint.json b/types/jscodeshift/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/jscodeshift/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/jsdoc-to-markdown/index.d.ts b/types/jsdoc-to-markdown/index.d.ts
new file mode 100644
index 0000000000..78b4d7d045
--- /dev/null
+++ b/types/jsdoc-to-markdown/index.d.ts
@@ -0,0 +1,137 @@
+// Type definitions for jsdoc-to-markdown 4.0
+// Project: https://github.com/jsdoc2md/jsdoc-to-markdown
+// Definitions by:  Adam Zerella <https://github.com/adamzerella>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.9
+
+export type StyleListFormat = "none" | "grouped" | "table" | "dl";
+export type RenderListFormat = "list" | "table";
+export type MemberIndexFormat = "grouped" | "list";
+
+export interface RenderOptions {
+    /**
+     * Raw template data to use. Useful when you already have template data, obtained from .getTemplateData.
+     * Either files, source or data must be supplied.
+     */
+    data?: object[];
+    /**
+     * The template the supplied documentation will be rendered into.
+     * Use the default or supply your own template for full control over the output.
+     */
+    template?: string;
+    /**
+     * The initial heading depth.
+     * For example, with a value of 2 the top-level markdown headings look like "## The heading".
+     */
+    headingDepth?: number;
+    /**
+     * Specifies the default language used in '@example' blocks (for syntax-highlighting purposes).
+     * In gfm mode, each '@example' is wrapped in a fenced-code block. Example usage: --example-lang js.
+     * Use the special value none for no specific language.
+     * While using this option, you can override the supplied language
+     * for any '@example' by specifying the @lang subtag,
+     * e.g @example @lang hbs. Specifying @example @lang off will disable code blocks for that example.
+     */
+    exampleLang?: string;
+    /**
+     * Use an installed package containing helper and/or partial overrides.
+     */
+    plugin?: string|string[];
+    /**
+     * handlebars helper files to override or extend the default set.
+     */
+    helper?: string|string[];
+    /**
+     * handlebars partial files to override or extend the default set.
+     */
+    partial?: string|string[];
+    /**
+     * Format identifier names in the code style,
+     * (i.e. format using backticks or <code></code>).
+     */
+    nameFormat?: string;
+    /**
+     * By default, dmd generates github-flavoured markdown.
+     * Not all markdown parsers render gfm correctly.
+     * If your generated docs look incorrect on sites other than Github
+     * (e.g. npmjs.org) try enabling this option to disable Github-specific syntax.
+     */
+    noGfm?: boolean;
+    /**
+     * Put <hr> breaks between identifiers. Improves readability on bulky docs.
+     */
+    seperators?: boolean;
+    moduleIndexFormat?: StyleListFormat;
+    globalIndexFormat?: StyleListFormat;
+    /**
+     * Two options to render parameter lists: 'list' or 'table' (default).
+     * Table format works well in most cases but switch to list if things begin to look crowded / squashed.
+     */
+    paramListFormat?: RenderListFormat;
+    propertyListFormat?: RenderListFormat;
+    memberIndexFormat?: MemberIndexFormat;
+}
+
+export interface JsdocOptions {
+    /**
+     * By default results are cached to speed up repeat invocations.
+     * Set to true to disable this.
+     */
+    noCache?: boolean;
+    /**
+     * One or more filenames to process.
+     * Accepts globs (e.g. *.js). Either files, source or data must be supplied.
+     */
+    files: string|string[];
+    /**
+     * A string containing source code to process.
+     * Either files, source or data must be supplied.
+     */
+    source?: string;
+    /**
+     * The path to the jsdoc configuration file.
+     *  Default: path/to/jsdoc/conf.json.
+     */
+    configure?: string;
+}
+
+export class JsdocToMarkdown {
+    /**
+     * Returns markdown documentation from jsdoc-annoted source code.
+     */
+    render(options: RenderOptions|JsdocOptions): Promise<string>;
+    /**
+     * Sync version of render.
+     */
+    renderSync(options: RenderOptions|JsdocOptions): string;
+    /**
+     * Returns the template data (jsdoc-parse output) which is fed into the output template (dmd).
+     */
+    getTemplateData(options: JsdocOptions): Promise<object[]>;
+    /**
+     * Sync version of getTemplateData.
+     */
+    getTemplateDataSync(options: JsdocOptions): object[];
+    /**
+     * Returns raw data direct from the underlying jsdoc3.
+     */
+    getJsdocData(options: JsdocOptions): Promise<object[]>;
+    /**
+     * Sync version of getJsdocData.
+     */
+    getJsdocDataSync(options: JsdocOptions): object[];
+    /**
+     * By default, the output of each invocation of the main generation methods (render, getTemplateData etc)
+     * is stored in the cache (your system's temporary directory).
+     * Future jsdoc2md invocations with the same input options and source code will return the output immediately from cache,
+     * making the tool much faster/cheaper. If the input options or source code changes,
+     * fresh output will be generated. This method clears the cache,
+     * which you should never need to do unless the cache is failing for some reason.
+     * On Mac OSX, the system tmpdir clears itself every few days meaning your jsdoc2md cache will also be routinely cleared.
+     */
+    clear(): Promise<void>;
+    /**
+     * Returns all jsdoc namepaths found in the supplied source code.
+     */
+    getNamepaths(options: JsdocOptions): Promise<object>;
+}
diff --git a/types/jsdoc-to-markdown/jsdoc-to-markdown-tests.ts b/types/jsdoc-to-markdown/jsdoc-to-markdown-tests.ts
new file mode 100644
index 0000000000..e37d899bd4
--- /dev/null
+++ b/types/jsdoc-to-markdown/jsdoc-to-markdown-tests.ts
@@ -0,0 +1,23 @@
+import { JsdocToMarkdown, StyleListFormat } from "jsdoc-to-markdown";
+
+const jsdoc2md = new JsdocToMarkdown();
+
+const JsdocDataOptions = {
+    files: "file.js"
+};
+
+const RenderOptions = {
+    data: [],
+    plugin: "",
+    helper: [""],
+    moduleIndexFormat: "table" as StyleListFormat
+};
+
+jsdoc2md.render(JsdocDataOptions);
+jsdoc2md.renderSync(RenderOptions);
+jsdoc2md.getTemplateData(JsdocDataOptions);
+jsdoc2md.getTemplateDataSync(JsdocDataOptions);
+jsdoc2md.getJsdocData(JsdocDataOptions);
+jsdoc2md.getJsdocDataSync(JsdocDataOptions);
+jsdoc2md.clear();
+jsdoc2md.getNamepaths(JsdocDataOptions);
diff --git a/types/jsdoc-to-markdown/tsconfig.json b/types/jsdoc-to-markdown/tsconfig.json
new file mode 100644
index 0000000000..eabb42ab3b
--- /dev/null
+++ b/types/jsdoc-to-markdown/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [
+
+      ],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "jsdoc-to-markdown-tests.ts"
+    ]
+}
diff --git a/types/jsdoc-to-markdown/tslint.json b/types/jsdoc-to-markdown/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/jsdoc-to-markdown/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/jsdom/index.d.ts b/types/jsdom/index.d.ts
index dec74af1ba..a4267d560e 100644
--- a/types/jsdom/index.d.ts
+++ b/types/jsdom/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jsdom 12.2
-// Project: https://github.com/tmpvar/jsdom#readme
+// Project: https://github.com/jsdom/jsdom
 // Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
 //                 Johan Palmfjord <https://github.com/palmfjord>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/jsforce/api/chatter.d.ts b/types/jsforce/api/chatter.d.ts
index c712187559..4b65740f36 100644
--- a/types/jsforce/api/chatter.d.ts
+++ b/types/jsforce/api/chatter.d.ts
@@ -27,7 +27,7 @@ interface RequestParams {
 export class RequestResult {
 }
 
-export class Request<T> implements Promise<T> {
+export class Request<T> implements PromiseLike<T> {
     constructor(chatter: Chatter, params: RequestParams);
 
     batchParams(): BatchRequestParams;
@@ -36,16 +36,12 @@ export class Request<T> implements Promise<T> {
 
     stream(): Stream;
 
-    catch<TResult>(onrejected?: ((reason: any) => (PromiseLike<TResult> | TResult)) | null | undefined): Promise<T | TResult>;
-
     then<TResult1, TResult2>(onfulfilled?: ((value: T) => (PromiseLike<TResult1> | TResult1)) | null | undefined,
                              onrejected?: ((reason: any) => (PromiseLike<TResult2> | TResult2)) | null | undefined): Promise<TResult1 | TResult2>;
 
     finally(onfinally?: () => void): Promise<T>;
 
     thenCall(callback?: (err: Error, records: T) => void): Query<T>;
-
-    readonly [Symbol.toStringTag]: 'Promise';
 }
 
 export class Resource<T> extends Request<T> {
diff --git a/types/jsforce/api/metadata.d.ts b/types/jsforce/api/metadata.d.ts
index c6aec12e7e..88dbdaa52d 100644
--- a/types/jsforce/api/metadata.d.ts
+++ b/types/jsforce/api/metadata.d.ts
@@ -112,21 +112,17 @@ interface DeployOptions {
     singlePackage?:	boolean;
 }
 
-export class AsyncResultLocator<T> extends EventEmitter implements Promise<T> {
+export class AsyncResultLocator<T> extends EventEmitter implements PromiseLike<T> {
     check(callback?: Callback<T>): Promise<T>
 
     complete(callback?: Callback<T>): Promise<T>
 
     poll(interval: number, timeout: number): void;
 
-    catch<TResult>(onrejected?: ((reason: any) => (PromiseLike<TResult> | TResult)) | null | undefined): Promise<T | TResult>;
-
     then<TResult1, TResult2>(onfulfilled?: ((value: T) => (PromiseLike<TResult1> | TResult1)) | null | undefined,
                              onrejected?: ((reason: any) => (PromiseLike<TResult2> | TResult2)) | null | undefined): Promise<TResult1 | TResult2>;
 
     finally(onfinally?: () => void): Promise<T>;
-
-    readonly [Symbol.toStringTag]: "Promise";
 }
 
 export class DeployResultLocator<T> extends AsyncResultLocator<T> {}
diff --git a/types/jsforce/index.d.ts b/types/jsforce/index.d.ts
index 9aaba4e54b..3cea55dafd 100644
--- a/types/jsforce/index.d.ts
+++ b/types/jsforce/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jsforce 1.9
-// Project: https://github.com/jsforce/jsforce
+// Project: http://github.com/jsforce/jsforce
 // Definitions by: Dolan Miu <https://github.com/dolanmiu>
 //                 Kamil Ejsymont <https://github.com/netes>
 //                 Thomas Dvornik <https://github.com/amphro>
diff --git a/types/jsforce/jsforce-tests.ts b/types/jsforce/jsforce-tests.ts
index 08ea888062..45442b91dc 100644
--- a/types/jsforce/jsforce-tests.ts
+++ b/types/jsforce/jsforce-tests.ts
@@ -615,7 +615,7 @@ async function testChatter(conn: sf.Connection): Promise<void> {
 
     const feedResource: sf.Resource<sf.RequestResult> = chatter.resource('/feed-elements');
 
-    const feedCreateRequest: any = await (feedResource.create({
+    const feedCreateRequest: any = await feedResource.create({
         body: {
             messageSegments: [{
                 type: 'Text',
@@ -624,13 +624,13 @@ async function testChatter(conn: sf.Connection): Promise<void> {
         },
         feedElementType: 'FeedItem',
         subjectId: 'me'
-    }) as Promise<sf.RequestResult>);
+    });
 
     console.log(`feedCreateRequest.id: ${feedCreateRequest.id}`);
     const itemLikesUrl = `/feed-elements/${feedCreateRequest.id}/capabilities/chatter-likes/items`;
     const itemsLikeResource: sf.Resource<sf.RequestResult> = chatter.resource(itemLikesUrl);
 
-    const itemsLikeCreateResult: sf.RequestResult = await (itemsLikeResource.create('') as Promise<sf.RequestResult>);
+    const itemsLikeCreateResult: sf.RequestResult = await itemsLikeResource.create('');
     console.log(`itemsLikeCreateResult['likedItem']: ${itemsLikeCreateResult as any['likedItem']}`);
 }
 
diff --git a/types/jsforce/tslint.json b/types/jsforce/tslint.json
index 43829466b8..12201695b9 100644
--- a/types/jsforce/tslint.json
+++ b/types/jsforce/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "array-type": false,
+        "await-promise": [true, "Request"],
         "ban-types": false,
         "eofline": false,
         "max-line-length": false,
diff --git a/types/jsnox/jsnox-tests.ts b/types/jsnox/jsnox-tests.ts
index f03c33e917..be5bd64126 100644
--- a/types/jsnox/jsnox-tests.ts
+++ b/types/jsnox/jsnox-tests.ts
@@ -9,7 +9,7 @@ interface PersonProps {
 }
 
 class Person extends React.Component<PersonProps> {
-    render(): React.ReactElement<any> { return null; }
+    render(): React.ReactElement { return null; }
 }
 
 const PersonTag = React.createFactory(Person);
diff --git a/types/json-rpc-ws/index.d.ts b/types/json-rpc-ws/index.d.ts
index 9faaeefd66..f81927d109 100644
--- a/types/json-rpc-ws/index.d.ts
+++ b/types/json-rpc-ws/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for json-rpc-ws 4.0
-// Project: https://www.npmjs.com/package/json-rpc-ws
+// Project: https://github.com/andyet/json-rpc-ws
 // Definitions by: Nicolas Penin <https://github.com/npenin>
 //                 Margus Lamp <https://github.com/mlamp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/json-schema/index.d.ts b/types/json-schema/index.d.ts
index 156a86c9a5..3c07271523 100644
--- a/types/json-schema/index.d.ts
+++ b/types/json-schema/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for json-schema 4.0, 6.0 and 7.0
-// Project: https://www.npmjs.com/package/json-schema
+// Project: https://github.com/kriszyp/json-schema
 // Definitions by: Boris Cherny <https://github.com/bcherny>
 //                 Cyrille Tuzi <https://github.com/cyrilletuzi>
 //                 Lucian Buzzo <https://github.com/lucianbuzzo>
@@ -20,6 +20,21 @@ export type JSONSchema4TypeName = 'string' | 'number' | 'integer' | 'boolean'
  */
 export type JSONSchema4Type = any[] | boolean | number | null | object | string
 
+/**
+ * Meta schema
+ *
+ * Recommended values:
+ * - '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#'
+ *
+ * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-5
+ */
+export type JSONSchema4Version = string;
+
 /**
  * JSON Schema V4
  * @see https://tools.ietf.org/html/draft-zyp-json-schema-04
@@ -27,10 +42,7 @@ export type JSONSchema4Type = any[] | boolean | number | null | object | string
 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
+    $schema?: JSONSchema4Version
 
     /**
      * This attribute is a string that provides a short description of the
@@ -210,6 +222,19 @@ export type JSONSchema6TypeName = 'string' | 'number' | 'integer' | 'boolean' |
 
 export type JSONSchema6Type = any[] | boolean | number | null | object | string
 
+/**
+ * Meta schema
+ *
+ * Recommended values:
+ * - '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#'
+ *
+ * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-5
+ */
+export type JSONSchema6Version = string;
+
 /**
  * JSON Schema V6
  * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01
@@ -218,8 +243,7 @@ export type JSONSchema6Definition = JSONSchema6 | boolean;
 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#'
+    $schema?: JSONSchema6Version
 
     /**
      * Must be strictly greater than 0.
@@ -502,12 +526,16 @@ export interface JSONSchema7Array extends Array<JSONSchema7Type> {}
 
 /**
  * Meta schema
+ *
+ * Recommended values:
+ * - '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#'
+ *
  * @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 type JSONSchema7Version = string;
 
 /**
  * JSON Schema v7
diff --git a/types/json2mq/index.d.ts b/types/json2mq/index.d.ts
new file mode 100644
index 0000000000..4efae7d889
--- /dev/null
+++ b/types/json2mq/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for json2mq 0.2
+// Project: https://github.com/akiran/json2mq
+// Definitions by: Zhang Yi Jiang <https://github.com/ZhangYiJiang>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = json2mq;
+
+declare function json2mq(query: json2mq.QueryObject | json2mq.QueryObject[]): string;
+
+declare namespace json2mq {
+    interface QueryObject {
+        [property: string]: string | number | boolean;
+    }
+}
diff --git a/types/json2mq/json2mq-tests.ts b/types/json2mq/json2mq-tests.ts
new file mode 100644
index 0000000000..6a8baa81af
--- /dev/null
+++ b/types/json2mq/json2mq-tests.ts
@@ -0,0 +1,25 @@
+import * as json2mq from 'json2mq';
+
+json2mq({ screen: true });  // -> 'screen'
+
+json2mq({ handheld: false });  // -> 'not handheld'
+
+json2mq({ minWidth: 100, maxWidth: 200 });
+// -> '(min-width: 100px) and (max-width: 200px)'
+
+json2mq({ minWidth: 100, maxWidth: '20em' });
+// -> '(min-width: 100px) and (max-width: 20em)'
+
+json2mq([{ screen: true, minWidth: 100 }, { handheld: true, orientation: 'landscape' }]);
+// -> 'screen and (min-width: 100px), handheld and (orientation: landscape)'
+
+json2mq({ all: true, monochrome: true });
+// -> 'all and monochrome'
+
+// Test QueryObject
+const mediaQuery: json2mq.QueryObject = {
+    screen: true,
+    monochrome: false,
+    maxWidth: 200,
+    minHeight: '10rem',
+};
diff --git a/types/json2mq/tsconfig.json b/types/json2mq/tsconfig.json
new file mode 100644
index 0000000000..c4b51247a8
--- /dev/null
+++ b/types/json2mq/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "json2mq-tests.ts"
+    ]
+}
diff --git a/types/json2mq/tslint.json b/types/json2mq/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/json2mq/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/json3/index.d.ts b/types/json3/index.d.ts
index 768a76cf14..58d2ea9915 100644
--- a/types/json3/index.d.ts
+++ b/types/json3/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for json3 3.3
-// Project: https://bestiejs.github.io/json3/
+// Project: http://bestiejs.github.io/json3
 // Definitions by: NN <https://github.com/NN--->
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/jsonata/index.d.ts b/types/jsonata/index.d.ts
index f9196d7149..c0634c6ef1 100644
--- a/types/jsonata/index.d.ts
+++ b/types/jsonata/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jsonata 1.3
-// Project: https://github.com/jsonata-js/jsonata
+// Project: https://github.com/jsonata-js/jsonata, http://jsonata.org
 // Definitions by: Nick <https://github.com/nick121212>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/jsoneditor/index.d.ts b/types/jsoneditor/index.d.ts
index f095cb8434..3c74a3d789 100644
--- a/types/jsoneditor/index.d.ts
+++ b/types/jsoneditor/index.d.ts
@@ -1,54 +1,199 @@
-// Type definitions for jsoneditor v5.19.0
+// Type definitions for jsoneditor v5.28.2
 // Project: https://github.com/josdejong/jsoneditor
 // Definitions by: Alejandro Sánchez <https://github.com/alejo90>
 //                 Errietta Kostala <https://github.com/errietta>
+//                 Adam Vigneaux <https://github.com/adamvig>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="ace" />
 
+import { Ajv } from "ajv";
+
 declare module 'jsoneditor' {
-    export interface JSONEditorNode {
+    type JSONPath = (string|number)[];
+
+    export interface Node {
         field: string;
-        value: string;
-        path: Array<string>;
+        value?: string;
+        path: JSONPath;
     }
 
     export type JSONEditorMode = 'tree' | 'view' | 'form' | 'code' | 'text';
 
+    export interface NodeName {
+        path: string;
+        type: 'object'|'array';
+        size: number;
+    }
+
+    export interface ValidationError {
+        path: JSONPath;
+        message: string;
+    }
+
+    export interface Template {
+        text: string;
+        title: string;
+        className?: string;
+        field: string;
+        value: any;
+    }
+
+    export type AutoCompleteCompletion = null|string[]|{startFrom: number, options: string[]};
+
+    export type AutoCompleteOptionsGetter = (
+        text: string, path: JSONPath, input: string, editor: JSONEditor,
+    ) => AutoCompleteCompletion|Promise<AutoCompleteCompletion>;
+
+    export interface AutoCompleteOptions {
+        /**
+         * @default [39, 35, 9]
+         */
+        confirmKeys?: number[];
+        caseSensitive?: boolean;
+        getOptions?: AutoCompleteOptionsGetter;
+    }
+
+    export interface SelectionPosition {
+        row: number;
+        column: number;
+    }
+
+    export interface SerializableNode {
+        value: any;
+        path: JSONPath;
+    }
+
+    // Based on the API of https://github.com/Sphinxxxx/vanilla-picker
+    export interface Color {
+        rgba: Array<number>;
+        hsla: Array<number>;
+        rgbString: string;
+        rgbaString: string;
+        hslString: string;
+        hslaString: string;
+        hex: string;
+    }
+
     export interface JSONEditorOptions {
         ace?: AceAjax.Ace;
-        ajv?: any; // Any for now, since ajv typings aren't A-Ok
+        ajv?: Ajv;
         onChange?: () => void;
-        onEditable?: (node: JSONEditorNode) => boolean | {field: boolean, value: boolean};
+        onChangeJSON?: (json: any) => void;
+        onChangeText?: (jsonString: string) => void;
+        onEditable?: (node: Node) => boolean|{field: boolean, value: boolean};
         onError?: (error: Error) => void;
         onModeChange?: (newMode: JSONEditorMode, oldMode: JSONEditorMode) => void;
+        onNodeName?: (nodeName: NodeName) => string|undefined;
+        onValidate?: (json: any) => ValidationError[]|Promise<ValidationError[]>;
+        /**
+         * @default false
+         */
         escapeUnicode?: boolean;
+        /**
+         * @default false
+         */
         sortObjectKeys?: boolean;
+        /**
+         * @default true
+         */
         history?: boolean;
+        /**
+         * @default 'tree'
+         */
         mode?: JSONEditorMode;
-        modes?: Array<JSONEditorMode>;
+        modes?: JSONEditorMode[];
+        /**
+         * @default undefined
+         */
         name?: string;
-        schema?: Object;
-        schemaRefs?: Object;
+        schema?: object;
+        schemaRefs?: object;
+        /**
+         * @default true
+         */
         search?: boolean;
+        /**
+         * @default 2
+         */
         indentation?: number;
         theme?: string;
+        templates?: Template[];
+        autocomplete?: AutoCompleteOptions;
+        /**
+         * @default true
+         */
+        mainMenuBar?: boolean;
+        /**
+         * @default true
+         */
+        navigationBar?: boolean;
+        /**
+         * @default true
+         */
+        statusBar?: boolean;
+        onTextSelectionChange?: (start: SelectionPosition, end: SelectionPosition, text: string) => void;
+        onSelectionChange?: (start: SerializableNode, end: SerializableNode) => void;
+        onEvent?: (node: Node, event: string) => void;
+        /**
+         * @default true
+         */
+        colorPicker?: boolean;
+        onColorPicker?: (parent: HTMLElement, color: string, onChange: (color: Color) => void) => void;
+        /**
+         * @default true
+         */
+        timestampTag?: boolean;
+        language?: string;
+        languages?: {
+            [lang: string]: {
+                [key: string]: string;
+            };
+        };
+        modalAnchor?: HTMLElement;
+        /**
+         * @default true
+         */
+        enableSort?: boolean;
+        /**
+         * @default true
+         */
+        enableTransform?: boolean;
+        /**
+         * @default 100
+         */
+        maxVisibleChilds?: number;
+
     }
 
     export default class JSONEditor {
-        constructor(container: HTMLElement, options?: JSONEditorOptions, json?: Object);
+        constructor(container: HTMLElement, options?: JSONEditorOptions, json?: any);
         collapseAll(): void;
         destroy(): void;
         expandAll(): void;
         focus(): void;
-        set(json: Object): void;
-        setMode(mode: JSONEditorMode): void;
-        setName(name?: string): void;
-        setSchema(schema: Object): void;
-        setText(jsonString: string): void;
         get(): any;
         getMode(): JSONEditorMode;
-        getName(): string;
+        getName(): string|undefined;
+        getNodesByRange(start: {path: JSONPath}, end: {path: JSONPath}): Array<SerializableNode>;
+        getSelection(): {start: SerializableNode, end: SerializableNode};
         getText(): string;
+        getTextSelection(): {start: SelectionPosition, end: SelectionPosition, text: string};
+        refresh(): void;
+        set(json: any): void;
+        setMode(mode: JSONEditorMode): void;
+        setName(name?: string): void;
+        setSchema(schema: object, schemaRefs?: object): void;
+        setSelection(start: {path: JSONPath}, end: {path: JSONPath}): void;
+        setText(jsonString: string): void;
+        setTextSelection(start: SelectionPosition, end: SelectionPosition): void;
+        update(json: any): void;
+        updateText(jsonString: string): void;
+
+        static VALID_OPTIONS: Array<string>;
+        static ace: AceAjax.Ace;
+        static Ajv: Ajv;
+        static VanillaPicker: any;
     }
 }
diff --git a/types/jsoneditor/jsoneditor-tests.ts b/types/jsoneditor/jsoneditor-tests.ts
index d905e6ba76..b584a14416 100644
--- a/types/jsoneditor/jsoneditor-tests.ts
+++ b/types/jsoneditor/jsoneditor-tests.ts
@@ -1,11 +1,13 @@
-import JSONEditor, {JSONEditorMode, JSONEditorNode, JSONEditorOptions } from 'jsoneditor';
+import * as Ajv from 'ajv';
+import JSONEditor, {JSONEditorMode, Node, JSONEditorOptions } from 'jsoneditor';
 
 let options: JSONEditorOptions;
+options = {};
 options = {
     ace: ace,
-    //ajv: Ajv({allErrors: true, verbose: true})
+    ajv: new Ajv({allErrors: true, verbose: true}),
     onChange() {},
-    onEditable(node: JSONEditorNode) {
+    onEditable(node: Node) {
         return true;
     },
     onError(error: Error) {},
@@ -23,7 +25,7 @@ options = {
     theme: 'default'
 };
 options = {
-    onEditable(node: JSONEditorNode) {
+    onEditable(node: Node) {
         return {field: true, value: false};
     }
 };
diff --git a/types/jsoneditor/package.json b/types/jsoneditor/package.json
new file mode 100644
index 0000000000..b47ef67b0a
--- /dev/null
+++ b/types/jsoneditor/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "ajv": "*"
+    }
+}
diff --git a/types/jsontoxml/index.d.ts b/types/jsontoxml/index.d.ts
index f683050031..37ad9c187c 100644
--- a/types/jsontoxml/index.d.ts
+++ b/types/jsontoxml/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jsontoxml 1.0
-// Project: https://github.com/soldair/node-jsontoxml
+// Project: https://github.com/soldair/node-jsontoxml, http://github.com/ken-franken/node-jsontoxml
 // Definitions by: benstevens48 <https://github.com/benstevens48>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/jsqrcode/index.d.ts b/types/jsqrcode/index.d.ts
index e7768d593f..e8b58458f4 100644
--- a/types/jsqrcode/index.d.ts
+++ b/types/jsqrcode/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jsqrcode 1.0
+// Type definitions for non-npm package jsqrcode 1.0
 // Project: https://github.com/LazarSoft/jsqrcode
 // Definitions by: Ricardo Azzi Silva <https://github.com/lordazzi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/jszip/index.d.ts b/types/jszip/index.d.ts
index ba3ea392c9..a5ab4ee8e1 100644
--- a/types/jszip/index.d.ts
+++ b/types/jszip/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for JSZip 3.1
-// Project: http://stuk.github.com/jszip/
+// Project: http://stuk.github.com/jszip/, https://github.com/stuk/jszip
 // Definitions by: mzeiher <https://github.com/mzeiher>, forabi <https://github.com/forabi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/jweixin/index.d.ts b/types/jweixin/index.d.ts
index b656e81ecc..9e9994371e 100644
--- a/types/jweixin/index.d.ts
+++ b/types/jweixin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jweixin 1.0
-// Project: https://mp.weixin.qq.com/wiki/11/74ad127cc054f6b80759c40f77ec03db.html
+// Project: https://mp.weixin.qq.com/wiki/11/74ad127cc054f6b80759c40f77ec03db.html, https://github.com/heyong-2015/jweixin
 // Definitions by: taoqf <https://github.com/taoqf>
 // 					gomydodo <https://github.com/gomydodo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/jwplayer/index.d.ts b/types/jwplayer/index.d.ts
index 05d9c50aa6..91f0d455cc 100644
--- a/types/jwplayer/index.d.ts
+++ b/types/jwplayer/index.d.ts
@@ -7,6 +7,7 @@
 //                 Benjamin Dobson <https://github.com/bpdsw>
 //                 Be Birchall <https://github.com/bebebebebe>
 //                 Daniel Cassidy <https://github.com/djcsdy>
+//                 Drew Wyatt <https://github.com/drewwyatt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -264,6 +265,13 @@ declare namespace jwplayer {
         reason: 'auto' | 'api' | 'initial choice';
     }
 
+    interface CastParam {
+        available: boolean;
+        active: boolean;
+        deviceName: string;
+        type: 'cast';
+    }
+
     interface EventParams {
         adClick: AdProgressParam;
         adCompanions: AdCompanionsParam;
@@ -277,6 +285,7 @@ declare namespace jwplayer {
         adPlay: AdPlayParam;
         adPause: AdPlayParam;
         adTime: AdTimeParam;
+        cast: CastParam;
         meta: MetadataParam;
         audioTracks: AudioTracksParam;
         audioTrackChanged: AudioTrackChangedParam;
diff --git a/types/jws/index.d.ts b/types/jws/index.d.ts
index fdbf1851c4..6c9d7194f5 100644
--- a/types/jws/index.d.ts
+++ b/types/jws/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jws 3.1
+// Type definitions for jws 3.2
 // Project: https://github.com/brianloveswords/node-jws
 // Definitions by: Justin Beckwith <https://github.com/JustinBeckwith>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -145,7 +145,8 @@ export interface VerifyOptions {
 
 export type Algorithm = 'HS256' | 'HS384' | 'HS512' | 'RS256' |
                         'RS384' | 'RS512' | 'ES256' | 'ES384' |
-                        'ES512' | 'none';
+                        'ES512' | 'PS256' | 'PS384' | 'PS512' |
+                        'none';
 
 export interface Header {
     alg: Algorithm;
diff --git a/types/karma-webpack/index.d.ts b/types/karma-webpack/index.d.ts
index f7278b64a5..e3a1f5fcea 100644
--- a/types/karma-webpack/index.d.ts
+++ b/types/karma-webpack/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for karma-webpack 2.0
-// Project: http://github.com/webpack/karma-webpack
+// Project: https://github.com/webpack-contrib/karma-webpack
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/karma/index.d.ts b/types/karma/index.d.ts
index 0da2803283..07146aeef5 100644
--- a/types/karma/index.d.ts
+++ b/types/karma/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for karma 3.0
-// Project: https://github.com/karma-runner/karma
+// Project: https://github.com/karma-runner/karma, http://karma-runner.github.io
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 //                 James Garbutt <https://github.com/43081j>
 //                 Yaroslav Admin <https://github.com/devoto13>
diff --git a/types/katex/contrib/auto-render.d.ts b/types/katex/contrib/auto-render.d.ts
new file mode 100644
index 0000000000..efef3ffb7d
--- /dev/null
+++ b/types/katex/contrib/auto-render.d.ts
@@ -0,0 +1,64 @@
+declare module 'katex/dist/contrib/auto-render' {
+    import { KatexOptions } from 'katex';
+
+    export interface RenderMathInElementSpecificOptionsDelimiters {
+        /**
+         * A string which starts the math expression (i.e. the left delimiter)
+         */
+        left: string;
+        /**
+         * A string which ends the math expression (i.e. the right delimiter)
+         */
+        right: string;
+        /**
+         * A boolean of whether the math in the expression should be rendered in display mode or not
+         */
+        display: boolean
+    }
+
+    export interface RenderMathInElementSpecificOptions {
+        /**
+         * A list of delimiters to look for math
+         *
+         * @default [
+         *   {left: "$$", right: "$$", display: true},
+         *   {left: "\\(", right: "\\)", display: false},
+         *   {left: "\\[", right: "\\]", display: true}
+         * ]
+         */
+        delimiters?: ReadonlyArray<RenderMathInElementSpecificOptionsDelimiters>;
+        /**
+         * A list of DOM node types to ignore when recursing through
+         *
+         * @default ["script", "noscript", "style", "textarea", "pre", "code"]
+         */
+        ignoredTags?: ReadonlyArray<keyof HTMLElementTagNameMap>;
+        /**
+         * A list of DOM node class names to ignore when recursing through
+         *
+         * @default []
+         */
+        ignoredClasses?: string[];
+        /**
+         * A callback method returning a message and an error stack in case of an critical error during rendering
+         * @param msg Message generated by KaTeX
+         * @param err Caught error
+         *
+         * @default console.error
+         */
+        errorCallback?(msg: string, err: Error): void;
+    }
+
+    /**
+     * renderMathInElement options contain KaTeX render options and renderMathInElement specific options
+     */
+    export type RenderMathInElementOptions = KatexOptions & RenderMathInElementSpecificOptions;
+
+    /**
+     * Auto-render TeX expressions in HTML element
+     * @param elem HTML element to auto-render
+     * @param options Render options
+     */
+    function renderMathInElement(elem: HTMLElement, options?: RenderMathInElementOptions): void;
+    export default renderMathInElement;
+}
diff --git a/types/katex/contrib/index.d.ts b/types/katex/contrib/index.d.ts
new file mode 100644
index 0000000000..a365569333
--- /dev/null
+++ b/types/katex/contrib/index.d.ts
@@ -0,0 +1 @@
+/// <reference path="auto-render.d.ts" />
diff --git a/types/katex/index.d.ts b/types/katex/index.d.ts
index ae126b3444..9d89c7c329 100644
--- a/types/katex/index.d.ts
+++ b/types/katex/index.d.ts
@@ -2,24 +2,28 @@
 // Project: http://khan.github.io/KaTeX/
 // Definitions by: Michael Randolph <https://github.com/mrand01>
 //                 Kevin Nguyen <https://github.com/knguyen0125>
+//                 bLue <https://github.com/dreamerblue>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference path="contrib/index.d.ts" />
 
 export as namespace katex;
 
 /** Documentation: https://katex.org/docs/options.html */
 export interface KatexOptions {
     /**
-     * If `true`, math will be rendered in display mode 
+     * If `true`, math will be rendered in display mode
      * (math in display style and center math on page)
-     * 
+     *
      * If `false`, math will be rendered in inline mode
      * @default false
      */
     displayMode?: boolean;
     /**
-     * If `true`, KaTeX will throw a `ParseError` when 
+     * If `true`, KaTeX will throw a `ParseError` when
      * it encounters an unsupported command or invalid LaTex
-     * 
+     *
      * If `false`, KaTeX will render unsupported commands as
      * text, and render invalid LaTeX as its source code with
      * hover text giving the error, in color given by errorColor
@@ -32,56 +36,56 @@ export interface KatexOptions {
     errorColor?: string;
     /**
      * A collection of custom macros.
-     * 
+     *
      * See `src/macros.js` for its usage
      */
     macros?: any;
     /**
      * If `true`, `\color` will work like LaTeX's `\textcolor`
      * and takes 2 arguments
-     * 
+     *
      * If `false`, `\color` will work like LaTeX's `\color`
      * and takes 1 argument
-     * 
+     *
      * In both cases, `\textcolor` works as in LaTeX
-     * 
+     *
      * @default false
      */
     colorIsTextColor?: boolean;
     /**
      * All user-specified sizes will be caped to `maxSize` ems
-     * 
+     *
      * If set to Infinity, users can make elements and space
      * arbitrarily large
-     * 
+     *
      * @default Infinity
      */
     maxSize?: number;
     /**
      * Limit the number of macro expansions to specified number
-     * 
+     *
      * If set to `Infinity`, marco expander will try to fully expand
      * as in LaTex
-     * 
+     *
      * @default 1000
      */
     maxExpand?: number;
     /**
      * Allowed protocols in `\href`
-     * 
+     *
      * Use `_relative` to allow relative urls
-     * 
+     *
      * Use `*` to allow all protocols
      */
-    allowedProtocols?: string[]
+    allowedProtocols?: string[];
     /**
      * If `false` or `"ignore"`, allow features that make
      * writing in LaTex convenient but not supported by LaTex
-     * 
+     *
      * If `true` or `"error"`, throw an error for such transgressions
-     * 
+     *
      * If `"warn"`, warn about behavior via `console.warn`
-     * 
+     *
      * @default "warn"
      */
     strict?: boolean | string | Function;
diff --git a/types/katex/katex-tests.ts b/types/katex/katex-tests.ts
index 6fd614c82c..6b3e223927 100644
--- a/types/katex/katex-tests.ts
+++ b/types/katex/katex-tests.ts
@@ -1,16 +1,33 @@
 import katexLib = require('katex');
+import renderMathInElement, { RenderMathInElementOptions } from 'katex/dist/contrib/auto-render';
 
 class KatexTest {
-	constructor() {
-		katexLib.render('My Latex String', document.createElement('div'));
+    constructor() {
+        katexLib.render('My Latex String', document.createElement('div'));
 
-		try {
-			let options: katexLib.KatexOptions = { throwOnError: true };
-			let value: string = katexLib.renderToString('My Latex String', options);
-		} catch (error) {
-			if (error instanceof katexLib.ParseError) {
-				//do something with this error
-			}
-		}
-	}
-}
\ No newline at end of file
+        try {
+            let options: katexLib.KatexOptions = { throwOnError: true };
+            let value: string = katexLib.renderToString('My Latex String', options);
+        } catch (error) {
+            if (error instanceof katexLib.ParseError) {
+                //do something with this error
+            }
+        }
+
+        const renderMathInElementOptions: RenderMathInElementOptions = {
+            delimiters: [
+                { left: "$$", right: "$$", display: true },
+                { left: "\\[", right: "\\]", display: true },
+                { left: "$", right: "$", display: false },
+                { left: "\\(", right: "\\)", display: false },
+            ],
+            errorCallback(msg: string, err: Error): void {
+                console.error(msg, err);
+                //do something with this error
+            }
+        };
+        const container = document.createElement('div');
+        container.innerText = 'LaTeX string $c = \\pm\\sqrt{a^2 + b^2}$';
+        renderMathInElement(container, renderMathInElementOptions);
+    }
+}
diff --git a/types/keen-tracking/index.d.ts b/types/keen-tracking/index.d.ts
index 69f513312c..5ac3c1a70d 100644
--- a/types/keen-tracking/index.d.ts
+++ b/types/keen-tracking/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for keen-tracking 2.0
-// Project: https://github.com/keen/keen-tracking.js#readme
+// Project: https://github.com/keen/keen-tracking.js#readme, https://keen.io
 // Definitions by: Rui Ferreira <https://github.com/rui-ferreira>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/keycloak-connect/index.d.ts b/types/keycloak-connect/index.d.ts
index de24fb84e9..2a98ccec52 100644
--- a/types/keycloak-connect/index.d.ts
+++ b/types/keycloak-connect/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for keycloak-connect 4.5
-// Project: https://github.com/keycloak/keycloak-nodejs-connect
+// Project: https://github.com/keycloak/keycloak-nodejs-connect, http://keycloak.org
 // Definitions by: Gregor Stamać <https://github.com/gstamac>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/kissfft-js/index.d.ts b/types/kissfft-js/index.d.ts
new file mode 100644
index 0000000000..dc745354ec
--- /dev/null
+++ b/types/kissfft-js/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for kissfft-js 0.1
+// Project: https://github.com/j-funk/kissfft-js#readme
+// Definitions by: racerhere <https://github.com/racerhere>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/types/kissfft-js
+
+export class FFT {
+    constructor(size: number);
+    forward(input: number[]): number[];
+    inverse(input: number[]): number[];
+    dispose(): void;
+}
+
+export class FFTR {
+    constructor(size: number);
+    forward(input: number[]): number[];
+    inverse(input: number[]): number[];
+    dispose(): void;
+}
diff --git a/types/kissfft-js/kissfft-js-tests.ts b/types/kissfft-js/kissfft-js-tests.ts
new file mode 100644
index 0000000000..7de3255660
--- /dev/null
+++ b/types/kissfft-js/kissfft-js-tests.ts
@@ -0,0 +1,11 @@
+import * as kissFFT from "kissfft-js";
+
+const fft = new kissFFT.FFT(0); // $ExpectType FFT
+fft.forward([1, 2, 3]); // $ExpectType number[]
+fft.inverse([1, 2, 3]); // $ExpectType number[]
+fft.dispose(); // $ExpectType void
+
+const fftr = new kissFFT.FFTR(0); // $ExpectType FFTR
+fftr.forward([1, 2, 3]); // $ExpectType number[]
+fftr.inverse([1, 2, 3]); // $ExpectType number[]
+fftr.dispose(); // $ExpectType void
diff --git a/types/kissfft-js/tsconfig.json b/types/kissfft-js/tsconfig.json
new file mode 100644
index 0000000000..5164a8f4bd
--- /dev/null
+++ b/types/kissfft-js/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",
+        "kissfft-js-tests.ts"
+    ]
+}
diff --git a/types/kissfft-js/tslint.json b/types/kissfft-js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/kissfft-js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/klaw/index.d.ts b/types/klaw/index.d.ts
index 7b4e586842..32810990d5 100644
--- a/types/klaw/index.d.ts
+++ b/types/klaw/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for klaw v2.1.1
+// Type definitions for klaw v3.0.0
 // Project: https://github.com/jprichardson/node-klaw
 // Definitions by: Matthew McEachen <https://github.com/mceachen>
+//                 Pascal Sthamer <https://github.com/p4sca1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -26,6 +27,7 @@ declare module "klaw" {
             fs?: any // fs or mock-fs
             filter?: (path: string) => boolean
             depthLimit?: number
+            preserveSymlinks?: boolean
         }
 
         type Event = "close" | "data" | "end" | "readable" | "error"
diff --git a/types/klaw/klaw-tests.ts b/types/klaw/klaw-tests.ts
index 69406f73e8..baecd656f3 100644
--- a/types/klaw/klaw-tests.ts
+++ b/types/klaw/klaw-tests.ts
@@ -5,7 +5,7 @@ const path = require('path');
 
 let items: klaw.Item[] = [] // files, directories, symlinks, etc
 
-klaw('/some/dir')
+klaw('/some/dir', { preserveSymlinks: false })
     .on('data', function(item: klaw.Item) {
         items.push(item)
     })
diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index 3ea4e37790..7888559827 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Knex.js 0.15
-// Project: https://github.com/tgriesser/knex
+// Project: https://github.com/tgriesser/knex, https://knexjs.org
 // Definitions by: Qubo <https://github.com/tkQubo>
 //                 Pablo Rodríguez <https://github.com/MeLlamoPablo>
 //                 Matt R. Wilson <https://github.com/mastermatt>
diff --git a/types/knockback/index.d.ts b/types/knockback/index.d.ts
index 68b9dc9e0b..59f3e3fa93 100644
--- a/types/knockback/index.d.ts
+++ b/types/knockback/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Knockback.js
-// Project: http://kmalakoff.github.io/knockback/
+// Project: http://kmalakoff.github.com/knockback
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/knuddels-userapps-api/index.d.ts b/types/knuddels-userapps-api/index.d.ts
index f190821ba8..a369554eb3 100644
--- a/types/knuddels-userapps-api/index.d.ts
+++ b/types/knuddels-userapps-api/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Knuddels UserApps API 1.00111486
+// Type definitions for non-npm package Knuddels UserApps API 1.00111486
 // Project: https://developer.knuddels.de
 // Definitions by: Knuddels GmbH & Co. KG <https://github.com/Knuddels>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/koa-bodyparser/index.d.ts b/types/koa-bodyparser/index.d.ts
index 88328b5c3d..d8666da7cd 100644
--- a/types/koa-bodyparser/index.d.ts
+++ b/types/koa-bodyparser/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for koa-bodyparser 4.2
-// Project: https://github.com/koajs/bodyparser
+// Project: https://github.com/koajs/body-parser
 // Definitions by: Jerry Chin <https://github.com/hellopao>
 //                 Anup Kishore <https://github.com/anup-2s>
 //                 Hiroshi Ioka <https://github.com/hirochachacha>
diff --git a/types/koa-bouncer/index.d.ts b/types/koa-bouncer/index.d.ts
index 7b881f2b5c..af3a8b6693 100644
--- a/types/koa-bouncer/index.d.ts
+++ b/types/koa-bouncer/index.d.ts
@@ -7,7 +7,7 @@
 import { Middleware, Context } from 'koa';
 
 declare namespace KoaBouncer {
-    export class ValidatorError extends Error {
+    export class ValidationError extends Error {
         name: string;
         message: string;
         bouncer: {
@@ -88,4 +88,4 @@ declare module "koa" {
     }
 }
     
-export = KoaBouncer;
\ No newline at end of file
+export = KoaBouncer;
diff --git a/types/koa-bunyan-logger/index.d.ts b/types/koa-bunyan-logger/index.d.ts
index 1cf77fec92..ab201bfc27 100644
--- a/types/koa-bunyan-logger/index.d.ts
+++ b/types/koa-bunyan-logger/index.d.ts
@@ -1,17 +1,47 @@
-// Type definitions for koa-bunyan-logger 2.0
+// Type definitions for koa-bunyan-logger 2.1
 // Project: https://github.com/koajs/bunyan-logger
 // Definitions by: Steven McDowall <https://github.com/sjmcdowall>
+//                 Jan Karlo Dela Cruz <https://github.com/jankdc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import { Middleware } from 'koa';
+import { Middleware, Request, Response } from 'koa';
 
 import Logger = require('bunyan');
 
-export = koaBunyanLogger;
-
 declare function koaBunyanLogger(logger?: Logger): Middleware;
 
+declare namespace koaBunyanLogger {
+    interface RequestData {
+        req: Request;
+    }
+
+    interface ResponseData {
+        req: Request;
+        res: Response;
+    }
+
+    interface RequestIdContextOptions {
+        header?: string;
+        prop?: string;
+        requestProp?: string;
+        field?: string;
+    }
+
+    interface RequestLoggerOptions {
+        durationField?: string;
+        levelFn?: (status: number, err: Error) => string;
+        updateLogFields?: (data: RequestData) => RequestData;
+        updateRequestLogFields?: (requestData: RequestData) => RequestData;
+        updateResponseLogFields?: (responseData: ResponseData) => ResponseData;
+        formatRequestMessage?: (requestData: RequestData) => string;
+        formatResponseMessage?: (responseData: ResponseData) => string;
+    }
+
+    function requestLogger(opts?: RequestLoggerOptions): Middleware;
+    function requestIdContext(opts?: RequestIdContextOptions): Middleware;
+}
+
 // Extend the Koa context to add the logger..
 declare module 'koa' {
     // tslint:disable-next-line: interface-name
@@ -19,3 +49,5 @@ declare module 'koa' {
         log: Logger;
     }
 }
+
+export = koaBunyanLogger;
diff --git a/types/koa-bunyan-logger/koa-bunyan-logger-tests.ts b/types/koa-bunyan-logger/koa-bunyan-logger-tests.ts
index daaf26b7a3..3d66a72a13 100644
--- a/types/koa-bunyan-logger/koa-bunyan-logger-tests.ts
+++ b/types/koa-bunyan-logger/koa-bunyan-logger-tests.ts
@@ -3,6 +3,8 @@ import koaBunyanLogger = require('koa-bunyan-logger');
 
 const app = new Koa();
 app.use(koaBunyanLogger());
+app.use(koaBunyanLogger.requestIdContext());
+app.use(koaBunyanLogger.requestLogger());
 
 app.use(async (ctx, next) => {
     ctx.log.info('Got a request from %s for %s', ctx.request.ip, ctx.path);
diff --git a/types/koa-compose/index.d.ts b/types/koa-compose/index.d.ts
index 88047abcc9..f35b9ca208 100644
--- a/types/koa-compose/index.d.ts
+++ b/types/koa-compose/index.d.ts
@@ -2,6 +2,13 @@
 // Project: https://github.com/koajs/compose
 // Definitions by: jKey Lu <https://github.com/jkeylu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as Koa from "koa";
+
+declare function compose<T, U, V, W>(
+    middleware: [Koa.Middleware<T, U>, Koa.Middleware<V, W>]
+): Koa.Middleware<T & V, U & W>;
 
 declare function compose<T>(middleware: Array<compose.Middleware<T>>): compose.ComposedMiddleware<T>;
 
diff --git a/types/koa-compose/koa-compose-tests.ts b/types/koa-compose/koa-compose-tests.ts
index ed1c705e5d..56b105e900 100644
--- a/types/koa-compose/koa-compose-tests.ts
+++ b/types/koa-compose/koa-compose-tests.ts
@@ -1,4 +1,5 @@
 import compose = require('koa-compose');
+import * as Koa from "koa";
 
 const fn1: compose.Middleware<any> = (context: any, next: () => Promise<void>): Promise<any> =>
     Promise
@@ -11,3 +12,40 @@ const fn2: compose.Middleware<any> = (context: any, next: () => Promise<void>):
         .then(next);
 
 const fn = compose([fn1, fn2]);
+
+interface FooCtx {
+    foo: string;
+}
+
+const fooMiddleware: Koa.Middleware<FooCtx> = async (ctx, next) => {
+    ctx.state.foo = "foo";
+    await next();
+};
+
+interface BarCtx {
+    bar: string;
+}
+
+const barMiddleware: Koa.Middleware<BarCtx> = async (ctx, next) => {
+    ctx.state.bar = "bar";
+    await next();
+};
+
+interface WooCtx {
+    woo: string;
+}
+
+const wooMiddleware: Koa.Middleware<WooCtx> = async (ctx, next) => {
+    ctx.state.woo = "woo";
+    await next();
+};
+
+new Koa<{}, {}>()
+    .use(compose([compose([fooMiddleware, barMiddleware]), wooMiddleware]))
+    .use(async (ctx, next) => {
+        ctx.state.foo;
+        ctx.state.bar;
+        ctx.state.woo;
+        ctx.body = "Something";
+        await next();
+    });
diff --git a/types/koa-convert/index.d.ts b/types/koa-convert/index.d.ts
index 498088b4c6..7fbe235900 100644
--- a/types/koa-convert/index.d.ts
+++ b/types/koa-convert/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for koa-convert 1.2
-// Project: https://github.com/koajs/convert
+// Project: https://github.com/koajs/convert, https://github.com/gyson/koa-convert
 // Definitions by: Daniel Byrne <https://github.com/danwbyrne>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/koa-joi-router/index.d.ts b/types/koa-joi-router/index.d.ts
index b767984d73..8ee1563370 100644
--- a/types/koa-joi-router/index.d.ts
+++ b/types/koa-joi-router/index.d.ts
@@ -1,14 +1,16 @@
-// Type definitions for koa-joi-router 5.1
+// Type definitions for koa-joi-router 5.2
 // Project: https://github.com/koajs/joi-router
 // Definitions by: Matthew Bull <https://github.com/wingsbob>
 //                 Dave Welsh <https://github.com/move-zig>
 //                 Hiroshi Ioka <https://github.com/hirochachacha>
+//                 Tiger Oakes <https://github.com/NotWoods>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
 import * as Koa from 'koa';
 import * as Joi from 'joi';
 import * as KoaRouter from 'koa-router';
+import * as CoBody from 'co-body';
 
 declare module "koa" {
     interface Request {
@@ -23,28 +25,34 @@ interface createRouter {
 }
 
 declare namespace createRouter {
-    type PartialHandler = (ctx: Koa.Context) => any;
     type FullHandler = (ctx: Koa.Context, next: () => Promise<any>) => any;
-    interface NestedHandler extends ReadonlyArray<PartialHandler|FullHandler|NestedHandler> {}
-    type Handler = PartialHandler | FullHandler| NestedHandler;
+    interface NestedHandler extends ReadonlyArray<Handler> {}
+    type Handler = FullHandler | NestedHandler;
 
     type Method = (path: string|RegExp, handlerOrConfig: Handler | object, ...handlers: Handler[]) => Router;
 
+    type OutputValidation = { body: Joi.SchemaLike } | { headers: Joi.SchemaLike };
+
     interface Spec {
         method: string|string[];
         path: string|RegExp;
         handler: Handler;
+        pre?: Handler;
         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};
+            header?: Joi.SchemaLike;
+            query?: Joi.SchemaLike;
+            params?: Joi.SchemaLike;
+            body?: Joi.SchemaLike;
             maxBody?: number;
             failure?: number;
             type?: 'form'|'json'|'multipart';
-            output?: {[status: number]: Joi.AnySchema};
+            formOptions?: CoBody.Options;
+            jsonOptions?: CoBody.Options;
+            multipartOptions?: CoBody.Options;
+            output?: {[status: string]: OutputValidation};
             continueOnError?: boolean;
         };
+        meta?: any;
     }
 
     interface Router {
diff --git a/types/koa-joi-router/koa-joi-router-tests.ts b/types/koa-joi-router/koa-joi-router-tests.ts
index 6ff956c2ef..050ad4d5a1 100644
--- a/types/koa-joi-router/koa-joi-router-tests.ts
+++ b/types/koa-joi-router/koa-joi-router-tests.ts
@@ -30,6 +30,7 @@ const spec3: router.Spec = {
     body: Joi.any(),
   },
   handler: (ctx: koa.Context) => ctx.status = 201,
+  pre: (_ctx, next) => next(),
 };
 
 router().route(spec3);
@@ -40,10 +41,22 @@ const spec4: router.Spec = {
   validate: {
     type: 'json',
     output: {
-      201: Joi.object(),
+      201: {
+        body: Joi.object(),
+      },
+      '400,404': {
+        headers: Joi.object(),
+        body: Joi.object(),
+      },
+      '500-599': {
+        headers: Joi.object(),
+      },
+    },
+    jsonOptions: {
+        limit: '10kb'
     }
   },
-  handler: (ctx: koa.Context) => {
+  handler(ctx) {
     ctx.status = 201;
     ctx.body = {};
   },
@@ -54,10 +67,11 @@ router().route(spec4);
 const spec5: router.Spec = {
   method: 'PUT',
   path: '/user',
-  handler: (ctx: koa.Context) => {
+  handler: (ctx) => {
     ctx.status = 201;
     ctx.body = ctx.request.body;
   },
+  meta: 'meta data',
 };
 
 router().route(spec5);
diff --git a/types/koa-pino-logger/index.d.ts b/types/koa-pino-logger/index.d.ts
index 04eea930ce..b32c076a01 100644
--- a/types/koa-pino-logger/index.d.ts
+++ b/types/koa-pino-logger/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for koa-pino-logger 2.1
-// Project: https://github.com/pinojs/koa-pino-logger
+// Project: https://github.com/pinojs/koa-pino-logger, https://github.com/davidmarkclements/koa-pino-logger
 // Definitions by: Cameron Yan <https://github.com/khell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/koa-range/index.d.ts b/types/koa-range/index.d.ts
index 9240491f04..dc6396ca43 100644
--- a/types/koa-range/index.d.ts
+++ b/types/koa-range/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for koa-range 0.3
-// Project: https://github.com/koajs/koa-range
+// Project: https://github.com/koajs/koa-range, https://github.com/yorkie/koa-range
 // Definitions by: Sami Kukkonen <https://github.com/strax>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/koa-session/index.d.ts b/types/koa-session/index.d.ts
index 08e6e66f70..512b888e1c 100644
--- a/types/koa-session/index.d.ts
+++ b/types/koa-session/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for koa-session 5.7
+// Type definitions for koa-session 5.10
 // Project: https://github.com/koajs/session
 // Definitions by: Yu Hsin Lu <https://github.com/kerol2r20>
 //                 Tomek Łaziuk <https://github.com/tlaziuk>
+//                 Hiroshi Ioka <https://github.com/hirochachacha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /* =================== USAGE ===================
 
@@ -16,6 +17,9 @@
  =============================================== */
 
 import Koa = require("koa");
+import Cookies = require("cookies");
+
+type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
 
 declare namespace session {
     /**
@@ -108,7 +112,7 @@ declare namespace session {
         hash(sess: any): string;
     }
 
-    interface opts {
+    interface opts extends Omit<Cookies.SetOption, 'maxAge'> {
         /**
          * cookie key (default is koa:sess)
          */
@@ -121,21 +125,6 @@ declare namespace session {
          */
         maxAge?: number | "session";
 
-        /**
-         * can overwrite or not (default true)
-         */
-        overwrite: boolean;
-
-        /**
-         * httpOnly or not (default true)
-         */
-        httpOnly: boolean;
-
-        /**
-         * signed or not (default true)
-         */
-        signed: boolean;
-
         /**
          * custom encode method
          */
diff --git a/types/koa-session/koa-session-tests.ts b/types/koa-session/koa-session-tests.ts
index a647b43e42..4930a6f1c2 100644
--- a/types/koa-session/koa-session-tests.ts
+++ b/types/koa-session/koa-session-tests.ts
@@ -37,6 +37,7 @@ app.use(session({
             console.log(key);
         },
     },
+    path: "/",
 }, app));
 
 app.use((ctx, next) => {
diff --git a/types/koa-static/index.d.ts b/types/koa-static/index.d.ts
index eaba7866c4..34ebc39d53 100644
--- a/types/koa-static/index.d.ts
+++ b/types/koa-static/index.d.ts
@@ -19,7 +19,7 @@ import { Middleware } from "koa";
 
 import { SendOptions } from "koa-send";
 
-declare function serve(root: string, opts?: serve.Options): Middleware;
+declare function serve(root: string, opts?: serve.Options): Middleware<{}>;
 
 declare namespace serve {
     interface Options extends SendOptions {
diff --git a/types/koa2-session-redis/index.d.ts b/types/koa2-session-redis/index.d.ts
index 24e85e1674..049c655f5f 100644
--- a/types/koa2-session-redis/index.d.ts
+++ b/types/koa2-session-redis/index.d.ts
@@ -2,7 +2,7 @@
 // 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
+// TypeScript Version: 2.8
 
 import * as Redis from 'redis';
 import * as session from 'koa-session';
diff --git a/types/kraken-js/index.d.ts b/types/kraken-js/index.d.ts
index 3013938dd2..7569500627 100644
--- a/types/kraken-js/index.d.ts
+++ b/types/kraken-js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for krakenjs 2.2
-// Project: http://krakenjs.com
+// Project: http://krakenjs.com, https://github.com/krakenjs/kraken-js
 // Definitions by: Timur Manyanov <https://github.com/darkwebdev>
 //                 Satana Charuwichitratana <https://github.com/micksatana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/kss/index.d.ts b/types/kss/index.d.ts
index 963dec9bff..6b6f33e858 100644
--- a/types/kss/index.d.ts
+++ b/types/kss/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for KSS 3.0
-// Project: https://github.com/kss-node/kss-node
+// Project: https://github.com/kss-node/kss-node, http://kss-node.github.io/kss-node
 // Definitions by: Gilad Gray <https://github.com/giladgray>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/kurento-utils/index.d.ts b/types/kurento-utils/index.d.ts
index a8a30005b6..2063dfbada 100644
--- a/types/kurento-utils/index.d.ts
+++ b/types/kurento-utils/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for kurento-utils 6.7
-// Project: https://github.com/Kurento/kurento-utils-js
+// Project: https://github.com/Kurento/kurento-utils-js, https://www.kurento.org
 // Definitions by: Miloslav Nenadál <https://github.com/nenadalm>
 //                 Benjamin Riggs <https://github.com/riggs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/later/index.d.ts b/types/later/index.d.ts
index 71d53983b0..4ffc4bc7ef 100644
--- a/types/later/index.d.ts
+++ b/types/later/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for LaterJS 1.2
-// Project: http://bunkat.github.io/later/
+// Project: http://bunkat.github.io/later/, https://github.com/bunkat/later
 // Definitions by: Jason D Dryhurst-Smith <https://github.com/jasond-s>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/latlon-geohash/index.d.ts b/types/latlon-geohash/index.d.ts
index a7d843c30c..e2ba9ef160 100644
--- a/types/latlon-geohash/index.d.ts
+++ b/types/latlon-geohash/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for latlon-geohash 1.1
-// Project: https://github.com/chrisveness/latlon-geohash
+// Project: https://github.com/chrisveness/latlon-geohash, http://www.movable-type.co.uk/scripts/geohash.html
 // Definitions by: Robert Imig <https://github.com/rimig>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/leaflet-areaselect/index.d.ts b/types/leaflet-areaselect/index.d.ts
index ae7f4e042d..bee0dd3691 100644
--- a/types/leaflet-areaselect/index.d.ts
+++ b/types/leaflet-areaselect/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Leaflet.areaSelect 0.1
+// Type definitions for non-npm package Leaflet.areaSelect 0.1
 // Project: https://github.com/heyman/leaflet-areaselect
 // Definitions by: André Wallat <https://github.com/awallat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/leaflet-editable/index.d.ts b/types/leaflet-editable/index.d.ts
index f73befb161..907a0d2139 100644
--- a/types/leaflet-editable/index.d.ts
+++ b/types/leaflet-editable/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Leaflet.Editable 0.7
-// Project: https://github.com/yohanboniface/Leaflet.Editable
+// Project: https://github.com/leaflet/leaflet.editable
 // Definitions by: Dominic Alie <https://github.com/dalie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/leaflet.awesome-markers/index.d.ts b/types/leaflet.awesome-markers/index.d.ts
index 859a37364b..2771a36904 100644
--- a/types/leaflet.awesome-markers/index.d.ts
+++ b/types/leaflet.awesome-markers/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Leaflet.awesome-markers plugin 2.0
-// Project: https://github.com/sigma-geosistemas/Leaflet.awesome-markers#properties
+// Project: https://github.com/sigma-geosistemas/leaflet.awesome-markers
 // Definitions by: Marcel Sebek <https://github.com/sebek64>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/leaflet.pm/index.d.ts b/types/leaflet.pm/index.d.ts
index e33d335a7b..fdf72bc682 100644
--- a/types/leaflet.pm/index.d.ts
+++ b/types/leaflet.pm/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for leaflet.pm 0.13
-// Project: https://github.com/codeofsumit/leaflet.pm
+// Project: https://github.com/codeofsumit/leaflet.pm, https://leafletpm.now.sh
 // Definitions by: Thomas Kleinke <https://github.com/tkleinke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/leaflet/index.d.ts b/types/leaflet/index.d.ts
index 96bcb3277a..f99f76817d 100644
--- a/types/leaflet/index.d.ts
+++ b/types/leaflet/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Alejandro Sánchez <https://github.com/alejo90>
 //                 Arne Schubert <https://github.com/atd-schubert>
 //                 Michael Auer <https://github.com/mcauer>
+//                 Roni Karilkar <https://github.com/ronikar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -493,7 +494,7 @@ export interface TileLayerOptions extends GridLayerOptions {
     tms?: boolean;
     zoomReverse?: boolean;
     detectRetina?: boolean;
-    crossOrigin?: boolean;
+    crossOrigin?: CrossOrigin;
     // [name: string]: any;
     // You are able add additional properties, but it makes this interface unchackable.
     // See: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/15313
@@ -549,12 +550,16 @@ export namespace tileLayer {
     function wms(baseUrl: string, options?: WMSOptions): TileLayer.WMS;
 }
 
+export type CrossOrigin = boolean | string;
+
 export interface ImageOverlayOptions extends InteractiveLayerOptions {
     opacity?: number;
     alt?: string;
     interactive?: boolean;
     attribution?: string;
-    crossOrigin?: boolean;
+    crossOrigin?: CrossOrigin;
+    errorOverlayUrl?: string;
+    zIndex?: number;
     className?: string;
 }
 
@@ -568,6 +573,9 @@ export class ImageOverlay extends Layer {
     /** Update the bounds that this ImageOverlay covers */
     setBounds(bounds: LatLngBounds): this;
 
+    /** Changes the zIndex of the image overlay */
+    setZIndex(value: number): this;
+
     /** Get the bounds that this ImageOverlay covers */
     getBounds(): LatLngBounds;
 
@@ -579,6 +587,32 @@ export class ImageOverlay extends Layer {
 
 export function imageOverlay(imageUrl: string, bounds: LatLngBoundsExpression, options?: ImageOverlayOptions): ImageOverlay;
 
+export interface VideoOverlayOptions extends ImageOverlayOptions {
+    autoplay?: boolean;
+    loop?: boolean;
+}
+
+export class VideoOverlay extends Layer { /** VideoOverlay doesn't extend ImageOverlay because ImageOverlay.getElement returns HTMLImageElement */
+    constructor(video: string | string[] | HTMLVideoElement, bounds: LatLngBoundsExpression, options?: VideoOverlayOptions);
+    setOpacity(opacity: number): this;
+    bringToFront(): this;
+    bringToBack(): this;
+    setUrl(url: string): this;
+
+    /** Update the bounds that this VideoOverlay covers */
+    setBounds(bounds: LatLngBounds): this;
+
+    /** Get the bounds that this VideoOverlay covers */
+    getBounds(): LatLngBounds;
+
+    /** Get the video element that represents the VideoOverlay on the map */
+    getElement(): HTMLVideoElement | undefined;
+
+    options: VideoOverlayOptions;
+}
+
+export function videoOverlay(video: string | string[] | HTMLVideoElement, bounds: LatLngBoundsExpression, options?: VideoOverlayOptions): VideoOverlay;
+
 export type LineCapShape = 'butt' | 'round' | 'square' | 'inherit';
 
 export type LineJoinShape = 'miter' | 'round' | 'bevel' | 'inherit';
diff --git a/types/leaflet/leaflet-tests.ts b/types/leaflet/leaflet-tests.ts
index a6c9b6ccc3..2e0f139e9d 100644
--- a/types/leaflet/leaflet-tests.ts
+++ b/types/leaflet/leaflet-tests.ts
@@ -1,13 +1,13 @@
 import * as L from 'leaflet';
 
-const latLngLiteral: L.LatLngLiteral = {lat: 12, lng: 13};
+const latLngLiteral: L.LatLngLiteral = { lat: 12, lng: 13 };
 const latLngTuple: L.LatLngTuple = [12, 13];
 
 let latLng: L.LatLng;
 latLng = L.latLng(12, 13);
 latLng = L.latLng(12, 13, 0);
 latLng = L.latLng(latLngLiteral);
-latLng = L.latLng({lat: 12, lng: 13, alt: 0});
+latLng = L.latLng({ lat: 12, lng: 13, alt: 0 });
 latLng = L.latLng(latLngTuple);
 latLng = L.latLng([12, 13, 0]);
 
@@ -34,7 +34,7 @@ let point: L.Point;
 point = L.point(12, 13);
 point = L.point(12, 13, true);
 point = L.point(pointTuple);
-point = L.point({x: 12, y: 13});
+point = L.point({ x: 12, y: 13 });
 
 point = new L.Point(12, 13);
 point = new L.Point(12, 13, true);
@@ -171,7 +171,7 @@ map.removeEventListener('moveend');
 map.removeEventListener('moveend', () => {});
 map.removeEventListener('moveend', () => {}, {});
 
-map.panInside(latLng, {padding: [50, 50], paddingBottomRight: point, paddingTopLeft: [100, 100]});
+map.panInside(latLng, { padding: [50, 50], paddingBottomRight: point, paddingTopLeft: [100, 100] });
 
 // map.getRenderer
 
@@ -218,25 +218,25 @@ mapPixelBounds = map.getPixelWorldBounds(12);
 
 let tileLayerOptions: L.TileLayerOptions = {};
 tileLayerOptions = {
-    minZoom: 0,
-    maxZoom: 18,
-    maxNativeZoom: 2,
-    errorTileUrl: '',
-    zoomOffset: 0,
-    tms: true,
-    zoomReverse: true,
-    detectRetina: true,
-    crossOrigin: false,
-    opacity: 1,
-    updateWhenIdle: true,
-    updateWhenZooming: true,
-    updateInterval: 500,
-    attribution: '',
-    zIndex: 1,
-    noWrap: true,
-    pane: '',
-    className: '',
-    keepBuffer: 1,
+	minZoom: 0,
+	maxZoom: 18,
+	maxNativeZoom: 2,
+	errorTileUrl: '',
+	zoomOffset: 0,
+	tms: true,
+	zoomReverse: true,
+	detectRetina: true,
+	crossOrigin: false,
+	opacity: 1,
+	updateWhenIdle: true,
+	updateWhenZooming: true,
+	updateInterval: 500,
+	attribution: '',
+	zIndex: 1,
+	noWrap: true,
+	pane: '',
+	className: '',
+	keepBuffer: 1,
 };
 
 tileLayerOptions.subdomains = 'a';
@@ -259,37 +259,67 @@ tileLayer = new L.TileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', tileLayer
 // imageOverlay
 let imageOverlayOptions: L.ImageOverlayOptions;
 imageOverlayOptions = {
-    opacity: 100,
-    alt: 'alt',
-    interactive: true,
-    attribution: 'attribution',
-    crossOrigin: true,
-    className: 'className',
-    bubblingMouseEvents: false,
-    pane: 'pane'
+	opacity: 100,
+	alt: 'alt',
+	interactive: true,
+	attribution: 'attribution',
+	errorOverlayUrl: 'http://www.test.com/error.png',
+	zIndex: 1,
+	crossOrigin: true,
+	className: 'className',
+	bubblingMouseEvents: false,
+	pane: 'pane'
 };
 
-const imageOverlayBounds = latLngBounds;
+let 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',
+	opacity: 100,
+	alt: 'alt',
+	className: 'className',
+});
+imageOverlay.setOpacity(100);
+imageOverlay.bringToFront();
+imageOverlay.bringToBack();
+imageOverlay.setUrl('https://www.google.ru/images/branding/googlelogo/2x/googlelogo_color_120x44dp.png');
+imageOverlay.setBounds(imageOverlayBounds);
+imageOverlay.setZIndex(1);
+imageOverlayBounds = imageOverlay.getBounds();
+html = imageOverlay.getElement();
+
+// videoOverlay
+let videoOverlayOptions: L.VideoOverlayOptions;
+videoOverlayOptions = {
+	interactive: true,
+	opacity: 100,
+	autoplay: true,
+	loop: false
+};
+
+const videoOverlayBounds = latLngBounds;
+const videoOverlayUrls = ['https://www.mapbox.com/bites/00188/patricia_nasa.webm'];
+const videoElement = document.createElement('video');
+
+let videoOverlay: L.VideoOverlay;
+videoOverlay = L.videoOverlay('https://www.mapbox.com/bites/00188/patricia_nasa.webm', videoOverlayBounds);
+videoOverlay = L.videoOverlay(videoOverlayUrls, videoOverlayBounds, videoOverlayOptions);
+videoOverlay = L.videoOverlay(videoElement, videoOverlayBounds, {
+	autoplay: true
 });
 
-const eventHandler = () => {};
+const eventHandler = () => { };
 const domEvent: Event = {} as Event;
 L.DomEvent
 	.on(htmlElement, 'click', eventHandler)
 	.addListener(htmlElement, 'click', eventHandler)
 	.off(htmlElement, 'click', eventHandler)
 	.removeListener(htmlElement, 'click', eventHandler)
-	.on(htmlElement, {click: eventHandler})
-	.addListener(htmlElement, {click: eventHandler})
-	.off(htmlElement, {click: eventHandler}, eventHandler)
-	.removeListener(htmlElement, {click: eventHandler}, eventHandler)
+	.on(htmlElement, { click: eventHandler })
+	.addListener(htmlElement, { click: eventHandler })
+	.off(htmlElement, { click: eventHandler }, eventHandler)
+	.removeListener(htmlElement, { click: eventHandler }, eventHandler)
 	.stopPropagation(domEvent)
 	.disableScrollPropagation(htmlElement)
 	.disableClickPropagation(htmlElement)
@@ -415,13 +445,13 @@ let threeCoords: [number, number, number] = [1, 2, 3];
 latLng = L.GeoJSON.coordsToLatLng(threeCoords);
 threeCoords = L.GeoJSON.latLngToCoords(latLng) as [number, number, number];
 
-let nestedTwoCoords = [ [12, 13], [13, 14], [14, 15] ];
+let nestedTwoCoords = [[12, 13], [13, 14], [14, 15]];
 const nestedLatLngs: L.LatLng[] = L.GeoJSON.coordsToLatLngs(nestedTwoCoords, 1);
 nestedTwoCoords = L.GeoJSON.latLngsToCoords(nestedLatLngs, 1);
 
 const geojson = new L.GeoJSON();
 const style: L.PathOptions = {
-    className: "string",
+	className: "string",
 };
 const styler: L.StyleFunction<MyProperties> = () => style;
 geojson.setStyle(style);
@@ -441,7 +471,7 @@ class MyLayer extends L.Layer {
 
 class MyIcon extends L.Icon {
 	constructor() {
-		super({iconUrl: 'icon.png'});
+		super({ iconUrl: 'icon.png' });
 	}
 }
 
@@ -451,9 +481,9 @@ class MyDivIcon extends L.DivIcon {
 	}
 }
 
-const divIcon = L.divIcon({html: ''});
+const divIcon = L.divIcon({ html: '' });
 let defaultIcon = new L.Icon.Default();
-defaultIcon = new L.Icon.Default({imagePath: 'apath'});
+defaultIcon = new L.Icon.Default({ imagePath: 'apath' });
 
 const myControlClass = L.Control.extend({});
 const myControl = new myControlClass();
@@ -511,11 +541,11 @@ 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
+		[[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]]
+		[[41, -111.03], [45, -111.04], [45, -104.05], [41, -104.05]]
 	]
 ];
 polygon = L.polygon(multiPolygonLatLngs);
@@ -534,8 +564,8 @@ 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]]
+	[[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);
@@ -569,7 +599,7 @@ const extended3: typeof obj1 & typeof obj2 & typeof obj3 & typeof obj4 = L.Util.
 const extended4: typeof obj1 & typeof obj2 & typeof obj3 & typeof obj4 & typeof obj5 = L.Util.extend(obj1, obj2, obj3, obj4, obj5);
 
 L.Util.create({});
-L.Util.create(null, {foo: {writable: true, value: 'bar'}});
+L.Util.create(null, { foo: { writable: true, value: 'bar' } });
 
 L.Util.bind(() => {}, {});
 L.Util.stamp({});
diff --git a/types/ledgerhq__hw-transport-node-hid/index.d.ts b/types/ledgerhq__hw-transport-node-hid/index.d.ts
index 91fa7263dc..6aed52ffbf 100644
--- a/types/ledgerhq__hw-transport-node-hid/index.d.ts
+++ b/types/ledgerhq__hw-transport-node-hid/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @ledgerhq/hw-transport-node-hid 4.22
-// Project: https://github.com/LedgerHQ/ledgerjs/tree/master/packages/hw-transport-node-hid
+// Project: https://github.com/LedgerHQ/ledgerjs/tree/master/packages/hw-transport-node-hid, https://github.com/ledgerhq/ledgerjs
 // Definitions by: Daniel Byrne <https://github.com/danwbyrne>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/ledgerhq__hw-transport-u2f/index.d.ts b/types/ledgerhq__hw-transport-u2f/index.d.ts
index b08b6c27ff..704e46be10 100644
--- a/types/ledgerhq__hw-transport-u2f/index.d.ts
+++ b/types/ledgerhq__hw-transport-u2f/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @ledgerhq/hw-transport-u2f 4.21
-// Project: https://github.com/LedgerHQ/ledgerjs/tree/master/packages/hw-transport-u2f
+// Project: https://github.com/LedgerHQ/ledgerjs/tree/master/packages/hw-transport-u2f, https://github.com/ledgerhq/ledgerjs
 // Definitions by: Daniel Byrne <https://github.com/danwbyrne>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/ledgerhq__hw-transport/index.d.ts b/types/ledgerhq__hw-transport/index.d.ts
index 6b3854a343..b62d66c5b2 100644
--- a/types/ledgerhq__hw-transport/index.d.ts
+++ b/types/ledgerhq__hw-transport/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @ledgerhq/hw-transport 4.21
-// Project: https://github.com/LedgerHQ/ledgerjs/tree/master/packages/hw-transport
+// Project: https://github.com/LedgerHQ/ledgerjs/tree/master/packages/hw-transport, https://github.com/ledgerhq/ledgerjs
 // Definitions by: Daniel Byrne <https://github.com/danwbyrne>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/less2sass/index.d.ts b/types/less2sass/index.d.ts
index 25848117f2..3b3073b581 100644
--- a/types/less2sass/index.d.ts
+++ b/types/less2sass/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for less2sass 1.0
-// Project: https://github.com/ekryski/less2sass
+// Project: https://github.com/ekryski/less2sass, http://erickryski.com
 // Definitions by: William Lohan <https://github.com/gatimus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/libxmljs/index.d.ts b/types/libxmljs/index.d.ts
index a29a6adeda..6540561a07 100644
--- a/types/libxmljs/index.d.ts
+++ b/types/libxmljs/index.d.ts
@@ -14,12 +14,48 @@ export const libxml_parser_version: string;
 // tslint:disable-next-line:strict-export-declare-modifiers
 interface StringMap { [key: string]: string; }
 
-export function parseXml(source: string, options?: StringMap): Document;
-export function parseXmlString(source: string, options?: StringMap): Document;
+// tslint:disable-next-line:strict-export-declare-modifiers
+interface ParserOptions {
+    recover?: boolean;
+    noent?: boolean;
+    dtdload?: boolean;
+    doctype?: boolean;
+    dtdattr?: any;
+    dtdvalid?: boolean;
+    noerror?: boolean;
+    errors?: boolean;
+    nowarning?: boolean;
+    warnings?: boolean;
+    pedantic?: boolean;
+    noblanks?: boolean;
+    blanks?: boolean;
+    sax1?: boolean;
+    xinclude?: boolean;
+    nonet?: boolean;
+    net?: boolean;
+    nodict?: boolean;
+    dict?: boolean;
+    nsclean?: boolean;
+    implied?: boolean;
+    nocdata?: boolean;
+    cdata?: boolean;
+    noxincnode?: boolean;
+    compact?: boolean;
+    old?: boolean;
+    nobasefix?: boolean;
+    basefix?: boolean;
+    huge?: boolean;
+    oldsax?: boolean;
+    ignore_enc?: boolean;
+    big_lines?: boolean;
+}
 
-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 parseXml(source: string, options?: ParserOptions): Document;
+export function parseXmlString(source: string, options?: ParserOptions): Document;
+
+export function parseHtml(source: string, options?: ParserOptions): Document;
+export function parseHtmlString(source: string, options?: ParserOptions): Document;
+export function parseHtmlFragment(source: string, options?: ParserOptions): Document;
 
 export function memoryUsage(): number;
 export function nodeCount(): number;
@@ -113,6 +149,7 @@ export class Element extends Node {
     prevElement(): Element|null;
     nextElement(): Element|null;
     addNextSibling(siblingNode: Node): Node;
+    addPrevSibling(siblingNode: Node): Node;
 
     find(xpath: string, ns_uri?: string): Node[];
     find(xpath: string, namespaces: StringMap): Node[];
diff --git a/types/lil-uri/index.d.ts b/types/lil-uri/index.d.ts
new file mode 100644
index 0000000000..b9642657fd
--- /dev/null
+++ b/types/lil-uri/index.d.ts
@@ -0,0 +1,214 @@
+// Type definitions for lil-uri 0.2
+// Project: https://github.com/lil-js/uri#readme
+// Definitions by: Wayne Carson <https://github.com/wcarson>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Global exposed when library is used outside of a module environment.
+ */
+export as namespace lil;
+
+/**
+ * Exported function
+ */
+export = uri;
+
+/**
+ * Parses the given URI string
+ *
+ * @param the URI string to parse.
+ */
+declare function uri(uri?: string): uri.URI;
+
+declare namespace uri {
+    /**
+     * Provides access to URI component values and parser/builder functions.
+     */
+    interface URI {
+        /**
+         * Parses the given URI string
+         * @param uri the URI to parse
+         */
+        parse(uri: string): URIParts;
+
+        /**
+         * Builds URI components into a URI string
+         */
+        build(): string;
+
+        /**
+         * Builds URI components into a URI string
+         */
+        toString(): string;
+
+        /**
+         * Builds URI components into a URI string
+         */
+        valueOf(): string;
+
+        /**
+         * Gets the protocol value
+         */
+        protocol(): string;
+
+        /**
+         * Sets the protocol
+         * @param protocol the protocol
+         * @return this object
+         */
+        protocol(protocol: string): URI;
+
+        /**
+         * Gets the host value
+         */
+        host(): string;
+
+        /**
+         * Sets the host
+         * @param host the host
+         * @return this object
+         */
+        host(host: string): URI;
+
+        /**
+         * Gets the hostname value
+         */
+        hostname(): string;
+
+        /**
+         * Sets the hostname
+         * @param hostname the hostname
+         * @return this object
+         */
+        hostname(hostname: string): URI;
+
+        /**
+         * Gets the port value
+         */
+        port(): number;
+
+        /**
+         * Sets the port
+         * @param port the port
+         * @return this object
+         */
+        port(port: string): URI;
+
+        /**
+         * Gets the auth value
+         */
+        auth(): Credentials;
+
+        /**
+         * Sets the auth
+         * @param auth the auth
+         * @return this object
+         */
+        auth(auth: string): URI;
+
+        /**
+         * Gets the user value
+         */
+        user(): string;
+
+        /**
+         * Sets the user
+         * @param user the user
+         * @return this object
+         */
+        user(user: string): URI;
+
+        /**
+         * Gets the password value
+         */
+        password(): string;
+
+        /**
+         * Sets the password
+         * @param password the password
+         * @return this object
+         */
+        password(password: string): URI;
+
+        /**
+         * Gets the path value
+         */
+        path(): string;
+
+        /**
+         * Sets the path
+         * @param path the path
+         * @return this object
+         */
+        path(path: string): URI;
+
+        /**
+         * Gets the search value
+         */
+        search(): string;
+
+        /**
+         * Sets the search
+         * @param search the search
+         * @return this object
+         */
+        search(search: string): URI;
+
+        /**
+         * Gets the query value
+         */
+        query(): QueryString;
+
+        /**
+         * Sets the query
+         * @param query the query
+         * @return this object
+         */
+        query(query: QueryString): URI;
+
+        /**
+         * Gets the hash value
+         */
+        hash(): string;
+
+        /**
+         * Sets the hash
+         * @param hash the hash
+         * @return this object
+         */
+        hash(hash: string): URI;
+    }
+
+    /**
+     * URI parts
+     */
+    interface URIParts {
+        uri: string;
+        protocol: string;
+        host: string;
+        hostname: string;
+        port: string;
+        auth: string;
+        user: string;
+        password: string;
+        path: string;
+        search: string;
+        query: QueryString;
+        hash: string;
+    }
+
+    /**
+     * Map of query string keys and values
+     */
+    interface QueryString {
+        [key: string]: string|string[];
+    }
+
+    /**
+     * Credentials map
+     */
+    interface Credentials {
+        user: string;
+        password: string;
+    }
+}
diff --git a/types/lil-uri/lil-uri-tests.ts b/types/lil-uri/lil-uri-tests.ts
new file mode 100644
index 0000000000..0674e9422a
--- /dev/null
+++ b/types/lil-uri/lil-uri-tests.ts
@@ -0,0 +1,59 @@
+import uri = require('lil-uri');
+
+//
+// Tests are based on code samples on https://github.com/lil-js/uri#readme
+//
+
+//
+// Parser
+//
+
+const url = uri('http://user:pass@example.com:8080/bar/foo.xml?foo=bar&hello=world&#hash=1');
+
+// $ExpectType string
+url.protocol(); // -> http
+
+// $ExpectType string
+url.host(); // -> example.com:8080
+
+// $ExpectType string
+url.hostname(); // -> example.com
+
+// $ExpectType number
+url.port(); // -> 8080
+
+// $ExpectType Credentials
+url.auth(); // -> { user: 'user', password: 'pass' }
+
+// $ExpectType string
+url.user(); // -> user
+
+// $ExpectType string
+url.password(); // -> pass
+
+// $ExpectType string
+url.path(); // -> /bar/foo.xml
+
+// $ExpectType string
+url.search(); // -> foo=bar&hello=world
+
+// $ExpectType QueryString
+url.query(); // -> { foo: 'bar', hello: 'world' }
+
+// $ExpectType string
+url.hash(); // -> hash=1
+
+//
+// Builder
+//
+
+// $ExpectType string
+uri()
+    .protocol('https')
+    .host('example.com')
+    .port('8080')
+    .auth('user:pass')
+    .path('/bar/foo.xml')
+    .query({ foo: 'bar', hello: 'world' })
+    .hash('hash=1')
+    .build(); // -> http://@example.com:8080/bar/foo.xml?foo=bar&hello=world&#frament=1
diff --git a/types/lil-uri/tsconfig.json b/types/lil-uri/tsconfig.json
new file mode 100644
index 0000000000..22578f4124
--- /dev/null
+++ b/types/lil-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",
+        "lil-uri-tests.ts"
+    ]
+}
diff --git a/types/lil-uri/tslint.json b/types/lil-uri/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/lil-uri/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/lingui__core/index.d.ts b/types/lingui__core/index.d.ts
index 9628f85634..c2243ba558 100644
--- a/types/lingui__core/index.d.ts
+++ b/types/lingui__core/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @lingui/core 2.2
-// Project: https://lingui.github.io/js-lingui/
+// Project: https://lingui.github.io/js-lingui/, https://github.com/lingui/js-lingui
 // Definitions by: Jeow Li Huan <https://github.com/huan086>
 // Definitions: https://github.com/huan086/lingui-typings
 // TypeScript Version: 2.2
diff --git a/types/lingui__macro/Trans.d.ts b/types/lingui__macro/Trans.d.ts
index c1834b770d..ba950bb2be 100644
--- a/types/lingui__macro/Trans.d.ts
+++ b/types/lingui__macro/Trans.d.ts
@@ -6,7 +6,7 @@ export interface TransPropsWithoutI18n extends RenderProps {
     defaults?: string;
     values?: object;
     formats?: object;
-    components?: ReadonlyArray<ReactElement<any>>;
+    components?: ReadonlyArray<ReactElement>;
     children?: ReactNode;
 }
 
diff --git a/types/lingui__macro/index.d.ts b/types/lingui__macro/index.d.ts
index 036434b636..e433b43ec7 100644
--- a/types/lingui__macro/index.d.ts
+++ b/types/lingui__macro/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @lingui/macro 2.7
-// Project: https://lingui.github.io/js-lingui/
+// Project: https://lingui.github.io/js-lingui/, https://github.com/lingui/js-lingui
 // Definitions by: Jeow Li Huan <https://github.com/huan086>
 // Definitions: https://github.com/huan086/lingui-typings
 // TypeScript Version: 2.8
diff --git a/types/lingui__react/Trans.d.ts b/types/lingui__react/Trans.d.ts
index c1834b770d..ba950bb2be 100644
--- a/types/lingui__react/Trans.d.ts
+++ b/types/lingui__react/Trans.d.ts
@@ -6,7 +6,7 @@ export interface TransPropsWithoutI18n extends RenderProps {
     defaults?: string;
     values?: object;
     formats?: object;
-    components?: ReadonlyArray<ReactElement<any>>;
+    components?: ReadonlyArray<ReactElement>;
     children?: ReactNode;
 }
 
diff --git a/types/lingui__react/index.d.ts b/types/lingui__react/index.d.ts
index da40b247ce..8d23645c30 100644
--- a/types/lingui__react/index.d.ts
+++ b/types/lingui__react/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @lingui/react 2.5
-// Project: https://lingui.github.io/js-lingui/
+// Project: https://lingui.github.io/js-lingui/, https://github.com/lingui/js-lingui
 // Definitions by: Jeow Li Huan <https://github.com/huan086>
 // Definitions: https://github.com/huan086/lingui-typings
 // TypeScript Version: 2.8
diff --git a/types/list.js/index.d.ts b/types/list.js/index.d.ts
new file mode 100644
index 0000000000..8209d87e67
--- /dev/null
+++ b/types/list.js/index.d.ts
@@ -0,0 +1,65 @@
+// Type definitions for list.js 1.5
+// Project: http://listjs.com
+// Definitions by: Jeffrey Meng <https://github.com/jeffreymeng>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
+
+declare class List {
+    listContainer: HTMLElement;
+    list: HTMLElement;
+    items: object[];
+    visibleItems: object[];
+    matchingItems: object[];
+    searched: boolean;
+    filtered: boolean;
+
+    constructor(element: string|HTMLElement, options?: List.ListOptions, values?: object[]);
+
+    add(values: object[], callback?: (item: List.ListItem) => void): void;
+    remove(valueName: string, value: any): number;
+    get(valueName: string, value: any): List.ListItem[];
+    sort(valueName: string, options: List.SortOptions): void;
+    search(searchString: string, columns?: string[]): void;
+    clear(): void;
+    filter(filterFunction: (item: List.ListItem) => boolean): void;
+    size(): number;
+    show(i: number, page: number): void;
+    update(): void;
+    reIndex(): void;
+    fuzzySearch(searchString: string, columns?: string[]): void;
+    on(event: string, callback: () => void): void;
+}
+
+declare namespace List {
+    interface ListItem {
+        elm: HTMLElement;
+
+        values(newValues: object): void;
+        values(): object;
+        show(): void;
+        hide(): void;
+        matching(): boolean;
+        visible(): boolean;
+    }
+
+    interface ListOptions {
+        valueNames?: string[];
+        item?: string;
+        listClass?: string;
+        searchClass?: string;
+        sortClass?: string;
+        indexAsync?: boolean;
+        page?: number;
+        i?: number;
+        pagination?: boolean;
+    }
+
+    interface SortOptions {
+        order?: string;
+        alphabet?: string;
+        insensitive?: boolean;
+        sortFunction?: ((a: object, b: object) => number|undefined);
+    }
+}
+
+export = List;
diff --git a/types/list.js/list.js-tests.ts b/types/list.js/list.js-tests.ts
new file mode 100644
index 0000000000..b2852c1a55
--- /dev/null
+++ b/types/list.js/list.js-tests.ts
@@ -0,0 +1,49 @@
+import List from "list.js";
+
+const list = new List(new HTMLElement(), {
+    page: 3,
+    searchClass: "class"
+});
+
+list.list; // $ExpectType HTMLElement
+list.listContainer; // $ExpectType HTMLElement
+list.items; // $ExpectType object[]
+list.visibleItems; // $ExpectType object[]
+list.matchingItems; // $ExpectType object[]
+list.searched; // $ExpectType boolean
+list.filtered; // $ExpectType boolean
+
+list.add([{ // $ExpectType void
+    name: "value",
+    value: true
+}], (item) => {}); // $ExpectType (item: ListItem) => void
+
+list.remove("name", "value"); // $ExpectType number
+list.get("name", "value"); // $ExpectType ListItem[]
+list.sort("name", { // $ExpectType void
+    order: "asec",
+    alphabet: "ABCD1234EFGH"
+});
+list.search("name", ["col1", "col2"]); // $ExpectType void
+list.clear(); // $ExpectType void
+list.filter((item) => {
+    return true;
+});
+list.size(); // $ExpectType number
+list.show(0, 0); // $ExpectType void
+list.update(); // $ExpectType void
+list.reIndex(); // $ExpectType void
+list.fuzzySearch("search", ["col1", "col2"]); // $ExpectType void
+list.on("event", () => { // void
+   // Do Something
+});
+
+const item = list.get("name", "value")[0];
+
+item.elm; // $ExpectType HTMLElement
+item.values(["new1", "new2"]); // $ExpectType void
+item.values(); // $ExpectType object
+item.show(); // $ExpectType void
+item.hide(); // $ExpectType void
+item.matching(); // $ExpectType boolean
+item.visible(); // $ExpectType boolean
diff --git a/types/list.js/tsconfig.json b/types/list.js/tsconfig.json
new file mode 100644
index 0000000000..85166b0860
--- /dev/null
+++ b/types/list.js/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "esModuleInterop": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "list.js-tests.ts"
+    ]
+}
diff --git a/types/list.js/tslint.json b/types/list.js/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/list.js/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/loadable__component/index.d.ts b/types/loadable__component/index.d.ts
index c4877bd8a9..f901457828 100644
--- a/types/loadable__component/index.d.ts
+++ b/types/loadable__component/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @loadable/component 5.2
+// Type definitions for @loadable/component 5.6
 // Project: https://github.com/smooth-code/loadable-components
 // Definitions by: Martynas Kadiša <https://github.com/martynaskadisa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -14,15 +14,16 @@ export type DefaultComponent<P> = React.ComponentType<P> | DefaultImportedCompon
 
 export interface Options {
 	fallback?: JSX.Element;
+	ssr?: boolean;
 }
 
-export type LoadableComponent<T> = React.ComponentType<T & { fallback?: JSX.Element }>;
+export type LoadableComponent<T> = React.ComponentType<T & { fallback?: JSX.Element }> & { preload(props?: T): void };
 export type LoadableLibrary<TModule> = React.ComponentType<{
 	fallback?: JSX.Element;
 	children?: (module: TModule) => React.ReactNode;
 	ref?: React.Ref<TModule>;
 }> &
-	TModule;
+	TModule & { preload(props?: object): void };
 
 declare function lib<T>(
 	loadFn: (props: object) => Promise<T>,
diff --git a/types/loadable__component/loadable__component-tests.tsx b/types/loadable__component/loadable__component-tests.tsx
index d286711be1..d5abfa3a5c 100644
--- a/types/loadable__component/loadable__component-tests.tsx
+++ b/types/loadable__component/loadable__component-tests.tsx
@@ -36,8 +36,14 @@ function importLibLoader() {
     // Should allow passing JSX element to fallback in options
     loadable(defaultImportComponentLoader, { fallback: <div>loading...</div> });
 
+    // Should allow passing boolean to `ssr` in options
+    loadable(defaultImportComponentLoader, { ssr: true });
+
     // Should allow passing `fallback` prop to loadable component
     <LoadableComponent foo="test" fallback={<div>loading...</div>} />;
+
+    // Should allow preloading
+    LoadableComponent.preload();
 }
 
 // lazy
@@ -52,6 +58,9 @@ function importLibLoader() {
 
     // Should allow passing fallback prop
     <LazyComponent foo="test" fallback={<div>loading...</div>} />;
+
+    // Should allow preloading
+    LazyComponent.preload();
 }
 
 // loadable.lib
@@ -71,6 +80,9 @@ function importLibLoader() {
     // Should allow passing fallback JSX element
     loadable.lib(importLibLoader, { fallback: <div>loading lib...</div> });
 
+    // Should allow passing boolean to `ssr` in options
+    loadable.lib(defaultImportComponentLoader, { ssr: true });
+
     // Should allow passing fallback prop
     <LoadableLibrary fallback={<div>Loading library...</div>}>
         {({ getTestObj }) => getTestObj().foo}
@@ -80,6 +92,9 @@ function importLibLoader() {
     const ref = React.createRef<typeof LoadableLibrary>();
     <LoadableLibrary ref={ref} />;
     ref.current!.getTestObj().foo;
+
+    // Should allow preloading
+    LoadableLibrary.preload();
 }
 
 // lazy.lib
@@ -105,6 +120,9 @@ function importLibLoader() {
     const ref = React.createRef<typeof LazyLibrary>();
     <LazyLibrary ref={ref} />;
     ref.current!.getTestObj().foo;
+
+    // Should allow preloading
+    LazyDefaultLibrary.preload();
 }
 
 // loadableReady
diff --git a/types/loadable__server/index.d.ts b/types/loadable__server/index.d.ts
index eafbd7eec7..33a3366ca9 100644
--- a/types/loadable__server/index.d.ts
+++ b/types/loadable__server/index.d.ts
@@ -51,7 +51,7 @@ export class ChunkExtractor {
 	/**
 	 * Get scripts as a string of `<script>` tags
 	 */
-	getScriptTags(): string[];
+	getScriptTags(): string;
 
 	/**
 	 * Get scripts as an array of React `<script>` elements.
@@ -61,7 +61,7 @@ export class ChunkExtractor {
 	/**
 	 * Get "prefetch" and "preload" links as a string of `<link>` tags
 	 */
-	getLinkTags(): string[];
+	getLinkTags(): string;
 
 	/**
 	 * Get "prefetch" and "preload" links as an array of React `<link>` elements
@@ -71,7 +71,7 @@ export class ChunkExtractor {
 	/**
 	 * Get style links as a string of `<link>` tags
 	 */
-	getStyleTags(): string[];
+	getStyleTags(): string;
 
 	/**
 	 * Get style links as an array of React `<link>` elements
diff --git a/types/loadable__server/loadable__server-tests.tsx b/types/loadable__server/loadable__server-tests.tsx
index 36f1f74173..7e1649b282 100644
--- a/types/loadable__server/loadable__server-tests.tsx
+++ b/types/loadable__server/loadable__server-tests.tsx
@@ -33,8 +33,8 @@ const {
 
 // getLinkTags
 {
-    // Should return an arary of strings
-    const tags: string[] = getLinkTags();
+    // Should return a string
+    const tags: string = getLinkTags();
 }
 
 // getScriptElements
@@ -45,8 +45,8 @@ const {
 
 // getScriptTags
 {
-    // Should return an arary of strings
-    const tags: string[] = getScriptTags();
+    // Should return a string
+    const tags: string = getScriptTags();
 }
 
 // getStyleElements
@@ -57,8 +57,8 @@ const {
 
 // getStyleTags
 {
-    // Should return an arary of strings
-    const tags: string[] = getStyleTags();
+    // Should return a string
+    const tags: string = getStyleTags();
 }
 
 // requireEntrypoint
diff --git a/types/localizejs-library/index.d.ts b/types/localizejs-library/index.d.ts
index e8a14392b9..d7a579a399 100644
--- a/types/localizejs-library/index.d.ts
+++ b/types/localizejs-library/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for LocalizeJS Library 1.0
+// Type definitions for non-npm package LocalizeJS Library 1.0
 // Project: https://help.localizejs.com/docs/library-api
 // Definitions by: Samer Albahra <https://github.com/salbahra>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/lockfile/index.d.ts b/types/lockfile/index.d.ts
index 422b2b80a3..4d2acd9863 100644
--- a/types/lockfile/index.d.ts
+++ b/types/lockfile/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lockfile 1.0
-// Project: https://github.com/isaacs/lockfile
+// Project: https://github.com/npm/lockfile
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 //                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/lodash-es/index.d.ts b/types/lodash-es/index.d.ts
index 3ea316d67b..61eb6016ee 100644
--- a/types/lodash-es/index.d.ts
+++ b/types/lodash-es/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash-es 4.17
-// Project: http://lodash.com/
+// Project: http://lodash.com/, https://lodash.com/custom-builds
 // Definitions by: Stephen Lautier <https://github.com/stephenlautier>, e-cloud <https://github.com/e-cloud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.add/index.d.ts b/types/lodash.add/index.d.ts
index 00d16b08e6..742a2fc000 100644
--- a/types/lodash.add/index.d.ts
+++ b/types/lodash.add/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.add 3.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.after/index.d.ts b/types/lodash.after/index.d.ts
index 6187f9676f..48adaf8994 100644
--- a/types/lodash.after/index.d.ts
+++ b/types/lodash.after/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.after 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.ary/index.d.ts b/types/lodash.ary/index.d.ts
index c55dadc0c1..d442d3ad4d 100644
--- a/types/lodash.ary/index.d.ts
+++ b/types/lodash.ary/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.ary 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.assign/index.d.ts b/types/lodash.assign/index.d.ts
index fa4c94932f..549fb7af74 100644
--- a/types/lodash.assign/index.d.ts
+++ b/types/lodash.assign/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.assign 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.assignin/index.d.ts b/types/lodash.assignin/index.d.ts
index f7b2d7a70f..34e644c6b9 100644
--- a/types/lodash.assignin/index.d.ts
+++ b/types/lodash.assignin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.assignIn 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.assigninwith/index.d.ts b/types/lodash.assigninwith/index.d.ts
index 6d4a04fd2b..ba48574c0d 100644
--- a/types/lodash.assigninwith/index.d.ts
+++ b/types/lodash.assigninwith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.assignInWith 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.assignwith/index.d.ts b/types/lodash.assignwith/index.d.ts
index 57600a053d..b88032631e 100644
--- a/types/lodash.assignwith/index.d.ts
+++ b/types/lodash.assignwith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.assignWith 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.at/index.d.ts b/types/lodash.at/index.d.ts
index edff6471b4..a307f84553 100644
--- a/types/lodash.at/index.d.ts
+++ b/types/lodash.at/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.at 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.attempt/index.d.ts b/types/lodash.attempt/index.d.ts
index c6b29b05b4..71b89a092f 100644
--- a/types/lodash.attempt/index.d.ts
+++ b/types/lodash.attempt/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.attempt 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.before/index.d.ts b/types/lodash.before/index.d.ts
index 7e4add0ab1..f19139a5ee 100644
--- a/types/lodash.before/index.d.ts
+++ b/types/lodash.before/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.before 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.bind/index.d.ts b/types/lodash.bind/index.d.ts
index c2a5d00e9e..e90ebaa4c1 100644
--- a/types/lodash.bind/index.d.ts
+++ b/types/lodash.bind/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.bind 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.bindall/index.d.ts b/types/lodash.bindall/index.d.ts
index 183812c630..4a4cb0de76 100644
--- a/types/lodash.bindall/index.d.ts
+++ b/types/lodash.bindall/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.bindAll 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.bindkey/index.d.ts b/types/lodash.bindkey/index.d.ts
index 6ba68efdec..86c9c13672 100644
--- a/types/lodash.bindkey/index.d.ts
+++ b/types/lodash.bindkey/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.bindKey 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.camelcase/index.d.ts b/types/lodash.camelcase/index.d.ts
index cac7ee844d..6fbedc08d6 100644
--- a/types/lodash.camelcase/index.d.ts
+++ b/types/lodash.camelcase/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.camelCase 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.capitalize/index.d.ts b/types/lodash.capitalize/index.d.ts
index a6fc0db0a2..fbe1b177ee 100644
--- a/types/lodash.capitalize/index.d.ts
+++ b/types/lodash.capitalize/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.capitalize 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.castarray/index.d.ts b/types/lodash.castarray/index.d.ts
index 8173acc5bb..41e53aecff 100644
--- a/types/lodash.castarray/index.d.ts
+++ b/types/lodash.castarray/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.castArray 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.ceil/index.d.ts b/types/lodash.ceil/index.d.ts
index fece48100d..d6e055af91 100644
--- a/types/lodash.ceil/index.d.ts
+++ b/types/lodash.ceil/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.ceil 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.chunk/index.d.ts b/types/lodash.chunk/index.d.ts
index a6907e5bae..c85c5c988c 100644
--- a/types/lodash.chunk/index.d.ts
+++ b/types/lodash.chunk/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.chunk 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.clamp/index.d.ts b/types/lodash.clamp/index.d.ts
index 402cebf9e6..7bc75b42e9 100644
--- a/types/lodash.clamp/index.d.ts
+++ b/types/lodash.clamp/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.clamp 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.clone/index.d.ts b/types/lodash.clone/index.d.ts
index 8517afee09..62da74b22d 100644
--- a/types/lodash.clone/index.d.ts
+++ b/types/lodash.clone/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.clone 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.clonedeep/index.d.ts b/types/lodash.clonedeep/index.d.ts
index a1766a12e5..5f25f0cfa7 100644
--- a/types/lodash.clonedeep/index.d.ts
+++ b/types/lodash.clonedeep/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.cloneDeep 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.clonedeepwith/index.d.ts b/types/lodash.clonedeepwith/index.d.ts
index 0977563508..9725303ac2 100644
--- a/types/lodash.clonedeepwith/index.d.ts
+++ b/types/lodash.clonedeepwith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.cloneDeepWith 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.clonewith/index.d.ts b/types/lodash.clonewith/index.d.ts
index 0caf99deb8..b02127620c 100644
--- a/types/lodash.clonewith/index.d.ts
+++ b/types/lodash.clonewith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.cloneWith 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.compact/index.d.ts b/types/lodash.compact/index.d.ts
index 7ed354f717..48b4bbd7e1 100644
--- a/types/lodash.compact/index.d.ts
+++ b/types/lodash.compact/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.compact 3.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.concat/index.d.ts b/types/lodash.concat/index.d.ts
index 8c88e834a7..576dd6aa6b 100644
--- a/types/lodash.concat/index.d.ts
+++ b/types/lodash.concat/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.concat 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.cond/index.d.ts b/types/lodash.cond/index.d.ts
index 8570a945da..633e40809e 100644
--- a/types/lodash.cond/index.d.ts
+++ b/types/lodash.cond/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.cond 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.constant/index.d.ts b/types/lodash.constant/index.d.ts
index 15a624e90e..5122739117 100644
--- a/types/lodash.constant/index.d.ts
+++ b/types/lodash.constant/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.constant 3.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.countby/index.d.ts b/types/lodash.countby/index.d.ts
index 5d352a8b48..1f569be971 100644
--- a/types/lodash.countby/index.d.ts
+++ b/types/lodash.countby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.countBy 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.create/index.d.ts b/types/lodash.create/index.d.ts
index 5be60d77f3..173f439a2f 100644
--- a/types/lodash.create/index.d.ts
+++ b/types/lodash.create/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.create 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.curry/index.d.ts b/types/lodash.curry/index.d.ts
index 9f00457f3f..d569ccb852 100644
--- a/types/lodash.curry/index.d.ts
+++ b/types/lodash.curry/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.curry 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.curryright/index.d.ts b/types/lodash.curryright/index.d.ts
index a19422b8cc..0d13c7d705 100644
--- a/types/lodash.curryright/index.d.ts
+++ b/types/lodash.curryright/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.curryRight 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.debounce/index.d.ts b/types/lodash.debounce/index.d.ts
index c6e5fe52cb..4babb92e45 100644
--- a/types/lodash.debounce/index.d.ts
+++ b/types/lodash.debounce/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.debounce 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.deburr/index.d.ts b/types/lodash.deburr/index.d.ts
index c75b793a43..103ae6f0b9 100644
--- a/types/lodash.deburr/index.d.ts
+++ b/types/lodash.deburr/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.deburr 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.defaults/index.d.ts b/types/lodash.defaults/index.d.ts
index 85309c3f62..9d92dd3021 100644
--- a/types/lodash.defaults/index.d.ts
+++ b/types/lodash.defaults/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.defaults 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.defaultsdeep/index.d.ts b/types/lodash.defaultsdeep/index.d.ts
index 8fd5eceea6..d1f1e1aa4e 100644
--- a/types/lodash.defaultsdeep/index.d.ts
+++ b/types/lodash.defaultsdeep/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.defaultsDeep 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.defer/index.d.ts b/types/lodash.defer/index.d.ts
index 1ba71f43a6..12247d6273 100644
--- a/types/lodash.defer/index.d.ts
+++ b/types/lodash.defer/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.defer 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.delay/index.d.ts b/types/lodash.delay/index.d.ts
index b6d6dc253d..2ad1ff79d3 100644
--- a/types/lodash.delay/index.d.ts
+++ b/types/lodash.delay/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.delay 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.difference/index.d.ts b/types/lodash.difference/index.d.ts
index 8584bdc360..9843b97496 100644
--- a/types/lodash.difference/index.d.ts
+++ b/types/lodash.difference/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.difference 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.differenceby/index.d.ts b/types/lodash.differenceby/index.d.ts
index c72ec8a20e..24d95da85a 100644
--- a/types/lodash.differenceby/index.d.ts
+++ b/types/lodash.differenceby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.differenceBy 4.8
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.differencewith/index.d.ts b/types/lodash.differencewith/index.d.ts
index f1dbdf9e06..32f51678ab 100644
--- a/types/lodash.differencewith/index.d.ts
+++ b/types/lodash.differencewith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.differenceWith 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.divide/index.d.ts b/types/lodash.divide/index.d.ts
index d111dae3b6..7abbafd7bd 100644
--- a/types/lodash.divide/index.d.ts
+++ b/types/lodash.divide/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.divide 4.9
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.drop/index.d.ts b/types/lodash.drop/index.d.ts
index 49734fc833..9eaf528d73 100644
--- a/types/lodash.drop/index.d.ts
+++ b/types/lodash.drop/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.drop 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.dropright/index.d.ts b/types/lodash.dropright/index.d.ts
index 7239b9ebfa..73056b73a4 100644
--- a/types/lodash.dropright/index.d.ts
+++ b/types/lodash.dropright/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.dropRight 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.droprightwhile/index.d.ts b/types/lodash.droprightwhile/index.d.ts
index 4ccfa00c7f..a145e956ee 100644
--- a/types/lodash.droprightwhile/index.d.ts
+++ b/types/lodash.droprightwhile/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.dropRightWhile 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.dropwhile/index.d.ts b/types/lodash.dropwhile/index.d.ts
index 4dcc629786..7be29abfc4 100644
--- a/types/lodash.dropwhile/index.d.ts
+++ b/types/lodash.dropwhile/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.dropWhile 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.endswith/index.d.ts b/types/lodash.endswith/index.d.ts
index 14c8d65424..d27aea64c5 100644
--- a/types/lodash.endswith/index.d.ts
+++ b/types/lodash.endswith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.endsWith 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.eq/index.d.ts b/types/lodash.eq/index.d.ts
index db03c67aa4..1e577a2dac 100644
--- a/types/lodash.eq/index.d.ts
+++ b/types/lodash.eq/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.eq 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.escape/index.d.ts b/types/lodash.escape/index.d.ts
index 6df7eda743..3b9b0845ad 100644
--- a/types/lodash.escape/index.d.ts
+++ b/types/lodash.escape/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.escape 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.escaperegexp/index.d.ts b/types/lodash.escaperegexp/index.d.ts
index eff6aeb8d8..5d508bf40f 100644
--- a/types/lodash.escaperegexp/index.d.ts
+++ b/types/lodash.escaperegexp/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.escapeRegExp 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.every/index.d.ts b/types/lodash.every/index.d.ts
index 3106368cb8..d4443355a4 100644
--- a/types/lodash.every/index.d.ts
+++ b/types/lodash.every/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.every 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.fill/index.d.ts b/types/lodash.fill/index.d.ts
index 6a7f90cf09..21eca6cb70 100644
--- a/types/lodash.fill/index.d.ts
+++ b/types/lodash.fill/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.fill 3.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.filter/index.d.ts b/types/lodash.filter/index.d.ts
index e5a3859a0e..b7eaf4d001 100644
--- a/types/lodash.filter/index.d.ts
+++ b/types/lodash.filter/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.filter 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.find/index.d.ts b/types/lodash.find/index.d.ts
index 4b4b1f20c9..a4723afa63 100644
--- a/types/lodash.find/index.d.ts
+++ b/types/lodash.find/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.find 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.findindex/index.d.ts b/types/lodash.findindex/index.d.ts
index 2f935455ce..04045617e0 100644
--- a/types/lodash.findindex/index.d.ts
+++ b/types/lodash.findindex/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.findIndex 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.findkey/index.d.ts b/types/lodash.findkey/index.d.ts
index 2aa119a378..151b5e28d8 100644
--- a/types/lodash.findkey/index.d.ts
+++ b/types/lodash.findkey/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.findKey 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.findlast/index.d.ts b/types/lodash.findlast/index.d.ts
index 6d1d0ef3ab..e06477e488 100644
--- a/types/lodash.findlast/index.d.ts
+++ b/types/lodash.findlast/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.findLast 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.findlastindex/index.d.ts b/types/lodash.findlastindex/index.d.ts
index 3d603cf6ff..982b1d3880 100644
--- a/types/lodash.findlastindex/index.d.ts
+++ b/types/lodash.findlastindex/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.findLastIndex 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.findlastkey/index.d.ts b/types/lodash.findlastkey/index.d.ts
index 4708fba2cb..7ce6837eb7 100644
--- a/types/lodash.findlastkey/index.d.ts
+++ b/types/lodash.findlastkey/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.findLastKey 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.first/index.d.ts b/types/lodash.first/index.d.ts
index 7a14e5fc40..cd48bdc4bf 100644
--- a/types/lodash.first/index.d.ts
+++ b/types/lodash.first/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.first 3.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.flatmap/index.d.ts b/types/lodash.flatmap/index.d.ts
index b934345e81..11cd11337b 100644
--- a/types/lodash.flatmap/index.d.ts
+++ b/types/lodash.flatmap/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.flatMap 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.flatmapdeep/index.d.ts b/types/lodash.flatmapdeep/index.d.ts
index 0d70f9138e..d4f10edf3e 100644
--- a/types/lodash.flatmapdeep/index.d.ts
+++ b/types/lodash.flatmapdeep/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.flatMapDeep 4.10
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.flatmapdepth/index.d.ts b/types/lodash.flatmapdepth/index.d.ts
index b5f690e357..91fb6bd576 100644
--- a/types/lodash.flatmapdepth/index.d.ts
+++ b/types/lodash.flatmapdepth/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.flatMapDepth 4.10
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.flatten/index.d.ts b/types/lodash.flatten/index.d.ts
index 766108b8b8..3689f19e15 100644
--- a/types/lodash.flatten/index.d.ts
+++ b/types/lodash.flatten/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.flatten 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.flattendeep/index.d.ts b/types/lodash.flattendeep/index.d.ts
index 9cd6dd213a..791f2b384f 100644
--- a/types/lodash.flattendeep/index.d.ts
+++ b/types/lodash.flattendeep/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.flattenDeep 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.flattendepth/index.d.ts b/types/lodash.flattendepth/index.d.ts
index b8de6e67bb..443cdc0cd0 100644
--- a/types/lodash.flattendepth/index.d.ts
+++ b/types/lodash.flattendepth/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.flattenDepth 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.flip/index.d.ts b/types/lodash.flip/index.d.ts
index 4dedd9c4a4..6adfc21057 100644
--- a/types/lodash.flip/index.d.ts
+++ b/types/lodash.flip/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.flip 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.floor/index.d.ts b/types/lodash.floor/index.d.ts
index 6e906c8527..27cfda6f21 100644
--- a/types/lodash.floor/index.d.ts
+++ b/types/lodash.floor/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.floor 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.flow/index.d.ts b/types/lodash.flow/index.d.ts
index 905b15658a..e6be4df9cc 100644
--- a/types/lodash.flow/index.d.ts
+++ b/types/lodash.flow/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.flow 3.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.flowright/index.d.ts b/types/lodash.flowright/index.d.ts
index 1448c48053..aa53e08fff 100644
--- a/types/lodash.flowright/index.d.ts
+++ b/types/lodash.flowright/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.flowRight 3.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.foreach/index.d.ts b/types/lodash.foreach/index.d.ts
index 32068bef80..464cb0e867 100644
--- a/types/lodash.foreach/index.d.ts
+++ b/types/lodash.foreach/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.forEach 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.foreachright/index.d.ts b/types/lodash.foreachright/index.d.ts
index d0838f880b..9ad225ae54 100644
--- a/types/lodash.foreachright/index.d.ts
+++ b/types/lodash.foreachright/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.forEachRight 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.forin/index.d.ts b/types/lodash.forin/index.d.ts
index 15160e9b11..54669de7f9 100644
--- a/types/lodash.forin/index.d.ts
+++ b/types/lodash.forin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.forIn 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.forinright/index.d.ts b/types/lodash.forinright/index.d.ts
index ca16e9d84f..cfa0a1843a 100644
--- a/types/lodash.forinright/index.d.ts
+++ b/types/lodash.forinright/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.forInRight 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.forown/index.d.ts b/types/lodash.forown/index.d.ts
index ee2c6fa068..e1df00c22a 100644
--- a/types/lodash.forown/index.d.ts
+++ b/types/lodash.forown/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.forOwn 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.forownright/index.d.ts b/types/lodash.forownright/index.d.ts
index 63311de202..1a349592fd 100644
--- a/types/lodash.forownright/index.d.ts
+++ b/types/lodash.forownright/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.forOwnRight 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.frompairs/index.d.ts b/types/lodash.frompairs/index.d.ts
index 23df262b5b..f73cb2b9dd 100644
--- a/types/lodash.frompairs/index.d.ts
+++ b/types/lodash.frompairs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.fromPairs 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.functions/index.d.ts b/types/lodash.functions/index.d.ts
index 774965a4e0..40abae2872 100644
--- a/types/lodash.functions/index.d.ts
+++ b/types/lodash.functions/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.functions 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.functionsin/index.d.ts b/types/lodash.functionsin/index.d.ts
index ff8e82356a..17cca60180 100644
--- a/types/lodash.functionsin/index.d.ts
+++ b/types/lodash.functionsin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.functionsIn 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.get/index.d.ts b/types/lodash.get/index.d.ts
index b961e34f87..7ad640da93 100644
--- a/types/lodash.get/index.d.ts
+++ b/types/lodash.get/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.get 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.groupby/index.d.ts b/types/lodash.groupby/index.d.ts
index bae0166900..9363e47b41 100644
--- a/types/lodash.groupby/index.d.ts
+++ b/types/lodash.groupby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.groupBy 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.gt/index.d.ts b/types/lodash.gt/index.d.ts
index 3da1ad1633..6a973547b0 100644
--- a/types/lodash.gt/index.d.ts
+++ b/types/lodash.gt/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.gt 3.9
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.gte/index.d.ts b/types/lodash.gte/index.d.ts
index 78de8e60df..f968e8bb20 100644
--- a/types/lodash.gte/index.d.ts
+++ b/types/lodash.gte/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.gte 3.9
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.has/index.d.ts b/types/lodash.has/index.d.ts
index c2f5da7951..4f917d5187 100644
--- a/types/lodash.has/index.d.ts
+++ b/types/lodash.has/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.has 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.hasin/index.d.ts b/types/lodash.hasin/index.d.ts
index 619bc11335..ca286c6cd9 100644
--- a/types/lodash.hasin/index.d.ts
+++ b/types/lodash.hasin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.hasIn 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.head/index.d.ts b/types/lodash.head/index.d.ts
index 7060dea1bc..e26f114bf0 100644
--- a/types/lodash.head/index.d.ts
+++ b/types/lodash.head/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.head 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.identity/index.d.ts b/types/lodash.identity/index.d.ts
index 65a568a732..986c039d2e 100644
--- a/types/lodash.identity/index.d.ts
+++ b/types/lodash.identity/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.identity 3.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.includes/index.d.ts b/types/lodash.includes/index.d.ts
index 627a174174..1b490f7aed 100644
--- a/types/lodash.includes/index.d.ts
+++ b/types/lodash.includes/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.includes 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.indexof/index.d.ts b/types/lodash.indexof/index.d.ts
index 98267c8c95..8102c6a697 100644
--- a/types/lodash.indexof/index.d.ts
+++ b/types/lodash.indexof/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.indexOf 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.initial/index.d.ts b/types/lodash.initial/index.d.ts
index 8e4554e85f..9fa9218416 100644
--- a/types/lodash.initial/index.d.ts
+++ b/types/lodash.initial/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.initial 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.inrange/index.d.ts b/types/lodash.inrange/index.d.ts
index 66ffbcf901..3a817d9d2d 100644
--- a/types/lodash.inrange/index.d.ts
+++ b/types/lodash.inrange/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.inRange 3.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.intersection/index.d.ts b/types/lodash.intersection/index.d.ts
index db56bd9ad9..044cd6949d 100644
--- a/types/lodash.intersection/index.d.ts
+++ b/types/lodash.intersection/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.intersection 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.intersectionby/index.d.ts b/types/lodash.intersectionby/index.d.ts
index 0b17495dd1..a1d01a7c5d 100644
--- a/types/lodash.intersectionby/index.d.ts
+++ b/types/lodash.intersectionby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.intersectionBy 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.intersectionwith/index.d.ts b/types/lodash.intersectionwith/index.d.ts
index 646f60b95b..ff7cba542d 100644
--- a/types/lodash.intersectionwith/index.d.ts
+++ b/types/lodash.intersectionwith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.intersectionWith 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.invert/index.d.ts b/types/lodash.invert/index.d.ts
index d87b20287d..112bbee8e6 100644
--- a/types/lodash.invert/index.d.ts
+++ b/types/lodash.invert/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.invert 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.invertby/index.d.ts b/types/lodash.invertby/index.d.ts
index eb7eb2ee2a..f7c8ef8ee7 100644
--- a/types/lodash.invertby/index.d.ts
+++ b/types/lodash.invertby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.invertBy 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.invoke/index.d.ts b/types/lodash.invoke/index.d.ts
index c912aa0666..fb979c2079 100644
--- a/types/lodash.invoke/index.d.ts
+++ b/types/lodash.invoke/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.invoke 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.invokemap/index.d.ts b/types/lodash.invokemap/index.d.ts
index 3b910216e2..7cefb18454 100644
--- a/types/lodash.invokemap/index.d.ts
+++ b/types/lodash.invokemap/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.invokeMap 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isarguments/index.d.ts b/types/lodash.isarguments/index.d.ts
index 683cfa2f41..9f8704e327 100644
--- a/types/lodash.isarguments/index.d.ts
+++ b/types/lodash.isarguments/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isArguments 3.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isarray/index.d.ts b/types/lodash.isarray/index.d.ts
index 0a8cc51877..60299a147c 100644
--- a/types/lodash.isarray/index.d.ts
+++ b/types/lodash.isarray/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isArray 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isarraybuffer/index.d.ts b/types/lodash.isarraybuffer/index.d.ts
index 0d9180fa3c..ddeee837b6 100644
--- a/types/lodash.isarraybuffer/index.d.ts
+++ b/types/lodash.isarraybuffer/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isArrayBuffer 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isarraylike/index.d.ts b/types/lodash.isarraylike/index.d.ts
index d7d826b62c..761e226f3d 100644
--- a/types/lodash.isarraylike/index.d.ts
+++ b/types/lodash.isarraylike/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isArrayLike 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isarraylikeobject/index.d.ts b/types/lodash.isarraylikeobject/index.d.ts
index e817ab932b..8a3562ef04 100644
--- a/types/lodash.isarraylikeobject/index.d.ts
+++ b/types/lodash.isarraylikeobject/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isArrayLikeObject 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isboolean/index.d.ts b/types/lodash.isboolean/index.d.ts
index 1870287eea..60d3b863a8 100644
--- a/types/lodash.isboolean/index.d.ts
+++ b/types/lodash.isboolean/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isBoolean 3.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isbuffer/index.d.ts b/types/lodash.isbuffer/index.d.ts
index eff600740f..e39e927ff1 100644
--- a/types/lodash.isbuffer/index.d.ts
+++ b/types/lodash.isbuffer/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isBuffer 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isdate/index.d.ts b/types/lodash.isdate/index.d.ts
index c41e8d5130..cba12e469a 100644
--- a/types/lodash.isdate/index.d.ts
+++ b/types/lodash.isdate/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isDate 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.iselement/index.d.ts b/types/lodash.iselement/index.d.ts
index e1295e1136..751b675421 100644
--- a/types/lodash.iselement/index.d.ts
+++ b/types/lodash.iselement/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isElement 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isempty/index.d.ts b/types/lodash.isempty/index.d.ts
index 3ce119387f..92bf9b2168 100644
--- a/types/lodash.isempty/index.d.ts
+++ b/types/lodash.isempty/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isEmpty 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isequal/index.d.ts b/types/lodash.isequal/index.d.ts
index 07fc7af364..0a00fb83ce 100644
--- a/types/lodash.isequal/index.d.ts
+++ b/types/lodash.isequal/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isEqual 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isequalwith/index.d.ts b/types/lodash.isequalwith/index.d.ts
index 2d3b4bcbbe..05eaecdbd0 100644
--- a/types/lodash.isequalwith/index.d.ts
+++ b/types/lodash.isequalwith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isEqualWith 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.iserror/index.d.ts b/types/lodash.iserror/index.d.ts
index ed6fd0cbb1..5e31aa33de 100644
--- a/types/lodash.iserror/index.d.ts
+++ b/types/lodash.iserror/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isError 3.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isfinite/index.d.ts b/types/lodash.isfinite/index.d.ts
index f45109c32b..7d4874cd4a 100644
--- a/types/lodash.isfinite/index.d.ts
+++ b/types/lodash.isfinite/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isFinite 3.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isfunction/index.d.ts b/types/lodash.isfunction/index.d.ts
index 3930b74f24..b0876bfe82 100644
--- a/types/lodash.isfunction/index.d.ts
+++ b/types/lodash.isfunction/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isFunction 3.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isinteger/index.d.ts b/types/lodash.isinteger/index.d.ts
index 284bedd3ac..e42d7bb1ac 100644
--- a/types/lodash.isinteger/index.d.ts
+++ b/types/lodash.isinteger/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isInteger 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.islength/index.d.ts b/types/lodash.islength/index.d.ts
index 8e4b70ebbc..86c63fd45b 100644
--- a/types/lodash.islength/index.d.ts
+++ b/types/lodash.islength/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isLength 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.ismap/index.d.ts b/types/lodash.ismap/index.d.ts
index 59de035b0d..10ebdf8fe4 100644
--- a/types/lodash.ismap/index.d.ts
+++ b/types/lodash.ismap/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isMap 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.ismatch/index.d.ts b/types/lodash.ismatch/index.d.ts
index a551e40bdb..6439efb285 100644
--- a/types/lodash.ismatch/index.d.ts
+++ b/types/lodash.ismatch/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isMatch 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.ismatchwith/index.d.ts b/types/lodash.ismatchwith/index.d.ts
index 12c28e91d0..322b329308 100644
--- a/types/lodash.ismatchwith/index.d.ts
+++ b/types/lodash.ismatchwith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isMatchWith 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isnan/index.d.ts b/types/lodash.isnan/index.d.ts
index 8f91fd9fe4..3f2067314f 100644
--- a/types/lodash.isnan/index.d.ts
+++ b/types/lodash.isnan/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isNaN 3.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isnative/index.d.ts b/types/lodash.isnative/index.d.ts
index 79a21741b6..eb00733bee 100644
--- a/types/lodash.isnative/index.d.ts
+++ b/types/lodash.isnative/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isNative 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isnil/index.d.ts b/types/lodash.isnil/index.d.ts
index 07878b327c..fed4d9b833 100644
--- a/types/lodash.isnil/index.d.ts
+++ b/types/lodash.isnil/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isNil 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isnull/index.d.ts b/types/lodash.isnull/index.d.ts
index 82b0e5c73b..73ebb73e1b 100644
--- a/types/lodash.isnull/index.d.ts
+++ b/types/lodash.isnull/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isNull 3.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isnumber/index.d.ts b/types/lodash.isnumber/index.d.ts
index e49243cb92..28132eb6a9 100644
--- a/types/lodash.isnumber/index.d.ts
+++ b/types/lodash.isnumber/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isNumber 3.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isobject/index.d.ts b/types/lodash.isobject/index.d.ts
index 0fac0100ea..e1e05723b8 100644
--- a/types/lodash.isobject/index.d.ts
+++ b/types/lodash.isobject/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isObject 3.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isobjectlike/index.d.ts b/types/lodash.isobjectlike/index.d.ts
index de57ad36b1..6ad791127f 100644
--- a/types/lodash.isobjectlike/index.d.ts
+++ b/types/lodash.isobjectlike/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isObjectLike 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isplainobject/index.d.ts b/types/lodash.isplainobject/index.d.ts
index 13b2a28614..c76bc92a64 100644
--- a/types/lodash.isplainobject/index.d.ts
+++ b/types/lodash.isplainobject/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isPlainObject 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isregexp/index.d.ts b/types/lodash.isregexp/index.d.ts
index bd5056a919..65669eed68 100644
--- a/types/lodash.isregexp/index.d.ts
+++ b/types/lodash.isregexp/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isRegExp 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.issafeinteger/index.d.ts b/types/lodash.issafeinteger/index.d.ts
index e0cf8e9aeb..62bf5880c3 100644
--- a/types/lodash.issafeinteger/index.d.ts
+++ b/types/lodash.issafeinteger/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isSafeInteger 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isset/index.d.ts b/types/lodash.isset/index.d.ts
index 34bbe7b6b7..76a6789d52 100644
--- a/types/lodash.isset/index.d.ts
+++ b/types/lodash.isset/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isSet 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isstring/index.d.ts b/types/lodash.isstring/index.d.ts
index a2ccd5c3aa..81bcc8236a 100644
--- a/types/lodash.isstring/index.d.ts
+++ b/types/lodash.isstring/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isString 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.issymbol/index.d.ts b/types/lodash.issymbol/index.d.ts
index 4e7938ac12..51a1313671 100644
--- a/types/lodash.issymbol/index.d.ts
+++ b/types/lodash.issymbol/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isSymbol 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.istypedarray/index.d.ts b/types/lodash.istypedarray/index.d.ts
index e66c1b8591..5721a94c58 100644
--- a/types/lodash.istypedarray/index.d.ts
+++ b/types/lodash.istypedarray/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isTypedArray 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isundefined/index.d.ts b/types/lodash.isundefined/index.d.ts
index 3eb831c31d..a0f2f068fc 100644
--- a/types/lodash.isundefined/index.d.ts
+++ b/types/lodash.isundefined/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isUndefined 3.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isweakmap/index.d.ts b/types/lodash.isweakmap/index.d.ts
index da7a801f7b..28dc1febf5 100644
--- a/types/lodash.isweakmap/index.d.ts
+++ b/types/lodash.isweakmap/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isWeakMap 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.isweakset/index.d.ts b/types/lodash.isweakset/index.d.ts
index aba0c5c1ea..72465044fd 100644
--- a/types/lodash.isweakset/index.d.ts
+++ b/types/lodash.isweakset/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.isWeakSet 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.iteratee/index.d.ts b/types/lodash.iteratee/index.d.ts
index bb4f570b04..29e1cc29fd 100644
--- a/types/lodash.iteratee/index.d.ts
+++ b/types/lodash.iteratee/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.iteratee 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.join/index.d.ts b/types/lodash.join/index.d.ts
index d3c396c919..7769af5a06 100644
--- a/types/lodash.join/index.d.ts
+++ b/types/lodash.join/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.join 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.kebabcase/index.d.ts b/types/lodash.kebabcase/index.d.ts
index 3ebd5c0bac..70ca258fe0 100644
--- a/types/lodash.kebabcase/index.d.ts
+++ b/types/lodash.kebabcase/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.kebabCase 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.keyby/index.d.ts b/types/lodash.keyby/index.d.ts
index cdfe5b371f..e02a4dd3f5 100644
--- a/types/lodash.keyby/index.d.ts
+++ b/types/lodash.keyby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.keyBy 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.keys/index.d.ts b/types/lodash.keys/index.d.ts
index c29e6dd6a2..177620ea0c 100644
--- a/types/lodash.keys/index.d.ts
+++ b/types/lodash.keys/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.keys 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.keysin/index.d.ts b/types/lodash.keysin/index.d.ts
index 3bae82e618..98dd57b500 100644
--- a/types/lodash.keysin/index.d.ts
+++ b/types/lodash.keysin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.keysIn 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.last/index.d.ts b/types/lodash.last/index.d.ts
index 40507c89a6..dc2fadedb3 100644
--- a/types/lodash.last/index.d.ts
+++ b/types/lodash.last/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.last 3.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.lastindexof/index.d.ts b/types/lodash.lastindexof/index.d.ts
index 0f4bd029d1..891d2ca084 100644
--- a/types/lodash.lastindexof/index.d.ts
+++ b/types/lodash.lastindexof/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.lastIndexOf 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.lowercase/index.d.ts b/types/lodash.lowercase/index.d.ts
index 8fd634dce9..05a5a0a20e 100644
--- a/types/lodash.lowercase/index.d.ts
+++ b/types/lodash.lowercase/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.lowerCase 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.lowerfirst/index.d.ts b/types/lodash.lowerfirst/index.d.ts
index ec21074bc8..05f3e6d760 100644
--- a/types/lodash.lowerfirst/index.d.ts
+++ b/types/lodash.lowerfirst/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.lowerFirst 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.lt/index.d.ts b/types/lodash.lt/index.d.ts
index 76e9f7232a..c9ef9da1b9 100644
--- a/types/lodash.lt/index.d.ts
+++ b/types/lodash.lt/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.lt 3.9
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.lte/index.d.ts b/types/lodash.lte/index.d.ts
index 5f41829f56..7361ef610e 100644
--- a/types/lodash.lte/index.d.ts
+++ b/types/lodash.lte/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.lte 3.9
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.mapkeys/index.d.ts b/types/lodash.mapkeys/index.d.ts
index 2da90122d3..145fe41b89 100644
--- a/types/lodash.mapkeys/index.d.ts
+++ b/types/lodash.mapkeys/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.mapKeys 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.mapvalues/index.d.ts b/types/lodash.mapvalues/index.d.ts
index c1c8339228..86fb63ed4d 100644
--- a/types/lodash.mapvalues/index.d.ts
+++ b/types/lodash.mapvalues/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.mapValues 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.matches/index.d.ts b/types/lodash.matches/index.d.ts
index 7825c18641..ebdc90e017 100644
--- a/types/lodash.matches/index.d.ts
+++ b/types/lodash.matches/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.matches 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.matchesproperty/index.d.ts b/types/lodash.matchesproperty/index.d.ts
index f507730b82..533656be56 100644
--- a/types/lodash.matchesproperty/index.d.ts
+++ b/types/lodash.matchesproperty/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.matchesProperty 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.max/index.d.ts b/types/lodash.max/index.d.ts
index 3082ad8431..99aa8e2ffc 100644
--- a/types/lodash.max/index.d.ts
+++ b/types/lodash.max/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.max 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.maxby/index.d.ts b/types/lodash.maxby/index.d.ts
index ad7950063a..9362902bf4 100644
--- a/types/lodash.maxby/index.d.ts
+++ b/types/lodash.maxby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.maxBy 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.mean/index.d.ts b/types/lodash.mean/index.d.ts
index 41d1e354db..2edd6adb1b 100644
--- a/types/lodash.mean/index.d.ts
+++ b/types/lodash.mean/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.mean 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.meanby/index.d.ts b/types/lodash.meanby/index.d.ts
index 3eee444d11..a4305a0560 100644
--- a/types/lodash.meanby/index.d.ts
+++ b/types/lodash.meanby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.meanBy 4.10
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.memoize/index.d.ts b/types/lodash.memoize/index.d.ts
index 415e831a9c..869ae4ba7d 100644
--- a/types/lodash.memoize/index.d.ts
+++ b/types/lodash.memoize/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.memoize 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.merge/index.d.ts b/types/lodash.merge/index.d.ts
index a4c293fda9..a757f0694e 100644
--- a/types/lodash.merge/index.d.ts
+++ b/types/lodash.merge/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.merge 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.mergewith/index.d.ts b/types/lodash.mergewith/index.d.ts
index 7a6eff8ac1..ea3ceda237 100644
--- a/types/lodash.mergewith/index.d.ts
+++ b/types/lodash.mergewith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.mergeWith 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.method/index.d.ts b/types/lodash.method/index.d.ts
index 1ca04640dd..6d36760961 100644
--- a/types/lodash.method/index.d.ts
+++ b/types/lodash.method/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.method 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.methodof/index.d.ts b/types/lodash.methodof/index.d.ts
index de42a138d7..057ef55108 100644
--- a/types/lodash.methodof/index.d.ts
+++ b/types/lodash.methodof/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.methodOf 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.min/index.d.ts b/types/lodash.min/index.d.ts
index 0aee524043..e8a613f17f 100644
--- a/types/lodash.min/index.d.ts
+++ b/types/lodash.min/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.min 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.minby/index.d.ts b/types/lodash.minby/index.d.ts
index d76ec94610..d9b6a58bfe 100644
--- a/types/lodash.minby/index.d.ts
+++ b/types/lodash.minby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.minBy 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.mixin/index.d.ts b/types/lodash.mixin/index.d.ts
index cb702b1640..ff0a8975da 100644
--- a/types/lodash.mixin/index.d.ts
+++ b/types/lodash.mixin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.mixin 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.negate/index.d.ts b/types/lodash.negate/index.d.ts
index aaf870172e..3043694532 100644
--- a/types/lodash.negate/index.d.ts
+++ b/types/lodash.negate/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.negate 3.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.noop/index.d.ts b/types/lodash.noop/index.d.ts
index 06d52fa333..30a76c63ce 100644
--- a/types/lodash.noop/index.d.ts
+++ b/types/lodash.noop/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.noop 3.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.now/index.d.ts b/types/lodash.now/index.d.ts
index a8fd64978a..1cb3ed1cea 100644
--- a/types/lodash.now/index.d.ts
+++ b/types/lodash.now/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.now 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.nth/index.d.ts b/types/lodash.nth/index.d.ts
index 106f634cab..5368fd7dee 100644
--- a/types/lodash.nth/index.d.ts
+++ b/types/lodash.nth/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.nth 4.11
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.ntharg/index.d.ts b/types/lodash.ntharg/index.d.ts
index 587f9418b6..d444e2cbee 100644
--- a/types/lodash.ntharg/index.d.ts
+++ b/types/lodash.ntharg/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.nthArg 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.omit/index.d.ts b/types/lodash.omit/index.d.ts
index 945fd29746..38d60f8538 100644
--- a/types/lodash.omit/index.d.ts
+++ b/types/lodash.omit/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.omit 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.omitby/index.d.ts b/types/lodash.omitby/index.d.ts
index 7e5ff364a0..5946e410ac 100644
--- a/types/lodash.omitby/index.d.ts
+++ b/types/lodash.omitby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.omitBy 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.once/index.d.ts b/types/lodash.once/index.d.ts
index cc1b543125..fbe506150b 100644
--- a/types/lodash.once/index.d.ts
+++ b/types/lodash.once/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.once 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.orderby/index.d.ts b/types/lodash.orderby/index.d.ts
index 4f44153aaf..2e8c5c5da4 100644
--- a/types/lodash.orderby/index.d.ts
+++ b/types/lodash.orderby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.orderBy 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.over/index.d.ts b/types/lodash.over/index.d.ts
index bd9622c09e..2d078c4853 100644
--- a/types/lodash.over/index.d.ts
+++ b/types/lodash.over/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.over 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.overargs/index.d.ts b/types/lodash.overargs/index.d.ts
index 014718136d..18b7024397 100644
--- a/types/lodash.overargs/index.d.ts
+++ b/types/lodash.overargs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.overArgs 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.overevery/index.d.ts b/types/lodash.overevery/index.d.ts
index 5c1c41e4c3..7ca277f428 100644
--- a/types/lodash.overevery/index.d.ts
+++ b/types/lodash.overevery/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.overEvery 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.oversome/index.d.ts b/types/lodash.oversome/index.d.ts
index 62debc56ed..abf71cb967 100644
--- a/types/lodash.oversome/index.d.ts
+++ b/types/lodash.oversome/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.overSome 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.pad/index.d.ts b/types/lodash.pad/index.d.ts
index a839afa7b8..516d851dec 100644
--- a/types/lodash.pad/index.d.ts
+++ b/types/lodash.pad/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.pad 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.padend/index.d.ts b/types/lodash.padend/index.d.ts
index 403eb20f4e..fdaf51da25 100644
--- a/types/lodash.padend/index.d.ts
+++ b/types/lodash.padend/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.padEnd 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.padstart/index.d.ts b/types/lodash.padstart/index.d.ts
index d7a53dc384..a91cd5339e 100644
--- a/types/lodash.padstart/index.d.ts
+++ b/types/lodash.padstart/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.padStart 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.parseint/index.d.ts b/types/lodash.parseint/index.d.ts
index a484898083..727c8d66c7 100644
--- a/types/lodash.parseint/index.d.ts
+++ b/types/lodash.parseint/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.parseInt 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.partial/index.d.ts b/types/lodash.partial/index.d.ts
index e359b2e88d..18d68aa00a 100644
--- a/types/lodash.partial/index.d.ts
+++ b/types/lodash.partial/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.partial 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.partialright/index.d.ts b/types/lodash.partialright/index.d.ts
index 9a611e74a4..b005408404 100644
--- a/types/lodash.partialright/index.d.ts
+++ b/types/lodash.partialright/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.partialRight 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.partition/index.d.ts b/types/lodash.partition/index.d.ts
index 00d4217734..8abce2b57f 100644
--- a/types/lodash.partition/index.d.ts
+++ b/types/lodash.partition/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.partition 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.pick/index.d.ts b/types/lodash.pick/index.d.ts
index df8123935c..e2f2df3d30 100644
--- a/types/lodash.pick/index.d.ts
+++ b/types/lodash.pick/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.pick 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.pickby/index.d.ts b/types/lodash.pickby/index.d.ts
index f645edf4af..fdf61e9468 100644
--- a/types/lodash.pickby/index.d.ts
+++ b/types/lodash.pickby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.pickBy 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.property/index.d.ts b/types/lodash.property/index.d.ts
index db33432a2b..0701c0ef8b 100644
--- a/types/lodash.property/index.d.ts
+++ b/types/lodash.property/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.property 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.propertyof/index.d.ts b/types/lodash.propertyof/index.d.ts
index bc577bb158..5c22792ce8 100644
--- a/types/lodash.propertyof/index.d.ts
+++ b/types/lodash.propertyof/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.propertyOf 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.pull/index.d.ts b/types/lodash.pull/index.d.ts
index ea8d9ce465..c9f543ff15 100644
--- a/types/lodash.pull/index.d.ts
+++ b/types/lodash.pull/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.pull 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.pullall/index.d.ts b/types/lodash.pullall/index.d.ts
index ab0bf70f99..7cce80257d 100644
--- a/types/lodash.pullall/index.d.ts
+++ b/types/lodash.pullall/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.pullAll 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.pullallby/index.d.ts b/types/lodash.pullallby/index.d.ts
index 95e3faf7b1..77adee2864 100644
--- a/types/lodash.pullallby/index.d.ts
+++ b/types/lodash.pullallby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.pullAllBy 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.pullallwith/index.d.ts b/types/lodash.pullallwith/index.d.ts
index b7ef8fe66d..f11192ffbe 100644
--- a/types/lodash.pullallwith/index.d.ts
+++ b/types/lodash.pullallwith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.pullAllWith 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.pullat/index.d.ts b/types/lodash.pullat/index.d.ts
index d27e13e939..4b04d54fac 100644
--- a/types/lodash.pullat/index.d.ts
+++ b/types/lodash.pullat/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.pullAt 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.random/index.d.ts b/types/lodash.random/index.d.ts
index 88faece9b8..48147b1b5a 100644
--- a/types/lodash.random/index.d.ts
+++ b/types/lodash.random/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.random 3.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.range/index.d.ts b/types/lodash.range/index.d.ts
index 63471fc4b7..9ca85ee30c 100644
--- a/types/lodash.range/index.d.ts
+++ b/types/lodash.range/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.range 3.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.rangeright/index.d.ts b/types/lodash.rangeright/index.d.ts
index a9db5fc861..f17168e479 100644
--- a/types/lodash.rangeright/index.d.ts
+++ b/types/lodash.rangeright/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.rangeRight 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.rearg/index.d.ts b/types/lodash.rearg/index.d.ts
index 4e66aa6a78..bdde2bd4af 100644
--- a/types/lodash.rearg/index.d.ts
+++ b/types/lodash.rearg/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.rearg 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.reduce/index.d.ts b/types/lodash.reduce/index.d.ts
index 959385250f..f7f58198eb 100644
--- a/types/lodash.reduce/index.d.ts
+++ b/types/lodash.reduce/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.reduce 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.reduceright/index.d.ts b/types/lodash.reduceright/index.d.ts
index 81fa92950a..4fc2a4d54a 100644
--- a/types/lodash.reduceright/index.d.ts
+++ b/types/lodash.reduceright/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.reduceRight 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.reject/index.d.ts b/types/lodash.reject/index.d.ts
index 2b6ba750f4..b183695eec 100644
--- a/types/lodash.reject/index.d.ts
+++ b/types/lodash.reject/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.reject 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.remove/index.d.ts b/types/lodash.remove/index.d.ts
index a600613fac..449e9d62de 100644
--- a/types/lodash.remove/index.d.ts
+++ b/types/lodash.remove/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.remove 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.repeat/index.d.ts b/types/lodash.repeat/index.d.ts
index f589dcf17c..fcd29d00f0 100644
--- a/types/lodash.repeat/index.d.ts
+++ b/types/lodash.repeat/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.repeat 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.replace/index.d.ts b/types/lodash.replace/index.d.ts
index 029c35d7b4..b3421ff41a 100644
--- a/types/lodash.replace/index.d.ts
+++ b/types/lodash.replace/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.replace 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.rest/index.d.ts b/types/lodash.rest/index.d.ts
index 9037abfcdb..bcc5c5e083 100644
--- a/types/lodash.rest/index.d.ts
+++ b/types/lodash.rest/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.rest 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.result/index.d.ts b/types/lodash.result/index.d.ts
index 096fe0cc48..684c213eea 100644
--- a/types/lodash.result/index.d.ts
+++ b/types/lodash.result/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.result 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.reverse/index.d.ts b/types/lodash.reverse/index.d.ts
index 7633952e42..72dbe9e2fe 100644
--- a/types/lodash.reverse/index.d.ts
+++ b/types/lodash.reverse/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.reverse 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.round/index.d.ts b/types/lodash.round/index.d.ts
index 12a4b6770b..7311d157ce 100644
--- a/types/lodash.round/index.d.ts
+++ b/types/lodash.round/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.round 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.sample/index.d.ts b/types/lodash.sample/index.d.ts
index ca1331a292..2eb8119f0e 100644
--- a/types/lodash.sample/index.d.ts
+++ b/types/lodash.sample/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.sample 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.samplesize/index.d.ts b/types/lodash.samplesize/index.d.ts
index 64574c1b0a..1df16efad5 100644
--- a/types/lodash.samplesize/index.d.ts
+++ b/types/lodash.samplesize/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.sampleSize 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.set/index.d.ts b/types/lodash.set/index.d.ts
index b94a5a8912..686e1588bc 100644
--- a/types/lodash.set/index.d.ts
+++ b/types/lodash.set/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.set 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.setwith/index.d.ts b/types/lodash.setwith/index.d.ts
index 6324d2ed60..b61d8ae119 100644
--- a/types/lodash.setwith/index.d.ts
+++ b/types/lodash.setwith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.setWith 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.shuffle/index.d.ts b/types/lodash.shuffle/index.d.ts
index 722a855e06..d9374b5072 100644
--- a/types/lodash.shuffle/index.d.ts
+++ b/types/lodash.shuffle/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.shuffle 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.size/index.d.ts b/types/lodash.size/index.d.ts
index 1c26366438..18c18eeced 100644
--- a/types/lodash.size/index.d.ts
+++ b/types/lodash.size/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.size 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.slice/index.d.ts b/types/lodash.slice/index.d.ts
index 1c3063e813..c2381806b5 100644
--- a/types/lodash.slice/index.d.ts
+++ b/types/lodash.slice/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.slice 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.snakecase/index.d.ts b/types/lodash.snakecase/index.d.ts
index c0eb9e2892..7b468103ae 100644
--- a/types/lodash.snakecase/index.d.ts
+++ b/types/lodash.snakecase/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.snakeCase 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.some/index.d.ts b/types/lodash.some/index.d.ts
index dd4b5a6393..9fb21515a8 100644
--- a/types/lodash.some/index.d.ts
+++ b/types/lodash.some/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.some 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.sortby/index.d.ts b/types/lodash.sortby/index.d.ts
index 2f5c9c3859..14de9ae556 100644
--- a/types/lodash.sortby/index.d.ts
+++ b/types/lodash.sortby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.sortBy 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.sortedindex/index.d.ts b/types/lodash.sortedindex/index.d.ts
index 85a996c023..23a331e64a 100644
--- a/types/lodash.sortedindex/index.d.ts
+++ b/types/lodash.sortedindex/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.sortedIndex 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.sortedindexby/index.d.ts b/types/lodash.sortedindexby/index.d.ts
index d4453c2d5c..6fa690eb63 100644
--- a/types/lodash.sortedindexby/index.d.ts
+++ b/types/lodash.sortedindexby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.sortedIndexBy 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.sortedindexof/index.d.ts b/types/lodash.sortedindexof/index.d.ts
index 7a6ccf1a1c..1905dc923c 100644
--- a/types/lodash.sortedindexof/index.d.ts
+++ b/types/lodash.sortedindexof/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.sortedIndexOf 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.sortedlastindex/index.d.ts b/types/lodash.sortedlastindex/index.d.ts
index 42cfe82665..8759590288 100644
--- a/types/lodash.sortedlastindex/index.d.ts
+++ b/types/lodash.sortedlastindex/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.sortedLastIndex 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.sortedlastindexby/index.d.ts b/types/lodash.sortedlastindexby/index.d.ts
index b65e41a423..d513d18674 100644
--- a/types/lodash.sortedlastindexby/index.d.ts
+++ b/types/lodash.sortedlastindexby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.sortedLastIndexBy 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.sortedlastindexof/index.d.ts b/types/lodash.sortedlastindexof/index.d.ts
index 0da507fa35..14d5656d62 100644
--- a/types/lodash.sortedlastindexof/index.d.ts
+++ b/types/lodash.sortedlastindexof/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.sortedLastIndexOf 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.sorteduniq/index.d.ts b/types/lodash.sorteduniq/index.d.ts
index c192b0194b..04af0325a0 100644
--- a/types/lodash.sorteduniq/index.d.ts
+++ b/types/lodash.sorteduniq/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.sortedUniq 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.sorteduniqby/index.d.ts b/types/lodash.sorteduniqby/index.d.ts
index b21474755b..26c838a01d 100644
--- a/types/lodash.sorteduniqby/index.d.ts
+++ b/types/lodash.sorteduniqby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.sortedUniqBy 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.split/index.d.ts b/types/lodash.split/index.d.ts
index 0f67699d83..5400e2345a 100644
--- a/types/lodash.split/index.d.ts
+++ b/types/lodash.split/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.split 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.spread/index.d.ts b/types/lodash.spread/index.d.ts
index d9f630fe18..d96b12d1ba 100644
--- a/types/lodash.spread/index.d.ts
+++ b/types/lodash.spread/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.spread 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.startcase/index.d.ts b/types/lodash.startcase/index.d.ts
index b984bd7def..2c00230290 100644
--- a/types/lodash.startcase/index.d.ts
+++ b/types/lodash.startcase/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.startCase 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.startswith/index.d.ts b/types/lodash.startswith/index.d.ts
index 41bab99c58..fbd92b4c40 100644
--- a/types/lodash.startswith/index.d.ts
+++ b/types/lodash.startswith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.startsWith 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.subtract/index.d.ts b/types/lodash.subtract/index.d.ts
index 32869bb8e5..676efb6f17 100644
--- a/types/lodash.subtract/index.d.ts
+++ b/types/lodash.subtract/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.subtract 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.sum/index.d.ts b/types/lodash.sum/index.d.ts
index cf041f00b3..b19d67a4ce 100644
--- a/types/lodash.sum/index.d.ts
+++ b/types/lodash.sum/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.sum 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.sumby/index.d.ts b/types/lodash.sumby/index.d.ts
index c4e6e8bbd1..a5f6ac015a 100644
--- a/types/lodash.sumby/index.d.ts
+++ b/types/lodash.sumby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.sumBy 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.tail/index.d.ts b/types/lodash.tail/index.d.ts
index cababa89cc..51c89ef6b9 100644
--- a/types/lodash.tail/index.d.ts
+++ b/types/lodash.tail/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.tail 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.take/index.d.ts b/types/lodash.take/index.d.ts
index 4e63eb0fda..dffe621124 100644
--- a/types/lodash.take/index.d.ts
+++ b/types/lodash.take/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.take 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.takeright/index.d.ts b/types/lodash.takeright/index.d.ts
index 7459b3c1da..637926a744 100644
--- a/types/lodash.takeright/index.d.ts
+++ b/types/lodash.takeright/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.takeRight 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.takerightwhile/index.d.ts b/types/lodash.takerightwhile/index.d.ts
index bd689ec0c6..376124310a 100644
--- a/types/lodash.takerightwhile/index.d.ts
+++ b/types/lodash.takerightwhile/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.takeRightWhile 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.takewhile/index.d.ts b/types/lodash.takewhile/index.d.ts
index d38f753408..8e5e2958b5 100644
--- a/types/lodash.takewhile/index.d.ts
+++ b/types/lodash.takewhile/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.takeWhile 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.template/index.d.ts b/types/lodash.template/index.d.ts
index 1631671432..9060d5e979 100644
--- a/types/lodash.template/index.d.ts
+++ b/types/lodash.template/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.template 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.throttle/index.d.ts b/types/lodash.throttle/index.d.ts
index fa727a83e8..0e5e2c3d79 100644
--- a/types/lodash.throttle/index.d.ts
+++ b/types/lodash.throttle/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.throttle 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.times/index.d.ts b/types/lodash.times/index.d.ts
index 15f34ce730..dfbfcb0425 100644
--- a/types/lodash.times/index.d.ts
+++ b/types/lodash.times/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.times 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.toarray/index.d.ts b/types/lodash.toarray/index.d.ts
index f4046569c4..ea13431aa1 100644
--- a/types/lodash.toarray/index.d.ts
+++ b/types/lodash.toarray/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.toArray 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.tofinite/index.d.ts b/types/lodash.tofinite/index.d.ts
index f15e09f061..5639c9ba0f 100644
--- a/types/lodash.tofinite/index.d.ts
+++ b/types/lodash.tofinite/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.toFinite 4.12
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.tointeger/index.d.ts b/types/lodash.tointeger/index.d.ts
index 4f2da6588d..d662ff0695 100644
--- a/types/lodash.tointeger/index.d.ts
+++ b/types/lodash.tointeger/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.toInteger 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.tolength/index.d.ts b/types/lodash.tolength/index.d.ts
index 2895322b86..a198d6cb5f 100644
--- a/types/lodash.tolength/index.d.ts
+++ b/types/lodash.tolength/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.toLength 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.tolower/index.d.ts b/types/lodash.tolower/index.d.ts
index 442a460251..a056bef4ae 100644
--- a/types/lodash.tolower/index.d.ts
+++ b/types/lodash.tolower/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.toLower 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.tonumber/index.d.ts b/types/lodash.tonumber/index.d.ts
index b81b2a825a..85587a3563 100644
--- a/types/lodash.tonumber/index.d.ts
+++ b/types/lodash.tonumber/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.toNumber 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.topairs/index.d.ts b/types/lodash.topairs/index.d.ts
index 9c63367ea0..dec1a83e18 100644
--- a/types/lodash.topairs/index.d.ts
+++ b/types/lodash.topairs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.toPairs 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.topairsin/index.d.ts b/types/lodash.topairsin/index.d.ts
index 4cba676436..580cd15f14 100644
--- a/types/lodash.topairsin/index.d.ts
+++ b/types/lodash.topairsin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.toPairsIn 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.topath/index.d.ts b/types/lodash.topath/index.d.ts
index 72dbf5bb70..5778b4a5a8 100644
--- a/types/lodash.topath/index.d.ts
+++ b/types/lodash.topath/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.toPath 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.toplainobject/index.d.ts b/types/lodash.toplainobject/index.d.ts
index 1c9d08f979..26f7eb62b3 100644
--- a/types/lodash.toplainobject/index.d.ts
+++ b/types/lodash.toplainobject/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.toPlainObject 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.tosafeinteger/index.d.ts b/types/lodash.tosafeinteger/index.d.ts
index fdf18d94f2..5429fe3a24 100644
--- a/types/lodash.tosafeinteger/index.d.ts
+++ b/types/lodash.tosafeinteger/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.toSafeInteger 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.tostring/index.d.ts b/types/lodash.tostring/index.d.ts
index 9b11dbd864..d7aec37cf9 100644
--- a/types/lodash.tostring/index.d.ts
+++ b/types/lodash.tostring/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.toString 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.toupper/index.d.ts b/types/lodash.toupper/index.d.ts
index 5f40e81f49..a19a7f2293 100644
--- a/types/lodash.toupper/index.d.ts
+++ b/types/lodash.toupper/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.toUpper 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.transform/index.d.ts b/types/lodash.transform/index.d.ts
index 07ebf4dc0b..524dcce29d 100644
--- a/types/lodash.transform/index.d.ts
+++ b/types/lodash.transform/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.transform 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.trim/index.d.ts b/types/lodash.trim/index.d.ts
index e5af08651b..634b4f5843 100644
--- a/types/lodash.trim/index.d.ts
+++ b/types/lodash.trim/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.trim 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.trimend/index.d.ts b/types/lodash.trimend/index.d.ts
index cad13c3d63..5931c425c1 100644
--- a/types/lodash.trimend/index.d.ts
+++ b/types/lodash.trimend/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.trimEnd 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.trimstart/index.d.ts b/types/lodash.trimstart/index.d.ts
index 2254f4304f..6e9ff19aae 100644
--- a/types/lodash.trimstart/index.d.ts
+++ b/types/lodash.trimstart/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.trimStart 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.truncate/index.d.ts b/types/lodash.truncate/index.d.ts
index 6b121e1bb0..640143ae7d 100644
--- a/types/lodash.truncate/index.d.ts
+++ b/types/lodash.truncate/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.truncate 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.unary/index.d.ts b/types/lodash.unary/index.d.ts
index bc884ea223..c1cab16bf4 100644
--- a/types/lodash.unary/index.d.ts
+++ b/types/lodash.unary/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.unary 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.unescape/index.d.ts b/types/lodash.unescape/index.d.ts
index 0405506765..1a6c126529 100644
--- a/types/lodash.unescape/index.d.ts
+++ b/types/lodash.unescape/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.unescape 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.union/index.d.ts b/types/lodash.union/index.d.ts
index 11ec95f768..f8e1c3982b 100644
--- a/types/lodash.union/index.d.ts
+++ b/types/lodash.union/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.union 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.unionby/index.d.ts b/types/lodash.unionby/index.d.ts
index 9f3c35288d..ec59f1b5c6 100644
--- a/types/lodash.unionby/index.d.ts
+++ b/types/lodash.unionby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.unionBy 4.8
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.unionwith/index.d.ts b/types/lodash.unionwith/index.d.ts
index c70a5f1e98..a724b6ed00 100644
--- a/types/lodash.unionwith/index.d.ts
+++ b/types/lodash.unionwith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.unionWith 4.6
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.uniq/index.d.ts b/types/lodash.uniq/index.d.ts
index eaf546733c..d3fcc99bf8 100644
--- a/types/lodash.uniq/index.d.ts
+++ b/types/lodash.uniq/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.uniq 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.uniqby/index.d.ts b/types/lodash.uniqby/index.d.ts
index 909655b16e..fdf318f2cc 100644
--- a/types/lodash.uniqby/index.d.ts
+++ b/types/lodash.uniqby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.uniqBy 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.uniqueid/index.d.ts b/types/lodash.uniqueid/index.d.ts
index 1804767b5d..f0b38f23ed 100644
--- a/types/lodash.uniqueid/index.d.ts
+++ b/types/lodash.uniqueid/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.uniqueId 4.0
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.uniqwith/index.d.ts b/types/lodash.uniqwith/index.d.ts
index 501276eeae..65f00cc772 100644
--- a/types/lodash.uniqwith/index.d.ts
+++ b/types/lodash.uniqwith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.uniqWith 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.unset/index.d.ts b/types/lodash.unset/index.d.ts
index e23af76a42..4308337560 100644
--- a/types/lodash.unset/index.d.ts
+++ b/types/lodash.unset/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.unset 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.unzip/index.d.ts b/types/lodash.unzip/index.d.ts
index d227c85725..a0d6e933c1 100644
--- a/types/lodash.unzip/index.d.ts
+++ b/types/lodash.unzip/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.unzip 3.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.unzipwith/index.d.ts b/types/lodash.unzipwith/index.d.ts
index 548451e15d..0f95c0377f 100644
--- a/types/lodash.unzipwith/index.d.ts
+++ b/types/lodash.unzipwith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.unzipWith 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.update/index.d.ts b/types/lodash.update/index.d.ts
index 9eee12bc18..165804f25f 100644
--- a/types/lodash.update/index.d.ts
+++ b/types/lodash.update/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.update 4.10
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.updatewith/index.d.ts b/types/lodash.updatewith/index.d.ts
index 4d74417a57..3ae0594188 100644
--- a/types/lodash.updatewith/index.d.ts
+++ b/types/lodash.updatewith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.updateWith 4.10
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.uppercase/index.d.ts b/types/lodash.uppercase/index.d.ts
index fa5aadcfcc..fb25f87be6 100644
--- a/types/lodash.uppercase/index.d.ts
+++ b/types/lodash.uppercase/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.upperCase 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.upperfirst/index.d.ts b/types/lodash.upperfirst/index.d.ts
index 6dc6737ae3..f58a6853f3 100644
--- a/types/lodash.upperfirst/index.d.ts
+++ b/types/lodash.upperfirst/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.upperFirst 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.values/index.d.ts b/types/lodash.values/index.d.ts
index 532dcc62c7..9bba06f1a2 100644
--- a/types/lodash.values/index.d.ts
+++ b/types/lodash.values/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.values 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.valuesin/index.d.ts b/types/lodash.valuesin/index.d.ts
index 0a9640af4e..3da65eabb7 100644
--- a/types/lodash.valuesin/index.d.ts
+++ b/types/lodash.valuesin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.valuesIn 4.3
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.without/index.d.ts b/types/lodash.without/index.d.ts
index b0670dd01f..624fdd8918 100644
--- a/types/lodash.without/index.d.ts
+++ b/types/lodash.without/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.without 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.words/index.d.ts b/types/lodash.words/index.d.ts
index a16a995921..304f7c3145 100644
--- a/types/lodash.words/index.d.ts
+++ b/types/lodash.words/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.words 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.wrap/index.d.ts b/types/lodash.wrap/index.d.ts
index 6117d407c6..410c955027 100644
--- a/types/lodash.wrap/index.d.ts
+++ b/types/lodash.wrap/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.wrap 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.xor/index.d.ts b/types/lodash.xor/index.d.ts
index 9874aaa7da..0426670d24 100644
--- a/types/lodash.xor/index.d.ts
+++ b/types/lodash.xor/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.xor 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.xorby/index.d.ts b/types/lodash.xorby/index.d.ts
index 1e68620ffc..d1ebbbd9fa 100644
--- a/types/lodash.xorby/index.d.ts
+++ b/types/lodash.xorby/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.xorBy 4.7
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.xorwith/index.d.ts b/types/lodash.xorwith/index.d.ts
index 639ecbc496..6adaa16d35 100644
--- a/types/lodash.xorwith/index.d.ts
+++ b/types/lodash.xorwith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.xorWith 4.5
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.zip/index.d.ts b/types/lodash.zip/index.d.ts
index dc6bab3162..3ad6804c4f 100644
--- a/types/lodash.zip/index.d.ts
+++ b/types/lodash.zip/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.zip 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.zipobject/index.d.ts b/types/lodash.zipobject/index.d.ts
index 529d362a5b..a4c0d0e444 100644
--- a/types/lodash.zipobject/index.d.ts
+++ b/types/lodash.zipobject/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.zipObject 4.1
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.zipobjectdeep/index.d.ts b/types/lodash.zipobjectdeep/index.d.ts
index 39e7f389fe..b942a3e4c6 100644
--- a/types/lodash.zipobjectdeep/index.d.ts
+++ b/types/lodash.zipobjectdeep/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.zipObjectDeep 4.4
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash.zipwith/index.d.ts b/types/lodash.zipwith/index.d.ts
index 5cd0f33de8..39c39005d7 100644
--- a/types/lodash.zipwith/index.d.ts
+++ b/types/lodash.zipwith/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lodash.zipWith 4.2
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/lodash/index.d.ts b/types/lodash/index.d.ts
index 95228b8c29..94cabd0f37 100644
--- a/types/lodash/index.d.ts
+++ b/types/lodash/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Lo-Dash 4.14
-// Project: http://lodash.com/
+// Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>,
 //                 Ilya Mochalov <https://github.com/chrootsu>,
 //                 Stepan Mikhaylyuk <https://github.com/stepancar>,
diff --git a/types/loglevel/index.d.ts b/types/loglevel/index.d.ts
index 3ad9faf707..64eee88aa6 100644
--- a/types/loglevel/index.d.ts
+++ b/types/loglevel/index.d.ts
@@ -6,7 +6,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-declare var log: log.Logger;
+declare var log: log.DefaultLogger;
 export as namespace log;
 export = log;
 
@@ -44,6 +44,30 @@ declare namespace log {
 
     type MethodFactory = (methodName: string, level: LogLevelNumbers, loggerName: string) => LoggingMethod;
 
+    interface DefaultLogger extends Logger {
+        /**
+         * If you're using another JavaScript library that exposes a 'log' global, you can run into conflicts with loglevel.
+         * Similarly to jQuery, you can solve this by putting loglevel into no-conflict mode immediately after it is loaded
+         * onto the page. This resets to 'log' global to its value before loglevel was loaded (typically undefined), and
+         * returns the loglevel object, which you can then bind to another name yourself.
+         */
+        noConflict(): any;
+
+        /**
+         * This gets you a new logger object that works exactly like the root log object, but can have its level and
+         * logging methods set independently. All loggers must have a name (which is a non-empty string). Calling
+         * getLogger() multiple times with the same name will return an identical logger object.
+         * In large applications, it can be incredibly useful to turn logging on and off for particular modules as you are
+         * working with them. Using the getLogger() method lets you create a separate logger for each part of your
+         * application with its own logging level. Likewise, for small, independent modules, using a named logger instead
+         * of the default root logger allows developers using your module to selectively turn on deep, trace-level logging
+         * when trying to debug problems, while logging only errors or silencing logging altogether under normal
+         * circumstances.
+         * @param name The name of the produced logger
+         */
+        getLogger(name: string): Logger;
+    }
+
     interface Logger {
         /**
          * Available log levels.
@@ -105,14 +129,6 @@ declare namespace log {
          */
         setLevel(level: LogLevelDesc, persist?: boolean): void;
 
-        /**
-         * If you're using another JavaScript library that exposes a 'log' global, you can run into conflicts with loglevel.
-         * Similarly to jQuery, you can solve this by putting loglevel into no-conflict mode immediately after it is loaded
-         * onto the page. This resets to 'log' global to its value before loglevel was loaded (typically undefined), and
-         * returns the loglevel object, which you can then bind to another name yourself.
-         */
-        noConflict(): any;
-
         /**
          * Returns the current logging level, as a value from LogLevel.
          * It's very unlikely you'll need to use this for normal application logging; it's provided partly to help plugin
@@ -137,20 +153,6 @@ declare namespace log {
          */
         setDefaultLevel(level: LogLevelDesc): void;
 
-        /**
-         * This gets you a new logger object that works exactly like the root log object, but can have its level and
-         * logging methods set independently. All loggers must have a name (which is a non-empty string). Calling
-         * getLogger() multiple times with the same name will return an identical logger object.
-         * In large applications, it can be incredibly useful to turn logging on and off for particular modules as you are
-         * working with them. Using the getLogger() method lets you create a separate logger for each part of your
-         * application with its own logging level. Likewise, for small, independent modules, using a named logger instead
-         * of the default root logger allows developers using your module to selectively turn on deep, trace-level logging
-         * when trying to debug problems, while logging only errors or silencing logging altogether under normal
-         * circumstances.
-         * @param name The name of the produced logger
-         */
-        getLogger(name: string): Logger;
-
         /**
          * This enables all log messages, and is equivalent to log.setLevel("trace").
          *
diff --git a/types/lolex/index.d.ts b/types/lolex/index.d.ts
index 1727c97ad3..35c4880a5b 100644
--- a/types/lolex/index.d.ts
+++ b/types/lolex/index.d.ts
@@ -1,10 +1,76 @@
-// Type definitions for lolex 2.1
+// Type definitions for lolex 3
 // Project: https://github.com/sinonjs/lolex
 // Definitions by: Wim Looman <https://github.com/Nemo157>
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>
 //                 Rogier Schouten <https://github.com/rogierschouten>
+//                 Yishai Zehavi <https://github.com/zyishai>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/**
+ * Names of clock methods that may be faked by install.
+ */
+type FakeMethod = "setTimeout" | "clearTimeout" | "setImmediate" | "clearImmediate" | "setInterval" | "clearInterval" | "Date" | "nextTick" | "hrtime";
+
+/**
+ * Global methods avaliable to every clock and also as standalone methods (inside `timers` global object).
+ */
+export interface GlobalTimers<TTimerId extends TimerId> {
+    /**
+     * Schedules a callback to be fired once timeout milliseconds have ticked by.
+     *
+     * @param callback   Callback to be fired.
+     * @param timeout   How many ticks to wait to run the callback.
+     * @param args   Any extra arguments to pass to the callback.
+     * @returns Time identifier for cancellation.
+     */
+    setTimeout: (callback: () => void, timeout: number, ...args: any[]) => TTimerId;
+
+    /**
+     * Clears a timer, as long as it was created using setTimeout.
+     *
+     * @param id   Timer ID or object.
+     */
+    clearTimeout: (id: TimerId) => void;
+
+    /**
+     * Schedules a callback to be fired every time timeout milliseconds have ticked by.
+     *
+     * @param callback   Callback to be fired.
+     * @param timeout   How many ticks to wait between callbacks.
+     * @param args   Any extra arguments to pass to the callback.
+     * @returns Time identifier for cancellation.
+     */
+    setInterval: (callback: () => void, timeout: number, ...args: any[]) => TTimerId;
+
+    /**
+     * Clears a timer, as long as it was created using setInterval.
+     *
+     * @param id   Timer ID or object.
+     */
+    clearInterval: (id: TTimerId) => void;
+
+    /**
+     * Schedules the callback to be fired once 0 milliseconds have ticked by.
+     *
+     * @param callback   Callback to be fired.
+     * @remarks You'll still have to call clock.tick() for the callback to fire.
+     * @remarks If called during a tick the callback won't fire until 1 millisecond has ticked by.
+     */
+    setImmediate: (callback: () => void) => TTimerId;
+
+    /**
+     * Clears a timer, as long as it was created using setImmediate.
+     *
+     * @param id   Timer ID or object.
+     */
+    clearImmediate: (id: TTimerId) => void;
+
+    /**
+     * Implements the Date object but using this clock to provide the correct time.
+     */
+    Date: typeof Date;
+}
+
 /**
  * Timer object used in node.
  */
@@ -25,102 +91,47 @@ export interface NodeTimer {
  */
 export type TimerId = number | NodeTimer;
 
-/**
- * Lolex clock for a browser environment.
- */
-type BrowserClock = LolexClock<number>;
-
-/**
- * Lolex clock for a Node environment.
- */
-type NodeClock = LolexClock<NodeTimer> & {
-    /**
-     * Mimicks process.hrtime().
-     *
-     * @param prevTime   Previous system time to calculate time elapsed.
-     * @returns High resolution real time as [seconds, nanoseconds].
-     */
-    hrtime(prevTime?: [number, number]): [number, number];
-};
-
-/**
- * Clock object created by lolex.
- */
-type Clock = BrowserClock | NodeClock;
-
-/**
- * Names of clock methods that may be faked by install.
- */
-type FakeMethod = "setTimeout" | "clearTimeout" | "setImmediate" | "clearImmediate" | "setInterval" | "clearInterval" | "Date" | "nextTick" | "hrtime";
-
 /**
  * Controls the flow of time.
  */
-export interface LolexClock<TTimerId extends TimerId> {
+export interface LolexClock<TTimerId extends TimerId> extends GlobalTimers<TTimerId> {
     /**
      * Current clock time.
      */
     now: number;
 
     /**
-     * Implements the Date object but using this clock to provide the correct time.
+     * Don't know what this prop is for, but it was included in the clocks that `createClock` or
+     * `install` return (it is never used in the code, for now).
      */
-    Date: typeof Date;
+    timeouts: {};
 
     /**
-     * Schedules a callback to be fired once timeout milliseconds have ticked by.
+     * Maximum number of timers that will be run when calling runAll().
+     */
+    loopLimit: number;
+
+    /**
+     * Schedule callback to run in the next animation frame.
      *
      * @param callback   Callback to be fired.
-     * @param timeout   How many ticks to wait to run the callback.
-     * @param args   Any extra arguments to pass to the callback.
-     * @returns Time identifier for cancellation.
+     * @returns Request id.
      */
-    setTimeout: (callback: () => any, timeout: number, ...args: any[]) => TTimerId;
+    requestAnimationFrame: (callback: (time: number) => void) => TTimerId;
 
     /**
-     * Clears a timer, as long as it was created using setTimeout.
+     * Cancel animation frame request.
      *
-     * @param id   Timer ID or object.
+     * @param id   The id returned from requestAnimationFrame method.
      */
-    clearTimeout: (id: TTimerId) => void;
+    cancelAnimationFrame: (id: TTimerId) => void;
 
-    /**
-     * Schedules a callback to be fired every time timeout milliseconds have ticked by.
-     *
-     * @param callback   Callback to be fired.
-     * @param timeout   How many ticks to wait between callbacks.
-     * @param args   Any extra arguments to pass to the callback.
-     * @returns Time identifier for cancellation.
-     */
-    setInterval: (callback: () => any, timeout: number, ...args: any[]) => TTimerId;
-
-    /**
-     * Clears a timer, as long as it was created using setInterval.
-     *
-     * @param id   Timer ID or object.
-     */
-    clearInterval: (id: TTimerId) => void;
-
-    /**
-     * Schedules the callback to be fired once 0 milliseconds have ticked by.
-     *
-     * @param callback   Callback to be fired.
-     * @remarks You'll still have to call clock.tick() for the callback to fire.
-     * @remarks If called during a tick the callback won't fire until 1 millisecond has ticked by.
-     */
-    setImmediate: (callback: () => any) => TTimerId;
-
-    /**
-     * Clears a timer, as long as it was created using setImmediate.
-     *
-     * @param id   Timer ID or object.
-     */
-    clearImmediate: (id: TTimerId) => void;
-
-    /**
-     * Simulates process.nextTick();
-     */
-    nextTick: (callback: () => void) => void;
+	/**
+	 * Get the number of waiting timers.
+	 *
+	 * @returns number of waiting timers.
+	 */
+	countTimers: () => number;
 
     /**
      * Advances the clock to the the moment of the first scheduled timer, firing it.
@@ -134,6 +145,11 @@ export interface LolexClock<TTimerId extends TimerId> {
      */
     tick: (time: number | string) => void;
 
+    /**
+     * Removes all timers and tick without firing them and restore now to its original value.
+     */
+    reset: () => void;
+
     /**
      * Runs all pending timers until there are none remaining.
      *
@@ -141,6 +157,11 @@ export interface LolexClock<TTimerId extends TimerId> {
      */
     runAll: () => void;
 
+	/**
+	 * Advanced the clock to the next animation frame while firing all scheduled callbacks.
+	 */
+	runToFrame: () => void;
+
     /**
      * Takes note of the last scheduled timer when it is run, and advances the clock to
      * that time firing callbacks as necessary.
@@ -154,13 +175,72 @@ export interface LolexClock<TTimerId extends TimerId> {
      * @remarks This affects the current time but it does not in itself cause timers to fire.
      */
     setSystemTime: (now?: number | Date) => void;
+}
 
+/**
+ * Lolex clock for a browser environment.
+ */
+type BrowserClock = LolexClock<number> & {
+    /**
+     * Mimics performance.now().
+     */
+    performance: {
+        now: () => number;
+    }
+};
+
+/**
+ * Lolex clock for a Node environment.
+ */
+type NodeClock = LolexClock<NodeTimer> & {
+    /**
+     * Mimicks process.hrtime().
+     *
+     * @param prevTime   Previous system time to calculate time elapsed.
+     * @returns High resolution real time as [seconds, nanoseconds].
+     */
+    hrtime(prevTime?: [number, number]): [number, number];
+
+    /**
+     * Mimics process.nextTick() explicitly dropping additional arguments.
+     */
+    queueMicrotask: (callback: () => void) => void;
+
+    /**
+     * Simulates process.nextTick().
+     */
+    nextTick: (callback: () => void) => void;
+
+    /**
+	 * Run all pending microtasks scheduled with nextTick.
+	 */
+    runMicrotasks: () => void;
+};
+
+/**
+ * Clock object created by lolex.
+ */
+type Clock = BrowserClock | NodeClock;
+
+/**
+ * Additional methods that installed clock have.
+ */
+type InstalledMethods = {
     /**
      * Restores the original methods on the context that was passed to lolex.install,
      * or the native timers if no context was given.
      */
     uninstall: () => void;
-}
+
+    methods: FakeMethod[];
+};
+
+/**
+ * Clock object created by calling `install();`.
+ *
+ * @type TClock   type of base clock (e.g BrowserClock).
+ */
+type InstalledClock<TClock extends Clock> = TClock & InstalledMethods;
 
 /**
  * Creates a clock.
@@ -174,7 +254,6 @@ export interface LolexClock<TTimerId extends TimerId> {
  */
 export declare function createClock<TClock extends Clock>(now?: number | Date, loopLimit?: number): TClock;
 
-
 export interface LolexInstallOpts {
     /**
      * Installs lolex onto the specified target context (default: global)
@@ -217,4 +296,20 @@ export interface LolexInstallOpts {
  * @param toFake   Names of methods that should be faked.
  * @type TClock   Type of clock to create.
  */
-export declare function install<TClock extends Clock>(opts?: LolexInstallOpts): TClock;
+export declare function install<TClock extends Clock>(opts?: LolexInstallOpts): InstalledClock<TClock>;
+
+export interface LolexWithContext {
+    timers: GlobalTimers<TimerId>;
+    createClock: <TClock extends Clock>(now?: number | Date, loopLimit?: number) => TClock;
+    install: <TClock extends Clock>(opts?: LolexInstallOpts) => InstalledClock<TClock>;
+    withGlobal: (global: Object) => LolexWithContext;
+}
+
+/**
+ * Apply new context to lolex.
+ *
+ * @param global   New context to apply like `window` (in browsers) or `global` (in node).
+ */
+export declare function withGlobal(global: Object): LolexWithContext;
+
+export declare const timers: GlobalTimers<TimerId>;
diff --git a/types/lolex/lolex-tests.ts b/types/lolex/lolex-tests.ts
index f698eac3cc..2a01dd5916 100644
--- a/types/lolex/lolex-tests.ts
+++ b/types/lolex/lolex-tests.ts
@@ -1,5 +1,17 @@
 import lolex = require("lolex");
 
+const global: lolex.LolexWithContext = lolex.withGlobal({});
+const timers: lolex.GlobalTimers<lolex.TimerId> = lolex.timers;
+
+const lolexTimeout: lolex.TimerId = timers.setTimeout(() => {}, 42);
+const lolexInterval: lolex.TimerId = timers.setInterval(() => {}, 42);
+const lolexImmediate: lolex.TimerId = timers.setImmediate(() => {});
+const lolexDate: Date = new timers.Date();
+
+timers.clearTimeout(lolexTimeout);
+timers.clearInterval(lolexInterval);
+timers.clearImmediate(lolexImmediate);
+
 let browserClock: lolex.BrowserClock = lolex.createClock() as lolex.BrowserClock;
 let nodeClock: lolex.NodeClock = lolex.createClock() as lolex.NodeClock;
 
@@ -16,7 +28,7 @@ lolex.createClock<lolex.NodeClock>(new Date());
 lolex.createClock<lolex.NodeClock>(7, 9001);
 lolex.createClock<lolex.NodeClock>(new Date(), 9001);
 
-lolex.install<lolex.BrowserClock>({
+const browserInstalledClock = lolex.install<lolex.BrowserClock>({
 	advanceTimeDelta: 20,
 	loopLimit: 10,
 	now: 0,
@@ -25,7 +37,7 @@ lolex.install<lolex.BrowserClock>({
 	toFake: ["setTimeout", "nextTick", "hrtime"]
 });
 
-lolex.install<lolex.BrowserClock>({
+const nodeInstalledClock = lolex.install<lolex.NodeClock>({
 	advanceTimeDelta: 20,
 	loopLimit: 10,
 	now: new Date(0),
@@ -35,7 +47,10 @@ lolex.install<lolex.BrowserClock>({
 });
 
 const browserNow: number = browserClock.now;
+const browserTimeouts: Object = browserClock.timeouts;
+const browserLoopLimit: number = browserClock.loopLimit;
 const browserDate: Date = new browserClock.Date();
+const browserPerformanceNow: number = browserClock.performance.now();
 
 const nodeNow: number = nodeClock.now;
 const nodeDate: Date = new nodeClock.Date();
@@ -43,30 +58,45 @@ const nodeDate: Date = new nodeClock.Date();
 const browserTimeout: number = browserClock.setTimeout(() => {}, 7);
 const browserInterval: number = browserClock.setInterval(() => {}, 7);
 const browserImmediate: number = browserClock.setImmediate(() => {});
+const browserAnimationFrame: number = browserClock.requestAnimationFrame(() => {});
 const nodeTimeout: lolex.NodeTimer = nodeClock.setTimeout(() => {}, 7);
 const nodeInterval: lolex.NodeTimer = nodeClock.setInterval(() => {}, 7);
 const nodeImmediate: lolex.NodeTimer = nodeClock.setImmediate(() => {});
+const nodeAnimationFrame: lolex.NodeTimer = nodeClock.requestAnimationFrame(() => {});
+
+nodeTimeout.ref();
+nodeTimeout.unref();
 
 browserClock.clearTimeout(browserTimeout);
 browserClock.clearInterval(browserInterval);
 browserClock.clearImmediate(browserImmediate);
+browserClock.cancelAnimationFrame(browserAnimationFrame);
 
 nodeClock.clearTimeout(nodeTimeout);
 nodeClock.clearInterval(nodeInterval);
 nodeClock.clearImmediate(nodeImmediate);
+nodeClock.cancelAnimationFrame(nodeAnimationFrame);
 
 browserClock.tick(7);
 browserClock.tick("08");
 
 nodeClock.tick(7);
-nodeClock.tick("08");
+nodeClock.tick("08:03");
 
 browserClock.next();
 nodeClock.next();
 
+browserClock.reset();
+nodeClock.reset();
+
 browserClock.runAll();
 nodeClock.runAll();
 
+nodeClock.runMicrotasks();
+
+browserClock.runToFrame();
+nodeClock.runToFrame();
+
 browserClock.runToLast();
 nodeClock.runToLast();
 
@@ -79,9 +109,23 @@ nodeClock.setSystemTime(7);
 nodeClock.setSystemTime(new Date());
 
 nodeClock.nextTick(() => undefined);
+nodeClock.queueMicrotask(() => {});
 
-browserClock.uninstall();
-nodeClock.uninstall();
+const browserTimersCount: number = browserClock.countTimers();
+const nodeTimersCount: number = nodeClock.countTimers();
+
+let [secs, nanos] = nodeClock.hrtime([0, 0]);
+[secs, nanos] = nodeClock.hrtime();
+
+// shows that typescript successfully infer the return values as numbers.
+secs.toFixed();
+nanos.toExponential();
+
+browserInstalledClock.performance.now();
+nodeInstalledClock.nextTick(() => {});
+
+browserInstalledClock.uninstall();
+nodeInstalledClock.uninstall();
 
 // Clocks should be typed to have unbound method signatures that can be passed around
 const { clearTimeout } = browserClock;
diff --git a/types/looks-same/index.d.ts b/types/looks-same/index.d.ts
index 6423e5fe4c..5a39a3e0fa 100644
--- a/types/looks-same/index.d.ts
+++ b/types/looks-same/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for looks-same 4.0
-// Project: https://github.com/gemini-testing/looks-same/releases
+// Project: https://github.com/gemini-testing/looks-same
 // Definitions by: xcatliu <https://github.com/xcatliu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/loopback/index.d.ts b/types/loopback/index.d.ts
index 58f5901a86..24a09efa94 100644
--- a/types/loopback/index.d.ts
+++ b/types/loopback/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Loopback 3.2
-// Project: https://github.com/strongloop/loopback
+// Project: https://github.com/strongloop/loopback, http://loopback.io
 // Definitions by: Andres D Jimenez <https://github.com/kattsushi>
 //                 Tim Schumacher <https://github.com/enko>
 //                 Sequoia McDowell <https://github.com/sequoia>
diff --git a/types/lory.js/index.d.ts b/types/lory.js/index.d.ts
index dd37fb8efa..82c1f6fbc6 100644
--- a/types/lory.js/index.d.ts
+++ b/types/lory.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for lory 2.2.1
+// Type definitions for lory 2.5.3
 // Project: https://github.com/meandmax/lory/
 // Definitions by: kubosho <https://github.com/kubosho>
 //                 philip bulley <https://github.com/milkisevil>
@@ -80,6 +80,11 @@ interface LoryOptions {
      * cubic bezier easing functions: http://easings.net/de (default: 'cubic-bezier(0.455, 0.03, 0.515, 0.955)').
      */
     ease?: string;
+	
+    /**
+     * the slide index to show when the slider is initialized (	default: 0 )
+     */
+    initialIndex?: number;
 
     /**
      * if slider reached the last slide, with next click the slider goes back to the startindex (default: false).
diff --git a/types/lory.js/lory.js-tests.ts b/types/lory.js/lory.js-tests.ts
index 616073f180..f3ca0464c2 100644
--- a/types/lory.js/lory.js-tests.ts
+++ b/types/lory.js/lory.js-tests.ts
@@ -19,6 +19,7 @@ import { lory } from 'lory.js';
         rewindSpeed: 600,
         snapBackSpeed: 200,
         ease: 'ease',
+		initialIndex: 0,
         rewind: true,
         infinite: false,
         classNameFrame: 'js_frame',
diff --git a/types/lovefield/index.d.ts b/types/lovefield/index.d.ts
index bca0c708f1..8049f296c5 100644
--- a/types/lovefield/index.d.ts
+++ b/types/lovefield/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Lovefield 2.1
-// Project: http://google.github.io/lovefield/
+// Project: http://google.github.io/lovefield/, https://github.com/google/lovefield
 // Definitions by: freshp86 <https://github.com/freshp86>
 //                 zackzeno <https://github.com/zackzeno>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ltx/index.d.ts b/types/ltx/index.d.ts
index 1c313c5541..ea9b7928ad 100644
--- a/types/ltx/index.d.ts
+++ b/types/ltx/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ltx 2.8
-// Project: github.com/node-xmpp/ltx/
+// Project: http://github.com/node-xmpp/ltx
 // Definitions by: PJakcson <https://github.com/PJakcson>
 //                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/lunr/index.d.ts b/types/lunr/index.d.ts
index ab59d556f6..9350d20f8f 100644
--- a/types/lunr/index.d.ts
+++ b/types/lunr/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lunr.js 2.3
-// Project: https://github.com/olivernn/lunr.js
+// Project: https://github.com/olivernn/lunr.js, http://lunrjs.com
 // Definitions by: Sean Tan <https://github.com/seantanly>, Andrés Pérez <https://github.com/hokiegeek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/luxon/index.d.ts b/types/luxon/index.d.ts
index 890d0731ad..44165c06c3 100644
--- a/types/luxon/index.d.ts
+++ b/types/luxon/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for luxon 1.10
+// Type definitions for luxon 1.11
 // Project: https://github.com/moment/luxon#readme
 // Definitions by: Colby DeHart <https://github.com/colbydehart>
 //                 Hyeonseok Yang <https://github.com/FourwingsY>
 //                 Jonathan Siebern <https://github.com/jsiebern>
 //                 Matt R. Wilson <https://github.com/mastermatt>
 //                 Pietro Vismara <https://github.com/pietrovismara>
+//                 Janeene Beeforth <https://github.com/dawnmist>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -425,7 +426,7 @@ export class Interval {
     engulfs(other: Interval): boolean;
     equals(other: Interval): boolean;
     hasSame(unit: DurationUnit): boolean;
-    intersection(other: Interval): Interval;
+    intersection(other: Interval): Interval | null;
     isAfter(dateTime: DateTime): boolean;
     isBefore(dateTime: DateTime): boolean;
     isEmpty(): boolean;
@@ -435,7 +436,7 @@ export class Interval {
     splitAt(...dateTimes: DateTime[]): Interval[];
     splitBy(duration: Duration | DurationObject | number): Interval[];
     toDuration(
-        unit: DurationUnit | DurationUnit[],
+        unit?: DurationUnit | DurationUnit[],
         options?: DiffOptions
     ): Duration;
     toFormat(
@@ -467,11 +468,11 @@ export interface ZoneOffsetOptions {
 }
 
 export class Zone {
-    static offsetName(ts: number, options?: ZoneOffsetOptions): string;
-    static isValid: boolean;
-    static name: string;
-    static type: string;
-    static universal: boolean;
+    offsetName(ts: number, options?: ZoneOffsetOptions): string;
+    isValid: boolean;
+    name: string;
+    type: string;
+    universal: boolean;
     equals(other: Zone): boolean;
     offset(ts: number): number;
 }
diff --git a/types/luxon/luxon-tests.ts b/types/luxon/luxon-tests.ts
index 3cadfa5779..ecf49e2081 100644
--- a/types/luxon/luxon-tests.ts
+++ b/types/luxon/luxon-tests.ts
@@ -1,4 +1,4 @@
-import { DateTime, Duration, Interval, Info, Settings, IANAZone } from 'luxon';
+import { DateTime, Duration, Interval, Info, Settings, IANAZone, Zone, ZoneOffsetOptions } from 'luxon';
 
 /* DateTime */
 const dt = DateTime.local(2017, 5, 15, 8, 30);
@@ -140,10 +140,12 @@ i.length('years'); // $ExpectType number
 i.contains(DateTime.local(2019)); // $ExpectType boolean
 i.set({end: DateTime.local(2020)}); // $ExpectType Interval
 i.mapEndpoints((d) => d); // $ExpectType Interval
+i.intersection(i); // $ExpectType Interval | null
 
 i.toISO(); // $ExpectType string
 i.toString(); // $ExpectType string
 i.toDuration('months'); // $ExpectType Duration
+i.toDuration(); // $ExpectType Duration
 
 if (Interval.isInterval(anything)) {
     anything; // $ExpectType Interval
@@ -285,3 +287,21 @@ dur.reconfigure({ conversionAccuracy: 'longterm' }); // $ExpectType Duration
 
 start.until(end); // $ExpectType Interval
 i.toDuration(['years', 'months', 'days']); // $ExpectType Duration
+
+/* Sample Zone Implementation */
+class SampleZone extends Zone {
+  readonly isValid = false;
+  readonly name = 'Sample';
+  readonly type = 'Example';
+  readonly universal = true;
+
+  offsetName(ts: number, options?: ZoneOffsetOptions) {
+    return 'SampleZone';
+  }
+  equals(other: Zone) {
+    return other.name === this.name;
+  }
+  offset(ts: number) {
+    return 0;
+  }
+}
diff --git a/types/lz-string/index.d.ts b/types/lz-string/index.d.ts
index bd64854976..9cff45952e 100644
--- a/types/lz-string/index.d.ts
+++ b/types/lz-string/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for lz-string 1.3
-// Project: https://github.com/pieroxy/lz-string
+// Project: https://github.com/pieroxy/lz-string, http://pieroxy.net/blog/pages/lz-string/index.html
 // Definitions by: Roman Nikitin <https://github.com/M0ns1gn0r>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/magnet-uri/index.d.ts b/types/magnet-uri/index.d.ts
index 2b9a445970..0d555372bf 100644
--- a/types/magnet-uri/index.d.ts
+++ b/types/magnet-uri/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for magnet-uri 5.1
-// Project: https://github.com/feross/magnet-uri
+// Project: https://github.com/webtorrent/magnet-uri
 // Definitions by: Tomasz Łaziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/mapbox-gl-leaflet/index.d.ts b/types/mapbox-gl-leaflet/index.d.ts
index 34e3578eac..ea6593d760 100644
--- a/types/mapbox-gl-leaflet/index.d.ts
+++ b/types/mapbox-gl-leaflet/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for mapbox-gl-leaflet 0.0
-// Project: https://github.com/brunob/leaflet.fullscreen
+// Project: https://github.com/mapbox/mapbox-gl-leaflet
 // Definitions by: Alexey Gorshkov <https://github.com/agorshkov23>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index 149d433a89..786b7260b6 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -1,8 +1,10 @@
 // Type definitions for Mapbox GL JS v0.51.0
 // Project: https://github.com/mapbox/mapbox-gl-js
-// Definitions by: Dominik Bruderer <https://github.com/dobrud>, Patrick Reames <https://github.com/patrickr>
+// Definitions by: Dominik Bruderer <https://github.com/dobrud>
+//                 Patrick Reames <https://github.com/patrickr>
+//                 Karl-Aksel Puulmann <https://github.com/macobo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 3.0
 
 /// <reference types="geojson" />
 
@@ -20,7 +22,33 @@ declare namespace mapboxgl {
     type LngLatLike = LngLat | { lng: number; lat: number; } | { lon: number; lat: number; } | [number, number];
     type LngLatBoundsLike = LngLatBounds | [LngLatLike, LngLatLike] | [number, number, number, number];
     type PointLike = Point | [number, number];
-    type Expression = any[];
+
+    type ExpressionName =
+        // Types
+        | 'array' | 'boolean' | 'collator' | 'format' | 'literal' | 'number' | 'object' | 'string'
+        | 'to-boolean' | 'to-color' | 'to-number' | 'to-string' | 'typeof'
+        // Feature data
+        | 'feature-state' | 'geometry-type' | 'id' | 'line-progress' | 'properties'
+        // Lookup
+        | 'at' | 'get' | 'has' | 'length'
+        // Decision
+        | '!=' | '<' | '<=' | '==' | '>' | '>=' | 'all' | 'any' | 'case' | 'match'
+        // Ramps, scales, curves
+        | 'interpolate' | 'interpolate-hcl' | 'interpolate-lab' | 'step'
+        // Variable binding
+        | 'let' | 'var'
+        // String
+        | 'concat' | 'downcase' | 'is-supported-script' | 'resolved-locale' | 'upcase'
+        // Color
+        | 'rgb' | 'rgba'
+        // Math
+        | '-' | '*' | '/' | '%' | '^' | '+' | 'abs' | 'acos' | 'asin' | 'atan' | 'ceil' | 'cos' | 'e'
+        | 'floor' | 'ln' | 'ln2' | 'log10' | 'log2' | 'max' | 'min' | 'pi' | 'round' | 'sin' | 'sqrt' | 'tan'
+        // Zoom, Heatmap
+        | 'zoom' | 'heatmap-density';
+
+    type Expression = [ExpressionName, ...any[]]
+
     type Anchor = 'center' | 'left' | 'right' | 'top' | 'bottom' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
 
     /**
@@ -73,7 +101,7 @@ declare namespace mapboxgl {
 
         isStyleLoaded(): boolean;
 
-        addSource(id: string, source: VectorSource | RasterSource | RasterDemSource | GeoJSONSource | ImageSource | VideoSource | GeoJSONSourceRaw): this;
+        addSource(id: string, source: AnySourceData): this;
 
         isSourceLoaded(id: string): boolean;
 
@@ -81,7 +109,7 @@ declare namespace mapboxgl {
 
         removeSource(id: string): this;
 
-        getSource(id: string): VectorSource | RasterSource | RasterDemSource | GeoJSONSource | ImageSource | VideoSource;
+        getSource(id: string): AnySourceImpl;
 
         addImage(name: string, image: HTMLImageElement | ArrayBufferView | { width: number, height: number, data: Uint8Array | Uint8ClampedArray } | ImageData, options?: { pixelRatio?: number, sdf?: boolean }): this;
 
@@ -626,7 +654,7 @@ declare namespace mapboxgl {
         name?: string;
         pitch?: number;
         light?: Light;
-        sources?: any;
+        sources?: Sources;
         sprite?: string;
         transition?: Transition;
         version: number;
@@ -648,6 +676,14 @@ declare namespace mapboxgl {
         'intensity-transition'?: Transition;
     }
 
+    export interface Sources {
+        [sourceName: string]: AnySourceData;
+    }
+
+    export type AnySourceData = GeoJSONSourceRaw | VideoSourceRaw | ImageSourceRaw | CanvasSourceRaw | VectorSource | RasterSource | RasterDemSource
+
+    export type AnySourceImpl = GeoJSONSource | VideoSource | ImageSource | CanvasSource | VectorSource | RasterSource | RasterDemSource
+
     export interface Source {
         type: 'vector' | 'raster' | 'raster-dem' | 'geojson' | 'image' | 'video' | 'canvas';
     }
@@ -699,10 +735,11 @@ declare namespace mapboxgl {
     /**
      * VideoSource
      */
-    export interface VideoSource extends VideoSourceOptions {
+    export interface VideoSourceRaw extends Source, VideoSourceOptions {
+        type: 'video';
     }
 
-    export class VideoSource implements Source {
+    export class VideoSource implements VideoSourceRaw {
         type: 'video';
 
         constructor(options?: mapboxgl.VideoSourceOptions);
@@ -721,10 +758,11 @@ declare namespace mapboxgl {
     /**
      * ImageSource
      */
-    export interface ImageSource extends ImageSourceOptions {
+    export interface ImageSourceRaw extends Source, ImageSourceOptions {
+        type: 'image';
     }
 
-    export class ImageSource implements Source {
+    export class ImageSource implements ImageSourceRaw {
         type: 'image';
 
         constructor(options?: mapboxgl.ImageSourceOptions);
@@ -741,7 +779,11 @@ declare namespace mapboxgl {
     /**
      * CanvasSource
      */
-    export class CanvasSource implements Source, CanvasSourceOptions {
+    export interface CanvasSourceRaw extends Source, CanvasSourceOptions {
+        type: 'canvas';
+    }
+
+    export class CanvasSource implements CanvasSourceRaw {
         type: 'canvas';
 
         coordinates: number[][];
@@ -1246,7 +1288,7 @@ declare namespace mapboxgl {
         metadata?: any;
         ref?: string;
 
-        source?: string | VectorSource | RasterSource | RasterDemSource | GeoJSONSource | ImageSource | VideoSource | GeoJSONSourceRaw;
+        source?: string | AnySourceData;
 
         'source-layer'?: string;
 
@@ -1361,7 +1403,7 @@ declare namespace mapboxgl {
         'symbol-spacing'?: number | Expression;
         'symbol-avoid-edges'?: boolean;
         'symbol-z-order'?: 'viewport-y' | 'source';
-        'icon-allow-overlap'?: boolean | StyleFunction;
+        'icon-allow-overlap'?: boolean | StyleFunction | Expression;
         'icon-ignore-placement'?: boolean;
         'icon-optional'?: boolean;
         'icon-rotation-alignment'?: 'map' | 'viewport' | 'auto';
@@ -1377,7 +1419,7 @@ declare namespace mapboxgl {
         'icon-pitch-alignment'?: 'map' | 'viewport' | 'auto';
         'text-pitch-alignment'?: 'map' | 'viewport' | 'auto';
         'text-rotation-alignment'?: 'map' | 'viewport' | 'auto';
-        'text-field'?: string | StyleFunction;
+        'text-field'?: string | StyleFunction | Expression;
         'text-font'?: string | string[];
         'text-size'?: number | StyleFunction | Expression;
         'text-max-width'?: number | Expression;
diff --git a/types/mapbox-gl/mapbox-gl-tests.ts b/types/mapbox-gl/mapbox-gl-tests.ts
index d119c76bd5..92f0c6c7c7 100644
--- a/types/mapbox-gl/mapbox-gl-tests.ts
+++ b/types/mapbox-gl/mapbox-gl-tests.ts
@@ -50,7 +50,8 @@ map.on('load', function(){
 		"type": "symbol",
 		"source": "data",
 		"layout": {
-			"icon-image": "marker-15"
+			"icon-image": "marker-15",
+			"text-field": ['get', 'property']
 		}
 	});
 
@@ -788,3 +789,14 @@ expectType<mapboxgl.Map>(map.on('touchcancel', 'text', (ev) => {
 	expectType<mapboxgl.MapLayerTouchEvent>(ev);
 	expectType<mapboxgl.MapboxGeoJSONFeature[] | undefined>(ev.features);
 }));
+
+/*
+ * Expression
+ */
+expectType<mapboxgl.Expression>(['id']);
+expectType<mapboxgl.Expression>(['get', 'property']);
+expectType<mapboxgl.Expression>([
+	'format',
+	['concat', ['get', 'name'], '\n'], {},
+	['concat', ['get', 'area'], 'foobar', { 'font-scale': 0.8 }]
+]);
diff --git a/types/mapbox/index.d.ts b/types/mapbox/index.d.ts
index 97da469e4a..283d36d545 100644
--- a/types/mapbox/index.d.ts
+++ b/types/mapbox/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Mapbox 1.6
-// Project: https://www.mapbox.com/mapbox.js/
+// Project: https://www.mapbox.com/mapbox.js/, https://github.com/mapbox/mapbox-sdk-js
 // Definitions by: Maxime Fabre <https://github.com/anahkiasen>
 //                 Florian Luccioni <https://github.com/Fluccioni>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/mapbox__s3urls/index.d.ts b/types/mapbox__s3urls/index.d.ts
new file mode 100644
index 0000000000..523cb0fc07
--- /dev/null
+++ b/types/mapbox__s3urls/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for mapbox__s3urls 1.5
+// Project: https://github.com/mapbox/s3urls
+// Definitions by: Sebastian Vera <https://github.com/sebastianvera>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// tslint:disable-next-line no-single-declare-module
+declare module "@mapbox/s3urls" {
+    function fromUrl(
+        url: string
+    ): { Bucket: string | undefined; Key: string | undefined };
+
+    function toUrl(
+        bucket: string,
+        key: string
+    ): {
+        s3: string;
+        "bucket-in-path": string;
+        "bucket-in-host": string;
+    };
+
+    function convert(
+        url: string,
+        to: "s3" | "bucket-in-path" | "bucket-in-host"
+    ): string;
+
+    function signed(
+        url: string,
+        expires: number,
+        cb: (err: Error | undefined, url: string) => void
+    ): void;
+
+    function valid(url: string): boolean;
+}
diff --git a/types/mapbox__s3urls/mapbox__s3urls-tests.ts b/types/mapbox__s3urls/mapbox__s3urls-tests.ts
new file mode 100644
index 0000000000..7a50fdcfac
--- /dev/null
+++ b/types/mapbox__s3urls/mapbox__s3urls-tests.ts
@@ -0,0 +1,15 @@
+import * as s3urls from "@mapbox/s3urls";
+
+s3urls.toUrl("bucket", "key"); // $ExpectType { s3: string; "bucket-in-path": string; "bucket-in-host": string; }
+s3urls.toUrl("bucket", "key")["s3"]; // $ExpectType string
+s3urls.toUrl("bucket", "key")["bucket-in-host"]; // $ExpectType string
+s3urls.toUrl("bucket", "key")["bucket-in-path"]; // $ExpectType string
+
+s3urls.valid("s3://bucket/key"); // $ExpectType boolean
+s3urls.valid("invalid"); // $ExpectType boolean
+
+s3urls.convert("s3://bucket/key", "s3"); // $ExpectType string
+s3urls.convert("s3://bucket/key", "bucket-in-path"); // $ExpectType string
+s3urls.convert("s3://bucket/key", "bucket-in-host"); // $ExpectType string
+
+s3urls.fromUrl("s3://bucket/key"); // $ExpectType object
diff --git a/types/mapbox__s3urls/tsconfig.json b/types/mapbox__s3urls/tsconfig.json
new file mode 100644
index 0000000000..9c3d217340
--- /dev/null
+++ b/types/mapbox__s3urls/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "paths": {
+            "@mapbox/s3urls": ["mapbox__s3urls"]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "mapbox__s3urls-tests.ts"]
+}
diff --git a/types/mapbox__s3urls/tslint.json b/types/mapbox__s3urls/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mapbox__s3urls/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/mapbox__sphericalmercator/index.d.ts b/types/mapbox__sphericalmercator/index.d.ts
new file mode 100644
index 0000000000..3ed6dfbe9e
--- /dev/null
+++ b/types/mapbox__sphericalmercator/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for @mapbox/sphericalmercator 1.1
+// Project: https://github.com/mapbox/sphericalmercator, https://github.com/mapbox/node-sphericalmercator
+// Definitions by: Nicholas Husher <https://github.com/nhusher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace SphericalMercator;
+
+interface XYBounds {
+    minX: number;
+    minY: number;
+    maxX: number;
+    maxY: number;
+}
+
+export {};
+
+type LatLngPoint = [number, number];
+type XYPoint = [number, number];
+type BoundingBox = [number, number, number, number];
+type Projection = 'WGS84' | '900913';
+
+export default class SphericalMercator {
+    constructor(options: { size: number })
+    px(ll: LatLngPoint, zoom: number): XYPoint;
+    ll(px: XYPoint, zoom: number): LatLngPoint;
+    bbox(x: number, y: number, zoom: number, tms_style: boolean, srs: Projection): BoundingBox;
+    xyz(bbox: BoundingBox, zoom: number, tms_style: boolean, srs: Projection): XYBounds;
+    convert(bbox: BoundingBox, to: Projection): BoundingBox;
+    forward(ll: LatLngPoint): XYPoint;
+    inverse(xy: XYPoint): LatLngPoint;
+}
diff --git a/types/mapbox__sphericalmercator/mapbox__sphericalmercator-tests.ts b/types/mapbox__sphericalmercator/mapbox__sphericalmercator-tests.ts
new file mode 100644
index 0000000000..25caac746f
--- /dev/null
+++ b/types/mapbox__sphericalmercator/mapbox__sphericalmercator-tests.ts
@@ -0,0 +1,17 @@
+import SphericalMercator from '@mapbox/sphericalmercator';
+
+const sm = new SphericalMercator({ size: 100 });
+
+const xy: [number, number] = sm.px([10, 10], 10);
+const ll: [number, number] = sm.ll([20, 20], 10);
+const bbox1: [number, number, number, number] = sm.bbox(10, 10, 10, true, '900913');
+const xybounds: {
+  minX: number,
+  minY: number,
+  maxX: number,
+  maxY: number
+} = sm.xyz(bbox1, 10, true, 'WGS84');
+
+const bbox2: [number, number, number, number] = sm.convert(bbox1, 'WGS84');
+const fwd: [number, number] = sm.forward(ll);
+const inv: [number, number] = sm.inverse(xy);
diff --git a/types/mapbox__sphericalmercator/tsconfig.json b/types/mapbox__sphericalmercator/tsconfig.json
new file mode 100644
index 0000000000..a5684b798a
--- /dev/null
+++ b/types/mapbox__sphericalmercator/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "paths": {
+            "@mapbox/sphericalmercator": [
+                "mapbox__sphericalmercator"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "mapbox__sphericalmercator-tests.ts"
+    ]
+}
diff --git a/types/mapbox__sphericalmercator/tslint.json b/types/mapbox__sphericalmercator/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mapbox__sphericalmercator/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/marked/index.d.ts b/types/marked/index.d.ts
index 963a6f6697..78a45b052c 100644
--- a/types/marked/index.d.ts
+++ b/types/marked/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Marked 0.6
-// Project: https://github.com/markedjs/marked
+// Project: https://github.com/markedjs/marked, https://marked.js.org
 // Definitions by: William Orr <https://github.com/worr>
 //                 BendingBender <https://github.com/BendingBender>
 //                 CrossR <https://github.com/CrossR>
diff --git a/types/masonry-layout/index.d.ts b/types/masonry-layout/index.d.ts
index 2e62989ca8..81fa58c4ed 100644
--- a/types/masonry-layout/index.d.ts
+++ b/types/masonry-layout/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Masonry 4.2
-// Project: https://github.com/desandro/masonry
+// Project: https://github.com/desandro/masonry, https://masonry.desandro.com
 // Definitions by: Mark Wilson <https://github.com/m-a-wilson>, Travis Brown <https://github.com/warriorrocker>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/massive/index.d.ts b/types/massive/index.d.ts
index 772f418df3..72ef7c117b 100644
--- a/types/massive/index.d.ts
+++ b/types/massive/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for massive 5.4
-// Project: https://github.com/dmfay/massive-js.git
+// Project: https://github.com/dmfay/massive-js.git, https://dmfay.github.io/massive-js
 // Definitions by: Pascal Birchler <https://github.com/swissspidy>
 //                 Clarence Ho <https://github.com/clarenceh>
 //                 Felix Faust <https://github.com/AmazingTurtle>
diff --git a/types/material-components-web/index.d.ts b/types/material-components-web/index.d.ts
index 9e3ca568f1..b8e9ce9040 100644
--- a/types/material-components-web/index.d.ts
+++ b/types/material-components-web/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.43
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>, Arthur Groupp <https://github.com/agroupp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material-ui/index.d.ts b/types/material-ui/index.d.ts
index 285d949d70..005cf353de 100644
--- a/types/material-ui/index.d.ts
+++ b/types/material-ui/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for material-ui 0.21
-// Project: https://github.com/callemall/material-ui
+// Project: https://github.com/callemall/material-ui, http://material-ui.com
 // Definitions by: Nathan Brown <https://github.com/ngbrown>
 //                 Igor Beagorudsky <https://github.com/theigor>
 //                 Ali Taheri Moghaddar <https://github.com/alitaheri>
@@ -559,8 +559,8 @@ declare namespace __MaterialUI {
         className?: string;
         iconClassNameLeft?: string;
         iconClassNameRight?: string;
-        iconElementLeft?: React.ReactElement<any>;
-        iconElementRight?: React.ReactElement<any>;
+        iconElementLeft?: React.ReactElement;
+        iconElementRight?: React.ReactElement;
         iconStyleRight?: React.CSSProperties;
         iconStyleLeft?: React.CSSProperties;
         onLeftIconButtonClick?: React.MouseEventHandler<{}>;
@@ -654,7 +654,7 @@ declare namespace __MaterialUI {
         backgroundColor?: string;
         className?: string;
         color?: string;
-        icon?: React.ReactElement<any>;
+        icon?: React.ReactElement;
         size?: number;
         src?: string;
         style?: React.CSSProperties;
@@ -1037,7 +1037,7 @@ declare namespace __MaterialUI {
         text: string;
     }
     export interface DialogProps extends React.DOMAttributes<{}>, React.Props<Dialog> {
-        actions?: Array<DialogAction | React.ReactElement<any>>;
+        actions?: Array<DialogAction | React.ReactElement>;
         /** @deprecated use a custom `actions` property instead */
         actionFocus?: string;
         actionsContainerClassName?: string;
@@ -1103,10 +1103,10 @@ declare namespace __MaterialUI {
         }
 
         export interface GridTileProps {
-            actionIcon?: React.ReactElement<any>;
+            actionIcon?: React.ReactElement;
             actionPosition?: "left" | "right";
             cols?: number;
-            containerElement?: string | React.ReactElement<any> | React.ComponentClass<any>;
+            containerElement?: string | React.ReactElement | React.ComponentClass<any>;
             rows?: number;
             style?: React.CSSProperties;
             subtitle?: React.ReactNode;
@@ -1157,9 +1157,9 @@ declare namespace __MaterialUI {
             initiallyOpen?: boolean;
             innerDivStyle?: React.CSSProperties;
             insetChildren?: boolean;
-            leftAvatar?: React.ReactElement<any>;
-            leftCheckbox?: React.ReactElement<any>;
-            leftIcon?: React.ReactElement<any>;
+            leftAvatar?: React.ReactElement;
+            leftCheckbox?: React.ReactElement;
+            leftIcon?: React.ReactElement;
             nestedItems?: Array<React.ReactElement<ListItemProps>>;
             nestedLevel?: number;
             nestedListStyle?: React.CSSProperties;
@@ -1172,10 +1172,10 @@ declare namespace __MaterialUI {
             open?: boolean;
             primaryText?: React.ReactNode;
             primaryTogglesNestedList?: boolean;
-            rightAvatar?: React.ReactElement<any>;
-            rightIcon?: React.ReactElement<any>;
-            rightIconButton?: React.ReactElement<any>;
-            rightToggle?: React.ReactElement<any>;
+            rightAvatar?: React.ReactElement;
+            rightIcon?: React.ReactElement;
+            rightIconButton?: React.ReactElement;
+            rightToggle?: React.ReactElement;
             secondaryText?: React.ReactNode;
             secondaryTextLines?: number; // 1 or 2
             style?: React.CSSProperties;
@@ -1227,11 +1227,11 @@ declare namespace __MaterialUI {
             innerDivStyle?: React.CSSProperties;
             insetChildren?: boolean;
             label?: string | React.ReactNode;
-            leftIcon?: React.ReactElement<any>;
+            leftIcon?: React.ReactElement;
             menuItems?: React.ReactNode;
             onClick?: React.MouseEventHandler<{}>;
             primaryText?: React.ReactNode;
-            rightIcon?: React.ReactElement<any>;
+            rightIcon?: React.ReactElement;
             secondaryText?: React.ReactNode;
             style?: React.CSSProperties;
             containerElement?: React.ReactNode | string;
@@ -1503,7 +1503,7 @@ declare namespace __MaterialUI {
             rippleColor?: string;
             rippleStyle?: React.CSSProperties;
             style?: React.CSSProperties;
-            switchElement: React.ReactElement<any>;
+            switchElement: React.ReactElement;
             switched: boolean;
             thumbStyle?: React.CSSProperties;
             trackStyle?: React.CSSProperties;
diff --git a/types/material__animation/index.d.ts b/types/material__animation/index.d.ts
index 2527cf9e71..4ec8d9bbb4 100644
--- a/types/material__animation/index.d.ts
+++ b/types/material__animation/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__auto-init/index.d.ts b/types/material__auto-init/index.d.ts
index 2993089fce..ca827759a3 100644
--- a/types/material__auto-init/index.d.ts
+++ b/types/material__auto-init/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__base/index.d.ts b/types/material__base/index.d.ts
index bc4d2ee1a3..1ce92aafa7 100644
--- a/types/material__base/index.d.ts
+++ b/types/material__base/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__checkbox/index.d.ts b/types/material__checkbox/index.d.ts
index 308bc077bb..36047917f3 100644
--- a/types/material__checkbox/index.d.ts
+++ b/types/material__checkbox/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__chips/index.d.ts b/types/material__chips/index.d.ts
index 935d897236..118c986ab7 100644
--- a/types/material__chips/index.d.ts
+++ b/types/material__chips/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__dialog/index.d.ts b/types/material__dialog/index.d.ts
index 491d2ad9fd..cfb1649ada 100644
--- a/types/material__dialog/index.d.ts
+++ b/types/material__dialog/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__dom/index.d.ts b/types/material__dom/index.d.ts
index f751696f43..b9f18cf598 100644
--- a/types/material__dom/index.d.ts
+++ b/types/material__dom/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.43
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Arthur Groupp <https://github.com/agroupp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__drawer/index.d.ts b/types/material__drawer/index.d.ts
index 9980f1c304..bb5b1adb5d 100644
--- a/types/material__drawer/index.d.ts
+++ b/types/material__drawer/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.43
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>, Arthur Groupp <https://github.com/agroupp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__floating-label/index.d.ts b/types/material__floating-label/index.d.ts
index 6b426a75d3..5a0466fab2 100644
--- a/types/material__floating-label/index.d.ts
+++ b/types/material__floating-label/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__form-field/index.d.ts b/types/material__form-field/index.d.ts
index 812df5c0c0..6b9b124cf8 100644
--- a/types/material__form-field/index.d.ts
+++ b/types/material__form-field/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__grid-list/index.d.ts b/types/material__grid-list/index.d.ts
index 87ee0a138e..89f1df1c4c 100644
--- a/types/material__grid-list/index.d.ts
+++ b/types/material__grid-list/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__icon-toggle/index.d.ts b/types/material__icon-toggle/index.d.ts
index beae5b83db..314ee91015 100644
--- a/types/material__icon-toggle/index.d.ts
+++ b/types/material__icon-toggle/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__line-ripple/index.d.ts b/types/material__line-ripple/index.d.ts
index f76ed98d10..d29b135c5b 100644
--- a/types/material__line-ripple/index.d.ts
+++ b/types/material__line-ripple/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__linear-progress/index.d.ts b/types/material__linear-progress/index.d.ts
index 4161a165f8..953fef49da 100644
--- a/types/material__linear-progress/index.d.ts
+++ b/types/material__linear-progress/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__list/index.d.ts b/types/material__list/index.d.ts
index 22adf832f3..80619ae4d4 100644
--- a/types/material__list/index.d.ts
+++ b/types/material__list/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.43
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Arthur Groupp <https://github.com/agroupp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__menu/index.d.ts b/types/material__menu/index.d.ts
index 1762aa3721..a873814437 100644
--- a/types/material__menu/index.d.ts
+++ b/types/material__menu/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__notched-outline/index.d.ts b/types/material__notched-outline/index.d.ts
index d22a9a6918..267b610763 100644
--- a/types/material__notched-outline/index.d.ts
+++ b/types/material__notched-outline/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__radio/index.d.ts b/types/material__radio/index.d.ts
index d73206b791..93dc5e5cd8 100644
--- a/types/material__radio/index.d.ts
+++ b/types/material__radio/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__ripple/index.d.ts b/types/material__ripple/index.d.ts
index aaef1a6aff..7e756327c9 100644
--- a/types/material__ripple/index.d.ts
+++ b/types/material__ripple/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__select/index.d.ts b/types/material__select/index.d.ts
index a487461ae7..5f4a0b385c 100644
--- a/types/material__select/index.d.ts
+++ b/types/material__select/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__selection-control/index.d.ts b/types/material__selection-control/index.d.ts
index b5ce84d6ce..13840565ab 100644
--- a/types/material__selection-control/index.d.ts
+++ b/types/material__selection-control/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__slider/index.d.ts b/types/material__slider/index.d.ts
index 1a1c02d86a..9ba457074d 100644
--- a/types/material__slider/index.d.ts
+++ b/types/material__slider/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__snackbar/index.d.ts b/types/material__snackbar/index.d.ts
index da6ecd4ca2..58dbce3f19 100644
--- a/types/material__snackbar/index.d.ts
+++ b/types/material__snackbar/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__tab/index.d.ts b/types/material__tab/index.d.ts
index b2cc71129e..9aa0220eed 100644
--- a/types/material__tab/index.d.ts
+++ b/types/material__tab/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__tabs/index.d.ts b/types/material__tabs/index.d.ts
index b5a9d4143e..2323f29448 100644
--- a/types/material__tabs/index.d.ts
+++ b/types/material__tabs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__textfield/foundation.d.ts b/types/material__textfield/foundation.d.ts
index ffc0436f45..255495f003 100644
--- a/types/material__textfield/foundation.d.ts
+++ b/types/material__textfield/foundation.d.ts
@@ -71,6 +71,8 @@ export default class MDCTextFieldFoundation extends MDCFoundation<MDCTextFieldAd
 
     setValid(isValid: boolean): void;
 
+    setUseNativeValidation(useNativeValidation: boolean): void;
+
     isDisabled(): boolean;
 
     setDisabled(disabled: boolean): void;
diff --git a/types/material__textfield/index.d.ts b/types/material__textfield/index.d.ts
index b3e61550c9..340b50f126 100644
--- a/types/material__textfield/index.d.ts
+++ b/types/material__textfield/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
@@ -78,4 +78,12 @@ export class MDCTextField extends MDCComponent<MDCTextFieldAdapter, MDCTextField
      * Recomputes the outline SVG path for the outline element.
      */
     layout(): void;
+
+    /**
+     * Ideally we would use a 'writeonly' modifier here since this is a setter,
+     * but such a thing does not exist.
+     * https://github.com/Microsoft/TypeScript/issues/4839
+     * https://github.com/Microsoft/TypeScript/issues/21759
+     */
+    useNativeValidation: boolean;
 }
diff --git a/types/material__toolbar/index.d.ts b/types/material__toolbar/index.d.ts
index 75bcbcda5f..c7458e9a58 100644
--- a/types/material__toolbar/index.d.ts
+++ b/types/material__toolbar/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/material__top-app-bar/index.d.ts b/types/material__top-app-bar/index.d.ts
index da37e36f23..754caabe99 100644
--- a/types/material__top-app-bar/index.d.ts
+++ b/types/material__top-app-bar/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Material Components Web 0.35
-// Project: https://material.io/components/
+// Project: https://material.io/components/, https://github.com/material-components/material-components-web
 // Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index c72ca68941..20fb7154cb 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for mathjs 4.4
+// Type definitions for mathjs 5.0
 // Project: http://mathjs.org/
 // Definitions by: Ilya Shestakov <https://github.com/siavol>,
 //                  Andy Patterson <https://github.com/andnp>,
@@ -1277,7 +1277,7 @@ declare namespace math {
          * @param format The Matrix storage format
          * @returns A matrix with ones on the diagonal
          */
-        eye(
+        identity(
             size: number | number[] | Matrix | MathArray,
             format?: string
         ): Matrix | MathArray | number;
@@ -1287,7 +1287,7 @@ declare namespace math {
          * @param format The Matrix storage format
          * @returns A matrix with ones on the diagonal
          */
-        eye(m: number, n: number, format?: string): Matrix | MathArray | number;
+        identity(m: number, n: number, format?: string): Matrix | MathArray | number;
 
         /**
          * Filter the items in an array or one dimensional matrix.
@@ -3714,12 +3714,12 @@ declare namespace math {
          * matrix has ones on the diagonal and zeros elsewhere.
          * @param format The Matrix storage format
          */
-        eye(format?: string): MathJsChain;
+        identity(format?: string): MathJsChain;
         /**
          * @param n The y dimension for the matrix
          * @param format The Matrix storage format
          */
-        eye(n: number, format?: string): MathJsChain;
+        identity(n: number, format?: string): MathJsChain;
 
         /**
          * Filter the items in an array or one dimensional matrix.
diff --git a/types/mathjs/mathjs-tests.ts b/types/mathjs/mathjs-tests.ts
index 15d455e427..f336da0a0b 100644
--- a/types/mathjs/mathjs-tests.ts
+++ b/types/mathjs/mathjs-tests.ts
@@ -294,7 +294,7 @@ Sparse matrices examples
 */
 {
 	// create a sparse matrix
-	const a = math.eye(1000, 1000, 'sparse');
+	const a = math.identity(1000, 1000, 'sparse');
 
 	// do operations with a sparse matrix
 	const b = math.multiply(a, a);
diff --git a/types/mdast/index.d.ts b/types/mdast/index.d.ts
index c1fcadec97..01fc975f47 100644
--- a/types/mdast/index.d.ts
+++ b/types/mdast/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Mdast 3.0
-// Project: https://github.com/syntax-tree/mdast
+// Project: https://github.com/syntax-tree/mdast, https://github.com/wooorm/mdast
 // Definitions by: Jun Lu <https://github.com/lujun2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.0
diff --git a/types/mem-cache/index.d.ts b/types/mem-cache/index.d.ts
new file mode 100644
index 0000000000..df2a0db47d
--- /dev/null
+++ b/types/mem-cache/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for mem-cache 1.0
+// Project: https://github.com/silviom/node-mem-cache
+// Definitions by: Pedro Mutter <https://github.com/MutterPedro>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { EventEmitter } from 'events';
+
+interface CacheOptions {
+    timeout?: number;
+    doesNotRenewTimeout?: boolean;
+    timeoutDisabled?: boolean;
+}
+
+declare class Cache extends EventEmitter {
+    keys: string[];
+    length: number;
+
+    constructor(options?: number | CacheOptions);
+
+    set(key: string, value: any, timeout?: number): void;
+    get(key: string): any;
+    remove(key: string): void;
+    clean(): void;
+}
+
+export = Cache;
diff --git a/types/mem-cache/mem-cache-tests.ts b/types/mem-cache/mem-cache-tests.ts
new file mode 100644
index 0000000000..747ffd75c2
--- /dev/null
+++ b/types/mem-cache/mem-cache-tests.ts
@@ -0,0 +1,10 @@
+import Cache = require('mem-cache');
+
+const cache = new Cache(); // $ExpectType Cache
+
+cache.set('foo', 'bar'); // $ExpectType void
+cache.get('foo'); // $ExpectType any
+cache.remove('foo'); // $ExpectType void
+cache.clean(); // $ExpectType void
+cache.length; // $ExpectType number
+cache.keys; // $ExpectType string[]
diff --git a/types/mem-cache/tsconfig.json b/types/mem-cache/tsconfig.json
new file mode 100644
index 0000000000..3c3a2e701a
--- /dev/null
+++ b/types/mem-cache/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "mem-cache-tests.ts"
+    ],
+    "baseUrl": "types",
+    "typeRoots": ["types"]
+}
diff --git a/types/mem-cache/tslint.json b/types/mem-cache/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mem-cache/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/memcached/index.d.ts b/types/memcached/index.d.ts
index 8e330fa88d..6f5ee7e86c 100644
--- a/types/memcached/index.d.ts
+++ b/types/memcached/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for memcached 2.2
-// Project: https://github.com/3rd-Eden/memcached
+// Project: https://github.com/3rd-Eden/memcached, https://github.com/3rd-eden/node-memcached
 // Definitions by: KentarouTakeda <https://github.com/KentarouTakeda>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/memjs/index.d.ts b/types/memjs/index.d.ts
index 8ab8290ae3..c28eecf3bc 100644
--- a/types/memjs/index.d.ts
+++ b/types/memjs/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for memjs 1.2
 // Project: http://github.com/memcachier/memjs
 // Definitions by: Zongmin Lei <https://github.com/leizongmin>
+//                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -8,27 +9,29 @@
 
 export interface ClientOptions {
     /**
-     * `failoverTime` - how much to wait until retring a failed server. Default
-     * is 60 seconds.
+     * How many seconds to wait until retrying a failed server.
+     * @default 60
      */
     failoverTime?: number;
     /**
-     * `retries` - the number of times to retry an operation in lieu of failures
-     * (default 2)
+     * The number of times to retry an operation in lieu of failures.
+     * @default 2
      */
     retries?: number;
     /**
-     * `retry_delay` - default is 0.2
+     * @default 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
+     * The default expiration in seconds to use. A `0` means never expire,
+     * if it 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).
+     * @default 0
      */
     expires?: number;
     /**
-     * `logger` - a logger object that responds to `log(string)` method calls.
+     * A logger object that responds to `log(string)` method calls.
+     * @default console
      */
     logger?: {
         log(...args: any[]): void;
@@ -103,9 +106,10 @@ export class Client {
      * @param key
      * @param callback
      */
+    get(key: string): Promise<{ value: Buffer; flags: Buffer }>;
     get(
         key: string,
-        callback: (err?: Error | null, value?: Buffer, flags?: Buffer) => void
+        callback: (err: Error | null, value: Buffer | null, flags: Buffer | null) => void
     ): void;
 
     /**
@@ -125,11 +129,12 @@ export class Client {
      * @param options
      * @param callback
      */
+    set(key: string, value: string | Buffer, options: { expires?: number }): Promise<boolean>;
     set(
         key: string,
         value: string | Buffer,
         options: { expires?: number },
-        callback: (err?: Error | null, success?: boolean) => void
+        callback: (err: Error | null, success: boolean | null) => void
     ): void;
 
     /**
@@ -150,11 +155,12 @@ export class Client {
      * @param options
      * @param callback
      */
+    add(key: string, value: string | Buffer, options: { expires?: number }): Promise<boolean>;
     add(
         key: string,
         value: string | Buffer,
         options: { expires?: number },
-        callback: (err?: Error | null, success?: boolean) => void
+        callback: (err: Error | null, success: boolean | null) => void
     ): void;
 
     /**
@@ -175,11 +181,12 @@ export class Client {
      * @param options
      * @param callback
      */
+    replace(key: string, value: string | Buffer, options: { expires?: number }): Promise<boolean>;
     replace(
         key: string,
         value: string | Buffer,
         options: { expires?: number },
-        callback: (err?: Error | null, success?: boolean) => void
+        callback: (err: Error | null, success: boolean | null) => void
     ): void;
 
     /**
@@ -194,10 +201,8 @@ export class Client {
      * @param key
      * @param callback
      */
-    delete(
-        key: string,
-        callback: (err?: Error | null, success?: boolean) => void
-    ): void;
+    delete(key: string): Promise<boolean>;
+    delete(key: string, callback: (err: Error | null, success: boolean | null) => void): void;
 
     /**
      * INCREMENT
@@ -217,15 +222,16 @@ export class Client {
      * @param options
      * @param callback
      */
+    increment(
+        key: string,
+        amount: number,
+        options: { initial?: number; expires?: number }
+    ): Promise<{ success: boolean; value?: number | null }>;
     increment(
         key: string,
         amount: number,
         options: { initial?: number; expires?: number },
-        callback: (
-            err?: Error | null,
-            success?: boolean,
-            value?: number
-        ) => void
+        callback: (err: Error | null, success: boolean | null, value?: number | null) => void
     ): void;
 
     /**
@@ -246,15 +252,16 @@ export class Client {
      * @param options
      * @param callback
      */
+    decrement(
+        key: string,
+        amount: number,
+        options: { initial?: number; expires?: number }
+    ): Promise<{ success: boolean; value?: number | null }>;
     decrement(
         key: string,
         amount: number,
         options: { initial?: number; expires?: number },
-        callback: (
-            err?: Error | null,
-            success?: boolean,
-            value?: number
-        ) => void
+        callback: (err: Error | null, success: boolean | null, value?: number | null) => void
     ): void;
 
     /**
@@ -269,10 +276,11 @@ export class Client {
      * @param value
      * @param callback
      */
+    append(key: string, value: string | Buffer): Promise<boolean>;
     append(
         key: string,
         value: string | Buffer,
-        callback: (err?: Error | null, success?: boolean) => void
+        callback: (err: Error | null, success: boolean | null) => void
     ): void;
 
     /**
@@ -287,10 +295,11 @@ export class Client {
      * @param value
      * @param callback
      */
+    prepend(key: string, value: string | Buffer): Promise<boolean>;
     prepend(
         key: string,
         value: string | Buffer,
-        callback: (err?: Error | null, success?: boolean) => void
+        callback: (err: Error | null, success: boolean | null) => void
     ): void;
 
     /**
@@ -305,10 +314,11 @@ export class Client {
      * @param expires
      * @param callback
      */
+    touch(key: string, expires: number): Promise<boolean>;
     touch(
         key: string,
         expires: number,
-        callback: (err?: Error | null, success?: boolean) => void
+        callback: (err: Error | null, success: boolean | null) => void
     ): void;
 
     /**
@@ -323,12 +333,8 @@ export class Client {
      * `true` (if the operation was successful), or an error.
      * @param callback
      */
-    flush(
-        callback: (
-            err?: Error | null,
-            results?: Record<string, boolean>
-        ) => void
-    ): void;
+    flush(): Promise<Record<string, boolean>>;
+    flush(callback: (err: Error | null, results: Record<string, boolean>) => void): void;
 
     /**
      * STATS_WITH_KEY
@@ -345,11 +351,23 @@ export class Client {
      */
     statsWithKey(
         key: string,
-        callback: (
-            err?: Error | null,
-            server?: string,
-            stats?: Record<string, string>
-        ) => void
+        callback?: (err: Error | null, server: string, stats: Record<string, string> | null) => void
+    ): void;
+
+    /**
+     * STATS
+     *
+     * Fetches memcache stats from 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 callback
+     */
+    stats(
+        callback?: (err: Error | null, server: string, stats: Record<string, string> | null) => void
     ): void;
 
     /**
@@ -366,7 +384,9 @@ export class Client {
      * _server_ is the `"hostname:port"` of the server.
      * @param callback
      */
-    resetStats(callback: (err?: Error | null, server?: string) => void): void;
+    resetStats(
+        callback?: (err: Error | null, server: string, stats: Record<string, string> | null) => void
+    ): void;
 
     /**
      * QUIT
@@ -404,7 +424,7 @@ export class Client {
         key: string,
         request: Buffer,
         seq: number,
-        callback: () => void,
-        retries: number
+        callback?: (err: Error | null, ...args: any[]) => void,
+        retries?: number
     ): void;
 }
diff --git a/types/memjs/memjs-tests.ts b/types/memjs/memjs-tests.ts
index 2e3c34a3b5..021d8abc25 100644
--- a/types/memjs/memjs-tests.ts
+++ b/types/memjs/memjs-tests.ts
@@ -1,10 +1,12 @@
-import * as memjs from "memjs";
+import * as memjs from 'memjs';
 
 const client = memjs.Client.create();
 
-client.set("hello", "world", { expires: 600 }, (err, val) => {
+client.set('hello', 'world', { expires: 600 }, (err, val) => {
     console.log(err, val);
 });
-client.get("hello", (err, val) => {
+client.set('hello', 'world', { expires: 600 }); // $ExpectType Promise<boolean>
+client.get('hello', (err, val) => {
     console.log(err, val);
 });
+client.get('hello'); // $ExpectType Promise<{ value: Buffer; flags: Buffer; }>
diff --git a/types/mermaid/mermaid-tests.ts b/types/mermaid/mermaid-tests.ts
index 6d5b218ce4..a94355fb67 100644
--- a/types/mermaid/mermaid-tests.ts
+++ b/types/mermaid/mermaid-tests.ts
@@ -13,7 +13,7 @@ mermaid.initialize(config);
 // mermaidAPI usage
 
 const { mermaidAPI } = mermaid;
-mermaidAPI.initalize({});
+mermaidAPI.initialize({});
 
 const element = document.querySelector("#graphDiv")!;
 
diff --git a/types/mermaid/mermaidAPI.d.ts b/types/mermaid/mermaidAPI.d.ts
index 11077d88c4..127a679dae 100644
--- a/types/mermaid/mermaidAPI.d.ts
+++ b/types/mermaid/mermaidAPI.d.ts
@@ -240,7 +240,7 @@ declare namespace mermaidAPI {
 
     function parse(text: string): any;
 
-    function initalize(options: Config): void;
+    function initialize(options: Config): void;
 
     function getConfig(): Config;
 }
diff --git a/types/meteor-astronomy/index.d.ts b/types/meteor-astronomy/index.d.ts
index e23834963c..e2be0326b3 100644
--- a/types/meteor-astronomy/index.d.ts
+++ b/types/meteor-astronomy/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for meteor-astronomy 2.6
+// Type definitions for non-npm package meteor-astronomy 2.6
 // Project: https://github.com/jagi/meteor-astronomy/
 // Definitions by: Igor Golovin <https://github.com/Deadly0>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/meteor-collection-hooks/index.d.ts b/types/meteor-collection-hooks/index.d.ts
index 73784822ea..1b5a5d74d6 100644
--- a/types/meteor-collection-hooks/index.d.ts
+++ b/types/meteor-collection-hooks/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Meteor package matb33:collection-hooks 0.8
+// Type definitions for non-npm package Meteor package matb33:collection-hooks 0.8
 // Project: https://github.com/matb33/meteor-collection-hooks
 // Definitions by: Trygve Wastvedt <https://github.com/twastvedt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/meteor-universe-i18n/index.d.ts b/types/meteor-universe-i18n/index.d.ts
index 66ba85ff90..a577b0185e 100644
--- a/types/meteor-universe-i18n/index.d.ts
+++ b/types/meteor-universe-i18n/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for https://github.com/vazco/meteor-universe-i18n 1.14
+// Type definitions for non-npm package https://github.com/vazco/meteor-universe-i18n 1.14
 // Project: meteor-universe-i18n
 // Definitions by: Mathias Scherer <https://github.com/mathewmeconry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/meteor/globals/meteor.d.ts b/types/meteor/globals/meteor.d.ts
index 7a90b0611e..36757b98d1 100644
--- a/types/meteor/globals/meteor.d.ts
+++ b/types/meteor/globals/meteor.d.ts
@@ -25,7 +25,7 @@ declare module Meteor {
         _id?: string;
         username?: string;
         emails?: UserEmail[];
-        createdAt?: number;
+        createdAt?: Date;
         profile?: any;
         services?: any;
     }
@@ -49,7 +49,15 @@ declare module Meteor {
     /** Error **/
 
     /** Method **/
-    function methods(methods: Object): void;
+    interface MethodThisType {
+        isSimulation: boolean;
+        userId: string | null;
+        connection: Connection | null;
+        setUserId(userId: string): void;
+        unblock(): void;
+    }
+
+    function methods(methods: {[key: string]: (this: MethodThisType, ...args: any[]) => any}): void;
 
     function call(name: string, ...args: any[]): any;
 
@@ -195,7 +203,7 @@ declare module Meteor {
     function onConnection(callback: Function): void;
     /** Connection **/
 
-    function publish(name: string, func: Function): void;
+    function publish(name: string, func: (this: Subscription, ...args: any[]) => void): void;
 
     function _debug(...args: any[]): void;
 }
diff --git a/types/meteor/meteor.d.ts b/types/meteor/meteor.d.ts
index ca08c31c98..7392758e34 100644
--- a/types/meteor/meteor.d.ts
+++ b/types/meteor/meteor.d.ts
@@ -26,7 +26,7 @@ declare module "meteor/meteor" {
             _id?: string;
             username?: string;
             emails?: UserEmail[];
-            createdAt?: number;
+            createdAt?: Date;
             profile?: any;
             services?: any;
         }
@@ -50,7 +50,15 @@ declare module "meteor/meteor" {
         /** Error **/
 
         /** Method **/
-        function methods(methods: Object): void;
+        interface MethodThisType {
+            isSimulation: boolean;
+            userId: string | null;
+            connection: Connection | null;
+            setUserId(userId: string): void;
+            unblock(): void;
+        }
+
+        function methods(methods: {[key: string]: (this: MethodThisType, ...args: any[]) => any}): void;
 
         function call(name: string, ...args: any[]): any;
 
@@ -63,11 +71,16 @@ declare module "meteor/meteor" {
         /** Method **/
 
         /** Url **/
-        function absoluteUrl(path?: string, options?: {
-            secure?: boolean;
-            replaceLocalhost?: boolean;
-            rootUrl?: string;
-        }): string;
+        var absoluteUrl: {
+          (path?: string, options?: absoluteUrlOptions): string;
+          defaultOptions: absoluteUrlOptions;
+        }
+
+        interface absoluteUrlOptions {
+          secure?: boolean;
+          replaceLocalhost?: boolean;
+          rootUrl?: string;
+        }
         /** Url **/
 
         /** Timeout **/
@@ -196,7 +209,7 @@ declare module "meteor/meteor" {
         function onConnection(callback: Function): void;
         /** Connection **/
 
-        function publish(name: string, func: Function): void;
+        function publish(name: string, func: (this: Subscription, ...args: any[]) => void): void;
 
         function _debug(...args: any[]): void;
     }
diff --git a/types/meteor/mongo.d.ts b/types/meteor/mongo.d.ts
index 84b2d53528..079bf6272d 100644
--- a/types/meteor/mongo.d.ts
+++ b/types/meteor/mongo.d.ts
@@ -96,7 +96,7 @@ declare module "meteor/mongo" {
             { $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] }
+            [P in keyof T]?: OnlyElementsOfArrays<T[P]> | { $each: T[P] }
         }
         type CurrentDateModifier = { $type: "timestamp" | "date" } | true
         type Modifier<T> = T | {
diff --git a/types/meteor/test/meteor-tests.ts b/types/meteor/test/meteor-tests.ts
index 8e14f39fb1..db6815caf2 100644
--- a/types/meteor/test/meteor-tests.ts
+++ b/types/meteor/test/meteor-tests.ts
@@ -246,7 +246,13 @@ Items.insert({ list: groceriesId, name: "Persimmons" });
 /**
  * From Collections, collection.update section
  */
-var Players = new Mongo.Collection('Players');
+
+interface Players {
+  score: number
+  badges: string[]
+}
+
+var Players: Mongo.Collection<Players> = new Mongo.Collection('Players');
 
 Template['adminDashboard'].events({
     'click .givePoints': function () {
@@ -265,6 +271,17 @@ Meteor.methods({
     }
 });
 
+/**
+ * Also from Collections, collection.update section
+ */
+Meteor.methods({
+    declareWinners: function () {
+        Players.update({ score: { $gt: 10 } },
+            { $addToSet: { badges: {$each: ["Winner", "Super"]} } },
+            { multi: true });
+    }
+});
+
 /**
  * From Collections, collection.remove section
  */
@@ -795,3 +812,10 @@ const collectionWithoutConnection = new Mongo.Collection<MonkeyDAO>("monkey", {
 });
 
 }  // End of namespace
+
+// absoluteUrl
+Meteor.absoluteUrl('/sub', {rootUrl: 'http://wonderful.com'});
+Meteor.absoluteUrl.defaultOptions = {
+  rootUrl: 'http://123.com',
+  secure: false
+};
diff --git a/types/mfiles/index.d.ts b/types/mfiles/index.d.ts
index 6816f1d889..e59304f11c 100644
--- a/types/mfiles/index.d.ts
+++ b/types/mfiles/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for M-Files UI Extensibility 11.3
+// Type definitions for non-npm package M-Files UI Extensibility 11.3
 // Project: http://www.m-files.com/UI_Extensibility_Framework/
 // Definitions by: Arsène von Wyss <https://github.com/avonwyss>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/micromodal/index.d.ts b/types/micromodal/index.d.ts
new file mode 100644
index 0000000000..3796eba976
--- /dev/null
+++ b/types/micromodal/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for micromodal 0.3
+// Project: https://github.com/ghosh/micromodal#readme
+// Definitions by: Wayne Carson <https://github.com/wcarson>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * MicroModal configuration options
+ */
+export interface MicroModalConfig {
+    /** This is fired when the modal is opening. */
+    onShow?: (modal?: HTMLElement) => void;
+
+    /** This is fired when the modal is closing. */
+    onClose?: (modal?: HTMLElement) => void;
+
+    /** Custom data attribute to open modal. Default is data-micromodal-trigger. */
+    openTrigger?: string;
+
+    /** Custom data attribute to close modal. Default is data-micromodal-close. */
+    closeTrigger?: string;
+
+    /** This disables scrolling on the page while the modal is open. The default value is false. */
+    disableScroll?: boolean;
+
+    /** Disable auto focus on first focusable element. Default is false */
+    disableFocus?: boolean;
+
+    /**
+     * Set this to true if using css animations to hide the modal. This allows it to wait for the animation to
+     * finish before removing it from the DOM. Default is false
+     */
+    awaitCloseAnimation?: boolean;
+
+    /** This option suppresses the console warnings if passed as true. The default value is false. */
+    debugMode?: boolean;
+}
+
+/**
+ * MicroModal controller
+ */
+declare namespace MicroModal {
+    /**
+     * Binds click handlers to all modal triggers
+     * @param config configuration options
+     */
+    function init(config?: MicroModalConfig): void;
+
+    /**
+     * Shows a particular modal
+     * @param targetModal The id of the modal to display
+     * @param config configuration options
+     */
+    function show(targetModal: string, config?: MicroModalConfig): void;
+
+    /**
+     * Closes the active modal
+     */
+    function close(): void;
+}
+
+export default MicroModal;
diff --git a/types/micromodal/micromodal-tests.ts b/types/micromodal/micromodal-tests.ts
new file mode 100644
index 0000000000..e2d2d386bd
--- /dev/null
+++ b/types/micromodal/micromodal-tests.ts
@@ -0,0 +1,18 @@
+import MicroModal, { MicroModalConfig } from 'micromodal';
+
+const config: MicroModalConfig = {
+    onShow: (modal) => { console.log(modal!.id); },
+    onClose: (modal) => { console.log(modal!.id); },
+    openTrigger: 'data-modal-open',
+    closeTrigger: 'data-modal-close',
+    disableScroll: true,
+    disableFocus: true,
+    awaitCloseAnimation: true,
+    debugMode: true
+};
+
+MicroModal.init(config);
+
+MicroModal.show('my-modal');
+
+MicroModal.close();
diff --git a/types/micromodal/tsconfig.json b/types/micromodal/tsconfig.json
new file mode 100644
index 0000000000..58ce896244
--- /dev/null
+++ b/types/micromodal/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",
+        "micromodal-tests.ts"
+    ]
+}
diff --git a/types/micromodal/tslint.json b/types/micromodal/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/micromodal/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/microsoftteams/index.d.ts b/types/microsoftteams/index.d.ts
index 497090cfa3..3aa56fd325 100644
--- a/types/microsoftteams/index.d.ts
+++ b/types/microsoftteams/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for microsoftteams 1.2
+// Type definitions for non-npm package microsoftteams 1.2
 // Project: https://github.com/OfficeDev/microsoft-teams-library-js
 // Definitions by: Bhargav Krishna <https://github.com/WrathOfZombies>
 //                 Jay Ongg <https://github.com/jayongg>
diff --git a/types/mime/index.d.ts b/types/mime/index.d.ts
index 2ff497ac12..771898cf91 100644
--- a/types/mime/index.d.ts
+++ b/types/mime/index.d.ts
@@ -13,5 +13,3 @@ export interface TypeMap { [key: string]: string[]; }
 export function getType(path: string): string | null;
 export function getExtension(mime: string): string | null;
 export function define(mimes: TypeMap, force?: boolean): void;
-
-export const default_type: string;
diff --git a/types/mina/index.d.ts b/types/mina/index.d.ts
index 1fb55924c0..c79c124bf9 100644
--- a/types/mina/index.d.ts
+++ b/types/mina/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for mina Snap-SVG 0.4
-// Project: https://github.com/adobe-webplatform/Snap.svg
+// Project: https://github.com/adobe-webplatform/Snap.svg, http://onlyvc.us/mina
 // Definitions by: Lars Klein <https://github.com/lhk>, Mattanja Kern <https://github.com/mattanja>, Andrey Kurdyumov <https://github.com/kant2002>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/mirrorx/index.d.ts b/types/mirrorx/index.d.ts
index e2fa0ee465..1e048553e7 100644
--- a/types/mirrorx/index.d.ts
+++ b/types/mirrorx/index.d.ts
@@ -147,7 +147,7 @@ export interface Renderer {
   ): React.Component<P, React.ComponentState> | Element | void;
 
   (
-    element: Array<React.ReactElement<any>>,
+    element: React.ReactElement[],
     container: Element | null,
     callback?: () => void
   ): React.Component<any, React.ComponentState> | Element | void;
diff --git a/types/mithril-global/index.d.ts b/types/mithril-global/index.d.ts
index fe1814e4ed..9519bca43c 100644
--- a/types/mithril-global/index.d.ts
+++ b/types/mithril-global/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mithril 1.1
+// Type definitions for non-npm package Mithril 1.1
 // Project: https://mithril.js.org/
 // Definitions by: Mike Linkovich <https://github.com/spacejack>, Isiah Meadows <https://github.com/isiahmeadows>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/mithril/index.d.ts b/types/mithril/index.d.ts
index 83de8c9825..2457ff9c51 100644
--- a/types/mithril/index.d.ts
+++ b/types/mithril/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Mithril 1.1
-// Project: https://mithril.js.org/
+// Project: https://mithril.js.org/, https://github.com/mithriljs/mithril.js
 // Definitions by: Mike Linkovich <https://github.com/spacejack>, András Parditka <https://github.com/andraaspar>, Isiah Meadows <https://github.com/isiahmeadows>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
@@ -94,8 +94,9 @@ declare namespace Mithril {
 		set(route: string, data?: any, options?: RouteOptions): void;
 		/** Defines a router prefix which is a fragment of the URL that dictates the underlying strategy used by the router. */
 		prefix(urlFragment: string): void;
-		/** This method is meant to be used in conjunction with an <a> Vnode's oncreate hook. */
-		link(vnode: Vnode<any, any>): (e?: Event) => any;
+		/** This method is meant to be used in conjunction with an <a> Vnode's oncreate/onupdate hooks. */
+        link(vnode: Vnode<any, any>): (e?: Event) => any;
+        link(options: RouteOptions): (vnode: Vnode<any, any>) => (e?: Event) => any;
 		/** Returns the named parameter value from the current route. */
 		param(name: string): string;
 		/** Gets all route parameters. */
diff --git a/types/mithril/test/test-route.ts b/types/mithril/test/test-route.ts
index 030a260bcb..a7737af671 100644
--- a/types/mithril/test/test-route.ts
+++ b/types/mithril/test/test-route.ts
@@ -125,4 +125,18 @@ route.set('/test2', undefined, {
 
 const path: string = route.get();
 
-const fn = route.link(h('div', 'test'));
+const fn1: (e?: Event) => any = route.link(h('div', 'test'));
+
+const fn2: (v: Vnode<any, any>) => any = route.link({
+    replace: true,
+	state: {abc: 123},
+	title: "Title"
+});
+
+const ex1 = h('a', {href: '/url', oncreate: route.link});
+
+const ex2 = h('a', {href: '/url', oncreate: route.link({
+    replace: true,
+	state: {abc: 123},
+	title: "Title"
+})});
diff --git a/types/mixpanel/index.d.ts b/types/mixpanel/index.d.ts
index 08bbe26720..901e3a033a 100644
--- a/types/mixpanel/index.d.ts
+++ b/types/mixpanel/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Mixpanel 2.14
-// Project: https://mixpanel.com/
+// Project: https://mixpanel.com/, https://github.com/mixpanel/mixpanel-node
 //          https://github.com/mixpanel/mixpanel-js
 // Definitions by: Knut Eirik Leira Hjelle <https://github.com/hjellek>
 //                 Manduro <https://github.com/Manduro>
diff --git a/types/mjml-react/index.d.ts b/types/mjml-react/index.d.ts
index decb895010..80efb1c75d 100644
--- a/types/mjml-react/index.d.ts
+++ b/types/mjml-react/index.d.ts
@@ -24,7 +24,7 @@ export namespace utils {
     function getTextAlign(value: string, fallback?: TextAlignment): TextAlignment;
 }
 
-export function renderToMjml(email: React.ReactElement<any>): string;
+export function renderToMjml(email: React.ReactElement): string;
 
 export interface Mjml2HtmlOptions {
     fonts?: { [key: string]: string };
@@ -35,7 +35,7 @@ export interface Mjml2HtmlOptions {
     filePath?: string;
 }
 
-export function render(email: React.ReactElement<any>, options?: Mjml2HtmlOptions): { html: string; errors: Error[] };
+export function render(email: React.ReactElement, options?: Mjml2HtmlOptions): { html: string; errors: Error[] };
 
 // Components
 
diff --git a/types/mjml/index.d.ts b/types/mjml/index.d.ts
index 7dd0dbda72..867dfb7145 100644
--- a/types/mjml/index.d.ts
+++ b/types/mjml/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for mjml 4.0
-// Project: https://github.com/mjmlio/mjml
+// Project: https://github.com/mjmlio/mjml, https://mjml.io
 // Definitions by: aahoughton <https://github.com/aahoughton>
 //                 marpstar   <https://github.com/marpstar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/mocha/index.d.ts b/types/mocha/index.d.ts
index 868a6c332d..5ccf573a07 100644
--- a/types/mocha/index.d.ts
+++ b/types/mocha/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for mocha 5.2
-// Project: http://mochajs.org/
+// Project: https://mochajs.org
 // Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid>
 //                 otiai10 <https://github.com/otiai10>
 //                 jt000 <https://github.com/jt000>
diff --git a/types/modernizr/index.d.ts b/types/modernizr/index.d.ts
index a9cfb92f54..5b03bdd833 100644
--- a/types/modernizr/index.d.ts
+++ b/types/modernizr/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Modernizr 3.5
-// Project: http://modernizr.com/
+// Project: http://modernizr.com/, https://github.com/modernizr/modernizr
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 //                 Theodore Brown <https://github.com/theodorejb>
 //                 Leon Yu <https://github.com/leonyu>
diff --git a/types/moment-precise-range-plugin/index.d.ts b/types/moment-precise-range-plugin/index.d.ts
new file mode 100644
index 0000000000..ad28b3d009
--- /dev/null
+++ b/types/moment-precise-range-plugin/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for moment-precise-range 0.2
+// Project: https://github.com/codebox/moment-precise-range
+// Definitions by: Mitchell Grice <https://github.com/gricey432>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import moment = require('moment');
+
+export = moment;
+
+declare module "moment" {
+    interface PreciseRangeValueObject {
+        years: number;
+        months: number;
+        days: number;
+        hours: number;
+        minutes: number;
+        seconds: number;
+        firstDateWasLater: boolean;
+    }
+
+    interface Moment {
+        preciseDiff(d2: Moment, returnValueObject?: false): string;
+        preciseDiff(d2: Moment, returnValueObject: true): PreciseRangeValueObject;
+    }
+
+    function preciseDiff(d1: Moment, d2: Moment, returnValueObject?: false): string;
+    function preciseDiff(d1: Moment, d2: Moment, returnValueObject: true): PreciseRangeValueObject;
+}
diff --git a/types/moment-precise-range-plugin/moment-precise-range-plugin-tests.ts b/types/moment-precise-range-plugin/moment-precise-range-plugin-tests.ts
new file mode 100644
index 0000000000..427d513fb9
--- /dev/null
+++ b/types/moment-precise-range-plugin/moment-precise-range-plugin-tests.ts
@@ -0,0 +1,14 @@
+import moment = require("moment");
+import * as momentPreciseRange from "moment-precise-range-plugin";
+
+// Static methods
+const m1 = moment.utc();
+const m2 = moment.utc();
+moment.preciseDiff(m1, m2);
+moment.preciseDiff(m1, m2, true);
+moment.preciseDiff(m1, m2, false);
+
+// Instance methods
+m1.preciseDiff(m2);
+m1.preciseDiff(m2, true);
+m1.preciseDiff(m2, false);
diff --git a/types/moment-precise-range-plugin/package.json b/types/moment-precise-range-plugin/package.json
new file mode 100644
index 0000000000..19e5fb0d14
--- /dev/null
+++ b/types/moment-precise-range-plugin/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "moment": ">=2.14.0"
+    }
+}
diff --git a/types/moment-precise-range-plugin/tsconfig.json b/types/moment-precise-range-plugin/tsconfig.json
new file mode 100644
index 0000000000..cfb6dcbd4d
--- /dev/null
+++ b/types/moment-precise-range-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",
+        "moment-precise-range-plugin-tests.ts"
+    ]
+}
diff --git a/types/moment-precise-range-plugin/tslint.json b/types/moment-precise-range-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/moment-precise-range-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/moment-range/index.d.ts b/types/moment-range/index.d.ts
index f45ab0ed8b..e230550ace 100644
--- a/types/moment-range/index.d.ts
+++ b/types/moment-range/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Moment-range.js 3.1
-// Project: https://github.com/gf3/moment-range
+// Project: https://github.com/rotaready/moment-range
 // Definitions by: Bart van den Burg <https://github.com/Burgov>
 //                 Wilgert Velinga <https://github.com/wilgert>
 //                 Juan Francisco Adame <https://github.com/franjuan>
diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index b7d3b5d9c6..2a01b58a95 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -16,6 +16,8 @@
 //                 Dan Manastireanu <https://github.com/danmana>
 //                 stablio <https://github.com/stablio>
 //                 Emmanuel Gautier <https://github.com/emmanuelgautier>
+//                 Frontend Monster <https://github.com/frontendmonster>
+//                 Ming Chen <https://github.com/mingchen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -165,16 +167,7 @@ declare module "mongoose" {
 
   export function startSession(options?: mongodb.SessionOptions, cb?: (err: any, session: mongodb.ClientSession) => void): Promise<mongodb.ClientSession>;
 
-  class CastError extends Error {
-    /**
-     * The Mongoose CastError constructor
-     * @param type The name of the type
-     * @param value The value that failed to cast
-     * @param path The path a.b.c in the doc where this cast error occurred
-     * @param reason The original error that was thrown
-     */
-    constructor(type: string, value: any, path: string, reason?: NativeError);
-  }
+  export type CastError = Error.CastError;
 
   /*
    * section connection.js
@@ -316,6 +309,16 @@ declare module "mongoose" {
     readyState: number;
   }
 
+  /**
+   * Connection optional settings.
+   *
+   * see
+   *   https://mongoosejs.com/docs/api.html#mongoose_Mongoose-connect
+   * and
+   *   http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html
+   * for all available options.
+   *
+   */
   interface ConnectionOptionsBase {
     /** database Name for Mongodb Atlas Connection */
     dbName?: string;
@@ -334,16 +337,18 @@ declare module "mongoose" {
     /** Use ssl connection (needs to have a mongod server with ssl support) (default: true) */
     ssl?: boolean;
     /** Validate mongod server certificate against ca (needs to have a mongod server with ssl support, 2.4 or higher) */
-    sslValidate?: object;
+    sslValidate?: boolean;
     /** Number of connections in the connection pool for each server instance, set to 5 as default for legacy reasons. */
     poolSize?: number;
     /** Reconnect on error (default: true) */
     autoReconnect?: boolean;
-    /** TCP KeepAlive on the socket with a X ms delay before start (default: 0). */
-    keepAlive?: number;
-    /** TCP Connection timeout setting (default: 0) */
+    /** TCP Connection keep alive enabled (default: true) */
+    keepAlive?: boolean;
+    /** The number of milliseconds to wait before initiating keepAlive on the TCP socket (default 30000) */
+    keepAliveInitialDelay?: number;
+    /** TCP Connection timeout setting (default: 30000) */
     connectTimeoutMS?: number;
-    /** TCP Socket timeout setting (default: 0) */
+    /** TCP Socket timeout setting (default: 360000) */
     socketTimeoutMS?: number;
     /** If the database authentication is dependent on another databaseName. */
     authSource?: string;
@@ -495,6 +500,11 @@ declare module "mongoose" {
    * http://mongoosejs.com/docs/api.html#error-js
    */
   class Error extends global.Error {
+
+    // "MongooseError" for instances of the current class,
+    // an other string for instances of derived classes.
+    name: "MongooseError" | string;
+
     /**
      * MongooseError constructor
      * @param msg Error message
@@ -530,6 +540,10 @@ declare module "mongoose" {
      * the document.
      */
     export class DocumentNotFoundError extends Error {
+      name: 'DocumentNotFoundError';
+      filter: any;
+      query: any;
+      constructor(filter: any);
     }
 
     /**
@@ -540,10 +554,11 @@ declare module "mongoose" {
      * cast a value.
      */
     export class CastError extends Error {
+      name: 'CastError';
       stringValue: string;
       kind: string;
-      path: string;
       value: any;
+      path: string;
       reason?: any;
       model?: any;
 
@@ -555,13 +570,18 @@ declare module "mongoose" {
     /**
      * section error/validation.js
      * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.ValidationError
+
+     * An instance of this error class will be returned when [validation](/docs/validation.html) failed.
+     * The `errors` property contains an object whose keys are the paths that failed and whose values are
+     * instances of CastError or ValidationError.
      *
-     * An instance of this error class will be returned when [validation](http://mongoosejs.com/docs/validation.html) failed.
      */
     export class ValidationError extends Error {
-      errors: any;
+      name: 'ValidationError';
 
-      constructor(instance: MongooseDocument);
+      errors: {[path: string]: ValidatorError | CastError};
+
+      constructor(instance?: MongooseDocument);
 
       /** Console.log helper */
       toString(): string;
@@ -580,13 +600,14 @@ declare module "mongoose" {
      * A `ValidationError` has a hash of `errors` that contain individual `ValidatorError` instances
      */
     export class ValidatorError extends Error {
-      properties: any;
+      name: 'ValidatorError';
+      properties: {message: string, type?: string, path?: string, value?: any, reason?: any};
       kind: string;
       path: string;
       value: any;
       reason: any;
 
-      constructor(properties: any);
+      constructor(properties: {message?: string, type?: string, path?: string, value?: any, reason?: any});
 
       formatMessage(msg: string | Function, properties: any): string;
 
@@ -602,6 +623,7 @@ declare module "mongoose" {
      * the [`versionKey` option](http://mongoosejs.com/docs/guide.html#versionKey) for more information.
      */
     export class VersionError extends Error {
+      name: 'VersionError';
       version: any;
       modifiedPaths: Array<any>;
 
@@ -617,6 +639,7 @@ declare module "mongoose" {
      * information.
      */
     export class ParallelSaveError extends Error {
+      name: 'ParallelSaveError';
       constructor(doc: MongooseDocument);
     }
 
@@ -628,6 +651,7 @@ declare module "mongoose" {
      * See [the FAQ about `OverwriteModelError`](http://mongoosejs.com/docs/faq.html#overwrite-model-error).
      */
     export class OverwriteModelError extends Error {
+      name: 'OverwriteModelError';
       constructor(name: string);
     }
 
@@ -638,6 +662,7 @@ declare module "mongoose" {
      * Thrown when you try to access a model that has not been registered yet
      */
     export class MissingSchemaError extends Error {
+      name: 'MissingSchemaError';
       constructor(name: string);
     }
 
@@ -649,6 +674,7 @@ declare module "mongoose" {
      * and then modified the array in an unsafe way.
      */
     export class DivergentArrayError extends Error {
+      name: 'DivergentArrayError';
       constructor(paths: Array<any>);
     }
   }
@@ -1310,7 +1336,7 @@ declare module "mongoose" {
      * @param kind optional kind property for the error
      * @returns the current ValidationError, with all currently invalidated paths
      */
-    invalidate(path: string, errorMsg: string | NativeError, value: any, kind?: string): Error.ValidationError | boolean;
+    invalidate(path: string, errorMsg: string | NativeError, value?: any, kind?: string): Error.ValidationError | boolean;
 
     /** Returns true if path was directly set and modified, else false. */
     isDirectModified(path: string): boolean;
@@ -1408,9 +1434,9 @@ declare module "mongoose" {
      * Executes registered validation rules (skipping asynchronous validators) for this document.
      * This method is useful if you need synchronous validation.
      * @param pathsToValidate only validate the given paths
-     * @returns MongooseError if there are errors during validation, or undefined if there is no error.
+     * @returns ValidationError if there are errors during validation, or undefined if there is no error.
      */
-    validateSync(pathsToValidate?: string | string[]): Error;
+    validateSync(pathsToValidate?: string | string[]): Error.ValidationError;
 
     /** Hash containing current validation errors. */
     errors: any;
@@ -2174,8 +2200,7 @@ declare module "mongoose" {
     }): this;
 
     /** Executes this query and returns a promise */
-    then<TRes>(resolve?: (res: T) => void | TRes | PromiseLike<TRes>,
-      reject?: (err: any) => void | TRes | PromiseLike<TRes>): Promise<TRes>;
+    then: Promise<T>["then"];
 
     /**
      * Converts this query to a customized, reusable query
@@ -2240,6 +2265,11 @@ declare module "mongoose" {
      * functions that update validation runs. Does nothing if runValidators is false.
      */
     context?: string;
+    /**
+     *  by default, mongoose only returns the first error that occurred in casting the query.
+     *  Turn on this option to aggregate all the cast errors.
+     */
+      multipleCastError?: boolean;
   }
 
   interface QueryUpdateOptions extends ModelUpdateOptions {
@@ -2343,6 +2373,14 @@ declare module "mongoose" {
 
         /** This schema type's name, to defend against minifiers that mangle function names. */
         static schemaName: string;
+
+        /**
+         * Adds a discriminator type.
+         * @param name discriminator model name
+         * @param schema discriminator model schema
+         */
+        discriminator<U extends Document>(name: string, schema: Schema): Model<U>;
+
       }
 
       /*
@@ -2666,8 +2704,7 @@ declare module "mongoose" {
     sort(arg: string | any): this;
 
     /** Provides promise for aggregate. */
-    then<TRes>(resolve?: (val: T) => void | TRes | PromiseLike<TRes>,
-      reject?: (err: any) => void | TRes | PromiseLike<TRes>): Promise<TRes>;
+    then: Promise<T>["then"];
 
     /**
      * Appends new custom $unwind operator(s) to this aggregate pipeline.
@@ -3347,6 +3384,11 @@ declare module "mongoose" {
     overwrite?: boolean;
     /** other options */
     [other: string]: any;
+    /**
+     *  by default, mongoose only returns the first error that occurred in casting the query.
+     *  Turn on this option to aggregate all the cast errors.
+     */
+      multipleCastError?: boolean;
   }
 
   interface ModelMapReduceOption<T, Key, Val> {
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index 8e6a60fdc7..6d487dd14d 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -173,9 +173,9 @@ const getDB = async (tenant: string)=> {
  * http://mongoosejs.com/docs/api.html#error-js
  */
 var mongooseError: mongoose.Error = new mongoose.Error('error');
+mongooseError.name;
 /* inherited properties */
 mongooseError.message;
-mongooseError.name;
 mongooseError.stack;
 /* static properties */
 mongoose.Error.messages.hasOwnProperty('');
@@ -186,21 +186,22 @@ mongoose.Error.Messages.hasOwnProperty('');
  * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.CastError
  */
 var castError: mongoose.Error.CastError = new mongoose.Error.CastError('', '', '');
-castError.setModel('foo');
+castError.name;
 castError.stringValue;
 castError.kind;
 castError.path;
 castError.value;
+castError.setModel('foo');
 /* inherited properties */
-castError.name;
-castError.stack;
 castError.message;
+castError.stack;
 
 /*
  * section error/validator.js
  * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.ValidatorError
  */
-var validatorError: mongoose.Error.ValidatorError = new mongoose.Error.ValidatorError({ foo: 'bar' })
+var validatorError: mongoose.Error.ValidatorError = new mongoose.Error.ValidatorError({ message: 'bar' })
+validatorError.name;
 validatorError.properties;
 validatorError.kind;
 validatorError.path;
@@ -209,9 +210,8 @@ validatorError.toString().toLowerCase();
 validatorError.formatMessage('foo', {});
 validatorError.formatMessage('foo', (bar: any)=>{ return bar; });
 /* inherited properties */
-validatorError.name;
-validatorError.stack;
 validatorError.message;
+validatorError.stack;
 
 /*
  * section error/validation.js
@@ -219,54 +219,54 @@ validatorError.message;
  */
 var doc = <mongoose.MongooseDocument> {};
 var validationError: mongoose.Error.ValidationError = new mongoose.Error.ValidationError(doc);
+validationError.name;
 validationError.toString().toLowerCase();
 validationError.inspect();
 validationError.toJSON().hasOwnProperty('');
 validationError.addError('foo', validatorError)
 /* inherited properties */
-validationError.name;
-validationError.stack;
 validationError.message;
+validationError.stack;
 
 /*
  * section error/parallelSave.js
  * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.ParallelSaveError
  */
 var parallelSaveError: mongoose.Error.ParallelSaveError = new mongoose.Error.ParallelSaveError(doc);
-/* inherited properties */
 parallelSaveError.name;
-parallelSaveError.stack;
+/* inherited properties */
 parallelSaveError.message;
+parallelSaveError.stack;
 
 /*
  * section error/overwriteModel.js
  * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.OverwriteModelError
  */
 var overwriteModelError: mongoose.Error.OverwriteModelError = new mongoose.Error.OverwriteModelError('foo');
-/* inherited properties */
 overwriteModelError.name;
-overwriteModelError.stack;
+/* inherited properties */
 overwriteModelError.message;
+overwriteModelError.stack;
 
 /*
  * section error/missingSchema.js
  * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.MissingSchemaError
  */
 var missingSchemaError: mongoose.Error.MissingSchemaError = new mongoose.Error.MissingSchemaError('foo');
-/* inherited properties */
 missingSchemaError.name;
-missingSchemaError.stack;
+/* inherited properties */
 missingSchemaError.message;
+missingSchemaError.stack;
 
 /*
  * section error/divergentArray.js
  * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.MissingSchemaError
  */
-var missingSchemaError: mongoose.Error.DivergentArrayError = new mongoose.Error.DivergentArrayError(['foo','bar']);
-/* inherited properties */
+var divergentArrayError: mongoose.Error.DivergentArrayError = new mongoose.Error.DivergentArrayError(['foo','bar']);
 missingSchemaError.name;
-missingSchemaError.stack;
+/* inherited properties */
 missingSchemaError.message;
+missingSchemaError.stack;
 
 const pluralize = mongoose.pluralize();
 const plural: string = pluralize('foo');
@@ -726,6 +726,7 @@ doc.execPopulate().then(function (arg) {
 doc.get('path', Number);
 doc.init(doc).init(doc, {});
 doc.inspect();
+doc.invalidate('path', new Error('hi')).toString();
 doc.invalidate('path', new Error('hi'), 999).toString();
 doc.isDirectModified('path').valueOf();
 doc.isInit('path').valueOf();
@@ -1224,6 +1225,8 @@ var documentarray: mongoose.Schema.Types.DocumentArray = new mongoose.Schema.Typ
 mongoose.Schema.Types.DocumentArray.schemaName.toLowerCase();
 /* inherited properties */
 documentarray.sparse(true);
+/* http://thecodebarbarian.com/mongoose-4.8-embedded-discriminators */
+documentarray.discriminator('name', new mongoose.Schema({ foo: String }));
 
 /*
  * section schema/number.js
@@ -1555,6 +1558,18 @@ mongoose.Promise.all;
 mongoose.model('').findOne()
   .exec().then(cb);
 
+function testPromise_all() {
+  interface IUser extends mongoose.Document {
+    name: string;
+  }
+
+  const User = mongoose.model<IUser>('User', new mongoose.Schema({name: String}))
+
+  const dc: mongoose.DocumentQuery<IUser|null, IUser> = User.findOne({});
+  const dc2: PromiseLike<IUser|null> = dc;
+  Promise.all([dc])
+}
+
 /*
  * section model.js
  * http://mongoosejs.com/docs/api.html#model-js
diff --git a/types/mongorito/index.d.ts b/types/mongorito/index.d.ts
index 2c69c14fd0..3a34eec617 100644
--- a/types/mongorito/index.d.ts
+++ b/types/mongorito/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for mongorito 3.0
-// Project: https://github.com/vadimdemedes/mongorito
+// Project: https://github.com/vadimdemedes/mongorito, https://github.com/vdemedes/mongorito
 // Definitions by: Pinguet62 <https://github.com/pinguet62>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/moo/index.d.ts b/types/moo/index.d.ts
index fd53f98e0a..2dd1a4b4db 100644
--- a/types/moo/index.d.ts
+++ b/types/moo/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for moo 0.4
+// Type definitions for moo 0.5
 // Project: https://github.com/tjvr/moo#readme
 // Definitions by: Nikita Litvin <https://github.com/deltaidea>
 //                 Jörg Vehlow <https://github.com/MofX>
@@ -11,6 +11,15 @@ export as namespace moo;
  */
 export const error: { error: true };
 
+/**
+ * Reserved token for indicating a fallback rule.
+ */
+export const fallback: { fallback: true };
+
+export type TypeMapper = (x: string) => string;
+
+export function keywords(kws: {[k: string]: string | string[]}): TypeMapper;
+
 export function compile(rules: Rules): Lexer;
 
 export function states(states: {[x: string]: Rules}, start?: string): Lexer;
@@ -45,9 +54,11 @@ export interface Rule {
      */
     value?: (x: string) => string;
 
-    keywords?: {
-        [x: string]: string | string[]
-    };
+    /**
+     * Used for mapping one set of types to another.
+     * See https://github.com/no-context/moo#keywords for an example
+     */
+    type?: TypeMapper;
 }
 export interface Rules {
     [x: string]: RegExp | string | string[] | Rule | Rule[];
diff --git a/types/moo/moo-tests.ts b/types/moo/moo-tests.ts
index c82bedd219..5cb9fa6f5b 100644
--- a/types/moo/moo-tests.ts
+++ b/types/moo/moo-tests.ts
@@ -20,20 +20,21 @@ lexer = moo.compile({
 
 lexer = moo.compile({
     IDEN: {
-        match: /[a-zA-Z]+/, keywords: {
+        match: /[a-zA-Z]+/,
+        type: moo.keywords({
             KW: ['while', 'if', 'else', 'moo', 'reloacows']
-        }
+        })
     },
     SPACE: { match: /\s+/, lineBreaks: true }
 });
 
 lexer = moo.compile({
     name: {
-        match: /[a-zA-Z]+/, keywords: {
+        match: /[a-zA-Z]+/, type: moo.keywords({
             'kw-class': 'class',
             'kw-def': 'def',
             'kw-if': 'if',
-        }
+        })
     }
 });
 
diff --git a/types/mozilla-readability/index.d.ts b/types/mozilla-readability/index.d.ts
index 7a7c26fdb8..ee6833be3c 100644
--- a/types/mozilla-readability/index.d.ts
+++ b/types/mozilla-readability/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for mozilla-readability 0.1
+// Type definitions for non-npm package mozilla-readability 0.1
 // Project: https://github.com/mozilla/readability
 // Definitions by: Charles Vandevoorde <https://github.com/charlesvdv>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/mssql/index.d.ts b/types/mssql/index.d.ts
index 891186f7ee..085ab122c1 100644
--- a/types/mssql/index.d.ts
+++ b/types/mssql/index.d.ts
@@ -288,6 +288,12 @@ export declare class RequestError implements Error {
     public name: string;
     public message: string;
     public code: string;
+    public number?: number;
+    public state?: number;
+    public class?: number;
+    public lineNumber?: number;
+    public serverName?: string;
+    public procName?: string;
 }
 
 export declare class Transaction extends events.EventEmitter {
diff --git a/types/mui-datatables/index.d.ts b/types/mui-datatables/index.d.ts
new file mode 100644
index 0000000000..2dffabbc53
--- /dev/null
+++ b/types/mui-datatables/index.d.ts
@@ -0,0 +1,174 @@
+// Type definitions for mui-datatables 2.0
+// Project: https://github.com/gregnb/mui-datatables
+// Definitions by: Jeroen "Favna" Claassens <https://github.com/favna>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+interface MUIDataTableData {
+    index: number;
+    data: any[];
+}
+
+interface MUIDataTableStateRows {
+    data: string[];
+    lookup: any;
+}
+
+interface MUIDataTableState {
+    announceText: string | null;
+    activeColumn: string | null;
+    page: number;
+    rowsPerPage: number;
+    filterList: string[][];
+    selectedRows: MUIDataTableStateRows;
+    expandedRows: MUIDataTableStateRows;
+    showResponsive: boolean;
+    searchText: string | null;
+    rowsPerPageOptions: number[];
+}
+
+interface MUIDataTableMeta {
+    rowIndex: number;
+    columnIndex: number;
+    columnData: MUIDataTableColumnOptions[];
+    rowData: any[];
+    tableData: MUIDataTableData[];
+    tableState: MUIDataTableState;
+}
+
+interface MUIDataTableCustomHeadRenderer extends MUIDataTableColumn {
+    index: number;
+}
+
+interface MUIDataTableColumn {
+    name: string;
+    label?: string;
+    options?: MUIDataTableColumnOptions;
+}
+
+interface MUIDataTableTextLabelsBody {
+    noMatch: string;
+    toolTip: string;
+}
+
+interface MUIDataTableTextLabelsPagination {
+    next: string;
+    previous: string;
+    rowsPerPage: string;
+    displayRows: string;
+}
+
+interface MUIDataTableTextLabelsToolbar {
+    search: string;
+    downloadCsv: string;
+    print: string;
+    viewColumns: string;
+    filterTable: string;
+}
+
+interface MUIDataTableTextLabelsFilter {
+    all: string;
+    title: string;
+    reset: string;
+}
+
+interface MUIDataTableTextLabelsViewColumns {
+    title: string;
+    titleAria: string;
+}
+
+interface MUIDataTableTextLabelsSelectedRows {
+    text: string;
+    delete: string;
+    deleteAria: string;
+}
+
+export interface MUIDataTableTextLabels {
+    body: MUIDataTableTextLabelsBody;
+    pagination: MUIDataTableTextLabelsPagination;
+    toolbar: MUIDataTableTextLabelsToolbar;
+    filter: MUIDataTableTextLabelsFilter;
+    viewColumns: MUIDataTableTextLabelsViewColumns;
+    selectedRows: MUIDataTableTextLabelsSelectedRows;
+}
+
+export interface MUIDataTableColumnOptions {
+    display?: 'true' | 'false' | 'excluded';
+    filter?: boolean;
+    filterList?: string[];
+    filterOptions?: string[];
+    sort?: boolean;
+    sortDirection?: 'asc' | 'desc';
+    download?: boolean;
+    hint?: string;
+    customHeadRender?: (columnMeta: MUIDataTableCustomHeadRenderer, updateDirection: (params: any) => any) => string;
+    customBodyRender?: (value: any, tableMeta: MUIDataTableMeta, updateValue: (s: any, c: any, p: any) => any) => string | React.ReactNode;
+    setCellProps?: (cellValue: string, rowIndex: number, columnIndex: number) => string;
+}
+
+export interface MUIDataTableOptions {
+    page?: number;
+    count?: number;
+    serverSide?: boolean;
+    rowsSelected?: any[];
+    filterType?: 'dropdown' | 'checkbox' | 'multiselect' | 'textField';
+    textLabels?: MUIDataTableTextLabels;
+    pagination?: boolean;
+    selectableRows?: boolean;
+    IsRowSelectable?: (dataIndex: any) => boolean;
+    resizableColumns?: boolean;
+    expandableRows?: boolean;
+    renderExpandableRow?: (rowData: string[], rowMeta: { dataIndex: number; rowIndex: number }) => React.ReactNode;
+    customToolbar?: () => React.ReactNode;
+    customToolbarSelect?: () => React.ReactNode;
+    customFooter?: () => React.ReactNode;
+    customSort?: (data: any[], colIndex: number, order: string) => any[];
+    elevation?: number;
+    caseSensitive?: boolean;
+    responsive?: 'stacked' | 'scroll';
+    rowsPerPage?: number;
+    rowsPerPageOptions?: number[];
+    rowHover?: boolean;
+    fixedHeader?: boolean;
+    sortFilterList?: boolean;
+    sort?: boolean;
+    filter?: boolean;
+    search?: boolean;
+    print?: boolean;
+    download?: boolean;
+    downloadOptions?: { filename: string; separator: string };
+    viewColumns?: boolean;
+    onRowsSelect?: (currentRowsSelected: any[], rowsSelected: any[]) => void;
+    onRowsDelete?: (rowsDeleted: any[]) => void;
+    onRowClick?: (rowData: string[], rowMeta: { dataIndex: number; rowIndex: number }) => void;
+    onCellClick?: (colIndex: number, rowIndex: number) => void;
+    onChangePage?: (currentPage: number) => void;
+    onChangeRowsPerPage?: (numberOfRows: number) => void;
+    onSearchChange?: (searchText: string) => void;
+    onFilterChange?: (changedColumn: string, filterList: any[]) => void;
+    onColumnSortChange?: (changedColumn: string, direction: string) => void;
+    onColumnViewChange?: (changedColumn: string, action: string) => void;
+    onTableChange?: (action: string, tableState: object) => void;
+    setRowProps?: (row: any[], rowIndex: number) => any;
+}
+
+export type MUIDataTableColumnDef = string | MUIDataTableColumn;
+
+export interface MuiDatatablesTableState {
+    page: number;
+    rowsPerPage: number;
+    filterList: any[];
+}
+
+export interface MUIDataTableProps {
+    title: string;
+    columns: MUIDataTableColumnDef[];
+    data: any[];
+    options?: MUIDataTableOptions;
+}
+
+declare const MUIDataTable: React.ComponentType<MUIDataTableProps>;
+
+export default MUIDataTable;
diff --git a/types/mui-datatables/mui-datatables-tests.tsx b/types/mui-datatables/mui-datatables-tests.tsx
new file mode 100644
index 0000000000..c6a477ea08
--- /dev/null
+++ b/types/mui-datatables/mui-datatables-tests.tsx
@@ -0,0 +1,76 @@
+import MUIDataTable, { MUIDataTableOptions, MUIDataTableTextLabels } from 'mui-datatables';
+import * as React from 'react';
+
+interface Props extends MUIDataTableOptions {
+    data: any;
+    title: string;
+    textLabels?: MUIDataTableTextLabels;
+}
+
+class MuiCustomTable extends React.Component<Props> {
+    private readonly data: string[][] = this.props.data.map((asset: any) => Object.values(asset));
+    private readonly columns = this.props.data
+                                .map((entry: any) => Object.keys(entry))
+                                .flat()
+                                .map((title: string) => title.toUpperCase())
+                                .filter((element: string, index: number, array: string[]) => array.indexOf(element) === index);
+    private readonly TableOptions: MUIDataTableOptions = {
+        filterType: 'checkbox',
+        responsive: 'scroll',
+        selectableRows: false,
+        elevation: 0,
+        rowsPerPageOptions: [5, 10, 20, 25, 50, 100],
+        downloadOptions: {
+            filename: 'filename.csv',
+            separator: ','
+        },
+        sortFilterList: false,
+        textLabels: {
+            body: {
+                noMatch: 'Sorry, no matching records found',
+                toolTip: 'Sort',
+            },
+            pagination: {
+                next: 'Next Page',
+                previous: 'Previous Page',
+                rowsPerPage: 'Rows per page:',
+                displayRows: 'of',
+            },
+            toolbar: {
+                search: 'Search',
+                downloadCsv: 'Download CSV',
+                print: 'Print',
+                viewColumns: 'View Columns',
+                filterTable: 'Filter Table',
+            },
+            filter: {
+                all: 'All',
+                title: 'FILTERS',
+                reset: 'RESET',
+            },
+            viewColumns: {
+                title: 'Show Columns',
+                titleAria: 'Show/Hide Table Columns',
+            },
+            selectedRows: {
+                text: 'rows(s) selected',
+                delete: 'Delete',
+                deleteAria: 'Delete Selected Rows',
+            }
+        }
+    };
+
+    render() {
+        return (<MUIDataTable title={this.props.title} data={this.data} columns={this.columns} options={this.TableOptions}/>);
+    }
+}
+
+const TableFruits = [
+    {id: 1, name: "Apple", amount: 1},
+    {id: 2, name: "Pear", amount: 2},
+    {id: 3, name: "Strawberry", amount: 5},
+    {id: 4, name: "Banana", amount: 7},
+    {id: 5, name: "Orange", amount: 9},
+];
+
+<MuiCustomTable title="Awesome Table" data={TableFruits}/>;
diff --git a/types/mui-datatables/tsconfig.json b/types/mui-datatables/tsconfig.json
new file mode 100644
index 0000000000..a4d6f99b77
--- /dev/null
+++ b/types/mui-datatables/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es2017.object",
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "mui-datatables-tests.tsx"
+    ]
+}
diff --git a/types/mui-datatables/tslint.json b/types/mui-datatables/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mui-datatables/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/multiparty/index.d.ts b/types/multiparty/index.d.ts
index ca968fefcf..1dbb3e272b 100644
--- a/types/multiparty/index.d.ts
+++ b/types/multiparty/index.d.ts
@@ -19,6 +19,13 @@ export declare class Form extends events.EventEmitter {
      * @param callback
      */
     parse(request: http.IncomingMessage, callback?: (error: Error, fields: any, files: any) => any): void;
+
+    on(event: "part", listener: (part: Part) => void): this;
+    on(event: "close", listener: () => void): this;
+    on(event: "error", listener: (err: Error) => void): this;
+    on(event: "progress", listener: (bytesReceived: number, bytesExpected: number) => void): this;
+    on(event: "field", listener: (name: string, value: string) => void): this;
+    on(event: string | symbol, listener: (...args: any[]) => void): this;
 }
 
 export interface File {
@@ -29,7 +36,7 @@ export interface File {
     /**
      * the filename that the user reports for the file
      */
-    originalFileName: string;
+    originalFilename: string;
     /**
      * the absolute path of the uploaded file on disk
      */
@@ -44,7 +51,7 @@ export interface File {
     size: number;
 }
 
-interface Part extends stream.Readable {
+export interface Part extends stream.Readable {
     /**
      * the headers for this part. For example, you may be interested in content-type
      */
diff --git a/types/n3/index.d.ts b/types/n3/index.d.ts
index 4a4e7812e6..60df059a71 100644
--- a/types/n3/index.d.ts
+++ b/types/n3/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for N3 1.0
-// Project: https://github.com/RubenVerborgh/N3.js
+// Project: https://github.com/rdfjs/n3.js
 // Definitions by: Fred Eisele <https://github.com/phreed>
 //                 Ruben Taelman <https://github.com/rubensworks>
 //                 Laurens Rietveld <https://github.com/LaurensRietveld>
diff --git a/types/nanoscroller/index.d.ts b/types/nanoscroller/index.d.ts
index c12d493650..fd6ce60d58 100644
--- a/types/nanoscroller/index.d.ts
+++ b/types/nanoscroller/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for nanoScroller 0.8
-// Project: http://jamesflorentino.github.io/nanoScrollerJS/
+// Project: http://jamesflorentino.github.io/nanoScrollerJS/, https://github.com/jamesflorentino/nanoscrollerjs
 // Definitions by: Yannick Beauchamp-Hurtubise <https://github.com/zihark17>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/nats-hemera/index.d.ts b/types/nats-hemera/index.d.ts
index 868d550cf9..6224030d92 100644
--- a/types/nats-hemera/index.d.ts
+++ b/types/nats-hemera/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for hemera 2.0
-// Project: https://github.com/hemerajs/hemera
+// Project: https://github.com/hemerajs/hemera, https://hemerajs.github.io/hemera
 // Definitions by: Vladimir Djukic <https://github.com/vforv>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/natural-compare-lite/index.d.ts b/types/natural-compare-lite/index.d.ts
new file mode 100644
index 0000000000..d9dd5f3e6d
--- /dev/null
+++ b/types/natural-compare-lite/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for natural-compare-lite 1.4
+// Project: https://github.com/litejs/natural-compare-lite
+// Definitions by: Doniyor Aliyev <https://github.com/doniyor2109>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function naturalCompare(a: string, b: string): -1 | 0 | 1;
+
+export = naturalCompare;
diff --git a/types/natural-compare-lite/natural-compare-lite-tests.ts b/types/natural-compare-lite/natural-compare-lite-tests.ts
new file mode 100644
index 0000000000..c82a695344
--- /dev/null
+++ b/types/natural-compare-lite/natural-compare-lite-tests.ts
@@ -0,0 +1,3 @@
+import compare = require("natural-compare-lite");
+
+['a', 's', 'd'].sort(compare);
diff --git a/types/natural-compare-lite/tsconfig.json b/types/natural-compare-lite/tsconfig.json
new file mode 100644
index 0000000000..ddfcb244cb
--- /dev/null
+++ b/types/natural-compare-lite/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "natural-compare-lite-tests.ts"
+    ]
+}
diff --git a/types/natural-compare-lite/tslint.json b/types/natural-compare-lite/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/natural-compare-lite/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/natural-compare/index.d.ts b/types/natural-compare/index.d.ts
new file mode 100644
index 0000000000..bb26b925f7
--- /dev/null
+++ b/types/natural-compare/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for natural-compare 1.4
+// Project: https://github.com/litejs/natural-compare-lite
+// Definitions by: Doniyor Aliyev <https://github.com/doniyor2109>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function naturalCompare(a: string, b: string): -1 | 0 | 1;
+
+export = naturalCompare;
diff --git a/types/natural-compare/natural-compare-tests.ts b/types/natural-compare/natural-compare-tests.ts
new file mode 100644
index 0000000000..d006905f47
--- /dev/null
+++ b/types/natural-compare/natural-compare-tests.ts
@@ -0,0 +1,3 @@
+import compare = require("natural-compare");
+
+['a', 's', 'd'].sort(compare);
diff --git a/types/natural-compare/tsconfig.json b/types/natural-compare/tsconfig.json
new file mode 100644
index 0000000000..c8af37bb22
--- /dev/null
+++ b/types/natural-compare/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "natural-compare-tests.ts"
+    ]
+}
diff --git a/types/natural-compare/tslint.json b/types/natural-compare/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/natural-compare/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/navermaps/index.d.ts b/types/navermaps/index.d.ts
index 8ba4d52bd5..9667538b2f 100644
--- a/types/navermaps/index.d.ts
+++ b/types/navermaps/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Naver Maps JavaScript API 3.0
+// Type definitions for non-npm package Naver Maps JavaScript API 3.0
 // Project: https://navermaps.github.io/maps.js
 // Definitions by: Ckboyjiy <https://github.com/ckboyjiy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/navigator-permissions/index.d.ts b/types/navigator-permissions/index.d.ts
index ba66b4cb46..df807c5d1e 100644
--- a/types/navigator-permissions/index.d.ts
+++ b/types/navigator-permissions/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Navigator.Permissions 0.1
+// Type definitions for non-npm package Navigator.Permissions 0.1
 // Project: https://developer.mozilla.org/en-US/docs/Web/API/Permissions
 // Definitions by: Vince Varga <https://github.com/vargavince91>, MindDoc <https://github.com/minddocdev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ndarray/index.d.ts b/types/ndarray/index.d.ts
index 039401b6e2..789e97df8c 100644
--- a/types/ndarray/index.d.ts
+++ b/types/ndarray/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ndarray 1.0
-// Project: https://github.com/scijs/ndarray
+// Project: https://github.com/scijs/ndarray, https://github.com/mikolalysenko/ndarray
 // Definitions by: Giff Song <https://github.com/pawsong>, taoqf <https://github.com/taoqf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/needle/index.d.ts b/types/needle/index.d.ts
index 509e212c6e..af879cfacc 100644
--- a/types/needle/index.d.ts
+++ b/types/needle/index.d.ts
@@ -247,6 +247,7 @@ declare namespace needle {
     export type NeedleCallback = core.NeedleCallback;
     export type NeedleHttpVerbs = core.NeedleHttpVerbs;
     export type NeedleOptions = core.NeedleOptions;
+    export type NeedleResponse = core.NeedleResponse;
     export type ReadableStream = core.ReadableStream;
 
     /**
diff --git a/types/needle/needle-tests.ts b/types/needle/needle-tests.ts
index a216b1f686..fac7efa58c 100644
--- a/types/needle/needle-tests.ts
+++ b/types/needle/needle-tests.ts
@@ -73,14 +73,18 @@ function API_head() {
 
 function API_get() {
     // using promises
+    let resp: needle.NeedleResponse;
+
     needle('get', 'google.com/search?q=syd+barrett')
-        .then((resp) => {
+        .then((_resp) => {
             // if no http:// is found, Needle will automagically prepend it.
+            resp = _resp;
         });
 
     // using callback
-    needle.get('google.com/search?q=syd+barrett', (err, resp) => {
+    needle.get('google.com/search?q=syd+barrett', (err, _resp) => {
         // if no http:// is found, Needle will automagically prepend it.
+        resp = _resp;  // assign response
     });
 }
 
diff --git a/types/netease-captcha/index.d.ts b/types/netease-captcha/index.d.ts
index fbdfb03e7d..731dbd20b4 100644
--- a/types/netease-captcha/index.d.ts
+++ b/types/netease-captcha/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for netease-captcha 2.1
+// Type definitions for non-npm package netease-captcha 2.1
 // Project: https://cstaticdun.126.net/load.min.js
 // Definitions by: Minjie Shen <https://github.com/norubidium>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/netlify-identity-widget/index.d.ts b/types/netlify-identity-widget/index.d.ts
index a231be53d2..caf0c6b3f9 100644
--- a/types/netlify-identity-widget/index.d.ts
+++ b/types/netlify-identity-widget/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for netlify-identity-widget 1.4
-// Project: https://github.com/netlify/netlify-identity-widget
+// Project: https://github.com/netlify/netlify-identity-widget, https://identity.netlify.com
 // Definitions by: Naveen Kumar Sangi <https://github.com/nkprince007>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/new-relic-browser/index.d.ts b/types/new-relic-browser/index.d.ts
index 581d6efb52..f580226118 100644
--- a/types/new-relic-browser/index.d.ts
+++ b/types/new-relic-browser/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for NewRelicBrowser 0.1072
+// Type definitions for non-npm package NewRelicBrowser 0.1072
 // Project: https://docs.newrelic.com/docs/browser/new-relic-browser/browser-agent-spa-api
 // Definitions by: Rene Hamburger <https://github.com/renehamburger>, Piotr Kubisa <https://github.com/piotrkubisa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/next-seo/index.d.ts b/types/next-seo/index.d.ts
new file mode 100644
index 0000000000..8d7c487393
--- /dev/null
+++ b/types/next-seo/index.d.ts
@@ -0,0 +1,84 @@
+// Type definitions for next-seo 1.10
+// Project: https://github.com/garmeeh/next-seo#readme
+// Definitions by: Thomas Kosiewski <https://github.com/ThomasK33>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { Component } from "react";
+
+export interface NextSeoProps {
+    config: Config;
+}
+
+export interface Config {
+    title?: string;
+    titleTemplate?: string;
+    description?: string;
+    canonical?: string;
+
+    dangerouslySetAllPagesToNoIndex?: boolean;
+    noindex?: boolean;
+
+    twitter?: Twitter;
+    facebook?: Facebook;
+    openGraph?: OpenGraph;
+}
+
+export interface Twitter {
+    cardType?: string;
+    site?: string;
+    handle?: string;
+}
+
+export interface Facebook {
+    appId?: number;
+}
+
+export interface OpenGraph {
+    url?: string;
+    type?: string;
+    title?: string;
+    description?: string;
+    images?: ReadonlyArray<OpenGraphImages>;
+    defaultImageHeight?: number;
+    defaultImageWidth?: number;
+    locale?: string;
+    site_name?: string;
+
+    profile?: OpenGraphProfile;
+    book?: OpenGraphBook;
+    article?: OpenGraphArticle;
+}
+
+export interface OpenGraphImages {
+    url?: string;
+    width?: number;
+    height?: number;
+    alt?: string;
+}
+
+export interface OpenGraphProfile {
+    firstName?: string;
+    lastName?: string;
+    username?: string;
+    gender?: string;
+}
+
+export interface OpenGraphBook {
+    authors?: ReadonlyArray<string>;
+    isbn?: string;
+    releaseDate?: string;
+    tags?: ReadonlyArray<string>;
+}
+
+export interface OpenGraphArticle {
+    publishedTime?: string;
+    modifiedTime?: string;
+    expirationTime?: string;
+
+    authors?: ReadonlyArray<string>;
+    section?: string;
+    tags?: ReadonlyArray<string>;
+}
+
+export default class NextSeo extends Component<NextSeoProps> { }
diff --git a/types/next-seo/next-seo-tests.ts b/types/next-seo/next-seo-tests.ts
new file mode 100644
index 0000000000..3c2da4b032
--- /dev/null
+++ b/types/next-seo/next-seo-tests.ts
@@ -0,0 +1,48 @@
+import NextSeo from 'next-seo';
+
+new NextSeo({
+    config: {
+        canonical: "",
+        dangerouslySetAllPagesToNoIndex: false,
+        description: "",
+        facebook: {
+            appId: 0,
+        },
+        noindex: false,
+        openGraph: {
+            book: {
+                authors: [""],
+                isbn: "",
+                releaseDate: "",
+                tags: [""],
+            },
+            defaultImageHeight: 0,
+            defaultImageWidth: 0,
+            description: "",
+            images: [{
+                alt: "",
+                height: 0,
+                url: "",
+                width: 0,
+            }],
+            locale: "",
+            profile: {
+                firstName: "",
+                gender: "",
+                lastName: "",
+                username: "",
+            },
+            site_name: "",
+            title: "",
+            type: "",
+            url: "",
+        },
+        title: "",
+        titleTemplate: "",
+        twitter: {
+            cardType: "",
+            handle: "",
+            site: "",
+        },
+    },
+});
diff --git a/types/next-seo/tsconfig.json b/types/next-seo/tsconfig.json
new file mode 100644
index 0000000000..faea26b9bc
--- /dev/null
+++ b/types/next-seo/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "target": "es6",
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "next-seo-tests.ts"
+    ]
+}
diff --git a/types/next-seo/tslint.json b/types/next-seo/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/next-seo/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/next-server/head.d.ts b/types/next-server/head.d.ts
index 8a8be730f8..f24ed34661 100644
--- a/types/next-server/head.d.ts
+++ b/types/next-server/head.d.ts
@@ -3,6 +3,6 @@ import * as React from "react";
 export function defaultHead(className?: string): JSX.Element[];
 export default class Head extends React.Component {
     static canUseDOM: boolean;
-    static peek(): Array<React.ReactElement<any>>;
-    static rewind(): Array<React.ReactElement<any>>;
+    static peek(): React.ReactElement[];
+    static rewind(): React.ReactElement[];
 }
diff --git a/types/next-server/link.d.ts b/types/next-server/link.d.ts
index 520868f05f..04580e24b1 100644
--- a/types/next-server/link.d.ts
+++ b/types/next-server/link.d.ts
@@ -11,7 +11,7 @@ export interface LinkProps {
     href?: string | UrlLike;
     as?: string | UrlLike;
     passHref?: boolean;
-    children: React.ReactElement<any>;
+    children: React.ReactElement;
 }
 
 export default class Link extends React.Component<LinkProps> {}
diff --git a/types/next/app.d.ts b/types/next/app.d.ts
index 392b997f89..3e933c09c6 100644
--- a/types/next/app.d.ts
+++ b/types/next/app.d.ts
@@ -53,6 +53,6 @@ export type AppComponentType<P = {}, IP = P, C = NextAppContext> = NextComponent
 >;
 
 export class Container extends React.Component {}
-export default class App<P = {}> extends React.Component<P & DefaultAppIProps & AppProps> {
+export default class App<P = {}, S = {}> extends React.Component<P & DefaultAppIProps & AppProps, S> {
     static getInitialProps(context: NextAppContext): Promise<DefaultAppIProps>;
 }
diff --git a/types/next/document.d.ts b/types/next/document.d.ts
index 9ac8985cdf..f89e5d71e0 100644
--- a/types/next/document.d.ts
+++ b/types/next/document.d.ts
@@ -2,10 +2,15 @@ import * as React from "react";
 import { NextContext, NextComponentType } from ".";
 import { DefaultQuery } from "./router";
 
+/**
+ * Result from renderPage().
+ * https://github.com/zeit/next.js/blob/v8.0.0/packages/next/pages/_document.js#L18
+ * https://github.com/zeit/next.js/blob/v8.0.0/packages/next-server/server/render.tsx#L159
+ * https://github.com/zeit/next.js/blob/v8.0.0/packages/next-server/server/render.tsx#L44
+ */
 export interface RenderPageResponse {
-    buildManifest: Record<string, any>;
     html?: string;
-    head?: Array<React.ReactElement<any>>;
+    head?: React.ReactNode;
 }
 
 export interface PageProps {
@@ -27,8 +32,15 @@ export type Enhancer<E extends PageProps = AnyPageProps, P extends any = E> = (
  */
 export interface NextDocumentContext<Q extends DefaultQuery = DefaultQuery> extends NextContext<Q> {
     /** A callback that executes the actual React rendering logic (synchronously) */
-    renderPage<E extends PageProps = AnyPageProps, P extends any = E>(
-        enhancer?: Enhancer<E, P> // tslint:disable-line no-unnecessary-generics
+    renderPage<
+        E extends PageProps = AnyPageProps,
+        P = E,
+        EA extends PageProps = AnyPageProps,
+        PA = EA
+    >(
+        enhancer?:
+            | Enhancer<E, P> // tslint:disable-line no-unnecessary-generics
+            | { enhanceApp?: Enhancer<EA, PA>; enhanceComponent?: Enhancer<E, P> } // tslint:disable-line no-unnecessary-generics
     ): RenderPageResponse;
 }
 
diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 8d911ab2c1..0f491675ce 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for next 7.0
-// Project: https://github.com/zeit/next.js/packages/next
+// Type definitions for next 8.0
+// Project: https://github.com/zeit/next.js/packages/next, https://nextjs.org
 // Definitions by: Drew Hays <https://github.com/dru89>
 //                 Brice BERNARD <https://github.com/brikou>
 //                 James Hegedus <https://github.com/jthegedus>
diff --git a/types/next/test/next-app-tests.tsx b/types/next/test/next-app-tests.tsx
index eaa2c0ad07..514cc24436 100644
--- a/types/next/test/next-app-tests.tsx
+++ b/types/next/test/next-app-tests.tsx
@@ -6,6 +6,10 @@ interface TestAppProps {
     pageProps: any;
 }
 
+interface TestAppState {
+    color: string;
+}
+
 interface TypedQuery extends DefaultQuery {
     id?: string;
 }
@@ -33,6 +37,20 @@ class TestAppWithProps extends App<TestAppProps & WithExampleProps> {
     }
 }
 
+class ErrorTestAppWithState extends App<TestAppProps & WithExampleProps, TestAppState> {
+    static async getInitialProps({ Component, router, ctx }: NextAppContext) {
+        const pageProps = Component.getInitialProps && (await Component.getInitialProps(ctx));
+        return { pageProps };
+    }
+
+    render() {
+        const { Component, router, pageProps, example } = this.props;
+        return <Component {...pageProps} example={example} />;
+    }
+
+    state: {}; // $ExpectError
+}
+
 class TestAppWithTypedQuery extends App {
     static async getInitialProps({ ctx }: NextAppContext<TypedQuery>) {
         const { id } = ctx.query;
diff --git a/types/next/test/next-document-tests.tsx b/types/next/test/next-document-tests.tsx
index bf7ccf036d..7c50a03930 100644
--- a/types/next/test/next-document-tests.tsx
+++ b/types/next/test/next-document-tests.tsx
@@ -35,20 +35,37 @@ class MyDocumentDefault extends Document {
 }
 
 class MyDoc extends Document<WithUrlProps> {
-    static getInitialProps({ req, renderPage }: NextDocumentContext) {
-        // without callback
+    static async getInitialProps(ctx: NextDocumentContext) {
+        const { req, renderPage } = ctx;
+
+        // without enhancer
         const _page = renderPage();
 
-        // with callback
-        const enhancer: Enhancer<PageProps, {}> = App => props => <App />;
-        const { html, head, buildManifest } = renderPage(enhancer);
+        // with component enhancer
+        const enhancer: Enhancer<PageProps, {}> = Component => props => <Component />;
+        const _enhancedPage = renderPage(enhancer);
 
-        const styles = [<style />];
+        // with app and component enhancers
+        const enhanceApp: Enhancer<PageProps, {}> = App => props => <App />;
+        const enhanceComponent: Enhancer<PageProps, {}> = Component => props => <Component />;
+        const { html, head } = renderPage({
+            enhanceApp,
+            enhanceComponent
+        });
+
+        const initialProps = await Document.getInitialProps(ctx);
+
+        const styles = (
+            <>
+                {initialProps.styles}
+                <style />
+            </>
+        );
 
         // Custom prop
         const url = req!.url;
 
-        return { html, head, buildManifest, styles, url };
+        return { html, head, styles, url };
     }
 
     constructor(props: WithUrlProps & DocumentProps) {
@@ -61,12 +78,14 @@ class MyDoc extends Document<WithUrlProps> {
 
     render() {
         const { pathname, query } = this.props.__NEXT_DATA__;
+        const { head, styles } = this.props;
 
         return (
             <html>
                 <Head nonce="nonce" any="property" should="work" here>
+                    {head}
                     <title>My page</title>
-                    {this.props.styles}
+                    {styles}
                 </Head>
                 <body>
                     <Main />
diff --git a/types/ng-tags-input/index.d.ts b/types/ng-tags-input/index.d.ts
index 624bbac7f0..b62643204f 100644
--- a/types/ng-tags-input/index.d.ts
+++ b/types/ng-tags-input/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ng-tags-input for 3.2
-// Project: https://github.com/mbenford/ngTagsInput
+// Project: https://github.com/mbenford/ngTagsInput, http://mbenford.github.io/ngtagsinput
 // Definitions by: George Pap <https://github.com/GiorgosPap>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/ngtoaster/index.d.ts b/types/ngtoaster/index.d.ts
index 092e1a7b0e..bd1ceefa6d 100644
--- a/types/ngtoaster/index.d.ts
+++ b/types/ngtoaster/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for angularjs-toaster 2.2
+// Type definitions for non-npm package angularjs-toaster 2.2
 // Project: https://github.com/jirikavi/AngularJS-Toaster
 // Definitions by: Ben Tesser <https://github.com/btesser>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/ngwysiwyg/index.d.ts b/types/ngwysiwyg/index.d.ts
index 8a1fe1b8e2..3cdadad937 100644
--- a/types/ngwysiwyg/index.d.ts
+++ b/types/ngwysiwyg/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ngWYSIWYG 0.6
+// Type definitions for non-npm package ngWYSIWYG 0.6
 // Project: https://github.com/psergus/ngWYSIWYG
 // Definitions by: Patrick Mac Kay <https://github.com/patrick-mackay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/nightwatch/index.d.ts b/types/nightwatch/index.d.ts
index 01e1d99aa6..ae5fc34d36 100644
--- a/types/nightwatch/index.d.ts
+++ b/types/nightwatch/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for nightwatch 0.9
-// Project: http://nightwatchjs.org/api
+// Project: http://nightwatchjs.org
 // Definitions by: Rahul Kavalapara <https://github.com/rkavalap>
 //                 Connor Schlesiger <https://github.com/schlesiger>
 //                 Clayton Astrom <https://github.com/ClaytonAstrom>
diff --git a/types/nivo-slider/index.d.ts b/types/nivo-slider/index.d.ts
index f30f6d445b..718904ca4c 100644
--- a/types/nivo-slider/index.d.ts
+++ b/types/nivo-slider/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Nivo Slider 3.2
-// Project: https://github.com/Codeinwp/Nivo-Slider-jQuery
+// Project: https://github.com/Codeinwp/Nivo-Slider-jQuery, https://github.com/gilbitron/nivo-slider
 // Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/no-scroll/index.d.ts b/types/no-scroll/index.d.ts
new file mode 100644
index 0000000000..b20b596a27
--- /dev/null
+++ b/types/no-scroll/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for no-scroll 2.1
+// Project: https://github.com/davidtheclark/no-scroll
+// Definitions by: Zhang Yi Jiang <https://github.com/ZhangYiJiang>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Module is exported as global object outside of module loader environment
+export as namespace noScroll;
+
+interface NoScroll {
+    off(): void;
+    on(): void;
+    toggle(): void;
+}
+
+declare const noScroll: NoScroll;
+export = noScroll;
diff --git a/types/no-scroll/no-scroll-tests.ts b/types/no-scroll/no-scroll-tests.ts
new file mode 100644
index 0000000000..c33ebcf799
--- /dev/null
+++ b/types/no-scroll/no-scroll-tests.ts
@@ -0,0 +1,5 @@
+import * as noScroll from 'no-scroll';
+
+noScroll.on();
+noScroll.off();
+noScroll.toggle();
diff --git a/types/no-scroll/tsconfig.json b/types/no-scroll/tsconfig.json
new file mode 100644
index 0000000000..f3d27166a1
--- /dev/null
+++ b/types/no-scroll/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "no-scroll-tests.ts"
+    ]
+}
diff --git a/types/no-scroll/tslint.json b/types/no-scroll/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/no-scroll/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/noble-mac/index.d.ts b/types/noble-mac/index.d.ts
index c960dc9693..d1b57c5aa3 100644
--- a/types/noble-mac/index.d.ts
+++ b/types/noble-mac/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for noble-mac 0.0
+// Type definitions for non-npm package noble-mac 0.0
 // Project: https://github.com/Timeular/noble-mac
 // Definitions by: Seon-Wook Park <https://github.com/swook>
 //                 Shantanu Bhadoria <https://github.com/shantanubhadoria>
diff --git a/types/noble/index.d.ts b/types/noble/index.d.ts
index 5b4af235e7..a00a5e0431 100644
--- a/types/noble/index.d.ts
+++ b/types/noble/index.d.ts
@@ -6,6 +6,7 @@
 //                 Dan Chao <https://github.com/bioball>
 //                 Michal Lower <https://github.com/keton>
 //                 Rob Moran <https://github.com/thegecko>
+//                 Clayton Kucera <https://github.com/claytonkucera>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -65,10 +66,10 @@ export declare class Peripheral extends events.EventEmitter {
 
 export interface Advertisement {
     localName: string;
-    serviceData: {
+    serviceData: Array<{
         uuid: string,
         data: Buffer
-    };
+    }>;
     txPowerLevel: number;
     manufacturerData: Buffer;
     serviceUuids: string[];
diff --git a/types/noble/noble-tests.ts b/types/noble/noble-tests.ts
index a4441eba6e..6276446237 100644
--- a/types/noble/noble-tests.ts
+++ b/types/noble/noble-tests.ts
@@ -45,10 +45,10 @@ var peripheral: noble.Peripheral = new noble.Peripheral();
 peripheral.uuid = "12ad4e81";
 peripheral.advertisement = {
     localName:        "device",
-    serviceData:      {
+    serviceData:      [{
         uuid: "180a",
         data: new Buffer(1)
-    },
+    }],
     txPowerLevel:     1,
     manufacturerData: new Buffer(1),
     serviceUuids:     ["0x180a", "0x180d"]
diff --git a/types/node-cache/index.d.ts b/types/node-cache/index.d.ts
index 069bd4fb32..6bac061ecb 100644
--- a/types/node-cache/index.d.ts
+++ b/types/node-cache/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for node-cache 4.1
-// Project: https://github.com/tcs-de/nodecache
+// Project: https://github.com/mpneuried/nodecache
 // Definitions by: Ilya Mochalov <https://github.com/chrootsu>
 //                 Daniel Thunell <https://github.com/dthunell>
 //                 Ulf Seltmann <https://github.com/useltmann>
diff --git a/types/node-crate/index.d.ts b/types/node-crate/index.d.ts
index 971c71db24..a85e54a690 100644
--- a/types/node-crate/index.d.ts
+++ b/types/node-crate/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for node-crate 2.0
-// Project: https://github.com/megastef/node-crate
+// Project: https://github.com/megastef/node-crate, http://megastef.github.io/node-crate
 // Definitions by: Greg Jednaszewski <https://github.com/gjednaszewski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/node-cron/index.d.ts b/types/node-cron/index.d.ts
index 8c6b70ec1c..6cd1b1445e 100644
--- a/types/node-cron/index.d.ts
+++ b/types/node-cron/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for node-cron 2.0
-// Project: https://github.com/node-cron/node-cron
+// Project: https://github.com/node-cron/node-cron, https://github.com/merencia/node-cron
 // Definitions by: morsic <https://github.com/maximelkin>,
 //                 burtek <https://github.com/burtek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/node-fetch/index.d.ts b/types/node-fetch/index.d.ts
index 4b12734363..03ae639d26 100644
--- a/types/node-fetch/index.d.ts
+++ b/types/node-fetch/index.d.ts
@@ -2,6 +2,8 @@
 // Project: https://github.com/bitinn/node-fetch
 // Definitions by: Torsten Werner <https://github.com/torstenwerner>
 //                 Niklas Lindgren <https://github.com/nikcorg>
+//                 Vinay Bedre <https://github.com/vinaybedre>
+//                 Antonio Román <https://github.com/kyranet>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -133,6 +135,9 @@ export class Body {
 export class FetchError extends Error {
     name: "FetchError";
     constructor(message: string, type: string, systemError: string);
+    type: string;
+    code?: string;
+    errno?: string;
 }
 
 export class Response extends Body {
@@ -168,7 +173,13 @@ export type HeaderInit = Headers | string[];
 export type BodyInit = ArrayBuffer | ArrayBufferView | NodeJS.ReadableStream | string | URLSearchParams;
 export type RequestInfo = string | Request;
 
-export default function fetch(
+declare function fetch(
     url: string | Request,
     init?: RequestInit
 ): Promise<Response>;
+
+declare namespace fetch {
+    function isRedirect(code: number): boolean;
+}
+
+export default fetch;
diff --git a/types/node-fetch/node-fetch-tests.ts b/types/node-fetch/node-fetch-tests.ts
index 7561ae1b0f..d35114f60a 100644
--- a/types/node-fetch/node-fetch-tests.ts
+++ b/types/node-fetch/node-fetch-tests.ts
@@ -77,3 +77,8 @@ function test_headersRaw() {
 	const myHeader = 'foo';
 	headers.raw()[myHeader]; // $ExpectType string[]
 }
+
+function test_isRedirect() {
+    fetch.isRedirect(301);
+    fetch.isRedirect(201);
+}
diff --git a/types/node-forge/index.d.ts b/types/node-forge/index.d.ts
index 1d9b0cb858..ad15411714 100644
--- a/types/node-forge/index.d.ts
+++ b/types/node-forge/index.d.ts
@@ -9,13 +9,14 @@
 //                 Nikita Koryabkin <https://github.com/Apologiz>
 //                 timhwang21       <https://github.com/timhwang21>
 //                 supaiku0         <https://github.com/supaiku0>
+//                 Anders Kaseorg   <https://github.com/andersk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
 /// <reference types="node" />
 
 declare module "node-forge" {
-    type Byte = string;
+    type Byte = number;
     type Bytes = string;
     type Hex = string;
     type Base64 = string;
@@ -69,7 +70,7 @@ declare module "node-forge" {
         function privateKeyFromPem(pem: PEM): PrivateKey;
         function certificateToPem(cert: Certificate, maxline?: number): PEM;
         function certificateFromPem(pem: PEM, computeHash?: boolean, strict?: boolean): Certificate;
-        function createCaStore(): CAStore;
+        function createCaStore(certs?: ReadonlyArray<Certificate | pki.PEM>): CAStore;
         function verifyCertificateChain(caStore: CAStore, chain: Certificate[], customVerifyCallback?: (verified: boolean | string, depth: number, chain: Certificate[]) => boolean): boolean;
 
         interface oids {
@@ -359,10 +360,10 @@ declare module "node-forge" {
             type: Type;
             constructed: boolean;
             composed: boolean;
-            value: Asn1[];
+            value: Bytes | Asn1[];
         }
 
-        function create(tagClass: Class, type: Type, constructed: boolean, value: string | Asn1[]): Asn1;
+        function create(tagClass: Class, type: Type, constructed: boolean, value: Bytes | Asn1[]): Asn1;
         function fromDer(bytes: Bytes | util.ByteBuffer, strict?: boolean): Asn1;
         function toDer(obj: Asn1): util.ByteBuffer;
         function oidToDer(oid: OID): util.ByteStringBuffer;
@@ -495,6 +496,30 @@ declare module "node-forge" {
 
         function pkcs12FromAsn1(obj: any, strict?: boolean, password?: string): Pkcs12Pfx;
         function pkcs12FromAsn1(obj: any, password?: string): Pkcs12Pfx;
+
+        function toPkcs12Asn1(
+            key: pki.PrivateKey,
+            cert: pki.Certificate | pki.Certificate[],
+            password: string | null,
+            options?: {
+                algorithm?: 'aes128' | 'aes192' | 'aes256' | '3des',
+                count?: number,
+                saltSize?: number,
+                useMac?: boolean,
+                localKeyId?: Hex,
+                friendlyName?: string,
+                generateLocalKeyId?: boolean,
+            },
+        ): asn1.Asn1;
+
+        function generateKey(
+            password: string | null | undefined,
+            salt: util.ByteBuffer,
+            id: Byte,
+            iter: number,
+            n: number,
+            md?: md.MessageDigest,
+        ): util.ByteBuffer;
     }
 
     namespace pkcs7 {
@@ -583,4 +608,284 @@ declare module "node-forge" {
             function create(any: any): any;
         }
     }
+
+    namespace tls {
+        interface ProtocolVersion {
+            major: Byte;
+            minor: Byte;
+        }
+
+        const Versions: ProtocolVersion[];
+        const SupportedVersions: ProtocolVersion[];
+        const Version: ProtocolVersion;
+
+        const MaxFragment: number;
+
+        enum ConnectionEnd {
+            server = 0,
+            client = 1,
+        }
+
+        enum PRFAlgorithm {
+            tls_prf_sha256 = 0,
+        }
+
+        enum BulkCipherAlgorithm {
+            rc4 = 0,
+            des3 = 1,
+            aes = 2,
+        }
+
+        enum CipherType {
+            stream = 0,
+            block = 1,
+            aead = 2,
+        }
+
+        enum MACAlgorithm {
+            hmac_md5 = 0,
+            hmac_sha1 = 1,
+            hmac_sha256 = 2,
+            hmac_sha384 = 3,
+            hmac_sha512 = 4,
+        }
+
+        enum CompressionMethod {
+            none = 0,
+            deflate = 1,
+        }
+
+        enum ContentType {
+            change_cipher_spec = 20,
+            alert = 21,
+            handshake = 22,
+            application_data = 23,
+            heartbeat = 24,
+        }
+
+        enum HandshakeType {
+            hello_request = 0,
+            client_hello = 1,
+            server_hello = 2,
+            certificate = 11,
+            server_key_exchange = 12,
+            certificate_request = 13,
+            server_hello_done = 14,
+            certificate_verify = 15,
+            client_key_exchange = 16,
+            finished = 20,
+        }
+
+        namespace Alert {
+            enum Level {
+                warning = 1,
+                fatal = 2,
+            }
+
+            enum Description {
+                close_notify = 0,
+                unexpected_message = 10,
+                bad_record_mac = 20,
+                decryption_failed = 21,
+                record_overflow = 22,
+                decompression_failure = 30,
+                handshake_failure = 40,
+                bad_certificate = 42,
+                unsupported_certificate = 43,
+                certificate_revoked = 44,
+                certificate_expired = 45,
+                certificate_unknown = 46,
+                illegal_parameter = 47,
+                unknown_ca = 48,
+                access_denied = 49,
+                decode_error = 50,
+                decrypt_error = 51,
+                export_restriction = 60,
+                protocol_version = 70,
+                insufficient_security = 71,
+                internal_error = 80,
+                user_canceled = 90,
+                no_renegotiation = 100,
+            }
+        }
+
+        enum HeartbeatMessageType {
+            heartbeat_request = 1,
+            heartbeat_response = 2,
+        }
+
+        interface CipherSuite {
+            id: [Byte, Byte];
+            name: string;
+        }
+
+        const CipherSuites: { [name: string]: CipherSuite };
+
+        interface CertificateRequest {
+            certificate_types: util.ByteBuffer;
+            certificate_authorities: util.ByteBuffer;
+        }
+
+        type ConnectionState = any;
+
+        interface Connection {
+            version: ProtocolVersion;
+            entity: ConnectionEnd;
+            sessionId: Bytes | null;
+            caStore: pki.CAStore;
+            sessionCache: SessionCache | null;
+            cipherSuites: CipherSuite[];
+            connected(conn: Connection): void;
+            virtualHost: string | null;
+            verifyClient: boolean;
+            verify(
+                conn: Connection,
+                verified: Verified,
+                depth: number,
+                certs: pki.Certificate[]
+            ): Verified;
+            getCertificate:
+                | ((
+                      conn: Connection,
+                      hint: CertificateRequest | string[]
+                  ) => pki.PEM | ReadonlyArray<pki.PEM>)
+                | null;
+            getPrivateKey:
+                | ((conn: Connection, certificate: pki.Certificate) => pki.PEM)
+                | null;
+            getSignature:
+                | ((
+                      conn: Connection,
+                      bytes: Bytes,
+                      callback: (conn: Connection, bytes: Bytes) => void
+                  ) => void)
+                | null;
+            input: util.ByteBuffer;
+            tlsData: util.ByteBuffer;
+            data: util.ByteBuffer;
+            tlsDataReady(conn: Connection): void;
+            dataReady(conn: Connection): void;
+            heartbeatReceived:
+                | ((conn: Connection, payload: util.ByteBuffer) => void)
+                | undefined;
+            closed(conn: Connection): void;
+            error(conn: Connection, error: TLSError): void;
+            deflate: ((inBytes: Bytes) => Bytes) | null;
+            inflate: ((inBytes: Bytes) => Bytes) | null;
+            reset(clearFail?: boolean): void;
+            record: Record | null;
+            session: Session | null;
+            peerCertificate: pki.Certificate | null;
+            state: { pending: ConnectionState | null; current: ConnectionState };
+            expect: number;
+            fragmented: Record | null;
+            records: Record[];
+            open: boolean;
+            handshakes: number;
+            handshaking: boolean;
+            isConnected: boolean;
+            fail: boolean;
+            handshake(sessionId?: Bytes | null): void;
+            process(data: Bytes): number;
+            prepare(data: Bytes): boolean;
+            prepareHeartbeatRequest(
+                payload: Bytes | util.ByteBuffer,
+                payloadLength?: number
+            ): boolean;
+            close(clearFail?: boolean): Connection;
+        }
+
+        interface Record {
+            type: ContentType;
+            version: ProtocolVersion;
+            length: number;
+            fragment: util.ByteBuffer;
+            ready?: boolean;
+        }
+
+        interface Session {
+            version: ProtocolVersion | null;
+            extensions: { [_: string]: object };
+            cipherSuite: CipherSuite | null;
+            compressionMethod: CompressionMethod | null;
+            serverCertificate: pki.Certificate | null;
+            clientCertificate: pki.Certificate | null;
+            md5: md.MessageDigest;
+            sha1: md.MessageDigest;
+        }
+
+        interface SessionCache {
+            cache: { [key: string]: Session };
+            capacity: number;
+            order: [Hex];
+            getSession(sessionId: Bytes): Session;
+            setSession(sessionId: Bytes, session: Session): void;
+        }
+
+        function createSessionCache(
+            cache?: SessionCache | { [key: string]: Session },
+            capacity?: number
+        ): SessionCache;
+
+        interface Alert {
+            level: Alert.Level;
+            description: Alert.Description;
+        }
+
+        interface TLSError extends Error {
+            message: string;
+            send: boolean;
+            origin: "server" | "client";
+            alert: Alert;
+        }
+
+        type Verified = true | { message?: string; alert?: Alert.Description };
+
+        function createConnection(options: {
+            server?: boolean;
+            sessionId?: Bytes | null;
+            caStore?: pki.CAStore | ReadonlyArray<pki.Certificate>;
+            sessionCache?: SessionCache | { [key: string]: Session };
+            cipherSuites?: CipherSuite[];
+            connected(conn: Connection): void;
+            virtualHost?: string;
+            verifyClient?: boolean;
+            verify?(
+                conn: Connection,
+                verified: Verified,
+                depth: number,
+                certs: pki.Certificate[]
+            ): Verified;
+            getCertificate?(
+                conn: Connection,
+                hint: CertificateRequest | string[]
+            ): pki.PEM | ReadonlyArray<pki.PEM>;
+            getPrivateKey?(conn: Connection, certificate: pki.Certificate): pki.PEM;
+            getSignature?(
+                conn: Connection,
+                bytes: Bytes,
+                callback: (conn: Connection, bytes: Bytes) => void
+            ): void;
+            tlsDataReady(conn: Connection): void;
+            dataReady(conn: Connection): void;
+            heartbeatReceived?(conn: Connection, payload: util.ByteBuffer): void;
+            closed(conn: Connection): void;
+            error(conn: Connection, error: TLSError): void;
+            deflate?(inBytes: Bytes): Bytes;
+            inflate?(inBytes: Bytes): Bytes;
+        }): Connection;
+
+        function prf_tls1(
+            secret: string,
+            label: string,
+            seed: string,
+            length: number
+        ): util.ByteBuffer;
+
+        function hmac_sha1(
+            key: string | ReadonlyArray<Byte> | util.ByteBuffer,
+            seqNum: [number, number],
+            record: Record
+        ): Bytes;
+    }
 }
diff --git a/types/node-forge/node-forge-tests.ts b/types/node-forge/node-forge-tests.ts
index 8cb1e54aea..c99f417550 100644
--- a/types/node-forge/node-forge-tests.ts
+++ b/types/node-forge/node-forge-tests.ts
@@ -207,7 +207,7 @@ if (forge.util.fillString('1', 5) !== '11111') throw Error('forge.util.fillStrin
 {
     const emptyStore = forge.pki.createCaStore();
 
-    const certificate = forge.pki.createCertificate();
+    const certificate = cert;
     const pem = forge.pki.certificateToPem(certificate);
 
     const caStore = forge.pki.createCaStore();
@@ -225,4 +225,121 @@ if (forge.util.fillString('1', 5) !== '11111') throw Error('forge.util.fillStrin
 
 {
     const key: string = forge.pkcs5.pbkdf2("password", "salt", 1000, 32);
-}
\ No newline at end of file
+}
+
+{
+    // Based on node-forge/examples/tls.js
+
+    let success = false;
+
+    const client = forge.tls.createConnection({
+        server: false,
+        caStore: [cert],
+        sessionCache: {},
+        // supported cipher suites in order of preference
+        cipherSuites: [
+            forge.tls.CipherSuites.TLS_RSA_WITH_AES_128_CBC_SHA,
+            forge.tls.CipherSuites.TLS_RSA_WITH_AES_256_CBC_SHA],
+        virtualHost: 'server',
+        verify: function(c, verified, depth, certs) {
+            console.log(
+                'TLS Client verifying certificate w/CN: \"' +
+                    certs[0].subject.getField('CN').value +
+                    '\", verified: ' + verified + '...');
+            return verified;
+        },
+        connected: function(c) {
+            console.log('Client connected...');
+
+            // send message to server
+            setTimeout(function() {
+                c.prepareHeartbeatRequest('heartbeat');
+                c.prepare('Hello Server');
+            }, 1);
+        },
+        getCertificate: function(c, hint) {
+            console.log('Client getting certificate ...');
+            return forge.pki.certificateToPem(cert);
+        },
+        getPrivateKey: function(c, cert) {
+            return privateKeyPem;
+        },
+        tlsDataReady: function(c) {
+            // send TLS data to server
+            server.process(c.tlsData.getBytes());
+        },
+        dataReady: function(c) {
+            var response = c.data.getBytes();
+            console.log('Client received \"' + response + '\"');
+            success = (response === 'Hello Client');
+            c.close();
+        },
+        heartbeatReceived: function(c, payload) {
+            console.log('Client received heartbeat: ' + payload.getBytes());
+        },
+        closed: function(c) {
+            console.log('Client disconnected.');
+            if(success) {
+                console.log('PASS');
+            } else {
+                console.log('FAIL');
+            }
+        },
+        error: function(c, error) {
+            console.log('Client error: ' + error.message);
+        }
+    });
+
+    // create TLS server
+    const server = forge.tls.createConnection({
+        server: true,
+        caStore: [cert],
+        sessionCache: {},
+        // supported cipher suites in order of preference
+        cipherSuites: [
+            forge.tls.CipherSuites.TLS_RSA_WITH_AES_128_CBC_SHA,
+            forge.tls.CipherSuites.TLS_RSA_WITH_AES_256_CBC_SHA],
+        connected: function(c) {
+            console.log('Server connected');
+            c.prepareHeartbeatRequest('heartbeat');
+        },
+        verifyClient: true,
+        verify: function(c, verified, depth, certs) {
+            console.log(
+                'Server verifying certificate w/CN: \"' +
+                    certs[0].subject.getField('CN').value +
+                    '\", verified: ' + verified + '...');
+            return verified;
+        },
+        getCertificate: function(c, hint) {
+            console.log('Server getting certificate for \"' + (hint as string[])[0] + '\"...');
+            return forge.pki.certificateToPem(cert);
+        },
+        getPrivateKey: function(c, cert) {
+            return privateKeyPem;
+        },
+        tlsDataReady: function(c) {
+            // send TLS data to client
+            client.process(c.tlsData.getBytes());
+        },
+        dataReady: function(c) {
+            console.log('Server received \"' + c.data.getBytes() + '\"');
+
+            // send response
+            c.prepare('Hello Client');
+            c.close();
+        },
+        heartbeatReceived: function(c, payload) {
+            console.log('Server received heartbeat: ' + payload.getBytes());
+        },
+        closed: function(c) {
+            console.log('Server disconnected.');
+        },
+        error: function(c, error) {
+            console.log('Server error: ' + error.message);
+        }
+    });
+
+    console.log('created TLS client and server, doing handshake...');
+    client.handshake();
+}
diff --git a/types/node-jose/index.d.ts b/types/node-jose/index.d.ts
new file mode 100644
index 0000000000..dc4caaeca5
--- /dev/null
+++ b/types/node-jose/index.d.ts
@@ -0,0 +1,335 @@
+// Type definitions for node-jose 1.1
+// Project: https://github.com/cisco/node-jose
+// Definitions by: Nadun Indunil <https://github.com/nadunindunil>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.3
+
+/// <reference types="node" />
+
+export function canYouSee(ks: JWK.Key | JWK.KeyStore, opts: object): JWS.Verifier;
+
+export namespace JWA {
+    interface DecryptEncryptOptions {
+        aad?: Buffer;
+        adata?: Buffer;
+        iv?: Buffer;
+        tag?: Buffer; // Not used in encrypt
+        mac?: Buffer; // Not used in encrypt
+        epu?: Buffer; // encryption party info
+        epv?: Buffer; // encryption party info
+        kdata?: Buffer;
+        epk?: Buffer; // ephemeral pub key used in ec
+        enc?: string; // algorithm to use in ec
+        alg?: string; // variation of enc, probably oversight in lib code
+        apu?: Buffer; // agreement party info used in ec
+        apv?: Buffer; // agreement party info used in ec
+        p2s?: Buffer; // used in pbes
+        p2c?: number; // used in pbes
+    }
+
+    interface DeriveOptions {
+        length?: number; // key length
+        otherInfo?: Buffer; // info used in concatkdf
+        public?: Buffer; // public key used in ecdh
+        hash?: Buffer; // hash used in ecdh
+        salt?: Buffer; // salt value used in hkdf
+        info?: Buffer; // app identifier info used in hkdf
+    }
+
+    interface EncryptReturn {
+        data: Buffer; // The cipher text
+        tag?: Buffer; // The tag used in some algorithms
+    }
+
+    interface SignReturn {
+        data: Buffer; // the data passed into the sign function
+        mac: Buffer; // the signature for `data`
+    }
+
+    interface SignVerifyOptions {
+        loose?: boolean;
+    }
+
+    interface VerifyReturn {
+        data: Buffer; // the data passed into the verify function
+        mac: Buffer; // the signature for `data`
+        valid: boolean; // whether the signature matches the data
+    }
+
+    function decrypt(
+        alg: string,
+        key: string | Buffer,
+        cdata: string | Buffer,
+        props?: DecryptEncryptOptions
+    ): Promise<Buffer>;
+
+    function derive(alg: string, key: string | Buffer, props?: DeriveOptions): Promise<Buffer>;
+
+    function digest(alg: string, data: string | Buffer, props?: any): Promise<Buffer>;
+
+    function encrypt(
+        alg: string,
+        key: string | Buffer,
+        pdata: string | Buffer,
+        props?: DecryptEncryptOptions
+    ): Promise<EncryptReturn>;
+
+    function sign(
+        alg: string,
+        key: string | Buffer,
+        pdata: string | Buffer,
+        props: SignVerifyOptions
+    ): Promise<SignReturn>;
+
+    function verify(
+        alg: string,
+        key: string | Buffer,
+        pdata: string | Buffer,
+        mac: string | Buffer,
+        props: SignVerifyOptions
+    ): Promise<VerifyReturn>;
+}
+
+export namespace JWE {
+    function createEncrypt(keys: JWK.Key | JWK.Key[]): Encryptor;
+    function createEncrypt(
+        options: {
+            format?: 'compact' | 'flattened';
+            zip?: boolean;
+            fields?: object;
+        },
+        key: JWK.Key
+    ): Encryptor;
+
+    function createDecrypt(key: JWK.Key | JWK.KeyStore, opts?: any): Decryptor;
+
+    interface Encryptor {
+        update(input: any): this;
+        final(): Promise<string>;
+    }
+
+    interface Decryptor {
+        decrypt(input: string): Promise<DecryptResult>;
+    }
+
+    interface DecryptResult {
+        /**
+         * an array of the member names from the "protected" member
+         */
+        protected: string[];
+        /**
+         * the decrypted content (alternate)
+         */
+        plaintext: Buffer;
+    }
+}
+
+export namespace JWK {
+    const MODE_DECRYPT: string;
+
+    const MODE_ENCRYPT: string;
+
+    const MODE_SIGN: string;
+
+    const MODE_UNWRAP: string;
+
+    const MODE_VERIFY: string;
+
+    const MODE_WRAP: string;
+
+    function asKey(
+        key: string | Buffer | object | RawKey,
+        form?: 'json' | 'private' | 'pkcs8' | 'public' | 'spki' | 'pkix' | 'x509' | 'pem'
+    ): Promise<Key>;
+    /**
+     * To import a JWK-set as a keystore
+     */
+    function asKeyStore(ks: object | string): Promise<KeyStore>;
+
+    function createKey(kty: any, size: any, props: any): Promise<Key>;
+    /**
+     * To create an empty keystore
+     */
+    function createKeyStore(): KeyStore;
+
+    function isKey(input: any): input is Key;
+
+    function isKeyStore(input: any): input is KeyStore;
+
+    type KeyUse = 'sig' | 'enc' | 'desc';
+
+    interface JWEEncryptor {
+        update(input: any): this;
+        final(): Promise<string>;
+    }
+
+    interface RawKey {
+        alg: string;
+        kty: string;
+        use: KeyUse;
+
+        // e and n make up the public key
+        e: string;
+        n: string;
+    }
+
+    interface KeyStoreGetFilter {
+        kty?: string;
+        use?: KeyUse;
+        alg?: string;
+    }
+
+    interface KeyStoreGetOptions extends KeyStoreGetFilter {
+        kid: string;
+    }
+
+    interface KeyStore {
+        /**
+         * To export the public keys of a keystore as a JWK-set
+         */
+        toJSON(exportPrivateKeys?: boolean): object;
+        /**
+         * To retrieve a key from a keystore
+         */
+        get(kid: string, filter?: KeyStoreGetFilter): RawKey;
+        get(options: KeyStoreGetOptions): RawKey;
+        all(options?: Partial<KeyStoreGetOptions>): RawKey[];
+        add(key: RawKey): Promise<Key>;
+        /**
+         * @param key
+         *  String serialization of a JSON JWK/(base64-encoded) PEM/(binary-encoded) DER
+         *  Buffer of a JSON JWK/(base64-encoded) PEM/(binary-encoded) DER
+         * @param form
+         * is either a:
+         * - "json" for a JSON stringified JWK
+         * - "private" for a DER encoded 'raw' private key
+         * - "pkcs8" for a DER encoded (unencrypted!) PKCS8 private key
+         * - "public" for a DER encoded SPKI public key (alternate to 'spki')
+         * - "spki" for a DER encoded SPKI public key
+         * - "pkix" for a DER encoded PKIX X.509 certificate
+         * - "x509" for a DER encoded PKIX X.509 certificate
+         * - "pem" for a PEM encoded of PKCS8 / SPKI / PKIX
+         */
+        add(
+            key: string | Buffer | Key | object,
+            form?: 'json' | 'private' | 'pkcs8' | 'public' | 'spki' | 'pkix' | 'x509' | 'pem'
+        ): Promise<Key>;
+
+        generate(kty: string, size?: string | number, props?: any): Promise<Key>;
+
+        remove(key: Key): void;
+    }
+
+    interface Key {
+        keystore: KeyStore;
+        length: number;
+        kty: string;
+        kid: string;
+        use: KeyUse;
+        alg: string;
+
+        toPEM(isPrivate?: boolean): string;
+        toJSON(isPrivate?: boolean, excluded?: string[]): object;
+        thumbprint(hash?: string): Promise<string>;
+    }
+}
+
+export namespace JWS {
+    function createSign(keys: JWK.Key | JWK.Key[]): Signer;
+    function createSign(
+        options: {
+            format?: 'compact' | 'flattened';
+            alg?: string;
+            compact?: boolean;
+            fields?: object;
+        },
+        key: JWK.Key | JWK.Key[]
+    ): Signer;
+
+    /**
+     * Using a keystore.
+     */
+    function createVerify(
+        input?: string | JWK.Key | JWK.KeyStore | object,
+        opts?: { allowEmbeddedKey?: boolean; algorithms?: string[]; handlers?: any }
+    ): Verifier;
+
+    interface CreateSignResult {
+        signResult: object;
+    }
+
+    interface Signer {
+        update(input: Buffer | string, encoding?: string): this;
+        final(): Promise<CreateSignResult>;
+    }
+
+    interface BaseResult {
+        /**
+         * the combined 'protected' and 'unprotected' header members
+         */
+        header: object;
+        /**
+         * the signed content
+         */
+        payload: Buffer;
+        /**
+         * The key used to verify the signature
+         */
+        key: JWK.Key;
+        protected: string[];
+    }
+
+    interface VerificationResult extends BaseResult {
+        /**
+         * the verified signature
+         */
+        signature: Buffer | string;
+    }
+
+    interface Verifier {
+        verify(input: string, opts?: { allowEmbeddedKey?: boolean }): Promise<VerificationResult>;
+    }
+
+    interface Exp {
+        complete(jws: any): any;
+    }
+
+    interface VerifyOptions {
+        allowEmbeddedKey?: boolean;
+        algorithms?: string[];
+        handlers: { exp: boolean | Exp };
+    }
+}
+
+export function parse(input: Buffer | string | object): parse.ParseReturn;
+
+export namespace parse {
+    interface ParseReturn {
+        type: 'JWS' | 'JWE';
+        format: 'compact' | 'json';
+        input: Buffer | string | object;
+        header: object;
+        perform: (ks: JWK.KeyStore) => Promise<JWE.DecryptResult> | Promise<JWS.VerificationResult>;
+    }
+    function compact(input: Buffer | string | object): ParseReturn;
+
+    function json(input: Buffer | string | object): ParseReturn;
+}
+
+export namespace util {
+    function asBuffer(input: string | Buffer, encoding?: string): Buffer;
+
+    function randomBytes(len: number): Buffer;
+
+    namespace base64url {
+        function decode(base64url: string): string;
+
+        function encode(buffer: string | Buffer, encoding?: string): string;
+    }
+
+    namespace utf8 {
+        function decode(input: string): string;
+
+        function encode(input: string): string;
+    }
+}
diff --git a/types/node-jose/node-jose-tests.ts b/types/node-jose/node-jose-tests.ts
new file mode 100644
index 0000000000..dbeaccc9dc
--- /dev/null
+++ b/types/node-jose/node-jose-tests.ts
@@ -0,0 +1,276 @@
+import * as jose from 'node-jose';
+
+const keystore = jose.JWK.createKeyStore();
+const output = keystore.toJSON();
+keystore.toJSON(true);
+
+jose.JWK.asKeyStore('input').then(result => {});
+
+let key = keystore.get('kid');
+
+key = keystore.get('kid', { kty: 'RSA' });
+
+// ... and by 'use'
+key = keystore.get('kid', { use: 'enc' });
+
+// ... and by 'alg'
+key = keystore.get('kid', { alg: 'RSA-OAEP' });
+
+// ... and by 'kty' and 'use'
+key = keystore.get('kid', { kty: 'RSA', use: 'enc' });
+
+// same as above, but with a single {props} argument
+key = keystore.get({ kid: 'kid', kty: 'RSA', use: 'enc' });
+
+let everything = keystore.all();
+
+// filter by 'kid'
+everything = keystore.all({ kid: 'kid' });
+
+// filter by 'kty'
+everything = keystore.all({ kty: 'RSA' });
+
+// filter by 'use'
+everything = keystore.all({ use: 'enc' });
+
+// filter by 'alg'
+everything = keystore.all({ alg: 'RSA-OAEP' });
+
+// filter by 'kid' + 'kty' + 'alg'
+everything = keystore.all({ kid: 'kid', kty: 'RSA', alg: 'RSA-OAEP' });
+
+keystore.add('input').then(result => {});
+
+keystore.add('input', 'json').then(result => {
+    // {result} is a jose.JWK.Key
+});
+
+keystore.generate('oct', 256).then(result => {
+    // {result} is a jose.JWK.Key
+});
+
+// ... with properties
+const props = {
+    kid: 'gBdaS-G8RLax2qgObTD94w',
+    alg: 'A256GCM',
+    use: 'enc'
+};
+
+let key2: jose.JWK.Key;
+keystore.generate('oct', 256, props).then(result => {
+    key2 = result;
+    keystore.remove(key2);
+
+    jose.JWK.asKey(key2).then(result => {});
+
+    jose.JWK.asKey('input', 'json').then(result => {});
+});
+
+jose.JWK.createKey('oct', 256, { alg: 'A256GCM' }).then(result => {
+    const output4 = result.toJSON(true);
+    result.thumbprint('hash').then(print => {});
+
+    const key = result;
+
+    jose.JWS.createSign(key)
+        .update('input')
+        .final()
+        .then(result => {
+            // {result} is a JSON object -- JWS using the JSON General Serialization
+        });
+
+    jose.JWS.createSign({ format: 'flattened' }, key)
+        .update('input')
+        .final()
+        .then(result => {
+            // {result} is a JSON object -- JWS using the JSON Flattened Serialization
+        });
+
+    jose.JWS.createSign({ format: 'compact' }, key)
+        .update('input')
+        .final()
+        .then(result => {
+            // {result} is a String -- JWS using the Compact Serialization
+        });
+
+    jose.JWS.createSign({ alg: 'PS256' }, key)
+        .update('input')
+        .final()
+        .then(result => {
+            // ....
+        });
+
+    jose.JWS.createSign({ fields: { cty: 'jwk+json' } }, key)
+        .update('input')
+        .final()
+        .then(result => {
+            // ....
+        });
+
+    jose.JWS.createSign(key)
+        .update('input', 'utf8')
+        .final()
+        .then(result => {
+            // ....
+        });
+
+    let opts = {
+        algorithms: ['PS*']
+    };
+    jose.JWS.createVerify(key, opts)
+        .verify('input')
+        .then(result => {
+            // ...
+        });
+
+    opts = {
+        algorithms: ['*', '!HS*']
+    };
+    jose.JWS.createVerify(key, opts)
+        .verify('input')
+        .then(result => {
+            // ...
+        });
+
+    const opts2 = {
+        handlers: {
+            exp: true
+        }
+    };
+
+    jose.JWS.createVerify(key, opts2)
+        .verify('input')
+        .then(result => {
+            // ...
+        });
+
+    jose.JWE.createEncrypt(key)
+        .update('input')
+        .final()
+        .then(result => {
+            // {result} is a JSON Object -- JWE using the JSON General Serialization
+        });
+
+    jose.JWE.createEncrypt({ format: 'compact' }, key)
+        .update('input')
+        .final()
+        .then(result => {
+            // {result} is a String -- JWE using the Compact Serialization
+        });
+
+    jose.JWE.createEncrypt({ format: 'flattened' }, key)
+        .update('input')
+        .final()
+        .then(result => {
+            // {result} is a JSON Object -- JWE using the JSON Flattened Serialization
+        });
+
+    jose.JWE.createEncrypt({ zip: true }, key)
+        .update('input')
+        .final()
+        .then(result => {
+            // ....
+        });
+
+    jose.JWE.createEncrypt({ fields: { cty: 'jwk+json' } }, key)
+        .update('input')
+        .final()
+        .then(result => {
+            // ....
+        });
+
+    jose.JWE.createEncrypt([key, key])
+        .update('input')
+        .final()
+        .then(result => {
+            // ....
+        });
+
+    jose.JWE.createDecrypt(key)
+        .decrypt('input')
+        .then(result => {
+            // ....
+        });
+
+    const opts3 = {
+        algorithms: ['dir', 'A*GCM']
+    };
+    jose.JWE.createDecrypt(key, opts3)
+        .decrypt('input')
+        .then(result => {
+            // ...
+        });
+
+    const opts4 = {
+        algorithms: ['*', '!RSA*']
+    };
+    jose.JWS.createVerify(key, opts4)
+        .verify('input')
+        .then(result => {
+            // ...
+        });
+
+    const opts5 = {
+        handlers: {
+            exp: true
+        }
+    };
+    jose.JWE.createDecrypt(key, opts5)
+        .decrypt('input')
+        .then(result => {
+            // ...
+        });
+});
+
+jose.JWS.createVerify(keystore)
+    .verify('input')
+    .then(result => {
+        // {result} is a Object with:
+        // *  header: the combined 'protected' and 'unprotected' header members
+        // *  payload: Buffer of the signed content
+        // *  signature: Buffer of the verified signature
+        // *  key: The key used to verify the signature
+    });
+
+// {key} can be:
+// *  jose.JWK.Key
+// *  JSON object representing a JWK
+jose.JWS.createVerify(key)
+    .verify('input')
+    .then(result => {
+        // ...
+    });
+
+jose.JWS.createVerify()
+    .verify('input', { allowEmbeddedKey: true })
+    .then(result => {
+        // ...
+    });
+
+const verifier = jose.JWS.createVerify({ allowEmbeddedKey: true });
+
+verifier.verify('input').then(result => {
+    // ...
+});
+
+jose.JWE.createDecrypt(keystore)
+    .decrypt('input')
+    .then(result => {
+        // {result} is a Object with:
+        // *  header: the combined 'protected' and 'unprotected' header members
+        // *  protected: an array of the member names from the "protected" member
+        // *  key: Key used to decrypt
+        // *  payload: Buffer of the decrypted content
+        // *  plaintext: Buffer of the decrypted content (alternate)
+    });
+
+jose.util.asBuffer('input');
+
+jose.util.base64url.encode('input');
+jose.util.base64url.encode('input', 'utf8');
+
+jose.util.base64url.encode('input');
+
+jose.util.base64url.decode('input');
+
+jose.util.randomBytes(32);
diff --git a/types/node-jose/tsconfig.json b/types/node-jose/tsconfig.json
new file mode 100644
index 0000000000..c01c2b1fb7
--- /dev/null
+++ b/types/node-jose/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "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-jose-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/node-jose/tslint.json b/types/node-jose/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/node-jose/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/node-sass-middleware/index.d.ts b/types/node-sass-middleware/index.d.ts
index badbd843d1..53cde2a10a 100644
--- a/types/node-sass-middleware/index.d.ts
+++ b/types/node-sass-middleware/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/sass/node-sass-middleware
 // Definitions by: Pascal Garber <http://www.jumplink.eu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.7
 
 
 
diff --git a/types/node-sass/index.d.ts b/types/node-sass/index.d.ts
index b208b57f19..f5445689b4 100644
--- a/types/node-sass/index.d.ts
+++ b/types/node-sass/index.d.ts
@@ -1,56 +1,410 @@
-// Type definitions for Node Sass v3.10.1
+// Type definitions for node-sass 4.11
 // Project: https://github.com/sass/node-sass
-// Definitions by: Asana <https://asana.com>
+// Definitions by: Asana <https://github.com/pspeter3>, Chris Eppstein <https://github.com/chriseppstein>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
 
 /// <reference types="node" />
 
-type ImporterReturnType = { file: string } | { contents: string } | Error | null;
+export type ImporterReturnType = { file: string } | { file?: string; contents: string } | Error | null | types.Null | types.Error;
 
-interface Importer {
-    (url: string, prev: string, done: (data: ImporterReturnType) => void): ImporterReturnType | void;
+/**
+ * The context value is a value that is shared for the duration of a single render.
+ * The context object is the implicit `this` for importers and sass functions
+ * that are implemented in javascript.
+ *
+ * A render can be detected as asynchronous if the `callback` property is set on the context object.
+ */
+export interface Context {
+	options: Options;
+	callback: SassRenderCallback | undefined;
+	[data: string]: any;
 }
 
-interface Options {
-    file?: string;
-    data?: string;
-    importer?: Importer | Importer[];
-    functions?: { [key: string]: Function };
-    includePaths?: string[];
-    indentedSyntax?: boolean;
-    indentType?: string;
-    indentWidth?: number;
-    linefeed?: string;
-    omitSourceMapUrl?: boolean;
-    outFile?: string;
-    outputStyle?: "compact" | "compressed" | "expanded" | "nested";
-    precision?: number;
-    sourceComments?: boolean;
-    sourceMap?: boolean | string;
-    sourceMapContents?: boolean;
-    sourceMapEmbed?: boolean;
-    sourceMapRoot?: string;
+export interface AsyncContext extends Context {
+	callback: SassRenderCallback;
 }
 
-interface SassError extends Error {
-    message: string;
-    line: number;
-    column: number;
-    status: number;
-    file: string;
+export interface SyncContext extends Context {
+	callback: undefined;
 }
 
-interface Result {
-    css: Buffer;
-    map: Buffer;
-    stats: {
-        entry: string;
-        start: number;
-        end: number;
-        duration: number;
-        includedFiles: string[];
-    }
+export type AsyncImporter = (this: AsyncContext, url: string, prev: string, done: (data: ImporterReturnType) => void) => void;
+export type SyncImporter = (this: SyncContext, url: string, prev: string) => ImporterReturnType;
+export type Importer = AsyncImporter | SyncImporter;
+
+// These function types enumerate up to 6 js arguments. More than that will be incorrectly marked by the compiler as an error.
+
+// ** Sync Sass functions receiving fixed # of arguments ***
+export type SyncSassFn = (this: SyncContext, ...$args: types.Value[]) => types.ReturnValue;
+
+/* tslint:disable:max-line-length */
+// ** Sync Sass functions receiving variable # of arguments ***
+export type SyncSassVarArgFn1 = (this: SyncContext, $arg1: types.Value[]) => types.ReturnValue;
+export type SyncSassVarArgFn2 = (this: SyncContext, $arg1: types.Value, $arg2: types.Value[]) => types.ReturnValue;
+export type SyncSassVarArgFn3 = (this: SyncContext, $arg1: types.Value, $arg2: types.Value, $arg3: types.Value[]) => types.ReturnValue;
+export type SyncSassVarArgFn4 = (this: SyncContext, $arg1: types.Value, $arg2: types.Value, $arg3: types.Value, $arg4: types.Value[]) => types.ReturnValue;
+export type SyncSassVarArgFn5 = (this: SyncContext, $arg1: types.Value, $arg2: types.Value, $arg3: types.Value, $arg4: types.Value, $arg5: types.Value[]) => types.ReturnValue;
+export type SyncSassVarArgFn6 = (this: SyncContext, $arg1: types.Value, $arg2: types.Value, $arg3: types.Value, $arg4: types.Value, $arg5: types.Value, $arg6: types.Value[]) => types.ReturnValue;
+
+export type SassFunctionCallback = ($result: types.ReturnValue) => void;
+
+// ** Async Sass functions receiving fixed # of arguments ***
+export type AsyncSassFn0 = (this: AsyncContext, cb: SassFunctionCallback) => void;
+export type AsyncSassFn1 = (this: AsyncContext, $arg1: types.Value, cb: SassFunctionCallback) => void;
+export type AsyncSassFn2 = (this: AsyncContext, $arg1: types.Value, $arg2: types.Value, cb: SassFunctionCallback) => void;
+export type AsyncSassFn3 = (this: AsyncContext, $arg1: types.Value, $arg2: types.Value, $arg3: types.Value, cb: SassFunctionCallback) => void;
+export type AsyncSassFn4 = (this: AsyncContext, $arg1: types.Value, $arg2: types.Value, $arg3: types.Value, $arg4: types.Value, cb: SassFunctionCallback) => void;
+export type AsyncSassFn5 = (this: AsyncContext, $arg1: types.Value, $arg2: types.Value, $arg3: types.Value, $arg4: types.Value, $arg5: types.Value, cb: SassFunctionCallback) => void;
+export type AsyncSassFn6 = (this: AsyncContext, $arg1: types.Value, $arg2: types.Value, $arg3: types.Value, $arg4: types.Value, $arg5: types.Value, $arg6: types.Value, cb: SassFunctionCallback) => void;
+
+// *** Async Sass Functions receiving variable # of arguments ***
+export type AsyncSassVarArgFn1 = (this: AsyncContext, $arg1: types.Value[], cb: SassFunctionCallback) => void;
+export type AsyncSassVarArgFn2 = (this: AsyncContext, $arg1: types.Value, $arg2: types.Value[], cb: SassFunctionCallback) => void;
+export type AsyncSassVarArgFn3 = (this: AsyncContext, $arg1: types.Value, $arg2: types.Value, $arg3: types.Value[], cb: SassFunctionCallback) => void;
+export type AsyncSassVarArgFn4 = (this: AsyncContext, $arg1: types.Value, $arg2: types.Value, $arg3: types.Value, $arg4: types.Value[], cb: SassFunctionCallback) => void;
+export type AsyncSassVarArgFn5 = (this: AsyncContext, $arg1: types.Value, $arg2: types.Value, $arg3: types.Value, $arg4: types.Value, $arg5: types.Value[], cb: SassFunctionCallback) => void;
+export type AsyncSassVarArgFn6 = (this: AsyncContext, $arg1: types.Value, $arg2: types.Value, $arg3: types.Value, $arg4: types.Value, $arg5: types.Value, $arg6: types.Value[], cb: SassFunctionCallback) => void;
+/* tslint:enable:max-line-length */
+
+export type SyncSassFunction = SyncSassFn | SyncSassVarArgFn1 | SyncSassVarArgFn2 | SyncSassVarArgFn3 | SyncSassVarArgFn4 | SyncSassVarArgFn5 | SyncSassVarArgFn6;
+
+export type AsyncSassFunction = AsyncSassFn0 | AsyncSassFn1 | AsyncSassFn2 | AsyncSassFn3 | AsyncSassFn4 | AsyncSassFn5 | AsyncSassFn6
+															| AsyncSassVarArgFn1 | AsyncSassVarArgFn2 | AsyncSassVarArgFn3 | AsyncSassVarArgFn4 | AsyncSassVarArgFn5 | AsyncSassVarArgFn6;
+
+export type SassFunction = SyncSassFunction | AsyncSassFunction;
+
+export type FunctionDeclarations<FunctionType extends SassFunction = SassFunction> = Record<string, FunctionType>;
+
+export interface Options {
+	file?: string;
+	data?: string;
+	importer?: Importer | Importer[];
+	functions?: FunctionDeclarations;
+	includePaths?: string[];
+	indentedSyntax?: boolean;
+	indentType?: string;
+	indentWidth?: number;
+	linefeed?: string;
+	omitSourceMapUrl?: boolean;
+	outFile?: string;
+	outputStyle?: "compact" | "compressed" | "expanded" | "nested";
+	precision?: number;
+	sourceComments?: boolean;
+	sourceMap?: boolean | string;
+	sourceMapContents?: boolean;
+	sourceMapEmbed?: boolean;
+	sourceMapRoot?: string;
+	[key: string]: any;
 }
 
-export declare function render(options: Options, callback: (err: SassError, result: Result) => any): void;
-export declare function renderSync(options: Options): Result;
+export interface SyncOptions extends Options {
+	functions?: FunctionDeclarations<SyncSassFunction>;
+	importer?: SyncImporter | SyncImporter[];
+}
+
+/**
+ * The error object returned to javascript by sass's render methods.
+ *
+ * This is not the same thing as types.Error.
+ */
+export interface SassError extends Error {
+	message: string;
+	line: number;
+	column: number;
+	status: number;
+	file: string;
+}
+
+/**
+ * The result of successfully compiling a Sass file.
+ */
+export interface Result {
+	css: Buffer;
+	map: Buffer;
+	stats: {
+		entry: string;
+		start: number;
+		end: number;
+		duration: number;
+		includedFiles: string[];
+	};
+}
+export type SassRenderCallback = (err: SassError, result: Result) => any;
+
+// Note, most node-sass constructors can be invoked as a function or with a new
+// operator. The exception: the types Null and Boolean for which new is
+// forbidden.
+//
+// Because of this, the new-able object notation is used here, a class does not
+// work for these types.
+export namespace types {
+	/* eslint-disable @typescript-eslint/ban-types */
+	/* tslint:disable:ban-types */
+	/**
+	 * Values that are received from Sass as an argument to a javascript function.
+	 */
+	export type Value = Null | Number | String | Color | Boolean | List | Map;
+
+	/**
+	 * Values that are legal to return to Sass from a javascript function.
+	 */
+	export type ReturnValue = Value | Error;
+
+	// *** Sass Null ***
+
+	export interface Null {
+		/**
+		 * This property doesn't exist, but its presence forces the typescript
+		 * compiler to properly type check this type. Without it, it seems to
+		 * allow things that aren't types.Null to match it in case statements and
+		 * assignments.
+		 */
+		readonly ___NULL___: unique symbol;
+	}
+
+	interface NullConstructor {
+		(): Null;
+		NULL: Null;
+	}
+	export const Null: NullConstructor;
+
+	// *** Sass Number ***
+
+	export interface Number {
+		getValue(): number;
+		setValue(n: number): void;
+		getUnit(): string;
+		setUnit(u: string): void;
+	}
+	interface NumberConstructor {
+		/**
+		 * Constructs a new Sass number. Does not require use of the `new` keyword.
+		 */
+		new(value: number, unit?: string): Number;
+		/**
+		 * Constructs a new Sass number. Can also be used with the `new` keyword.
+		 */
+		(value: number, unit?: string): Number;
+	}
+
+	export const Number: NumberConstructor;
+
+	// *** Sass String ***
+
+	export interface String {
+		getValue(): string;
+		setValue(s: string): void;
+	}
+
+	interface StringConstructor {
+		/**
+		 * Constructs a new Sass string. Does not require use of the `new` keyword.
+		 */
+		new (value: string): String;
+		/**
+		 * Constructs a new Sass string. Can also be used with the `new` keyword.
+		 */
+		(value: string): String;
+	}
+
+	export const String: StringConstructor;
+
+	// *** Sass Color ***
+
+	export interface Color {
+		/**
+		 * Get the red component of the color.
+		 * @returns integer between 0 and 255 inclusive;
+		 */
+		getR(): number;
+		/**
+		 * Set the red component of the color.
+		 * @returns integer between 0 and 255 inclusive;
+		 */
+		setR(r: number): void;
+		/**
+		 * Get the green component of the color.
+		 * @returns integer between 0 and 255 inclusive;
+		 */
+		getG(): number;
+		/**
+		 * Set the green component of the color.
+		 * @param g integer between 0 and 255 inclusive;
+		 */
+		setG(g: number): void;
+		/**
+		 * Get the blue component of the color.
+		 * @returns integer between 0 and 255 inclusive;
+		 */
+		getB(): number;
+		/**
+		 * Set the blue component of the color.
+		 * @param b integer between 0 and 255 inclusive;
+		 */
+		setB(b: number): void;
+		/**
+		 * Get the alpha transparency component of the color.
+		 * @returns number between 0 and 1 inclusive;
+		 */
+		getA(): number;
+		/**
+		 * Set the alpha component of the color.
+		 * @param a number between 0 and 1 inclusive;
+		 */
+		setA(a: number): void;
+	}
+
+	interface ColorConstructor {
+		/**
+		 * Constructs a new Sass color given the RGBA component values. Do not invoke with the `new` keyword.
+		 *
+		 * @param r integer 0-255 inclusive
+		 * @param g integer 0-255 inclusive
+		 * @param b integer 0-255 inclusive
+		 * @param [a] float 0 - 1 inclusive
+		 * @returns a SassColor instance.
+		 */
+		new (r: number, g: number, b: number, a?: number): Color;
+
+		/**
+		 * Constructs a new Sass color given a 4 byte number. Do not invoke with the `new` keyword.
+		 *
+		 * If a single number is passed it is assumed to be a number that contains
+		 * all the components which are extracted using bitmasks and bitshifting.
+		 *
+		 * @param hexN A number that is usually written in hexadecimal form. E.g. 0xff0088cc.
+		 * @returns a Sass Color instance.
+		 * @example
+		 *   // Comparison with byte array manipulation
+		 *   let a = new ArrayBuffer(4);
+		 *   let hexN = 0xCCFF0088; // 0xAARRGGBB
+		 *   let a32 = new Uint32Array(a); // Uint32Array [ 0 ]
+		 *   a32[0] = hexN;
+		 *   let a8 = new Uint8Array(a); // Uint8Array [ 136, 0, 255, 204 ]
+		 *   let componentBytes = [a8[2], a8[1], a8[0], a8[3] / 255] // [ 136, 0, 255, 0.8 ]
+		 *   let c = sass.types.Color(hexN);
+		 *   let components = [c.getR(), c.getG(), c.getR(), c.getA()] // [ 136, 0, 255, 0.8 ]
+		 *   assert.deepEqual(componentBytes, components); // does not raise.
+		 */
+		new (hexN: number): Color;
+
+		/**
+		 * Constructs a new Sass color given the RGBA component values. Do not invoke with the `new` keyword.
+		 *
+		 * @param r integer 0-255 inclusive
+		 * @param g integer 0-255 inclusive
+		 * @param b integer 0-255 inclusive
+		 * @param [a] float 0 - 1 inclusive
+		 * @returns a SassColor instance.
+		 */
+		(r: number, g: number, b: number, a?: number): Color;
+
+		/**
+		 * Constructs a new Sass color given a 4 byte number. Do not invoke with the `new` keyword.
+		 *
+		 * If a single number is passed it is assumed to be a number that contains
+		 * all the components which are extracted using bitmasks and bitshifting.
+		 *
+		 * @param hexN A number that is usually written in hexadecimal form. E.g. 0xff0088cc.
+		 * @returns a Sass Color instance.
+		 * @example
+		 *   // Comparison with byte array manipulation
+		 *   let a = new ArrayBuffer(4);
+		 *   let hexN = 0xCCFF0088; // 0xAARRGGBB
+		 *   let a32 = new Uint32Array(a); // Uint32Array [ 0 ]
+		 *   a32[0] = hexN;
+		 *   let a8 = new Uint8Array(a); // Uint8Array [ 136, 0, 255, 204 ]
+		 *   let componentBytes = [a8[2], a8[1], a8[0], a8[3] / 255] // [ 136, 0, 255, 0.8 ]
+		 *   let c = sass.types.Color(hexN);
+		 *   let components = [c.getR(), c.getG(), c.getR(), c.getA()] // [ 136, 0, 255, 0.8 ]
+		 *   assert.deepEqual(componentBytes, components); // does not raise.
+		 */
+		(hexN: number): Color;
+	}
+
+	export const Color: ColorConstructor;
+
+	// *** Sass Boolean ***
+
+	export interface Boolean {
+		getValue(): boolean;
+	}
+
+	interface BooleanConstructor {
+		(bool: boolean): Boolean;
+		TRUE: Boolean;
+		FALSE: Boolean;
+	}
+
+	export const Boolean: BooleanConstructor;
+
+	// *** Sass List ***
+
+	export interface Enumerable {
+		getValue(index: number): Value;
+		setValue(index: number, value: Value): void;
+		getLength(): number;
+	}
+
+	export interface List extends Enumerable {
+		getSeparator(): boolean;
+		setSeparator(isComma: boolean): void;
+	}
+	interface ListConstructor {
+		new (length: number, commaSeparator?: boolean): List;
+		(length: number, commaSeparator?: boolean): List;
+	}
+	export const List: ListConstructor;
+
+	// *** Sass Map ***
+
+	export interface Map extends Enumerable {
+		getKey(index: number): Value;
+		setKey(index: number, key: Value): void;
+	}
+	interface MapConstructor {
+		new (length: number): Map;
+		(length: number): Map;
+	}
+	export const Map: MapConstructor;
+
+	// *** Sass Error ***
+
+	export interface Error {
+		/**
+		 * This property doesn't exist, but its presence forces the typescript
+		 * compiler to properly type check this type. Without it, it seems to
+		 * allow things that aren't types.Error to match it in case statements and
+		 * assignments.
+		 */
+		readonly ___SASS_ERROR___: unique symbol;
+		// why isn't there a getMessage() method?
+	}
+
+	interface ErrorConstructor {
+		/**
+		 * An error return value for async functions.
+		 * For synchronous functions, this can be returned or a standard error object can be thrown.
+		 */
+		new (message: string): Error;
+		/**
+		 * An error return value for async functions.
+		 * For synchronous functions, this can be returned or a standard error object can be thrown.
+		 */
+		(message: string): Error;
+	}
+	export const Error: ErrorConstructor;
+
+	/* eslint-enable @typescript-eslint/ban-types */
+	/* tslint:enable:ban-types */
+}
+
+// *** Top level Constants ***
+
+export const NULL: types.Null;
+export const TRUE: types.Boolean;
+export const FALSE: types.Boolean;
+export const info: string;
+export function render(options: Options, callback: SassRenderCallback): void;
+export function renderSync(options: SyncOptions): Result;
diff --git a/types/node-sass/node-sass-tests.ts b/types/node-sass/node-sass-tests.ts
index 4de32d7d06..e8ae73cef7 100644
--- a/types/node-sass/node-sass-tests.ts
+++ b/types/node-sass/node-sass-tests.ts
@@ -1,48 +1,193 @@
 import * as sass from 'node-sass';
 
-sass.render({
-  file: '/path/to/myFile.scss',
-  data: 'body{background:blue; a{color:black;}}',
-  importer: function(url, prev, done) {
-    someAsyncFunction(url, prev, function(result) {
-      if (result == null) {
-        // return null to opt out of handling this path
-        // compiler will fall to next importer in array (or its own default)
-        return null;
-      }
-      // only one of them is required, see section Sepcial Behaviours.
-      done({ file: result.path });
-      done({ contents: result.data });
-    });
-  },
-  includePaths: ['lib/', 'mod/'],
-  outputStyle: 'compressed'
-}, function(error, result) { // node-style callback from v3.0.0 onwards
+console.log(sass.info);
+
+const syncImporter: sass.SyncImporter = function(url, prev) {
+  if (url.startsWith('!')) {
+    return sass.NULL;
+  }
+  if (url.endsWith('?')) {
+    return sass.types.Error("cannot question mark");
+  }
+  console.log(typeof this.callback); // "undefined"
+  return { file: [prev, url].join('/') };
+};
+
+const asyncImporter: sass.AsyncImporter = function(url, prev, done) {
+  if (url.startsWith('!')) {
+    // shouldn't really call twice, just checking for compiler validity
+    done(null);
+    done(sass.NULL);
+  }
+  if (url.endsWith('?')) {
+    // shouldn't really call twice, just checking for compiler validity
+    done(new sass.types.Error('Cannot accept this file'));
+    done(new Error('Cannot accept this file'));
+  } else {
+    console.log(this.options.file); // "string"
+    console.log(typeof this.callback); // "function"
+    done({ file: [prev, url].join('/') });
+  }
+};
+
+const anotherAsyncImporter: sass.AsyncImporter = (url, prev, done) => {
+  someAsyncFunction(url, prev, (result) => {
+    if (result == null) {
+      // return null to opt out of handling this path
+      // compiler will fall to next importer in array (or its own default)
+      done(null);
+    }
+    // only one of them is required, see section Special Behaviors.
+    done({ file: result.path });
+    done({ contents: result.data });
+  });
+};
+
+const handleAsyncResult: sass.SassRenderCallback = (error, result) => { // node-style callback from v3.0.0 onwards
   if (error) {
     console.log(error.status, error.column, error.message, error.line);
-  }
-  else {
+  } else {
     console.log(result.stats);
     console.log(result.css.toString());
     console.log(result.map.toString());
     // or better
     console.log(JSON.stringify(result.map)); // note, JSON.stringify accepts Buffer too
   }
-});
+};
+
+const syncFunction: Record<string, sass.SyncSassFn> = {
+  "pow($base, $exp)"($base, $exp) {
+    console.log(this.options.file); // "string"
+    console.log(typeof this.callback); // "undefined"
+    if ($base instanceof sass.types.Number && $exp instanceof sass.types.Number) {
+      if ($base.getUnit() !== "" || $exp.getUnit() !== "") {
+        throw new Error("Cannot have units in an exponent");
+      }
+      return new sass.types.Number(Math.pow($base.getValue(), $exp.getValue()));
+    } else {
+      throw new Error("Number expected");
+    }
+  }
+};
+
+const syncVarArg: Record<string, sass.SyncSassVarArgFn3> = {
+  "add-all($n1, $n2, $ns...)"($n1, $n2, $ns) {
+    if (!($n1 instanceof sass.types.Number)) {
+      throw new Error("Expected a number");
+    }
+    if (!($n2 instanceof sass.types.Number)) {
+      throw new Error("Expected a number");
+    }
+    const unit = $n1.getUnit();
+    if ($n2.getUnit() !== unit) {
+      throw new Error("units don't match");
+    }
+    let accum = $n1.getValue() + $n2.getValue();
+    $ns.forEach(($n) => {
+      if (!($n instanceof sass.types.Number)) {
+        throw new Error("Expected a number");
+      }
+      if ($n.getUnit() !== unit) {
+        throw new Error("units don't match");
+      }
+      accum = accum + $n.getValue();
+    });
+    return sass.types.Number(accum, unit);
+  }
+};
+
+const syncFunctions: Record<string, sass.SyncSassFunction> = {...syncFunction, ...syncVarArg};
+
+const asyncFunction: Record<string, sass.AsyncSassFn2> = {
+  "pow-async($base, $exp)"($base, $exp, done) {
+    console.log(this.options.file); // "string"
+    console.log(typeof this.callback); // "function"
+    if ($base instanceof sass.types.Number && $exp instanceof sass.types.Number) {
+      if ($base.getUnit() !== "" || $exp.getUnit() !== "") {
+        done(new sass.types.Error("Cannot have units in an exponent"));
+      }
+      done(new sass.types.Number(Math.pow($base.getValue(), $exp.getValue())));
+    } else {
+      done(new sass.types.Error("Number expected"));
+    }
+  }
+};
+
+const asyncVarArg: Record<string, sass.AsyncSassVarArgFn3> = {
+  "add-all-async($n1, $n2, $ns...)"($n1, $n2, $ns, done) {
+    if (!($n1 instanceof sass.types.Number)) {
+      done(new sass.types.Error("Expected a number"));
+      return;
+    }
+    if (!($n2 instanceof sass.types.Number)) {
+      done(new sass.types.Error("Expected a number"));
+      return;
+    }
+    const unit = $n1.getUnit();
+    if ($n2.getUnit() !== unit) {
+      done(new sass.types.Error("units don't match"));
+      return;
+    }
+    let accum = $n1.getValue() + $n2.getValue();
+    for (const $n of $ns) {
+      if (!($n instanceof sass.types.Number)) {
+        done(new sass.types.Error("Expected a number"));
+        return;
+      }
+      if ($n.getUnit() !== unit) {
+        done(new sass.types.Error("units don't match"));
+        return;
+      }
+      accum = accum + $n.getValue();
+    }
+    done(sass.types.Number(accum, unit));
+  }
+};
+
+const asyncFunctions: Record<string, sass.AsyncSassFunction> = {...asyncFunction, ...asyncVarArg};
+
+const functions: sass.FunctionDeclarations = {...syncFunctions, ...asyncFunctions};
+
+sass.render({
+  file: '/path/to/myFile.scss',
+  data: 'body{background:blue; a{color:black;}}',
+  functions,
+  importer: [anotherAsyncImporter, asyncImporter, syncImporter],
+  includePaths: ['lib/', 'mod/'],
+  outputStyle: 'compressed'
+}, handleAsyncResult);
+
 // OR
+
+sass.render({
+  file: '/path/to/myFile.scss',
+  data: 'body{background:blue; a{color:black;}}',
+  importer: asyncImporter,
+  includePaths: ['lib/', 'mod/'],
+  outputStyle: 'compressed'
+}, handleAsyncResult);
+
+// OR
+
+sass.render({
+  file: '/path/to/myFile.scss',
+  data: 'body{background:blue; a{color:black;}}',
+  importer: syncImporter,
+  includePaths: ['lib/', 'mod/'],
+  outputStyle: 'compressed'
+}, handleAsyncResult);
+
+// OR
+
 const result = sass.renderSync({
   file: '/path/to/file.scss',
   data: 'body{background:blue; a{color:black;}}',
   outputStyle: 'compressed',
+  functions: syncFunctions,
   outFile: '/to/my/output.css',
   sourceMap: true, // or an absolute or relative (to outFile) path
   sourceMapRoot: '.',
-  importer: function(url, prev) {
-    if (url.startsWith('!')) {
-      return new Error('Cannot accept this file');
-    }
-    return { file: [prev, url].join('/') };
-  },
+  importer: syncImporter,
 });
 
 console.log(result.css);
@@ -50,6 +195,104 @@ console.log(result.map);
 console.log(result.stats);
 
 function someAsyncFunction(url: string, prev: string, callback: (result: { path: string; data: string }) => void): void { }
-function someSyncFunction(url: string, prev: string): { path: string; data: string } {
-  return null;
+
+function sameType<V extends sass.types.Value>(v1: V, v2: V): boolean {
+  return v1.constructor === v2.constructor;
 }
+
+// function-based Constructors and instance methods for types
+const true1 = sass.types.Boolean(true);
+true1.getValue(); // true
+const true2 = sass.types.Boolean.TRUE;
+const true3 = sass.TRUE;
+sameType(true2, true3);
+true2 === true3; // true
+const false1 = sass.types.Boolean(false);
+const false2 = sass.types.Boolean.FALSE;
+const false3 = sass.FALSE;
+false2 === false3; // true
+false1.getValue(); // false
+const null1 = sass.types.Null();
+const null2 = sass.types.Null.NULL;
+const null3 = sass.NULL;
+sameType(null2, null3);
+null1 === null2; // true
+null1 === null3; // true
+const ident = sass.types.String("x");
+ident.getValue(); // 'x'
+const stringQuoted = sass.types.String("'x'");
+stringQuoted.getValue(); // '\'x\''
+const number = sass.types.Number(5);
+number.getUnit(); // ""
+number.getValue(); // 5
+const dimension = sass.types.Number(5, "px");
+dimension.getUnit(); // "px"
+const redOpaque = sass.types.Color(240, 15, 0);
+redOpaque.getR(); // 240
+redOpaque.getG(); // 15
+redOpaque.getB(); // 0
+redOpaque.getA(); // 1
+const redTranslucent = sass.types.Color(240, 15, 0, 0.5);
+redTranslucent.getA(); // 0.5
+const redOpaque2 = sass.types.Color(0xF00F00FF);
+redOpaque2.getR(); // 240
+redOpaque2.getG(); // 15
+redOpaque2.getB(); // 0
+redOpaque2.getA(); // 1
+const redTranslucent2 = sass.types.Color(0xF00F007F);
+redTranslucent.getA(); // 0.5
+const spaceList1 = sass.types.List(1);
+spaceList1.getLength(); // 1
+spaceList1.getSeparator(); // false
+spaceList1.setValue(0, ident);
+spaceList1.setValue(0, true1);
+spaceList1.setValue(0, false1);
+spaceList1.setValue(0, null1);
+spaceList1.setValue(0, dimension);
+spaceList1.setValue(0, redOpaque);
+spaceList1.getValue(0) === redOpaque; // true
+const spaceList2 = sass.types.List(1, false);
+spaceList2.setValue(0, sass.types.String("s"));
+const commaList1 = sass.types.List(2, true);
+commaList1.getLength(); // 2
+commaList1.getSeparator(); // true (it's a comma)
+commaList1.setValue(0, spaceList1);
+commaList1.setValue(2, spaceList2);
+const map1 = sass.types.Map(2);
+map1.getLength(); // 2
+map1.setKey(0, ident);
+map1.setValue(0, spaceList1);
+ident === map1.getKey(0); // true
+spaceList1 === map1.getValue(1); // true
+sameType(ident, map1.getKey(0)); // true
+const error = new sass.types.Error("message");
+
+function valuesOf(enumerable: sass.types.Enumerable): sass.types.Value[] {
+  const values = new Array<sass.types.Value>();
+  for (let i = 0; i < enumerable.getLength(); i++) {
+    values.push(enumerable.getValue(i));
+  }
+  return values;
+}
+
+let arr = valuesOf(map1);
+console.dir(arr);
+arr = valuesOf(commaList1);
+console.dir(arr);
+
+// new-based Constructors
+// boolean and null raise a runtime error if constructed with new.
+// const newTrue = new sass.types.Boolean(true);
+// const newFalse = new sass.types.Boolean(false);
+// const newNull = new sass.types.Null();
+const newIdent = new sass.types.String("x");
+const newNumber = new sass.types.Number(5);
+const newDimension = new sass.types.Number(5, "px");
+const newRedOpaque = new sass.types.Color(240, 15, 0);
+const newRedTranslucent = new sass.types.Color(240, 15, 0, 0.5);
+const newRedOpaque2 = new sass.types.Color(0xF00F00FF);
+const newSpaceList1 = new sass.types.List(1);
+const newSpaceList2 = new sass.types.List(1, false);
+const newCommaList1 = new sass.types.List(2, true);
+const newMap1 = new sass.types.Map(2);
+const newError = new sass.types.Error("message");
diff --git a/types/node-sass/tsconfig.json b/types/node-sass/tsconfig.json
index a1e4cdb079..172d6270c7 100644
--- a/types/node-sass/tsconfig.json
+++ b/types/node-sass/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/node-sass/tslint.json b/types/node-sass/tslint.json
index a41bf5d19a..0b6d65eeac 100644
--- a/types/node-sass/tslint.json
+++ b/types/node-sass/tslint.json
@@ -1,79 +1,9 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        // We don't want to export the Constructor interfaces
+        // and I can't figure out how to disable this lint using
+        // `export {}`
+        "strict-export-declare-modifiers": false
     }
 }
diff --git a/types/node-schedule/index.d.ts b/types/node-schedule/index.d.ts
index e7da166aab..8e5727d3d0 100644
--- a/types/node-schedule/index.d.ts
+++ b/types/node-schedule/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for node-schedule 1.2
-// Project: https://github.com/tejasmanohar/node-schedule/
+// Project: https://github.com/node-schedule/node-schedule
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>, Florian Plattner <https://github.com/flowpl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/node-sql-parser/index.d.ts b/types/node-sql-parser/index.d.ts
new file mode 100644
index 0000000000..c711212c63
--- /dev/null
+++ b/types/node-sql-parser/index.d.ts
@@ -0,0 +1,97 @@
+// Type definitions for node-sql-parser 1.0
+// Project: https://github.com/taozhi8833998/node-sql-parser#readme
+// Definitions by: taozhi8833998 <https://github.com/taozhi8833998>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+export interface With {
+  name: string;
+  stmt: any[];
+  columns?: any[];
+}
+export type WhilteListCheckMode = 'table' | 'column';
+export interface TableColumnAst {
+  tableList: string[];
+  columnsList: string[];
+  ast: AST[] | AST;
+}
+export interface From {
+  db: string | null;
+  table: string;
+  as: string | null;
+}
+export interface Dual {
+  type: 'dual';
+}
+export interface Limit {
+  type: string;
+  value: number;
+}
+export interface OrderBy {
+  type: 'ASC' | 'DESC';
+  expr: any;
+}
+export interface ColumnRef {
+  type: 'column_ref';
+  table: string | null;
+  column: string;
+}
+export interface SetList {
+  column: string;
+  value: any;
+  table: string | null;
+}
+export interface InsertReplaceValue {
+  type: 'expr_list';
+  value: any[];
+}
+export interface Select {
+  with: With | null;
+  type: 'select';
+  options: any[] | null;
+  distinct: 'DISTINCT' | null;
+  columns: any[] | '*';
+  from: Array<From | Dual> | null;
+  where: any;
+  groupby: ColumnRef[] | null;
+  having: any[] | null;
+  orderby: OrderBy[] | null;
+  limit: Limit[] | null;
+}
+export interface Insert_Replace {
+  type: 'replace' | 'insert';
+  db: string | null;
+  table: string;
+  columns: string[] | null;
+  values: InsertReplaceValue[];
+}
+export interface Update {
+  type: 'udpate';
+  db: string | null;
+  table: string;
+  set: SetList[];
+  where: any;
+}
+export interface Delete {
+  type: 'delete';
+  tables: any;
+  from: Array<From | Dual>;
+  where: any;
+}
+export type AST = Select | Insert_Replace | Update | Delete;
+
+export class Parser {
+  constructor();
+
+  parse(sql: string): TableColumnAst;
+
+  astify(sql: string): AST[] | AST;
+
+  sqlify(ast: AST[] | AST): string;
+
+  whiteListCheck(sql: string, whiteList: string[], type?: WhilteListCheckMode): Error | undefined;
+
+  tableList(sql: string): string[];
+
+  columnList(sql: string): string[];
+}
diff --git a/types/node-sql-parser/node-sql-parser-tests.ts b/types/node-sql-parser/node-sql-parser-tests.ts
new file mode 100644
index 0000000000..050c69a855
--- /dev/null
+++ b/types/node-sql-parser/node-sql-parser-tests.ts
@@ -0,0 +1,19 @@
+import { Parser } from 'node-sql-parser';
+
+const parser = new Parser();
+const sql = 'select id from tableA';
+
+// $ExpectType Select | Insert_Replace | Update | Delete | AST[]
+const selectAst = parser.astify(sql);
+
+// $ExpectType string
+parser.sqlify(selectAst);
+
+// $ExpectType string[]
+parser.tableList(sql);
+
+// $ExpectType string[]
+parser.columnList(sql);
+
+// $ExpectType Error | undefined
+parser.whiteListCheck(sql, ['select::null::tableA'], 'table');
diff --git a/types/node-sql-parser/tsconfig.json b/types/node-sql-parser/tsconfig.json
new file mode 100644
index 0000000000..c7f24afb95
--- /dev/null
+++ b/types/node-sql-parser/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "esModuleInterop": true,
+        "allowSyntheticDefaultImports": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-sql-parser-tests.ts"
+    ]
+}
diff --git a/types/node-sql-parser/tslint.json b/types/node-sql-parser/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/node-sql-parser/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/node-xmpp-client/index.d.ts b/types/node-xmpp-client/index.d.ts
index 0f8db89799..0a78289309 100644
--- a/types/node-xmpp-client/index.d.ts
+++ b/types/node-xmpp-client/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for node-xmpp-client 3.1
-// Project: https://github.com/node-xmpp/node-xmpp/tree/master/packages/node-xmpp-client/
+// Project: http://github.com/node-xmpp/node-xmpp
 // Definitions by: PJakcson <https://github.com/PJakcson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/node-xmpp-core/index.d.ts b/types/node-xmpp-core/index.d.ts
index 79d742cfd0..43ce7f7238 100644
--- a/types/node-xmpp-core/index.d.ts
+++ b/types/node-xmpp-core/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for node-xmpp-core 5.0
-// Project: github.com/node-xmpp/node-xmpp/
+// Project: http://github.com/node-xmpp/node-xmpp
 // Definitions by: PJakcson <https://github.com/PJakcson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/node/assert.d.ts b/types/node/assert.d.ts
new file mode 100644
index 0000000000..d73353c5d8
--- /dev/null
+++ b/types/node/assert.d.ts
@@ -0,0 +1,52 @@
+declare module "assert" {
+    function internal(value: any, message?: string | Error): void;
+    namespace internal {
+        class AssertionError implements Error {
+            name: string;
+            message: string;
+            actual: any;
+            expected: any;
+            operator: string;
+            generatedMessage: boolean;
+            code: 'ERR_ASSERTION';
+
+            constructor(options?: {
+                message?: string; actual?: any; expected?: any;
+                operator?: string; stackStartFn?: Function
+            });
+        }
+
+        function fail(message?: string | Error): never;
+        /** @deprecated since v10.0.0 - use fail([message]) or other assert functions instead. */
+        function fail(actual: any, expected: any, message?: string | Error, operator?: string, stackStartFn?: Function): never;
+        function ok(value: any, message?: string | Error): void;
+        /** @deprecated since v9.9.0 - use strictEqual() instead. */
+        function equal(actual: any, expected: any, message?: string | Error): void;
+        /** @deprecated since v9.9.0 - use notStrictEqual() instead. */
+        function notEqual(actual: any, expected: any, message?: string | Error): void;
+        /** @deprecated since v9.9.0 - use deepStrictEqual() instead. */
+        function deepEqual(actual: any, expected: any, message?: string | Error): void;
+        /** @deprecated since v9.9.0 - use notDeepStrictEqual() instead. */
+        function notDeepEqual(actual: any, expected: any, message?: string | Error): void;
+        function strictEqual(actual: any, expected: any, message?: string | Error): void;
+        function notStrictEqual(actual: any, expected: any, message?: string | Error): void;
+        function deepStrictEqual(actual: any, expected: any, message?: string | Error): void;
+        function notDeepStrictEqual(actual: any, expected: any, message?: string | Error): void;
+
+        function throws(block: Function, message?: string | Error): void;
+        function throws(block: Function, error: RegExp | Function | Object | Error, message?: string | Error): void;
+        function doesNotThrow(block: Function, message?: string | Error): void;
+        function doesNotThrow(block: Function, error: RegExp | Function, message?: string | Error): void;
+
+        function ifError(value: any): void;
+
+        function rejects(block: Function | Promise<any>, message?: string | Error): Promise<void>;
+        function rejects(block: Function | Promise<any>, error: RegExp | Function | Object | Error, message?: string | Error): Promise<void>;
+        function doesNotReject(block: Function | Promise<any>, message?: string | Error): Promise<void>;
+        function doesNotReject(block: Function | Promise<any>, error: RegExp | Function, message?: string | Error): Promise<void>;
+
+        const strict: typeof internal;
+    }
+
+    export = internal;
+}
diff --git a/types/node/async_hooks.d.ts b/types/node/async_hooks.d.ts
new file mode 100644
index 0000000000..2c77932ecd
--- /dev/null
+++ b/types/node/async_hooks.d.ts
@@ -0,0 +1,144 @@
+/**
+ * Async Hooks module: https://nodejs.org/api/async_hooks.html
+ */
+declare module "async_hooks" {
+    /**
+     * Returns the asyncId of the current execution context.
+     */
+    function executionAsyncId(): number;
+
+    /**
+     * Returns the ID of the resource responsible for calling the callback that is currently being executed.
+     */
+    function triggerAsyncId(): number;
+
+    interface HookCallbacks {
+        /**
+         * Called when a class is constructed that has the possibility to emit an asynchronous event.
+         * @param asyncId a unique ID for the async resource
+         * @param type the type of the async resource
+         * @param triggerAsyncId the unique ID of the async resource in whose execution context this async resource was created
+         * @param resource reference to the resource representing the async operation, needs to be released during destroy
+         */
+        init?(asyncId: number, type: string, triggerAsyncId: number, resource: Object): void;
+
+        /**
+         * When an asynchronous operation is initiated or completes a callback is called to notify the user.
+         * The before callback is called just before said callback is executed.
+         * @param asyncId the unique identifier assigned to the resource about to execute the callback.
+         */
+        before?(asyncId: number): void;
+
+        /**
+         * Called immediately after the callback specified in before is completed.
+         * @param asyncId the unique identifier assigned to the resource which has executed the callback.
+         */
+        after?(asyncId: number): void;
+
+        /**
+         * Called when a promise has resolve() called. This may not be in the same execution id
+         * as the promise itself.
+         * @param asyncId the unique id for the promise that was resolve()d.
+         */
+        promiseResolve?(asyncId: number): void;
+
+        /**
+         * Called after the resource corresponding to asyncId is destroyed
+         * @param asyncId a unique ID for the async resource
+         */
+        destroy?(asyncId: number): void;
+    }
+
+    interface AsyncHook {
+        /**
+         * Enable the callbacks for a given AsyncHook instance. If no callbacks are provided enabling is a noop.
+         */
+        enable(): this;
+
+        /**
+         * Disable the callbacks for a given AsyncHook instance from the global pool of AsyncHook callbacks to be executed. Once a hook has been disabled it will not be called again until enabled.
+         */
+        disable(): this;
+    }
+
+    /**
+     * Registers functions to be called for different lifetime events of each async operation.
+     * @param options the callbacks to register
+     * @return an AsyncHooks instance used for disabling and enabling hooks
+     */
+    function createHook(options: HookCallbacks): AsyncHook;
+
+    interface AsyncResourceOptions {
+      /**
+       * The ID of the execution context that created this async event.
+       * Default: `executionAsyncId()`
+       */
+      triggerAsyncId?: number;
+
+      /**
+       * Disables automatic `emitDestroy` when the object is garbage collected.
+       * This usually does not need to be set (even if `emitDestroy` is called
+       * manually), unless the resource's `asyncId` is retrieved and the
+       * sensitive API's `emitDestroy` is called with it.
+       * Default: `false`
+       */
+      requireManualDestroy?: boolean;
+    }
+
+    /**
+     * The class AsyncResource was designed to be extended by the embedder's async resources.
+     * Using this users can easily trigger the lifetime events of their own resources.
+     */
+    class AsyncResource {
+        /**
+         * AsyncResource() is meant to be extended. Instantiating a
+         * new AsyncResource() also triggers init. If triggerAsyncId is omitted then
+         * async_hook.executionAsyncId() is used.
+         * @param type The type of async event.
+         * @param triggerAsyncId The ID of the execution context that created
+         *   this async event (default: `executionAsyncId()`), or an
+         *   AsyncResourceOptions object (since 9.3)
+         */
+        constructor(type: string, triggerAsyncId?: number|AsyncResourceOptions);
+
+        /**
+         * Call AsyncHooks before callbacks.
+         * @deprecated since 9.6 - Use asyncResource.runInAsyncScope() instead.
+         */
+        emitBefore(): void;
+
+        /**
+         * Call AsyncHooks after callbacks.
+         * @deprecated since 9.6 - Use asyncResource.runInAsyncScope() instead.
+         */
+        emitAfter(): void;
+
+        /**
+         * Call the provided function with the provided arguments in the
+         * execution context of the async resource. This will establish the
+         * context, trigger the AsyncHooks before callbacks, call the function,
+         * trigger the AsyncHooks after callbacks, and then restore the original
+         * execution context.
+         * @param fn The function to call in the execution context of this
+         *   async resource.
+         * @param thisArg The receiver to be used for the function call.
+         * @param args Optional arguments to pass to the function.
+         */
+        runInAsyncScope<This, Result>(fn: (this: This, ...args: any[]) => Result, thisArg?: This, ...args: any[]): Result;
+
+        /**
+         * Call AsyncHooks destroy callbacks.
+         */
+        emitDestroy(): void;
+
+        /**
+         * @return the unique ID assigned to this AsyncResource instance.
+         */
+        asyncId(): number;
+
+        /**
+         * @return the trigger ID for this AsyncResource instance.
+         */
+        triggerAsyncId(): number;
+    }
+}
diff --git a/types/node/base.d.ts b/types/node/base.d.ts
new file mode 100644
index 0000000000..70983d9515
--- /dev/null
+++ b/types/node/base.d.ts
@@ -0,0 +1,41 @@
+// base definnitions for all NodeJS modules that are not specific to any version of TypeScript
+/// <reference path="globals.d.ts" />
+/// <reference path="assert.d.ts" />
+/// <reference path="async_hooks.d.ts" />
+/// <reference path="buffer.d.ts" />
+/// <reference path="child_process.d.ts" />
+/// <reference path="cluster.d.ts" />
+/// <reference path="console.d.ts" />
+/// <reference path="constants.d.ts" />
+/// <reference path="crypto.d.ts" />
+/// <reference path="dgram.d.ts" />
+/// <reference path="dns.d.ts" />
+/// <reference path="domain.d.ts" />
+/// <reference path="events.d.ts" />
+/// <reference path="fs.d.ts" />
+/// <reference path="http.d.ts" />
+/// <reference path="http2.d.ts" />
+/// <reference path="https.d.ts" />
+/// <reference path="inspector.d.ts" />
+/// <reference path="module.d.ts" />
+/// <reference path="net.d.ts" />
+/// <reference path="os.d.ts" />
+/// <reference path="path.d.ts" />
+/// <reference path="perf_hooks.d.ts" />
+/// <reference path="process.d.ts" />
+/// <reference path="punycode.d.ts" />
+/// <reference path="querystring.d.ts" />
+/// <reference path="readline.d.ts" />
+/// <reference path="repl.d.ts" />
+/// <reference path="stream.d.ts" />
+/// <reference path="string_decoder.d.ts" />
+/// <reference path="timers.d.ts" />
+/// <reference path="tls.d.ts" />
+/// <reference path="trace_events.d.ts" />
+/// <reference path="tty.d.ts" />
+/// <reference path="url.d.ts" />
+/// <reference path="util.d.ts" />
+/// <reference path="v8.d.ts" />
+/// <reference path="vm.d.ts" />
+/// <reference path="worker_threads.d.ts" />
+/// <reference path="zlib.d.ts" />
diff --git a/types/node/buffer.d.ts b/types/node/buffer.d.ts
new file mode 100644
index 0000000000..1d618f2c4b
--- /dev/null
+++ b/types/node/buffer.d.ts
@@ -0,0 +1,12 @@
+declare module "buffer" {
+    export const INSPECT_MAX_BYTES: number;
+    const BuffType: typeof Buffer;
+
+    export const SlowBuffer: {
+        /** @deprecated since v6.0.0, use Buffer.allocUnsafeSlow() */
+        new(size: number): Buffer;
+        prototype: Buffer;
+    };
+
+    export { BuffType as Buffer };
+}
diff --git a/types/node/child_process.d.ts b/types/node/child_process.d.ts
new file mode 100644
index 0000000000..8e10d4e0c7
--- /dev/null
+++ b/types/node/child_process.d.ts
@@ -0,0 +1,338 @@
+declare module "child_process" {
+    import * as events from "events";
+    import * as stream from "stream";
+    import * as net from "net";
+
+    interface ChildProcess extends events.EventEmitter {
+        stdin: stream.Writable;
+        stdout: stream.Readable;
+        stderr: stream.Readable;
+        stdio: [stream.Writable, stream.Readable, stream.Readable];
+        killed: boolean;
+        pid: number;
+        kill(signal?: string): void;
+        send(message: any, callback?: (error: Error) => void): boolean;
+        send(message: any, sendHandle?: net.Socket | net.Server, callback?: (error: Error) => void): boolean;
+        send(message: any, sendHandle?: net.Socket | net.Server, options?: MessageOptions, callback?: (error: Error) => void): boolean;
+        connected: boolean;
+        disconnect(): void;
+        unref(): void;
+        ref(): void;
+
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. disconnect
+         * 3. error
+         * 4. exit
+         * 5. message
+         */
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: (code: number, signal: string) => void): this;
+        addListener(event: "disconnect", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "exit", listener: (code: number | null, signal: string | null) => void): this;
+        addListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close", code: number, signal: string): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "exit", code: number | null, signal: string | null): boolean;
+        emit(event: "message", message: any, sendHandle: net.Socket | net.Server): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: (code: number, signal: string) => void): this;
+        on(event: "disconnect", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "exit", listener: (code: number | null, signal: string | null) => void): this;
+        on(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: (code: number, signal: string) => void): this;
+        once(event: "disconnect", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "exit", listener: (code: number | null, signal: string | null) => void): this;
+        once(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: (code: number, signal: string) => void): this;
+        prependListener(event: "disconnect", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "exit", listener: (code: number | null, signal: string | null) => void): this;
+        prependListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "disconnect", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "exit", listener: (code: number | null, signal: string | null) => void): this;
+        prependOnceListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+    }
+
+    interface MessageOptions {
+        keepOpen?: boolean;
+    }
+
+    type StdioOptions = "pipe" | "ignore" | "inherit" | Array<("pipe" | "ipc" | "ignore" | "inherit" | stream.Stream | number | null | undefined)>;
+
+    interface CommonOptions {
+        /**
+         * @default true
+         */
+        windowsHide?: boolean;
+        uid?: number;
+        gid?: number;
+        cwd?: string;
+        env?: NodeJS.ProcessEnv;
+        /**
+         * @default 0
+         */
+        timeout?: number;
+    }
+
+    interface SpawnOptions extends CommonOptions {
+        argv0?: string;
+        stdio?: StdioOptions;
+        detached?: boolean;
+        shell?: boolean | string;
+        windowsVerbatimArguments?: boolean;
+    }
+
+    function spawn(command: string, options?: SpawnOptions): ChildProcess;
+    function spawn(command: string, args?: ReadonlyArray<string>, options?: SpawnOptions): ChildProcess;
+
+    interface ExecOptions extends CommonOptions {
+        shell?: string;
+        maxBuffer?: number;
+        killSignal?: string;
+    }
+
+    interface ExecOptionsWithStringEncoding extends ExecOptions {
+        encoding: BufferEncoding;
+    }
+
+    interface ExecOptionsWithBufferEncoding extends ExecOptions {
+        encoding: string | null; // specify `null`.
+    }
+
+    interface ExecException extends Error {
+        cmd?: string;
+        killed?: boolean;
+        code?: number;
+        signal?: string;
+    }
+
+    // no `options` definitely means stdout/stderr are `string`.
+    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`.
+    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`.
+    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`.
+    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`.
+    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`.
+    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.
+    namespace exec {
+        function __promisify__(command: string): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(command: string, options: { encoding: "buffer" | null } & ExecOptions): Promise<{ stdout: Buffer, stderr: Buffer }>;
+        function __promisify__(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(command: string, options: ExecOptions): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(command: string, options?: ({ encoding?: string | null } & ExecOptions) | null): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+    }
+
+    interface ExecFileOptions extends CommonOptions {
+        maxBuffer?: number;
+        killSignal?: string;
+        windowsVerbatimArguments?: boolean;
+    }
+    interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
+        encoding: BufferEncoding;
+    }
+    interface ExecFileOptionsWithBufferEncoding extends ExecFileOptions {
+        encoding: 'buffer' | null;
+    }
+    interface ExecFileOptionsWithOtherEncoding extends ExecFileOptions {
+        encoding: string;
+    }
+
+    function execFile(file: string): ChildProcess;
+    function execFile(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
+    function execFile(file: string, args?: ReadonlyArray<string> | null): ChildProcess;
+    function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
+
+    // no `options` definitely means stdout/stderr are `string`.
+    function execFile(file: string, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    function execFile(file: string, args: ReadonlyArray<string> | undefined | null, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // `options` with `"buffer"` or `null` for `encoding` means stdout/stderr are definitely `Buffer`.
+    function execFile(file: string, options: ExecFileOptionsWithBufferEncoding, callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
+    function execFile(
+        file: string,
+        args: ReadonlyArray<string> | undefined | null,
+        options: ExecFileOptionsWithBufferEncoding,
+        callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void,
+    ): ChildProcess;
+
+    // `options` with well known `encoding` means stdout/stderr are definitely `string`.
+    function execFile(file: string, options: ExecFileOptionsWithStringEncoding, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    function execFile(
+        file: string,
+        args: ReadonlyArray<string> | undefined | null,
+        options: ExecFileOptionsWithStringEncoding,
+        callback: (error: Error | null, stdout: string, stderr: string) => void,
+    ): ChildProcess;
+
+    // `options` with an `encoding` whose type is `string` means stdout/stderr could either be `Buffer` or `string`.
+    // There is no guarantee the `encoding` is unknown as `string` is a superset of `BufferEncoding`.
+    function execFile(
+        file: string,
+        options: ExecFileOptionsWithOtherEncoding,
+        callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void,
+    ): ChildProcess;
+    function execFile(
+        file: string,
+        args: ReadonlyArray<string> | undefined | null,
+        options: ExecFileOptionsWithOtherEncoding,
+        callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void,
+    ): ChildProcess;
+
+    // `options` without an `encoding` means stdout/stderr are definitely `string`.
+    function execFile(file: string, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // fallback if nothing else matches. Worst case is always `string | Buffer`.
+    function execFile(
+        file: string,
+        options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null,
+        callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null,
+    ): ChildProcess;
+    function execFile(
+        file: string,
+        args: ReadonlyArray<string> | undefined | null,
+        options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null,
+        callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null,
+    ): ChildProcess;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace execFile {
+        function __promisify__(file: string): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(file: string, args: string[] | undefined | null): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(file: string, options: ExecFileOptionsWithBufferEncoding): Promise<{ stdout: Buffer, stderr: Buffer }>;
+        function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithBufferEncoding): Promise<{ stdout: Buffer, stderr: Buffer }>;
+        function __promisify__(file: string, options: ExecFileOptionsWithStringEncoding): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithStringEncoding): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(file: string, options: ExecFileOptionsWithOtherEncoding): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+        function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithOtherEncoding): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+        function __promisify__(file: string, options: ExecFileOptions): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptions): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+        function __promisify__(
+            file: string,
+            args: string[] | undefined | null,
+            options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null,
+        ): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+    }
+
+    interface ForkOptions {
+        cwd?: string;
+        env?: NodeJS.ProcessEnv;
+        execPath?: string;
+        execArgv?: string[];
+        silent?: boolean;
+        stdio?: StdioOptions;
+        windowsVerbatimArguments?: boolean;
+        uid?: number;
+        gid?: number;
+    }
+    function fork(modulePath: string, args?: ReadonlyArray<string>, options?: ForkOptions): ChildProcess;
+
+    interface SpawnSyncOptions extends CommonOptions {
+        argv0?: string; // Not specified in the docs
+        input?: string | Buffer | NodeJS.TypedArray | DataView;
+        stdio?: StdioOptions;
+        killSignal?: string | number;
+        maxBuffer?: number;
+        encoding?: string;
+        shell?: boolean | string;
+        windowsVerbatimArguments?: boolean;
+    }
+    interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
+        encoding: BufferEncoding;
+    }
+    interface SpawnSyncOptionsWithBufferEncoding extends SpawnSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    interface SpawnSyncReturns<T> {
+        pid: number;
+        output: string[];
+        stdout: T;
+        stderr: T;
+        status: number;
+        signal: string;
+        error: Error;
+    }
+    function spawnSync(command: string): SpawnSyncReturns<Buffer>;
+    function spawnSync(command: string, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
+    function spawnSync(command: string, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
+    function spawnSync(command: string, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+    function spawnSync(command: string, args?: ReadonlyArray<string>, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
+    function spawnSync(command: string, args?: ReadonlyArray<string>, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
+    function spawnSync(command: string, args?: ReadonlyArray<string>, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+
+    interface ExecSyncOptions extends CommonOptions {
+        input?: string | Buffer | Uint8Array;
+        stdio?: StdioOptions;
+        shell?: string;
+        killSignal?: string | number;
+        maxBuffer?: number;
+        encoding?: string;
+    }
+    interface ExecSyncOptionsWithStringEncoding extends ExecSyncOptions {
+        encoding: BufferEncoding;
+    }
+    interface ExecSyncOptionsWithBufferEncoding extends ExecSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    function execSync(command: string): Buffer;
+    function execSync(command: string, options?: ExecSyncOptionsWithStringEncoding): string;
+    function execSync(command: string, options?: ExecSyncOptionsWithBufferEncoding): Buffer;
+    function execSync(command: string, options?: ExecSyncOptions): Buffer;
+
+    interface ExecFileSyncOptions extends CommonOptions {
+        input?: string | Buffer | NodeJS.TypedArray | DataView;
+        stdio?: StdioOptions;
+        killSignal?: string | number;
+        maxBuffer?: number;
+        encoding?: string;
+        shell?: boolean | string;
+    }
+    interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
+        encoding: BufferEncoding;
+    }
+    interface ExecFileSyncOptionsWithBufferEncoding extends ExecFileSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    function execFileSync(command: string): Buffer;
+    function execFileSync(command: string, options?: ExecFileSyncOptionsWithStringEncoding): string;
+    function execFileSync(command: string, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+    function execFileSync(command: string, options?: ExecFileSyncOptions): Buffer;
+    function execFileSync(command: string, args?: ReadonlyArray<string>, options?: ExecFileSyncOptionsWithStringEncoding): string;
+    function execFileSync(command: string, args?: ReadonlyArray<string>, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+    function execFileSync(command: string, args?: ReadonlyArray<string>, options?: ExecFileSyncOptions): Buffer;
+}
diff --git a/types/node/cluster.d.ts b/types/node/cluster.d.ts
new file mode 100644
index 0000000000..f089a41ebb
--- /dev/null
+++ b/types/node/cluster.d.ts
@@ -0,0 +1,260 @@
+declare module "cluster" {
+    import * as child from "child_process";
+    import * as events from "events";
+    import * as net from "net";
+
+    // interfaces
+    interface ClusterSettings {
+        execArgv?: string[]; // default: process.execArgv
+        exec?: string;
+        args?: string[];
+        silent?: boolean;
+        stdio?: any[];
+        uid?: number;
+        gid?: number;
+        inspectPort?: number | (() => number);
+    }
+
+    interface Address {
+        address: string;
+        port: number;
+        addressType: number | "udp4" | "udp6";  // 4, 6, -1, "udp4", "udp6"
+    }
+
+    class Worker extends events.EventEmitter {
+        id: number;
+        process: child.ChildProcess;
+        send(message: any, sendHandle?: any, callback?: (error: Error) => void): boolean;
+        kill(signal?: string): void;
+        destroy(signal?: string): void;
+        disconnect(): void;
+        isConnected(): boolean;
+        isDead(): boolean;
+        exitedAfterDisconnect: boolean;
+
+        /**
+         * events.EventEmitter
+         *   1. disconnect
+         *   2. error
+         *   3. exit
+         *   4. listening
+         *   5. message
+         *   6. online
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "disconnect", listener: () => void): this;
+        addListener(event: "error", listener: (error: Error) => void): this;
+        addListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        addListener(event: "listening", listener: (address: Address) => void): this;
+        addListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        addListener(event: "online", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "error", error: Error): boolean;
+        emit(event: "exit", code: number, signal: string): boolean;
+        emit(event: "listening", address: Address): boolean;
+        emit(event: "message", message: any, handle: net.Socket | net.Server): boolean;
+        emit(event: "online"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "disconnect", listener: () => void): this;
+        on(event: "error", listener: (error: Error) => void): this;
+        on(event: "exit", listener: (code: number, signal: string) => void): this;
+        on(event: "listening", listener: (address: Address) => void): this;
+        on(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        on(event: "online", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "disconnect", listener: () => void): this;
+        once(event: "error", listener: (error: Error) => void): this;
+        once(event: "exit", listener: (code: number, signal: string) => void): this;
+        once(event: "listening", listener: (address: Address) => void): this;
+        once(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        once(event: "online", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "disconnect", listener: () => void): this;
+        prependListener(event: "error", listener: (error: Error) => void): this;
+        prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependListener(event: "listening", listener: (address: Address) => void): this;
+        prependListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependListener(event: "online", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "disconnect", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (error: Error) => void): this;
+        prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "listening", listener: (address: Address) => void): this;
+        prependOnceListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependOnceListener(event: "online", listener: () => void): this;
+    }
+
+    interface Cluster extends events.EventEmitter {
+        Worker: Worker;
+        disconnect(callback?: Function): void;
+        fork(env?: any): Worker;
+        isMaster: boolean;
+        isWorker: boolean;
+        // TODO: cluster.schedulingPolicy
+        settings: ClusterSettings;
+        setupMaster(settings?: ClusterSettings): void;
+        worker?: Worker;
+        workers?: {
+            [index: string]: Worker | undefined
+        };
+
+        /**
+         * events.EventEmitter
+         *   1. disconnect
+         *   2. exit
+         *   3. fork
+         *   4. listening
+         *   5. message
+         *   6. online
+         *   7. setup
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        addListener(event: "fork", listener: (worker: Worker) => void): this;
+        addListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        addListener(event: "online", listener: (worker: Worker) => void): this;
+        addListener(event: "setup", listener: (settings: any) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "disconnect", worker: Worker): boolean;
+        emit(event: "exit", worker: Worker, code: number, signal: string): boolean;
+        emit(event: "fork", worker: Worker): boolean;
+        emit(event: "listening", worker: Worker, address: Address): boolean;
+        emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
+        emit(event: "online", worker: Worker): boolean;
+        emit(event: "setup", settings: any): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "disconnect", listener: (worker: Worker) => void): this;
+        on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        on(event: "fork", listener: (worker: Worker) => void): this;
+        on(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        on(event: "online", listener: (worker: Worker) => void): this;
+        on(event: "setup", listener: (settings: any) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "disconnect", listener: (worker: Worker) => void): this;
+        once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        once(event: "fork", listener: (worker: Worker) => void): this;
+        once(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        once(event: "online", listener: (worker: Worker) => void): this;
+        once(event: "setup", listener: (settings: any) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        prependListener(event: "fork", listener: (worker: Worker) => void): this;
+        prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependListener(event: "online", listener: (worker: Worker) => void): this;
+        prependListener(event: "setup", listener: (settings: any) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        prependOnceListener(event: "fork", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        // the handle is a net.Socket or net.Server object, or undefined.
+        prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;
+        prependOnceListener(event: "online", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "setup", listener: (settings: any) => void): this;
+    }
+
+    function disconnect(callback?: Function): void;
+    function fork(env?: any): Worker;
+    const isMaster: boolean;
+    const isWorker: boolean;
+    // TODO: cluster.schedulingPolicy
+    const settings: ClusterSettings;
+    function setupMaster(settings?: ClusterSettings): void;
+    const worker: Worker;
+    const workers: {
+        [index: string]: Worker | undefined
+    };
+
+    /**
+     * events.EventEmitter
+     *   1. disconnect
+     *   2. exit
+     *   3. fork
+     *   4. listening
+     *   5. message
+     *   6. online
+     *   7. setup
+     */
+    function addListener(event: string, listener: (...args: any[]) => void): Cluster;
+    function addListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    function addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    function addListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    function addListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+     // the handle is a net.Socket or net.Server object, or undefined.
+    function addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;
+    function addListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    function addListener(event: "setup", listener: (settings: any) => void): Cluster;
+
+    function emit(event: string | symbol, ...args: any[]): boolean;
+    function emit(event: "disconnect", worker: Worker): boolean;
+    function emit(event: "exit", worker: Worker, code: number, signal: string): boolean;
+    function emit(event: "fork", worker: Worker): boolean;
+    function emit(event: "listening", worker: Worker, address: Address): boolean;
+    function emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
+    function emit(event: "online", worker: Worker): boolean;
+    function emit(event: "setup", settings: any): boolean;
+
+    function on(event: string, listener: (...args: any[]) => void): Cluster;
+    function on(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    function on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    function on(event: "fork", listener: (worker: Worker) => void): Cluster;
+    function on(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    function on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    function on(event: "online", listener: (worker: Worker) => void): Cluster;
+    function on(event: "setup", listener: (settings: any) => void): Cluster;
+
+    function once(event: string, listener: (...args: any[]) => void): Cluster;
+    function once(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    function once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    function once(event: "fork", listener: (worker: Worker) => void): Cluster;
+    function once(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    function once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    function once(event: "online", listener: (worker: Worker) => void): Cluster;
+    function once(event: "setup", listener: (settings: any) => void): Cluster;
+
+    function removeListener(event: string, listener: (...args: any[]) => void): Cluster;
+    function removeAllListeners(event?: string): Cluster;
+    function setMaxListeners(n: number): Cluster;
+    function getMaxListeners(): number;
+    function listeners(event: string): Function[];
+    function listenerCount(type: string): number;
+
+    function prependListener(event: string, listener: (...args: any[]) => void): Cluster;
+    function prependListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    function prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    function prependListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    function prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+     // the handle is a net.Socket or net.Server object, or undefined.
+    function prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;
+    function prependListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    function prependListener(event: "setup", listener: (settings: any) => void): Cluster;
+
+    function prependOnceListener(event: string, listener: (...args: any[]) => void): Cluster;
+    function prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    function prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    function prependOnceListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    function prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+     // the handle is a net.Socket or net.Server object, or undefined.
+    function prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;
+    function prependOnceListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    function prependOnceListener(event: "setup", listener: (settings: any) => void): Cluster;
+
+    function eventNames(): string[];
+}
diff --git a/types/node/console.d.ts b/types/node/console.d.ts
new file mode 100644
index 0000000000..d30d13f871
--- /dev/null
+++ b/types/node/console.d.ts
@@ -0,0 +1,3 @@
+declare module "console" {
+    export = console;
+}
diff --git a/types/node/constants.d.ts b/types/node/constants.d.ts
new file mode 100644
index 0000000000..6c39d64346
--- /dev/null
+++ b/types/node/constants.d.ts
@@ -0,0 +1,279 @@
+declare module "constants" {
+    const E2BIG: number;
+    const EACCES: number;
+    const EADDRINUSE: number;
+    const EADDRNOTAVAIL: number;
+    const EAFNOSUPPORT: number;
+    const EAGAIN: number;
+    const EALREADY: number;
+    const EBADF: number;
+    const EBADMSG: number;
+    const EBUSY: number;
+    const ECANCELED: number;
+    const ECHILD: number;
+    const ECONNABORTED: number;
+    const ECONNREFUSED: number;
+    const ECONNRESET: number;
+    const EDEADLK: number;
+    const EDESTADDRREQ: number;
+    const EDOM: number;
+    const EEXIST: number;
+    const EFAULT: number;
+    const EFBIG: number;
+    const EHOSTUNREACH: number;
+    const EIDRM: number;
+    const EILSEQ: number;
+    const EINPROGRESS: number;
+    const EINTR: number;
+    const EINVAL: number;
+    const EIO: number;
+    const EISCONN: number;
+    const EISDIR: number;
+    const ELOOP: number;
+    const EMFILE: number;
+    const EMLINK: number;
+    const EMSGSIZE: number;
+    const ENAMETOOLONG: number;
+    const ENETDOWN: number;
+    const ENETRESET: number;
+    const ENETUNREACH: number;
+    const ENFILE: number;
+    const ENOBUFS: number;
+    const ENODATA: number;
+    const ENODEV: number;
+    const ENOENT: number;
+    const ENOEXEC: number;
+    const ENOLCK: number;
+    const ENOLINK: number;
+    const ENOMEM: number;
+    const ENOMSG: number;
+    const ENOPROTOOPT: number;
+    const ENOSPC: number;
+    const ENOSR: number;
+    const ENOSTR: number;
+    const ENOSYS: number;
+    const ENOTCONN: number;
+    const ENOTDIR: number;
+    const ENOTEMPTY: number;
+    const ENOTSOCK: number;
+    const ENOTSUP: number;
+    const ENOTTY: number;
+    const ENXIO: number;
+    const EOPNOTSUPP: number;
+    const EOVERFLOW: number;
+    const EPERM: number;
+    const EPIPE: number;
+    const EPROTO: number;
+    const EPROTONOSUPPORT: number;
+    const EPROTOTYPE: number;
+    const ERANGE: number;
+    const EROFS: number;
+    const ESPIPE: number;
+    const ESRCH: number;
+    const ETIME: number;
+    const ETIMEDOUT: number;
+    const ETXTBSY: number;
+    const EWOULDBLOCK: number;
+    const EXDEV: number;
+    const WSAEINTR: number;
+    const WSAEBADF: number;
+    const WSAEACCES: number;
+    const WSAEFAULT: number;
+    const WSAEINVAL: number;
+    const WSAEMFILE: number;
+    const WSAEWOULDBLOCK: number;
+    const WSAEINPROGRESS: number;
+    const WSAEALREADY: number;
+    const WSAENOTSOCK: number;
+    const WSAEDESTADDRREQ: number;
+    const WSAEMSGSIZE: number;
+    const WSAEPROTOTYPE: number;
+    const WSAENOPROTOOPT: number;
+    const WSAEPROTONOSUPPORT: number;
+    const WSAESOCKTNOSUPPORT: number;
+    const WSAEOPNOTSUPP: number;
+    const WSAEPFNOSUPPORT: number;
+    const WSAEAFNOSUPPORT: number;
+    const WSAEADDRINUSE: number;
+    const WSAEADDRNOTAVAIL: number;
+    const WSAENETDOWN: number;
+    const WSAENETUNREACH: number;
+    const WSAENETRESET: number;
+    const WSAECONNABORTED: number;
+    const WSAECONNRESET: number;
+    const WSAENOBUFS: number;
+    const WSAEISCONN: number;
+    const WSAENOTCONN: number;
+    const WSAESHUTDOWN: number;
+    const WSAETOOMANYREFS: number;
+    const WSAETIMEDOUT: number;
+    const WSAECONNREFUSED: number;
+    const WSAELOOP: number;
+    const WSAENAMETOOLONG: number;
+    const WSAEHOSTDOWN: number;
+    const WSAEHOSTUNREACH: number;
+    const WSAENOTEMPTY: number;
+    const WSAEPROCLIM: number;
+    const WSAEUSERS: number;
+    const WSAEDQUOT: number;
+    const WSAESTALE: number;
+    const WSAEREMOTE: number;
+    const WSASYSNOTREADY: number;
+    const WSAVERNOTSUPPORTED: number;
+    const WSANOTINITIALISED: number;
+    const WSAEDISCON: number;
+    const WSAENOMORE: number;
+    const WSAECANCELLED: number;
+    const WSAEINVALIDPROCTABLE: number;
+    const WSAEINVALIDPROVIDER: number;
+    const WSAEPROVIDERFAILEDINIT: number;
+    const WSASYSCALLFAILURE: number;
+    const WSASERVICE_NOT_FOUND: number;
+    const WSATYPE_NOT_FOUND: number;
+    const WSA_E_NO_MORE: number;
+    const WSA_E_CANCELLED: number;
+    const WSAEREFUSED: number;
+    const SIGHUP: number;
+    const SIGINT: number;
+    const SIGILL: number;
+    const SIGABRT: number;
+    const SIGFPE: number;
+    const SIGKILL: number;
+    const SIGSEGV: number;
+    const SIGTERM: number;
+    const SIGBREAK: number;
+    const SIGWINCH: number;
+    const SSL_OP_ALL: number;
+    const SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: number;
+    const SSL_OP_CIPHER_SERVER_PREFERENCE: number;
+    const SSL_OP_CISCO_ANYCONNECT: number;
+    const SSL_OP_COOKIE_EXCHANGE: number;
+    const SSL_OP_CRYPTOPRO_TLSEXT_BUG: number;
+    const SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: number;
+    const SSL_OP_EPHEMERAL_RSA: number;
+    const SSL_OP_LEGACY_SERVER_CONNECT: number;
+    const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: number;
+    const SSL_OP_MICROSOFT_SESS_ID_BUG: number;
+    const SSL_OP_MSIE_SSLV2_RSA_PADDING: number;
+    const SSL_OP_NETSCAPE_CA_DN_BUG: number;
+    const SSL_OP_NETSCAPE_CHALLENGE_BUG: number;
+    const SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG: number;
+    const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: number;
+    const SSL_OP_NO_COMPRESSION: number;
+    const SSL_OP_NO_QUERY_MTU: number;
+    const SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: number;
+    const SSL_OP_NO_SSLv2: number;
+    const SSL_OP_NO_SSLv3: number;
+    const SSL_OP_NO_TICKET: number;
+    const SSL_OP_NO_TLSv1: number;
+    const SSL_OP_NO_TLSv1_1: number;
+    const SSL_OP_NO_TLSv1_2: number;
+    const SSL_OP_PKCS1_CHECK_1: number;
+    const SSL_OP_PKCS1_CHECK_2: number;
+    const SSL_OP_SINGLE_DH_USE: number;
+    const SSL_OP_SINGLE_ECDH_USE: number;
+    const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: number;
+    const SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG: number;
+    const SSL_OP_TLS_BLOCK_PADDING_BUG: number;
+    const SSL_OP_TLS_D5_BUG: number;
+    const SSL_OP_TLS_ROLLBACK_BUG: number;
+    const ENGINE_METHOD_DSA: number;
+    const ENGINE_METHOD_DH: number;
+    const ENGINE_METHOD_RAND: number;
+    const ENGINE_METHOD_ECDH: number;
+    const ENGINE_METHOD_ECDSA: number;
+    const ENGINE_METHOD_CIPHERS: number;
+    const ENGINE_METHOD_DIGESTS: number;
+    const ENGINE_METHOD_STORE: number;
+    const ENGINE_METHOD_PKEY_METHS: number;
+    const ENGINE_METHOD_PKEY_ASN1_METHS: number;
+    const ENGINE_METHOD_ALL: number;
+    const ENGINE_METHOD_NONE: number;
+    const DH_CHECK_P_NOT_SAFE_PRIME: number;
+    const DH_CHECK_P_NOT_PRIME: number;
+    const DH_UNABLE_TO_CHECK_GENERATOR: number;
+    const DH_NOT_SUITABLE_GENERATOR: number;
+    const NPN_ENABLED: number;
+    const RSA_PKCS1_PADDING: number;
+    const RSA_SSLV23_PADDING: number;
+    const RSA_NO_PADDING: number;
+    const RSA_PKCS1_OAEP_PADDING: number;
+    const RSA_X931_PADDING: number;
+    const RSA_PKCS1_PSS_PADDING: number;
+    const POINT_CONVERSION_COMPRESSED: number;
+    const POINT_CONVERSION_UNCOMPRESSED: number;
+    const POINT_CONVERSION_HYBRID: number;
+    const O_RDONLY: number;
+    const O_WRONLY: number;
+    const O_RDWR: number;
+    const S_IFMT: number;
+    const S_IFREG: number;
+    const S_IFDIR: number;
+    const S_IFCHR: number;
+    const S_IFBLK: number;
+    const S_IFIFO: number;
+    const S_IFSOCK: number;
+    const S_IRWXU: number;
+    const S_IRUSR: number;
+    const S_IWUSR: number;
+    const S_IXUSR: number;
+    const S_IRWXG: number;
+    const S_IRGRP: number;
+    const S_IWGRP: number;
+    const S_IXGRP: number;
+    const S_IRWXO: number;
+    const S_IROTH: number;
+    const S_IWOTH: number;
+    const S_IXOTH: number;
+    const S_IFLNK: number;
+    const O_CREAT: number;
+    const O_EXCL: number;
+    const O_NOCTTY: number;
+    const O_DIRECTORY: number;
+    const O_NOATIME: number;
+    const O_NOFOLLOW: number;
+    const O_SYNC: number;
+    const O_DSYNC: number;
+    const O_SYMLINK: number;
+    const O_DIRECT: number;
+    const O_NONBLOCK: number;
+    const O_TRUNC: number;
+    const O_APPEND: number;
+    const F_OK: number;
+    const R_OK: number;
+    const W_OK: number;
+    const X_OK: number;
+    const COPYFILE_EXCL: number;
+    const COPYFILE_FICLONE: number;
+    const COPYFILE_FICLONE_FORCE: number;
+    const UV_UDP_REUSEADDR: number;
+    const SIGQUIT: number;
+    const SIGTRAP: number;
+    const SIGIOT: number;
+    const SIGBUS: number;
+    const SIGUSR1: number;
+    const SIGUSR2: number;
+    const SIGPIPE: number;
+    const SIGALRM: number;
+    const SIGCHLD: number;
+    const SIGSTKFLT: number;
+    const SIGCONT: number;
+    const SIGSTOP: number;
+    const SIGTSTP: number;
+    const SIGTTIN: number;
+    const SIGTTOU: number;
+    const SIGURG: number;
+    const SIGXCPU: number;
+    const SIGXFSZ: number;
+    const SIGVTALRM: number;
+    const SIGPROF: number;
+    const SIGIO: number;
+    const SIGPOLL: number;
+    const SIGPWR: number;
+    const SIGSYS: number;
+    const SIGUNUSED: number;
+    const defaultCoreCipherList: string;
+    const defaultCipherList: string;
+    const ENGINE_METHOD_RSA: number;
+    const ALPN_ENABLED: number;
+}
diff --git a/types/node/crypto.d.ts b/types/node/crypto.d.ts
new file mode 100644
index 0000000000..27bf801c9f
--- /dev/null
+++ b/types/node/crypto.d.ts
@@ -0,0 +1,512 @@
+declare module "crypto" {
+    import * as stream from "stream";
+
+    interface Certificate {
+        exportChallenge(spkac: BinaryLike): Buffer;
+        exportPublicKey(spkac: BinaryLike): Buffer;
+        verifySpkac(spkac: Binary): boolean;
+    }
+    const Certificate: {
+        new(): Certificate;
+        (): Certificate;
+    };
+
+    namespace constants { // https://nodejs.org/dist/latest-v10.x/docs/api/crypto.html#crypto_crypto_constants
+        const OPENSSL_VERSION_NUMBER: number;
+
+        /** Applies multiple bug workarounds within OpenSSL. See https://www.openssl.org/docs/man1.0.2/ssl/SSL_CTX_set_options.html for detail. */
+        const SSL_OP_ALL: number;
+        /** Allows legacy insecure renegotiation between OpenSSL and unpatched clients or servers. See https://www.openssl.org/docs/man1.0.2/ssl/SSL_CTX_set_options.html. */
+        const SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: number;
+        /** Attempts to use the server's preferences instead of the client's when selecting a cipher. See https://www.openssl.org/docs/man1.0.2/ssl/SSL_CTX_set_options.html. */
+        const SSL_OP_CIPHER_SERVER_PREFERENCE: number;
+        /** Instructs OpenSSL to use Cisco's "speshul" version of DTLS_BAD_VER. */
+        const SSL_OP_CISCO_ANYCONNECT: number;
+        /** Instructs OpenSSL to turn on cookie exchange. */
+        const SSL_OP_COOKIE_EXCHANGE: number;
+        /** Instructs OpenSSL to add server-hello extension from an early version of the cryptopro draft. */
+        const SSL_OP_CRYPTOPRO_TLSEXT_BUG: number;
+        /** Instructs OpenSSL to disable a SSL 3.0/TLS 1.0 vulnerability workaround added in OpenSSL 0.9.6d. */
+        const SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: number;
+        /** Instructs OpenSSL to always use the tmp_rsa key when performing RSA operations. */
+        const SSL_OP_EPHEMERAL_RSA: number;
+        /** Allows initial connection to servers that do not support RI. */
+        const SSL_OP_LEGACY_SERVER_CONNECT: number;
+        const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: number;
+        const SSL_OP_MICROSOFT_SESS_ID_BUG: number;
+        /** Instructs OpenSSL to disable the workaround for a man-in-the-middle protocol-version vulnerability in the SSL 2.0 server implementation. */
+        const SSL_OP_MSIE_SSLV2_RSA_PADDING: number;
+        const SSL_OP_NETSCAPE_CA_DN_BUG: number;
+        const SSL_OP_NETSCAPE_CHALLENGE_BUG: number;
+        const SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG: number;
+        const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: number;
+        /** Instructs OpenSSL to disable support for SSL/TLS compression. */
+        const SSL_OP_NO_COMPRESSION: number;
+        const SSL_OP_NO_QUERY_MTU: number;
+        /** Instructs OpenSSL to always start a new session when performing renegotiation. */
+        const SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: number;
+        const SSL_OP_NO_SSLv2: number;
+        const SSL_OP_NO_SSLv3: number;
+        const SSL_OP_NO_TICKET: number;
+        const SSL_OP_NO_TLSv1: number;
+        const SSL_OP_NO_TLSv1_1: number;
+        const SSL_OP_NO_TLSv1_2: number;
+        const SSL_OP_PKCS1_CHECK_1: number;
+        const SSL_OP_PKCS1_CHECK_2: number;
+        /** Instructs OpenSSL to always create a new key when using temporary/ephemeral DH parameters. */
+        const SSL_OP_SINGLE_DH_USE: number;
+        /** Instructs OpenSSL to always create a new key when using temporary/ephemeral ECDH parameters. */
+        const SSL_OP_SINGLE_ECDH_USE: number;
+        const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: number;
+        const SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG: number;
+        const SSL_OP_TLS_BLOCK_PADDING_BUG: number;
+        const SSL_OP_TLS_D5_BUG: number;
+        /** Instructs OpenSSL to disable version rollback attack detection. */
+        const SSL_OP_TLS_ROLLBACK_BUG: number;
+
+        const ENGINE_METHOD_RSA: number;
+        const ENGINE_METHOD_DSA: number;
+        const ENGINE_METHOD_DH: number;
+        const ENGINE_METHOD_RAND: number;
+        const ENGINE_METHOD_EC: number;
+        const ENGINE_METHOD_CIPHERS: number;
+        const ENGINE_METHOD_DIGESTS: number;
+        const ENGINE_METHOD_PKEY_METHS: number;
+        const ENGINE_METHOD_PKEY_ASN1_METHS: number;
+        const ENGINE_METHOD_ALL: number;
+        const ENGINE_METHOD_NONE: number;
+
+        const DH_CHECK_P_NOT_SAFE_PRIME: number;
+        const DH_CHECK_P_NOT_PRIME: number;
+        const DH_UNABLE_TO_CHECK_GENERATOR: number;
+        const DH_NOT_SUITABLE_GENERATOR: number;
+
+        const ALPN_ENABLED: number;
+
+        const RSA_PKCS1_PADDING: number;
+        const RSA_SSLV23_PADDING: number;
+        const RSA_NO_PADDING: number;
+        const RSA_PKCS1_OAEP_PADDING: number;
+        const RSA_X931_PADDING: number;
+        const RSA_PKCS1_PSS_PADDING: number;
+        /** Sets the salt length for RSA_PKCS1_PSS_PADDING to the digest size when signing or verifying. */
+        const RSA_PSS_SALTLEN_DIGEST: number;
+        /** Sets the salt length for RSA_PKCS1_PSS_PADDING to the maximum permissible value when signing data. */
+        const RSA_PSS_SALTLEN_MAX_SIGN: number;
+        /** Causes the salt length for RSA_PKCS1_PSS_PADDING to be determined automatically when verifying a signature. */
+        const RSA_PSS_SALTLEN_AUTO: number;
+
+        const POINT_CONVERSION_COMPRESSED: number;
+        const POINT_CONVERSION_UNCOMPRESSED: number;
+        const POINT_CONVERSION_HYBRID: number;
+
+        /** Specifies the built-in default cipher list used by Node.js (colon-separated values). */
+        const defaultCoreCipherList: string;
+        /** Specifies the active default cipher list used by the current Node.js process  (colon-separated values). */
+        const defaultCipherList: string;
+    }
+
+    /** @deprecated since v10.0.0 */
+    const fips: boolean;
+
+    function createHash(algorithm: string, options?: stream.TransformOptions): Hash;
+    function createHmac(algorithm: string, key: BinaryLike, options?: stream.TransformOptions): Hmac;
+
+    type Utf8AsciiLatin1Encoding = "utf8" | "ascii" | "latin1";
+    type HexBase64Latin1Encoding = "latin1" | "hex" | "base64";
+    type Utf8AsciiBinaryEncoding = "utf8" | "ascii" | "binary";
+    type HexBase64BinaryEncoding = "binary" | "base64" | "hex";
+    type ECDHKeyFormat = "compressed" | "uncompressed" | "hybrid";
+
+    interface Hash extends NodeJS.ReadWriteStream {
+        update(data: BinaryLike): Hash;
+        update(data: string, input_encoding: Utf8AsciiLatin1Encoding): Hash;
+        digest(): Buffer;
+        digest(encoding: HexBase64Latin1Encoding): string;
+    }
+    interface Hmac extends NodeJS.ReadWriteStream {
+        update(data: BinaryLike): Hmac;
+        update(data: string, input_encoding: Utf8AsciiLatin1Encoding): Hmac;
+        digest(): Buffer;
+        digest(encoding: HexBase64Latin1Encoding): string;
+    }
+
+    export type KeyObjectType = 'secret' | 'public' | 'private';
+
+    interface KeyObject {
+        asymmetricKeyType?: KeyType;
+        export(options?: {
+            type: 'pkcs1' | 'spki' | 'pkcs8' | 'sec1',
+            format: KeyFormat,
+            cipher?: string,
+            passphrase?: string | Buffer
+        }): string | Buffer;
+        symmetricSize?: number;
+        type: KeyObjectType;
+    }
+
+    type CipherCCMTypes = 'aes-128-ccm' | 'aes-192-ccm' | 'aes-256-ccm';
+    type CipherGCMTypes = 'aes-128-gcm' | 'aes-192-gcm' | 'aes-256-gcm';
+
+    type Binary = Buffer | NodeJS.TypedArray | DataView;
+    type BinaryLike = string | Binary;
+
+    type CipherKey = BinaryLike | KeyObject;
+
+    interface CipherCCMOptions extends stream.TransformOptions {
+        authTagLength: number;
+    }
+    interface CipherGCMOptions extends stream.TransformOptions {
+        authTagLength?: number;
+    }
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    function createCipher(algorithm: CipherCCMTypes, password: BinaryLike, options: CipherCCMOptions): CipherCCM;
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    function createCipher(algorithm: CipherGCMTypes, password: BinaryLike, options?: CipherGCMOptions): CipherGCM;
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    function createCipher(algorithm: string, password: BinaryLike, options?: stream.TransformOptions): Cipher;
+
+    function createCipheriv(
+        algorithm: CipherCCMTypes,
+        key: CipherKey,
+        iv: BinaryLike,
+        options: CipherCCMOptions
+    ): CipherCCM;
+    function createCipheriv(
+        algorithm: CipherGCMTypes,
+        key: CipherKey,
+        iv: BinaryLike,
+        options?: CipherGCMOptions
+    ): CipherGCM;
+    function createCipheriv(
+        algorithm: string, key: CipherKey, iv: BinaryLike, options?: stream.TransformOptions
+    ): Cipher;
+
+    interface Cipher extends NodeJS.ReadWriteStream {
+        update(data: BinaryLike): Buffer;
+        update(data: string, input_encoding: Utf8AsciiBinaryEncoding): Buffer;
+        update(data: Binary, output_encoding: HexBase64BinaryEncoding): string;
+        update(data: Binary, 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
+    }
+    interface CipherCCM extends Cipher {
+        setAAD(buffer: Buffer, options: { plaintextLength: number }): this;
+        getAuthTag(): Buffer;
+    }
+    interface CipherGCM extends Cipher {
+        setAAD(buffer: Buffer, options?: { plaintextLength: number }): this;
+        getAuthTag(): Buffer;
+    }
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    function createDecipher(algorithm: CipherCCMTypes, password: BinaryLike, options: CipherCCMOptions): DecipherCCM;
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    function createDecipher(algorithm: CipherGCMTypes, password: BinaryLike, options?: CipherGCMOptions): DecipherGCM;
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    function createDecipher(algorithm: string, password: BinaryLike, options?: stream.TransformOptions): Decipher;
+
+    function createDecipheriv(
+        algorithm: CipherCCMTypes,
+        key: BinaryLike,
+        iv: BinaryLike,
+        options: CipherCCMOptions,
+    ): DecipherCCM;
+    function createDecipheriv(
+        algorithm: CipherGCMTypes,
+        key: BinaryLike,
+        iv: BinaryLike,
+        options?: CipherGCMOptions,
+    ): DecipherGCM;
+    function createDecipheriv(algorithm: string, key: BinaryLike, iv: BinaryLike, options?: stream.TransformOptions): Decipher;
+
+    interface Decipher extends NodeJS.ReadWriteStream {
+        update(data: Binary): Buffer;
+        update(data: string, input_encoding: HexBase64BinaryEncoding): Buffer;
+        update(data: Binary, 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: Binary): this;
+        // setAAD(buffer: Binary): this;
+    }
+    interface DecipherCCM extends Decipher {
+        setAuthTag(buffer: Binary): this;
+        setAAD(buffer: Binary, options: { plaintextLength: number }): this;
+    }
+    interface DecipherGCM extends Decipher {
+        setAuthTag(buffer: Binary): this;
+        setAAD(buffer: Binary, options?: { plaintextLength: number }): this;
+    }
+
+    interface PrivateKeyInput {
+        key: string | Buffer;
+        format?: KeyFormat;
+        type?: 'pkcs1' | 'pkcs8' | 'sec1';
+        passphrase?: string | Buffer;
+    }
+
+    interface PublicKeyInput {
+        key: string | Buffer;
+        format?: KeyFormat;
+        type?: 'pkcs1' | 'spki';
+    }
+
+    function createPrivateKey(key: PrivateKeyInput | string | Buffer): KeyObject;
+    function createPublicKey(key: PublicKeyInput | string | Buffer): KeyObject;
+    function createSecretKey(key: Buffer): KeyObject;
+
+    function createSign(algorithm: string, options?: stream.WritableOptions): Signer;
+
+    interface SignPrivateKeyInput extends PrivateKeyInput {
+        padding?: number;
+        saltLength?: number;
+    }
+
+    type KeyLike = string | Buffer | KeyObject;
+
+    interface Signer extends NodeJS.WritableStream {
+        update(data: BinaryLike): Signer;
+        update(data: string, input_encoding: Utf8AsciiLatin1Encoding): Signer;
+        sign(private_key: SignPrivateKeyInput | KeyLike): Buffer;
+        sign(private_key: SignPrivateKeyInput | KeyLike, output_format: HexBase64Latin1Encoding): string;
+    }
+
+    function createVerify(algorith: string, options?: stream.WritableOptions): Verify;
+    interface Verify extends NodeJS.WritableStream {
+        update(data: BinaryLike): Verify;
+        update(data: string, input_encoding: Utf8AsciiLatin1Encoding): Verify;
+        verify(object: Object | KeyLike, signature: Binary): boolean;
+        verify(object: Object | KeyLike, 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
+    }
+    function createDiffieHellman(prime_length: number, generator?: number | Binary): DiffieHellman;
+    function createDiffieHellman(prime: Binary): DiffieHellman;
+    function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding): DiffieHellman;
+    function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: number | Binary): DiffieHellman;
+    function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: string, generator_encoding: HexBase64Latin1Encoding): DiffieHellman;
+    interface DiffieHellman {
+        generateKeys(): Buffer;
+        generateKeys(encoding: HexBase64Latin1Encoding): string;
+        computeSecret(other_public_key: Binary): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
+        computeSecret(other_public_key: Binary, output_encoding: HexBase64Latin1Encoding): string;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
+        getPrime(): Buffer;
+        getPrime(encoding: HexBase64Latin1Encoding): string;
+        getGenerator(): Buffer;
+        getGenerator(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(): Buffer;
+        getPublicKey(encoding: HexBase64Latin1Encoding): string;
+        getPrivateKey(): Buffer;
+        getPrivateKey(encoding: HexBase64Latin1Encoding): string;
+        setPublicKey(public_key: Binary): void;
+        setPublicKey(public_key: string, encoding: string): void;
+        setPrivateKey(private_key: Binary): void;
+        setPrivateKey(private_key: string, encoding: string): void;
+        verifyError: number;
+    }
+    function getDiffieHellman(group_name: string): DiffieHellman;
+    function pbkdf2(
+        password: BinaryLike,
+        salt: BinaryLike,
+        iterations: number,
+        keylen: number,
+        digest: string,
+        callback: (err: Error | null, derivedKey: Buffer) => any,
+    ): void;
+    function pbkdf2Sync(password: BinaryLike, salt: BinaryLike, iterations: number, keylen: number, digest: string): Buffer;
+
+    function randomBytes(size: number): Buffer;
+    function randomBytes(size: number, callback: (err: Error | null, buf: Buffer) => void): void;
+    function pseudoRandomBytes(size: number): Buffer;
+    function pseudoRandomBytes(size: number, callback: (err: Error | null, buf: Buffer) => void): void;
+
+    function randomFillSync<T extends Binary>(buffer: T, offset?: number, size?: number): T;
+    function randomFill<T extends Binary>(buffer: T, callback: (err: Error | null, buf: T) => void): void;
+    function randomFill<T extends Binary>(buffer: T, offset: number, callback: (err: Error | null, buf: T) => void): void;
+    function randomFill<T extends Binary>(buffer: T, offset: number, size: number, callback: (err: Error | null, buf: T) => void): void;
+
+    interface ScryptOptions {
+        N?: number;
+        r?: number;
+        p?: number;
+        maxmem?: number;
+    }
+    function scrypt(
+        password: BinaryLike,
+        salt: BinaryLike,
+        keylen: number, callback: (err: Error | null, derivedKey: Buffer) => void,
+    ): void;
+    function scrypt(
+        password: BinaryLike,
+        salt: BinaryLike,
+        keylen: number,
+        options: ScryptOptions,
+        callback: (err: Error | null, derivedKey: Buffer) => void,
+    ): void;
+    function scryptSync(password: BinaryLike, salt: BinaryLike, keylen: number, options?: ScryptOptions): Buffer;
+
+    interface RsaPublicKey {
+        key: KeyLike;
+        padding?: number;
+    }
+    interface RsaPrivateKey {
+        key: KeyLike;
+        passphrase?: string;
+        padding?: number;
+    }
+    function publicEncrypt(public_key: RsaPublicKey | KeyLike, buffer: Binary): Buffer;
+    function privateDecrypt(private_key: RsaPrivateKey | KeyLike, buffer: Binary): Buffer;
+    function privateEncrypt(private_key: RsaPrivateKey | KeyLike, buffer: Binary): Buffer;
+    function publicDecrypt(public_key: RsaPublicKey | KeyLike, buffer: Binary): Buffer;
+    function getCiphers(): string[];
+    function getCurves(): string[];
+    function getHashes(): string[];
+    class ECDH {
+        static convertKey(
+            key: BinaryLike,
+            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: Binary): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
+        computeSecret(other_public_key: Binary, 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: Binary): void;
+        setPrivateKey(private_key: string, encoding: HexBase64Latin1Encoding): void;
+    }
+    function createECDH(curve_name: string): ECDH;
+    function timingSafeEqual(a: Binary, b: Binary): boolean;
+    /** @deprecated since v10.0.0 */
+    const DEFAULT_ENCODING: string;
+
+    export type KeyType = 'rsa' | 'dsa' | 'ec';
+    export type KeyFormat = 'pem' | 'der';
+
+    interface BasePrivateKeyEncodingOptions<T extends KeyFormat> {
+        format: T;
+        cipher: string;
+        passphrase: string;
+    }
+
+    interface RSAKeyPairOptions<PubF extends KeyFormat, PrivF extends KeyFormat> {
+        /**
+         * Key size in bits
+         */
+        modulusLength: number;
+        /**
+         * @default 0x10001
+         */
+        publicExponent?: number;
+
+        publicKeyEncoding: {
+            type: 'pkcs1' | 'spki';
+            format: PubF;
+        };
+        privateKeyEncoding: BasePrivateKeyEncodingOptions<PrivF> & {
+            type: 'pkcs1' | 'pkcs8';
+        };
+    }
+
+    interface DSAKeyPairOptions<PubF extends KeyFormat, PrivF extends KeyFormat> {
+        /**
+         * Key size in bits
+         */
+        modulusLength: number;
+        /**
+         * Size of q in bits
+         */
+        divisorLength: number;
+
+        publicKeyEncoding: {
+            type: 'spki';
+            format: PubF;
+        };
+        privateKeyEncoding: BasePrivateKeyEncodingOptions<PrivF> & {
+            type: 'pkcs8';
+        };
+    }
+
+    interface ECKeyPairOptions<PubF extends KeyFormat, PrivF extends KeyFormat> {
+        /**
+         * Name of the curve to use.
+         */
+        namedCurve: string;
+
+        publicKeyEncoding: {
+            type: 'pkcs1' | 'spki';
+            format: PubF;
+        };
+        privateKeyEncoding: BasePrivateKeyEncodingOptions<PrivF> & {
+            type: 'sec1' | 'pkcs8';
+        };
+    }
+
+    interface KeyPairSyncResult<T1 extends string | Buffer, T2 extends string | Buffer> {
+        publicKey: T1;
+        privateKey: T2;
+    }
+
+    function generateKeyPairSync(type: 'rsa', options: RSAKeyPairOptions<'pem', 'pem'>): KeyPairSyncResult<string, string>;
+    function generateKeyPairSync(type: 'rsa', options: RSAKeyPairOptions<'pem', 'der'>): KeyPairSyncResult<string, Buffer>;
+    function generateKeyPairSync(type: 'rsa', options: RSAKeyPairOptions<'der', 'pem'>): KeyPairSyncResult<Buffer, string>;
+    function generateKeyPairSync(type: 'rsa', options: RSAKeyPairOptions<'der', 'der'>): KeyPairSyncResult<Buffer, Buffer>;
+
+    function generateKeyPairSync(type: 'dsa', options: DSAKeyPairOptions<'pem', 'pem'>): KeyPairSyncResult<string, string>;
+    function generateKeyPairSync(type: 'dsa', options: DSAKeyPairOptions<'pem', 'der'>): KeyPairSyncResult<string, Buffer>;
+    function generateKeyPairSync(type: 'dsa', options: DSAKeyPairOptions<'der', 'pem'>): KeyPairSyncResult<Buffer, string>;
+    function generateKeyPairSync(type: 'dsa', options: DSAKeyPairOptions<'der', 'der'>): KeyPairSyncResult<Buffer, Buffer>;
+
+    function generateKeyPairSync(type: 'ec', options: ECKeyPairOptions<'pem', 'pem'>): KeyPairSyncResult<string, string>;
+    function generateKeyPairSync(type: 'ec', options: ECKeyPairOptions<'pem', 'der'>): KeyPairSyncResult<string, Buffer>;
+    function generateKeyPairSync(type: 'ec', options: ECKeyPairOptions<'der', 'pem'>): KeyPairSyncResult<Buffer, string>;
+    function generateKeyPairSync(type: 'ec', options: ECKeyPairOptions<'der', 'der'>): KeyPairSyncResult<Buffer, Buffer>;
+
+    function generateKeyPair(type: 'rsa', options: RSAKeyPairOptions<'pem', 'pem'>, callback: (err: Error | null, publicKey: string, privateKey: string) => void): void;
+    function generateKeyPair(type: 'rsa', options: RSAKeyPairOptions<'pem', 'der'>, callback: (err: Error | null, publicKey: string, privateKey: Buffer) => void): void;
+    function generateKeyPair(type: 'rsa', options: RSAKeyPairOptions<'der', 'pem'>, callback: (err: Error | null, publicKey: Buffer, privateKey: string) => void): void;
+    function generateKeyPair(type: 'rsa', options: RSAKeyPairOptions<'der', 'der'>, callback: (err: Error | null, publicKey: Buffer, privateKey: Buffer) => void): void;
+
+    function generateKeyPair(type: 'dsa', options: DSAKeyPairOptions<'pem', 'pem'>, callback: (err: Error | null, publicKey: string, privateKey: string) => void): void;
+    function generateKeyPair(type: 'dsa', options: DSAKeyPairOptions<'pem', 'der'>, callback: (err: Error | null, publicKey: string, privateKey: Buffer) => void): void;
+    function generateKeyPair(type: 'dsa', options: DSAKeyPairOptions<'der', 'pem'>, callback: (err: Error | null, publicKey: Buffer, privateKey: string) => void): void;
+    function generateKeyPair(type: 'dsa', options: DSAKeyPairOptions<'der', 'der'>, callback: (err: Error | null, publicKey: Buffer, privateKey: Buffer) => void): void;
+
+    function generateKeyPair(type: 'ec', options: ECKeyPairOptions<'pem', 'pem'>, callback: (err: Error | null, publicKey: string, privateKey: string) => void): void;
+    function generateKeyPair(type: 'ec', options: ECKeyPairOptions<'pem', 'der'>, callback: (err: Error | null, publicKey: string, privateKey: Buffer) => void): void;
+    function generateKeyPair(type: 'ec', options: ECKeyPairOptions<'der', 'pem'>, callback: (err: Error | null, publicKey: Buffer, privateKey: string) => void): void;
+    function generateKeyPair(type: 'ec', options: ECKeyPairOptions<'der', 'der'>, callback: (err: Error | null, publicKey: Buffer, privateKey: Buffer) => void): void;
+
+    namespace generateKeyPair {
+        function __promisify__(type: "rsa", options: RSAKeyPairOptions<'pem', 'pem'>): Promise<{ publicKey: string, privateKey: string }>;
+        function __promisify__(type: "rsa", options: RSAKeyPairOptions<'pem', 'der'>): Promise<{ publicKey: string, privateKey: Buffer }>;
+        function __promisify__(type: "rsa", options: RSAKeyPairOptions<'der', 'pem'>): Promise<{ publicKey: Buffer, privateKey: string }>;
+        function __promisify__(type: "rsa", options: RSAKeyPairOptions<'der', 'der'>): Promise<{ publicKey: Buffer, privateKey: Buffer }>;
+
+        function __promisify__(type: "dsa", options: DSAKeyPairOptions<'pem', 'pem'>): Promise<{ publicKey: string, privateKey: string }>;
+        function __promisify__(type: "dsa", options: DSAKeyPairOptions<'pem', 'der'>): Promise<{ publicKey: string, privateKey: Buffer }>;
+        function __promisify__(type: "dsa", options: DSAKeyPairOptions<'der', 'pem'>): Promise<{ publicKey: Buffer, privateKey: string }>;
+        function __promisify__(type: "dsa", options: DSAKeyPairOptions<'der', 'der'>): Promise<{ publicKey: Buffer, privateKey: Buffer }>;
+
+        function __promisify__(type: "ec", options: ECKeyPairOptions<'pem', 'pem'>): Promise<{ publicKey: string, privateKey: string }>;
+        function __promisify__(type: "ec", options: ECKeyPairOptions<'pem', 'der'>): Promise<{ publicKey: string, privateKey: Buffer }>;
+        function __promisify__(type: "ec", options: ECKeyPairOptions<'der', 'pem'>): Promise<{ publicKey: Buffer, privateKey: string }>;
+        function __promisify__(type: "ec", options: ECKeyPairOptions<'der', 'der'>): Promise<{ publicKey: Buffer, privateKey: Buffer }>;
+    }
+}
diff --git a/types/node/dgram.d.ts b/types/node/dgram.d.ts
new file mode 100644
index 0000000000..93759406c7
--- /dev/null
+++ b/types/node/dgram.d.ts
@@ -0,0 +1,102 @@
+declare module "dgram" {
+    import { AddressInfo } from "net";
+    import * as dns from "dns";
+    import * as events from "events";
+
+    interface RemoteInfo {
+        address: string;
+        family: 'IPv4' | 'IPv6';
+        port: number;
+        size: number;
+    }
+
+    interface BindOptions {
+        port: number;
+        address?: string;
+        exclusive?: boolean;
+    }
+
+    type SocketType = "udp4" | "udp6";
+
+    interface SocketOptions {
+        type: SocketType;
+        reuseAddr?: boolean;
+        /**
+         * @default false
+         */
+        ipv6Only?: boolean;
+        recvBufferSize?: number;
+        sendBufferSize?: number;
+        lookup?: (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void) => void;
+    }
+
+    function createSocket(type: SocketType, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+    function createSocket(options: SocketOptions, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+
+    class Socket extends events.EventEmitter {
+        send(msg: Buffer | string | Uint8Array | any[], port: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: Buffer | string | Uint8Array, offset: number, length: number, port: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
+        bind(port?: number, address?: string, callback?: () => void): void;
+        bind(port?: number, callback?: () => void): void;
+        bind(callback?: () => void): void;
+        bind(options: BindOptions, callback?: Function): void;
+        close(callback?: () => void): void;
+        address(): AddressInfo | string;
+        setBroadcast(flag: boolean): void;
+        setTTL(ttl: number): void;
+        setMulticastTTL(ttl: number): void;
+        setMulticastInterface(multicastInterface: string): void;
+        setMulticastLoopback(flag: boolean): void;
+        addMembership(multicastAddress: string, multicastInterface?: string): void;
+        dropMembership(multicastAddress: string, multicastInterface?: string): void;
+        ref(): this;
+        unref(): this;
+        setRecvBufferSize(size: number): void;
+        setSendBufferSize(size: number): void;
+        getRecvBufferSize(): number;
+        getSendBufferSize(): number;
+
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. error
+         * 3. listening
+         * 4. message
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "listening", listener: () => void): this;
+        addListener(event: "message", listener: (msg: Buffer, rinfo: RemoteInfo) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "listening"): boolean;
+        emit(event: "message", msg: Buffer, rinfo: RemoteInfo): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "listening", listener: () => void): this;
+        on(event: "message", listener: (msg: Buffer, rinfo: RemoteInfo) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "listening", listener: () => void): this;
+        once(event: "message", listener: (msg: Buffer, rinfo: RemoteInfo) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "listening", listener: () => void): this;
+        prependListener(event: "message", listener: (msg: Buffer, rinfo: RemoteInfo) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "listening", listener: () => void): this;
+        prependOnceListener(event: "message", listener: (msg: Buffer, rinfo: RemoteInfo) => void): this;
+    }
+}
diff --git a/types/node/dns.d.ts b/types/node/dns.d.ts
new file mode 100644
index 0000000000..a77216f797
--- /dev/null
+++ b/types/node/dns.d.ts
@@ -0,0 +1,292 @@
+declare module "dns" {
+    // Supported getaddrinfo flags.
+    const ADDRCONFIG: number;
+    const V4MAPPED: number;
+
+    interface LookupOptions {
+        family?: number;
+        hints?: number;
+        all?: boolean;
+        verbatim?: boolean;
+    }
+
+    interface LookupOneOptions extends LookupOptions {
+        all?: false;
+    }
+
+    interface LookupAllOptions extends LookupOptions {
+        all: true;
+    }
+
+    interface LookupAddress {
+        address: string;
+        family: number;
+    }
+
+    function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+    function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+    function lookup(hostname: string, options: LookupAllOptions, callback: (err: NodeJS.ErrnoException, addresses: LookupAddress[]) => void): void;
+    function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException, address: string | LookupAddress[], family: number) => void): void;
+    function lookup(hostname: string, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace lookup {
+        function __promisify__(hostname: string, options: LookupAllOptions): Promise<{ address: LookupAddress[] }>;
+        function __promisify__(hostname: string, options?: LookupOneOptions | number): Promise<{ address: string, family: number }>;
+        function __promisify__(hostname: string, options?: LookupOptions | number): Promise<{ address: string | LookupAddress[], family?: number }>;
+    }
+
+    function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void;
+
+    namespace lookupService {
+        function __promisify__(address: string, port: number): Promise<{ hostname: string, service: string }>;
+    }
+
+    interface ResolveOptions {
+        ttl: boolean;
+    }
+
+    interface ResolveWithTtlOptions extends ResolveOptions {
+        ttl: true;
+    }
+
+    interface RecordWithTtl {
+        address: string;
+        ttl: number;
+    }
+
+    /** @deprecated Use AnyARecord or AnyAaaaRecord instead. */
+    type AnyRecordWithTtl = AnyARecord | AnyAaaaRecord;
+
+    interface AnyARecord extends RecordWithTtl {
+        type: "A";
+    }
+
+    interface AnyAaaaRecord extends RecordWithTtl {
+        type: "AAAA";
+    }
+
+    interface MxRecord {
+        priority: number;
+        exchange: string;
+    }
+
+    interface AnyMxRecord extends MxRecord {
+        type: "MX";
+    }
+
+    interface NaptrRecord {
+        flags: string;
+        service: string;
+        regexp: string;
+        replacement: string;
+        order: number;
+        preference: number;
+    }
+
+    interface AnyNaptrRecord extends NaptrRecord {
+        type: "NAPTR";
+    }
+
+    interface SoaRecord {
+        nsname: string;
+        hostmaster: string;
+        serial: number;
+        refresh: number;
+        retry: number;
+        expire: number;
+        minttl: number;
+    }
+
+    interface AnySoaRecord extends SoaRecord {
+        type: "SOA";
+    }
+
+    interface SrvRecord {
+        priority: number;
+        weight: number;
+        port: number;
+        name: string;
+    }
+
+    interface AnySrvRecord extends SrvRecord {
+        type: "SRV";
+    }
+
+    interface AnyTxtRecord {
+        type: "TXT";
+        entries: string[];
+    }
+
+    interface AnyNsRecord {
+        type: "NS";
+        value: string;
+    }
+
+    interface AnyPtrRecord {
+        type: "PTR";
+        value: string;
+    }
+
+    interface AnyCnameRecord {
+        type: "CNAME";
+        value: string;
+    }
+
+    type AnyRecord = AnyARecord |
+        AnyAaaaRecord |
+        AnyCnameRecord |
+        AnyMxRecord |
+        AnyNaptrRecord |
+        AnyNsRecord |
+        AnyPtrRecord |
+        AnySoaRecord |
+        AnySrvRecord |
+        AnyTxtRecord;
+
+    function resolve(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve(hostname: string, rrtype: "A", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve(hostname: string, rrtype: "AAAA", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve(hostname: string, rrtype: "ANY", callback: (err: NodeJS.ErrnoException, addresses: AnyRecord[]) => void): void;
+    function resolve(hostname: string, rrtype: "CNAME", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve(hostname: string, rrtype: "MX", callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
+    function resolve(hostname: string, rrtype: "NAPTR", callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
+    function resolve(hostname: string, rrtype: "NS", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve(hostname: string, rrtype: "PTR", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve(hostname: string, rrtype: "SOA", callback: (err: NodeJS.ErrnoException, addresses: SoaRecord) => void): void;
+    function resolve(hostname: string, rrtype: "SRV", callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
+    function resolve(hostname: string, rrtype: "TXT", callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+    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.
+    namespace resolve {
+        function __promisify__(hostname: string, rrtype?: "A" | "AAAA" | "CNAME" | "NS" | "PTR"): Promise<string[]>;
+        function __promisify__(hostname: string, rrtype: "ANY"): Promise<AnyRecord[]>;
+        function __promisify__(hostname: string, rrtype: "MX"): Promise<MxRecord[]>;
+        function __promisify__(hostname: string, rrtype: "NAPTR"): Promise<NaptrRecord[]>;
+        function __promisify__(hostname: string, rrtype: "SOA"): Promise<SoaRecord>;
+        function __promisify__(hostname: string, rrtype: "SRV"): Promise<SrvRecord[]>;
+        function __promisify__(hostname: string, rrtype: "TXT"): Promise<string[][]>;
+        function __promisify__(hostname: string, rrtype: string): Promise<string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][] | AnyRecord[]>;
+    }
+
+    function resolve4(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve4(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
+    function resolve4(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace resolve4 {
+        function __promisify__(hostname: string): Promise<string[]>;
+        function __promisify__(hostname: string, options: ResolveWithTtlOptions): Promise<RecordWithTtl[]>;
+        function __promisify__(hostname: string, options?: ResolveOptions): Promise<string[] | RecordWithTtl[]>;
+    }
+
+    function resolve6(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve6(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
+    function resolve6(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace resolve6 {
+        function __promisify__(hostname: string): Promise<string[]>;
+        function __promisify__(hostname: string, options: ResolveWithTtlOptions): Promise<RecordWithTtl[]>;
+        function __promisify__(hostname: string, options?: ResolveOptions): Promise<string[] | RecordWithTtl[]>;
+    }
+
+    function resolveCname(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    namespace resolveCname {
+        function __promisify__(hostname: string): Promise<string[]>;
+    }
+
+    function resolveMx(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
+    namespace resolveMx {
+        function __promisify__(hostname: string): Promise<MxRecord[]>;
+    }
+
+    function resolveNaptr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
+    namespace resolveNaptr {
+        function __promisify__(hostname: string): Promise<NaptrRecord[]>;
+    }
+
+    function resolveNs(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    namespace resolveNs {
+        function __promisify__(hostname: string): Promise<string[]>;
+    }
+
+    function resolvePtr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    namespace resolvePtr {
+        function __promisify__(hostname: string): Promise<string[]>;
+    }
+
+    function resolveSoa(hostname: string, callback: (err: NodeJS.ErrnoException, address: SoaRecord) => void): void;
+    namespace resolveSoa {
+        function __promisify__(hostname: string): Promise<SoaRecord>;
+    }
+
+    function resolveSrv(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
+    namespace resolveSrv {
+        function __promisify__(hostname: string): Promise<SrvRecord[]>;
+    }
+
+    function resolveTxt(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+    namespace resolveTxt {
+        function __promisify__(hostname: string): Promise<string[][]>;
+    }
+
+    function resolveAny(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: AnyRecord[]) => void): void;
+    namespace resolveAny {
+        function __promisify__(hostname: string): Promise<AnyRecord[]>;
+    }
+
+    function reverse(ip: string, callback: (err: NodeJS.ErrnoException, hostnames: string[]) => void): void;
+    function setServers(servers: string[]): void;
+    function getServers(): string[];
+
+    // Error codes
+    const NODATA: string;
+    const FORMERR: string;
+    const SERVFAIL: string;
+    const NOTFOUND: string;
+    const NOTIMP: string;
+    const REFUSED: string;
+    const BADQUERY: string;
+    const BADNAME: string;
+    const BADFAMILY: string;
+    const BADRESP: string;
+    const CONNREFUSED: string;
+    const TIMEOUT: string;
+    const EOF: string;
+    const FILE: string;
+    const NOMEM: string;
+    const DESTRUCTION: string;
+    const BADSTR: string;
+    const BADFLAGS: string;
+    const NONAME: string;
+    const BADHINTS: string;
+    const NOTINITIALIZED: string;
+    const LOADIPHLPAPI: string;
+    const ADDRGETNETWORKPARAMS: string;
+    const CANCELLED: string;
+
+    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;
+    }
+}
diff --git a/types/node/domain.d.ts b/types/node/domain.d.ts
new file mode 100644
index 0000000000..6a30decfa5
--- /dev/null
+++ b/types/node/domain.d.ts
@@ -0,0 +1,16 @@
+declare module "domain" {
+    import * as events from "events";
+
+    class Domain extends events.EventEmitter implements NodeJS.Domain {
+        run(fn: Function): void;
+        add(emitter: events.EventEmitter): void;
+        remove(emitter: events.EventEmitter): void;
+        bind(cb: (err: Error, data: any) => any): any;
+        intercept(cb: (data: any) => any): any;
+        members: any[];
+        enter(): void;
+        exit(): void;
+    }
+
+    function create(): Domain;
+}
diff --git a/types/node/events.d.ts b/types/node/events.d.ts
new file mode 100644
index 0000000000..dd0d8d191b
--- /dev/null
+++ b/types/node/events.d.ts
@@ -0,0 +1,29 @@
+declare module "events" {
+    class internal extends NodeJS.EventEmitter { }
+
+    namespace internal {
+         class EventEmitter extends internal {
+            /** @deprecated since v4.0.0 */
+            static listenerCount(emitter: EventEmitter, event: string | symbol): number;
+            static defaultMaxListeners: number;
+
+            addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            on(event: string | symbol, listener: (...args: any[]) => void): this;
+            once(event: string | symbol, listener: (...args: any[]) => void): this;
+            prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            off(event: string | symbol, listener: (...args: any[]) => void): this;
+            removeAllListeners(event?: string | symbol): this;
+            setMaxListeners(n: number): this;
+            getMaxListeners(): number;
+            listeners(event: string | symbol): Function[];
+            rawListeners(event: string | symbol): Function[];
+            emit(event: string | symbol, ...args: any[]): boolean;
+            eventNames(): Array<string | symbol>;
+            listenerCount(type: string | symbol): number;
+        }
+    }
+
+    export = internal;
+}
diff --git a/types/node/fs.d.ts b/types/node/fs.d.ts
new file mode 100644
index 0000000000..105ce92036
--- /dev/null
+++ b/types/node/fs.d.ts
@@ -0,0 +1,2272 @@
+declare module "fs" {
+    import * as stream from "stream";
+    import * as events from "events";
+    import { URL } from "url";
+
+    /**
+     * Valid types for path values in "fs".
+     */
+    type PathLike = string | Buffer | URL;
+
+    type BinaryData = Buffer | DataView | NodeJS.TypedArray;
+    class Stats {
+        isFile(): boolean;
+        isDirectory(): boolean;
+        isBlockDevice(): boolean;
+        isCharacterDevice(): boolean;
+        isSymbolicLink(): boolean;
+        isFIFO(): boolean;
+        isSocket(): boolean;
+        dev: number;
+        ino: number;
+        mode: number;
+        nlink: number;
+        uid: number;
+        gid: number;
+        rdev: number;
+        size: number;
+        blksize: number;
+        blocks: number;
+        atimeMs: number;
+        mtimeMs: number;
+        ctimeMs: number;
+        birthtimeMs: number;
+        atime: Date;
+        mtime: Date;
+        ctime: Date;
+        birthtime: Date;
+    }
+
+    class Dirent {
+        isFile(): boolean;
+        isDirectory(): boolean;
+        isBlockDevice(): boolean;
+        isCharacterDevice(): boolean;
+        isSymbolicLink(): boolean;
+        isFIFO(): boolean;
+        isSocket(): boolean;
+        name: string;
+    }
+
+    interface FSWatcher extends events.EventEmitter {
+        close(): void;
+
+        /**
+         * events.EventEmitter
+         *   1. change
+         *   2. error
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        addListener(event: "error", listener: (error: Error) => void): this;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        on(event: "error", listener: (error: Error) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        once(event: "error", listener: (error: Error) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        prependListener(event: "error", listener: (error: Error) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        prependOnceListener(event: "error", listener: (error: Error) => void): this;
+    }
+
+    class ReadStream extends stream.Readable {
+        close(): void;
+        bytesRead: number;
+        path: string | Buffer;
+
+        /**
+         * events.EventEmitter
+         *   1. open
+         *   2. close
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "open", listener: (fd: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "open", listener: (fd: number) => void): this;
+        on(event: "close", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "open", listener: (fd: number) => void): this;
+        once(event: "close", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "open", listener: (fd: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "open", listener: (fd: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+    }
+
+    class WriteStream extends stream.Writable {
+        close(): void;
+        bytesWritten: number;
+        path: string | Buffer;
+
+        /**
+         * events.EventEmitter
+         *   1. open
+         *   2. close
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "open", listener: (fd: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "open", listener: (fd: number) => void): this;
+        on(event: "close", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "open", listener: (fd: number) => void): this;
+        once(event: "close", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "open", listener: (fd: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "open", listener: (fd: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+    }
+
+    /**
+     * Asynchronous rename(2) - Change the name or location of a file or directory.
+     * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function rename(oldPath: PathLike, newPath: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace rename {
+        /**
+         * Asynchronous rename(2) - Change the name or location of a file or directory.
+         * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        function __promisify__(oldPath: PathLike, newPath: PathLike): Promise<void>;
+    }
+
+    /**
+     * Synchronous rename(2) - Change the name or location of a file or directory.
+     * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function renameSync(oldPath: PathLike, newPath: PathLike): void;
+
+    /**
+     * Asynchronous truncate(2) - Truncate a file to a specified length.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param len If not specified, defaults to `0`.
+     */
+    function truncate(path: PathLike, len: number | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronous truncate(2) - Truncate a file to a specified length.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function truncate(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace truncate {
+        /**
+         * Asynchronous truncate(2) - Truncate a file to a specified length.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param len If not specified, defaults to `0`.
+         */
+        function __promisify__(path: PathLike, len?: number | null): Promise<void>;
+    }
+
+    /**
+     * Synchronous truncate(2) - Truncate a file to a specified length.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param len If not specified, defaults to `0`.
+     */
+    function truncateSync(path: PathLike, len?: number | null): void;
+
+    /**
+     * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+     * @param fd A file descriptor.
+     * @param len If not specified, defaults to `0`.
+     */
+    function ftruncate(fd: number, len: number | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+     * @param fd A file descriptor.
+     */
+    function ftruncate(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace ftruncate {
+        /**
+         * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+         * @param fd A file descriptor.
+         * @param len If not specified, defaults to `0`.
+         */
+        function __promisify__(fd: number, len?: number | null): Promise<void>;
+    }
+
+    /**
+     * Synchronous ftruncate(2) - Truncate a file to a specified length.
+     * @param fd A file descriptor.
+     * @param len If not specified, defaults to `0`.
+     */
+    function ftruncateSync(fd: number, len?: number | null): void;
+
+    /**
+     * Asynchronous chown(2) - Change ownership of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function chown(path: PathLike, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace chown {
+        /**
+         * Asynchronous chown(2) - Change ownership of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function __promisify__(path: PathLike, uid: number, gid: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous chown(2) - Change ownership of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function chownSync(path: PathLike, uid: number, gid: number): void;
+
+    /**
+     * Asynchronous fchown(2) - Change ownership of a file.
+     * @param fd A file descriptor.
+     */
+    function fchown(fd: number, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace fchown {
+        /**
+         * Asynchronous fchown(2) - Change ownership of a file.
+         * @param fd A file descriptor.
+         */
+        function __promisify__(fd: number, uid: number, gid: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fchown(2) - Change ownership of a file.
+     * @param fd A file descriptor.
+     */
+    function fchownSync(fd: number, uid: number, gid: number): void;
+
+    /**
+     * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function lchown(path: PathLike, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace lchown {
+        /**
+         * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function __promisify__(path: PathLike, uid: number, gid: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function lchownSync(path: PathLike, uid: number, gid: number): void;
+
+    /**
+     * Asynchronous chmod(2) - Change permissions of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    function chmod(path: PathLike, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace chmod {
+        /**
+         * Asynchronous chmod(2) - Change permissions of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        function __promisify__(path: PathLike, mode: string | number): Promise<void>;
+    }
+
+    /**
+     * Synchronous chmod(2) - Change permissions of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    function chmodSync(path: PathLike, mode: string | number): void;
+
+    /**
+     * Asynchronous fchmod(2) - Change permissions of a file.
+     * @param fd A file descriptor.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    function fchmod(fd: number, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace fchmod {
+        /**
+         * Asynchronous fchmod(2) - Change permissions of a file.
+         * @param fd A file descriptor.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        function __promisify__(fd: number, mode: string | number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fchmod(2) - Change permissions of a file.
+     * @param fd A file descriptor.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    function fchmodSync(fd: number, mode: string | number): void;
+
+    /**
+     * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    function lchmod(path: PathLike, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace lchmod {
+        /**
+         * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        function __promisify__(path: PathLike, mode: string | number): Promise<void>;
+    }
+
+    /**
+     * Synchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    function lchmodSync(path: PathLike, mode: string | number): void;
+
+    /**
+     * Asynchronous stat(2) - Get file status.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function stat(path: PathLike, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace stat {
+        /**
+         * Asynchronous stat(2) - Get file status.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function __promisify__(path: PathLike): Promise<Stats>;
+    }
+
+    /**
+     * Synchronous stat(2) - Get file status.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function statSync(path: PathLike): Stats;
+
+    /**
+     * Asynchronous fstat(2) - Get file status.
+     * @param fd A file descriptor.
+     */
+    function fstat(fd: number, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace fstat {
+        /**
+         * Asynchronous fstat(2) - Get file status.
+         * @param fd A file descriptor.
+         */
+        function __promisify__(fd: number): Promise<Stats>;
+    }
+
+    /**
+     * Synchronous fstat(2) - Get file status.
+     * @param fd A file descriptor.
+     */
+    function fstatSync(fd: number): Stats;
+
+    /**
+     * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function lstat(path: PathLike, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace lstat {
+        /**
+         * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function __promisify__(path: PathLike): Promise<Stats>;
+    }
+
+    /**
+     * Synchronous lstat(2) - Get file status. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function lstatSync(path: PathLike): Stats;
+
+    /**
+     * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+     * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function link(existingPath: PathLike, newPath: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace link {
+        /**
+         * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+         * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function link(existingPath: PathLike, newPath: PathLike): Promise<void>;
+    }
+
+    /**
+     * Synchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+     * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function linkSync(existingPath: PathLike, newPath: PathLike): void;
+
+    /**
+     * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+     * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+     * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+     */
+    function symlink(target: PathLike, path: PathLike, type: symlink.Type | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+     */
+    function symlink(target: PathLike, path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace symlink {
+        /**
+         * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+         * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+         * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+         * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+         * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+         */
+        function __promisify__(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
+
+        type Type = "dir" | "file" | "junction";
+    }
+
+    /**
+     * Synchronous symlink(2) - Create a new symbolic link to an existing file.
+     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+     * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+     * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+     */
+    function symlinkSync(target: PathLike, path: PathLike, type?: symlink.Type | null): void;
+
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readlink(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, linkString: string) => void): void;
+
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readlink(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, linkString: Buffer) => void): void;
+
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readlink(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, linkString: string | Buffer) => void): void;
+
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function readlink(path: PathLike, callback: (err: NodeJS.ErrnoException, linkString: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace readlink {
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+    }
+
+    /**
+     * Synchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readlinkSync(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
+
+    /**
+     * Synchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readlinkSync(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
+
+    /**
+     * Synchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readlinkSync(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
+
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function realpath(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
+
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function realpath(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, resolvedPath: Buffer) => void): void;
+
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function realpath(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string | Buffer) => void): void;
+
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function realpath(path: PathLike, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace realpath {
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+
+        function native(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
+        function native(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, resolvedPath: Buffer) => void): void;
+        function native(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string | Buffer) => void): void;
+        function native(path: PathLike, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
+    }
+
+    /**
+     * Synchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function realpathSync(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
+
+    /**
+     * Synchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function realpathSync(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
+
+    /**
+     * Synchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function realpathSync(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
+
+    namespace realpathSync {
+        function native(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
+        function native(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
+        function native(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
+    }
+
+    /**
+     * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function unlink(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace unlink {
+        /**
+         * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function __promisify__(path: PathLike): Promise<void>;
+    }
+
+    /**
+     * Synchronous unlink(2) - delete a name and possibly the file it refers to.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function unlinkSync(path: PathLike): void;
+
+    /**
+     * Asynchronous rmdir(2) - delete a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function rmdir(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace rmdir {
+        /**
+         * Asynchronous rmdir(2) - delete a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function __promisify__(path: PathLike): Promise<void>;
+    }
+
+    /**
+     * Synchronous rmdir(2) - delete a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function rmdirSync(path: PathLike): void;
+
+    export interface MakeDirectoryOptions {
+        /**
+         * Indicates whether parent folders should be created.
+         * @default false
+         */
+        recursive?: boolean;
+        /**
+         * A file mode. If a string is passed, it is parsed as an octal integer. If not specified
+         * @default 0o777.
+         */
+        mode?: number;
+    }
+
+    /**
+     * Asynchronous mkdir(2) - create a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options Either the file mode, or an object optionally specifying the file mode and whether parent folders
+     * should be created. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+     */
+    function mkdir(path: PathLike, options: number | string | MakeDirectoryOptions | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronous mkdir(2) - create a directory with a mode of `0o777`.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function mkdir(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace mkdir {
+        /**
+         * Asynchronous mkdir(2) - create a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options Either the file mode, or an object optionally specifying the file mode and whether parent folders
+         * should be created. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+         */
+        function __promisify__(path: PathLike, options?: number | string | MakeDirectoryOptions | null): Promise<void>;
+    }
+
+    /**
+     * Synchronous mkdir(2) - create a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options Either the file mode, or an object optionally specifying the file mode and whether parent folders
+     * should be created. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+     */
+    function mkdirSync(path: PathLike, options?: number | string | MakeDirectoryOptions | null): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function mkdtemp(prefix: string, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, folder: string) => void): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function mkdtemp(prefix: string, options: "buffer" | { encoding: "buffer" }, callback: (err: NodeJS.ErrnoException, folder: Buffer) => void): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function mkdtemp(prefix: string, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, folder: string | Buffer) => void): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     */
+    function mkdtemp(prefix: string, callback: (err: NodeJS.ErrnoException, folder: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace mkdtemp {
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(prefix: string, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(prefix: string, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+    }
+
+    /**
+     * Synchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function mkdtempSync(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
+
+    /**
+     * Synchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function mkdtempSync(prefix: string, options: { encoding: "buffer" } | "buffer"): Buffer;
+
+    /**
+     * Synchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function mkdtempSync(prefix: string, options?: { encoding?: string | null } | string | null): string | Buffer;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readdir(
+        path: PathLike,
+        options: { encoding: BufferEncoding | null; withFileTypes?: false } | BufferEncoding | undefined | null,
+        callback: (err: NodeJS.ErrnoException, files: string[]) => void,
+    ): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readdir(path: PathLike, options: { encoding: "buffer"; withFileTypes?: false } | "buffer", callback: (err: NodeJS.ErrnoException, files: Buffer[]) => void): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readdir(
+        path: PathLike,
+        options: { encoding?: string | null; withFileTypes?: false } | string | undefined | null,
+        callback: (err: NodeJS.ErrnoException, files: string[] | Buffer[]) => void,
+    ): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function readdir(path: PathLike, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options If called with `withFileTypes: true` the result data will be an array of Dirent.
+     */
+    function readdir(path: PathLike, options: { withFileTypes: true }, callback: (err: NodeJS.ErrnoException, files: Dirent[]) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace readdir {
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options?: { encoding: BufferEncoding | null; withFileTypes?: false } | BufferEncoding | null): Promise<string[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options: "buffer" | { encoding: "buffer"; withFileTypes?: false }): Promise<Buffer[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options?: { encoding?: string | null; withFileTypes?: false } | string | null): Promise<string[] | Buffer[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options If called with `withFileTypes: true` the result data will be an array of Dirent
+         */
+        function __promisify__(path: PathLike, options: { withFileTypes: true }): Promise<Dirent[]>;
+    }
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readdirSync(path: PathLike, options?: { encoding: BufferEncoding | null; withFileTypes?: false } | BufferEncoding | null): string[];
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readdirSync(path: PathLike, options: { encoding: "buffer"; withFileTypes?: false } | "buffer"): Buffer[];
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readdirSync(path: PathLike, options?: { encoding?: string | null; withFileTypes?: false } | string | null): string[] | Buffer[];
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options If called with `withFileTypes: true` the result data will be an array of Dirent.
+     */
+    function readdirSync(path: PathLike, options: { withFileTypes: true }): Dirent[];
+
+    /**
+     * Asynchronous close(2) - close a file descriptor.
+     * @param fd A file descriptor.
+     */
+    function close(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace close {
+        /**
+         * Asynchronous close(2) - close a file descriptor.
+         * @param fd A file descriptor.
+         */
+        function __promisify__(fd: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous close(2) - close a file descriptor.
+     * @param fd A file descriptor.
+     */
+    function closeSync(fd: number): void;
+
+    /**
+     * Asynchronous open(2) - open and possibly create a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
+     */
+    function open(path: PathLike, flags: string | number, mode: string | number | undefined | null, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
+
+    /**
+     * Asynchronous open(2) - open and possibly create a file. If the file is created, its mode will be `0o666`.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function open(path: PathLike, flags: string | number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace open {
+        /**
+         * Asynchronous open(2) - open and possibly create a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
+         */
+        function __promisify__(path: PathLike, flags: string | number, mode?: string | number | null): Promise<number>;
+    }
+
+    /**
+     * Synchronous open(2) - open and possibly create a file, returning a file descriptor..
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
+     */
+    function openSync(path: PathLike, flags: string | number, mode?: string | number | null): number;
+
+    /**
+     * Asynchronously change file timestamps of the file referenced by the supplied path.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    function utimes(path: PathLike, atime: string | number | Date, mtime: string | number | Date, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace utimes {
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied path.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        function __promisify__(path: PathLike, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+    }
+
+    /**
+     * Synchronously change file timestamps of the file referenced by the supplied path.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    function utimesSync(path: PathLike, atime: string | number | Date, mtime: string | number | Date): void;
+
+    /**
+     * Asynchronously change file timestamps of the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    function futimes(fd: number, atime: string | number | Date, mtime: string | number | Date, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace futimes {
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied file descriptor.
+         * @param fd A file descriptor.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        function __promisify__(fd: number, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+    }
+
+    /**
+     * Synchronously change file timestamps of the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    function futimesSync(fd: number, atime: string | number | Date, mtime: string | number | Date): void;
+
+    /**
+     * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+     * @param fd A file descriptor.
+     */
+    function fsync(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace fsync {
+        /**
+         * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+         * @param fd A file descriptor.
+         */
+        function __promisify__(fd: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+     * @param fd A file descriptor.
+     */
+    function fsyncSync(fd: number): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     */
+    function write<TBuffer extends BinaryData>(
+        fd: number,
+        buffer: TBuffer,
+        offset: number | undefined | null,
+        length: number | undefined | null,
+        position: number | undefined | null,
+        callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void,
+    ): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+     */
+    function write<TBuffer extends BinaryData>(
+        fd: number,
+        buffer: TBuffer,
+        offset: number | undefined | null,
+        length: number | undefined | null,
+        callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void,
+    ): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     */
+    function write<TBuffer extends BinaryData>(fd: number, buffer: TBuffer, offset: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     */
+    function write<TBuffer extends BinaryData>(fd: number, buffer: TBuffer, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     * @param encoding The expected string encoding.
+     */
+    function write(
+        fd: number,
+        string: any,
+        position: number | undefined | null,
+        encoding: string | undefined | null,
+        callback: (err: NodeJS.ErrnoException, written: number, str: string) => void,
+    ): void;
+
+    /**
+     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     */
+    function write(fd: number, string: any, position: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+
+    /**
+     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     */
+    function write(fd: number, string: any, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace write {
+        /**
+         * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+         * @param fd A file descriptor.
+         * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+         * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+         */
+        function __promisify__<TBuffer extends BinaryData>(
+            fd: number,
+            buffer?: TBuffer,
+            offset?: number,
+            length?: number,
+            position?: number | null,
+        ): Promise<{ bytesWritten: number, buffer: TBuffer }>;
+
+        /**
+         * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+         * @param fd A file descriptor.
+         * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+         * @param encoding The expected string encoding.
+         */
+        function __promisify__(fd: number, string: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
+    }
+
+    /**
+     * Synchronously writes `buffer` to the file referenced by the supplied file descriptor, returning the number of bytes written.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     */
+    function writeSync(fd: number, buffer: BinaryData, offset?: number | null, length?: number | null, position?: number | null): number;
+
+    /**
+     * Synchronously writes `string` to the file referenced by the supplied file descriptor, returning the number of bytes written.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     * @param encoding The expected string encoding.
+     */
+    function writeSync(fd: number, string: any, position?: number | null, encoding?: string | null): number;
+
+    /**
+     * Asynchronously reads data from the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param buffer The buffer that the data will be written to.
+     * @param offset The offset in the buffer at which to start writing.
+     * @param length The number of bytes to read.
+     * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+     */
+    function read<TBuffer extends BinaryData>(
+        fd: number,
+        buffer: TBuffer,
+        offset: number,
+        length: number,
+        position: number | null,
+        callback: (err: NodeJS.ErrnoException, bytesRead: number, buffer: TBuffer) => void,
+    ): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace read {
+        /**
+         * @param fd A file descriptor.
+         * @param buffer The buffer that the data will be written to.
+         * @param offset The offset in the buffer at which to start writing.
+         * @param length The number of bytes to read.
+         * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+         */
+        function __promisify__<TBuffer extends BinaryData>(fd: number, buffer: TBuffer, offset: number, length: number, position: number | null): Promise<{ bytesRead: number, buffer: TBuffer }>;
+    }
+
+    /**
+     * Synchronously reads data from the file referenced by the supplied file descriptor, returning the number of bytes read.
+     * @param fd A file descriptor.
+     * @param buffer The buffer that the data will be written to.
+     * @param offset The offset in the buffer at which to start writing.
+     * @param length The number of bytes to read.
+     * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+     */
+    function readSync(fd: number, buffer: BinaryData, offset: number, length: number, position: number | null): number;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options An object that may contain an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    function readFile(path: PathLike | number, options: { encoding?: null; flag?: string; } | undefined | null, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    function readFile(path: PathLike | number, options: { encoding: string; flag?: string; } | string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    function readFile(
+        path: PathLike | number,
+        options: { encoding?: string | null; flag?: string; } | string | undefined | null,
+        callback: (err: NodeJS.ErrnoException, data: string | Buffer) => void,
+    ): void;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     */
+    function readFile(path: PathLike | number, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace readFile {
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param options An object that may contain an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        function __promisify__(path: PathLike | number, options?: { encoding?: null; flag?: string; } | null): Promise<Buffer>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        function __promisify__(path: PathLike | number, options: { encoding: string; flag?: string; } | string): Promise<string>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        function __promisify__(path: PathLike | number, options?: { encoding?: string | null; flag?: string; } | string | null): Promise<string | Buffer>;
+    }
+
+    /**
+     * Synchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options An object that may contain an optional flag. If a flag is not provided, it defaults to `'r'`.
+     */
+    function readFileSync(path: PathLike | number, options?: { encoding?: null; flag?: string; } | null): Buffer;
+
+    /**
+     * Synchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    function readFileSync(path: PathLike | number, options: { encoding: string; flag?: string; } | string): string;
+
+    /**
+     * Synchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    function readFileSync(path: PathLike | number, options?: { encoding?: string | null; flag?: string; } | string | null): string | Buffer;
+
+    type WriteFileOptions = { encoding?: string | null; mode?: number | string; flag?: string; } | string | null;
+
+    /**
+     * Asynchronously writes data to a file, replacing the file if it already exists.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'w'` is used.
+     */
+    function writeFile(path: PathLike | number, data: any, options: WriteFileOptions, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronously writes data to a file, replacing the file if it already exists.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     */
+    function writeFile(path: PathLike | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace writeFile {
+        /**
+         * Asynchronously writes data to a file, replacing the file if it already exists.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+         * If `encoding` is not supplied, the default of `'utf8'` is used.
+         * If `mode` is not supplied, the default of `0o666` is used.
+         * If `mode` is a string, it is parsed as an octal integer.
+         * If `flag` is not supplied, the default of `'w'` is used.
+         */
+        function __promisify__(path: PathLike | number, data: any, options?: WriteFileOptions): Promise<void>;
+    }
+
+    /**
+     * Synchronously writes data to a file, replacing the file if it already exists.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'w'` is used.
+     */
+    function writeFileSync(path: PathLike | number, data: any, options?: WriteFileOptions): void;
+
+    /**
+     * Asynchronously append data to a file, creating the file if it does not exist.
+     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'a'` is used.
+     */
+    function appendFile(file: PathLike | number, data: any, options: WriteFileOptions, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronously append data to a file, creating the file if it does not exist.
+     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     */
+    function appendFile(file: PathLike | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace appendFile {
+        /**
+         * Asynchronously append data to a file, creating the file if it does not exist.
+         * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+         * If `encoding` is not supplied, the default of `'utf8'` is used.
+         * If `mode` is not supplied, the default of `0o666` is used.
+         * If `mode` is a string, it is parsed as an octal integer.
+         * If `flag` is not supplied, the default of `'a'` is used.
+         */
+        function __promisify__(file: PathLike | number, data: any, options?: WriteFileOptions): Promise<void>;
+    }
+
+    /**
+     * Synchronously append data to a file, creating the file if it does not exist.
+     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'a'` is used.
+     */
+    function appendFileSync(file: PathLike | number, data: any, options?: WriteFileOptions): void;
+
+    /**
+     * Watch for changes on `filename`. The callback `listener` will be called each time the file is accessed.
+     */
+    function watchFile(filename: PathLike, options: { persistent?: boolean; interval?: number; } | undefined, listener: (curr: Stats, prev: Stats) => void): void;
+
+    /**
+     * Watch for changes on `filename`. The callback `listener` will be called each time the file is accessed.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function watchFile(filename: PathLike, listener: (curr: Stats, prev: Stats) => void): void;
+
+    /**
+     * Stop watching for changes on `filename`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function unwatchFile(filename: PathLike, listener?: (curr: Stats, prev: Stats) => void): void;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `persistent` is not supplied, the default of `true` is used.
+     * If `recursive` is not supplied, the default of `false` is used.
+     */
+    function watch(
+        filename: PathLike,
+        options: { encoding?: BufferEncoding | null, persistent?: boolean, recursive?: boolean } | BufferEncoding | undefined | null,
+        listener?: (event: string, filename: string) => void,
+    ): FSWatcher;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `persistent` is not supplied, the default of `true` is used.
+     * If `recursive` is not supplied, the default of `false` is used.
+     */
+    function watch(filename: PathLike, options: { encoding: "buffer", persistent?: boolean, recursive?: boolean } | "buffer", listener?: (event: string, filename: Buffer) => void): FSWatcher;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `persistent` is not supplied, the default of `true` is used.
+     * If `recursive` is not supplied, the default of `false` is used.
+     */
+    function watch(
+        filename: PathLike,
+        options: { encoding?: string | null, persistent?: boolean, recursive?: boolean } | string | null,
+        listener?: (event: string, filename: string | Buffer) => void,
+    ): FSWatcher;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function watch(filename: PathLike, listener?: (event: string, filename: string) => any): FSWatcher;
+
+    /**
+     * Asynchronously tests whether or not the given path exists by checking with the file system.
+     * @deprecated
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function exists(path: PathLike, callback: (exists: boolean) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace exists {
+        /**
+         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        function __promisify__(path: PathLike): Promise<boolean>;
+    }
+
+    /**
+     * Synchronously tests whether or not the given path exists by checking with the file system.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function existsSync(path: PathLike): boolean;
+
+    namespace constants {
+        // File Access Constants
+
+        /** Constant for fs.access(). File is visible to the calling process. */
+        const F_OK: number;
+
+        /** Constant for fs.access(). File can be read by the calling process. */
+        const R_OK: number;
+
+        /** Constant for fs.access(). File can be written by the calling process. */
+        const W_OK: number;
+
+        /** Constant for fs.access(). File can be executed by the calling process. */
+        const X_OK: number;
+
+        // File Copy Constants
+
+        /** Constant for fs.copyFile. Flag indicating the destination file should not be overwritten if it already exists. */
+        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.
+         */
+        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.
+         */
+        const COPYFILE_FICLONE_FORCE: number;
+
+        // File Open Constants
+
+        /** Constant for fs.open(). Flag indicating to open a file for read-only access. */
+        const O_RDONLY: number;
+
+        /** Constant for fs.open(). Flag indicating to open a file for write-only access. */
+        const O_WRONLY: number;
+
+        /** Constant for fs.open(). Flag indicating to open a file for read-write access. */
+        const O_RDWR: number;
+
+        /** Constant for fs.open(). Flag indicating to create the file if it does not already exist. */
+        const O_CREAT: number;
+
+        /** Constant for fs.open(). Flag indicating that opening a file should fail if the O_CREAT flag is set and the file already exists. */
+        const O_EXCL: number;
+
+        /**
+         * Constant for fs.open(). Flag indicating that if path identifies a terminal device,
+         * opening the path shall not cause that terminal to become the controlling terminal for the process
+         * (if the process does not already have one).
+         */
+        const O_NOCTTY: number;
+
+        /** Constant for fs.open(). Flag indicating that if the file exists and is a regular file, and the file is opened successfully for write access, its length shall be truncated to zero. */
+        const O_TRUNC: number;
+
+        /** Constant for fs.open(). Flag indicating that data will be appended to the end of the file. */
+        const O_APPEND: number;
+
+        /** Constant for fs.open(). Flag indicating that the open should fail if the path is not a directory. */
+        const O_DIRECTORY: number;
+
+        /**
+         * constant for fs.open().
+         * Flag indicating reading accesses to the file system will no longer result in
+         * an update to the atime information associated with the file.
+         * This flag is available on Linux operating systems only.
+         */
+        const O_NOATIME: number;
+
+        /** Constant for fs.open(). Flag indicating that the open should fail if the path is a symbolic link. */
+        const O_NOFOLLOW: number;
+
+        /** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O. */
+        const O_SYNC: number;
+
+        /** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O with write operations waiting for data integrity. */
+        const O_DSYNC: number;
+
+        /** Constant for fs.open(). Flag indicating to open the symbolic link itself rather than the resource it is pointing to. */
+        const O_SYMLINK: number;
+
+        /** Constant for fs.open(). When set, an attempt will be made to minimize caching effects of file I/O. */
+        const O_DIRECT: number;
+
+        /** Constant for fs.open(). Flag indicating to open the file in nonblocking mode when possible. */
+        const O_NONBLOCK: number;
+
+        // File Type Constants
+
+        /** Constant for fs.Stats mode property for determining a file's type. Bit mask used to extract the file type code. */
+        const S_IFMT: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a regular file. */
+        const S_IFREG: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a directory. */
+        const S_IFDIR: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a character-oriented device file. */
+        const S_IFCHR: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a block-oriented device file. */
+        const S_IFBLK: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a FIFO/pipe. */
+        const S_IFIFO: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a symbolic link. */
+        const S_IFLNK: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a socket. */
+        const S_IFSOCK: number;
+
+        // File Mode Constants
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by owner. */
+        const S_IRWXU: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by owner. */
+        const S_IRUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by owner. */
+        const S_IWUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by owner. */
+        const S_IXUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by group. */
+        const S_IRWXG: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by group. */
+        const S_IRGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by group. */
+        const S_IWGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by group. */
+        const S_IXGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by others. */
+        const S_IRWXO: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by others. */
+        const S_IROTH: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by others. */
+        const S_IWOTH: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by others. */
+        const S_IXOTH: number;
+    }
+
+    /**
+     * Asynchronously tests a user's permissions for the file specified by path.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function access(path: PathLike, mode: number | undefined, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronously tests a user's permissions for the file specified by path.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function access(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace access {
+        /**
+         * Asynchronously tests a user's permissions for the file specified by path.
+         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        function __promisify__(path: PathLike, mode?: number): Promise<void>;
+    }
+
+    /**
+     * Synchronously tests a user's permissions for the file specified by path.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function accessSync(path: PathLike, mode?: number): void;
+
+    /**
+     * Returns a new `ReadStream` object.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function createReadStream(path: PathLike, options?: string | {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+        autoClose?: boolean;
+        start?: number;
+        end?: number;
+        highWaterMark?: number;
+    }): ReadStream;
+
+    /**
+     * Returns a new `WriteStream` object.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function createWriteStream(path: PathLike, options?: string | {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+        autoClose?: boolean;
+        start?: number;
+    }): WriteStream;
+
+    /**
+     * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+     * @param fd A file descriptor.
+     */
+    function fdatasync(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace fdatasync {
+        /**
+         * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+         * @param fd A file descriptor.
+         */
+        function __promisify__(fd: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+     * @param fd A file descriptor.
+     */
+    function fdatasyncSync(fd: number): void;
+
+    /**
+     * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * No arguments other than a possible exception are given to the callback function.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     */
+    function copyFile(src: PathLike, dest: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+    /**
+     * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * No arguments other than a possible exception are given to the callback function.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     * @param flags An integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+     */
+    function copyFile(src: PathLike, dest: PathLike, flags: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace copyFile {
+        /**
+         * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+         * No arguments other than a possible exception are given to the callback function.
+         * Node.js makes no guarantees about the atomicity of the copy operation.
+         * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+         * to remove the destination.
+         * @param src A path to the source file.
+         * @param dest A path to the destination file.
+         * @param flags An optional integer that specifies the behavior of the copy operation.
+         * The only supported flag is fs.constants.COPYFILE_EXCL,
+         * which causes the copy operation to fail if dest already exists.
+         */
+        function __promisify__(src: PathLike, dst: PathLike, flags?: number): Promise<void>;
+    }
+
+    /**
+     * Synchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     * @param flags An optional integer that specifies the behavior of the copy operation.
+     * The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+     */
+    function copyFileSync(src: PathLike, dest: PathLike, flags?: number): void;
+
+    namespace promises {
+        interface FileHandle {
+            /**
+             * Gets the file descriptor for this file handle.
+             */
+            readonly fd: number;
+
+            /**
+             * Asynchronously append data to a file, creating the file if it does not exist. The underlying file will _not_ be closed automatically.
+             * The `FileHandle` must have been opened for appending.
+             * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
+             * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+             * If `encoding` is not supplied, the default of `'utf8'` is used.
+             * If `mode` is not supplied, the default of `0o666` is used.
+             * If `mode` is a string, it is parsed as an octal integer.
+             * If `flag` is not supplied, the default of `'a'` is used.
+             */
+            appendFile(data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
+
+            /**
+             * Asynchronous fchown(2) - Change ownership of a file.
+             */
+            chown(uid: number, gid: number): Promise<void>;
+
+            /**
+             * Asynchronous fchmod(2) - Change permissions of a file.
+             * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+             */
+            chmod(mode: string | number): Promise<void>;
+
+            /**
+             * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+             */
+            datasync(): Promise<void>;
+
+            /**
+             * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+             */
+            sync(): Promise<void>;
+
+            /**
+             * Asynchronously reads data from the file.
+             * The `FileHandle` must have been opened for reading.
+             * @param buffer The buffer that the data will be written to.
+             * @param offset The offset in the buffer at which to start writing.
+             * @param length The number of bytes to read.
+             * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+             */
+            read<TBuffer extends Buffer | Uint8Array>(buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesRead: number, buffer: TBuffer }>;
+
+            /**
+             * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
+             * The `FileHandle` must have been opened for reading.
+             * @param options An object that may contain an optional flag.
+             * If a flag is not provided, it defaults to `'r'`.
+             */
+            readFile(options?: { encoding?: null, flag?: string | number } | null): Promise<Buffer>;
+
+            /**
+             * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
+             * The `FileHandle` must have been opened for reading.
+             * @param options An object that may contain an optional flag.
+             * If a flag is not provided, it defaults to `'r'`.
+             */
+            readFile(options: { encoding: BufferEncoding, flag?: string | number } | BufferEncoding): Promise<string>;
+
+            /**
+             * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
+             * The `FileHandle` must have been opened for reading.
+             * @param options An object that may contain an optional flag.
+             * If a flag is not provided, it defaults to `'r'`.
+             */
+            readFile(options?: { encoding?: string | null, flag?: string | number } | string | null): Promise<string | Buffer>;
+
+            /**
+             * Asynchronous fstat(2) - Get file status.
+             */
+            stat(): Promise<Stats>;
+
+            /**
+             * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+             * @param len If not specified, defaults to `0`.
+             */
+            truncate(len?: number): Promise<void>;
+
+            /**
+             * Asynchronously change file timestamps of the file.
+             * @param atime The last access time. If a string is provided, it will be coerced to number.
+             * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+             */
+            utimes(atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+
+            /**
+             * Asynchronously writes `buffer` to the file.
+             * The `FileHandle` must have been opened for writing.
+             * @param buffer The buffer that the data will be written to.
+             * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+             * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+             * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+             */
+            write<TBuffer extends Buffer | Uint8Array>(buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesWritten: number, buffer: TBuffer }>;
+
+            /**
+             * Asynchronously writes `string` to the file.
+             * The `FileHandle` must have been opened for writing.
+             * It is unsafe to call `write()` multiple times on the same file without waiting for the `Promise`
+             * to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
+             * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+             * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+             * @param encoding The expected string encoding.
+             */
+            write(data: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
+
+            /**
+             * Asynchronously writes data to a file, replacing the file if it already exists. The underlying file will _not_ be closed automatically.
+             * The `FileHandle` must have been opened for writing.
+             * It is unsafe to call `writeFile()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected).
+             * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
+             * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+             * If `encoding` is not supplied, the default of `'utf8'` is used.
+             * If `mode` is not supplied, the default of `0o666` is used.
+             * If `mode` is a string, it is parsed as an octal integer.
+             * If `flag` is not supplied, the default of `'w'` is used.
+             */
+            writeFile(data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
+
+            /**
+             * Asynchronous close(2) - close a `FileHandle`.
+             */
+            close(): Promise<void>;
+        }
+
+        /**
+         * Asynchronously tests a user's permissions for the file specified by path.
+         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        function access(path: PathLike, mode?: number): Promise<void>;
+
+        /**
+         * Asynchronously copies `src` to `dest`. By default, `dest` is overwritten if it already exists.
+         * Node.js makes no guarantees about the atomicity of the copy operation.
+         * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+         * to remove the destination.
+         * @param src A path to the source file.
+         * @param dest A path to the destination file.
+         * @param flags An optional integer that specifies the behavior of the copy operation. The only
+         * supported flag is `fs.constants.COPYFILE_EXCL`, which causes the copy operation to fail if
+         * `dest` already exists.
+         */
+        function copyFile(src: PathLike, dest: PathLike, flags?: number): Promise<void>;
+
+        /**
+         * Asynchronous open(2) - open and possibly create a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not
+         * supplied, defaults to `0o666`.
+         */
+        function open(path: PathLike, flags: string | number, mode?: string | number): Promise<FileHandle>;
+
+        /**
+         * Asynchronously reads data from the file referenced by the supplied `FileHandle`.
+         * @param handle A `FileHandle`.
+         * @param buffer The buffer that the data will be written to.
+         * @param offset The offset in the buffer at which to start writing.
+         * @param length The number of bytes to read.
+         * @param position The offset from the beginning of the file from which data should be read. If
+         * `null`, data will be read from the current position.
+         */
+        function read<TBuffer extends Buffer | Uint8Array>(
+            handle: FileHandle,
+            buffer: TBuffer,
+            offset?: number | null,
+            length?: number | null,
+            position?: number | null,
+        ): Promise<{ bytesRead: number, buffer: TBuffer }>;
+
+        /**
+         * Asynchronously writes `buffer` to the file referenced by the supplied `FileHandle`.
+         * It is unsafe to call `fsPromises.write()` multiple times on the same file without waiting for the `Promise`
+         * to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
+         * @param handle A `FileHandle`.
+         * @param buffer The buffer that the data will be written to.
+         * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+         * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+         */
+        function write<TBuffer extends Buffer | Uint8Array>(
+            handle: FileHandle,
+            buffer: TBuffer,
+            offset?: number | null,
+            length?: number | null, position?: number | null): Promise<{ bytesWritten: number, buffer: TBuffer }>;
+
+        /**
+         * Asynchronously writes `string` to the file referenced by the supplied `FileHandle`.
+         * It is unsafe to call `fsPromises.write()` multiple times on the same file without waiting for the `Promise`
+         * to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
+         * @param handle A `FileHandle`.
+         * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+         * @param encoding The expected string encoding.
+         */
+        function write(handle: FileHandle, string: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
+
+        /**
+         * Asynchronous rename(2) - Change the name or location of a file or directory.
+         * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        function rename(oldPath: PathLike, newPath: PathLike): Promise<void>;
+
+        /**
+         * Asynchronous truncate(2) - Truncate a file to a specified length.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param len If not specified, defaults to `0`.
+         */
+        function truncate(path: PathLike, len?: number): Promise<void>;
+
+        /**
+         * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+         * @param handle A `FileHandle`.
+         * @param len If not specified, defaults to `0`.
+         */
+        function ftruncate(handle: FileHandle, len?: number): Promise<void>;
+
+        /**
+         * Asynchronous rmdir(2) - delete a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function rmdir(path: PathLike): Promise<void>;
+
+        /**
+         * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+         * @param handle A `FileHandle`.
+         */
+        function fdatasync(handle: FileHandle): Promise<void>;
+
+        /**
+         * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+         * @param handle A `FileHandle`.
+         */
+        function fsync(handle: FileHandle): Promise<void>;
+
+        /**
+         * Asynchronous mkdir(2) - create a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options Either the file mode, or an object optionally specifying the file mode and whether parent folders
+         * should be created. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+         */
+        function mkdir(path: PathLike, options?: number | string | MakeDirectoryOptions | null): Promise<void>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readdir(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readdir(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readdir(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string[] | Buffer[]>;
+
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readlink(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readlink(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readlink(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+
+        /**
+         * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+         * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+         * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+         * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+         * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+         */
+        function symlink(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
+
+        /**
+         * Asynchronous fstat(2) - Get file status.
+         * @param handle A `FileHandle`.
+         */
+        function fstat(handle: FileHandle): Promise<Stats>;
+
+        /**
+         * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function lstat(path: PathLike): Promise<Stats>;
+
+        /**
+         * Asynchronous stat(2) - Get file status.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function stat(path: PathLike): Promise<Stats>;
+
+        /**
+         * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+         * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function link(existingPath: PathLike, newPath: PathLike): Promise<void>;
+
+        /**
+         * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function unlink(path: PathLike): Promise<void>;
+
+        /**
+         * Asynchronous fchmod(2) - Change permissions of a file.
+         * @param handle A `FileHandle`.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        function fchmod(handle: FileHandle, mode: string | number): Promise<void>;
+
+        /**
+         * Asynchronous chmod(2) - Change permissions of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        function chmod(path: PathLike, mode: string | number): Promise<void>;
+
+        /**
+         * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        function lchmod(path: PathLike, mode: string | number): Promise<void>;
+
+        /**
+         * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function lchown(path: PathLike, uid: number, gid: number): Promise<void>;
+
+        /**
+         * Asynchronous fchown(2) - Change ownership of a file.
+         * @param handle A `FileHandle`.
+         */
+        function fchown(handle: FileHandle, uid: number, gid: number): Promise<void>;
+
+        /**
+         * Asynchronous chown(2) - Change ownership of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function chown(path: PathLike, uid: number, gid: number): Promise<void>;
+
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied path.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        function utimes(path: PathLike, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied `FileHandle`.
+         * @param handle A `FileHandle`.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        function futimes(handle: FileHandle, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function realpath(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function realpath(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function realpath(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function mkdtemp(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function mkdtemp(prefix: string, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function mkdtemp(prefix: string, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+
+        /**
+         * Asynchronously writes data to a file, replacing the file if it already exists.
+         * It is unsafe to call `fsPromises.writeFile()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected).
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
+         * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+         * If `encoding` is not supplied, the default of `'utf8'` is used.
+         * If `mode` is not supplied, the default of `0o666` is used.
+         * If `mode` is a string, it is parsed as an octal integer.
+         * If `flag` is not supplied, the default of `'w'` is used.
+         */
+        function writeFile(path: PathLike | FileHandle, data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
+
+        /**
+         * Asynchronously append data to a file, creating the file if it does not exist.
+         * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
+         * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+         * If `encoding` is not supplied, the default of `'utf8'` is used.
+         * If `mode` is not supplied, the default of `0o666` is used.
+         * If `mode` is a string, it is parsed as an octal integer.
+         * If `flag` is not supplied, the default of `'a'` is used.
+         */
+        function appendFile(path: PathLike | FileHandle, data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
+         * @param options An object that may contain an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        function readFile(path: PathLike | FileHandle, options?: { encoding?: null, flag?: string | number } | null): Promise<Buffer>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
+         * @param options An object that may contain an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        function readFile(path: PathLike | FileHandle, options: { encoding: BufferEncoding, flag?: string | number } | BufferEncoding): Promise<string>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
+         * @param options An object that may contain an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        function readFile(path: PathLike | FileHandle, options?: { encoding?: string | null, flag?: string | number } | string | null): Promise<string | Buffer>;
+    }
+}
diff --git a/types/node/globals.d.ts b/types/node/globals.d.ts
new file mode 100644
index 0000000000..cd7d67bbdf
--- /dev/null
+++ b/types/node/globals.d.ts
@@ -0,0 +1,1028 @@
+// This needs to be global to avoid TS2403 in case lib.dom.d.ts is present in the same build
+interface Console {
+    Console: NodeJS.ConsoleConstructor;
+    /**
+     * A simple assertion test that verifies whether `value` is truthy.
+     * If it is not, an `AssertionError` is thrown.
+     * If provided, the error `message` is formatted using `util.format()` and used as the error message.
+     */
+    assert(value: any, message?: string, ...optionalParams: any[]): void;
+    /**
+     * When `stdout` is a TTY, calling `console.clear()` will attempt to clear the TTY.
+     * When `stdout` is not a TTY, this method does nothing.
+     */
+    clear(): void;
+    /**
+     * Maintains an internal counter specific to `label` and outputs to `stdout` the number of times `console.count()` has been called with the given `label`.
+     */
+    count(label?: string): void;
+    /**
+     * Resets the internal counter specific to `label`.
+     */
+    countReset(label?: string): void;
+    /**
+     * The `console.debug()` function is an alias for {@link console.log()}.
+     */
+    debug(message?: any, ...optionalParams: any[]): void;
+    /**
+     * Uses {@link util.inspect()} on `obj` and prints the resulting string to `stdout`.
+     * This function bypasses any custom `inspect()` function defined on `obj`.
+     */
+    dir(obj: any, options?: NodeJS.InspectOptions): void;
+    /**
+     * This method calls {@link console.log()} passing it the arguments received. Please note that this method does not produce any XML formatting
+     */
+    dirxml(...data: any[]): void;
+    /**
+     * Prints to `stderr` with newline.
+     */
+    error(message?: any, ...optionalParams: any[]): void;
+    /**
+     * Increases indentation of subsequent lines by two spaces.
+     * If one or more `label`s are provided, those are printed first without the additional indentation.
+     */
+    group(...label: any[]): void;
+    /**
+     * The `console.groupCollapsed()` function is an alias for {@link console.group()}.
+     */
+    groupCollapsed(): void;
+    /**
+     * Decreases indentation of subsequent lines by two spaces.
+     */
+    groupEnd(): void;
+    /**
+     * The {@link console.info()} function is an alias for {@link console.log()}.
+     */
+    info(message?: any, ...optionalParams: any[]): void;
+    /**
+     * Prints to `stdout` with newline.
+     */
+    log(message?: any, ...optionalParams: any[]): void;
+    /**
+     * This method does not display anything unless used in the inspector.
+     *  Prints to `stdout` the array `array` formatted as a table.
+     */
+    table(tabularData: any, properties?: string[]): void;
+    /**
+     * Starts a timer that can be used to compute the duration of an operation. Timers are identified by a unique `label`.
+     */
+    time(label?: string): void;
+    /**
+     * Stops a timer that was previously started by calling {@link console.time()} and prints the result to `stdout`.
+     */
+    timeEnd(label?: string): void;
+    /**
+     * For a timer that was previously started by calling {@link console.time()}, prints the elapsed time and other `data` arguments to `stdout`.
+     */
+    timeLog(label?: string, ...data: any[]): void;
+    /**
+     * Prints to `stderr` the string 'Trace :', followed by the {@link util.format()} formatted message and stack trace to the current position in the code.
+     */
+    trace(message?: any, ...optionalParams: any[]): void;
+    /**
+     * The {@link console.warn()} function is an alias for {@link console.error()}.
+     */
+    warn(message?: any, ...optionalParams: any[]): void;
+
+    // --- Inspector mode only ---
+    /**
+     * This method does not display anything unless used in the inspector.
+     *  The console.markTimeline() method is the deprecated form of console.timeStamp().
+     *
+     * @deprecated Use console.timeStamp() instead.
+     */
+    markTimeline(label?: string): void;
+    /**
+     * This method does not display anything unless used in the inspector.
+     *  Starts a JavaScript CPU profile with an optional label.
+     */
+    profile(label?: string): void;
+    /**
+     * This method does not display anything unless used in the inspector.
+     *  Stops the current JavaScript CPU profiling session if one has been started and prints the report to the Profiles panel of the inspector.
+     */
+    profileEnd(label?: string): void;
+    /**
+     * This method does not display anything unless used in the inspector.
+     *  Adds an event with the label `label` to the Timeline panel of the inspector.
+     */
+    timeStamp(label?: string): void;
+    /**
+     * This method does not display anything unless used in the inspector.
+     *  The console.timeline() method is the deprecated form of console.time().
+     *
+     * @deprecated Use console.time() instead.
+     */
+    timeline(label?: string): void;
+    /**
+     * This method does not display anything unless used in the inspector.
+     *  The console.timelineEnd() method is the deprecated form of console.timeEnd().
+     *
+     * @deprecated Use console.timeEnd() instead.
+     */
+    timelineEnd(label?: string): void;
+}
+
+interface Error {
+    stack?: string;
+}
+
+// Declare "static" methods in Error
+interface ErrorConstructor {
+    /** Create .stack property on a target object */
+    captureStackTrace(targetObject: Object, constructorOpt?: Function): void;
+
+    /**
+     * Optional override for formatting stack traces
+     *
+     * @see https://github.com/v8/v8/wiki/Stack%20Trace%20API#customizing-stack-traces
+     */
+    prepareStackTrace?: (err: Error, stackTraces: NodeJS.CallSite[]) => any;
+
+    stackTraceLimit: number;
+}
+
+interface SymbolConstructor {
+    readonly observable: symbol;
+}
+
+// Node.js ESNEXT support
+interface String {
+    /** Removes whitespace from the left end of a string. */
+    trimLeft(): string;
+    /** Removes whitespace from the right end of a string. */
+    trimRight(): string;
+}
+
+/*-----------------------------------------------*
+ *                                               *
+ *                   GLOBAL                      *
+ *                                               *
+ ------------------------------------------------*/
+declare var process: NodeJS.Process;
+declare var global: NodeJS.Global;
+declare var console: Console;
+
+declare var __filename: string;
+declare var __dirname: string;
+
+declare function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
+declare namespace setTimeout {
+    function __promisify__(ms: number): Promise<void>;
+    function __promisify__<T>(ms: number, value: T): Promise<T>;
+}
+declare function clearTimeout(timeoutId: NodeJS.Timeout): void;
+declare function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
+declare function clearInterval(intervalId: NodeJS.Timeout): void;
+declare function setImmediate(callback: (...args: any[]) => void, ...args: any[]): NodeJS.Immediate;
+declare namespace setImmediate {
+    function __promisify__(): Promise<void>;
+    function __promisify__<T>(value: T): Promise<T>;
+}
+declare function clearImmediate(immediateId: NodeJS.Immediate): void;
+
+/**
+ * @experimental
+ */
+declare function queueMicrotask(callback: () => void): void;
+
+// TODO: change to `type NodeRequireFunction = (id: string) => any;` in next mayor version.
+interface NodeRequireFunction {
+    /* tslint:disable-next-line:callable-types */
+    (id: string): any;
+}
+
+interface NodeRequire extends NodeRequireFunction {
+    resolve: RequireResolve;
+    cache: any;
+    /**
+     * @deprecated
+     */
+    extensions: NodeExtensions;
+    main: NodeModule | undefined;
+}
+
+interface RequireResolve {
+    (id: string, options?: { paths?: string[]; }): string;
+    paths(request: string): string[] | null;
+}
+
+interface NodeExtensions {
+    '.js': (m: NodeModule, filename: string) => any;
+    '.json': (m: NodeModule, filename: string) => any;
+    '.node': (m: NodeModule, filename: string) => any;
+    [ext: string]: (m: NodeModule, filename: string) => any;
+}
+
+declare var require: NodeRequire;
+
+interface NodeModule {
+    exports: any;
+    require: NodeRequireFunction;
+    id: string;
+    filename: string;
+    loaded: boolean;
+    parent: NodeModule | null;
+    children: NodeModule[];
+    paths: string[];
+}
+
+declare var module: NodeModule;
+
+// Same as module.exports
+declare var exports: any;
+
+// Buffer class
+type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "base64" | "latin1" | "binary" | "hex";
+interface Buffer extends Uint8Array {
+    constructor: typeof Buffer;
+    write(string: string, encoding?: string): number;
+    write(string: string, offset: number, encoding?: string): number;
+    write(string: string, offset: number, length: number, encoding?: string): number;
+    toString(encoding?: string, start?: number, end?: number): string;
+    toJSON(): { type: 'Buffer', data: number[] };
+    equals(otherBuffer: Uint8Array): boolean;
+    compare(otherBuffer: Uint8Array, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
+    copy(targetBuffer: Uint8Array, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
+    slice(start?: number, end?: number): Buffer;
+    writeUIntLE(value: number, offset: number, byteLength: number): number;
+    writeUIntBE(value: number, offset: number, byteLength: number): number;
+    writeIntLE(value: number, offset: number, byteLength: number): number;
+    writeIntBE(value: number, offset: number, byteLength: number): number;
+    readUIntLE(offset: number, byteLength: number): number;
+    readUIntBE(offset: number, byteLength: number): number;
+    readIntLE(offset: number, byteLength: number): number;
+    readIntBE(offset: number, byteLength: number): number;
+    readUInt8(offset: number): number;
+    readUInt16LE(offset: number): number;
+    readUInt16BE(offset: number): number;
+    readUInt32LE(offset: number): number;
+    readUInt32BE(offset: number): number;
+    readInt8(offset: number): number;
+    readInt16LE(offset: number): number;
+    readInt16BE(offset: number): number;
+    readInt32LE(offset: number): number;
+    readInt32BE(offset: number): number;
+    readFloatLE(offset: number): number;
+    readFloatBE(offset: number): number;
+    readDoubleLE(offset: number): number;
+    readDoubleBE(offset: number): number;
+    swap16(): Buffer;
+    swap32(): Buffer;
+    swap64(): Buffer;
+    writeUInt8(value: number, offset: number): number;
+    writeUInt16LE(value: number, offset: number): number;
+    writeUInt16BE(value: number, offset: number): number;
+    writeUInt32LE(value: number, offset: number): number;
+    writeUInt32BE(value: number, offset: number): number;
+    writeInt8(value: number, offset: number): number;
+    writeInt16LE(value: number, offset: number): number;
+    writeInt16BE(value: number, offset: number): number;
+    writeInt32LE(value: number, offset: number): number;
+    writeInt32BE(value: number, offset: number): number;
+    writeFloatLE(value: number, offset: number): number;
+    writeFloatBE(value: number, offset: number): number;
+    writeDoubleLE(value: number, offset: number): number;
+    writeDoubleBE(value: number, offset: number): number;
+    fill(value: any, offset?: number, end?: number): this;
+    indexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
+    lastIndexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
+    entries(): IterableIterator<[number, number]>;
+    includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
+    keys(): IterableIterator<number>;
+    values(): IterableIterator<number>;
+}
+
+/**
+ * Raw data is stored in instances of the Buffer class.
+ * A Buffer is similar to an array of integers but corresponds to a raw memory allocation outside the V8 heap.  A Buffer cannot be resized.
+ * Valid string encodings: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
+ */
+declare const Buffer: {
+    /**
+     * Allocates a new buffer containing the given {str}.
+     *
+     * @param str String to store in buffer.
+     * @param encoding encoding to use, optional.  Default is 'utf8'
+     * @deprecated since v10.0.0 - Use `Buffer.from(string[, encoding])` instead.
+     */
+    new(str: string, encoding?: string): Buffer;
+    /**
+     * Allocates a new buffer of {size} octets.
+     *
+     * @param size count of octets to allocate.
+     * @deprecated since v10.0.0 - Use `Buffer.alloc()` instead (also see `Buffer.allocUnsafe()`).
+     */
+    new(size: number): Buffer;
+    /**
+     * Allocates a new buffer containing the given {array} of octets.
+     *
+     * @param array The octets to store.
+     * @deprecated since v10.0.0 - Use `Buffer.from(array)` instead.
+     */
+    new(array: Uint8Array): Buffer;
+    /**
+     * Produces a Buffer backed by the same allocated memory as
+     * 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 | SharedArrayBuffer): Buffer;
+    /**
+     * Allocates a new buffer containing the given {array} of octets.
+     *
+     * @param array The octets to store.
+     * @deprecated since v10.0.0 - Use `Buffer.from(array)` instead.
+     */
+    new(array: any[]): Buffer;
+    /**
+     * Copies the passed {buffer} data onto a new {Buffer} instance.
+     *
+     * @param buffer The buffer to copy.
+     * @deprecated since v10.0.0 - Use `Buffer.from(buffer)` instead.
+     */
+    new(buffer: Buffer): Buffer;
+    prototype: Buffer;
+    /**
+     * When passed a reference to the .buffer property of a TypedArray instance,
+     * the newly created Buffer will share the same allocated memory as the TypedArray.
+     * The optional {byteOffset} and {length} arguments specify a memory range
+     * within the {arrayBuffer} that will be shared by the Buffer.
+     *
+     * @param arrayBuffer The .buffer property of any TypedArray or a new ArrayBuffer()
+     */
+    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[]): 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
+     *
+     * @param obj object to test.
+     */
+    isBuffer(obj: any): obj is Buffer;
+    /**
+     * Returns true if {encoding} is a valid encoding argument.
+     * Valid string encodings in Node 0.12: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
+     *
+     * @param encoding string to test.
+     */
+    isEncoding(encoding: string): boolean | undefined;
+    /**
+     * Gives the actual byte length of a string. encoding defaults to 'utf8'.
+     * This is not the same as String.prototype.length since that returns the number of characters in a string.
+     *
+     * @param string string to test.
+     * @param encoding encoding used to evaluate (defaults to 'utf8')
+     */
+    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.
+     *
+     * If the list has no items, or if the totalLength is 0, then it returns a zero-length buffer.
+     * If the list has exactly one item, then the first item of the list is returned.
+     * If the list has more than one item, then a new Buffer is created.
+     *
+     * @param list An array of Buffer objects to concatenate
+     * @param totalLength Total length of the buffers when concatenated.
+     *   If totalLength is not provided, it is read from the buffers in the list. However, this adds an additional loop to the function, so it is faster to provide the length explicitly.
+     */
+    concat(list: Uint8Array[], totalLength?: number): Buffer;
+    /**
+     * The same as buf1.compare(buf2).
+     */
+    compare(buf1: Uint8Array, buf2: Uint8Array): number;
+    /**
+     * Allocates a new buffer of {size} octets.
+     *
+     * @param size count of octets to allocate.
+     * @param fill if specified, buffer will be initialized by calling buf.fill(fill).
+     *    If parameter is omitted, buffer will be filled with zeros.
+     * @param encoding encoding used for call to buf.fill while initalizing
+     */
+    alloc(size: number, fill?: string | Buffer | number, encoding?: string): Buffer;
+    /**
+     * Allocates a new buffer of {size} octets, leaving memory not initialized, so the contents
+     * of the newly created Buffer are unknown and may contain sensitive data.
+     *
+     * @param size count of octets to allocate
+     */
+    allocUnsafe(size: number): Buffer;
+    /**
+     * Allocates a new non-pooled buffer of {size} octets, leaving memory not initialized, so the contents
+     * of the newly created Buffer are unknown and may contain sensitive data.
+     *
+     * @param size count of octets to allocate
+     */
+    allocUnsafeSlow(size: number): Buffer;
+    /**
+     * This is the number of bytes used to determine the size of pre-allocated, internal Buffer instances used for pooling. This value may be modified.
+     */
+    poolSize: number;
+};
+
+/*----------------------------------------------*
+*                                               *
+*               GLOBAL INTERFACES               *
+*                                               *
+*-----------------------------------------------*/
+declare namespace NodeJS {
+    interface InspectOptions {
+        /**
+         * If set to `true`, getters are going to be
+         * inspected as well. If set to `'get'` only getters without setter are going
+         * to be inspected. If set to `'set'` only getters having a corresponding
+         * setter are going to be inspected. This might cause side effects depending on
+         * the getter function.
+         * @default `false`
+         */
+        getters?: 'get' | 'set' | boolean;
+        showHidden?: boolean;
+        /**
+         * @default 2
+         */
+        depth?: number | null;
+        colors?: boolean;
+        customInspect?: boolean;
+        showProxy?: boolean;
+        maxArrayLength?: number | null;
+        breakLength?: number;
+        compact?: boolean;
+        sorted?: boolean | ((a: string, b: string) => number);
+    }
+
+    interface ConsoleConstructorOptions {
+        stdout: WritableStream;
+        stderr?: WritableStream;
+        ignoreErrors?: boolean;
+        colorMode?: boolean | 'auto';
+        inspectOptions?: InspectOptions;
+    }
+
+    interface ConsoleConstructor {
+        prototype: Console;
+        new(stdout: WritableStream, stderr?: WritableStream, ignoreErrors?: boolean): Console;
+        new(options: ConsoleConstructorOptions): Console;
+    }
+
+    interface CallSite {
+        /**
+         * Value of "this"
+         */
+        getThis(): any;
+
+        /**
+         * Type of "this" as a string.
+         * This is the name of the function stored in the constructor field of
+         * "this", if available.  Otherwise the object's [[Class]] internal
+         * property.
+         */
+        getTypeName(): string | null;
+
+        /**
+         * Current function
+         */
+        getFunction(): Function | undefined;
+
+        /**
+         * Name of the current function, typically its name property.
+         * If a name property is not available an attempt will be made to try
+         * to infer a name from the function's context.
+         */
+        getFunctionName(): string | null;
+
+        /**
+         * Name of the property [of "this" or one of its prototypes] that holds
+         * the current function
+         */
+        getMethodName(): string | null;
+
+        /**
+         * Name of the script [if this function was defined in a script]
+         */
+        getFileName(): string | null;
+
+        /**
+         * Current line number [if this function was defined in a script]
+         */
+        getLineNumber(): number | null;
+
+        /**
+         * Current column number [if this function was defined in a script]
+         */
+        getColumnNumber(): number | null;
+
+        /**
+         * A call site object representing the location where eval was called
+         * [if this function was created using a call to eval]
+         */
+        getEvalOrigin(): string | undefined;
+
+        /**
+         * Is this a toplevel invocation, that is, is "this" the global object?
+         */
+        isToplevel(): boolean;
+
+        /**
+         * Does this call take place in code defined by a call to eval?
+         */
+        isEval(): boolean;
+
+        /**
+         * Is this call in native V8 code?
+         */
+        isNative(): boolean;
+
+        /**
+         * Is this a constructor call?
+         */
+        isConstructor(): boolean;
+    }
+
+    interface ErrnoException extends Error {
+        errno?: number;
+        code?: string;
+        path?: string;
+        syscall?: string;
+        stack?: string;
+    }
+
+    class EventEmitter {
+        addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        on(event: string | symbol, listener: (...args: any[]) => void): this;
+        once(event: string | symbol, listener: (...args: any[]) => void): this;
+        removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        off(event: string | symbol, listener: (...args: any[]) => void): this;
+        removeAllListeners(event?: string | symbol): this;
+        setMaxListeners(n: number): this;
+        getMaxListeners(): number;
+        listeners(event: string | symbol): Function[];
+        rawListeners(event: string | symbol): Function[];
+        emit(event: string | symbol, ...args: any[]): boolean;
+        listenerCount(type: string | symbol): number;
+        // Added in Node 6...
+        prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        eventNames(): Array<string | symbol>;
+    }
+
+    interface ReadableStream extends EventEmitter {
+        readable: boolean;
+        read(size?: number): string | Buffer;
+        setEncoding(encoding: string): this;
+        pause(): this;
+        resume(): this;
+        isPaused(): boolean;
+        pipe<T extends WritableStream>(destination: T, options?: { end?: boolean; }): T;
+        unpipe(destination?: WritableStream): this;
+        unshift(chunk: string): void;
+        unshift(chunk: Buffer): void;
+        wrap(oldStream: ReadableStream): this;
+        [Symbol.asyncIterator](): AsyncIterableIterator<string | Buffer>;
+    }
+
+    interface WritableStream extends EventEmitter {
+        writable: boolean;
+        write(buffer: Buffer | string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        end(cb?: Function): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+    }
+
+    interface ReadWriteStream extends ReadableStream, WritableStream { }
+
+    interface Events extends EventEmitter { }
+
+    interface Domain extends Events {
+        run(fn: Function): void;
+        add(emitter: Events): void;
+        remove(emitter: Events): void;
+        bind(cb: (err: Error, data: any) => any): any;
+        intercept(cb: (data: any) => any): any;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        removeListener(event: string, listener: (...args: any[]) => void): this;
+        removeAllListeners(event?: string): this;
+    }
+
+    interface MemoryUsage {
+        rss: number;
+        heapTotal: number;
+        heapUsed: number;
+        external: number;
+    }
+
+    interface CpuUsage {
+        user: number;
+        system: number;
+    }
+
+    interface ProcessRelease {
+        name: string;
+        sourceUrl?: string;
+        headersUrl?: string;
+        libUrl?: string;
+        lts?: string;
+    }
+
+    interface ProcessVersions {
+        http_parser: string;
+        node: string;
+        v8: string;
+        ares: string;
+        uv: string;
+        zlib: string;
+        modules: string;
+        openssl: string;
+    }
+
+    type Platform = 'aix'
+        | 'android'
+        | 'darwin'
+        | 'freebsd'
+        | 'linux'
+        | 'openbsd'
+        | 'sunos'
+        | 'win32'
+        | 'cygwin';
+
+    type Signals =
+        "SIGABRT" | "SIGALRM" | "SIGBUS" | "SIGCHLD" | "SIGCONT" | "SIGFPE" | "SIGHUP" | "SIGILL" | "SIGINT" | "SIGIO" |
+        "SIGIOT" | "SIGKILL" | "SIGPIPE" | "SIGPOLL" | "SIGPROF" | "SIGPWR" | "SIGQUIT" | "SIGSEGV" | "SIGSTKFLT" |
+        "SIGSTOP" | "SIGSYS" | "SIGTERM" | "SIGTRAP" | "SIGTSTP" | "SIGTTIN" | "SIGTTOU" | "SIGUNUSED" | "SIGURG" |
+        "SIGUSR1" | "SIGUSR2" | "SIGVTALRM" | "SIGWINCH" | "SIGXCPU" | "SIGXFSZ" | "SIGBREAK" | "SIGLOST" | "SIGINFO";
+
+    type MultipleResolveType = 'resolve' | 'reject';
+
+    type BeforeExitListener = (code: number) => void;
+    type DisconnectListener = () => void;
+    type ExitListener = (code: number) => void;
+    type RejectionHandledListener = (promise: Promise<any>) => void;
+    type UncaughtExceptionListener = (error: Error) => void;
+    type UnhandledRejectionListener = (reason: any, promise: Promise<any>) => void;
+    type WarningListener = (warning: Error) => void;
+    type MessageListener = (message: any, sendHandle: any) => void;
+    type SignalsListener = (signal: Signals) => void;
+    type NewListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
+    type RemoveListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
+    type MultipleResolveListener = (type: MultipleResolveType, promise: Promise<any>, value: any) => void;
+
+    interface Socket extends ReadWriteStream {
+        isTTY?: true;
+    }
+
+    interface ProcessEnv {
+        [key: string]: string | undefined;
+    }
+
+    interface WriteStream extends Socket {
+        readonly writableHighWaterMark: number;
+        readonly writableLength: number;
+        columns?: number;
+        rows?: number;
+        _write(chunk: any, encoding: string, callback: Function): void;
+        _destroy(err: Error | null, callback: Function): void;
+        _final(callback: Function): void;
+        setDefaultEncoding(encoding: string): this;
+        cork(): void;
+        uncork(): void;
+        destroy(error?: Error): void;
+    }
+    interface ReadStream extends Socket {
+        readonly readableHighWaterMark: number;
+        readonly readableLength: number;
+        isRaw?: boolean;
+        setRawMode?(mode: boolean): void;
+        _read(size: number): void;
+        _destroy(err: Error | null, callback: Function): void;
+        push(chunk: any, encoding?: string): boolean;
+        destroy(error?: Error): void;
+    }
+
+    interface Process extends EventEmitter {
+        /**
+         * Can also be a tty.WriteStream, not typed due to limitation.s
+         */
+        stdout: WriteStream;
+        /**
+         * Can also be a tty.WriteStream, not typed due to limitation.s
+         */
+        stderr: WriteStream;
+        stdin: ReadStream;
+        openStdin(): Socket;
+        argv: string[];
+        argv0: string;
+        execArgv: string[];
+        execPath: string;
+        abort(): void;
+        chdir(directory: string): void;
+        cwd(): string;
+        debugPort: number;
+        emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
+        env: ProcessEnv;
+        exit(code?: number): never;
+        exitCode: number;
+        getgid(): number;
+        setgid(id: number | string): void;
+        getuid(): number;
+        setuid(id: number | string): void;
+        geteuid(): number;
+        seteuid(id: number | string): void;
+        getegid(): number;
+        setegid(id: number | string): void;
+        getgroups(): number[];
+        setgroups(groups: Array<string | number>): void;
+        setUncaughtExceptionCaptureCallback(cb: ((err: Error) => void) | null): void;
+        hasUncaughtExceptionCaptureCallback(): boolean;
+        version: string;
+        versions: ProcessVersions;
+        config: {
+            target_defaults: {
+                cflags: any[];
+                default_configuration: string;
+                defines: string[];
+                include_dirs: string[];
+                libraries: string[];
+            };
+            variables: {
+                clang: number;
+                host_arch: string;
+                node_install_npm: boolean;
+                node_install_waf: boolean;
+                node_prefix: string;
+                node_shared_openssl: boolean;
+                node_shared_v8: boolean;
+                node_shared_zlib: boolean;
+                node_use_dtrace: boolean;
+                node_use_etw: boolean;
+                node_use_openssl: boolean;
+                target_arch: string;
+                v8_no_strict_aliasing: number;
+                v8_use_snapshot: boolean;
+                visibility: string;
+            };
+        };
+        kill(pid: number, signal?: string | number): void;
+        pid: number;
+        ppid: number;
+        title: string;
+        arch: string;
+        platform: Platform;
+        mainModule?: NodeModule;
+        memoryUsage(): MemoryUsage;
+        cpuUsage(previousValue?: CpuUsage): CpuUsage;
+        nextTick(callback: Function, ...args: any[]): void;
+        release: ProcessRelease;
+        /**
+         * Can only be set if not in worker thread.
+         */
+        umask(mask?: number): number;
+        uptime(): number;
+        hrtime(time?: [number, number]): [number, number];
+        domain: Domain;
+
+        // Worker
+        send?(message: any, sendHandle?: any): void;
+        disconnect(): void;
+        connected: boolean;
+
+        /**
+         * The `process.allowedNodeEnvironmentFlags` property is a special,
+         * read-only `Set` of flags allowable within the [`NODE_OPTIONS`][]
+         * environment variable.
+         */
+        allowedNodeEnvironmentFlags: ReadonlySet<string>;
+
+        /**
+         * EventEmitter
+         *   1. beforeExit
+         *   2. disconnect
+         *   3. exit
+         *   4. message
+         *   5. rejectionHandled
+         *   6. uncaughtException
+         *   7. unhandledRejection
+         *   8. warning
+         *   9. message
+         *  10. <All OS Signals>
+         *  11. newListener/removeListener inherited from EventEmitter
+         */
+        addListener(event: "beforeExit", listener: BeforeExitListener): this;
+        addListener(event: "disconnect", listener: DisconnectListener): this;
+        addListener(event: "exit", listener: ExitListener): this;
+        addListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        addListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        addListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        addListener(event: "warning", listener: WarningListener): this;
+        addListener(event: "message", listener: MessageListener): this;
+        addListener(event: Signals, listener: SignalsListener): this;
+        addListener(event: "newListener", listener: NewListenerListener): this;
+        addListener(event: "removeListener", listener: RemoveListenerListener): this;
+        addListener(event: "multipleResolves", listener: MultipleResolveListener): this;
+
+        emit(event: "beforeExit", code: number): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "exit", code: number): boolean;
+        emit(event: "rejectionHandled", promise: Promise<any>): boolean;
+        emit(event: "uncaughtException", error: Error): boolean;
+        emit(event: "unhandledRejection", reason: any, promise: Promise<any>): boolean;
+        emit(event: "warning", warning: Error): boolean;
+        emit(event: "message", message: any, sendHandle: any): this;
+        emit(event: Signals, signal: Signals): boolean;
+        emit(event: "newListener", eventName: string | symbol, listener: (...args: any[]) => void): this;
+        emit(event: "removeListener", eventName: string, listener: (...args: any[]) => void): this;
+        emit(event: "multipleResolves", listener: MultipleResolveListener): this;
+
+        on(event: "beforeExit", listener: BeforeExitListener): this;
+        on(event: "disconnect", listener: DisconnectListener): this;
+        on(event: "exit", listener: ExitListener): this;
+        on(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        on(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        on(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        on(event: "warning", listener: WarningListener): this;
+        on(event: "message", listener: MessageListener): this;
+        on(event: Signals, listener: SignalsListener): this;
+        on(event: "newListener", listener: NewListenerListener): this;
+        on(event: "removeListener", listener: RemoveListenerListener): this;
+        on(event: "multipleResolves", listener: MultipleResolveListener): this;
+
+        once(event: "beforeExit", listener: BeforeExitListener): this;
+        once(event: "disconnect", listener: DisconnectListener): this;
+        once(event: "exit", listener: ExitListener): this;
+        once(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        once(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        once(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        once(event: "warning", listener: WarningListener): this;
+        once(event: "message", listener: MessageListener): this;
+        once(event: Signals, listener: SignalsListener): this;
+        once(event: "newListener", listener: NewListenerListener): this;
+        once(event: "removeListener", listener: RemoveListenerListener): this;
+        once(event: "multipleResolves", listener: MultipleResolveListener): this;
+
+        prependListener(event: "beforeExit", listener: BeforeExitListener): this;
+        prependListener(event: "disconnect", listener: DisconnectListener): this;
+        prependListener(event: "exit", listener: ExitListener): this;
+        prependListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        prependListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        prependListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        prependListener(event: "warning", listener: WarningListener): this;
+        prependListener(event: "message", listener: MessageListener): this;
+        prependListener(event: Signals, listener: SignalsListener): this;
+        prependListener(event: "newListener", listener: NewListenerListener): this;
+        prependListener(event: "removeListener", listener: RemoveListenerListener): this;
+        prependListener(event: "multipleResolves", listener: MultipleResolveListener): this;
+
+        prependOnceListener(event: "beforeExit", listener: BeforeExitListener): this;
+        prependOnceListener(event: "disconnect", listener: DisconnectListener): this;
+        prependOnceListener(event: "exit", listener: ExitListener): this;
+        prependOnceListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        prependOnceListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        prependOnceListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        prependOnceListener(event: "warning", listener: WarningListener): this;
+        prependOnceListener(event: "message", listener: MessageListener): this;
+        prependOnceListener(event: Signals, listener: SignalsListener): this;
+        prependOnceListener(event: "newListener", listener: NewListenerListener): this;
+        prependOnceListener(event: "removeListener", listener: RemoveListenerListener): this;
+        prependOnceListener(event: "multipleResolves", listener: MultipleResolveListener): this;
+
+        listeners(event: "beforeExit"): BeforeExitListener[];
+        listeners(event: "disconnect"): DisconnectListener[];
+        listeners(event: "exit"): ExitListener[];
+        listeners(event: "rejectionHandled"): RejectionHandledListener[];
+        listeners(event: "uncaughtException"): UncaughtExceptionListener[];
+        listeners(event: "unhandledRejection"): UnhandledRejectionListener[];
+        listeners(event: "warning"): WarningListener[];
+        listeners(event: "message"): MessageListener[];
+        listeners(event: Signals): SignalsListener[];
+        listeners(event: "newListener"): NewListenerListener[];
+        listeners(event: "removeListener"): RemoveListenerListener[];
+        listeners(event: "multipleResolves"): MultipleResolveListener[];
+    }
+
+    interface Global {
+        Array: typeof Array;
+        ArrayBuffer: typeof ArrayBuffer;
+        Boolean: typeof Boolean;
+        Buffer: typeof Buffer;
+        DataView: typeof DataView;
+        Date: typeof Date;
+        Error: typeof Error;
+        EvalError: typeof EvalError;
+        Float32Array: typeof Float32Array;
+        Float64Array: typeof Float64Array;
+        Function: typeof Function;
+        GLOBAL: Global;
+        Infinity: typeof Infinity;
+        Int16Array: typeof Int16Array;
+        Int32Array: typeof Int32Array;
+        Int8Array: typeof Int8Array;
+        Intl: typeof Intl;
+        JSON: typeof JSON;
+        Map: MapConstructor;
+        Math: typeof Math;
+        NaN: typeof NaN;
+        Number: typeof Number;
+        Object: typeof Object;
+        Promise: Function;
+        RangeError: typeof RangeError;
+        ReferenceError: typeof ReferenceError;
+        RegExp: typeof RegExp;
+        Set: SetConstructor;
+        String: typeof String;
+        Symbol: Function;
+        SyntaxError: typeof SyntaxError;
+        TypeError: typeof TypeError;
+        URIError: typeof URIError;
+        Uint16Array: typeof Uint16Array;
+        Uint32Array: typeof Uint32Array;
+        Uint8Array: typeof Uint8Array;
+        Uint8ClampedArray: Function;
+        WeakMap: WeakMapConstructor;
+        WeakSet: WeakSetConstructor;
+        clearImmediate: (immediateId: Immediate) => void;
+        clearInterval: (intervalId: Timeout) => void;
+        clearTimeout: (timeoutId: Timeout) => void;
+        console: typeof console;
+        decodeURI: typeof decodeURI;
+        decodeURIComponent: typeof decodeURIComponent;
+        encodeURI: typeof encodeURI;
+        encodeURIComponent: typeof encodeURIComponent;
+        escape: (str: string) => string;
+        eval: typeof eval;
+        global: Global;
+        isFinite: typeof isFinite;
+        isNaN: typeof isNaN;
+        parseFloat: typeof parseFloat;
+        parseInt: typeof parseInt;
+        process: Process;
+        root: Global;
+        setImmediate: (callback: (...args: any[]) => void, ...args: any[]) => Immediate;
+        setInterval: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => Timeout;
+        setTimeout: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => Timeout;
+        queueMicrotask: typeof queueMicrotask;
+        undefined: typeof undefined;
+        unescape: (str: string) => string;
+        gc: () => void;
+        v8debug?: any;
+    }
+
+    interface Timer {
+        ref(): void;
+        refresh(): void;
+        unref(): void;
+    }
+
+    class Immediate {
+        ref(): void;
+        unref(): void;
+        _onImmediate: Function; // to distinguish it from the Timeout class
+    }
+
+    class Timeout implements Timer {
+        ref(): void;
+        refresh(): void;
+        unref(): void;
+    }
+
+    class Module {
+        static runMain(): void;
+        static wrap(code: string): string;
+        static createRequireFromPath(path: string): (path: string) => any;
+        static builtinModules: string[];
+
+        static Module: typeof Module;
+
+        exports: any;
+        require: NodeRequireFunction;
+        id: string;
+        filename: string;
+        loaded: boolean;
+        parent: Module | null;
+        children: Module[];
+        paths: string[];
+
+        constructor(id: string, parent?: Module);
+    }
+
+    type TypedArray = Uint8Array | Uint8ClampedArray | Uint16Array | Uint32Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array;
+}
diff --git a/types/node/http.d.ts b/types/node/http.d.ts
new file mode 100644
index 0000000000..b2557963a0
--- /dev/null
+++ b/types/node/http.d.ts
@@ -0,0 +1,267 @@
+declare module "http" {
+    import * as events from "events";
+    import * as net from "net";
+    import * as stream from "stream";
+    import { URL } from "url";
+
+    // incoming headers will never contain number
+    interface IncomingHttpHeaders {
+        'accept'?: string;
+        'accept-patch'?: string;
+        'accept-ranges'?: string;
+        'access-control-allow-credentials'?: string;
+        'access-control-allow-headers'?: string;
+        'access-control-allow-methods'?: string;
+        'access-control-allow-origin'?: string;
+        'access-control-expose-headers'?: string;
+        'access-control-max-age'?: string;
+        'age'?: string;
+        'allow'?: string;
+        'alt-svc'?: string;
+        'authorization'?: string;
+        'cache-control'?: string;
+        'connection'?: string;
+        'content-disposition'?: string;
+        'content-encoding'?: string;
+        'content-language'?: string;
+        'content-length'?: string;
+        'content-location'?: string;
+        'content-range'?: string;
+        'content-type'?: string;
+        'cookie'?: string;
+        'date'?: string;
+        'expect'?: string;
+        'expires'?: string;
+        'forwarded'?: string;
+        'from'?: string;
+        'host'?: string;
+        'if-match'?: string;
+        'if-modified-since'?: string;
+        'if-none-match'?: string;
+        'if-unmodified-since'?: string;
+        'last-modified'?: string;
+        'location'?: string;
+        'pragma'?: string;
+        'proxy-authenticate'?: string;
+        'proxy-authorization'?: string;
+        'public-key-pins'?: string;
+        'range'?: string;
+        'referer'?: string;
+        'retry-after'?: string;
+        'set-cookie'?: string[];
+        'strict-transport-security'?: string;
+        'tk'?: string;
+        'trailer'?: string;
+        'transfer-encoding'?: string;
+        'upgrade'?: string;
+        'user-agent'?: string;
+        'vary'?: string;
+        'via'?: string;
+        'warning'?: string;
+        'www-authenticate'?: string;
+        [header: string]: string | string[] | undefined;
+    }
+
+    // outgoing headers allows numbers (as they are converted internally to strings)
+    interface OutgoingHttpHeaders {
+        [header: string]: number | string | string[] | undefined;
+    }
+
+    interface ClientRequestArgs {
+        protocol?: string;
+        host?: string;
+        hostname?: string;
+        family?: number;
+        port?: number | string;
+        defaultPort?: number | string;
+        localAddress?: string;
+        socketPath?: string;
+        method?: string;
+        path?: string;
+        headers?: OutgoingHttpHeaders;
+        auth?: string;
+        agent?: Agent | boolean;
+        _defaultAgent?: Agent;
+        timeout?: number;
+        setHost?: boolean;
+        // https://github.com/nodejs/node/blob/master/lib/_http_client.js#L278
+        createConnection?: (options: ClientRequestArgs, oncreate: (err: Error, socket: net.Socket) => void) => net.Socket;
+    }
+
+    interface ServerOptions {
+        IncomingMessage?: typeof IncomingMessage;
+        ServerResponse?: typeof ServerResponse;
+    }
+
+    type RequestListener = (req: IncomingMessage, res: ServerResponse) => void;
+
+    class Server extends net.Server {
+        constructor(requestListener?: RequestListener);
+        constructor(options: ServerOptions, requestListener?: RequestListener);
+
+        setTimeout(msecs?: number, callback?: () => void): this;
+        setTimeout(callback: () => void): this;
+        maxHeadersCount: number;
+        timeout: number;
+        /**
+         * Limit the amount of time the parser will wait to receive the complete HTTP headers.
+         * @default 40000
+         */
+        headersTimeout: number;
+        keepAliveTimeout: number;
+    }
+
+    // https://github.com/nodejs/node/blob/master/lib/_http_outgoing.js
+    class OutgoingMessage extends stream.Writable {
+        upgrading: boolean;
+        chunkedEncoding: boolean;
+        shouldKeepAlive: boolean;
+        useChunkedEncodingByDefault: boolean;
+        sendDate: boolean;
+        finished: boolean;
+        headersSent: boolean;
+        connection: net.Socket;
+
+        constructor();
+
+        setTimeout(msecs: number, callback?: () => void): this;
+        setHeader(name: string, value: number | string | string[]): void;
+        getHeader(name: string): number | string | string[] | undefined;
+        getHeaders(): OutgoingHttpHeaders;
+        getHeaderNames(): string[];
+        hasHeader(name: string): boolean;
+        removeHeader(name: string): void;
+        addTrailers(headers: OutgoingHttpHeaders | Array<[string, string]>): void;
+        flushHeaders(): void;
+    }
+
+    // https://github.com/nodejs/node/blob/master/lib/_http_server.js#L108-L256
+    class ServerResponse extends OutgoingMessage {
+        statusCode: number;
+        statusMessage: string;
+
+        constructor(req: IncomingMessage);
+
+        assignSocket(socket: net.Socket): void;
+        detachSocket(socket: net.Socket): void;
+        // https://github.com/nodejs/node/blob/master/test/parallel/test-http-write-callbacks.js#L53
+        // no args in writeContinue callback
+        writeContinue(callback?: () => void): void;
+        writeHead(statusCode: number, reasonPhrase?: string, headers?: OutgoingHttpHeaders): void;
+        writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
+    }
+
+    // https://github.com/nodejs/node/blob/master/lib/_http_client.js#L77
+    class ClientRequest extends OutgoingMessage {
+        connection: net.Socket;
+        socket: net.Socket;
+        aborted: number;
+
+        constructor(url: string | URL | ClientRequestArgs, cb?: (res: IncomingMessage) => void);
+
+        abort(): void;
+        onSocket(socket: net.Socket): void;
+        setTimeout(timeout: number, callback?: () => void): this;
+        setNoDelay(noDelay?: boolean): void;
+        setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
+    }
+
+    class IncomingMessage extends stream.Readable {
+        constructor(socket: net.Socket);
+
+        httpVersion: string;
+        httpVersionMajor: number;
+        httpVersionMinor: number;
+        connection: net.Socket;
+        headers: IncomingHttpHeaders;
+        rawHeaders: string[];
+        trailers: { [key: string]: string | undefined };
+        rawTrailers: string[];
+        setTimeout(msecs: number, callback: () => void): this;
+        /**
+         * Only valid for request obtained from http.Server.
+         */
+        method?: string;
+        /**
+         * Only valid for request obtained from http.Server.
+         */
+        url?: string;
+        /**
+         * Only valid for response obtained from http.ClientRequest.
+         */
+        statusCode?: number;
+        /**
+         * Only valid for response obtained from http.ClientRequest.
+         */
+        statusMessage?: string;
+        socket: net.Socket;
+        destroy(error?: Error): void;
+    }
+
+    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;
+        /**
+         * Socket timeout in milliseconds. This will set the timeout after the socket is connected.
+         */
+        timeout?: number;
+    }
+
+    class Agent {
+        maxFreeSockets: number;
+        maxSockets: number;
+        sockets: any;
+        requests: any;
+
+        constructor(opts?: AgentOptions);
+
+        /**
+         * Destroy any sockets that are currently in use by the agent.
+         * It is usually not necessary to do this. However, if you are using an agent with KeepAlive enabled,
+         * then it is best to explicitly shut down the agent when you know that it will no longer be used. Otherwise,
+         * sockets may hang open for quite a long time before the server terminates them.
+         */
+        destroy(): void;
+    }
+
+    const METHODS: string[];
+
+    const STATUS_CODES: {
+        [errorCode: number]: string | undefined;
+        [errorCode: string]: string | undefined;
+    };
+
+    function createServer(requestListener?: RequestListener): Server;
+    function createServer(options: ServerOptions, requestListener?: RequestListener): Server;
+    function createClient(port?: number, host?: string): any;
+
+    // although RequestOptions are passed as ClientRequestArgs to ClientRequest directly,
+    // create interface RequestOptions would make the naming more clear to developers
+    interface RequestOptions extends ClientRequestArgs { }
+    function request(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): ClientRequest;
+    function request(url: string | URL, options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
+    function get(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): ClientRequest;
+    function get(url: string | URL, options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
+    let globalAgent: Agent;
+
+    /**
+     * Read-only property specifying the maximum allowed size of HTTP headers in bytes.
+     * Defaults to 8KB. Configurable using the [`--max-http-header-size`][] CLI option.
+     */
+    const maxHeaderSize: number;
+}
diff --git a/types/node/http2.d.ts b/types/node/http2.d.ts
new file mode 100644
index 0000000000..aecbca783f
--- /dev/null
+++ b/types/node/http2.d.ts
@@ -0,0 +1,861 @@
+declare module "http2" {
+    import * as events from "events";
+    import * as fs from "fs";
+    import * as net from "net";
+    import * as stream from "stream";
+    import * as tls from "tls";
+    import * as url from "url";
+
+    import { IncomingHttpHeaders as Http1IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
+    export { OutgoingHttpHeaders } from "http";
+
+    export interface IncomingHttpStatusHeader {
+        ":status"?: number;
+    }
+
+    export interface IncomingHttpHeaders extends Http1IncomingHttpHeaders {
+        ":path"?: string;
+        ":method"?: string;
+        ":authority"?: string;
+        ":scheme"?: string;
+    }
+
+    // Http2Stream
+
+    export interface StreamPriorityOptions {
+        exclusive?: boolean;
+        parent?: number;
+        weight?: number;
+        silent?: boolean;
+    }
+
+    export interface StreamState {
+        localWindowSize?: number;
+        state?: number;
+        streamLocalClose?: number;
+        streamRemoteClose?: number;
+        sumDependencyWeight?: number;
+        weight?: number;
+    }
+
+    export interface ServerStreamResponseOptions {
+        endStream?: boolean;
+        waitForTrailers?: boolean;
+    }
+
+    export interface StatOptions {
+        offset: number;
+        length: number;
+    }
+
+    export interface ServerStreamFileResponseOptions {
+        statCheck?: (stats: fs.Stats, headers: OutgoingHttpHeaders, statOptions: StatOptions) => void | boolean;
+        getTrailers?: (trailers: OutgoingHttpHeaders) => void;
+        offset?: number;
+        length?: number;
+    }
+
+    export interface ServerStreamFileResponseOptionsWithError extends ServerStreamFileResponseOptions {
+        onError?: (err: NodeJS.ErrnoException) => void;
+    }
+
+    export interface Http2Stream extends stream.Duplex {
+        readonly aborted: boolean;
+        readonly closed: boolean;
+        readonly destroyed: boolean;
+        readonly pending: boolean;
+        readonly rstCode: number;
+        readonly sentHeaders: OutgoingHttpHeaders;
+        readonly sentInfoHeaders?: OutgoingHttpHeaders[];
+        readonly sentTrailers?: OutgoingHttpHeaders;
+        readonly session: Http2Session;
+        readonly state: StreamState;
+        /**
+         * Set the true if the END_STREAM flag was set in the request or response HEADERS frame received,
+         * indicating that no additional data should be received and the readable side of the Http2Stream will be closed.
+         */
+        readonly endAfterHeaders: boolean;
+        close(code?: number, callback?: () => void): void;
+        priority(options: StreamPriorityOptions): void;
+        setTimeout(msecs: number, callback?: () => void): void;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "aborted", listener: () => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        addListener(event: "drain", listener: () => void): this;
+        addListener(event: "end", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "finish", listener: () => void): this;
+        addListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        addListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+        addListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        addListener(event: "streamClosed", listener: (code: number) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+        addListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "wantTrailers", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "aborted"): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "data", chunk: Buffer | string): boolean;
+        emit(event: "drain"): boolean;
+        emit(event: "end"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "finish"): boolean;
+        emit(event: "frameError", frameType: number, errorCode: number): boolean;
+        emit(event: "pipe", src: stream.Readable): boolean;
+        emit(event: "unpipe", src: stream.Readable): boolean;
+        emit(event: "streamClosed", code: number): boolean;
+        emit(event: "timeout"): boolean;
+        emit(event: "trailers", trailers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "wantTrailers"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "aborted", listener: () => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "data", listener: (chunk: Buffer | string) => void): this;
+        on(event: "drain", listener: () => void): this;
+        on(event: "end", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "finish", listener: () => void): this;
+        on(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        on(event: "pipe", listener: (src: stream.Readable) => void): this;
+        on(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        on(event: "streamClosed", listener: (code: number) => void): this;
+        on(event: "timeout", listener: () => void): this;
+        on(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "wantTrailers", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "aborted", listener: () => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "data", listener: (chunk: Buffer | string) => void): this;
+        once(event: "drain", listener: () => void): this;
+        once(event: "end", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "finish", listener: () => void): this;
+        once(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        once(event: "pipe", listener: (src: stream.Readable) => void): this;
+        once(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        once(event: "streamClosed", listener: (code: number) => void): this;
+        once(event: "timeout", listener: () => void): this;
+        once(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "wantTrailers", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "aborted", listener: () => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        prependListener(event: "drain", listener: () => void): this;
+        prependListener(event: "end", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "finish", listener: () => void): this;
+        prependListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        prependListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+        prependListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        prependListener(event: "streamClosed", listener: (code: number) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+        prependListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "wantTrailers", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "aborted", listener: () => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "end", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "finish", listener: () => void): this;
+        prependOnceListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        prependOnceListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+        prependOnceListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        prependOnceListener(event: "streamClosed", listener: (code: number) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+        prependOnceListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "wantTrailers", listener: () => void): this;
+
+        sendTrailers(headers: OutgoingHttpHeaders): this;
+    }
+
+    export interface ClientHttp2Stream extends Http2Stream {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+        addListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "headers", headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number): boolean;
+        emit(event: "push", headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "response", headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+        on(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+        once(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+        prependListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+        prependOnceListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+    }
+
+    export interface ServerHttp2Stream extends Http2Stream {
+        additionalHeaders(headers: OutgoingHttpHeaders): void;
+        readonly headersSent: boolean;
+        readonly pushAllowed: boolean;
+        pushStream(headers: OutgoingHttpHeaders, callback?: (err: Error | null, pushStream: ServerHttp2Stream, headers: OutgoingHttpHeaders) => void): void;
+        pushStream(headers: OutgoingHttpHeaders, options?: StreamPriorityOptions, callback?: (err: Error | null, pushStream: ServerHttp2Stream, headers: OutgoingHttpHeaders) => void): void;
+        respond(headers?: OutgoingHttpHeaders, options?: ServerStreamResponseOptions): void;
+        respondWithFD(fd: number, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptions): void;
+        respondWithFile(path: string, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptionsWithError): void;
+    }
+
+    // Http2Session
+
+    export interface Settings {
+        headerTableSize?: number;
+        enablePush?: boolean;
+        initialWindowSize?: number;
+        maxFrameSize?: number;
+        maxConcurrentStreams?: number;
+        maxHeaderListSize?: number;
+    }
+
+    export interface ClientSessionRequestOptions {
+        endStream?: boolean;
+        exclusive?: boolean;
+        parent?: number;
+        weight?: number;
+        getTrailers?: (trailers: OutgoingHttpHeaders, flags: number) => void;
+    }
+
+    export interface SessionState {
+        effectiveLocalWindowSize?: number;
+        effectiveRecvDataLength?: number;
+        nextStreamID?: number;
+        localWindowSize?: number;
+        lastProcStreamID?: number;
+        remoteWindowSize?: number;
+        outboundQueueSize?: number;
+        deflateDynamicTableSize?: number;
+        inflateDynamicTableSize?: number;
+    }
+
+    export interface Http2Session extends events.EventEmitter {
+        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 | 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;
+        setTimeout(msecs: number, callback?: () => void): void;
+        readonly socket: net.Socket | tls.TLSSocket;
+        readonly state: SessionState;
+        priority(stream: Http2Stream, options: StreamPriorityOptions): void;
+        settings(settings: Settings): void;
+        readonly type: number;
+        unref(): void;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        addListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        addListener(event: "localSettings", listener: (settings: Settings) => void): this;
+        addListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+        addListener(event: "ping", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "frameError", frameType: number, errorCode: number, streamID: number): boolean;
+        emit(event: "goaway", errorCode: number, lastStreamID: number, opaqueData: Buffer): boolean;
+        emit(event: "localSettings", settings: Settings): boolean;
+        emit(event: "remoteSettings", settings: Settings): boolean;
+        emit(event: "timeout"): boolean;
+        emit(event: "ping"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        on(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        on(event: "localSettings", listener: (settings: Settings) => void): this;
+        on(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        on(event: "timeout", listener: () => void): this;
+        on(event: "ping", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        once(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        once(event: "localSettings", listener: (settings: Settings) => void): this;
+        once(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        once(event: "timeout", listener: () => void): this;
+        once(event: "ping", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        prependListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        prependListener(event: "localSettings", listener: (settings: Settings) => void): this;
+        prependListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+        prependListener(event: "ping", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        prependOnceListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        prependOnceListener(event: "localSettings", listener: (settings: Settings) => void): this;
+        prependOnceListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+        prependOnceListener(event: "ping", listener: () => void): this;
+    }
+
+    export interface ClientHttp2Session extends Http2Session {
+        request(headers?: OutgoingHttpHeaders, options?: ClientSessionRequestOptions): ClientHttp2Stream;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
+        addListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        addListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "altsvc", alt: string, origin: string, stream: number): boolean;
+        emit(event: "connect", session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket): boolean;
+        emit(event: "stream", stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
+        on(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        on(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
+        once(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        once(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
+        prependListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
+        prependOnceListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+    }
+
+    export interface AlternativeServiceOptions {
+        origin: number | string | url.URL;
+    }
+
+    export interface ServerHttp2Session extends Http2Session {
+        altsvc(alt: string, originOrStream: number | string | url.URL | AlternativeServiceOptions): void;
+        readonly server: Http2Server | Http2SecureServer;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "connect", session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket): boolean;
+        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+    }
+
+    // Http2Server
+
+    export interface SessionOptions {
+        maxDeflateDynamicTableSize?: number;
+        maxReservedRemoteStreams?: number;
+        maxSendHeaderBlockLength?: number;
+        paddingStrategy?: number;
+        peerMaxConcurrentStreams?: number;
+        selectPadding?: (frameLen: number, maxFrameLen: number) => number;
+        settings?: Settings;
+        createConnection?: (option: SessionOptions) => stream.Duplex;
+    }
+
+    export type ClientSessionOptions = SessionOptions;
+    export type ServerSessionOptions = SessionOptions;
+
+    export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
+    export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
+
+    export interface ServerOptions extends ServerSessionOptions {
+        allowHTTP1?: boolean;
+    }
+
+    export interface SecureServerOptions extends SecureServerSessionOptions {
+        allowHTTP1?: boolean;
+    }
+
+    export interface Http2Server extends net.Server {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        addListener(event: "sessionError", listener: (err: Error) => void): this;
+        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "checkContinue", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
+        emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
+        emit(event: "sessionError", err: Error): boolean;
+        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "timeout"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        on(event: "sessionError", listener: (err: Error) => void): this;
+        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "timeout", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        once(event: "sessionError", listener: (err: Error) => void): this;
+        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "timeout", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+    }
+
+    export interface Http2SecureServer extends tls.Server {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        addListener(event: "sessionError", listener: (err: Error) => void): this;
+        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+        addListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "checkContinue", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
+        emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
+        emit(event: "sessionError", err: Error): boolean;
+        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "timeout"): boolean;
+        emit(event: "unknownProtocol", socket: tls.TLSSocket): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        on(event: "sessionError", listener: (err: Error) => void): this;
+        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "timeout", listener: () => void): this;
+        on(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        once(event: "sessionError", listener: (err: Error) => void): this;
+        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "timeout", listener: () => void): this;
+        once(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+        prependListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+        prependOnceListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+    }
+
+    export class Http2ServerRequest extends stream.Readable {
+        private constructor();
+        headers: IncomingHttpHeaders;
+        httpVersion: string;
+        method: string;
+        rawHeaders: string[];
+        rawTrailers: string[];
+        setTimeout(msecs: number, callback?: () => void): void;
+        socket: net.Socket | tls.TLSSocket;
+        stream: ServerHttp2Stream;
+        trailers: IncomingHttpHeaders;
+        url: string;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "aborted", hadError: boolean, code: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+    }
+
+    export class Http2ServerResponse extends events.EventEmitter {
+        private constructor();
+        addTrailers(trailers: OutgoingHttpHeaders): void;
+        connection: net.Socket | tls.TLSSocket;
+        end(callback?: () => void): void;
+        end(data?: string | Buffer, callback?: () => void): void;
+        end(data?: string | Buffer, encoding?: string, callback?: () => void): void;
+        readonly finished: boolean;
+        getHeader(name: string): string;
+        getHeaderNames(): string[];
+        getHeaders(): OutgoingHttpHeaders;
+        hasHeader(name: string): boolean;
+        readonly headersSent: boolean;
+        removeHeader(name: string): void;
+        sendDate: boolean;
+        setHeader(name: string, value: number | string | string[]): void;
+        setTimeout(msecs: number, callback?: () => void): void;
+        socket: net.Socket | tls.TLSSocket;
+        statusCode: number;
+        statusMessage: '';
+        stream: ServerHttp2Stream;
+        write(chunk: string | Buffer, callback?: (err: Error) => void): boolean;
+        write(chunk: string | Buffer, encoding?: string, callback?: (err: Error) => void): boolean;
+        writeContinue(): void;
+        writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
+        writeHead(statusCode: number, statusMessage?: string, headers?: OutgoingHttpHeaders): void;
+        createPushResponse(headers: OutgoingHttpHeaders, callback: (err: Error | null, res: Http2ServerResponse) => void): void;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "drain", listener: () => void): this;
+        addListener(event: "error", listener: (error: Error) => void): this;
+        addListener(event: "finish", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "aborted", hadError: boolean, code: number): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "drain"): boolean;
+        emit(event: "error", error: Error): boolean;
+        emit(event: "finish"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "drain", listener: () => void): this;
+        on(event: "error", listener: (error: Error) => void): this;
+        on(event: "finish", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "drain", listener: () => void): this;
+        once(event: "error", listener: (error: Error) => void): this;
+        once(event: "finish", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "drain", listener: () => void): this;
+        prependListener(event: "error", listener: (error: Error) => void): this;
+        prependListener(event: "finish", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (error: Error) => void): this;
+        prependOnceListener(event: "finish", listener: () => void): this;
+    }
+
+    // Public API
+
+    export namespace constants {
+        const NGHTTP2_SESSION_SERVER: number;
+        const NGHTTP2_SESSION_CLIENT: number;
+        const NGHTTP2_STREAM_STATE_IDLE: number;
+        const NGHTTP2_STREAM_STATE_OPEN: number;
+        const NGHTTP2_STREAM_STATE_RESERVED_LOCAL: number;
+        const NGHTTP2_STREAM_STATE_RESERVED_REMOTE: number;
+        const NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL: number;
+        const NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE: number;
+        const NGHTTP2_STREAM_STATE_CLOSED: number;
+        const NGHTTP2_NO_ERROR: number;
+        const NGHTTP2_PROTOCOL_ERROR: number;
+        const NGHTTP2_INTERNAL_ERROR: number;
+        const NGHTTP2_FLOW_CONTROL_ERROR: number;
+        const NGHTTP2_SETTINGS_TIMEOUT: number;
+        const NGHTTP2_STREAM_CLOSED: number;
+        const NGHTTP2_FRAME_SIZE_ERROR: number;
+        const NGHTTP2_REFUSED_STREAM: number;
+        const NGHTTP2_CANCEL: number;
+        const NGHTTP2_COMPRESSION_ERROR: number;
+        const NGHTTP2_CONNECT_ERROR: number;
+        const NGHTTP2_ENHANCE_YOUR_CALM: number;
+        const NGHTTP2_INADEQUATE_SECURITY: number;
+        const NGHTTP2_HTTP_1_1_REQUIRED: number;
+        const NGHTTP2_ERR_FRAME_SIZE_ERROR: number;
+        const NGHTTP2_FLAG_NONE: number;
+        const NGHTTP2_FLAG_END_STREAM: number;
+        const NGHTTP2_FLAG_END_HEADERS: number;
+        const NGHTTP2_FLAG_ACK: number;
+        const NGHTTP2_FLAG_PADDED: number;
+        const NGHTTP2_FLAG_PRIORITY: number;
+        const DEFAULT_SETTINGS_HEADER_TABLE_SIZE: number;
+        const DEFAULT_SETTINGS_ENABLE_PUSH: number;
+        const DEFAULT_SETTINGS_INITIAL_WINDOW_SIZE: number;
+        const DEFAULT_SETTINGS_MAX_FRAME_SIZE: number;
+        const MAX_MAX_FRAME_SIZE: number;
+        const MIN_MAX_FRAME_SIZE: number;
+        const MAX_INITIAL_WINDOW_SIZE: number;
+        const NGHTTP2_DEFAULT_WEIGHT: number;
+        const NGHTTP2_SETTINGS_HEADER_TABLE_SIZE: number;
+        const NGHTTP2_SETTINGS_ENABLE_PUSH: number;
+        const NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS: number;
+        const NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE: number;
+        const NGHTTP2_SETTINGS_MAX_FRAME_SIZE: number;
+        const NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE: number;
+        const PADDING_STRATEGY_NONE: number;
+        const PADDING_STRATEGY_MAX: number;
+        const PADDING_STRATEGY_CALLBACK: number;
+        const HTTP2_HEADER_STATUS: string;
+        const HTTP2_HEADER_METHOD: string;
+        const HTTP2_HEADER_AUTHORITY: string;
+        const HTTP2_HEADER_SCHEME: string;
+        const HTTP2_HEADER_PATH: string;
+        const HTTP2_HEADER_ACCEPT_CHARSET: string;
+        const HTTP2_HEADER_ACCEPT_ENCODING: string;
+        const HTTP2_HEADER_ACCEPT_LANGUAGE: string;
+        const HTTP2_HEADER_ACCEPT_RANGES: string;
+        const HTTP2_HEADER_ACCEPT: string;
+        const HTTP2_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN: string;
+        const HTTP2_HEADER_AGE: string;
+        const HTTP2_HEADER_ALLOW: string;
+        const HTTP2_HEADER_AUTHORIZATION: string;
+        const HTTP2_HEADER_CACHE_CONTROL: string;
+        const HTTP2_HEADER_CONNECTION: string;
+        const HTTP2_HEADER_CONTENT_DISPOSITION: string;
+        const HTTP2_HEADER_CONTENT_ENCODING: string;
+        const HTTP2_HEADER_CONTENT_LANGUAGE: string;
+        const HTTP2_HEADER_CONTENT_LENGTH: string;
+        const HTTP2_HEADER_CONTENT_LOCATION: string;
+        const HTTP2_HEADER_CONTENT_MD5: string;
+        const HTTP2_HEADER_CONTENT_RANGE: string;
+        const HTTP2_HEADER_CONTENT_TYPE: string;
+        const HTTP2_HEADER_COOKIE: string;
+        const HTTP2_HEADER_DATE: string;
+        const HTTP2_HEADER_ETAG: string;
+        const HTTP2_HEADER_EXPECT: string;
+        const HTTP2_HEADER_EXPIRES: string;
+        const HTTP2_HEADER_FROM: string;
+        const HTTP2_HEADER_HOST: string;
+        const HTTP2_HEADER_IF_MATCH: string;
+        const HTTP2_HEADER_IF_MODIFIED_SINCE: string;
+        const HTTP2_HEADER_IF_NONE_MATCH: string;
+        const HTTP2_HEADER_IF_RANGE: string;
+        const HTTP2_HEADER_IF_UNMODIFIED_SINCE: string;
+        const HTTP2_HEADER_LAST_MODIFIED: string;
+        const HTTP2_HEADER_LINK: string;
+        const HTTP2_HEADER_LOCATION: string;
+        const HTTP2_HEADER_MAX_FORWARDS: string;
+        const HTTP2_HEADER_PREFER: string;
+        const HTTP2_HEADER_PROXY_AUTHENTICATE: string;
+        const HTTP2_HEADER_PROXY_AUTHORIZATION: string;
+        const HTTP2_HEADER_RANGE: string;
+        const HTTP2_HEADER_REFERER: string;
+        const HTTP2_HEADER_REFRESH: string;
+        const HTTP2_HEADER_RETRY_AFTER: string;
+        const HTTP2_HEADER_SERVER: string;
+        const HTTP2_HEADER_SET_COOKIE: string;
+        const HTTP2_HEADER_STRICT_TRANSPORT_SECURITY: string;
+        const HTTP2_HEADER_TRANSFER_ENCODING: string;
+        const HTTP2_HEADER_TE: string;
+        const HTTP2_HEADER_UPGRADE: string;
+        const HTTP2_HEADER_USER_AGENT: string;
+        const HTTP2_HEADER_VARY: string;
+        const HTTP2_HEADER_VIA: string;
+        const HTTP2_HEADER_WWW_AUTHENTICATE: string;
+        const HTTP2_HEADER_HTTP2_SETTINGS: string;
+        const HTTP2_HEADER_KEEP_ALIVE: string;
+        const HTTP2_HEADER_PROXY_CONNECTION: string;
+        const HTTP2_METHOD_ACL: string;
+        const HTTP2_METHOD_BASELINE_CONTROL: string;
+        const HTTP2_METHOD_BIND: string;
+        const HTTP2_METHOD_CHECKIN: string;
+        const HTTP2_METHOD_CHECKOUT: string;
+        const HTTP2_METHOD_CONNECT: string;
+        const HTTP2_METHOD_COPY: string;
+        const HTTP2_METHOD_DELETE: string;
+        const HTTP2_METHOD_GET: string;
+        const HTTP2_METHOD_HEAD: string;
+        const HTTP2_METHOD_LABEL: string;
+        const HTTP2_METHOD_LINK: string;
+        const HTTP2_METHOD_LOCK: string;
+        const HTTP2_METHOD_MERGE: string;
+        const HTTP2_METHOD_MKACTIVITY: string;
+        const HTTP2_METHOD_MKCALENDAR: string;
+        const HTTP2_METHOD_MKCOL: string;
+        const HTTP2_METHOD_MKREDIRECTREF: string;
+        const HTTP2_METHOD_MKWORKSPACE: string;
+        const HTTP2_METHOD_MOVE: string;
+        const HTTP2_METHOD_OPTIONS: string;
+        const HTTP2_METHOD_ORDERPATCH: string;
+        const HTTP2_METHOD_PATCH: string;
+        const HTTP2_METHOD_POST: string;
+        const HTTP2_METHOD_PRI: string;
+        const HTTP2_METHOD_PROPFIND: string;
+        const HTTP2_METHOD_PROPPATCH: string;
+        const HTTP2_METHOD_PUT: string;
+        const HTTP2_METHOD_REBIND: string;
+        const HTTP2_METHOD_REPORT: string;
+        const HTTP2_METHOD_SEARCH: string;
+        const HTTP2_METHOD_TRACE: string;
+        const HTTP2_METHOD_UNBIND: string;
+        const HTTP2_METHOD_UNCHECKOUT: string;
+        const HTTP2_METHOD_UNLINK: string;
+        const HTTP2_METHOD_UNLOCK: string;
+        const HTTP2_METHOD_UPDATE: string;
+        const HTTP2_METHOD_UPDATEREDIRECTREF: string;
+        const HTTP2_METHOD_VERSION_CONTROL: string;
+        const HTTP_STATUS_CONTINUE: number;
+        const HTTP_STATUS_SWITCHING_PROTOCOLS: number;
+        const HTTP_STATUS_PROCESSING: number;
+        const HTTP_STATUS_OK: number;
+        const HTTP_STATUS_CREATED: number;
+        const HTTP_STATUS_ACCEPTED: number;
+        const HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION: number;
+        const HTTP_STATUS_NO_CONTENT: number;
+        const HTTP_STATUS_RESET_CONTENT: number;
+        const HTTP_STATUS_PARTIAL_CONTENT: number;
+        const HTTP_STATUS_MULTI_STATUS: number;
+        const HTTP_STATUS_ALREADY_REPORTED: number;
+        const HTTP_STATUS_IM_USED: number;
+        const HTTP_STATUS_MULTIPLE_CHOICES: number;
+        const HTTP_STATUS_MOVED_PERMANENTLY: number;
+        const HTTP_STATUS_FOUND: number;
+        const HTTP_STATUS_SEE_OTHER: number;
+        const HTTP_STATUS_NOT_MODIFIED: number;
+        const HTTP_STATUS_USE_PROXY: number;
+        const HTTP_STATUS_TEMPORARY_REDIRECT: number;
+        const HTTP_STATUS_PERMANENT_REDIRECT: number;
+        const HTTP_STATUS_BAD_REQUEST: number;
+        const HTTP_STATUS_UNAUTHORIZED: number;
+        const HTTP_STATUS_PAYMENT_REQUIRED: number;
+        const HTTP_STATUS_FORBIDDEN: number;
+        const HTTP_STATUS_NOT_FOUND: number;
+        const HTTP_STATUS_METHOD_NOT_ALLOWED: number;
+        const HTTP_STATUS_NOT_ACCEPTABLE: number;
+        const HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED: number;
+        const HTTP_STATUS_REQUEST_TIMEOUT: number;
+        const HTTP_STATUS_CONFLICT: number;
+        const HTTP_STATUS_GONE: number;
+        const HTTP_STATUS_LENGTH_REQUIRED: number;
+        const HTTP_STATUS_PRECONDITION_FAILED: number;
+        const HTTP_STATUS_PAYLOAD_TOO_LARGE: number;
+        const HTTP_STATUS_URI_TOO_LONG: number;
+        const HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE: number;
+        const HTTP_STATUS_RANGE_NOT_SATISFIABLE: number;
+        const HTTP_STATUS_EXPECTATION_FAILED: number;
+        const HTTP_STATUS_TEAPOT: number;
+        const HTTP_STATUS_MISDIRECTED_REQUEST: number;
+        const HTTP_STATUS_UNPROCESSABLE_ENTITY: number;
+        const HTTP_STATUS_LOCKED: number;
+        const HTTP_STATUS_FAILED_DEPENDENCY: number;
+        const HTTP_STATUS_UNORDERED_COLLECTION: number;
+        const HTTP_STATUS_UPGRADE_REQUIRED: number;
+        const HTTP_STATUS_PRECONDITION_REQUIRED: number;
+        const HTTP_STATUS_TOO_MANY_REQUESTS: number;
+        const HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE: number;
+        const HTTP_STATUS_UNAVAILABLE_FOR_LEGAL_REASONS: number;
+        const HTTP_STATUS_INTERNAL_SERVER_ERROR: number;
+        const HTTP_STATUS_NOT_IMPLEMENTED: number;
+        const HTTP_STATUS_BAD_GATEWAY: number;
+        const HTTP_STATUS_SERVICE_UNAVAILABLE: number;
+        const HTTP_STATUS_GATEWAY_TIMEOUT: number;
+        const HTTP_STATUS_HTTP_VERSION_NOT_SUPPORTED: number;
+        const HTTP_STATUS_VARIANT_ALSO_NEGOTIATES: number;
+        const HTTP_STATUS_INSUFFICIENT_STORAGE: number;
+        const HTTP_STATUS_LOOP_DETECTED: number;
+        const HTTP_STATUS_BANDWIDTH_LIMIT_EXCEEDED: number;
+        const HTTP_STATUS_NOT_EXTENDED: number;
+        const HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED: number;
+    }
+
+    export function getDefaultSettings(): Settings;
+    export function getPackedSettings(settings: Settings): Settings;
+    export function getUnpackedSettings(buf: Buffer | Uint8Array): Settings;
+
+    export function createServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;
+    export function createServer(options: ServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;
+
+    export function createSecureServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;
+    export function createSecureServer(options: SecureServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;
+
+    export function connect(authority: string | url.URL, listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): ClientHttp2Session;
+    export function connect(
+        authority: string | url.URL,
+        options?: ClientSessionOptions | SecureClientSessionOptions,
+        listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void,
+    ): ClientHttp2Session;
+}
diff --git a/types/node/https.d.ts b/types/node/https.d.ts
new file mode 100644
index 0000000000..2c7064f4df
--- /dev/null
+++ b/types/node/https.d.ts
@@ -0,0 +1,39 @@
+declare module "https" {
+    import * as tls from "tls";
+    import * as events from "events";
+    import * as http from "http";
+    import { URL } from "url";
+
+    type ServerOptions = tls.SecureContextOptions & tls.TlsOptions & http.ServerOptions;
+
+    type RequestOptions = http.RequestOptions & tls.SecureContextOptions & {
+        rejectUnauthorized?: boolean; // Defaults to true
+        servername?: string; // SNI TLS Extension
+    };
+
+    interface AgentOptions extends http.AgentOptions, tls.ConnectionOptions {
+        rejectUnauthorized?: boolean;
+        maxCachedSessions?: number;
+    }
+
+    class Agent extends http.Agent {
+        constructor(options?: AgentOptions);
+        options: AgentOptions;
+    }
+
+    class Server extends tls.Server {
+        constructor(options: ServerOptions, requestListener?: http.RequestListener);
+
+        setTimeout(callback: () => void): this;
+        setTimeout(msecs?: number, callback?: () => void): this;
+        timeout: number;
+        keepAliveTimeout: number;
+    }
+
+    function createServer(options: ServerOptions, requestListener?: http.RequestListener): Server;
+    function request(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    function request(url: string | URL, options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    function get(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    function get(url: string | URL, options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    let globalAgent: Agent;
+}
diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index c63b6c892b..39db1d52fa 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Node.js 10.12
+// Type definitions for non-npm package Node.js 11.9
 // Project: http://nodejs.org/
 // Definitions by: Microsoft TypeScript <https://github.com/Microsoft>
 //                 DefinitelyTyped <https://github.com/DefinitelyTyped>
@@ -6,9 +6,11 @@
 //                 Alexander T. <https://github.com/a-tarasyuk>
 //                 Alvis HT Tang <https://github.com/alvis>
 //                 Andrew Makarov <https://github.com/r3nya>
+//                 Benjamin Toueg <https://github.com/btoueg>
 //                 Bruno Scheufler <https://github.com/brunoscheufler>
 //                 Chigozirim C. <https://github.com/smac89>
 //                 Christian Vaagland Tellnes <https://github.com/tellnes>
+//                 David Junger <https://github.com/touffy>
 //                 Deividas Bakanas <https://github.com/DeividasBakanas>
 //                 Eugene Y. Q. Shen <https://github.com/eyqs>
 //                 Flarna <https://github.com/Flarna>
@@ -32,9188 +34,55 @@
 //                 Zane Hannan AU <https://github.com/ZaneHannanAU>
 //                 Jeremie Rodriguez <https://github.com/jeremiergz>
 //                 Samuel Ainsworth <https://github.com/samuela>
+//                 Kyle Uehlein <https://github.com/kuehlein>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/** inspector module types */
-/// <reference path="./inspector.d.ts" />
+// NOTE: These definitions support NodeJS and TypeScript 3.1.
 
-// This needs to be global to avoid TS2403 in case lib.dom.d.ts is present in the same build
-interface Console {
-    Console: NodeJS.ConsoleConstructor;
-    /**
-     * A simple assertion test that verifies whether `value` is truthy.
-     * If it is not, an `AssertionError` is thrown.
-     * If provided, the error `message` is formatted using `util.format()` and used as the error message.
-     */
-    assert(value: any, message?: string, ...optionalParams: any[]): void;
-    /**
-     * When `stdout` is a TTY, calling `console.clear()` will attempt to clear the TTY.
-     * When `stdout` is not a TTY, this method does nothing.
-     */
-    clear(): void;
-    /**
-     * Maintains an internal counter specific to `label` and outputs to `stdout` the number of times `console.count()` has been called with the given `label`.
-     */
-    count(label?: string): void;
-    /**
-     * Resets the internal counter specific to `label`.
-     */
-    countReset(label?: string): void;
-    /**
-     * The `console.debug()` function is an alias for {@link console.log()}.
-     */
-    debug(message?: any, ...optionalParams: any[]): void;
-    /**
-     * Uses {@link util.inspect()} on `obj` and prints the resulting string to `stdout`.
-     * This function bypasses any custom `inspect()` function defined on `obj`.
-     */
-    dir(obj: any, options?: NodeJS.InspectOptions): void;
-    /**
-     * This method calls {@link console.log()} passing it the arguments received. Please note that this method does not produce any XML formatting
-     */
-    dirxml(...data: any[]): void;
-    /**
-     * Prints to `stderr` with newline.
-     */
-    error(message?: any, ...optionalParams: any[]): void;
-    /**
-     * Increases indentation of subsequent lines by two spaces.
-     * If one or more `label`s are provided, those are printed first without the additional indentation.
-     */
-    group(...label: any[]): void;
-    /**
-     * The `console.groupCollapsed()` function is an alias for {@link console.group()}.
-     */
-    groupCollapsed(): void;
-    /**
-     * Decreases indentation of subsequent lines by two spaces.
-     */
-    groupEnd(): void;
-    /**
-     * The {@link console.info()} function is an alias for {@link console.log()}.
-     */
-    info(message?: any, ...optionalParams: any[]): void;
-    /**
-     * Prints to `stdout` with newline.
-     */
-    log(message?: any, ...optionalParams: any[]): void;
-    /**
-     * This method does not display anything unless used in the inspector.
-     *  Prints to `stdout` the array `array` formatted as a table.
-     */
-    table(tabularData: any, properties?: string[]): void;
-    /**
-     * Starts a timer that can be used to compute the duration of an operation. Timers are identified by a unique `label`.
-     */
-    time(label?: string): void;
-    /**
-     * Stops a timer that was previously started by calling {@link console.time()} and prints the result to `stdout`.
-     */
-    timeEnd(label?: string): void;
-    /**
-     * For a timer that was previously started by calling {@link console.time()}, prints the elapsed time and other `data` arguments to `stdout`.
-     */
-    timeLog(label?: string, ...data: any[]): void;
-    /**
-     * Prints to `stderr` the string 'Trace :', followed by the {@link util.format()} formatted message and stack trace to the current position in the code.
-     */
-    trace(message?: any, ...optionalParams: any[]): void;
-    /**
-     * The {@link console.warn()} function is an alias for {@link console.error()}.
-     */
-    warn(message?: any, ...optionalParams: any[]): void;
+// NOTE: TypeScript version-specific augmentations can be found in the following paths:
+//          - ~/base.d.ts         - Shared definitions common to all TypeScript versions
+//          - ~/index.d.ts        - Definitions specific to TypeScript 2.1
+//          - ~/ts3.1/index.d.ts  - Definitions specific to TypeScript 3.1
 
-    // --- Inspector mode only ---
-    /**
-     * This method does not display anything unless used in the inspector.
-     *  The console.markTimeline() method is the deprecated form of console.timeStamp().
-     *
-     * @deprecated Use console.timeStamp() instead.
-     */
-    markTimeline(label?: string): void;
-    /**
-     * This method does not display anything unless used in the inspector.
-     *  Starts a JavaScript CPU profile with an optional label.
-     */
-    profile(label?: string): void;
-    /**
-     * This method does not display anything unless used in the inspector.
-     *  Stops the current JavaScript CPU profiling session if one has been started and prints the report to the Profiles panel of the inspector.
-     */
-    profileEnd(label?: string): void;
-    /**
-     * This method does not display anything unless used in the inspector.
-     *  Adds an event with the label `label` to the Timeline panel of the inspector.
-     */
-    timeStamp(label?: string): void;
-    /**
-     * This method does not display anything unless used in the inspector.
-     *  The console.timeline() method is the deprecated form of console.time().
-     *
-     * @deprecated Use console.time() instead.
-     */
-    timeline(label?: string): void;
-    /**
-     * This method does not display anything unless used in the inspector.
-     *  The console.timelineEnd() method is the deprecated form of console.timeEnd().
-     *
-     * @deprecated Use console.timeEnd() instead.
-     */
-    timelineEnd(label?: string): void;
-}
+// NOTE: Augmentations for TypeScript 3.1 and later should use individual files for overrides
+//       within the respective ~/ts3.1 (or later) folder. However, this is disallowed for versions
+//       prior to TypeScript 3.1, so the older definitions will be found here.
 
-interface Error {
-    stack?: string;
-}
+// Base definitions for all NodeJS modules that are not specific to any version of TypeScript:
+/// <reference path="base.d.ts" />
 
-// Declare "static" methods in Error
-interface ErrorConstructor {
-    /** Create .stack property on a target object */
-    captureStackTrace(targetObject: Object, constructorOpt?: Function): void;
+// TypeScript 2.1-specific augmentations:
 
-    /**
-     * Optional override for formatting stack traces
-     *
-     * @see https://github.com/v8/v8/wiki/Stack%20Trace%20API#customizing-stack-traces
-     */
-    prepareStackTrace?: (err: Error, stackTraces: NodeJS.CallSite[]) => any;
-
-    stackTraceLimit: number;
-}
-
-// compat for TypeScript 1.8 and default es5 target
-// if you use with --target es3 or --target es5 and use below definitions,
-// use the lib.es6.d.ts that is bundled with TypeScript 1.8.
+// Forward-declarations for needed types from es2015 and later (in case users are using `--lib es5`)
 interface MapConstructor { }
 interface WeakMapConstructor { }
 interface SetConstructor { }
 interface WeakSetConstructor { }
-
 interface Set<T> {}
 interface ReadonlySet<T> {}
-
-// Forward-declare needed types from lib.es2015.d.ts (in case users are using `--lib es5`)
+interface IteratorResult<T> { }
 interface Iterable<T> { }
 interface Iterator<T> {
     next(value?: any): IteratorResult<T>;
 }
-interface IteratorResult<T> { }
+interface IterableIterator<T> { }
 interface AsyncIterableIterator<T> {}
 interface SymbolConstructor {
-    readonly observable: symbol;
     readonly iterator: symbol;
     readonly asyncIterator: symbol;
 }
 declare var Symbol: SymbolConstructor;
-interface SharedArrayBuffer {
+declare class SharedArrayBuffer {
+    constructor(byteSize: number);
     readonly byteLength: number;
     slice(begin?: number, end?: number): SharedArrayBuffer;
 }
 
-// Node.js ESNEXT support
-interface String {
-    /** Removes whitespace from the left end of a string. */
-    trimLeft(): string;
-    /** Removes whitespace from the right end of a string. */
-    trimRight(): string;
-}
-
-/*-----------------------------------------------*
- *                                               *
- *                   GLOBAL                      *
- *                                               *
- ------------------------------------------------*/
-declare var process: NodeJS.Process;
-declare var global: NodeJS.Global;
-declare var console: Console;
-
-declare var __filename: string;
-declare var __dirname: string;
-
-declare function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
-declare namespace setTimeout {
-    function __promisify__(ms: number): Promise<void>;
-    function __promisify__<T>(ms: number, value: T): Promise<T>;
-}
-declare function clearTimeout(timeoutId: NodeJS.Timeout): void;
-declare function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
-declare function clearInterval(intervalId: NodeJS.Timeout): void;
-declare function setImmediate(callback: (...args: any[]) => void, ...args: any[]): NodeJS.Immediate;
-declare namespace setImmediate {
-    function __promisify__(): Promise<void>;
-    function __promisify__<T>(value: T): Promise<T>;
-}
-declare function clearImmediate(immediateId: NodeJS.Immediate): void;
-
-// TODO: change to `type NodeRequireFunction = (id: string) => any;` in next mayor version.
-interface NodeRequireFunction {
-    /* tslint:disable-next-line:callable-types */
-    (id: string): any;
-}
-
-interface NodeRequire extends NodeRequireFunction {
-    resolve: RequireResolve;
-    cache: any;
-    extensions: NodeExtensions;
-    main: NodeModule | undefined;
-}
-
-interface RequireResolve {
-    (id: string, options?: { paths?: string[]; }): string;
-    paths(request: string): string[] | null;
-}
-
-interface NodeExtensions {
-    '.js': (m: NodeModule, filename: string) => any;
-    '.json': (m: NodeModule, filename: string) => any;
-    '.node': (m: NodeModule, filename: string) => any;
-    [ext: string]: (m: NodeModule, filename: string) => any;
-}
-
-declare var require: NodeRequire;
-
-interface NodeModule {
-    exports: any;
-    require: NodeRequireFunction;
-    id: string;
-    filename: string;
-    loaded: boolean;
-    parent: NodeModule | null;
-    children: NodeModule[];
-    paths: string[];
-}
-
-declare var module: NodeModule;
-
-// Same as module.exports
-declare var exports: any;
-declare const SlowBuffer: {
-    new(str: string, encoding?: string): Buffer;
-    new(size: number): Buffer;
-    new(size: Uint8Array): Buffer;
-    new(array: any[]): Buffer;
-    prototype: Buffer;
-    isBuffer(obj: any): boolean;
-    byteLength(string: string, encoding?: string): number;
-    concat(list: Buffer[], totalLength?: number): Buffer;
-};
-
-// Buffer class
-type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "base64" | "latin1" | "binary" | "hex";
-interface Buffer extends Uint8Array {
-    constructor: typeof Buffer;
-    write(string: string, offset?: number, length?: number, encoding?: string): number;
-    toString(encoding?: string, start?: number, end?: number): string;
-    toJSON(): { type: 'Buffer', data: any[] };
-    equals(otherBuffer: Uint8Array): boolean;
-    compare(otherBuffer: Uint8Array, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
-    copy(targetBuffer: Uint8Array, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
-    slice(start?: number, end?: number): Buffer;
-    writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-    writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-    writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-    writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-    readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
-    readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
-    readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
-    readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
-    readUInt8(offset: number, noAssert?: boolean): number;
-    readUInt16LE(offset: number, noAssert?: boolean): number;
-    readUInt16BE(offset: number, noAssert?: boolean): number;
-    readUInt32LE(offset: number, noAssert?: boolean): number;
-    readUInt32BE(offset: number, noAssert?: boolean): number;
-    readInt8(offset: number, noAssert?: boolean): number;
-    readInt16LE(offset: number, noAssert?: boolean): number;
-    readInt16BE(offset: number, noAssert?: boolean): number;
-    readInt32LE(offset: number, noAssert?: boolean): number;
-    readInt32BE(offset: number, noAssert?: boolean): number;
-    readFloatLE(offset: number, noAssert?: boolean): number;
-    readFloatBE(offset: number, noAssert?: boolean): number;
-    readDoubleLE(offset: number, noAssert?: boolean): number;
-    readDoubleBE(offset: number, noAssert?: boolean): number;
-    swap16(): Buffer;
-    swap32(): Buffer;
-    swap64(): Buffer;
-    writeUInt8(value: number, offset: number, noAssert?: boolean): number;
-    writeUInt16LE(value: number, offset: number, noAssert?: boolean): number;
-    writeUInt16BE(value: number, offset: number, noAssert?: boolean): number;
-    writeUInt32LE(value: number, offset: number, noAssert?: boolean): number;
-    writeUInt32BE(value: number, offset: number, noAssert?: boolean): number;
-    writeInt8(value: number, offset: number, noAssert?: boolean): number;
-    writeInt16LE(value: number, offset: number, noAssert?: boolean): number;
-    writeInt16BE(value: number, offset: number, noAssert?: boolean): number;
-    writeInt32LE(value: number, offset: number, noAssert?: boolean): number;
-    writeInt32BE(value: number, offset: number, noAssert?: boolean): number;
-    writeFloatLE(value: number, offset: number, noAssert?: boolean): number;
-    writeFloatBE(value: number, offset: number, noAssert?: boolean): number;
-    writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
-    writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
-    fill(value: any, offset?: number, end?: number): this;
-    indexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
-    lastIndexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
-    entries(): IterableIterator<[number, number]>;
-    includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
-    keys(): IterableIterator<number>;
-    values(): IterableIterator<number>;
-}
-
-/**
- * Raw data is stored in instances of the Buffer class.
- * A Buffer is similar to an array of integers but corresponds to a raw memory allocation outside the V8 heap.  A Buffer cannot be resized.
- * Valid string encodings: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
- */
-declare const Buffer: {
-    /**
-     * Allocates a new buffer containing the given {str}.
-     *
-     * @param str String to store in buffer.
-     * @param encoding encoding to use, optional.  Default is 'utf8'
-     * @deprecated since v10.0.0 - Use `Buffer.from(string[, encoding])` instead.
-     */
-    new(str: string, encoding?: string): Buffer;
-    /**
-     * Allocates a new buffer of {size} octets.
-     *
-     * @param size count of octets to allocate.
-     * @deprecated since v10.0.0 - Use `Buffer.alloc()` instead (also see `Buffer.allocUnsafe()`).
-     */
-    new(size: number): Buffer;
-    /**
-     * Allocates a new buffer containing the given {array} of octets.
-     *
-     * @param array The octets to store.
-     * @deprecated since v10.0.0 - Use `Buffer.from(array)` instead.
-     */
-    new(array: Uint8Array): Buffer;
-    /**
-     * Produces a Buffer backed by the same allocated memory as
-     * 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 | SharedArrayBuffer): Buffer;
-    /**
-     * Allocates a new buffer containing the given {array} of octets.
-     *
-     * @param array The octets to store.
-     * @deprecated since v10.0.0 - Use `Buffer.from(array)` instead.
-     */
-    new(array: any[]): Buffer;
-    /**
-     * Copies the passed {buffer} data onto a new {Buffer} instance.
-     *
-     * @param buffer The buffer to copy.
-     * @deprecated since v10.0.0 - Use `Buffer.from(buffer)` instead.
-     */
-    new(buffer: Buffer): Buffer;
-    prototype: Buffer;
-    /**
-     * When passed a reference to the .buffer property of a TypedArray instance,
-     * the newly created Buffer will share the same allocated memory as the TypedArray.
-     * The optional {byteOffset} and {length} arguments specify a memory range
-     * within the {arrayBuffer} that will be shared by the Buffer.
-     *
-     * @param arrayBuffer The .buffer property of any TypedArray or a new ArrayBuffer()
-     */
-    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[]): 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
-     *
-     * @param obj object to test.
-     */
-    isBuffer(obj: any): obj is Buffer;
-    /**
-     * Returns true if {encoding} is a valid encoding argument.
-     * Valid string encodings in Node 0.12: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
-     *
-     * @param encoding string to test.
-     */
-    isEncoding(encoding: string): boolean | undefined;
-    /**
-     * Gives the actual byte length of a string. encoding defaults to 'utf8'.
-     * This is not the same as String.prototype.length since that returns the number of characters in a string.
-     *
-     * @param string string to test.
-     * @param encoding encoding used to evaluate (defaults to 'utf8')
-     */
-    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.
-     *
-     * If the list has no items, or if the totalLength is 0, then it returns a zero-length buffer.
-     * If the list has exactly one item, then the first item of the list is returned.
-     * If the list has more than one item, then a new Buffer is created.
-     *
-     * @param list An array of Buffer objects to concatenate
-     * @param totalLength Total length of the buffers when concatenated.
-     *   If totalLength is not provided, it is read from the buffers in the list. However, this adds an additional loop to the function, so it is faster to provide the length explicitly.
-     */
-    concat(list: Uint8Array[], totalLength?: number): Buffer;
-    /**
-     * The same as buf1.compare(buf2).
-     */
-    compare(buf1: Uint8Array, buf2: Uint8Array): number;
-    /**
-     * Allocates a new buffer of {size} octets.
-     *
-     * @param size count of octets to allocate.
-     * @param fill if specified, buffer will be initialized by calling buf.fill(fill).
-     *    If parameter is omitted, buffer will be filled with zeros.
-     * @param encoding encoding used for call to buf.fill while initalizing
-     */
-    alloc(size: number, fill?: string | Buffer | number, encoding?: string): Buffer;
-    /**
-     * Allocates a new buffer of {size} octets, leaving memory not initialized, so the contents
-     * of the newly created Buffer are unknown and may contain sensitive data.
-     *
-     * @param size count of octets to allocate
-     */
-    allocUnsafe(size: number): Buffer;
-    /**
-     * Allocates a new non-pooled buffer of {size} octets, leaving memory not initialized, so the contents
-     * of the newly created Buffer are unknown and may contain sensitive data.
-     *
-     * @param size count of octets to allocate
-     */
-    allocUnsafeSlow(size: number): Buffer;
-    /**
-     * This is the number of bytes used to determine the size of pre-allocated, internal Buffer instances used for pooling. This value may be modified.
-     */
-    poolSize: number;
-};
-
-/*----------------------------------------------*
-*                                               *
-*               GLOBAL INTERFACES               *
-*                                               *
-*-----------------------------------------------*/
-declare namespace NodeJS {
-    interface InspectOptions {
-        showHidden?: boolean;
-        depth?: number | null;
-        colors?: boolean;
-        customInspect?: boolean;
-        showProxy?: boolean;
-        maxArrayLength?: number | null;
-        breakLength?: number;
-        compact?: boolean;
-        sorted?: boolean | ((a: string, b: string) => number);
-    }
-
-    interface ConsoleConstructorOptions {
-        stdout: WritableStream;
-        stderr?: WritableStream;
-        ignoreErrors?: boolean;
-        colorMode?: boolean | 'auto';
-    }
-
-    interface ConsoleConstructor {
-        prototype: Console;
-        new(stdout: WritableStream, stderr?: WritableStream, ignoreErrors?: boolean): Console;
-        new(options: ConsoleConstructorOptions): Console;
-    }
-
-    interface CallSite {
-        /**
-         * Value of "this"
-         */
-        getThis(): any;
-
-        /**
-         * Type of "this" as a string.
-         * This is the name of the function stored in the constructor field of
-         * "this", if available.  Otherwise the object's [[Class]] internal
-         * property.
-         */
-        getTypeName(): string | null;
-
-        /**
-         * Current function
-         */
-        getFunction(): Function | undefined;
-
-        /**
-         * Name of the current function, typically its name property.
-         * If a name property is not available an attempt will be made to try
-         * to infer a name from the function's context.
-         */
-        getFunctionName(): string | null;
-
-        /**
-         * Name of the property [of "this" or one of its prototypes] that holds
-         * the current function
-         */
-        getMethodName(): string | null;
-
-        /**
-         * Name of the script [if this function was defined in a script]
-         */
-        getFileName(): string | null;
-
-        /**
-         * Current line number [if this function was defined in a script]
-         */
-        getLineNumber(): number | null;
-
-        /**
-         * Current column number [if this function was defined in a script]
-         */
-        getColumnNumber(): number | null;
-
-        /**
-         * A call site object representing the location where eval was called
-         * [if this function was created using a call to eval]
-         */
-        getEvalOrigin(): string | undefined;
-
-        /**
-         * Is this a toplevel invocation, that is, is "this" the global object?
-         */
-        isToplevel(): boolean;
-
-        /**
-         * Does this call take place in code defined by a call to eval?
-         */
-        isEval(): boolean;
-
-        /**
-         * Is this call in native V8 code?
-         */
-        isNative(): boolean;
-
-        /**
-         * Is this a constructor call?
-         */
-        isConstructor(): boolean;
-    }
-
-    interface ErrnoException extends Error {
-        errno?: number;
-        code?: string;
-        path?: string;
-        syscall?: string;
-        stack?: string;
-    }
-
-    class EventEmitter {
-        addListener(event: string | symbol, listener: (...args: any[]) => void): this;
-        on(event: string | symbol, listener: (...args: any[]) => void): this;
-        once(event: string | symbol, listener: (...args: any[]) => void): this;
-        removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
-        off(event: string | symbol, listener: (...args: any[]) => void): this;
-        removeAllListeners(event?: string | symbol): this;
-        setMaxListeners(n: number): this;
-        getMaxListeners(): number;
-        listeners(event: string | symbol): Function[];
-        rawListeners(event: string | symbol): Function[];
-        emit(event: string | symbol, ...args: any[]): boolean;
-        listenerCount(type: string | symbol): number;
-        // Added in Node 6...
-        prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
-        eventNames(): Array<string | symbol>;
-    }
-
-    interface ReadableStream extends EventEmitter {
-        readable: boolean;
-        read(size?: number): string | Buffer;
-        setEncoding(encoding: string): this;
-        pause(): this;
-        resume(): this;
-        isPaused(): boolean;
-        pipe<T extends WritableStream>(destination: T, options?: { end?: boolean; }): T;
-        unpipe(destination?: WritableStream): this;
-        unshift(chunk: string): void;
-        unshift(chunk: Buffer): void;
-        wrap(oldStream: ReadableStream): this;
-        [Symbol.asyncIterator](): AsyncIterableIterator<string | Buffer>;
-    }
-
-    interface WritableStream extends EventEmitter {
-        writable: boolean;
-        write(buffer: Buffer | string, cb?: Function): boolean;
-        write(str: string, encoding?: string, cb?: Function): boolean;
-        end(cb?: Function): void;
-        end(buffer: Buffer, cb?: Function): void;
-        end(str: string, cb?: Function): void;
-        end(str: string, encoding?: string, cb?: Function): void;
-    }
-
-    interface ReadWriteStream extends ReadableStream, WritableStream { }
-
-    interface Events extends EventEmitter { }
-
-    interface Domain extends Events {
-        run(fn: Function): void;
-        add(emitter: Events): void;
-        remove(emitter: Events): void;
-        bind(cb: (err: Error, data: any) => any): any;
-        intercept(cb: (data: any) => any): any;
-
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        on(event: string, listener: (...args: any[]) => void): this;
-        once(event: string, listener: (...args: any[]) => void): this;
-        removeListener(event: string, listener: (...args: any[]) => void): this;
-        removeAllListeners(event?: string): this;
-    }
-
-    interface MemoryUsage {
-        rss: number;
-        heapTotal: number;
-        heapUsed: number;
-        external: number;
-    }
-
-    interface CpuUsage {
-        user: number;
-        system: number;
-    }
-
-    interface ProcessRelease {
-        name: string;
-        sourceUrl?: string;
-        headersUrl?: string;
-        libUrl?: string;
-        lts?: string;
-    }
-
-    interface ProcessVersions {
-        http_parser: string;
-        node: string;
-        v8: string;
-        ares: string;
-        uv: string;
-        zlib: string;
-        modules: string;
-        openssl: string;
-    }
-
-    type Platform = 'aix'
-        | 'android'
-        | 'darwin'
-        | 'freebsd'
-        | 'linux'
-        | 'openbsd'
-        | 'sunos'
-        | 'win32'
-        | 'cygwin';
-
-    type Signals =
-        "SIGABRT" | "SIGALRM" | "SIGBUS" | "SIGCHLD" | "SIGCONT" | "SIGFPE" | "SIGHUP" | "SIGILL" | "SIGINT" | "SIGIO" |
-        "SIGIOT" | "SIGKILL" | "SIGPIPE" | "SIGPOLL" | "SIGPROF" | "SIGPWR" | "SIGQUIT" | "SIGSEGV" | "SIGSTKFLT" |
-        "SIGSTOP" | "SIGSYS" | "SIGTERM" | "SIGTRAP" | "SIGTSTP" | "SIGTTIN" | "SIGTTOU" | "SIGUNUSED" | "SIGURG" |
-        "SIGUSR1" | "SIGUSR2" | "SIGVTALRM" | "SIGWINCH" | "SIGXCPU" | "SIGXFSZ" | "SIGBREAK" | "SIGLOST" | "SIGINFO";
-
-    type MultipleResolveType = 'resolve' | 'reject';
-
-    type BeforeExitListener = (code: number) => void;
-    type DisconnectListener = () => void;
-    type ExitListener = (code: number) => void;
-    type RejectionHandledListener = (promise: Promise<any>) => void;
-    type UncaughtExceptionListener = (error: Error) => void;
-    type UnhandledRejectionListener = (reason: any, promise: Promise<any>) => void;
-    type WarningListener = (warning: Error) => void;
-    type MessageListener = (message: any, sendHandle: any) => void;
-    type SignalsListener = (signal: Signals) => void;
-    type NewListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
-    type RemoveListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
-    type MultipleResolveListener = (type: MultipleResolveType, promise: Promise<any>, value: any) => void;
-
-    interface Socket extends ReadWriteStream {
-        isTTY?: true;
-    }
-
-    interface ProcessEnv {
-        [key: string]: string | undefined;
-    }
-
-    interface WriteStream extends Socket {
-        readonly writableHighWaterMark: number;
-        readonly writableLength: number;
-        columns?: number;
-        rows?: number;
-        _write(chunk: any, encoding: string, callback: Function): void;
-        _destroy(err: Error | null, callback: Function): void;
-        _final(callback: Function): void;
-        setDefaultEncoding(encoding: string): this;
-        cork(): void;
-        uncork(): void;
-        destroy(error?: Error): void;
-    }
-    interface ReadStream extends Socket {
-        readonly readableHighWaterMark: number;
-        readonly readableLength: number;
-        isRaw?: boolean;
-        setRawMode?(mode: boolean): void;
-        _read(size: number): void;
-        _destroy(err: Error | null, callback: Function): void;
-        push(chunk: any, encoding?: string): boolean;
-        destroy(error?: Error): void;
-    }
-
-    interface Process extends EventEmitter {
-        stdout: WriteStream;
-        stderr: WriteStream;
-        stdin: ReadStream;
-        openStdin(): Socket;
-        argv: string[];
-        argv0: string;
-        execArgv: string[];
-        execPath: string;
-        abort(): void;
-        chdir(directory: string): void;
-        cwd(): string;
-        debugPort: number;
-        emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
-        env: ProcessEnv;
-        exit(code?: number): never;
-        exitCode: number;
-        getgid(): number;
-        setgid(id: number | string): void;
-        getuid(): number;
-        setuid(id: number | string): void;
-        geteuid(): number;
-        seteuid(id: number | string): void;
-        getegid(): number;
-        setegid(id: number | string): void;
-        getgroups(): number[];
-        setgroups(groups: Array<string | number>): void;
-        setUncaughtExceptionCaptureCallback(cb: ((err: Error) => void) | null): void;
-        hasUncaughtExceptionCaptureCallback(): boolean;
-        version: string;
-        versions: ProcessVersions;
-        config: {
-            target_defaults: {
-                cflags: any[];
-                default_configuration: string;
-                defines: string[];
-                include_dirs: string[];
-                libraries: string[];
-            };
-            variables: {
-                clang: number;
-                host_arch: string;
-                node_install_npm: boolean;
-                node_install_waf: boolean;
-                node_prefix: string;
-                node_shared_openssl: boolean;
-                node_shared_v8: boolean;
-                node_shared_zlib: boolean;
-                node_use_dtrace: boolean;
-                node_use_etw: boolean;
-                node_use_openssl: boolean;
-                target_arch: string;
-                v8_no_strict_aliasing: number;
-                v8_use_snapshot: boolean;
-                visibility: string;
-            };
-        };
-        kill(pid: number, signal?: string | number): void;
-        pid: number;
-        ppid: number;
-        title: string;
-        arch: string;
-        platform: Platform;
-        mainModule?: NodeModule;
-        memoryUsage(): MemoryUsage;
-        cpuUsage(previousValue?: CpuUsage): CpuUsage;
-        nextTick(callback: Function, ...args: any[]): void;
-        release: ProcessRelease;
-        umask(mask?: number): number;
-        uptime(): number;
-        hrtime(time?: [number, number]): [number, number];
-        domain: Domain;
-
-        // Worker
-        send?(message: any, sendHandle?: any): void;
-        disconnect(): void;
-        connected: boolean;
-
-        /**
-         * The `process.allowedNodeEnvironmentFlags` property is a special,
-         * read-only `Set` of flags allowable within the [`NODE_OPTIONS`][]
-         * environment variable.
-         */
-        allowedNodeEnvironmentFlags: ReadonlySet<string>;
-
-        /**
-         * EventEmitter
-         *   1. beforeExit
-         *   2. disconnect
-         *   3. exit
-         *   4. message
-         *   5. rejectionHandled
-         *   6. uncaughtException
-         *   7. unhandledRejection
-         *   8. warning
-         *   9. message
-         *  10. <All OS Signals>
-         *  11. newListener/removeListener inherited from EventEmitter
-         */
-        addListener(event: "beforeExit", listener: BeforeExitListener): this;
-        addListener(event: "disconnect", listener: DisconnectListener): this;
-        addListener(event: "exit", listener: ExitListener): this;
-        addListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
-        addListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
-        addListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
-        addListener(event: "warning", listener: WarningListener): this;
-        addListener(event: "message", listener: MessageListener): this;
-        addListener(event: Signals, listener: SignalsListener): this;
-        addListener(event: "newListener", listener: NewListenerListener): this;
-        addListener(event: "removeListener", listener: RemoveListenerListener): this;
-        addListener(event: "multipleResolves", listener: MultipleResolveListener): this;
-
-        emit(event: "beforeExit", code: number): boolean;
-        emit(event: "disconnect"): boolean;
-        emit(event: "exit", code: number): boolean;
-        emit(event: "rejectionHandled", promise: Promise<any>): boolean;
-        emit(event: "uncaughtException", error: Error): boolean;
-        emit(event: "unhandledRejection", reason: any, promise: Promise<any>): boolean;
-        emit(event: "warning", warning: Error): boolean;
-        emit(event: "message", message: any, sendHandle: any): this;
-        emit(event: Signals, signal: Signals): boolean;
-        emit(event: "newListener", eventName: string | symbol, listener: (...args: any[]) => void): this;
-        emit(event: "removeListener", eventName: string, listener: (...args: any[]) => void): this;
-        emit(event: "multipleResolves", listener: MultipleResolveListener): this;
-
-        on(event: "beforeExit", listener: BeforeExitListener): this;
-        on(event: "disconnect", listener: DisconnectListener): this;
-        on(event: "exit", listener: ExitListener): this;
-        on(event: "rejectionHandled", listener: RejectionHandledListener): this;
-        on(event: "uncaughtException", listener: UncaughtExceptionListener): this;
-        on(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
-        on(event: "warning", listener: WarningListener): this;
-        on(event: "message", listener: MessageListener): this;
-        on(event: Signals, listener: SignalsListener): this;
-        on(event: "newListener", listener: NewListenerListener): this;
-        on(event: "removeListener", listener: RemoveListenerListener): this;
-        on(event: "multipleResolves", listener: MultipleResolveListener): this;
-
-        once(event: "beforeExit", listener: BeforeExitListener): this;
-        once(event: "disconnect", listener: DisconnectListener): this;
-        once(event: "exit", listener: ExitListener): this;
-        once(event: "rejectionHandled", listener: RejectionHandledListener): this;
-        once(event: "uncaughtException", listener: UncaughtExceptionListener): this;
-        once(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
-        once(event: "warning", listener: WarningListener): this;
-        once(event: "message", listener: MessageListener): this;
-        once(event: Signals, listener: SignalsListener): this;
-        once(event: "newListener", listener: NewListenerListener): this;
-        once(event: "removeListener", listener: RemoveListenerListener): this;
-        once(event: "multipleResolves", listener: MultipleResolveListener): this;
-
-        prependListener(event: "beforeExit", listener: BeforeExitListener): this;
-        prependListener(event: "disconnect", listener: DisconnectListener): this;
-        prependListener(event: "exit", listener: ExitListener): this;
-        prependListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
-        prependListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
-        prependListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
-        prependListener(event: "warning", listener: WarningListener): this;
-        prependListener(event: "message", listener: MessageListener): this;
-        prependListener(event: Signals, listener: SignalsListener): this;
-        prependListener(event: "newListener", listener: NewListenerListener): this;
-        prependListener(event: "removeListener", listener: RemoveListenerListener): this;
-        prependListener(event: "multipleResolves", listener: MultipleResolveListener): this;
-
-        prependOnceListener(event: "beforeExit", listener: BeforeExitListener): this;
-        prependOnceListener(event: "disconnect", listener: DisconnectListener): this;
-        prependOnceListener(event: "exit", listener: ExitListener): this;
-        prependOnceListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
-        prependOnceListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
-        prependOnceListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
-        prependOnceListener(event: "warning", listener: WarningListener): this;
-        prependOnceListener(event: "message", listener: MessageListener): this;
-        prependOnceListener(event: Signals, listener: SignalsListener): this;
-        prependOnceListener(event: "newListener", listener: NewListenerListener): this;
-        prependOnceListener(event: "removeListener", listener: RemoveListenerListener): this;
-        prependOnceListener(event: "multipleResolves", listener: MultipleResolveListener): this;
-
-        listeners(event: "beforeExit"): BeforeExitListener[];
-        listeners(event: "disconnect"): DisconnectListener[];
-        listeners(event: "exit"): ExitListener[];
-        listeners(event: "rejectionHandled"): RejectionHandledListener[];
-        listeners(event: "uncaughtException"): UncaughtExceptionListener[];
-        listeners(event: "unhandledRejection"): UnhandledRejectionListener[];
-        listeners(event: "warning"): WarningListener[];
-        listeners(event: "message"): MessageListener[];
-        listeners(event: Signals): SignalsListener[];
-        listeners(event: "newListener"): NewListenerListener[];
-        listeners(event: "removeListener"): RemoveListenerListener[];
-        listeners(event: "multipleResolves"): MultipleResolveListener[];
-    }
-
-    interface Global {
-        Array: typeof Array;
-        ArrayBuffer: typeof ArrayBuffer;
-        Boolean: typeof Boolean;
-        Buffer: typeof Buffer;
-        DataView: typeof DataView;
-        Date: typeof Date;
-        Error: typeof Error;
-        EvalError: typeof EvalError;
-        Float32Array: typeof Float32Array;
-        Float64Array: typeof Float64Array;
-        Function: typeof Function;
-        GLOBAL: Global;
-        Infinity: typeof Infinity;
-        Int16Array: typeof Int16Array;
-        Int32Array: typeof Int32Array;
-        Int8Array: typeof Int8Array;
-        Intl: typeof Intl;
-        JSON: typeof JSON;
-        Map: MapConstructor;
-        Math: typeof Math;
-        NaN: typeof NaN;
-        Number: typeof Number;
-        Object: typeof Object;
-        Promise: Function;
-        RangeError: typeof RangeError;
-        ReferenceError: typeof ReferenceError;
-        RegExp: typeof RegExp;
-        Set: SetConstructor;
-        String: typeof String;
-        Symbol: Function;
-        SyntaxError: typeof SyntaxError;
-        TypeError: typeof TypeError;
-        URIError: typeof URIError;
-        Uint16Array: typeof Uint16Array;
-        Uint32Array: typeof Uint32Array;
-        Uint8Array: typeof Uint8Array;
-        Uint8ClampedArray: Function;
-        WeakMap: WeakMapConstructor;
-        WeakSet: WeakSetConstructor;
-        clearImmediate: (immediateId: Immediate) => void;
-        clearInterval: (intervalId: Timeout) => void;
-        clearTimeout: (timeoutId: Timeout) => void;
-        console: typeof console;
-        decodeURI: typeof decodeURI;
-        decodeURIComponent: typeof decodeURIComponent;
-        encodeURI: typeof encodeURI;
-        encodeURIComponent: typeof encodeURIComponent;
-        escape: (str: string) => string;
-        eval: typeof eval;
-        global: Global;
-        isFinite: typeof isFinite;
-        isNaN: typeof isNaN;
-        parseFloat: typeof parseFloat;
-        parseInt: typeof parseInt;
-        process: Process;
-        root: Global;
-        setImmediate: (callback: (...args: any[]) => void, ...args: any[]) => Immediate;
-        setInterval: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => Timeout;
-        setTimeout: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => Timeout;
-        undefined: typeof undefined;
-        unescape: (str: string) => string;
-        gc: () => void;
-        v8debug?: any;
-    }
-
-    interface Timer {
-        ref(): void;
-        refresh(): void;
-        unref(): void;
-    }
-
-    class Immediate {
-        ref(): void;
-        unref(): void;
-        _onImmediate: Function; // to distinguish it from the Timeout class
-    }
-
-    class Timeout implements Timer {
-        ref(): void;
-        refresh(): void;
-        unref(): void;
-    }
-
-    class Module {
-        static runMain(): void;
-        static wrap(code: string): string;
-        static createRequireFromPath(path: string): (path: string) => any;
-        static builtinModules: string[];
-
-        static Module: typeof Module;
-
-        exports: any;
-        require: NodeRequireFunction;
-        id: string;
-        filename: string;
-        loaded: boolean;
-        parent: Module | null;
-        children: Module[];
-        paths: string[];
-
-        constructor(id: string, parent?: Module);
-    }
-
-    type TypedArray = Uint8Array | Uint8ClampedArray | Uint16Array | Uint32Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array;
-}
-
-interface IterableIterator<T> { }
-
-/*----------------------------------------------*
-*                                               *
-*                   MODULES                     *
-*                                               *
-*-----------------------------------------------*/
-declare module "buffer" {
-    export const INSPECT_MAX_BYTES: number;
-    const BuffType: typeof Buffer;
-    const SlowBuffType: typeof SlowBuffer;
-    export { BuffType as Buffer, SlowBuffType as SlowBuffer };
-}
-
-declare module "querystring" {
-    interface StringifyOptions {
-        encodeURIComponent?: Function;
-    }
-
-    interface ParseOptions {
-        maxKeys?: number;
-        decodeURIComponent?: Function;
-    }
-
-    interface ParsedUrlQuery { [key: string]: string | string[]; }
-
-    function stringify(obj?: {}, sep?: string, eq?: string, options?: StringifyOptions): string;
-    function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): ParsedUrlQuery;
-    function escape(str: string): string;
-    function unescape(str: string): string;
-}
-
-declare module "events" {
-    class internal extends NodeJS.EventEmitter { }
-
-    namespace internal {
-         class EventEmitter extends internal {
-            /** @deprecated since v4.0.0 */
-            static listenerCount(emitter: EventEmitter, event: string | symbol): number;
-            static defaultMaxListeners: number;
-
-            addListener(event: string | symbol, listener: (...args: any[]) => void): this;
-            on(event: string | symbol, listener: (...args: any[]) => void): this;
-            once(event: string | symbol, listener: (...args: any[]) => void): this;
-            prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
-            prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
-            removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
-            off(event: string | symbol, listener: (...args: any[]) => void): this;
-            removeAllListeners(event?: string | symbol): this;
-            setMaxListeners(n: number): this;
-            getMaxListeners(): number;
-            listeners(event: string | symbol): Function[];
-            rawListeners(event: string | symbol): Function[];
-            emit(event: string | symbol, ...args: any[]): boolean;
-            eventNames(): Array<string | symbol>;
-            listenerCount(type: string | symbol): number;
-        }
-    }
-
-    export = internal;
-}
-
-declare module "http" {
-    import * as events from "events";
-    import * as net from "net";
-    import * as stream from "stream";
-    import { URL } from "url";
-
-    // incoming headers will never contain number
-    interface IncomingHttpHeaders {
-        'accept'?: string;
-        'access-control-allow-origin'?: string;
-        'access-control-allow-credentials'?: string;
-        'access-control-expose-headers'?: string;
-        'access-control-max-age'?: string;
-        'access-control-allow-methods'?: string;
-        'access-control-allow-headers'?: string;
-        'accept-patch'?: string;
-        'accept-ranges'?: string;
-        'age'?: string;
-        'allow'?: string;
-        'alt-svc'?: string;
-        'authorization'?: string;
-        'cache-control'?: string;
-        'connection'?: string;
-        'content-disposition'?: string;
-        'content-encoding'?: string;
-        'content-language'?: string;
-        'content-length'?: string;
-        'content-location'?: string;
-        'content-range'?: string;
-        'content-type'?: string;
-        'cookie'?: string;
-        'date'?: string;
-        'expect'?: string;
-        'expires'?: string;
-        'forwarded'?: string;
-        'from'?: string;
-        'host'?: string;
-        'if-match'?: string;
-        'if-modified-since'?: string;
-        'if-none-match'?: string;
-        'if-unmodified-since'?: string;
-        'last-modified'?: string;
-        'location'?: string;
-        'pragma'?: string;
-        'proxy-authenticate'?: string;
-        'proxy-authorization'?: string;
-        'public-key-pins'?: string;
-        'range'?: string;
-        'referer'?: string;
-        'retry-after'?: string;
-        'set-cookie'?: string[];
-        'strict-transport-security'?: string;
-        'trailer'?: string;
-        'transfer-encoding'?: string;
-        'tk'?: string;
-        'upgrade'?: string;
-        'user-agent'?: string;
-        'vary'?: string;
-        'via'?: string;
-        'warning'?: string;
-        'www-authenticate'?: string;
-        [header: string]: string | string[] | undefined;
-    }
-
-    // outgoing headers allows numbers (as they are converted internally to strings)
-    interface OutgoingHttpHeaders {
-        [header: string]: number | string | string[] | undefined;
-    }
-
-    interface ClientRequestArgs {
-        protocol?: string;
-        host?: string;
-        hostname?: string;
-        family?: number;
-        port?: number | string;
-        defaultPort?: number | string;
-        localAddress?: string;
-        socketPath?: string;
-        method?: string;
-        path?: string;
-        headers?: OutgoingHttpHeaders;
-        auth?: string;
-        agent?: Agent | boolean;
-        _defaultAgent?: Agent;
-        timeout?: number;
-        setHost?: boolean;
-        // https://github.com/nodejs/node/blob/master/lib/_http_client.js#L278
-        createConnection?: (options: ClientRequestArgs, oncreate: (err: Error, socket: net.Socket) => void) => net.Socket;
-    }
-
-    class Server extends net.Server {
-        constructor(requestListener?: (req: IncomingMessage, res: ServerResponse) => void);
-
-        setTimeout(msecs?: number, callback?: () => void): this;
-        setTimeout(callback: () => void): this;
-        maxHeadersCount: number;
-        timeout: number;
-        keepAliveTimeout: number;
-    }
-
-    // https://github.com/nodejs/node/blob/master/lib/_http_outgoing.js
-    class OutgoingMessage extends stream.Writable {
-        upgrading: boolean;
-        chunkedEncoding: boolean;
-        shouldKeepAlive: boolean;
-        useChunkedEncodingByDefault: boolean;
-        sendDate: boolean;
-        finished: boolean;
-        headersSent: boolean;
-        connection: net.Socket;
-
-        constructor();
-
-        setTimeout(msecs: number, callback?: () => void): this;
-        setHeader(name: string, value: number | string | string[]): void;
-        getHeader(name: string): number | string | string[] | undefined;
-        getHeaders(): OutgoingHttpHeaders;
-        getHeaderNames(): string[];
-        hasHeader(name: string): boolean;
-        removeHeader(name: string): void;
-        addTrailers(headers: OutgoingHttpHeaders | Array<[string, string]>): void;
-        flushHeaders(): void;
-    }
-
-    // https://github.com/nodejs/node/blob/master/lib/_http_server.js#L108-L256
-    class ServerResponse extends OutgoingMessage {
-        statusCode: number;
-        statusMessage: string;
-
-        constructor(req: IncomingMessage);
-
-        assignSocket(socket: net.Socket): void;
-        detachSocket(socket: net.Socket): void;
-        // https://github.com/nodejs/node/blob/master/test/parallel/test-http-write-callbacks.js#L53
-        // no args in writeContinue callback
-        writeContinue(callback?: () => void): void;
-        writeHead(statusCode: number, reasonPhrase?: string, headers?: OutgoingHttpHeaders): void;
-        writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
-    }
-
-    // https://github.com/nodejs/node/blob/master/lib/_http_client.js#L77
-    class ClientRequest extends OutgoingMessage {
-        connection: net.Socket;
-        socket: net.Socket;
-        aborted: number;
-
-        constructor(url: string | URL | ClientRequestArgs, cb?: (res: IncomingMessage) => void);
-
-        abort(): void;
-        onSocket(socket: net.Socket): void;
-        setTimeout(timeout: number, callback?: () => void): this;
-        setNoDelay(noDelay?: boolean): void;
-        setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
-    }
-
-    class IncomingMessage extends stream.Readable {
-        constructor(socket: net.Socket);
-
-        httpVersion: string;
-        httpVersionMajor: number;
-        httpVersionMinor: number;
-        connection: net.Socket;
-        headers: IncomingHttpHeaders;
-        rawHeaders: string[];
-        trailers: { [key: string]: string | undefined };
-        rawTrailers: string[];
-        setTimeout(msecs: number, callback: () => void): this;
-        /**
-         * Only valid for request obtained from http.Server.
-         */
-        method?: string;
-        /**
-         * Only valid for request obtained from http.Server.
-         */
-        url?: string;
-        /**
-         * Only valid for response obtained from http.ClientRequest.
-         */
-        statusCode?: number;
-        /**
-         * Only valid for response obtained from http.ClientRequest.
-         */
-        statusMessage?: string;
-        socket: net.Socket;
-        destroy(error?: Error): void;
-    }
-
-    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;
-        /**
-         * Socket timeout in milliseconds. This will set the timeout after the socket is connected.
-         */
-        timeout?: number;
-    }
-
-    class Agent {
-        maxFreeSockets: number;
-        maxSockets: number;
-        sockets: any;
-        requests: any;
-
-        constructor(opts?: AgentOptions);
-
-        /**
-         * Destroy any sockets that are currently in use by the agent.
-         * It is usually not necessary to do this. However, if you are using an agent with KeepAlive enabled,
-         * then it is best to explicitly shut down the agent when you know that it will no longer be used. Otherwise,
-         * sockets may hang open for quite a long time before the server terminates them.
-         */
-        destroy(): void;
-    }
-
-    const METHODS: string[];
-
-    const STATUS_CODES: {
-        [errorCode: number]: string | undefined;
-        [errorCode: string]: string | undefined;
-    };
-
-    function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) => void): Server;
-    function createClient(port?: number, host?: string): any;
-
-    // although RequestOptions are passed as ClientRequestArgs to ClientRequest directly,
-    // create interface RequestOptions would make the naming more clear to developers
-    interface RequestOptions extends ClientRequestArgs { }
-    function request(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): ClientRequest;
-    function request(url: string | URL, options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
-    function get(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): ClientRequest;
-    function get(url: string | URL, options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
-    let globalAgent: Agent;
-}
-
-declare module "cluster" {
-    import * as child from "child_process";
-    import * as events from "events";
-    import * as net from "net";
-
-    // interfaces
-    interface ClusterSettings {
-        execArgv?: string[]; // default: process.execArgv
-        exec?: string;
-        args?: string[];
-        silent?: boolean;
-        stdio?: any[];
-        uid?: number;
-        gid?: number;
-        inspectPort?: number | (() => number);
-    }
-
-    interface Address {
-        address: string;
-        port: number;
-        addressType: number | "udp4" | "udp6";  // 4, 6, -1, "udp4", "udp6"
-    }
-
-    class Worker extends events.EventEmitter {
-        id: number;
-        process: child.ChildProcess;
-        suicide: boolean;
-        send(message: any, sendHandle?: any, callback?: (error: Error) => void): boolean;
-        kill(signal?: string): void;
-        destroy(signal?: string): void;
-        disconnect(): void;
-        isConnected(): boolean;
-        isDead(): boolean;
-        exitedAfterDisconnect: boolean;
-
-        /**
-         * events.EventEmitter
-         *   1. disconnect
-         *   2. error
-         *   3. exit
-         *   4. listening
-         *   5. message
-         *   6. online
-         */
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "disconnect", listener: () => void): this;
-        addListener(event: "error", listener: (error: Error) => void): this;
-        addListener(event: "exit", listener: (code: number, signal: string) => void): this;
-        addListener(event: "listening", listener: (address: Address) => void): this;
-        addListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-        addListener(event: "online", listener: () => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "disconnect"): boolean;
-        emit(event: "error", error: Error): boolean;
-        emit(event: "exit", code: number, signal: string): boolean;
-        emit(event: "listening", address: Address): boolean;
-        emit(event: "message", message: any, handle: net.Socket | net.Server): boolean;
-        emit(event: "online"): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "disconnect", listener: () => void): this;
-        on(event: "error", listener: (error: Error) => void): this;
-        on(event: "exit", listener: (code: number, signal: string) => void): this;
-        on(event: "listening", listener: (address: Address) => void): this;
-        on(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-        on(event: "online", listener: () => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "disconnect", listener: () => void): this;
-        once(event: "error", listener: (error: Error) => void): this;
-        once(event: "exit", listener: (code: number, signal: string) => void): this;
-        once(event: "listening", listener: (address: Address) => void): this;
-        once(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-        once(event: "online", listener: () => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "disconnect", listener: () => void): this;
-        prependListener(event: "error", listener: (error: Error) => void): this;
-        prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
-        prependListener(event: "listening", listener: (address: Address) => void): this;
-        prependListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-        prependListener(event: "online", listener: () => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "disconnect", listener: () => void): this;
-        prependOnceListener(event: "error", listener: (error: Error) => void): this;
-        prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
-        prependOnceListener(event: "listening", listener: (address: Address) => void): this;
-        prependOnceListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-        prependOnceListener(event: "online", listener: () => void): this;
-    }
-
-    interface Cluster extends events.EventEmitter {
-        Worker: Worker;
-        disconnect(callback?: Function): void;
-        fork(env?: any): Worker;
-        isMaster: boolean;
-        isWorker: boolean;
-        // TODO: cluster.schedulingPolicy
-        settings: ClusterSettings;
-        setupMaster(settings?: ClusterSettings): void;
-        worker?: Worker;
-        workers?: {
-            [index: string]: Worker | undefined
-        };
-
-        /**
-         * events.EventEmitter
-         *   1. disconnect
-         *   2. exit
-         *   3. fork
-         *   4. listening
-         *   5. message
-         *   6. online
-         *   7. setup
-         */
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "disconnect", listener: (worker: Worker) => void): this;
-        addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-        addListener(event: "fork", listener: (worker: Worker) => void): this;
-        addListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-        addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-        addListener(event: "online", listener: (worker: Worker) => void): this;
-        addListener(event: "setup", listener: (settings: any) => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "disconnect", worker: Worker): boolean;
-        emit(event: "exit", worker: Worker, code: number, signal: string): boolean;
-        emit(event: "fork", worker: Worker): boolean;
-        emit(event: "listening", worker: Worker, address: Address): boolean;
-        emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
-        emit(event: "online", worker: Worker): boolean;
-        emit(event: "setup", settings: any): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "disconnect", listener: (worker: Worker) => void): this;
-        on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-        on(event: "fork", listener: (worker: Worker) => void): this;
-        on(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-        on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-        on(event: "online", listener: (worker: Worker) => void): this;
-        on(event: "setup", listener: (settings: any) => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "disconnect", listener: (worker: Worker) => void): this;
-        once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-        once(event: "fork", listener: (worker: Worker) => void): this;
-        once(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-        once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-        once(event: "online", listener: (worker: Worker) => void): this;
-        once(event: "setup", listener: (settings: any) => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "disconnect", listener: (worker: Worker) => void): this;
-        prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-        prependListener(event: "fork", listener: (worker: Worker) => void): this;
-        prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-        prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-        prependListener(event: "online", listener: (worker: Worker) => void): this;
-        prependListener(event: "setup", listener: (settings: any) => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): this;
-        prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-        prependOnceListener(event: "fork", listener: (worker: Worker) => void): this;
-        prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-        // the handle is a net.Socket or net.Server object, or undefined.
-        prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;
-        prependOnceListener(event: "online", listener: (worker: Worker) => void): this;
-        prependOnceListener(event: "setup", listener: (settings: any) => void): this;
-    }
-
-    function disconnect(callback?: Function): void;
-    function fork(env?: any): Worker;
-    const isMaster: boolean;
-    const isWorker: boolean;
-    // TODO: cluster.schedulingPolicy
-    const settings: ClusterSettings;
-    function setupMaster(settings?: ClusterSettings): void;
-    const worker: Worker;
-    const workers: {
-        [index: string]: Worker | undefined
-    };
-
-    /**
-     * events.EventEmitter
-     *   1. disconnect
-     *   2. exit
-     *   3. fork
-     *   4. listening
-     *   5. message
-     *   6. online
-     *   7. setup
-     */
-    function addListener(event: string, listener: (...args: any[]) => void): Cluster;
-    function addListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
-    function addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
-    function addListener(event: "fork", listener: (worker: Worker) => void): Cluster;
-    function addListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
-     // the handle is a net.Socket or net.Server object, or undefined.
-    function addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;
-    function addListener(event: "online", listener: (worker: Worker) => void): Cluster;
-    function addListener(event: "setup", listener: (settings: any) => void): Cluster;
-
-    function emit(event: string | symbol, ...args: any[]): boolean;
-    function emit(event: "disconnect", worker: Worker): boolean;
-    function emit(event: "exit", worker: Worker, code: number, signal: string): boolean;
-    function emit(event: "fork", worker: Worker): boolean;
-    function emit(event: "listening", worker: Worker, address: Address): boolean;
-    function emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
-    function emit(event: "online", worker: Worker): boolean;
-    function emit(event: "setup", settings: any): boolean;
-
-    function on(event: string, listener: (...args: any[]) => void): Cluster;
-    function on(event: "disconnect", listener: (worker: Worker) => void): Cluster;
-    function on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
-    function on(event: "fork", listener: (worker: Worker) => void): Cluster;
-    function on(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
-    function on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
-    function on(event: "online", listener: (worker: Worker) => void): Cluster;
-    function on(event: "setup", listener: (settings: any) => void): Cluster;
-
-    function once(event: string, listener: (...args: any[]) => void): Cluster;
-    function once(event: "disconnect", listener: (worker: Worker) => void): Cluster;
-    function once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
-    function once(event: "fork", listener: (worker: Worker) => void): Cluster;
-    function once(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
-    function once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
-    function once(event: "online", listener: (worker: Worker) => void): Cluster;
-    function once(event: "setup", listener: (settings: any) => void): Cluster;
-
-    function removeListener(event: string, listener: (...args: any[]) => void): Cluster;
-    function removeAllListeners(event?: string): Cluster;
-    function setMaxListeners(n: number): Cluster;
-    function getMaxListeners(): number;
-    function listeners(event: string): Function[];
-    function listenerCount(type: string): number;
-
-    function prependListener(event: string, listener: (...args: any[]) => void): Cluster;
-    function prependListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
-    function prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
-    function prependListener(event: "fork", listener: (worker: Worker) => void): Cluster;
-    function prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
-     // the handle is a net.Socket or net.Server object, or undefined.
-    function prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;
-    function prependListener(event: "online", listener: (worker: Worker) => void): Cluster;
-    function prependListener(event: "setup", listener: (settings: any) => void): Cluster;
-
-    function prependOnceListener(event: string, listener: (...args: any[]) => void): Cluster;
-    function prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
-    function prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
-    function prependOnceListener(event: "fork", listener: (worker: Worker) => void): Cluster;
-    function prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
-     // the handle is a net.Socket or net.Server object, or undefined.
-    function prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;
-    function prependOnceListener(event: "online", listener: (worker: Worker) => void): Cluster;
-    function prependOnceListener(event: "setup", listener: (settings: any) => void): Cluster;
-
-    function eventNames(): string[];
-}
-
-declare module "worker_threads" {
-    import { EventEmitter } from "events";
-    import { Readable, Writable } from "stream";
-
-    const isMainThread: boolean;
-    const parentPort: null | MessagePort;
-    const threadId: number;
-    const workerData: any;
-
-    class MessageChannel {
-        readonly port1: MessagePort;
-        readonly port2: MessagePort;
-    }
-
-    class MessagePort extends EventEmitter {
-        close(): void;
-        postMessage(value: any, transferList?: Array<ArrayBuffer | MessagePort>): void;
-        ref(): void;
-        unref(): void;
-        start(): void;
-
-        addListener(event: "close", listener: () => void): this;
-        addListener(event: "message", listener: (value: any) => void): this;
-        addListener(event: string | symbol, listener: (...args: any[]) => void): this;
-
-        emit(event: "close"): boolean;
-        emit(event: "message", value: any): boolean;
-        emit(event: string | symbol, ...args: any[]): boolean;
-
-        on(event: "close", listener: () => void): this;
-        on(event: "message", listener: (value: any) => void): this;
-        on(event: string | symbol, listener: (...args: any[]) => void): this;
-
-        once(event: "close", listener: () => void): this;
-        once(event: "message", listener: (value: any) => void): this;
-        once(event: string | symbol, listener: (...args: any[]) => void): this;
-
-        prependListener(event: "close", listener: () => void): this;
-        prependListener(event: "message", listener: (value: any) => void): this;
-        prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
-
-        prependOnceListener(event: "close", listener: () => void): this;
-        prependOnceListener(event: "message", listener: (value: any) => void): this;
-        prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
-
-        removeListener(event: "close", listener: () => void): this;
-        removeListener(event: "message", listener: (value: any) => void): this;
-        removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
-
-        off(event: "close", listener: () => void): this;
-        off(event: "message", listener: (value: any) => void): this;
-        off(event: string | symbol, listener: (...args: any[]) => void): this;
-    }
-
-    interface WorkerOptions {
-        eval?: boolean;
-        workerData?: any;
-        stdin?: boolean;
-        stdout?: boolean;
-        stderr?: boolean;
-    }
-
-    class Worker extends EventEmitter {
-        readonly stdin: Writable | null;
-        readonly stdout: Readable;
-        readonly stderr: Readable;
-        readonly threadId: number;
-
-        constructor(filename: string, options?: WorkerOptions);
-
-        postMessage(value: any, transferList?: Array<ArrayBuffer | MessagePort>): void;
-        ref(): void;
-        unref(): void;
-        terminate(callback?: (err: any, exitCode: number) => void): void;
-
-        addListener(event: "error", listener: (err: any) => void): this;
-        addListener(event: "exit", listener: (exitCode: number) => void): this;
-        addListener(event: "message", listener: (value: any) => void): this;
-        addListener(event: "online", listener: () => void): this;
-        addListener(event: string | symbol, listener: (...args: any[]) => void): this;
-
-        emit(event: "error", err: any): boolean;
-        emit(event: "exit", exitCode: number): boolean;
-        emit(event: "message", value: any): boolean;
-        emit(event: "online"): boolean;
-        emit(event: string | symbol, ...args: any[]): boolean;
-
-        on(event: "error", listener: (err: any) => void): this;
-        on(event: "exit", listener: (exitCode: number) => void): this;
-        on(event: "message", listener: (value: any) => void): this;
-        on(event: "online", listener: () => void): this;
-        on(event: string | symbol, listener: (...args: any[]) => void): this;
-
-        once(event: "error", listener: (err: any) => void): this;
-        once(event: "exit", listener: (exitCode: number) => void): this;
-        once(event: "message", listener: (value: any) => void): this;
-        once(event: "online", listener: () => void): this;
-        once(event: string | symbol, listener: (...args: any[]) => void): this;
-
-        prependListener(event: "error", listener: (err: any) => void): this;
-        prependListener(event: "exit", listener: (exitCode: number) => void): this;
-        prependListener(event: "message", listener: (value: any) => void): this;
-        prependListener(event: "online", listener: () => void): this;
-        prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
-
-        prependOnceListener(event: "error", listener: (err: any) => void): this;
-        prependOnceListener(event: "exit", listener: (exitCode: number) => void): this;
-        prependOnceListener(event: "message", listener: (value: any) => void): this;
-        prependOnceListener(event: "online", listener: () => void): this;
-        prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
-
-        removeListener(event: "error", listener: (err: any) => void): this;
-        removeListener(event: "exit", listener: (exitCode: number) => void): this;
-        removeListener(event: "message", listener: (value: any) => void): this;
-        removeListener(event: "online", listener: () => void): this;
-        removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
-
-        off(event: "error", listener: (err: any) => void): this;
-        off(event: "exit", listener: (exitCode: number) => void): this;
-        off(event: "message", listener: (value: any) => void): this;
-        off(event: "online", listener: () => void): this;
-        off(event: string | symbol, listener: (...args: any[]) => void): this;
-    }
-}
-
-declare module "zlib" {
-    import * as stream from "stream";
-
-    interface ZlibOptions {
-        flush?: number; // default: zlib.constants.Z_NO_FLUSH
-        finishFlush?: number; // default: zlib.constants.Z_FINISH
-        chunkSize?: number; // default: 16*1024
-        windowBits?: number;
-        level?: number; // compression only
-        memLevel?: number; // compression only
-        strategy?: number; // compression only
-        dictionary?: Buffer | NodeJS.TypedArray | DataView | ArrayBuffer; // deflate/inflate only, empty dictionary by default
-    }
-
-    interface Zlib {
-        readonly bytesRead: number;
-        close(callback?: () => void): void;
-        flush(kind?: number | (() => void), callback?: () => void): void;
-    }
-
-    interface ZlibParams {
-        params(level: number, strategy: number, callback: () => void): void;
-    }
-
-    interface ZlibReset {
-        reset(): void;
-    }
-
-    interface Gzip extends stream.Transform, Zlib { }
-    interface Gunzip extends stream.Transform, Zlib { }
-    interface Deflate extends stream.Transform, Zlib, ZlibReset, ZlibParams { }
-    interface Inflate extends stream.Transform, Zlib, ZlibReset { }
-    interface DeflateRaw extends stream.Transform, Zlib, ZlibReset, ZlibParams { }
-    interface InflateRaw extends stream.Transform, Zlib, ZlibReset { }
-    interface Unzip extends stream.Transform, Zlib { }
-
-    function createGzip(options?: ZlibOptions): Gzip;
-    function createGunzip(options?: ZlibOptions): Gunzip;
-    function createDeflate(options?: ZlibOptions): Deflate;
-    function createInflate(options?: ZlibOptions): Inflate;
-    function createDeflateRaw(options?: ZlibOptions): DeflateRaw;
-    function createInflateRaw(options?: ZlibOptions): InflateRaw;
-    function createUnzip(options?: ZlibOptions): Unzip;
-
-    type InputType = string | Buffer | DataView | ArrayBuffer | NodeJS.TypedArray;
-    function deflate(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
-    function deflate(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
-    function deflateSync(buf: InputType, options?: ZlibOptions): Buffer;
-    function deflateRaw(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
-    function deflateRaw(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
-    function deflateRawSync(buf: InputType, options?: ZlibOptions): Buffer;
-    function gzip(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
-    function gzip(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
-    function gzipSync(buf: InputType, options?: ZlibOptions): Buffer;
-    function gunzip(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
-    function gunzip(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
-    function gunzipSync(buf: InputType, options?: ZlibOptions): Buffer;
-    function inflate(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
-    function inflate(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
-    function inflateSync(buf: InputType, options?: ZlibOptions): Buffer;
-    function inflateRaw(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
-    function inflateRaw(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
-    function inflateRawSync(buf: InputType, options?: ZlibOptions): Buffer;
-    function unzip(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
-    function unzip(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
-    function unzipSync(buf: InputType, options?: ZlibOptions): Buffer;
-
-    namespace constants {
-        // Allowed flush values.
-
-        const Z_NO_FLUSH: number;
-        const Z_PARTIAL_FLUSH: number;
-        const Z_SYNC_FLUSH: number;
-        const Z_FULL_FLUSH: number;
-        const Z_FINISH: number;
-        const Z_BLOCK: number;
-        const Z_TREES: number;
-
-        // Return codes for the compression/decompression functions. Negative values are errors, positive values are used for special but normal events.
-
-        const Z_OK: number;
-        const Z_STREAM_END: number;
-        const Z_NEED_DICT: number;
-        const Z_ERRNO: number;
-        const Z_STREAM_ERROR: number;
-        const Z_DATA_ERROR: number;
-        const Z_MEM_ERROR: number;
-        const Z_BUF_ERROR: number;
-        const Z_VERSION_ERROR: number;
-
-        // Compression levels.
-
-        const Z_NO_COMPRESSION: number;
-        const Z_BEST_SPEED: number;
-        const Z_BEST_COMPRESSION: number;
-        const Z_DEFAULT_COMPRESSION: number;
-
-        // Compression strategy.
-
-        const Z_FILTERED: number;
-        const Z_HUFFMAN_ONLY: number;
-        const Z_RLE: number;
-        const Z_FIXED: number;
-        const Z_DEFAULT_STRATEGY: number;
-    }
-
-    // Constants
-    const Z_NO_FLUSH: number;
-    const Z_PARTIAL_FLUSH: number;
-    const Z_SYNC_FLUSH: number;
-    const Z_FULL_FLUSH: number;
-    const Z_FINISH: number;
-    const Z_BLOCK: number;
-    const Z_TREES: number;
-    const Z_OK: number;
-    const Z_STREAM_END: number;
-    const Z_NEED_DICT: number;
-    const Z_ERRNO: number;
-    const Z_STREAM_ERROR: number;
-    const Z_DATA_ERROR: number;
-    const Z_MEM_ERROR: number;
-    const Z_BUF_ERROR: number;
-    const Z_VERSION_ERROR: number;
-    const Z_NO_COMPRESSION: number;
-    const Z_BEST_SPEED: number;
-    const Z_BEST_COMPRESSION: number;
-    const Z_DEFAULT_COMPRESSION: number;
-    const Z_FILTERED: number;
-    const Z_HUFFMAN_ONLY: number;
-    const Z_RLE: number;
-    const Z_FIXED: number;
-    const Z_DEFAULT_STRATEGY: number;
-    const Z_BINARY: number;
-    const Z_TEXT: number;
-    const Z_ASCII: number;
-    const Z_UNKNOWN: number;
-    const Z_DEFLATED: number;
-}
-
-declare module "os" {
-    interface CpuInfo {
-        model: string;
-        speed: number;
-        times: {
-            user: number;
-            nice: number;
-            sys: number;
-            idle: number;
-            irq: number;
-        };
-    }
-
-    interface NetworkInterfaceBase {
-        address: string;
-        netmask: string;
-        mac: string;
-        internal: boolean;
-        cidr: string | null;
-    }
-
-    interface NetworkInterfaceInfoIPv4 extends NetworkInterfaceBase {
-        family: "IPv4";
-    }
-
-    interface NetworkInterfaceInfoIPv6 extends NetworkInterfaceBase {
-        family: "IPv6";
-        scopeid: number;
-    }
-
-    type NetworkInterfaceInfo = NetworkInterfaceInfoIPv4 | NetworkInterfaceInfoIPv6;
-
-    function hostname(): string;
-    function loadavg(): number[];
-    function uptime(): number;
-    function freemem(): number;
-    function totalmem(): number;
-    function cpus(): CpuInfo[];
-    function type(): string;
-    function release(): string;
-    function networkInterfaces(): { [index: string]: NetworkInterfaceInfo[] };
-    function homedir(): string;
-    function userInfo(options?: { encoding: string }): { username: string, uid: number, gid: number, shell: any, homedir: string };
-    const constants: {
-        UV_UDP_REUSEADDR: number;
-        signals: {
-            SIGHUP: number;
-            SIGINT: number;
-            SIGQUIT: number;
-            SIGILL: number;
-            SIGTRAP: number;
-            SIGABRT: number;
-            SIGIOT: number;
-            SIGBUS: number;
-            SIGFPE: number;
-            SIGKILL: number;
-            SIGUSR1: number;
-            SIGSEGV: number;
-            SIGUSR2: number;
-            SIGPIPE: number;
-            SIGALRM: number;
-            SIGTERM: number;
-            SIGCHLD: number;
-            SIGSTKFLT: number;
-            SIGCONT: number;
-            SIGSTOP: number;
-            SIGTSTP: number;
-            SIGTTIN: number;
-            SIGTTOU: number;
-            SIGURG: number;
-            SIGXCPU: number;
-            SIGXFSZ: number;
-            SIGVTALRM: number;
-            SIGPROF: number;
-            SIGWINCH: number;
-            SIGIO: number;
-            SIGPOLL: number;
-            SIGPWR: number;
-            SIGSYS: number;
-            SIGUNUSED: number;
-        };
-        errno: {
-            E2BIG: number;
-            EACCES: number;
-            EADDRINUSE: number;
-            EADDRNOTAVAIL: number;
-            EAFNOSUPPORT: number;
-            EAGAIN: number;
-            EALREADY: number;
-            EBADF: number;
-            EBADMSG: number;
-            EBUSY: number;
-            ECANCELED: number;
-            ECHILD: number;
-            ECONNABORTED: number;
-            ECONNREFUSED: number;
-            ECONNRESET: number;
-            EDEADLK: number;
-            EDESTADDRREQ: number;
-            EDOM: number;
-            EDQUOT: number;
-            EEXIST: number;
-            EFAULT: number;
-            EFBIG: number;
-            EHOSTUNREACH: number;
-            EIDRM: number;
-            EILSEQ: number;
-            EINPROGRESS: number;
-            EINTR: number;
-            EINVAL: number;
-            EIO: number;
-            EISCONN: number;
-            EISDIR: number;
-            ELOOP: number;
-            EMFILE: number;
-            EMLINK: number;
-            EMSGSIZE: number;
-            EMULTIHOP: number;
-            ENAMETOOLONG: number;
-            ENETDOWN: number;
-            ENETRESET: number;
-            ENETUNREACH: number;
-            ENFILE: number;
-            ENOBUFS: number;
-            ENODATA: number;
-            ENODEV: number;
-            ENOENT: number;
-            ENOEXEC: number;
-            ENOLCK: number;
-            ENOLINK: number;
-            ENOMEM: number;
-            ENOMSG: number;
-            ENOPROTOOPT: number;
-            ENOSPC: number;
-            ENOSR: number;
-            ENOSTR: number;
-            ENOSYS: number;
-            ENOTCONN: number;
-            ENOTDIR: number;
-            ENOTEMPTY: number;
-            ENOTSOCK: number;
-            ENOTSUP: number;
-            ENOTTY: number;
-            ENXIO: number;
-            EOPNOTSUPP: number;
-            EOVERFLOW: number;
-            EPERM: number;
-            EPIPE: number;
-            EPROTO: number;
-            EPROTONOSUPPORT: number;
-            EPROTOTYPE: number;
-            ERANGE: number;
-            EROFS: number;
-            ESPIPE: number;
-            ESRCH: number;
-            ESTALE: number;
-            ETIME: number;
-            ETIMEDOUT: number;
-            ETXTBSY: number;
-            EWOULDBLOCK: number;
-            EXDEV: number;
-        };
-        priority: {
-            PRIORITY_LOW: number;
-            PRIORITY_BELOW_NORMAL: number;
-            PRIORITY_NORMAL: number;
-            PRIORITY_ABOVE_NORMAL: number;
-            PRIORITY_HIGH: number;
-            PRIORITY_HIGHEST: number;
-        }
-    };
-    function arch(): string;
-    function platform(): NodeJS.Platform;
-    function tmpdir(): string;
-    const EOL: string;
-    function endianness(): "BE" | "LE";
-    /**
-     * Gets the priority of a process.
-     * Defaults to current process.
-     */
-    function getPriority(pid?: number): number;
-    /**
-     * Sets the priority of the current process.
-     * @param priority Must be in range of -20 to 19
-     */
-    function setPriority(priority: number): void;
-    /**
-     * Sets the priority of the process specified process.
-     * @param priority Must be in range of -20 to 19
-     */
-    function setPriority(pid: number, priority: number): void;
-}
-
-declare module "https" {
-    import * as tls from "tls";
-    import * as events from "events";
-    import * as http from "http";
-    import { URL } from "url";
-
-    type ServerOptions = tls.SecureContextOptions & tls.TlsOptions;
-
-    type RequestOptions = http.RequestOptions & tls.SecureContextOptions & {
-        rejectUnauthorized?: boolean; // Defaults to true
-        servername?: string; // SNI TLS Extension
-    };
-
-    interface AgentOptions extends http.AgentOptions, tls.ConnectionOptions {
-        rejectUnauthorized?: boolean;
-        maxCachedSessions?: number;
-    }
-
-    class Agent extends http.Agent {
-        constructor(options?: AgentOptions);
-        options: AgentOptions;
-    }
-
-    class Server extends tls.Server {
-        setTimeout(callback: () => void): this;
-        setTimeout(msecs?: number, callback?: () => void): this;
-        timeout: number;
-        keepAliveTimeout: number;
-    }
-
-    function createServer(options: ServerOptions, requestListener?: (req: http.IncomingMessage, res: http.ServerResponse) => void): Server;
-    function request(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
-    function request(url: string | URL, options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
-    function get(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
-    function get(url: string | URL, options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
-    let globalAgent: Agent;
-}
-
-declare module "punycode" {
-    function decode(string: string): string;
-    function encode(string: string): string;
-    function toUnicode(domain: string): string;
-    function toASCII(domain: string): string;
-    const ucs2: ucs2;
-    interface ucs2 {
-        decode(string: string): number[];
-        encode(codePoints: number[]): string;
-    }
-    const version: any;
-}
-
-declare module "repl" {
-    import { Interface, Completer, AsyncCompleter } from "readline";
-    import { Context } from "vm";
-    import { InspectOptions } from "util";
-
-    interface ReplOptions {
-        /**
-         * The input prompt to display.
-         * Default: `"> "`
-         */
-        prompt?: string;
-        /**
-         * The `Readable` stream from which REPL input will be read.
-         * Default: `process.stdin`
-         */
-        input?: NodeJS.ReadableStream;
-        /**
-         * The `Writable` stream to which REPL output will be written.
-         * Default: `process.stdout`
-         */
-        output?: NodeJS.WritableStream;
-        /**
-         * If `true`, specifies that the output should be treated as a TTY terminal, and have
-         * ANSI/VT100 escape codes written to it.
-         * Default: checking the value of the `isTTY` property on the output stream upon
-         * instantiation.
-         */
-        terminal?: boolean;
-        /**
-         * The function to be used when evaluating each given line of input.
-         * Default: an async wrapper for the JavaScript `eval()` function. An `eval` function can
-         * error with `repl.Recoverable` to indicate the input was incomplete and prompt for
-         * additional lines.
-         *
-         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_default_evaluation
-         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_custom_evaluation_functions
-         */
-        eval?: REPLEval;
-        /**
-         * If `true`, specifies that the default `writer` function should include ANSI color
-         * styling to REPL output. If a custom `writer` function is provided then this has no
-         * effect.
-         * Default: the REPL instance's `terminal` value.
-         */
-        useColors?: boolean;
-        /**
-         * If `true`, specifies that the default evaluation function will use the JavaScript
-         * `global` as the context as opposed to creating a new separate context for the REPL
-         * instance. The node CLI REPL sets this value to `true`.
-         * Default: `false`.
-         */
-        useGlobal?: boolean;
-        /**
-         * If `true`, specifies that the default writer will not output the return value of a
-         * command if it evaluates to `undefined`.
-         * Default: `false`.
-         */
-        ignoreUndefined?: boolean;
-        /**
-         * The function to invoke to format the output of each command before writing to `output`.
-         * Default: a wrapper for `util.inspect`.
-         *
-         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_customizing_repl_output
-         */
-        writer?: REPLWriter;
-        /**
-         * An optional function used for custom Tab auto completion.
-         *
-         * @see https://nodejs.org/dist/latest-v11.x/docs/api/readline.html#readline_use_of_the_completer_function
-         */
-        completer?: Completer | AsyncCompleter;
-        /**
-         * A flag that specifies whether the default evaluator executes all JavaScript commands in
-         * strict mode or default (sloppy) mode.
-         * Accepted values are:
-         * - `repl.REPL_MODE_SLOPPY` - evaluates expressions in sloppy mode.
-         * - `repl.REPL_MODE_STRICT` - evaluates expressions in strict mode. This is equivalent to
-         *   prefacing every repl statement with `'use strict'`.
-         */
-        replMode?: typeof REPL_MODE_SLOPPY | typeof REPL_MODE_STRICT;
-        /**
-         * Stop evaluating the current piece of code when `SIGINT` is received, i.e. `Ctrl+C` is
-         * pressed. This cannot be used together with a custom `eval` function.
-         * Default: `false`.
-         */
-        breakEvalOnSigint?: boolean;
-    }
-
-    type REPLEval = (this: REPLServer, evalCmd: string, context: Context, file: string, cb: (err: Error | null, result: any) => void) => void;
-    type REPLWriter = (this: REPLServer, obj: any) => string;
-
-    /**
-     * This is the default "writer" value, if none is passed in the REPL options,
-     * and it can be overridden by custom print functions.
-     */
-    const writer: REPLWriter & { options: InspectOptions };
-
-    type REPLCommandAction = (this: REPLServer, text: string) => void;
-
-    interface REPLCommand {
-        /**
-         * Help text to be displayed when `.help` is entered.
-         */
-        help?: string;
-        /**
-         * The function to execute, optionally accepting a single string argument.
-         */
-        action: REPLCommandAction;
-    }
-
-    /**
-     * Provides a customizable Read-Eval-Print-Loop (REPL).
-     *
-     * Instances of `repl.REPLServer` will accept individual lines of user input, evaluate those
-     * according to a user-defined evaluation function, then output the result. Input and output
-     * may be from `stdin` and `stdout`, respectively, or may be connected to any Node.js `stream`.
-     *
-     * Instances of `repl.REPLServer` support automatic completion of inputs, simplistic Emacs-style
-     * line editing, multi-line inputs, ANSI-styled output, saving and restoring current REPL session
-     * state, error recovery, and customizable evaluation functions.
-     *
-     * Instances of `repl.REPLServer` are created using the `repl.start()` method and _should not_
-     * be created directly using the JavaScript `new` keyword.
-     *
-     * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_repl
-     */
-    class REPLServer extends Interface {
-        /**
-         * The `vm.Context` provided to the `eval` function to be used for JavaScript
-         * evaluation.
-         */
-        readonly context: Context;
-        /**
-         * The `Readable` stream from which REPL input will be read.
-         */
-        readonly inputStream: NodeJS.ReadableStream;
-        /**
-         * The `Writable` stream to which REPL output will be written.
-         */
-        readonly outputStream: NodeJS.WritableStream;
-        /**
-         * The commands registered via `replServer.defineCommand()`.
-         */
-        readonly commands: { readonly [name: string]: REPLCommand | undefined };
-        /**
-         * A value indicating whether the REPL is currently in "editor mode".
-         *
-         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_commands_and_special_keys
-         */
-        readonly editorMode: boolean;
-        /**
-         * A value indicating whether the `_` variable has been assigned.
-         *
-         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_assignment_of_the_underscore_variable
-         */
-        readonly underscoreAssigned: boolean;
-        /**
-         * The last evaluation result from the REPL (assigned to the `_` variable inside of the REPL).
-         *
-         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_assignment_of_the_underscore_variable
-         */
-        readonly last: any;
-        /**
-         * A value indicating whether the `_error` variable has been assigned.
-         *
-         * @since v9.8.0
-         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_assignment_of_the_underscore_variable
-         */
-        readonly underscoreErrAssigned: boolean;
-        /**
-         * The last error raised inside the REPL (assigned to the `_error` variable inside of the REPL).
-         *
-         * @since v9.8.0
-         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_assignment_of_the_underscore_variable
-         */
-        readonly lastError: any;
-        /**
-         * Specified in the REPL options, this is the function to be used when evaluating each
-         * given line of input. If not specified in the REPL options, this is an async wrapper
-         * for the JavaScript `eval()` function.
-         */
-        readonly eval: REPLEval;
-        /**
-         * Specified in the REPL options, this is a value indicating whether the default
-         * `writer` function should include ANSI color styling to REPL output.
-         */
-        readonly useColors: boolean;
-        /**
-         * Specified in the REPL options, this is a value indicating whether the default `eval`
-         * function will use the JavaScript `global` as the context as opposed to creating a new
-         * separate context for the REPL instance.
-         */
-        readonly useGlobal: boolean;
-        /**
-         * Specified in the REPL options, this is a value indicating whether the default `writer`
-         * function should output the result of a command if it evaluates to `undefined`.
-         */
-        readonly ignoreUndefined: boolean;
-        /**
-         * Specified in the REPL options, this is the function to invoke to format the output of
-         * each command before writing to `outputStream`. If not specified in the REPL options,
-         * this will be a wrapper for `util.inspect`.
-         */
-        readonly writer: REPLWriter;
-        /**
-         * Specified in the REPL options, this is the function to use for custom Tab auto-completion.
-         */
-        readonly completer: Completer | AsyncCompleter;
-        /**
-         * Specified in the REPL options, this is a flag that specifies whether the default `eval`
-         * function should execute all JavaScript commands in strict mode or default (sloppy) mode.
-         * Possible values are:
-         * - `repl.REPL_MODE_SLOPPY` - evaluates expressions in sloppy mode.
-         * - `repl.REPL_MODE_STRICT` - evaluates expressions in strict mode. This is equivalent to
-         *    prefacing every repl statement with `'use strict'`.
-         */
-        readonly replMode: typeof REPL_MODE_SLOPPY | typeof REPL_MODE_STRICT;
-
-        /**
-         * NOTE: According to the documentation:
-         *
-         * > Instances of `repl.REPLServer` are created using the `repl.start()` method and
-         * > _should not_ be created directly using the JavaScript `new` keyword.
-         *
-         * `REPLServer` cannot be subclassed due to implementation specifics in NodeJS.
-         *
-         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_class_replserver
-         */
-        private constructor();
-
-        /**
-         * Used to add new `.`-prefixed commands to the REPL instance. Such commands are invoked
-         * by typing a `.` followed by the `keyword`.
-         *
-         * @param keyword The command keyword (_without_ a leading `.` character).
-         * @param cmd The function to invoke when the command is processed.
-         *
-         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_replserver_definecommand_keyword_cmd
-         */
-        defineCommand(keyword: string, cmd: REPLCommandAction | REPLCommand): void;
-        /**
-         * Readies the REPL instance for input from the user, printing the configured `prompt` to a
-         * new line in the `output` and resuming the `input` to accept new input.
-         *
-         * When multi-line input is being entered, an ellipsis is printed rather than the 'prompt'.
-         *
-         * This method is primarily intended to be called from within the action function for
-         * commands registered using the `replServer.defineCommand()` method.
-         *
-         * @param preserveCursor When `true`, the cursor placement will not be reset to `0`.
-         */
-        displayPrompt(preserveCursor?: boolean): void;
-        /**
-         * Clears any command that has been buffered but not yet executed.
-         *
-         * This method is primarily intended to be called from within the action function for
-         * commands registered using the `replServer.defineCommand()` method.
-         *
-         * @since v9.0.0
-         */
-        clearBufferedCommand(): void;
-
-        /**
-         * events.EventEmitter
-         * 1. close - inherited from `readline.Interface`
-         * 2. line - inherited from `readline.Interface`
-         * 3. pause - inherited from `readline.Interface`
-         * 4. resume - inherited from `readline.Interface`
-         * 5. SIGCONT - inherited from `readline.Interface`
-         * 6. SIGINT - inherited from `readline.Interface`
-         * 7. SIGTSTP - inherited from `readline.Interface`
-         * 8. exit
-         * 9. reset
-         */
-
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "close", listener: () => void): this;
-        addListener(event: "line", listener: (input: string) => void): this;
-        addListener(event: "pause", listener: () => void): this;
-        addListener(event: "resume", listener: () => void): this;
-        addListener(event: "SIGCONT", listener: () => void): this;
-        addListener(event: "SIGINT", listener: () => void): this;
-        addListener(event: "SIGTSTP", listener: () => void): this;
-        addListener(event: "exit", listener: () => void): this;
-        addListener(event: "reset", listener: (context: Context) => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "close"): boolean;
-        emit(event: "line", input: string): boolean;
-        emit(event: "pause"): boolean;
-        emit(event: "resume"): boolean;
-        emit(event: "SIGCONT"): boolean;
-        emit(event: "SIGINT"): boolean;
-        emit(event: "SIGTSTP"): boolean;
-        emit(event: "exit"): boolean;
-        emit(event: "reset", context: Context): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "close", listener: () => void): this;
-        on(event: "line", listener: (input: string) => void): this;
-        on(event: "pause", listener: () => void): this;
-        on(event: "resume", listener: () => void): this;
-        on(event: "SIGCONT", listener: () => void): this;
-        on(event: "SIGINT", listener: () => void): this;
-        on(event: "SIGTSTP", listener: () => void): this;
-        on(event: "exit", listener: () => void): this;
-        on(event: "reset", listener: (context: Context) => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "close", listener: () => void): this;
-        once(event: "line", listener: (input: string) => void): this;
-        once(event: "pause", listener: () => void): this;
-        once(event: "resume", listener: () => void): this;
-        once(event: "SIGCONT", listener: () => void): this;
-        once(event: "SIGINT", listener: () => void): this;
-        once(event: "SIGTSTP", listener: () => void): this;
-        once(event: "exit", listener: () => void): this;
-        once(event: "reset", listener: (context: Context) => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "close", listener: () => void): this;
-        prependListener(event: "line", listener: (input: string) => void): this;
-        prependListener(event: "pause", listener: () => void): this;
-        prependListener(event: "resume", listener: () => void): this;
-        prependListener(event: "SIGCONT", listener: () => void): this;
-        prependListener(event: "SIGINT", listener: () => void): this;
-        prependListener(event: "SIGTSTP", listener: () => void): this;
-        prependListener(event: "exit", listener: () => void): this;
-        prependListener(event: "reset", listener: (context: Context) => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "close", listener: () => void): this;
-        prependOnceListener(event: "line", listener: (input: string) => void): this;
-        prependOnceListener(event: "pause", listener: () => void): this;
-        prependOnceListener(event: "resume", listener: () => void): this;
-        prependOnceListener(event: "SIGCONT", listener: () => void): this;
-        prependOnceListener(event: "SIGINT", listener: () => void): this;
-        prependOnceListener(event: "SIGTSTP", listener: () => void): this;
-        prependOnceListener(event: "exit", listener: () => void): this;
-        prependOnceListener(event: "reset", listener: (context: Context) => void): this;
-    }
-
-    /**
-     * A flag passed in the REPL options. Evaluates expressions in sloppy mode.
-     */
-    export const REPL_MODE_SLOPPY: symbol; // TODO: unique symbol
-
-    /**
-     * A flag passed in the REPL options. Evaluates expressions in strict mode.
-     * This is equivalent to prefacing every repl statement with `'use strict'`.
-     */
-    export const REPL_MODE_STRICT: symbol; // TODO: unique symbol
-
-    /**
-     * Creates and starts a `repl.REPLServer` instance.
-     *
-     * @param options The options for the `REPLServer`. If `options` is a string, then it specifies
-     * the input prompt.
-     */
-    function start(options?: string | ReplOptions): REPLServer;
-
-    /**
-     * Indicates a recoverable error that a `REPLServer` can use to support multi-line input.
-     *
-     * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_recoverable_errors
-     */
-    class Recoverable extends SyntaxError {
-        err: Error;
-
-        constructor(err: Error);
-    }
-}
-
-declare module "readline" {
-    import * as events from "events";
-    import * as stream from "stream";
-
-    interface Key {
-        sequence?: string;
-        name?: string;
-        ctrl?: boolean;
-        meta?: boolean;
-        shift?: boolean;
-    }
-
-    class Interface extends events.EventEmitter {
-        readonly terminal: boolean;
-
-        /**
-         * NOTE: According to the documentation:
-         *
-         * > Instances of the `readline.Interface` class are constructed using the
-         * > `readline.createInterface()` method.
-         *
-         * @see https://nodejs.org/dist/latest-v10.x/docs/api/readline.html#readline_class_interface
-         */
-        protected constructor(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean);
-        /**
-         * NOTE: According to the documentation:
-         *
-         * > Instances of the `readline.Interface` class are constructed using the
-         * > `readline.createInterface()` method.
-         *
-         * @see https://nodejs.org/dist/latest-v10.x/docs/api/readline.html#readline_class_interface
-         */
-        protected constructor(options: ReadLineOptions);
-
-        setPrompt(prompt: string): void;
-        prompt(preserveCursor?: boolean): void;
-        question(query: string, callback: (answer: string) => void): void;
-        pause(): this;
-        resume(): this;
-        close(): void;
-        write(data: string | Buffer, key?: Key): void;
-
-        /**
-         * events.EventEmitter
-         * 1. close
-         * 2. line
-         * 3. pause
-         * 4. resume
-         * 5. SIGCONT
-         * 6. SIGINT
-         * 7. SIGTSTP
-         */
-
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "close", listener: () => void): this;
-        addListener(event: "line", listener: (input: string) => void): this;
-        addListener(event: "pause", listener: () => void): this;
-        addListener(event: "resume", listener: () => void): this;
-        addListener(event: "SIGCONT", listener: () => void): this;
-        addListener(event: "SIGINT", listener: () => void): this;
-        addListener(event: "SIGTSTP", listener: () => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "close"): boolean;
-        emit(event: "line", input: string): boolean;
-        emit(event: "pause"): boolean;
-        emit(event: "resume"): boolean;
-        emit(event: "SIGCONT"): boolean;
-        emit(event: "SIGINT"): boolean;
-        emit(event: "SIGTSTP"): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "close", listener: () => void): this;
-        on(event: "line", listener: (input: string) => void): this;
-        on(event: "pause", listener: () => void): this;
-        on(event: "resume", listener: () => void): this;
-        on(event: "SIGCONT", listener: () => void): this;
-        on(event: "SIGINT", listener: () => void): this;
-        on(event: "SIGTSTP", listener: () => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "close", listener: () => void): this;
-        once(event: "line", listener: (input: string) => void): this;
-        once(event: "pause", listener: () => void): this;
-        once(event: "resume", listener: () => void): this;
-        once(event: "SIGCONT", listener: () => void): this;
-        once(event: "SIGINT", listener: () => void): this;
-        once(event: "SIGTSTP", listener: () => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "close", listener: () => void): this;
-        prependListener(event: "line", listener: (input: string) => void): this;
-        prependListener(event: "pause", listener: () => void): this;
-        prependListener(event: "resume", listener: () => void): this;
-        prependListener(event: "SIGCONT", listener: () => void): this;
-        prependListener(event: "SIGINT", listener: () => void): this;
-        prependListener(event: "SIGTSTP", listener: () => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "close", listener: () => void): this;
-        prependOnceListener(event: "line", listener: (input: string) => void): this;
-        prependOnceListener(event: "pause", listener: () => void): this;
-        prependOnceListener(event: "resume", listener: () => void): this;
-        prependOnceListener(event: "SIGCONT", listener: () => void): this;
-        prependOnceListener(event: "SIGINT", listener: () => void): this;
-        prependOnceListener(event: "SIGTSTP", listener: () => void): this;
-    }
-
-    type ReadLine = Interface; // type forwarded for backwards compatiblity
-
-    type Completer = (line: string) => CompleterResult;
-    type AsyncCompleter = (line: string, callback: (err: any, result: CompleterResult) => void) => any;
-
-    type CompleterResult = [string[], string];
-
-    interface ReadLineOptions {
-        input: NodeJS.ReadableStream;
-        output?: NodeJS.WritableStream;
-        completer?: Completer | AsyncCompleter;
-        terminal?: boolean;
-        historySize?: number;
-        prompt?: string;
-        crlfDelay?: number;
-        removeHistoryDuplicates?: boolean;
-    }
-
-    function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean): Interface;
-    function createInterface(options: ReadLineOptions): Interface;
-
-    function cursorTo(stream: NodeJS.WritableStream, x: number, y?: number): void;
-    function emitKeypressEvents(stream: NodeJS.ReadableStream, interface?: Interface): void;
-    function moveCursor(stream: NodeJS.WritableStream, dx: number | string, dy: number | string): void;
-    function clearLine(stream: NodeJS.WritableStream, dir: number): void;
-    function clearScreenDown(stream: NodeJS.WritableStream): void;
-}
-
-declare module "vm" {
-    interface Context {
-        [key: string]: any;
-    }
-    interface BaseOptions {
-        /**
-         * Specifies the filename used in stack traces produced by this script.
-         * Default: `''`.
-         */
-        filename?: string;
-        /**
-         * Specifies the line number offset that is displayed in stack traces produced by this script.
-         * Default: `0`.
-         */
-        lineOffset?: number;
-        /**
-         * Specifies the column number offset that is displayed in stack traces produced by this script.
-         * Default: `0`
-         */
-        columnOffset?: number;
-    }
-    interface ScriptOptions extends BaseOptions {
-        displayErrors?: boolean;
-        timeout?: number;
-        cachedData?: Buffer;
-        produceCachedData?: boolean;
-    }
-    interface RunningScriptOptions extends BaseOptions {
-        displayErrors?: boolean;
-        timeout?: number;
-    }
-    interface CompileFunctionOptions extends BaseOptions {
-        /**
-         * Provides an optional data with V8's code cache data for the supplied source.
-         */
-        cachedData?: Buffer;
-        /**
-         * Specifies whether to produce new cache data.
-         * Default: `false`,
-         */
-        produceCachedData?: boolean;
-        /**
-         * The sandbox/context in which the said function should be compiled in.
-         */
-        parsingContext?: Context;
-
-        /**
-         * An array containing a collection of context extensions (objects wrapping the current scope) to be applied while compiling
-         */
-        contextExtensions?: Object[];
-    }
-    class Script {
-        constructor(code: string, options?: ScriptOptions);
-        runInContext(contextifiedSandbox: Context, options?: RunningScriptOptions): any;
-        runInNewContext(sandbox?: Context, options?: RunningScriptOptions): any;
-        runInThisContext(options?: RunningScriptOptions): any;
-    }
-    function createContext(sandbox?: Context): Context;
-    function isContext(sandbox: Context): boolean;
-    function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions | string): any;
-    function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions | string): any;
-    function runInThisContext(code: string, options?: RunningScriptOptions | string): any;
-    function compileFunction(code: string, params: string[], options: CompileFunctionOptions): Function;
-}
-
-declare module "child_process" {
-    import * as events from "events";
-    import * as stream from "stream";
-    import * as net from "net";
-
-    interface ChildProcess extends events.EventEmitter {
-        stdin: stream.Writable;
-        stdout: stream.Readable;
-        stderr: stream.Readable;
-        stdio: [stream.Writable, stream.Readable, stream.Readable];
-        killed: boolean;
-        pid: number;
-        kill(signal?: string): void;
-        send(message: any, callback?: (error: Error) => void): boolean;
-        send(message: any, sendHandle?: net.Socket | net.Server, callback?: (error: Error) => void): boolean;
-        send(message: any, sendHandle?: net.Socket | net.Server, options?: MessageOptions, callback?: (error: Error) => void): boolean;
-        connected: boolean;
-        disconnect(): void;
-        unref(): void;
-        ref(): void;
-
-        /**
-         * events.EventEmitter
-         * 1. close
-         * 2. disconnect
-         * 3. error
-         * 4. exit
-         * 5. message
-         */
-
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "close", listener: (code: number, signal: string) => void): this;
-        addListener(event: "disconnect", listener: () => void): this;
-        addListener(event: "error", listener: (err: Error) => void): this;
-        addListener(event: "exit", listener: (code: number | null, signal: string | null) => void): this;
-        addListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "close", code: number, signal: string): boolean;
-        emit(event: "disconnect"): boolean;
-        emit(event: "error", err: Error): boolean;
-        emit(event: "exit", code: number | null, signal: string | null): boolean;
-        emit(event: "message", message: any, sendHandle: net.Socket | net.Server): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "close", listener: (code: number, signal: string) => void): this;
-        on(event: "disconnect", listener: () => void): this;
-        on(event: "error", listener: (err: Error) => void): this;
-        on(event: "exit", listener: (code: number | null, signal: string | null) => void): this;
-        on(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "close", listener: (code: number, signal: string) => void): this;
-        once(event: "disconnect", listener: () => void): this;
-        once(event: "error", listener: (err: Error) => void): this;
-        once(event: "exit", listener: (code: number | null, signal: string | null) => void): this;
-        once(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "close", listener: (code: number, signal: string) => void): this;
-        prependListener(event: "disconnect", listener: () => void): this;
-        prependListener(event: "error", listener: (err: Error) => void): this;
-        prependListener(event: "exit", listener: (code: number | null, signal: string | null) => void): this;
-        prependListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "close", listener: (code: number, signal: string) => void): this;
-        prependOnceListener(event: "disconnect", listener: () => void): this;
-        prependOnceListener(event: "error", listener: (err: Error) => void): this;
-        prependOnceListener(event: "exit", listener: (code: number | null, signal: string | null) => void): this;
-        prependOnceListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
-    }
-
-    interface MessageOptions {
-        keepOpen?: boolean;
-    }
-
-    type StdioOptions = "pipe" | "ignore" | "inherit" | Array<("pipe" | "ipc" | "ignore" | "inherit" | stream.Stream | number | null | undefined)>;
-
-    interface SpawnOptions {
-        cwd?: string;
-        env?: NodeJS.ProcessEnv;
-        argv0?: string;
-        stdio?: StdioOptions;
-        detached?: boolean;
-        uid?: number;
-        gid?: number;
-        shell?: boolean | string;
-        windowsVerbatimArguments?: boolean;
-        windowsHide?: boolean;
-    }
-
-    function spawn(command: string, options?: SpawnOptions): ChildProcess;
-    function spawn(command: string, args?: ReadonlyArray<string>, options?: SpawnOptions): ChildProcess;
-
-    interface ExecOptions {
-        cwd?: string;
-        env?: NodeJS.ProcessEnv;
-        shell?: string;
-        timeout?: number;
-        maxBuffer?: number;
-        killSignal?: string;
-        uid?: number;
-        gid?: number;
-        windowsHide?: boolean;
-    }
-
-    interface ExecOptionsWithStringEncoding extends ExecOptions {
-        encoding: BufferEncoding;
-    }
-
-    interface ExecOptionsWithBufferEncoding extends ExecOptions {
-        encoding: string | null; // specify `null`.
-    }
-
-    interface ExecException extends Error {
-        cmd?: string;
-        killed?: boolean;
-        code?: number;
-        signal?: string;
-    }
-
-    // no `options` definitely means stdout/stderr are `string`.
-    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`.
-    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`.
-    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`.
-    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`.
-    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`.
-    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.
-    namespace exec {
-        function __promisify__(command: string): Promise<{ stdout: string, stderr: string }>;
-        function __promisify__(command: string, options: { encoding: "buffer" | null } & ExecOptions): Promise<{ stdout: Buffer, stderr: Buffer }>;
-        function __promisify__(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<{ stdout: string, stderr: string }>;
-        function __promisify__(command: string, options: ExecOptions): Promise<{ stdout: string, stderr: string }>;
-        function __promisify__(command: string, options?: ({ encoding?: string | null } & ExecOptions) | null): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
-    }
-
-    interface ExecFileOptions {
-        cwd?: string;
-        env?: NodeJS.ProcessEnv;
-        timeout?: number;
-        maxBuffer?: number;
-        killSignal?: string;
-        uid?: number;
-        gid?: number;
-        windowsHide?: boolean;
-        windowsVerbatimArguments?: boolean;
-    }
-    interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
-        encoding: BufferEncoding;
-    }
-    interface ExecFileOptionsWithBufferEncoding extends ExecFileOptions {
-        encoding: 'buffer' | null;
-    }
-    interface ExecFileOptionsWithOtherEncoding extends ExecFileOptions {
-        encoding: string;
-    }
-
-    function execFile(file: string): ChildProcess;
-    function execFile(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
-    function execFile(file: string, args?: ReadonlyArray<string> | null): ChildProcess;
-    function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
-
-    // no `options` definitely means stdout/stderr are `string`.
-    function execFile(file: string, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
-    function execFile(file: string, args: ReadonlyArray<string> | undefined | null, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
-
-    // `options` with `"buffer"` or `null` for `encoding` means stdout/stderr are definitely `Buffer`.
-    function execFile(file: string, options: ExecFileOptionsWithBufferEncoding, callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
-    function execFile(
-        file: string,
-        args: ReadonlyArray<string> | undefined | null,
-        options: ExecFileOptionsWithBufferEncoding,
-        callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void,
-    ): ChildProcess;
-
-    // `options` with well known `encoding` means stdout/stderr are definitely `string`.
-    function execFile(file: string, options: ExecFileOptionsWithStringEncoding, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
-    function execFile(
-        file: string,
-        args: ReadonlyArray<string> | undefined | null,
-        options: ExecFileOptionsWithStringEncoding,
-        callback: (error: Error | null, stdout: string, stderr: string) => void,
-    ): ChildProcess;
-
-    // `options` with an `encoding` whose type is `string` means stdout/stderr could either be `Buffer` or `string`.
-    // There is no guarantee the `encoding` is unknown as `string` is a superset of `BufferEncoding`.
-    function execFile(
-        file: string,
-        options: ExecFileOptionsWithOtherEncoding,
-        callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void,
-    ): ChildProcess;
-    function execFile(
-        file: string,
-        args: ReadonlyArray<string> | undefined | null,
-        options: ExecFileOptionsWithOtherEncoding,
-        callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void,
-    ): ChildProcess;
-
-    // `options` without an `encoding` means stdout/stderr are definitely `string`.
-    function execFile(file: string, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
-    function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
-
-    // fallback if nothing else matches. Worst case is always `string | Buffer`.
-    function execFile(
-        file: string,
-        options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null,
-        callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null,
-    ): ChildProcess;
-    function execFile(
-        file: string,
-        args: ReadonlyArray<string> | undefined | null,
-        options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null,
-        callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null,
-    ): ChildProcess;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace execFile {
-        function __promisify__(file: string): Promise<{ stdout: string, stderr: string }>;
-        function __promisify__(file: string, args: string[] | undefined | null): Promise<{ stdout: string, stderr: string }>;
-        function __promisify__(file: string, options: ExecFileOptionsWithBufferEncoding): Promise<{ stdout: Buffer, stderr: Buffer }>;
-        function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithBufferEncoding): Promise<{ stdout: Buffer, stderr: Buffer }>;
-        function __promisify__(file: string, options: ExecFileOptionsWithStringEncoding): Promise<{ stdout: string, stderr: string }>;
-        function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithStringEncoding): Promise<{ stdout: string, stderr: string }>;
-        function __promisify__(file: string, options: ExecFileOptionsWithOtherEncoding): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
-        function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithOtherEncoding): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
-        function __promisify__(file: string, options: ExecFileOptions): Promise<{ stdout: string, stderr: string }>;
-        function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptions): Promise<{ stdout: string, stderr: string }>;
-        function __promisify__(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
-        function __promisify__(
-            file: string,
-            args: string[] | undefined | null,
-            options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null,
-        ): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
-    }
-
-    interface ForkOptions {
-        cwd?: string;
-        env?: NodeJS.ProcessEnv;
-        execPath?: string;
-        execArgv?: string[];
-        silent?: boolean;
-        stdio?: StdioOptions;
-        windowsVerbatimArguments?: boolean;
-        uid?: number;
-        gid?: number;
-    }
-    function fork(modulePath: string, args?: ReadonlyArray<string>, options?: ForkOptions): ChildProcess;
-
-    interface SpawnSyncOptions {
-        argv0?: string; // Not specified in the docs
-        cwd?: string;
-        input?: string | Buffer | NodeJS.TypedArray | DataView;
-        stdio?: StdioOptions;
-        env?: NodeJS.ProcessEnv;
-        uid?: number;
-        gid?: number;
-        timeout?: number;
-        killSignal?: string | number;
-        maxBuffer?: number;
-        encoding?: string;
-        shell?: boolean | string;
-        windowsVerbatimArguments?: boolean;
-        windowsHide?: boolean;
-    }
-    interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
-        encoding: BufferEncoding;
-    }
-    interface SpawnSyncOptionsWithBufferEncoding extends SpawnSyncOptions {
-        encoding: string; // specify `null`.
-    }
-    interface SpawnSyncReturns<T> {
-        pid: number;
-        output: string[];
-        stdout: T;
-        stderr: T;
-        status: number;
-        signal: string;
-        error: Error;
-    }
-    function spawnSync(command: string): SpawnSyncReturns<Buffer>;
-    function spawnSync(command: string, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
-    function spawnSync(command: string, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
-    function spawnSync(command: string, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
-    function spawnSync(command: string, args?: ReadonlyArray<string>, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
-    function spawnSync(command: string, args?: ReadonlyArray<string>, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
-    function spawnSync(command: string, args?: ReadonlyArray<string>, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
-
-    interface ExecSyncOptions {
-        cwd?: string;
-        input?: string | Buffer | Uint8Array;
-        stdio?: StdioOptions;
-        env?: NodeJS.ProcessEnv;
-        shell?: string;
-        uid?: number;
-        gid?: number;
-        timeout?: number;
-        killSignal?: string | number;
-        maxBuffer?: number;
-        encoding?: string;
-        windowsHide?: boolean;
-    }
-    interface ExecSyncOptionsWithStringEncoding extends ExecSyncOptions {
-        encoding: BufferEncoding;
-    }
-    interface ExecSyncOptionsWithBufferEncoding extends ExecSyncOptions {
-        encoding: string; // specify `null`.
-    }
-    function execSync(command: string): Buffer;
-    function execSync(command: string, options?: ExecSyncOptionsWithStringEncoding): string;
-    function execSync(command: string, options?: ExecSyncOptionsWithBufferEncoding): Buffer;
-    function execSync(command: string, options?: ExecSyncOptions): Buffer;
-
-    interface ExecFileSyncOptions {
-        cwd?: string;
-        input?: string | Buffer | NodeJS.TypedArray | DataView;
-        stdio?: StdioOptions;
-        env?: NodeJS.ProcessEnv;
-        uid?: number;
-        gid?: number;
-        timeout?: number;
-        killSignal?: string | number;
-        maxBuffer?: number;
-        encoding?: string;
-        windowsHide?: boolean;
-        shell?: boolean | string;
-    }
-    interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
-        encoding: BufferEncoding;
-    }
-    interface ExecFileSyncOptionsWithBufferEncoding extends ExecFileSyncOptions {
-        encoding: string; // specify `null`.
-    }
-    function execFileSync(command: string): Buffer;
-    function execFileSync(command: string, options?: ExecFileSyncOptionsWithStringEncoding): string;
-    function execFileSync(command: string, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
-    function execFileSync(command: string, options?: ExecFileSyncOptions): Buffer;
-    function execFileSync(command: string, args?: ReadonlyArray<string>, options?: ExecFileSyncOptionsWithStringEncoding): string;
-    function execFileSync(command: string, args?: ReadonlyArray<string>, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
-    function execFileSync(command: string, args?: ReadonlyArray<string>, options?: ExecFileSyncOptions): Buffer;
-}
-
-declare module "url" {
-    import { ParsedUrlQuery } from 'querystring';
-
-    interface UrlObjectCommon {
-        auth?: string;
-        hash?: string;
-        host?: string;
-        hostname?: string;
-        href?: string;
-        path?: string;
-        pathname?: string;
-        protocol?: string;
-        search?: string;
-        slashes?: boolean;
-    }
-
-    // Input to `url.format`
-    interface UrlObject extends UrlObjectCommon {
-        port?: string | number;
-        query?: string | null | { [key: string]: any };
-    }
-
-    // Output of `url.parse`
-    interface Url extends UrlObjectCommon {
-        port?: string;
-        query?: string | null | ParsedUrlQuery;
-    }
-
-    interface UrlWithParsedQuery extends Url {
-        query: ParsedUrlQuery;
-    }
-
-    interface UrlWithStringQuery extends Url {
-        query: string | null;
-    }
-
-    function parse(urlStr: string): UrlWithStringQuery;
-    function parse(urlStr: string, parseQueryString: false | undefined, slashesDenoteHost?: boolean): UrlWithStringQuery;
-    function parse(urlStr: string, parseQueryString: true, slashesDenoteHost?: boolean): UrlWithParsedQuery;
-    function parse(urlStr: string, parseQueryString: boolean, slashesDenoteHost?: boolean): Url;
-
-    function format(URL: URL, options?: URLFormatOptions): string;
-    function format(urlObject: UrlObject | string): string;
-    function resolve(from: string, to: string): string;
-
-    function domainToASCII(domain: string): string;
-    function domainToUnicode(domain: string): string;
-
-    /**
-     * This function ensures the correct decodings of percent-encoded characters as
-     * well as ensuring a cross-platform valid absolute path string.
-     * @param url The file URL string or URL object to convert to a path.
-     */
-    function fileURLToPath(url: string | URL): string;
-
-    /**
-     * This function ensures that path is resolved absolutely, and that the URL
-     * control characters are correctly encoded when converting into a File URL.
-     * @param url The path to convert to a File URL.
-     */
-    function pathToFileURL(url: string): URL;
-
-    interface URLFormatOptions {
-        auth?: boolean;
-        fragment?: boolean;
-        search?: boolean;
-        unicode?: boolean;
-    }
-
-    class URL {
-        constructor(input: string, base?: string | URL);
-        hash: string;
-        host: string;
-        hostname: string;
-        href: string;
-        readonly origin: string;
-        password: string;
-        pathname: string;
-        port: string;
-        protocol: string;
-        search: string;
-        readonly searchParams: URLSearchParams;
-        username: string;
-        toString(): string;
-        toJSON(): string;
-    }
-
-    class URLSearchParams implements Iterable<[string, string]> {
-        constructor(init?: URLSearchParams | string | { [key: string]: string | string[] | undefined } | Iterable<[string, string]> | Array<[string, string]>);
-        append(name: string, value: string): void;
-        delete(name: string): void;
-        entries(): IterableIterator<[string, string]>;
-        forEach(callback: (value: string, name: string, searchParams: this) => void): void;
-        get(name: string): string | null;
-        getAll(name: string): string[];
-        has(name: string): boolean;
-        keys(): IterableIterator<string>;
-        set(name: string, value: string): void;
-        sort(): void;
-        toString(): string;
-        values(): IterableIterator<string>;
-        [Symbol.iterator](): IterableIterator<[string, string]>;
-    }
-}
-
-declare module "dns" {
-    // Supported getaddrinfo flags.
-    const ADDRCONFIG: number;
-    const V4MAPPED: number;
-
-    interface LookupOptions {
-        family?: number;
-        hints?: number;
-        all?: boolean;
-        verbatim?: boolean;
-    }
-
-    interface LookupOneOptions extends LookupOptions {
-        all?: false;
-    }
-
-    interface LookupAllOptions extends LookupOptions {
-        all: true;
-    }
-
-    interface LookupAddress {
-        address: string;
-        family: number;
-    }
-
-    function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
-    function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
-    function lookup(hostname: string, options: LookupAllOptions, callback: (err: NodeJS.ErrnoException, addresses: LookupAddress[]) => void): void;
-    function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException, address: string | LookupAddress[], family: number) => void): void;
-    function lookup(hostname: string, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace lookup {
-        function __promisify__(hostname: string, options: LookupAllOptions): Promise<{ address: LookupAddress[] }>;
-        function __promisify__(hostname: string, options?: LookupOneOptions | number): Promise<{ address: string, family: number }>;
-        function __promisify__(hostname: string, options?: LookupOptions | number): Promise<{ address: string | LookupAddress[], family?: number }>;
-    }
-
-    function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void;
-
-    namespace lookupService {
-        function __promisify__(address: string, port: number): Promise<{ hostname: string, service: string }>;
-    }
-
-    interface ResolveOptions {
-        ttl: boolean;
-    }
-
-    interface ResolveWithTtlOptions extends ResolveOptions {
-        ttl: true;
-    }
-
-    interface RecordWithTtl {
-        address: string;
-        ttl: number;
-    }
-
-    /** @deprecated Use AnyARecord or AnyAaaaRecord instead. */
-    type AnyRecordWithTtl = AnyARecord | AnyAaaaRecord;
-
-    interface AnyARecord extends RecordWithTtl {
-        type: "A";
-    }
-
-    interface AnyAaaaRecord extends RecordWithTtl {
-        type: "AAAA";
-    }
-
-    interface MxRecord {
-        priority: number;
-        exchange: string;
-    }
-
-    interface AnyMxRecord extends MxRecord {
-        type: "MX";
-    }
-
-    interface NaptrRecord {
-        flags: string;
-        service: string;
-        regexp: string;
-        replacement: string;
-        order: number;
-        preference: number;
-    }
-
-    interface AnyNaptrRecord extends NaptrRecord {
-        type: "NAPTR";
-    }
-
-    interface SoaRecord {
-        nsname: string;
-        hostmaster: string;
-        serial: number;
-        refresh: number;
-        retry: number;
-        expire: number;
-        minttl: number;
-    }
-
-    interface AnySoaRecord extends SoaRecord {
-        type: "SOA";
-    }
-
-    interface SrvRecord {
-        priority: number;
-        weight: number;
-        port: number;
-        name: string;
-    }
-
-    interface AnySrvRecord extends SrvRecord {
-        type: "SRV";
-    }
-
-    interface AnyTxtRecord {
-        type: "TXT";
-        entries: string[];
-    }
-
-    interface AnyNsRecord {
-        type: "NS";
-        value: string;
-    }
-
-    interface AnyPtrRecord {
-        type: "PTR";
-        value: string;
-    }
-
-    interface AnyCnameRecord {
-        type: "CNAME";
-        value: string;
-    }
-
-    type AnyRecord = AnyARecord |
-        AnyAaaaRecord |
-        AnyCnameRecord |
-        AnyMxRecord |
-        AnyNaptrRecord |
-        AnyNsRecord |
-        AnyPtrRecord |
-        AnySoaRecord |
-        AnySrvRecord |
-        AnyTxtRecord;
-
-    function resolve(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-    function resolve(hostname: string, rrtype: "A", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-    function resolve(hostname: string, rrtype: "AAAA", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-    function resolve(hostname: string, rrtype: "ANY", callback: (err: NodeJS.ErrnoException, addresses: AnyRecord[]) => void): void;
-    function resolve(hostname: string, rrtype: "CNAME", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-    function resolve(hostname: string, rrtype: "MX", callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
-    function resolve(hostname: string, rrtype: "NAPTR", callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
-    function resolve(hostname: string, rrtype: "NS", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-    function resolve(hostname: string, rrtype: "PTR", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-    function resolve(hostname: string, rrtype: "SOA", callback: (err: NodeJS.ErrnoException, addresses: SoaRecord) => void): void;
-    function resolve(hostname: string, rrtype: "SRV", callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
-    function resolve(hostname: string, rrtype: "TXT", callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
-    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.
-    namespace resolve {
-        function __promisify__(hostname: string, rrtype?: "A" | "AAAA" | "CNAME" | "NS" | "PTR"): Promise<string[]>;
-        function __promisify__(hostname: string, rrtype: "ANY"): Promise<AnyRecord[]>;
-        function __promisify__(hostname: string, rrtype: "MX"): Promise<MxRecord[]>;
-        function __promisify__(hostname: string, rrtype: "NAPTR"): Promise<NaptrRecord[]>;
-        function __promisify__(hostname: string, rrtype: "SOA"): Promise<SoaRecord>;
-        function __promisify__(hostname: string, rrtype: "SRV"): Promise<SrvRecord[]>;
-        function __promisify__(hostname: string, rrtype: "TXT"): Promise<string[][]>;
-        function __promisify__(hostname: string, rrtype: string): Promise<string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][] | AnyRecord[]>;
-    }
-
-    function resolve4(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-    function resolve4(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
-    function resolve4(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace resolve4 {
-        function __promisify__(hostname: string): Promise<string[]>;
-        function __promisify__(hostname: string, options: ResolveWithTtlOptions): Promise<RecordWithTtl[]>;
-        function __promisify__(hostname: string, options?: ResolveOptions): Promise<string[] | RecordWithTtl[]>;
-    }
-
-    function resolve6(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-    function resolve6(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
-    function resolve6(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace resolve6 {
-        function __promisify__(hostname: string): Promise<string[]>;
-        function __promisify__(hostname: string, options: ResolveWithTtlOptions): Promise<RecordWithTtl[]>;
-        function __promisify__(hostname: string, options?: ResolveOptions): Promise<string[] | RecordWithTtl[]>;
-    }
-
-    function resolveCname(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-    namespace resolveCname {
-        function __promisify__(hostname: string): Promise<string[]>;
-    }
-
-    function resolveMx(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
-    namespace resolveMx {
-        function __promisify__(hostname: string): Promise<MxRecord[]>;
-    }
-
-    function resolveNaptr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
-    namespace resolveNaptr {
-        function __promisify__(hostname: string): Promise<NaptrRecord[]>;
-    }
-
-    function resolveNs(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-    namespace resolveNs {
-        function __promisify__(hostname: string): Promise<string[]>;
-    }
-
-    function resolvePtr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-    namespace resolvePtr {
-        function __promisify__(hostname: string): Promise<string[]>;
-    }
-
-    function resolveSoa(hostname: string, callback: (err: NodeJS.ErrnoException, address: SoaRecord) => void): void;
-    namespace resolveSoa {
-        function __promisify__(hostname: string): Promise<SoaRecord>;
-    }
-
-    function resolveSrv(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
-    namespace resolveSrv {
-        function __promisify__(hostname: string): Promise<SrvRecord[]>;
-    }
-
-    function resolveTxt(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
-    namespace resolveTxt {
-        function __promisify__(hostname: string): Promise<string[][]>;
-    }
-
-    function resolveAny(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: AnyRecord[]) => void): void;
-    namespace resolveAny {
-        function __promisify__(hostname: string): Promise<AnyRecord[]>;
-    }
-
-    function reverse(ip: string, callback: (err: NodeJS.ErrnoException, hostnames: string[]) => void): void;
-    function setServers(servers: string[]): void;
-    function getServers(): string[];
-
-    // Error codes
-    const NODATA: string;
-    const FORMERR: string;
-    const SERVFAIL: string;
-    const NOTFOUND: string;
-    const NOTIMP: string;
-    const REFUSED: string;
-    const BADQUERY: string;
-    const BADNAME: string;
-    const BADFAMILY: string;
-    const BADRESP: string;
-    const CONNREFUSED: string;
-    const TIMEOUT: string;
-    const EOF: string;
-    const FILE: string;
-    const NOMEM: string;
-    const DESTRUCTION: string;
-    const BADSTR: string;
-    const BADFLAGS: string;
-    const NONAME: string;
-    const BADHINTS: string;
-    const NOTINITIALIZED: string;
-    const LOADIPHLPAPI: string;
-    const ADDRGETNETWORKPARAMS: string;
-    const CANCELLED: string;
-
-    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" {
-    import * as stream from "stream";
-    import * as events from "events";
-    import * as dns from "dns";
-
-    type LookupFunction = (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void) => void;
-
-    interface AddressInfo {
-        address: string;
-        family: string;
-        port: number;
-    }
-
-    interface SocketConstructorOpts {
-        fd?: number;
-        allowHalfOpen?: boolean;
-        readable?: boolean;
-        writable?: boolean;
-    }
-
-    interface TcpSocketConnectOpts {
-        port: number;
-        host?: string;
-        localAddress?: string;
-        localPort?: number;
-        hints?: number;
-        family?: number;
-        lookup?: LookupFunction;
-    }
-
-    interface IpcSocketConnectOpts {
-        path: string;
-    }
-
-    type SocketConnectOpts = TcpSocketConnectOpts | IpcSocketConnectOpts;
-
-    class Socket extends stream.Duplex {
-        constructor(options?: SocketConstructorOpts);
-
-        // Extended base methods
-        write(buffer: Buffer): boolean;
-        write(buffer: Buffer, cb?: Function): boolean;
-        write(str: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, fd?: string): boolean;
-        write(data: any, encoding?: string, callback?: Function): void;
-
-        connect(options: SocketConnectOpts, connectionListener?: Function): this;
-        connect(port: number, host: string, connectionListener?: Function): this;
-        connect(port: number, connectionListener?: Function): this;
-        connect(path: string, connectionListener?: Function): this;
-
-        setEncoding(encoding?: string): this;
-        pause(): this;
-        resume(): this;
-        setTimeout(timeout: number, callback?: Function): this;
-        setNoDelay(noDelay?: boolean): this;
-        setKeepAlive(enable?: boolean, initialDelay?: number): this;
-        address(): AddressInfo | string;
-        unref(): void;
-        ref(): void;
-
-        readonly bufferSize: number;
-        readonly bytesRead: number;
-        readonly bytesWritten: number;
-        readonly connecting: boolean;
-        readonly destroyed: boolean;
-        readonly localAddress: string;
-        readonly localPort: number;
-        readonly remoteAddress?: string;
-        readonly remoteFamily?: string;
-        readonly remotePort?: number;
-
-        // Extended base methods
-        end(): void;
-        end(buffer: Buffer, cb?: Function): void;
-        end(str: string, cb?: Function): void;
-        end(str: string, encoding?: string, cb?: Function): void;
-        end(data?: any, encoding?: string): void;
-
-        /**
-         * events.EventEmitter
-         *   1. close
-         *   2. connect
-         *   3. data
-         *   4. drain
-         *   5. end
-         *   6. error
-         *   7. lookup
-         *   8. timeout
-         */
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "close", listener: (had_error: boolean) => void): this;
-        addListener(event: "connect", listener: () => void): this;
-        addListener(event: "data", listener: (data: Buffer) => void): this;
-        addListener(event: "drain", listener: () => void): this;
-        addListener(event: "end", listener: () => void): this;
-        addListener(event: "error", listener: (err: Error) => void): this;
-        addListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
-        addListener(event: "timeout", listener: () => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "close", had_error: boolean): boolean;
-        emit(event: "connect"): boolean;
-        emit(event: "data", data: Buffer): boolean;
-        emit(event: "drain"): boolean;
-        emit(event: "end"): boolean;
-        emit(event: "error", err: Error): boolean;
-        emit(event: "lookup", err: Error, address: string, family: string | number, host: string): boolean;
-        emit(event: "timeout"): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "close", listener: (had_error: boolean) => void): this;
-        on(event: "connect", listener: () => void): this;
-        on(event: "data", listener: (data: Buffer) => void): this;
-        on(event: "drain", listener: () => void): this;
-        on(event: "end", listener: () => void): this;
-        on(event: "error", listener: (err: Error) => void): this;
-        on(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
-        on(event: "timeout", listener: () => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "close", listener: (had_error: boolean) => void): this;
-        once(event: "connect", listener: () => void): this;
-        once(event: "data", listener: (data: Buffer) => void): this;
-        once(event: "drain", listener: () => void): this;
-        once(event: "end", listener: () => void): this;
-        once(event: "error", listener: (err: Error) => void): this;
-        once(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
-        once(event: "timeout", listener: () => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "close", listener: (had_error: boolean) => void): this;
-        prependListener(event: "connect", listener: () => void): this;
-        prependListener(event: "data", listener: (data: Buffer) => void): this;
-        prependListener(event: "drain", listener: () => void): this;
-        prependListener(event: "end", listener: () => void): this;
-        prependListener(event: "error", listener: (err: Error) => void): this;
-        prependListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
-        prependListener(event: "timeout", listener: () => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "close", listener: (had_error: boolean) => void): this;
-        prependOnceListener(event: "connect", listener: () => void): this;
-        prependOnceListener(event: "data", listener: (data: Buffer) => void): this;
-        prependOnceListener(event: "drain", listener: () => void): this;
-        prependOnceListener(event: "end", listener: () => void): this;
-        prependOnceListener(event: "error", listener: (err: Error) => void): this;
-        prependOnceListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
-        prependOnceListener(event: "timeout", listener: () => void): this;
-    }
-
-    interface ListenOptions {
-        port?: number;
-        host?: string;
-        backlog?: number;
-        path?: string;
-        exclusive?: boolean;
-        readableAll?: boolean;
-        writableAll?: boolean;
-    }
-
-    // https://github.com/nodejs/node/blob/master/lib/net.js
-    class Server extends events.EventEmitter {
-        constructor(connectionListener?: (socket: Socket) => void);
-        constructor(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void);
-
-        listen(port?: number, hostname?: string, backlog?: number, listeningListener?: Function): this;
-        listen(port?: number, hostname?: string, listeningListener?: Function): this;
-        listen(port?: number, backlog?: number, listeningListener?: Function): this;
-        listen(port?: number, listeningListener?: Function): this;
-        listen(path: string, backlog?: number, listeningListener?: Function): this;
-        listen(path: string, listeningListener?: Function): this;
-        listen(options: ListenOptions, listeningListener?: Function): this;
-        listen(handle: any, backlog?: number, listeningListener?: Function): this;
-        listen(handle: any, listeningListener?: Function): this;
-        close(callback?: Function): this;
-        address(): AddressInfo | string;
-        getConnections(cb: (error: Error | null, count: number) => void): void;
-        ref(): this;
-        unref(): this;
-        maxConnections: number;
-        connections: number;
-        listening: boolean;
-
-        /**
-         * events.EventEmitter
-         *   1. close
-         *   2. connection
-         *   3. error
-         *   4. listening
-         */
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "close", listener: () => void): this;
-        addListener(event: "connection", listener: (socket: Socket) => void): this;
-        addListener(event: "error", listener: (err: Error) => void): this;
-        addListener(event: "listening", listener: () => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "close"): boolean;
-        emit(event: "connection", socket: Socket): boolean;
-        emit(event: "error", err: Error): boolean;
-        emit(event: "listening"): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "close", listener: () => void): this;
-        on(event: "connection", listener: (socket: Socket) => void): this;
-        on(event: "error", listener: (err: Error) => void): this;
-        on(event: "listening", listener: () => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "close", listener: () => void): this;
-        once(event: "connection", listener: (socket: Socket) => void): this;
-        once(event: "error", listener: (err: Error) => void): this;
-        once(event: "listening", listener: () => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "close", listener: () => void): this;
-        prependListener(event: "connection", listener: (socket: Socket) => void): this;
-        prependListener(event: "error", listener: (err: Error) => void): this;
-        prependListener(event: "listening", listener: () => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "close", listener: () => void): this;
-        prependOnceListener(event: "connection", listener: (socket: Socket) => void): this;
-        prependOnceListener(event: "error", listener: (err: Error) => void): this;
-        prependOnceListener(event: "listening", listener: () => void): this;
-    }
-
-    interface TcpNetConnectOpts extends TcpSocketConnectOpts, SocketConstructorOpts {
-        timeout?: number;
-    }
-
-    interface IpcNetConnectOpts extends IpcSocketConnectOpts, SocketConstructorOpts {
-        timeout?: number;
-    }
-
-    type NetConnectOpts = TcpNetConnectOpts | IpcNetConnectOpts;
-
-    function createServer(connectionListener?: (socket: Socket) => void): Server;
-    function createServer(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void): Server;
-    function connect(options: NetConnectOpts, connectionListener?: Function): Socket;
-    function connect(port: number, host?: string, connectionListener?: Function): Socket;
-    function connect(path: string, connectionListener?: Function): Socket;
-    function createConnection(options: NetConnectOpts, connectionListener?: Function): Socket;
-    function createConnection(port: number, host?: string, connectionListener?: Function): Socket;
-    function createConnection(path: string, connectionListener?: Function): Socket;
-    function isIP(input: string): number;
-    function isIPv4(input: string): boolean;
-    function isIPv6(input: string): boolean;
-}
-
-declare module "dgram" {
-    import { AddressInfo } from "net";
-    import * as dns from "dns";
-    import * as events from "events";
-
-    interface RemoteInfo {
-        address: string;
-        family: string;
-        port: number;
-    }
-
-    interface BindOptions {
-        port: number;
-        address?: string;
-        exclusive?: boolean;
-    }
-
-    type SocketType = "udp4" | "udp6";
-
-    interface SocketOptions {
-        type: SocketType;
-        reuseAddr?: boolean;
-        recvBufferSize?: number;
-        sendBufferSize?: number;
-        lookup?: (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void) => void;
-    }
-
-    function createSocket(type: SocketType, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
-    function createSocket(options: SocketOptions, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
-
-    class Socket extends events.EventEmitter {
-        send(msg: Buffer | string | Uint8Array | any[], port: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
-        send(msg: Buffer | string | Uint8Array, offset: number, length: number, port: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
-        bind(port?: number, address?: string, callback?: () => void): void;
-        bind(port?: number, callback?: () => void): void;
-        bind(callback?: () => void): void;
-        bind(options: BindOptions, callback?: Function): void;
-        close(callback?: () => void): void;
-        address(): AddressInfo | string;
-        setBroadcast(flag: boolean): void;
-        setTTL(ttl: number): void;
-        setMulticastTTL(ttl: number): void;
-        setMulticastInterface(multicastInterface: string): void;
-        setMulticastLoopback(flag: boolean): void;
-        addMembership(multicastAddress: string, multicastInterface?: string): void;
-        dropMembership(multicastAddress: string, multicastInterface?: string): void;
-        ref(): this;
-        unref(): this;
-        setRecvBufferSize(size: number): void;
-        setSendBufferSize(size: number): void;
-        getRecvBufferSize(): number;
-        getSendBufferSize(): number;
-
-        /**
-         * events.EventEmitter
-         * 1. close
-         * 2. error
-         * 3. listening
-         * 4. message
-         */
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "close", listener: () => void): this;
-        addListener(event: "error", listener: (err: Error) => void): this;
-        addListener(event: "listening", listener: () => void): this;
-        addListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "close"): boolean;
-        emit(event: "error", err: Error): boolean;
-        emit(event: "listening"): boolean;
-        emit(event: "message", msg: Buffer, rinfo: AddressInfo): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "close", listener: () => void): this;
-        on(event: "error", listener: (err: Error) => void): this;
-        on(event: "listening", listener: () => void): this;
-        on(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "close", listener: () => void): this;
-        once(event: "error", listener: (err: Error) => void): this;
-        once(event: "listening", listener: () => void): this;
-        once(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "close", listener: () => void): this;
-        prependListener(event: "error", listener: (err: Error) => void): this;
-        prependListener(event: "listening", listener: () => void): this;
-        prependListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "close", listener: () => void): this;
-        prependOnceListener(event: "error", listener: (err: Error) => void): this;
-        prependOnceListener(event: "listening", listener: () => void): this;
-        prependOnceListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
-    }
-}
-
-declare module "fs" {
-    import * as stream from "stream";
-    import * as events from "events";
-    import { URL } from "url";
-
-    /**
-     * Valid types for path values in "fs".
-     */
-    type PathLike = string | Buffer | URL;
-
-    type BinaryData = Buffer | DataView | NodeJS.TypedArray;
-    class Stats {
-        isFile(): boolean;
-        isDirectory(): boolean;
-        isBlockDevice(): boolean;
-        isCharacterDevice(): boolean;
-        isSymbolicLink(): boolean;
-        isFIFO(): boolean;
-        isSocket(): boolean;
-        dev: number;
-        ino: number;
-        mode: number;
-        nlink: number;
-        uid: number;
-        gid: number;
-        rdev: number;
-        size: number;
-        blksize: number;
-        blocks: number;
-        atimeMs: number;
-        mtimeMs: number;
-        ctimeMs: number;
-        birthtimeMs: number;
-        atime: Date;
-        mtime: Date;
-        ctime: Date;
-        birthtime: Date;
-    }
-
-    class Dirent {
-        isFile(): boolean;
-        isDirectory(): boolean;
-        isBlockDevice(): boolean;
-        isCharacterDevice(): boolean;
-        isSymbolicLink(): boolean;
-        isFIFO(): boolean;
-        isSocket(): boolean;
-        name: string;
-    }
-
-    interface FSWatcher extends events.EventEmitter {
-        close(): void;
-
-        /**
-         * events.EventEmitter
-         *   1. change
-         *   2. error
-         */
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
-        addListener(event: "error", listener: (error: Error) => void): this;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
-        on(event: "error", listener: (error: Error) => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
-        once(event: "error", listener: (error: Error) => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
-        prependListener(event: "error", listener: (error: Error) => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
-        prependOnceListener(event: "error", listener: (error: Error) => void): this;
-    }
-
-    class ReadStream extends stream.Readable {
-        close(): void;
-        bytesRead: number;
-        path: string | Buffer;
-
-        /**
-         * events.EventEmitter
-         *   1. open
-         *   2. close
-         */
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "open", listener: (fd: number) => void): this;
-        addListener(event: "close", listener: () => void): this;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "open", listener: (fd: number) => void): this;
-        on(event: "close", listener: () => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "open", listener: (fd: number) => void): this;
-        once(event: "close", listener: () => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "open", listener: (fd: number) => void): this;
-        prependListener(event: "close", listener: () => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "open", listener: (fd: number) => void): this;
-        prependOnceListener(event: "close", listener: () => void): this;
-    }
-
-    class WriteStream extends stream.Writable {
-        close(): void;
-        bytesWritten: number;
-        path: string | Buffer;
-
-        /**
-         * events.EventEmitter
-         *   1. open
-         *   2. close
-         */
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "open", listener: (fd: number) => void): this;
-        addListener(event: "close", listener: () => void): this;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "open", listener: (fd: number) => void): this;
-        on(event: "close", listener: () => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "open", listener: (fd: number) => void): this;
-        once(event: "close", listener: () => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "open", listener: (fd: number) => void): this;
-        prependListener(event: "close", listener: () => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "open", listener: (fd: number) => void): this;
-        prependOnceListener(event: "close", listener: () => void): this;
-    }
-
-    /**
-     * Asynchronous rename(2) - Change the name or location of a file or directory.
-     * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     */
-    function rename(oldPath: PathLike, newPath: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace rename {
-        /**
-         * Asynchronous rename(2) - Change the name or location of a file or directory.
-         * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * URL support is _experimental_.
-         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * URL support is _experimental_.
-         */
-        function __promisify__(oldPath: PathLike, newPath: PathLike): Promise<void>;
-    }
-
-    /**
-     * Synchronous rename(2) - Change the name or location of a file or directory.
-     * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     */
-    function renameSync(oldPath: PathLike, newPath: PathLike): void;
-
-    /**
-     * Asynchronous truncate(2) - Truncate a file to a specified length.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param len If not specified, defaults to `0`.
-     */
-    function truncate(path: PathLike, len: number | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    /**
-     * Asynchronous truncate(2) - Truncate a file to a specified length.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     */
-    function truncate(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace truncate {
-        /**
-         * Asynchronous truncate(2) - Truncate a file to a specified length.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param len If not specified, defaults to `0`.
-         */
-        function __promisify__(path: PathLike, len?: number | null): Promise<void>;
-    }
-
-    /**
-     * Synchronous truncate(2) - Truncate a file to a specified length.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param len If not specified, defaults to `0`.
-     */
-    function truncateSync(path: PathLike, len?: number | null): void;
-
-    /**
-     * Asynchronous ftruncate(2) - Truncate a file to a specified length.
-     * @param fd A file descriptor.
-     * @param len If not specified, defaults to `0`.
-     */
-    function ftruncate(fd: number, len: number | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    /**
-     * Asynchronous ftruncate(2) - Truncate a file to a specified length.
-     * @param fd A file descriptor.
-     */
-    function ftruncate(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace ftruncate {
-        /**
-         * Asynchronous ftruncate(2) - Truncate a file to a specified length.
-         * @param fd A file descriptor.
-         * @param len If not specified, defaults to `0`.
-         */
-        function __promisify__(fd: number, len?: number | null): Promise<void>;
-    }
-
-    /**
-     * Synchronous ftruncate(2) - Truncate a file to a specified length.
-     * @param fd A file descriptor.
-     * @param len If not specified, defaults to `0`.
-     */
-    function ftruncateSync(fd: number, len?: number | null): void;
-
-    /**
-     * Asynchronous chown(2) - Change ownership of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function chown(path: PathLike, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace chown {
-        /**
-         * Asynchronous chown(2) - Change ownership of a file.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         */
-        function __promisify__(path: PathLike, uid: number, gid: number): Promise<void>;
-    }
-
-    /**
-     * Synchronous chown(2) - Change ownership of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function chownSync(path: PathLike, uid: number, gid: number): void;
-
-    /**
-     * Asynchronous fchown(2) - Change ownership of a file.
-     * @param fd A file descriptor.
-     */
-    function fchown(fd: number, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace fchown {
-        /**
-         * Asynchronous fchown(2) - Change ownership of a file.
-         * @param fd A file descriptor.
-         */
-        function __promisify__(fd: number, uid: number, gid: number): Promise<void>;
-    }
-
-    /**
-     * Synchronous fchown(2) - Change ownership of a file.
-     * @param fd A file descriptor.
-     */
-    function fchownSync(fd: number, uid: number, gid: number): void;
-
-    /**
-     * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function lchown(path: PathLike, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace lchown {
-        /**
-         * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         */
-        function __promisify__(path: PathLike, uid: number, gid: number): Promise<void>;
-    }
-
-    /**
-     * Synchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function lchownSync(path: PathLike, uid: number, gid: number): void;
-
-    /**
-     * Asynchronous chmod(2) - Change permissions of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-     */
-    function chmod(path: PathLike, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace chmod {
-        /**
-         * Asynchronous chmod(2) - Change permissions of a file.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-         */
-        function __promisify__(path: PathLike, mode: string | number): Promise<void>;
-    }
-
-    /**
-     * Synchronous chmod(2) - Change permissions of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-     */
-    function chmodSync(path: PathLike, mode: string | number): void;
-
-    /**
-     * Asynchronous fchmod(2) - Change permissions of a file.
-     * @param fd A file descriptor.
-     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-     */
-    function fchmod(fd: number, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace fchmod {
-        /**
-         * Asynchronous fchmod(2) - Change permissions of a file.
-         * @param fd A file descriptor.
-         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-         */
-        function __promisify__(fd: number, mode: string | number): Promise<void>;
-    }
-
-    /**
-     * Synchronous fchmod(2) - Change permissions of a file.
-     * @param fd A file descriptor.
-     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-     */
-    function fchmodSync(fd: number, mode: string | number): void;
-
-    /**
-     * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-     */
-    function lchmod(path: PathLike, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace lchmod {
-        /**
-         * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-         */
-        function __promisify__(path: PathLike, mode: string | number): Promise<void>;
-    }
-
-    /**
-     * Synchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-     */
-    function lchmodSync(path: PathLike, mode: string | number): void;
-
-    /**
-     * Asynchronous stat(2) - Get file status.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function stat(path: PathLike, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace stat {
-        /**
-         * Asynchronous stat(2) - Get file status.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         */
-        function __promisify__(path: PathLike): Promise<Stats>;
-    }
-
-    /**
-     * Synchronous stat(2) - Get file status.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function statSync(path: PathLike): Stats;
-
-    /**
-     * Asynchronous fstat(2) - Get file status.
-     * @param fd A file descriptor.
-     */
-    function fstat(fd: number, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace fstat {
-        /**
-         * Asynchronous fstat(2) - Get file status.
-         * @param fd A file descriptor.
-         */
-        function __promisify__(fd: number): Promise<Stats>;
-    }
-
-    /**
-     * Synchronous fstat(2) - Get file status.
-     * @param fd A file descriptor.
-     */
-    function fstatSync(fd: number): Stats;
-
-    /**
-     * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function lstat(path: PathLike, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace lstat {
-        /**
-         * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         */
-        function __promisify__(path: PathLike): Promise<Stats>;
-    }
-
-    /**
-     * Synchronous lstat(2) - Get file status. Does not dereference symbolic links.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function lstatSync(path: PathLike): Stats;
-
-    /**
-     * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
-     * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function link(existingPath: PathLike, newPath: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace link {
-        /**
-         * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
-         * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-         */
-        function link(existingPath: PathLike, newPath: PathLike): Promise<void>;
-    }
-
-    /**
-     * Synchronous link(2) - Create a new link (also known as a hard link) to an existing file.
-     * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function linkSync(existingPath: PathLike, newPath: PathLike): void;
-
-    /**
-     * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
-     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
-     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
-     * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
-     * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
-     */
-    function symlink(target: PathLike, path: PathLike, type: symlink.Type | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    /**
-     * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
-     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
-     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
-     */
-    function symlink(target: PathLike, path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace symlink {
-        /**
-         * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
-         * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
-         * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
-         * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
-         * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
-         */
-        function __promisify__(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
-
-        type Type = "dir" | "file" | "junction";
-    }
-
-    /**
-     * Synchronous symlink(2) - Create a new symbolic link to an existing file.
-     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
-     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
-     * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
-     * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
-     */
-    function symlinkSync(target: PathLike, path: PathLike, type?: symlink.Type | null): void;
-
-    /**
-     * Asynchronous readlink(2) - read value of a symbolic link.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readlink(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, linkString: string) => void): void;
-
-    /**
-     * Asynchronous readlink(2) - read value of a symbolic link.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readlink(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, linkString: Buffer) => void): void;
-
-    /**
-     * Asynchronous readlink(2) - read value of a symbolic link.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readlink(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, linkString: string | Buffer) => void): void;
-
-    /**
-     * Asynchronous readlink(2) - read value of a symbolic link.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function readlink(path: PathLike, callback: (err: NodeJS.ErrnoException, linkString: string) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace readlink {
-        /**
-         * Asynchronous readlink(2) - read value of a symbolic link.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function __promisify__(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
-
-        /**
-         * Asynchronous readlink(2) - read value of a symbolic link.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function __promisify__(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
-
-        /**
-         * Asynchronous readlink(2) - read value of a symbolic link.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
-    }
-
-    /**
-     * Synchronous readlink(2) - read value of a symbolic link.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readlinkSync(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
-
-    /**
-     * Synchronous readlink(2) - read value of a symbolic link.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readlinkSync(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
-
-    /**
-     * Synchronous readlink(2) - read value of a symbolic link.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readlinkSync(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
-
-    /**
-     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function realpath(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
-
-    /**
-     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function realpath(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, resolvedPath: Buffer) => void): void;
-
-    /**
-     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function realpath(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string | Buffer) => void): void;
-
-    /**
-     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function realpath(path: PathLike, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace realpath {
-        /**
-         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function __promisify__(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
-
-        /**
-         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function __promisify__(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
-
-        /**
-         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
-
-        function native(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
-        function native(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, resolvedPath: Buffer) => void): void;
-        function native(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string | Buffer) => void): void;
-        function native(path: PathLike, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
-    }
-
-    /**
-     * Synchronous realpath(3) - return the canonicalized absolute pathname.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function realpathSync(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
-
-    /**
-     * Synchronous realpath(3) - return the canonicalized absolute pathname.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function realpathSync(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
-
-    /**
-     * Synchronous realpath(3) - return the canonicalized absolute pathname.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function realpathSync(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
-
-    namespace realpathSync {
-        function native(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
-        function native(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
-        function native(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
-    }
-
-    /**
-     * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function unlink(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace unlink {
-        /**
-         * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         */
-        function __promisify__(path: PathLike): Promise<void>;
-    }
-
-    /**
-     * Synchronous unlink(2) - delete a name and possibly the file it refers to.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function unlinkSync(path: PathLike): void;
-
-    /**
-     * Asynchronous rmdir(2) - delete a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function rmdir(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace rmdir {
-        /**
-         * Asynchronous rmdir(2) - delete a directory.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         */
-        function __promisify__(path: PathLike): Promise<void>;
-    }
-
-    /**
-     * Synchronous rmdir(2) - delete a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function rmdirSync(path: PathLike): void;
-
-    export interface MakeDirectoryOptions {
-        /**
-         * Indicates whether parent folders should be created.
-         * @default false
-         */
-        recursive?: boolean;
-        /**
-         * A file mode. If a string is passed, it is parsed as an octal integer. If not specified
-         * @default 0o777.
-         */
-        mode?: number;
-    }
-
-    /**
-     * Asynchronous mkdir(2) - create a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options Either the file mode, or an object optionally specifying the file mode and whether parent folders
-     * should be created. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
-     */
-    function mkdir(path: PathLike, options: number | string | MakeDirectoryOptions | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    /**
-     * Asynchronous mkdir(2) - create a directory with a mode of `0o777`.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function mkdir(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace mkdir {
-        /**
-         * Asynchronous mkdir(2) - create a directory.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options Either the file mode, or an object optionally specifying the file mode and whether parent folders
-         * should be created. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
-         */
-        function __promisify__(path: PathLike, options?: number | string | MakeDirectoryOptions | null): Promise<void>;
-    }
-
-    /**
-     * Synchronous mkdir(2) - create a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options Either the file mode, or an object optionally specifying the file mode and whether parent folders
-     * should be created. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
-     */
-    function mkdirSync(path: PathLike, options?: number | string | MakeDirectoryOptions | null): void;
-
-    /**
-     * Asynchronously creates a unique temporary directory.
-     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function mkdtemp(prefix: string, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, folder: string) => void): void;
-
-    /**
-     * Asynchronously creates a unique temporary directory.
-     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function mkdtemp(prefix: string, options: "buffer" | { encoding: "buffer" }, callback: (err: NodeJS.ErrnoException, folder: Buffer) => void): void;
-
-    /**
-     * Asynchronously creates a unique temporary directory.
-     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function mkdtemp(prefix: string, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, folder: string | Buffer) => void): void;
-
-    /**
-     * Asynchronously creates a unique temporary directory.
-     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
-     */
-    function mkdtemp(prefix: string, callback: (err: NodeJS.ErrnoException, folder: string) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace mkdtemp {
-        /**
-         * Asynchronously creates a unique temporary directory.
-         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function __promisify__(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
-
-        /**
-         * Asynchronously creates a unique temporary directory.
-         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function __promisify__(prefix: string, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
-
-        /**
-         * Asynchronously creates a unique temporary directory.
-         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function __promisify__(prefix: string, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
-    }
-
-    /**
-     * Synchronously creates a unique temporary directory.
-     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function mkdtempSync(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
-
-    /**
-     * Synchronously creates a unique temporary directory.
-     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function mkdtempSync(prefix: string, options: { encoding: "buffer" } | "buffer"): Buffer;
-
-    /**
-     * Synchronously creates a unique temporary directory.
-     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function mkdtempSync(prefix: string, options?: { encoding?: string | null } | string | null): string | Buffer;
-
-    /**
-     * Asynchronous readdir(3) - read a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readdir(
-        path: PathLike,
-        options: { encoding: BufferEncoding | null; withFileTypes?: false } | BufferEncoding | undefined | null,
-        callback: (err: NodeJS.ErrnoException, files: string[]) => void,
-    ): void;
-
-    /**
-     * Asynchronous readdir(3) - read a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readdir(path: PathLike, options: { encoding: "buffer"; withFileTypes?: false } | "buffer", callback: (err: NodeJS.ErrnoException, files: Buffer[]) => void): void;
-
-    /**
-     * Asynchronous readdir(3) - read a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readdir(
-        path: PathLike,
-        options: { encoding?: string | null; withFileTypes?: false } | string | undefined | null,
-        callback: (err: NodeJS.ErrnoException, files: string[] | Buffer[]) => void,
-    ): void;
-
-    /**
-     * Asynchronous readdir(3) - read a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function readdir(path: PathLike, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
-
-    /**
-     * Asynchronous readdir(3) - read a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options If called with `withFileTypes: true` the result data will be an array of Dirent.
-     */
-    function readdir(path: PathLike, options: { withFileTypes: true }, callback: (err: NodeJS.ErrnoException, files: Dirent[]) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace readdir {
-        /**
-         * Asynchronous readdir(3) - read a directory.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function __promisify__(path: PathLike, options?: { encoding: BufferEncoding | null; withFileTypes?: false } | BufferEncoding | null): Promise<string[]>;
-
-        /**
-         * Asynchronous readdir(3) - read a directory.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function __promisify__(path: PathLike, options: "buffer" | { encoding: "buffer"; withFileTypes?: false }): Promise<Buffer[]>;
-
-        /**
-         * Asynchronous readdir(3) - read a directory.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function __promisify__(path: PathLike, options?: { encoding?: string | null; withFileTypes?: false } | string | null): Promise<string[] | Buffer[]>;
-
-        /**
-         * Asynchronous readdir(3) - read a directory.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options If called with `withFileTypes: true` the result data will be an array of Dirent
-         */
-        function __promisify__(path: PathLike, options: { withFileTypes: true }): Promise<Dirent[]>;
-    }
-
-    /**
-     * Synchronous readdir(3) - read a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readdirSync(path: PathLike, options?: { encoding: BufferEncoding | null; withFileTypes?: false } | BufferEncoding | null): string[];
-
-    /**
-     * Synchronous readdir(3) - read a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readdirSync(path: PathLike, options: { encoding: "buffer"; withFileTypes?: false } | "buffer"): Buffer[];
-
-    /**
-     * Synchronous readdir(3) - read a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readdirSync(path: PathLike, options?: { encoding?: string | null; withFileTypes?: false } | string | null): string[] | Buffer[];
-
-    /**
-     * Asynchronous readdir(3) - read a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options If called with `withFileTypes: true` the result data will be an array of Dirent.
-     */
-    function readdirSync(path: PathLike, options: { withFileTypes: true }): Dirent[];
-
-    /**
-     * Asynchronous close(2) - close a file descriptor.
-     * @param fd A file descriptor.
-     */
-    function close(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace close {
-        /**
-         * Asynchronous close(2) - close a file descriptor.
-         * @param fd A file descriptor.
-         */
-        function __promisify__(fd: number): Promise<void>;
-    }
-
-    /**
-     * Synchronous close(2) - close a file descriptor.
-     * @param fd A file descriptor.
-     */
-    function closeSync(fd: number): void;
-
-    /**
-     * Asynchronous open(2) - open and possibly create a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
-     */
-    function open(path: PathLike, flags: string | number, mode: string | number | undefined | null, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
-
-    /**
-     * Asynchronous open(2) - open and possibly create a file. If the file is created, its mode will be `0o666`.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function open(path: PathLike, flags: string | number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace open {
-        /**
-         * Asynchronous open(2) - open and possibly create a file.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
-         */
-        function __promisify__(path: PathLike, flags: string | number, mode?: string | number | null): Promise<number>;
-    }
-
-    /**
-     * Synchronous open(2) - open and possibly create a file, returning a file descriptor..
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
-     */
-    function openSync(path: PathLike, flags: string | number, mode?: string | number | null): number;
-
-    /**
-     * Asynchronously change file timestamps of the file referenced by the supplied path.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param atime The last access time. If a string is provided, it will be coerced to number.
-     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
-     */
-    function utimes(path: PathLike, atime: string | number | Date, mtime: string | number | Date, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace utimes {
-        /**
-         * Asynchronously change file timestamps of the file referenced by the supplied path.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param atime The last access time. If a string is provided, it will be coerced to number.
-         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
-         */
-        function __promisify__(path: PathLike, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
-    }
-
-    /**
-     * Synchronously change file timestamps of the file referenced by the supplied path.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param atime The last access time. If a string is provided, it will be coerced to number.
-     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
-     */
-    function utimesSync(path: PathLike, atime: string | number | Date, mtime: string | number | Date): void;
-
-    /**
-     * Asynchronously change file timestamps of the file referenced by the supplied file descriptor.
-     * @param fd A file descriptor.
-     * @param atime The last access time. If a string is provided, it will be coerced to number.
-     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
-     */
-    function futimes(fd: number, atime: string | number | Date, mtime: string | number | Date, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace futimes {
-        /**
-         * Asynchronously change file timestamps of the file referenced by the supplied file descriptor.
-         * @param fd A file descriptor.
-         * @param atime The last access time. If a string is provided, it will be coerced to number.
-         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
-         */
-        function __promisify__(fd: number, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
-    }
-
-    /**
-     * Synchronously change file timestamps of the file referenced by the supplied file descriptor.
-     * @param fd A file descriptor.
-     * @param atime The last access time. If a string is provided, it will be coerced to number.
-     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
-     */
-    function futimesSync(fd: number, atime: string | number | Date, mtime: string | number | Date): void;
-
-    /**
-     * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
-     * @param fd A file descriptor.
-     */
-    function fsync(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace fsync {
-        /**
-         * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
-         * @param fd A file descriptor.
-         */
-        function __promisify__(fd: number): Promise<void>;
-    }
-
-    /**
-     * Synchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
-     * @param fd A file descriptor.
-     */
-    function fsyncSync(fd: number): void;
-
-    /**
-     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
-     * @param fd A file descriptor.
-     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
-     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
-     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-     */
-    function write<TBuffer extends BinaryData>(
-        fd: number,
-        buffer: TBuffer,
-        offset: number | undefined | null,
-        length: number | undefined | null,
-        position: number | undefined | null,
-        callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void,
-    ): void;
-
-    /**
-     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
-     * @param fd A file descriptor.
-     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
-     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
-     */
-    function write<TBuffer extends BinaryData>(
-        fd: number,
-        buffer: TBuffer,
-        offset: number | undefined | null,
-        length: number | undefined | null,
-        callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void,
-    ): void;
-
-    /**
-     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
-     * @param fd A file descriptor.
-     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
-     */
-    function write<TBuffer extends BinaryData>(fd: number, buffer: TBuffer, offset: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
-
-    /**
-     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
-     * @param fd A file descriptor.
-     */
-    function write<TBuffer extends BinaryData>(fd: number, buffer: TBuffer, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
-
-    /**
-     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
-     * @param fd A file descriptor.
-     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
-     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-     * @param encoding The expected string encoding.
-     */
-    function write(
-        fd: number,
-        string: any,
-        position: number | undefined | null,
-        encoding: string | undefined | null,
-        callback: (err: NodeJS.ErrnoException, written: number, str: string) => void,
-    ): void;
-
-    /**
-     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
-     * @param fd A file descriptor.
-     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
-     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-     */
-    function write(fd: number, string: any, position: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
-
-    /**
-     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
-     * @param fd A file descriptor.
-     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
-     */
-    function write(fd: number, string: any, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace write {
-        /**
-         * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
-         * @param fd A file descriptor.
-         * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
-         * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
-         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-         */
-        function __promisify__<TBuffer extends BinaryData>(
-            fd: number,
-            buffer?: TBuffer,
-            offset?: number,
-            length?: number,
-            position?: number | null,
-        ): Promise<{ bytesWritten: number, buffer: TBuffer }>;
-
-        /**
-         * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
-         * @param fd A file descriptor.
-         * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
-         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-         * @param encoding The expected string encoding.
-         */
-        function __promisify__(fd: number, string: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
-    }
-
-    /**
-     * Synchronously writes `buffer` to the file referenced by the supplied file descriptor, returning the number of bytes written.
-     * @param fd A file descriptor.
-     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
-     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
-     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-     */
-    function writeSync(fd: number, buffer: BinaryData, offset?: number | null, length?: number | null, position?: number | null): number;
-
-    /**
-     * Synchronously writes `string` to the file referenced by the supplied file descriptor, returning the number of bytes written.
-     * @param fd A file descriptor.
-     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
-     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-     * @param encoding The expected string encoding.
-     */
-    function writeSync(fd: number, string: any, position?: number | null, encoding?: string | null): number;
-
-    /**
-     * Asynchronously reads data from the file referenced by the supplied file descriptor.
-     * @param fd A file descriptor.
-     * @param buffer The buffer that the data will be written to.
-     * @param offset The offset in the buffer at which to start writing.
-     * @param length The number of bytes to read.
-     * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
-     */
-    function read<TBuffer extends BinaryData>(
-        fd: number,
-        buffer: TBuffer,
-        offset: number,
-        length: number,
-        position: number | null,
-        callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: TBuffer) => void,
-    ): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace read {
-        /**
-         * @param fd A file descriptor.
-         * @param buffer The buffer that the data will be written to.
-         * @param offset The offset in the buffer at which to start writing.
-         * @param length The number of bytes to read.
-         * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
-         */
-        function __promisify__<TBuffer extends BinaryData>(fd: number, buffer: TBuffer, offset: number, length: number, position: number | null): Promise<{ bytesRead: number, buffer: TBuffer }>;
-    }
-
-    /**
-     * Synchronously reads data from the file referenced by the supplied file descriptor, returning the number of bytes read.
-     * @param fd A file descriptor.
-     * @param buffer The buffer that the data will be written to.
-     * @param offset The offset in the buffer at which to start writing.
-     * @param length The number of bytes to read.
-     * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
-     */
-    function readSync(fd: number, buffer: BinaryData, offset: number, length: number, position: number | null): number;
-
-    /**
-     * Asynchronously reads the entire contents of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-     * @param options An object that may contain an optional flag.
-     * If a flag is not provided, it defaults to `'r'`.
-     */
-    function readFile(path: PathLike | number, options: { encoding?: null; flag?: string; } | undefined | null, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
-
-    /**
-     * Asynchronously reads the entire contents of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
-     * If a flag is not provided, it defaults to `'r'`.
-     */
-    function readFile(path: PathLike | number, options: { encoding: string; flag?: string; } | string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
-
-    /**
-     * Asynchronously reads the entire contents of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
-     * If a flag is not provided, it defaults to `'r'`.
-     */
-    function readFile(
-        path: PathLike | number,
-        options: { encoding?: string | null; flag?: string; } | string | undefined | null,
-        callback: (err: NodeJS.ErrnoException, data: string | Buffer) => void,
-    ): void;
-
-    /**
-     * Asynchronously reads the entire contents of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-     */
-    function readFile(path: PathLike | number, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace readFile {
-        /**
-         * Asynchronously reads the entire contents of a file.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-         * @param options An object that may contain an optional flag.
-         * If a flag is not provided, it defaults to `'r'`.
-         */
-        function __promisify__(path: PathLike | number, options?: { encoding?: null; flag?: string; } | null): Promise<Buffer>;
-
-        /**
-         * Asynchronously reads the entire contents of a file.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * URL support is _experimental_.
-         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-         * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
-         * If a flag is not provided, it defaults to `'r'`.
-         */
-        function __promisify__(path: PathLike | number, options: { encoding: string; flag?: string; } | string): Promise<string>;
-
-        /**
-         * Asynchronously reads the entire contents of a file.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * URL support is _experimental_.
-         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-         * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
-         * If a flag is not provided, it defaults to `'r'`.
-         */
-        function __promisify__(path: PathLike | number, options?: { encoding?: string | null; flag?: string; } | string | null): Promise<string | Buffer>;
-    }
-
-    /**
-     * Synchronously reads the entire contents of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-     * @param options An object that may contain an optional flag. If a flag is not provided, it defaults to `'r'`.
-     */
-    function readFileSync(path: PathLike | number, options?: { encoding?: null; flag?: string; } | null): Buffer;
-
-    /**
-     * Synchronously reads the entire contents of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
-     * If a flag is not provided, it defaults to `'r'`.
-     */
-    function readFileSync(path: PathLike | number, options: { encoding: string; flag?: string; } | string): string;
-
-    /**
-     * Synchronously reads the entire contents of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
-     * If a flag is not provided, it defaults to `'r'`.
-     */
-    function readFileSync(path: PathLike | number, options?: { encoding?: string | null; flag?: string; } | string | null): string | Buffer;
-
-    type WriteFileOptions = { encoding?: string | null; mode?: number | string; flag?: string; } | string | null;
-
-    /**
-     * Asynchronously writes data to a file, replacing the file if it already exists.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
-     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-     * If `encoding` is not supplied, the default of `'utf8'` is used.
-     * If `mode` is not supplied, the default of `0o666` is used.
-     * If `mode` is a string, it is parsed as an octal integer.
-     * If `flag` is not supplied, the default of `'w'` is used.
-     */
-    function writeFile(path: PathLike | number, data: any, options: WriteFileOptions, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    /**
-     * Asynchronously writes data to a file, replacing the file if it already exists.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
-     */
-    function writeFile(path: PathLike | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace writeFile {
-        /**
-         * Asynchronously writes data to a file, replacing the file if it already exists.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * URL support is _experimental_.
-         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-         * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
-         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-         * If `encoding` is not supplied, the default of `'utf8'` is used.
-         * If `mode` is not supplied, the default of `0o666` is used.
-         * If `mode` is a string, it is parsed as an octal integer.
-         * If `flag` is not supplied, the default of `'w'` is used.
-         */
-        function __promisify__(path: PathLike | number, data: any, options?: WriteFileOptions): Promise<void>;
-    }
-
-    /**
-     * Synchronously writes data to a file, replacing the file if it already exists.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
-     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-     * If `encoding` is not supplied, the default of `'utf8'` is used.
-     * If `mode` is not supplied, the default of `0o666` is used.
-     * If `mode` is a string, it is parsed as an octal integer.
-     * If `flag` is not supplied, the default of `'w'` is used.
-     */
-    function writeFileSync(path: PathLike | number, data: any, options?: WriteFileOptions): void;
-
-    /**
-     * Asynchronously append data to a file, creating the file if it does not exist.
-     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
-     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-     * If `encoding` is not supplied, the default of `'utf8'` is used.
-     * If `mode` is not supplied, the default of `0o666` is used.
-     * If `mode` is a string, it is parsed as an octal integer.
-     * If `flag` is not supplied, the default of `'a'` is used.
-     */
-    function appendFile(file: PathLike | number, data: any, options: WriteFileOptions, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    /**
-     * Asynchronously append data to a file, creating the file if it does not exist.
-     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
-     */
-    function appendFile(file: PathLike | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace appendFile {
-        /**
-         * Asynchronously append data to a file, creating the file if it does not exist.
-         * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * URL support is _experimental_.
-         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-         * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
-         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-         * If `encoding` is not supplied, the default of `'utf8'` is used.
-         * If `mode` is not supplied, the default of `0o666` is used.
-         * If `mode` is a string, it is parsed as an octal integer.
-         * If `flag` is not supplied, the default of `'a'` is used.
-         */
-        function __promisify__(file: PathLike | number, data: any, options?: WriteFileOptions): Promise<void>;
-    }
-
-    /**
-     * Synchronously append data to a file, creating the file if it does not exist.
-     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
-     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
-     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-     * If `encoding` is not supplied, the default of `'utf8'` is used.
-     * If `mode` is not supplied, the default of `0o666` is used.
-     * If `mode` is a string, it is parsed as an octal integer.
-     * If `flag` is not supplied, the default of `'a'` is used.
-     */
-    function appendFileSync(file: PathLike | number, data: any, options?: WriteFileOptions): void;
-
-    /**
-     * Watch for changes on `filename`. The callback `listener` will be called each time the file is accessed.
-     */
-    function watchFile(filename: PathLike, options: { persistent?: boolean; interval?: number; } | undefined, listener: (curr: Stats, prev: Stats) => void): void;
-
-    /**
-     * Watch for changes on `filename`. The callback `listener` will be called each time the file is accessed.
-     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     */
-    function watchFile(filename: PathLike, listener: (curr: Stats, prev: Stats) => void): void;
-
-    /**
-     * Stop watching for changes on `filename`.
-     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     */
-    function unwatchFile(filename: PathLike, listener?: (curr: Stats, prev: Stats) => void): void;
-
-    /**
-     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
-     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
-     * If `encoding` is not supplied, the default of `'utf8'` is used.
-     * If `persistent` is not supplied, the default of `true` is used.
-     * If `recursive` is not supplied, the default of `false` is used.
-     */
-    function watch(
-        filename: PathLike,
-        options: { encoding?: BufferEncoding | null, persistent?: boolean, recursive?: boolean } | BufferEncoding | undefined | null,
-        listener?: (event: string, filename: string) => void,
-    ): FSWatcher;
-
-    /**
-     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
-     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
-     * If `encoding` is not supplied, the default of `'utf8'` is used.
-     * If `persistent` is not supplied, the default of `true` is used.
-     * If `recursive` is not supplied, the default of `false` is used.
-     */
-    function watch(filename: PathLike, options: { encoding: "buffer", persistent?: boolean, recursive?: boolean } | "buffer", listener?: (event: string, filename: Buffer) => void): FSWatcher;
-
-    /**
-     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
-     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
-     * If `encoding` is not supplied, the default of `'utf8'` is used.
-     * If `persistent` is not supplied, the default of `true` is used.
-     * If `recursive` is not supplied, the default of `false` is used.
-     */
-    function watch(
-        filename: PathLike,
-        options: { encoding?: string | null, persistent?: boolean, recursive?: boolean } | string | null,
-        listener?: (event: string, filename: string | Buffer) => void,
-    ): FSWatcher;
-
-    /**
-     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
-     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     */
-    function watch(filename: PathLike, listener?: (event: string, filename: string) => any): FSWatcher;
-
-    /**
-     * Asynchronously tests whether or not the given path exists by checking with the file system.
-     * @deprecated
-     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     */
-    function exists(path: PathLike, callback: (exists: boolean) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace exists {
-        /**
-         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-         * URL support is _experimental_.
-         */
-        function __promisify__(path: PathLike): Promise<boolean>;
-    }
-
-    /**
-     * Synchronously tests whether or not the given path exists by checking with the file system.
-     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     */
-    function existsSync(path: PathLike): boolean;
-
-    namespace constants {
-        // File Access Constants
-
-        /** Constant for fs.access(). File is visible to the calling process. */
-        const F_OK: number;
-
-        /** Constant for fs.access(). File can be read by the calling process. */
-        const R_OK: number;
-
-        /** Constant for fs.access(). File can be written by the calling process. */
-        const W_OK: number;
-
-        /** Constant for fs.access(). File can be executed by the calling process. */
-        const X_OK: number;
-
-        // File Copy Constants
-
-        /** Constant for fs.copyFile. Flag indicating the destination file should not be overwritten if it already exists. */
-        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.
-         */
-        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.
-         */
-        const COPYFILE_FICLONE_FORCE: number;
-
-        // File Open Constants
-
-        /** Constant for fs.open(). Flag indicating to open a file for read-only access. */
-        const O_RDONLY: number;
-
-        /** Constant for fs.open(). Flag indicating to open a file for write-only access. */
-        const O_WRONLY: number;
-
-        /** Constant for fs.open(). Flag indicating to open a file for read-write access. */
-        const O_RDWR: number;
-
-        /** Constant for fs.open(). Flag indicating to create the file if it does not already exist. */
-        const O_CREAT: number;
-
-        /** Constant for fs.open(). Flag indicating that opening a file should fail if the O_CREAT flag is set and the file already exists. */
-        const O_EXCL: number;
-
-        /**
-         * Constant for fs.open(). Flag indicating that if path identifies a terminal device,
-         * opening the path shall not cause that terminal to become the controlling terminal for the process
-         * (if the process does not already have one).
-         */
-        const O_NOCTTY: number;
-
-        /** Constant for fs.open(). Flag indicating that if the file exists and is a regular file, and the file is opened successfully for write access, its length shall be truncated to zero. */
-        const O_TRUNC: number;
-
-        /** Constant for fs.open(). Flag indicating that data will be appended to the end of the file. */
-        const O_APPEND: number;
-
-        /** Constant for fs.open(). Flag indicating that the open should fail if the path is not a directory. */
-        const O_DIRECTORY: number;
-
-        /**
-         * constant for fs.open().
-         * Flag indicating reading accesses to the file system will no longer result in
-         * an update to the atime information associated with the file.
-         * This flag is available on Linux operating systems only.
-         */
-        const O_NOATIME: number;
-
-        /** Constant for fs.open(). Flag indicating that the open should fail if the path is a symbolic link. */
-        const O_NOFOLLOW: number;
-
-        /** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O. */
-        const O_SYNC: number;
-
-        /** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O with write operations waiting for data integrity. */
-        const O_DSYNC: number;
-
-        /** Constant for fs.open(). Flag indicating to open the symbolic link itself rather than the resource it is pointing to. */
-        const O_SYMLINK: number;
-
-        /** Constant for fs.open(). When set, an attempt will be made to minimize caching effects of file I/O. */
-        const O_DIRECT: number;
-
-        /** Constant for fs.open(). Flag indicating to open the file in nonblocking mode when possible. */
-        const O_NONBLOCK: number;
-
-        // File Type Constants
-
-        /** Constant for fs.Stats mode property for determining a file's type. Bit mask used to extract the file type code. */
-        const S_IFMT: number;
-
-        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a regular file. */
-        const S_IFREG: number;
-
-        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a directory. */
-        const S_IFDIR: number;
-
-        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a character-oriented device file. */
-        const S_IFCHR: number;
-
-        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a block-oriented device file. */
-        const S_IFBLK: number;
-
-        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a FIFO/pipe. */
-        const S_IFIFO: number;
-
-        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a symbolic link. */
-        const S_IFLNK: number;
-
-        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a socket. */
-        const S_IFSOCK: number;
-
-        // File Mode Constants
-
-        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by owner. */
-        const S_IRWXU: number;
-
-        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by owner. */
-        const S_IRUSR: number;
-
-        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by owner. */
-        const S_IWUSR: number;
-
-        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by owner. */
-        const S_IXUSR: number;
-
-        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by group. */
-        const S_IRWXG: number;
-
-        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by group. */
-        const S_IRGRP: number;
-
-        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by group. */
-        const S_IWGRP: number;
-
-        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by group. */
-        const S_IXGRP: number;
-
-        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by others. */
-        const S_IRWXO: number;
-
-        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by others. */
-        const S_IROTH: number;
-
-        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by others. */
-        const S_IWOTH: number;
-
-        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by others. */
-        const S_IXOTH: number;
-    }
-
-    /**
-     * Asynchronously tests a user's permissions for the file specified by path.
-     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     */
-    function access(path: PathLike, mode: number | undefined, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    /**
-     * Asynchronously tests a user's permissions for the file specified by path.
-     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     */
-    function access(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace access {
-        /**
-         * Asynchronously tests a user's permissions for the file specified by path.
-         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-         * URL support is _experimental_.
-         */
-        function __promisify__(path: PathLike, mode?: number): Promise<void>;
-    }
-
-    /**
-     * Synchronously tests a user's permissions for the file specified by path.
-     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     */
-    function accessSync(path: PathLike, mode?: number): void;
-
-    /**
-     * Returns a new `ReadStream` object.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     */
-    function createReadStream(path: PathLike, options?: string | {
-        flags?: string;
-        encoding?: string;
-        fd?: number;
-        mode?: number;
-        autoClose?: boolean;
-        start?: number;
-        end?: number;
-        highWaterMark?: number;
-    }): ReadStream;
-
-    /**
-     * Returns a new `WriteStream` object.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     */
-    function createWriteStream(path: PathLike, options?: string | {
-        flags?: string;
-        encoding?: string;
-        fd?: number;
-        mode?: number;
-        autoClose?: boolean;
-        start?: number;
-    }): WriteStream;
-
-    /**
-     * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
-     * @param fd A file descriptor.
-     */
-    function fdatasync(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace fdatasync {
-        /**
-         * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
-         * @param fd A file descriptor.
-         */
-        function __promisify__(fd: number): Promise<void>;
-    }
-
-    /**
-     * Synchronous fdatasync(2) - synchronize a file's in-core state with storage device.
-     * @param fd A file descriptor.
-     */
-    function fdatasyncSync(fd: number): void;
-
-    /**
-     * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
-     * No arguments other than a possible exception are given to the callback function.
-     * Node.js makes no guarantees about the atomicity of the copy operation.
-     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
-     * to remove the destination.
-     * @param src A path to the source file.
-     * @param dest A path to the destination file.
-     */
-    function copyFile(src: PathLike, dest: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
-    /**
-     * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
-     * No arguments other than a possible exception are given to the callback function.
-     * Node.js makes no guarantees about the atomicity of the copy operation.
-     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
-     * to remove the destination.
-     * @param src A path to the source file.
-     * @param dest A path to the destination file.
-     * @param flags An integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
-     */
-    function copyFile(src: PathLike, dest: PathLike, flags: number, callback: (err: NodeJS.ErrnoException) => void): void;
-
-    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-    namespace copyFile {
-        /**
-         * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
-         * No arguments other than a possible exception are given to the callback function.
-         * Node.js makes no guarantees about the atomicity of the copy operation.
-         * If an error occurs after the destination file has been opened for writing, Node.js will attempt
-         * to remove the destination.
-         * @param src A path to the source file.
-         * @param dest A path to the destination file.
-         * @param flags An optional integer that specifies the behavior of the copy operation.
-         * The only supported flag is fs.constants.COPYFILE_EXCL,
-         * which causes the copy operation to fail if dest already exists.
-         */
-        function __promisify__(src: PathLike, dst: PathLike, flags?: number): Promise<void>;
-    }
-
-    /**
-     * Synchronously copies src to dest. By default, dest is overwritten if it already exists.
-     * Node.js makes no guarantees about the atomicity of the copy operation.
-     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
-     * to remove the destination.
-     * @param src A path to the source file.
-     * @param dest A path to the destination file.
-     * @param flags An optional integer that specifies the behavior of the copy operation.
-     * The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
-     */
-    function copyFileSync(src: PathLike, dest: PathLike, flags?: number): void;
-
-    namespace promises {
-        interface FileHandle {
-            /**
-             * Gets the file descriptor for this file handle.
-             */
-            readonly fd: number;
-
-            /**
-             * Asynchronously append data to a file, creating the file if it does not exist. The underlying file will _not_ be closed automatically.
-             * The `FileHandle` must have been opened for appending.
-             * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
-             * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-             * If `encoding` is not supplied, the default of `'utf8'` is used.
-             * If `mode` is not supplied, the default of `0o666` is used.
-             * If `mode` is a string, it is parsed as an octal integer.
-             * If `flag` is not supplied, the default of `'a'` is used.
-             */
-            appendFile(data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
-
-            /**
-             * Asynchronous fchown(2) - Change ownership of a file.
-             */
-            chown(uid: number, gid: number): Promise<void>;
-
-            /**
-             * Asynchronous fchmod(2) - Change permissions of a file.
-             * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-             */
-            chmod(mode: string | number): Promise<void>;
-
-            /**
-             * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
-             */
-            datasync(): Promise<void>;
-
-            /**
-             * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
-             */
-            sync(): Promise<void>;
-
-            /**
-             * Asynchronously reads data from the file.
-             * The `FileHandle` must have been opened for reading.
-             * @param buffer The buffer that the data will be written to.
-             * @param offset The offset in the buffer at which to start writing.
-             * @param length The number of bytes to read.
-             * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
-             */
-            read<TBuffer extends Buffer | Uint8Array>(buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesRead: number, buffer: TBuffer }>;
-
-            /**
-             * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
-             * The `FileHandle` must have been opened for reading.
-             * @param options An object that may contain an optional flag.
-             * If a flag is not provided, it defaults to `'r'`.
-             */
-            readFile(options?: { encoding?: null, flag?: string | number } | null): Promise<Buffer>;
-
-            /**
-             * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
-             * The `FileHandle` must have been opened for reading.
-             * @param options An object that may contain an optional flag.
-             * If a flag is not provided, it defaults to `'r'`.
-             */
-            readFile(options: { encoding: BufferEncoding, flag?: string | number } | BufferEncoding): Promise<string>;
-
-            /**
-             * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
-             * The `FileHandle` must have been opened for reading.
-             * @param options An object that may contain an optional flag.
-             * If a flag is not provided, it defaults to `'r'`.
-             */
-            readFile(options?: { encoding?: string | null, flag?: string | number } | string | null): Promise<string | Buffer>;
-
-            /**
-             * Asynchronous fstat(2) - Get file status.
-             */
-            stat(): Promise<Stats>;
-
-            /**
-             * Asynchronous ftruncate(2) - Truncate a file to a specified length.
-             * @param len If not specified, defaults to `0`.
-             */
-            truncate(len?: number): Promise<void>;
-
-            /**
-             * Asynchronously change file timestamps of the file.
-             * @param atime The last access time. If a string is provided, it will be coerced to number.
-             * @param mtime The last modified time. If a string is provided, it will be coerced to number.
-             */
-            utimes(atime: string | number | Date, mtime: string | number | Date): Promise<void>;
-
-            /**
-             * Asynchronously writes `buffer` to the file.
-             * The `FileHandle` must have been opened for writing.
-             * @param buffer The buffer that the data will be written to.
-             * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
-             * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
-             * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-             */
-            write<TBuffer extends Buffer | Uint8Array>(buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesWritten: number, buffer: TBuffer }>;
-
-            /**
-             * Asynchronously writes `string` to the file.
-             * The `FileHandle` must have been opened for writing.
-             * It is unsafe to call `write()` multiple times on the same file without waiting for the `Promise`
-             * to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
-             * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
-             * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-             * @param encoding The expected string encoding.
-             */
-            write(data: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
-
-            /**
-             * Asynchronously writes data to a file, replacing the file if it already exists. The underlying file will _not_ be closed automatically.
-             * The `FileHandle` must have been opened for writing.
-             * It is unsafe to call `writeFile()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected).
-             * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
-             * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-             * If `encoding` is not supplied, the default of `'utf8'` is used.
-             * If `mode` is not supplied, the default of `0o666` is used.
-             * If `mode` is a string, it is parsed as an octal integer.
-             * If `flag` is not supplied, the default of `'w'` is used.
-             */
-            writeFile(data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
-
-            /**
-             * Asynchronous close(2) - close a `FileHandle`.
-             */
-            close(): Promise<void>;
-        }
-
-        /**
-         * Asynchronously tests a user's permissions for the file specified by path.
-         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-         * URL support is _experimental_.
-         */
-        function access(path: PathLike, mode?: number): Promise<void>;
-
-        /**
-         * Asynchronously copies `src` to `dest`. By default, `dest` is overwritten if it already exists.
-         * Node.js makes no guarantees about the atomicity of the copy operation.
-         * If an error occurs after the destination file has been opened for writing, Node.js will attempt
-         * to remove the destination.
-         * @param src A path to the source file.
-         * @param dest A path to the destination file.
-         * @param flags An optional integer that specifies the behavior of the copy operation. The only
-         * supported flag is `fs.constants.COPYFILE_EXCL`, which causes the copy operation to fail if
-         * `dest` already exists.
-         */
-        function copyFile(src: PathLike, dest: PathLike, flags?: number): Promise<void>;
-
-        /**
-         * Asynchronous open(2) - open and possibly create a file.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not
-         * supplied, defaults to `0o666`.
-         */
-        function open(path: PathLike, flags: string | number, mode?: string | number): Promise<FileHandle>;
-
-        /**
-         * Asynchronously reads data from the file referenced by the supplied `FileHandle`.
-         * @param handle A `FileHandle`.
-         * @param buffer The buffer that the data will be written to.
-         * @param offset The offset in the buffer at which to start writing.
-         * @param length The number of bytes to read.
-         * @param position The offset from the beginning of the file from which data should be read. If
-         * `null`, data will be read from the current position.
-         */
-        function read<TBuffer extends Buffer | Uint8Array>(
-            handle: FileHandle,
-            buffer: TBuffer,
-            offset?: number | null,
-            length?: number | null,
-            position?: number | null,
-        ): Promise<{ bytesRead: number, buffer: TBuffer }>;
-
-        /**
-         * Asynchronously writes `buffer` to the file referenced by the supplied `FileHandle`.
-         * It is unsafe to call `fsPromises.write()` multiple times on the same file without waiting for the `Promise`
-         * to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
-         * @param handle A `FileHandle`.
-         * @param buffer The buffer that the data will be written to.
-         * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
-         * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
-         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-         */
-        function write<TBuffer extends Buffer | Uint8Array>(
-            handle: FileHandle,
-            buffer: TBuffer,
-            offset?: number | null,
-            length?: number | null, position?: number | null): Promise<{ bytesWritten: number, buffer: TBuffer }>;
-
-        /**
-         * Asynchronously writes `string` to the file referenced by the supplied `FileHandle`.
-         * It is unsafe to call `fsPromises.write()` multiple times on the same file without waiting for the `Promise`
-         * to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
-         * @param handle A `FileHandle`.
-         * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
-         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-         * @param encoding The expected string encoding.
-         */
-        function write(handle: FileHandle, string: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
-
-        /**
-         * Asynchronous rename(2) - Change the name or location of a file or directory.
-         * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * URL support is _experimental_.
-         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * URL support is _experimental_.
-         */
-        function rename(oldPath: PathLike, newPath: PathLike): Promise<void>;
-
-        /**
-         * Asynchronous truncate(2) - Truncate a file to a specified length.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param len If not specified, defaults to `0`.
-         */
-        function truncate(path: PathLike, len?: number): Promise<void>;
-
-        /**
-         * Asynchronous ftruncate(2) - Truncate a file to a specified length.
-         * @param handle A `FileHandle`.
-         * @param len If not specified, defaults to `0`.
-         */
-        function ftruncate(handle: FileHandle, len?: number): Promise<void>;
-
-        /**
-         * Asynchronous rmdir(2) - delete a directory.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         */
-        function rmdir(path: PathLike): Promise<void>;
-
-        /**
-         * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
-         * @param handle A `FileHandle`.
-         */
-        function fdatasync(handle: FileHandle): Promise<void>;
-
-        /**
-         * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
-         * @param handle A `FileHandle`.
-         */
-        function fsync(handle: FileHandle): Promise<void>;
-
-        /**
-         * Asynchronous mkdir(2) - create a directory.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options Either the file mode, or an object optionally specifying the file mode and whether parent folders
-         * should be created. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
-         */
-        function mkdir(path: PathLike, options?: number | string | MakeDirectoryOptions | null): Promise<void>;
-
-        /**
-         * Asynchronous readdir(3) - read a directory.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function readdir(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string[]>;
-
-        /**
-         * Asynchronous readdir(3) - read a directory.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function readdir(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer[]>;
-
-        /**
-         * Asynchronous readdir(3) - read a directory.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function readdir(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string[] | Buffer[]>;
-
-        /**
-         * Asynchronous readlink(2) - read value of a symbolic link.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function readlink(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
-
-        /**
-         * Asynchronous readlink(2) - read value of a symbolic link.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function readlink(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
-
-        /**
-         * Asynchronous readlink(2) - read value of a symbolic link.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function readlink(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
-
-        /**
-         * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
-         * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
-         * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
-         * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
-         * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
-         */
-        function symlink(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
-
-        /**
-         * Asynchronous fstat(2) - Get file status.
-         * @param handle A `FileHandle`.
-         */
-        function fstat(handle: FileHandle): Promise<Stats>;
-
-        /**
-         * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         */
-        function lstat(path: PathLike): Promise<Stats>;
-
-        /**
-         * Asynchronous stat(2) - Get file status.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         */
-        function stat(path: PathLike): Promise<Stats>;
-
-        /**
-         * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
-         * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-         */
-        function link(existingPath: PathLike, newPath: PathLike): Promise<void>;
-
-        /**
-         * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         */
-        function unlink(path: PathLike): Promise<void>;
-
-        /**
-         * Asynchronous fchmod(2) - Change permissions of a file.
-         * @param handle A `FileHandle`.
-         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-         */
-        function fchmod(handle: FileHandle, mode: string | number): Promise<void>;
-
-        /**
-         * Asynchronous chmod(2) - Change permissions of a file.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-         */
-        function chmod(path: PathLike, mode: string | number): Promise<void>;
-
-        /**
-         * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-         */
-        function lchmod(path: PathLike, mode: string | number): Promise<void>;
-
-        /**
-         * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         */
-        function lchown(path: PathLike, uid: number, gid: number): Promise<void>;
-
-        /**
-         * Asynchronous fchown(2) - Change ownership of a file.
-         * @param handle A `FileHandle`.
-         */
-        function fchown(handle: FileHandle, uid: number, gid: number): Promise<void>;
-
-        /**
-         * Asynchronous chown(2) - Change ownership of a file.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         */
-        function chown(path: PathLike, uid: number, gid: number): Promise<void>;
-
-        /**
-         * Asynchronously change file timestamps of the file referenced by the supplied path.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param atime The last access time. If a string is provided, it will be coerced to number.
-         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
-         */
-        function utimes(path: PathLike, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
-
-        /**
-         * Asynchronously change file timestamps of the file referenced by the supplied `FileHandle`.
-         * @param handle A `FileHandle`.
-         * @param atime The last access time. If a string is provided, it will be coerced to number.
-         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
-         */
-        function futimes(handle: FileHandle, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
-
-        /**
-         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function realpath(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
-
-        /**
-         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function realpath(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
-
-        /**
-         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function realpath(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
-
-        /**
-         * Asynchronously creates a unique temporary directory.
-         * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function mkdtemp(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
-
-        /**
-         * Asynchronously creates a unique temporary directory.
-         * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function mkdtemp(prefix: string, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
-
-        /**
-         * Asynchronously creates a unique temporary directory.
-         * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
-         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-         */
-        function mkdtemp(prefix: string, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
-
-        /**
-         * Asynchronously writes data to a file, replacing the file if it already exists.
-         * It is unsafe to call `fsPromises.writeFile()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected).
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * URL support is _experimental_.
-         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
-         * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
-         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-         * If `encoding` is not supplied, the default of `'utf8'` is used.
-         * If `mode` is not supplied, the default of `0o666` is used.
-         * If `mode` is a string, it is parsed as an octal integer.
-         * If `flag` is not supplied, the default of `'w'` is used.
-         */
-        function writeFile(path: PathLike | FileHandle, data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
-
-        /**
-         * Asynchronously append data to a file, creating the file if it does not exist.
-         * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * URL support is _experimental_.
-         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
-         * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
-         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-         * If `encoding` is not supplied, the default of `'utf8'` is used.
-         * If `mode` is not supplied, the default of `0o666` is used.
-         * If `mode` is a string, it is parsed as an octal integer.
-         * If `flag` is not supplied, the default of `'a'` is used.
-         */
-        function appendFile(path: PathLike | FileHandle, data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
-
-        /**
-         * Asynchronously reads the entire contents of a file.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
-         * @param options An object that may contain an optional flag.
-         * If a flag is not provided, it defaults to `'r'`.
-         */
-        function readFile(path: PathLike | FileHandle, options?: { encoding?: null, flag?: string | number } | null): Promise<Buffer>;
-
-        /**
-         * Asynchronously reads the entire contents of a file.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
-         * @param options An object that may contain an optional flag.
-         * If a flag is not provided, it defaults to `'r'`.
-         */
-        function readFile(path: PathLike | FileHandle, options: { encoding: BufferEncoding, flag?: string | number } | BufferEncoding): Promise<string>;
-
-        /**
-         * Asynchronously reads the entire contents of a file.
-         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
-         * @param options An object that may contain an optional flag.
-         * If a flag is not provided, it defaults to `'r'`.
-         */
-        function readFile(path: PathLike | FileHandle, options?: { encoding?: string | null, flag?: string | number } | string | null): Promise<string | Buffer>;
-    }
-}
-
-declare module "path" {
-    /**
-     * A parsed path object generated by path.parse() or consumed by path.format().
-     */
-    interface ParsedPath {
-        /**
-         * The root of the path such as '/' or 'c:\'
-         */
-        root: string;
-        /**
-         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
-         */
-        dir: string;
-        /**
-         * The file name including extension (if any) such as 'index.html'
-         */
-        base: string;
-        /**
-         * The file extension (if any) such as '.html'
-         */
-        ext: string;
-        /**
-         * The file name without extension (if any) such as 'index'
-         */
-        name: string;
-    }
-    interface FormatInputPathObject {
-        /**
-         * The root of the path such as '/' or 'c:\'
-         */
-        root?: string;
-        /**
-         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
-         */
-        dir?: string;
-        /**
-         * The file name including extension (if any) such as 'index.html'
-         */
-        base?: string;
-        /**
-         * The file extension (if any) such as '.html'
-         */
-        ext?: string;
-        /**
-         * The file name without extension (if any) such as 'index'
-         */
-        name?: string;
-    }
-
-    /**
-     * Normalize a string path, reducing '..' and '.' parts.
-     * When multiple slashes are found, they're replaced by a single one; when the path contains a trailing slash, it is preserved. On Windows backslashes are used.
-     *
-     * @param p string path to normalize.
-     */
-    function normalize(p: string): string;
-    /**
-     * Join all arguments together and normalize the resulting path.
-     * Arguments must be strings. In v0.8, non-string arguments were silently ignored. In v0.10 and up, an exception is thrown.
-     *
-     * @param paths paths to join.
-     */
-    function join(...paths: string[]): string;
-    /**
-     * The right-most parameter is considered {to}.  Other parameters are considered an array of {from}.
-     *
-     * Starting from leftmost {from} parameter, resolves {to} to an absolute path.
-     *
-     * If {to} isn't already absolute, {from} arguments are prepended in right to left order,
-     * until an absolute path is found. If after using all {from} paths still no absolute path is found,
-     * the current working directory is used as well. The resulting path is normalized,
-     * and trailing slashes are removed unless the path gets resolved to the root directory.
-     *
-     * @param pathSegments string paths to join.  Non-string arguments are ignored.
-     */
-    function resolve(...pathSegments: string[]): string;
-    /**
-     * Determines whether {path} is an absolute path. An absolute path will always resolve to the same location, regardless of the working directory.
-     *
-     * @param path path to test.
-     */
-    function isAbsolute(path: string): boolean;
-    /**
-     * Solve the relative path from {from} to {to}.
-     * At times we have two absolute paths, and we need to derive the relative path from one to the other. This is actually the reverse transform of path.resolve.
-     */
-    function relative(from: string, to: string): string;
-    /**
-     * Return the directory name of a path. Similar to the Unix dirname command.
-     *
-     * @param p the path to evaluate.
-     */
-    function dirname(p: string): string;
-    /**
-     * Return the last portion of a path. Similar to the Unix basename command.
-     * Often used to extract the file name from a fully qualified path.
-     *
-     * @param p the path to evaluate.
-     * @param ext optionally, an extension to remove from the result.
-     */
-    function basename(p: string, ext?: string): string;
-    /**
-     * Return the extension of the path, from the last '.' to end of string in the last portion of the path.
-     * If there is no '.' in the last portion of the path or the first character of it is '.', then it returns an empty string
-     *
-     * @param p the path to evaluate.
-     */
-    function extname(p: string): string;
-    /**
-     * The platform-specific file separator. '\\' or '/'.
-     */
-    const sep: '\\' | '/';
-    /**
-     * The platform-specific file delimiter. ';' or ':'.
-     */
-    const delimiter: ';' | ':';
-    /**
-     * Returns an object from a path string - the opposite of format().
-     *
-     * @param pathString path to evaluate.
-     */
-    function parse(pathString: string): ParsedPath;
-    /**
-     * Returns a path string from an object - the opposite of parse().
-     *
-     * @param pathString path to evaluate.
-     */
-    function format(pathObject: FormatInputPathObject): string;
-
-    namespace posix {
-        function normalize(p: string): string;
-        function join(...paths: any[]): string;
-        function resolve(...pathSegments: any[]): string;
-        function isAbsolute(p: string): boolean;
-        function relative(from: string, to: string): string;
-        function dirname(p: string): string;
-        function basename(p: string, ext?: string): string;
-        function extname(p: string): string;
-        const sep: string;
-        const delimiter: string;
-        function parse(p: string): ParsedPath;
-        function format(pP: FormatInputPathObject): string;
-    }
-
-    namespace win32 {
-        function normalize(p: string): string;
-        function join(...paths: any[]): string;
-        function resolve(...pathSegments: any[]): string;
-        function isAbsolute(p: string): boolean;
-        function relative(from: string, to: string): string;
-        function dirname(p: string): string;
-        function basename(p: string, ext?: string): string;
-        function extname(p: string): string;
-        const sep: string;
-        const delimiter: string;
-        function parse(p: string): ParsedPath;
-        function format(pP: FormatInputPathObject): string;
-    }
-}
-
-declare module "string_decoder" {
-    interface NodeStringDecoder {
-        write(buffer: Buffer): string;
-        end(buffer?: Buffer): string;
-    }
-    const StringDecoder: {
-        new(encoding?: string): NodeStringDecoder;
-    };
-}
-
-declare module "tls" {
-    import * as crypto from "crypto";
-    import * as dns from "dns";
-    import * as net from "net";
-    import * as stream from "stream";
-
-    const CLIENT_RENEG_LIMIT: number;
-    const CLIENT_RENEG_WINDOW: number;
-
-    interface Certificate {
-        /**
-         * Country code.
-         */
-        C: string;
-        /**
-         * Street.
-         */
-        ST: string;
-        /**
-         * Locality.
-         */
-        L: string;
-        /**
-         * Organization.
-         */
-        O: string;
-        /**
-         * Organizational unit.
-         */
-        OU: string;
-        /**
-         * Common name.
-         */
-        CN: string;
-    }
-
-    interface PeerCertificate {
-        subject: Certificate;
-        issuer: Certificate;
-        subjectaltname: string;
-        infoAccess: { [index: string]: string[] | undefined };
-        modulus: string;
-        exponent: string;
-        valid_from: string;
-        valid_to: string;
-        fingerprint: string;
-        ext_key_usage: string[];
-        serialNumber: string;
-        raw: Buffer;
-    }
-
-    interface DetailedPeerCertificate extends PeerCertificate {
-        issuerCertificate: DetailedPeerCertificate;
-    }
-
-    interface CipherNameAndProtocol {
-        /**
-         * The cipher name.
-         */
-        name: string;
-        /**
-         * SSL/TLS protocol version.
-         */
-        version: string;
-    }
-
-    class TLSSocket extends net.Socket {
-        /**
-         * Construct a new tls.TLSSocket object from an existing TCP socket.
-         */
-        constructor(socket: net.Socket, options?: {
-            /**
-             * An optional TLS context object from tls.createSecureContext()
-             */
-            secureContext?: SecureContext,
-            /**
-             * If true the TLS socket will be instantiated in server-mode.
-             * Defaults to false.
-             */
-            isServer?: boolean,
-            /**
-             * An optional net.Server instance.
-             */
-            server?: net.Server,
-            /**
-             * If true the server will request a certificate from clients that
-             * connect and attempt to verify that certificate. Defaults to
-             * false.
-             */
-            requestCert?: boolean,
-            /**
-             * If true the server will reject any connection which is not
-             * authorized with the list of supplied CAs. This option only has an
-             * effect if requestCert is true. Defaults to false.
-             */
-            rejectUnauthorized?: boolean,
-            /**
-             * An array of strings or a Buffer naming possible NPN protocols.
-             * (Protocols should be ordered by their priority.)
-             */
-            NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array,
-            /**
-             * An array of strings or a Buffer naming possible ALPN protocols.
-             * (Protocols should be ordered by their priority.) When the server
-             * receives both NPN and ALPN extensions from the client, ALPN takes
-             * precedence over NPN and the server does not send an NPN extension
-             * to the client.
-             */
-            ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array,
-            /**
-             * SNICallback(servername, cb) <Function> A function that will be
-             * called if the client supports SNI TLS extension. Two arguments
-             * will be passed when called: servername and cb. SNICallback should
-             * invoke cb(null, ctx), where ctx is a SecureContext instance.
-             * (tls.createSecureContext(...) can be used to get a proper
-             * SecureContext.) If SNICallback wasn't provided the default callback
-             * with high-level API will be used (see below).
-             */
-            SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void,
-            /**
-             * An optional Buffer instance containing a TLS session.
-             */
-            session?: Buffer,
-            /**
-             * If true, specifies that the OCSP status request extension will be
-             * added to the client hello and an 'OCSPResponse' event will be
-             * emitted on the socket before establishing a secure communication
-             */
-            requestOCSP?: boolean
-        });
-
-        /**
-         * A boolean that is true if the peer certificate was signed by one of the specified CAs, otherwise false.
-         */
-        authorized: boolean;
-        /**
-         * The reason why the peer's certificate has not been verified.
-         * This property becomes available only when tlsSocket.authorized === false.
-         */
-        authorizationError: Error;
-        /**
-         * Static boolean value, always true.
-         * May be used to distinguish TLS sockets from regular ones.
-         */
-        encrypted: boolean;
-
-        /**
-         * String containing the selected ALPN protocol.
-         * When ALPN has no selected protocol, tlsSocket.alpnProtocol equals false.
-         */
-        alpnProtocol?: string;
-
-        /**
-         * Returns an object representing the cipher name and the SSL/TLS protocol version of the current connection.
-         * @returns Returns an object representing the cipher name
-         * and the SSL/TLS protocol version of the current connection.
-         */
-        getCipher(): CipherNameAndProtocol;
-        /**
-         * Returns an object representing the peer's certificate.
-         * The returned object has some properties corresponding to the field of the certificate.
-         * If detailed argument is true the full chain with issuer property will be returned,
-         * if false only the top certificate without issuer property.
-         * If the peer does not provide a certificate, it returns null or an empty object.
-         * @param detailed - If true; the full chain with issuer property will be returned.
-         * @returns An object representing the peer's certificate.
-         */
-        getPeerCertificate(detailed: true): DetailedPeerCertificate;
-        getPeerCertificate(detailed?: false): PeerCertificate;
-        getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
-        /**
-         * Returns a string containing the negotiated SSL/TLS protocol version of the current connection.
-         * The value `'unknown'` will be returned for connected sockets that have not completed the handshaking process.
-         * The value `null` will be returned for server sockets or disconnected client sockets.
-         * See https://www.openssl.org/docs/man1.0.2/ssl/SSL_get_version.html for more information.
-         * @returns negotiated SSL/TLS protocol version of the current connection
-         */
-        getProtocol(): string | null;
-        /**
-         * Could be used to speed up handshake establishment when reconnecting to the server.
-         * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
-         */
-        getSession(): any;
-        /**
-         * NOTE: Works only with client TLS sockets.
-         * Useful only for debugging, for session reuse provide session option to tls.connect().
-         * @returns TLS session ticket or undefined if none was negotiated.
-         */
-        getTLSTicket(): any;
-        /**
-         * Initiate TLS renegotiation process.
-         *
-         * NOTE: Can be used to request peer's certificate after the secure connection has been established.
-         * ANOTHER NOTE: When running as the server, socket will be destroyed with an error after handshakeTimeout timeout.
-         * @param options - The options may contain the following fields: rejectUnauthorized,
-         * requestCert (See tls.createServer() for details).
-         * @param callback - callback(err) will be executed with null as err, once the renegotiation
-         * is successfully completed.
-         */
-        renegotiate(options: { rejectUnauthorized?: boolean, requestCert?: boolean }, callback: (err: Error | null) => void): any;
-        /**
-         * Set maximum TLS fragment size (default and maximum value is: 16384, minimum is: 512).
-         * Smaller fragment size decreases buffering latency on the client: large fragments are buffered by
-         * the TLS layer until the entire fragment is received and its integrity is verified;
-         * large fragments can span multiple roundtrips, and their processing can be delayed due to packet
-         * loss or reordering. However, smaller fragments add extra TLS framing bytes and CPU overhead,
-         * which may decrease overall server throughput.
-         * @param size - TLS fragment size (default and maximum value is: 16384, minimum is: 512).
-         * @returns Returns true on success, false otherwise.
-         */
-        setMaxSendFragment(size: number): boolean;
-
-        /**
-         * events.EventEmitter
-         * 1. OCSPResponse
-         * 2. secureConnect
-         */
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
-        addListener(event: "secureConnect", listener: () => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "OCSPResponse", response: Buffer): boolean;
-        emit(event: "secureConnect"): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "OCSPResponse", listener: (response: Buffer) => void): this;
-        on(event: "secureConnect", listener: () => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "OCSPResponse", listener: (response: Buffer) => void): this;
-        once(event: "secureConnect", listener: () => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
-        prependListener(event: "secureConnect", listener: () => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
-        prependOnceListener(event: "secureConnect", listener: () => void): this;
-    }
-
-    interface TlsOptions extends SecureContextOptions {
-        handshakeTimeout?: number;
-        requestCert?: boolean;
-        rejectUnauthorized?: boolean;
-        NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
-        ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
-        SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void;
-        sessionTimeout?: number;
-        ticketKeys?: Buffer;
-    }
-
-    interface ConnectionOptions extends SecureContextOptions {
-        host?: string;
-        port?: number;
-        path?: string; // Creates unix socket connection to path. If this option is specified, `host` and `port` are ignored.
-        socket?: net.Socket; // Establish secure connection on a given socket rather than creating a new socket
-        rejectUnauthorized?: boolean; // Defaults to true
-        NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
-        ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
-        checkServerIdentity?: typeof checkServerIdentity;
-        servername?: string; // SNI TLS Extension
-        session?: Buffer;
-        minDHSize?: number;
-        secureContext?: SecureContext; // If not provided, the entire ConnectionOptions object will be passed to tls.createSecureContext()
-        lookup?: net.LookupFunction;
-    }
-
-    class Server extends net.Server {
-        addContext(hostName: string, credentials: {
-            key: string;
-            cert: string;
-            ca: string;
-        }): void;
-
-        /**
-         * events.EventEmitter
-         * 1. tlsClientError
-         * 2. newSession
-         * 3. OCSPRequest
-         * 4. resumeSession
-         * 5. secureConnection
-         */
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-        addListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-        addListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-        addListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-        addListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "tlsClientError", err: Error, tlsSocket: TLSSocket): boolean;
-        emit(event: "newSession", sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void): boolean;
-        emit(event: "OCSPRequest", certificate: Buffer, issuer: Buffer, callback: Function): boolean;
-        emit(event: "resumeSession", sessionId: any, callback: (err: Error, sessionData: any) => void): boolean;
-        emit(event: "secureConnection", tlsSocket: TLSSocket): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-        on(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-        on(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-        on(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-        on(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-        once(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-        once(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-        once(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-        once(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-        prependListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-        prependListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-        prependListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-        prependListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-        prependOnceListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-        prependOnceListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-        prependOnceListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-        prependOnceListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
-    }
-
-    interface SecurePair {
-        encrypted: any;
-        cleartext: any;
-    }
-
-    interface SecureContextOptions {
-        pfx?: string | Buffer | Array<string | Buffer | Object>;
-        key?: string | Buffer | Array<Buffer | Object>;
-        passphrase?: string;
-        cert?: string | Buffer | Array<string | Buffer>;
-        ca?: string | Buffer | Array<string | Buffer>;
-        ciphers?: string;
-        honorCipherOrder?: boolean;
-        ecdhCurve?: string;
-        clientCertEngine?: string;
-        crl?: string | Buffer | Array<string | Buffer>;
-        dhparam?: string | Buffer;
-        secureOptions?: number; // Value is a numeric bitmask of the `SSL_OP_*` options
-        secureProtocol?: string; // SSL Method, e.g. SSLv23_method
-        sessionIdContext?: string;
-    }
-
-    interface SecureContext {
-        context: any;
-    }
-
-    /*
-     * Verifies the certificate `cert` is issued to host `host`.
-     * @host The hostname to verify the certificate against
-     * @cert PeerCertificate representing the peer's certificate
-     *
-     * Returns Error object, populating it with the reason, host and cert on failure.  On success, returns undefined.
-     */
-    function checkServerIdentity(host: string, cert: PeerCertificate): Error | undefined;
-    function createServer(options: TlsOptions, secureConnectionListener?: (socket: TLSSocket) => void): Server;
-    function connect(options: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
-    function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
-    function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
-    function createSecurePair(credentials?: crypto.Credentials, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair;
-    function createSecureContext(details: SecureContextOptions): SecureContext;
-    function getCiphers(): string[];
-
-    const DEFAULT_ECDH_CURVE: string;
-}
-
-declare module "crypto" {
-    import * as stream from "stream";
-
-    interface Certificate {
-        exportChallenge(spkac: string | Buffer | NodeJS.TypedArray | DataView): Buffer;
-        exportPublicKey(spkac: string | Buffer | NodeJS.TypedArray | DataView): Buffer;
-        verifySpkac(spkac: Buffer | NodeJS.TypedArray | DataView): boolean;
-    }
-    const Certificate: {
-        new(): Certificate;
-        (): Certificate;
-    };
-
-    /** @deprecated since v10.0.0 */
-    const fips: boolean;
-
-    interface CredentialDetails {
-        pfx: string;
-        key: string;
-        passphrase: string;
-        cert: string;
-        ca: string | string[];
-        crl: string | string[];
-        ciphers: string;
-    }
-    interface Credentials { context?: any; }
-    function createCredentials(details: CredentialDetails): Credentials;
-    function createHash(algorithm: string, options?: stream.TransformOptions): Hash;
-    function createHmac(algorithm: string, key: string | Buffer | NodeJS.TypedArray | DataView, options?: stream.TransformOptions): Hmac;
-
-    type Utf8AsciiLatin1Encoding = "utf8" | "ascii" | "latin1";
-    type HexBase64Latin1Encoding = "latin1" | "hex" | "base64";
-    type Utf8AsciiBinaryEncoding = "utf8" | "ascii" | "binary";
-    type HexBase64BinaryEncoding = "binary" | "base64" | "hex";
-    type ECDHKeyFormat = "compressed" | "uncompressed" | "hybrid";
-
-    interface Hash extends NodeJS.ReadWriteStream {
-        update(data: string | Buffer | NodeJS.TypedArray | DataView): Hash;
-        update(data: string, input_encoding: Utf8AsciiLatin1Encoding): Hash;
-        digest(): Buffer;
-        digest(encoding: HexBase64Latin1Encoding): string;
-    }
-    interface Hmac extends NodeJS.ReadWriteStream {
-        update(data: string | Buffer | NodeJS.TypedArray | DataView): Hmac;
-        update(data: string, input_encoding: Utf8AsciiLatin1Encoding): Hmac;
-        digest(): Buffer;
-        digest(encoding: HexBase64Latin1Encoding): string;
-    }
-    type CipherCCMTypes = 'aes-128-ccm' | 'aes-192-ccm' | 'aes-256-ccm';
-    type CipherGCMTypes = 'aes-128-gcm' | 'aes-192-gcm' | 'aes-256-gcm';
-    interface CipherCCMOptions extends stream.TransformOptions {
-        authTagLength: number;
-    }
-    interface CipherGCMOptions extends stream.TransformOptions {
-        authTagLength?: number;
-    }
-    /** @deprecated since v10.0.0 use createCipheriv() */
-    function createCipher(algorithm: CipherCCMTypes, password: string | Buffer | NodeJS.TypedArray | DataView, options: CipherCCMOptions): CipherCCM;
-    /** @deprecated since v10.0.0 use createCipheriv() */
-    function createCipher(algorithm: CipherGCMTypes, password: string | Buffer | NodeJS.TypedArray | DataView, options?: CipherGCMOptions): CipherGCM;
-    /** @deprecated since v10.0.0 use createCipheriv() */
-    function createCipher(algorithm: string, password: string | Buffer | NodeJS.TypedArray | DataView, options?: stream.TransformOptions): Cipher;
-
-    function createCipheriv(algorithm: CipherCCMTypes, key: string | Buffer | NodeJS.TypedArray | DataView, iv: string | Buffer | NodeJS.TypedArray | DataView, options: CipherCCMOptions): CipherCCM;
-    function createCipheriv(algorithm: CipherGCMTypes, key: string | Buffer | NodeJS.TypedArray | DataView, iv: string | Buffer | NodeJS.TypedArray | DataView, options?: CipherGCMOptions): CipherGCM;
-    function createCipheriv(algorithm: string, key: string | Buffer | NodeJS.TypedArray | DataView, iv: string | Buffer | NodeJS.TypedArray | DataView, options?: stream.TransformOptions): Cipher;
-
-    interface Cipher extends NodeJS.ReadWriteStream {
-        update(data: string | Buffer | NodeJS.TypedArray | DataView): Buffer;
-        update(data: string, input_encoding: Utf8AsciiBinaryEncoding): Buffer;
-        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
-    }
-    interface CipherCCM extends Cipher {
-        setAAD(buffer: Buffer, options: { plaintextLength: number }): this;
-        getAuthTag(): Buffer;
-    }
-    interface CipherGCM extends Cipher {
-        setAAD(buffer: Buffer, options?: { plaintextLength: number }): this;
-        getAuthTag(): Buffer;
-    }
-    /** @deprecated since v10.0.0 use createCipheriv() */
-    function createDecipher(algorithm: CipherCCMTypes, password: string | Buffer | NodeJS.TypedArray | DataView, options: CipherCCMOptions): DecipherCCM;
-    /** @deprecated since v10.0.0 use createCipheriv() */
-    function createDecipher(algorithm: CipherGCMTypes, password: string | Buffer | NodeJS.TypedArray | DataView, options?: CipherGCMOptions): DecipherGCM;
-    /** @deprecated since v10.0.0 use createCipheriv() */
-    function createDecipher(algorithm: string, password: string | Buffer | NodeJS.TypedArray | DataView, options?: stream.TransformOptions): Decipher;
-
-    function createDecipheriv(
-        algorithm: CipherCCMTypes,
-        key: string | Buffer | NodeJS.TypedArray | DataView,
-        iv: string | Buffer | NodeJS.TypedArray | DataView,
-        options: CipherCCMOptions,
-    ): DecipherCCM;
-    function createDecipheriv(
-        algorithm: CipherGCMTypes,
-        key: string | Buffer | NodeJS.TypedArray | DataView,
-        iv: string | Buffer | NodeJS.TypedArray | DataView,
-        options?: CipherGCMOptions,
-    ): DecipherGCM;
-    function createDecipheriv(algorithm: string, key: string | Buffer | NodeJS.TypedArray | DataView, iv: string | Buffer | NodeJS.TypedArray | DataView, options?: stream.TransformOptions): Decipher;
-
-    interface Decipher extends NodeJS.ReadWriteStream {
-        update(data: Buffer | NodeJS.TypedArray | DataView): Buffer;
-        update(data: string, input_encoding: HexBase64BinaryEncoding): Buffer;
-        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 | NodeJS.TypedArray | DataView): this;
-        // setAAD(buffer: Buffer | NodeJS.TypedArray | DataView): this;
-    }
-    interface DecipherCCM extends Decipher {
-        setAuthTag(buffer: Buffer | NodeJS.TypedArray | DataView): this;
-        setAAD(buffer: Buffer | NodeJS.TypedArray | DataView, options: { plaintextLength: number }): this;
-    }
-    interface DecipherGCM extends Decipher {
-        setAuthTag(buffer: Buffer | NodeJS.TypedArray | DataView): this;
-        setAAD(buffer: Buffer | NodeJS.TypedArray | DataView, options?: { plaintextLength: number }): this;
-    }
-
-    function createSign(algorithm: string, options?: stream.WritableOptions): Signer;
-    interface Signer extends NodeJS.WritableStream {
-        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;
-    }
-    function createVerify(algorith: string, options?: stream.WritableOptions): Verify;
-    interface Verify extends NodeJS.WritableStream {
-        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
-    }
-    function createDiffieHellman(prime_length: number, generator?: number | Buffer | NodeJS.TypedArray | DataView): DiffieHellman;
-    function createDiffieHellman(prime: Buffer | NodeJS.TypedArray | DataView): DiffieHellman;
-    function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding): DiffieHellman;
-    function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: number | Buffer | NodeJS.TypedArray | DataView): DiffieHellman;
-    function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: string, generator_encoding: HexBase64Latin1Encoding): DiffieHellman;
-    interface DiffieHellman {
-        generateKeys(): Buffer;
-        generateKeys(encoding: HexBase64Latin1Encoding): string;
-        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;
-        getGenerator(): Buffer;
-        getGenerator(encoding: HexBase64Latin1Encoding): string;
-        getPublicKey(): Buffer;
-        getPublicKey(encoding: HexBase64Latin1Encoding): string;
-        getPrivateKey(): Buffer;
-        getPrivateKey(encoding: HexBase64Latin1Encoding): string;
-        setPublicKey(public_key: Buffer | NodeJS.TypedArray | DataView): void;
-        setPublicKey(public_key: string, encoding: string): void;
-        setPrivateKey(private_key: Buffer | NodeJS.TypedArray | DataView): void;
-        setPrivateKey(private_key: string, encoding: string): void;
-        verifyError: number;
-    }
-    function getDiffieHellman(group_name: string): DiffieHellman;
-    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;
-    function pbkdf2Sync(password: string | Buffer | NodeJS.TypedArray | DataView, salt: string | Buffer | NodeJS.TypedArray | DataView, iterations: number, keylen: number, digest: string): Buffer;
-
-    function randomBytes(size: number): Buffer;
-    function randomBytes(size: number, callback: (err: Error | null, buf: Buffer) => void): void;
-    function pseudoRandomBytes(size: number): Buffer;
-    function pseudoRandomBytes(size: number, callback: (err: Error | null, buf: Buffer) => void): void;
-
-    function randomFillSync<T extends Buffer | NodeJS.TypedArray | DataView>(buffer: T, offset?: number, size?: number): T;
-    function randomFill<T extends Buffer | NodeJS.TypedArray | DataView>(buffer: T, callback: (err: Error | null, buf: T) => void): void;
-    function randomFill<T extends Buffer | NodeJS.TypedArray | DataView>(buffer: T, offset: number, callback: (err: Error | null, buf: T) => void): void;
-    function randomFill<T extends Buffer | NodeJS.TypedArray | DataView>(buffer: T, offset: number, size: number, callback: (err: Error | null, buf: T) => void): void;
-
-    interface ScryptOptions {
-        N?: number;
-        r?: number;
-        p?: number;
-        maxmem?: number;
-    }
-    function scrypt(
-        password: string | Buffer | NodeJS.TypedArray | DataView,
-        salt: string | Buffer | NodeJS.TypedArray | DataView,
-        keylen: number, callback: (err: Error | null, derivedKey: Buffer) => void,
-    ): void;
-    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;
-    function scryptSync(password: string | Buffer | NodeJS.TypedArray | DataView, salt: string | Buffer | NodeJS.TypedArray | DataView, keylen: number, options?: ScryptOptions): Buffer;
-
-    interface RsaPublicKey {
-        key: string;
-        padding?: number;
-    }
-    interface RsaPrivateKey {
-        key: string;
-        passphrase?: string;
-        padding?: number;
-    }
-    function publicEncrypt(public_key: string | RsaPublicKey, buffer: Buffer | NodeJS.TypedArray | DataView): Buffer;
-    function privateDecrypt(private_key: string | RsaPrivateKey, buffer: Buffer | NodeJS.TypedArray | DataView): Buffer;
-    function privateEncrypt(private_key: string | RsaPrivateKey, buffer: Buffer | NodeJS.TypedArray | DataView): Buffer;
-    function publicDecrypt(public_key: string | RsaPublicKey, buffer: Buffer | NodeJS.TypedArray | DataView): Buffer;
-    function getCiphers(): string[];
-    function getCurves(): string[];
-    function getHashes(): string[];
-    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 | 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 | NodeJS.TypedArray | DataView): void;
-        setPrivateKey(private_key: string, encoding: HexBase64Latin1Encoding): void;
-    }
-    function createECDH(curve_name: string): ECDH;
-    function timingSafeEqual(a: Buffer | NodeJS.TypedArray | DataView, b: Buffer | NodeJS.TypedArray | DataView): boolean;
-    /** @deprecated since v10.0.0 */
-    const DEFAULT_ENCODING: string;
-
-    export type KeyType = 'rsa' | 'dsa' | 'ec';
-    export type KeyFormat = 'pem' | 'der';
-
-    interface BasePrivateKeyEncodingOptions<T extends KeyFormat> {
-        format: T;
-        cipher: string;
-        passphrase: string;
-    }
-
-    interface RSAKeyPairOptions<PubF extends KeyFormat, PrivF extends KeyFormat> {
-        /**
-         * Key size in bits
-         */
-        modulusLength: number;
-        /**
-         * @default 0x10001
-         */
-        publicExponent?: number;
-
-        publicKeyEncoding: {
-            type: 'pkcs1' | 'spki';
-            format: PubF;
-        };
-        privateKeyEncoding: BasePrivateKeyEncodingOptions<PrivF> & {
-            type: 'pkcs1' | 'pkcs8';
-        };
-    }
-
-    interface DSAKeyPairOptions<PubF extends KeyFormat, PrivF extends KeyFormat> {
-        /**
-         * Key size in bits
-         */
-        modulusLength: number;
-        /**
-         * Size of q in bits
-         */
-        divisorLength: number;
-
-        publicKeyEncoding: {
-            type: 'spki';
-            format: PubF;
-        };
-        privateKeyEncoding: BasePrivateKeyEncodingOptions<PrivF> & {
-            type: 'pkcs8';
-        };
-    }
-
-    interface ECKeyPairOptions<PubF extends KeyFormat, PrivF extends KeyFormat> {
-        /**
-         * Name of the curve to use.
-         */
-        namedCurve: string;
-
-        publicKeyEncoding: {
-            type: 'pkcs1' | 'spki';
-            format: PubF;
-        };
-        privateKeyEncoding: BasePrivateKeyEncodingOptions<PrivF> & {
-            type: 'sec1' | 'pkcs8';
-        };
-    }
-
-    interface KeyPairSyncResult<T1 extends string | Buffer, T2 extends string | Buffer> {
-        publicKey: T1;
-        privateKey: T2;
-    }
-
-    function generateKeyPairSync(type: 'rsa', options: RSAKeyPairOptions<'pem', 'pem'>): KeyPairSyncResult<string, string>;
-    function generateKeyPairSync(type: 'rsa', options: RSAKeyPairOptions<'pem', 'der'>): KeyPairSyncResult<string, Buffer>;
-    function generateKeyPairSync(type: 'rsa', options: RSAKeyPairOptions<'der', 'pem'>): KeyPairSyncResult<Buffer, string>;
-    function generateKeyPairSync(type: 'rsa', options: RSAKeyPairOptions<'der', 'der'>): KeyPairSyncResult<Buffer, Buffer>;
-
-    function generateKeyPairSync(type: 'dsa', options: DSAKeyPairOptions<'pem', 'pem'>): KeyPairSyncResult<string, string>;
-    function generateKeyPairSync(type: 'dsa', options: DSAKeyPairOptions<'pem', 'der'>): KeyPairSyncResult<string, Buffer>;
-    function generateKeyPairSync(type: 'dsa', options: DSAKeyPairOptions<'der', 'pem'>): KeyPairSyncResult<Buffer, string>;
-    function generateKeyPairSync(type: 'dsa', options: DSAKeyPairOptions<'der', 'der'>): KeyPairSyncResult<Buffer, Buffer>;
-
-    function generateKeyPairSync(type: 'ec', options: ECKeyPairOptions<'pem', 'pem'>): KeyPairSyncResult<string, string>;
-    function generateKeyPairSync(type: 'ec', options: ECKeyPairOptions<'pem', 'der'>): KeyPairSyncResult<string, Buffer>;
-    function generateKeyPairSync(type: 'ec', options: ECKeyPairOptions<'der', 'pem'>): KeyPairSyncResult<Buffer, string>;
-    function generateKeyPairSync(type: 'ec', options: ECKeyPairOptions<'der', 'der'>): KeyPairSyncResult<Buffer, Buffer>;
-
-    function generateKeyPair(type: 'rsa', options: RSAKeyPairOptions<'pem', 'pem'>, callback: (err: Error | null, publicKey: string, privateKey: string) => void): void;
-    function generateKeyPair(type: 'rsa', options: RSAKeyPairOptions<'pem', 'der'>, callback: (err: Error | null, publicKey: string, privateKey: Buffer) => void): void;
-    function generateKeyPair(type: 'rsa', options: RSAKeyPairOptions<'der', 'pem'>, callback: (err: Error | null, publicKey: Buffer, privateKey: string) => void): void;
-    function generateKeyPair(type: 'rsa', options: RSAKeyPairOptions<'der', 'der'>, callback: (err: Error | null, publicKey: Buffer, privateKey: Buffer) => void): void;
-
-    function generateKeyPair(type: 'dsa', options: DSAKeyPairOptions<'pem', 'pem'>, callback: (err: Error | null, publicKey: string, privateKey: string) => void): void;
-    function generateKeyPair(type: 'dsa', options: DSAKeyPairOptions<'pem', 'der'>, callback: (err: Error | null, publicKey: string, privateKey: Buffer) => void): void;
-    function generateKeyPair(type: 'dsa', options: DSAKeyPairOptions<'der', 'pem'>, callback: (err: Error | null, publicKey: Buffer, privateKey: string) => void): void;
-    function generateKeyPair(type: 'dsa', options: DSAKeyPairOptions<'der', 'der'>, callback: (err: Error | null, publicKey: Buffer, privateKey: Buffer) => void): void;
-
-    function generateKeyPair(type: 'ec', options: ECKeyPairOptions<'pem', 'pem'>, callback: (err: Error | null, publicKey: string, privateKey: string) => void): void;
-    function generateKeyPair(type: 'ec', options: ECKeyPairOptions<'pem', 'der'>, callback: (err: Error | null, publicKey: string, privateKey: Buffer) => void): void;
-    function generateKeyPair(type: 'ec', options: ECKeyPairOptions<'der', 'pem'>, callback: (err: Error | null, publicKey: Buffer, privateKey: string) => void): void;
-    function generateKeyPair(type: 'ec', options: ECKeyPairOptions<'der', 'der'>, callback: (err: Error | null, publicKey: Buffer, privateKey: Buffer) => void): void;
-
-    namespace generateKeyPair {
-        function __promisify__(type: "rsa", options: RSAKeyPairOptions<'pem', 'pem'>): Promise<{ publicKey: string, privateKey: string }>;
-        function __promisify__(type: "rsa", options: RSAKeyPairOptions<'pem', 'der'>): Promise<{ publicKey: string, privateKey: Buffer }>;
-        function __promisify__(type: "rsa", options: RSAKeyPairOptions<'der', 'pem'>): Promise<{ publicKey: Buffer, privateKey: string }>;
-        function __promisify__(type: "rsa", options: RSAKeyPairOptions<'der', 'der'>): Promise<{ publicKey: Buffer, privateKey: Buffer }>;
-
-        function __promisify__(type: "dsa", options: DSAKeyPairOptions<'pem', 'pem'>): Promise<{ publicKey: string, privateKey: string }>;
-        function __promisify__(type: "dsa", options: DSAKeyPairOptions<'pem', 'der'>): Promise<{ publicKey: string, privateKey: Buffer }>;
-        function __promisify__(type: "dsa", options: DSAKeyPairOptions<'der', 'pem'>): Promise<{ publicKey: Buffer, privateKey: string }>;
-        function __promisify__(type: "dsa", options: DSAKeyPairOptions<'der', 'der'>): Promise<{ publicKey: Buffer, privateKey: Buffer }>;
-
-        function __promisify__(type: "ec", options: ECKeyPairOptions<'pem', 'pem'>): Promise<{ publicKey: string, privateKey: string }>;
-        function __promisify__(type: "ec", options: ECKeyPairOptions<'pem', 'der'>): Promise<{ publicKey: string, privateKey: Buffer }>;
-        function __promisify__(type: "ec", options: ECKeyPairOptions<'der', 'pem'>): Promise<{ publicKey: Buffer, privateKey: string }>;
-        function __promisify__(type: "ec", options: ECKeyPairOptions<'der', 'der'>): Promise<{ publicKey: Buffer, privateKey: Buffer }>;
-    }
-}
-
-declare module "stream" {
-    import * as events from "events";
-
-    class internal extends events.EventEmitter {
-        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-    }
-
-    namespace internal {
-        class Stream extends internal { }
-
-        interface ReadableOptions {
-            highWaterMark?: number;
-            encoding?: string;
-            objectMode?: boolean;
-            read?(this: Readable, size: number): void;
-            destroy?(this: Readable, error: Error | null, callback: (error: Error | null) => void): void;
-        }
-
-        class Readable extends Stream implements NodeJS.ReadableStream {
-            readable: boolean;
-            readonly readableHighWaterMark: number;
-            readonly readableLength: number;
-            constructor(opts?: ReadableOptions);
-            _read(size: number): void;
-            read(size?: number): any;
-            setEncoding(encoding: string): this;
-            pause(): this;
-            resume(): this;
-            isPaused(): boolean;
-            unpipe(destination?: NodeJS.WritableStream): this;
-            unshift(chunk: any): void;
-            wrap(oldStream: NodeJS.ReadableStream): this;
-            push(chunk: any, encoding?: string): boolean;
-            _destroy(error: Error | null, callback: (error: Error | null) => void): void;
-            destroy(error?: Error): void;
-
-            /**
-             * Event emitter
-             * The defined events on documents including:
-             * 1. close
-             * 2. data
-             * 3. end
-             * 4. readable
-             * 5. error
-             */
-            addListener(event: "close", listener: () => 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: "close"): 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: "close", listener: () => 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: "close", listener: () => 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: "close", listener: () => 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: "close", listener: () => 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: "close", listener: () => 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<any>;
-        }
-
-        interface WritableOptions {
-            highWaterMark?: number;
-            decodeStrings?: boolean;
-            objectMode?: boolean;
-            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;
-        }
-
-        class Writable extends Stream implements NodeJS.WritableStream {
-            writable: boolean;
-            readonly writableHighWaterMark: number;
-            readonly writableLength: number;
-            constructor(opts?: WritableOptions);
-            _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?: () => void): void;
-            end(chunk: any, cb?: () => void): void;
-            end(chunk: any, encoding?: string, cb?: () => void): void;
-            cork(): void;
-            uncork(): void;
-            destroy(error?: Error): void;
-
-            /**
-             * Event emitter
-             * The defined events on documents including:
-             * 1. close
-             * 2. drain
-             * 3. error
-             * 4. finish
-             * 5. pipe
-             * 6. unpipe
-             */
-            addListener(event: "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: "close"): 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: "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: "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: "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: "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: "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;
-        }
-
-        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.
-        class Duplex extends Readable implements Writable {
-            writable: boolean;
-            readonly writableHighWaterMark: number;
-            readonly writableLength: number;
-            constructor(opts?: DuplexOptions);
-            _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?: () => void): void;
-            end(chunk: any, cb?: () => void): void;
-            end(chunk: any, encoding?: string, cb?: () => void): void;
-            cork(): void;
-            uncork(): void;
-        }
-
-        type TransformCallback = (error?: Error, data?: any) => void;
-
-        interface TransformOptions extends DuplexOptions {
-            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;
-        }
-
-        class Transform extends Duplex {
-            constructor(opts?: TransformOptions);
-            _transform(chunk: any, encoding: string, callback: TransformCallback): void;
-            _flush(callback: TransformCallback): void;
-        }
-
-        class PassThrough extends Transform { }
-
-        function finished(stream: NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream, callback: (err?: NodeJS.ErrnoException) => void): () => void;
-        namespace finished {
-            function __promisify__(stream: NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream): Promise<void>;
-        }
-
-        function pipeline<T extends NodeJS.WritableStream>(stream1: NodeJS.ReadableStream, stream2: T, callback?: (err: NodeJS.ErrnoException) => void): T;
-        function pipeline<T extends NodeJS.WritableStream>(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream, stream3: T, callback?: (err: NodeJS.ErrnoException) => void): T;
-        function pipeline<T extends NodeJS.WritableStream>(
-            stream1: NodeJS.ReadableStream,
-            stream2: NodeJS.ReadWriteStream,
-            stream3: NodeJS.ReadWriteStream,
-            stream4: T,
-            callback?: (err: NodeJS.ErrnoException) => void,
-        ): T;
-        function pipeline<T extends NodeJS.WritableStream>(
-            stream1: NodeJS.ReadableStream,
-            stream2: NodeJS.ReadWriteStream,
-            stream3: NodeJS.ReadWriteStream,
-            stream4: NodeJS.ReadWriteStream,
-            stream5: T,
-            callback?: (err: NodeJS.ErrnoException) => void,
-        ): T;
-        function pipeline(streams: Array<NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream>, callback?: (err: NodeJS.ErrnoException) => void): NodeJS.WritableStream;
-        function pipeline(
-            stream1: NodeJS.ReadableStream,
-            stream2: NodeJS.ReadWriteStream | NodeJS.WritableStream,
-            ...streams: Array<NodeJS.ReadWriteStream | NodeJS.WritableStream | ((err: NodeJS.ErrnoException) => void)>,
-        ): NodeJS.WritableStream;
-        namespace pipeline {
-            function __promisify__(stream1: NodeJS.ReadableStream, stream2: NodeJS.WritableStream): Promise<void>;
-            function __promisify__(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream, stream3: NodeJS.WritableStream): Promise<void>;
-            function __promisify__(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream, stream3: NodeJS.ReadWriteStream, stream4: NodeJS.WritableStream): Promise<void>;
-            function __promisify__(
-                stream1: NodeJS.ReadableStream,
-                stream2: NodeJS.ReadWriteStream,
-                stream3: NodeJS.ReadWriteStream,
-                stream4: NodeJS.ReadWriteStream,
-                stream5: NodeJS.WritableStream,
-            ): Promise<void>;
-            function __promisify__(streams: Array<NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream>): Promise<void>;
-            function __promisify__(
-                stream1: NodeJS.ReadableStream,
-                stream2: NodeJS.ReadWriteStream | NodeJS.WritableStream,
-                ...streams: Array<NodeJS.ReadWriteStream | NodeJS.WritableStream>,
-            ): Promise<void>;
-        }
-    }
-
-    export = internal;
-}
-
 declare module "util" {
-    interface InspectOptions extends NodeJS.InspectOptions { }
-    function format(format: any, ...param: any[]): string;
-    function formatWithOptions(inspectOptions: InspectOptions, format: string, ...param: any[]): string;
-    /** @deprecated since v0.11.3 - use `console.error()` instead. */
-    function debug(string: string): void;
-    /** @deprecated since v0.11.3 - use `console.error()` instead. */
-    function error(...param: any[]): void;
-    /** @deprecated since v0.11.3 - use `console.log()` instead. */
-    function puts(...param: any[]): void;
-    /** @deprecated since v0.11.3 - use `console.log()` instead. */
-    function print(...param: any[]): void;
-    /** @deprecated since v0.11.3 - use a third party module instead. */
-    function log(string: string): void;
-    const inspect: {
-        (object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
-        (object: any, options: InspectOptions): string;
-        colors: {
-            [color: string]: [number, number] | undefined
-        }
-        styles: {
-            [style: string]: string | undefined
-        }
-        defaultOptions: InspectOptions;
-        custom: symbol;
-    };
-    /** @deprecated since v4.0.0 - use `Array.isArray()` instead. */
-    function isArray(object: any): object is any[];
-    /** @deprecated since v4.0.0 - use `util.types.isRegExp()` instead. */
-    function isRegExp(object: any): object is RegExp;
-    /** @deprecated since v4.0.0 - use `util.types.isDate()` instead. */
-    function isDate(object: any): object is Date;
-    /** @deprecated since v4.0.0 - use `util.types.isNativeError()` instead. */
-    function isError(object: any): object is Error;
-    function inherits(constructor: any, superConstructor: any): void;
-    function debuglog(key: string): (msg: string, ...param: any[]) => void;
-    /** @deprecated since v4.0.0 - use `typeof value === 'boolean'` instead. */
-    function isBoolean(object: any): object is boolean;
-    /** @deprecated since v4.0.0 - use `Buffer.isBuffer()` instead. */
-    function isBuffer(object: any): object is Buffer;
-    /** @deprecated since v4.0.0 - use `typeof value === 'function'` instead. */
-    function isFunction(object: any): boolean;
-    /** @deprecated since v4.0.0 - use `value === null` instead. */
-    function isNull(object: any): object is null;
-    /** @deprecated since v4.0.0 - use `value === null || value === undefined` instead. */
-    function isNullOrUndefined(object: any): object is null | undefined;
-    /** @deprecated since v4.0.0 - use `typeof value === 'number'` instead. */
-    function isNumber(object: any): object is number;
-    /** @deprecated since v4.0.0 - use `value !== null && typeof value === 'object'` instead. */
-    function isObject(object: any): boolean;
-    /** @deprecated since v4.0.0 - use `(typeof value !== 'object' && typeof value !== 'function') || value === null` instead. */
-    function isPrimitive(object: any): boolean;
-    /** @deprecated since v4.0.0 - use `typeof value === 'string'` instead. */
-    function isString(object: any): object is string;
-    /** @deprecated since v4.0.0 - use `typeof value === 'symbol'` instead. */
-    function isSymbol(object: any): object is symbol;
-    /** @deprecated since v4.0.0 - use `value === undefined` instead. */
-    function isUndefined(object: any): object is undefined;
-    function deprecate<T extends Function>(fn: T, message: string): T;
-    function isDeepStrictEqual(val1: any, val2: any): boolean;
-
-    interface CustomPromisify<TCustom extends Function> extends Function {
-        __promisify__: TCustom;
+    namespace inspect {
+        const custom: symbol;
     }
-
-    function callbackify(fn: () => Promise<void>): (callback: (err: NodeJS.ErrnoException) => void) => void;
-    function callbackify<TResult>(fn: () => Promise<TResult>): (callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
-    function callbackify<T1>(fn: (arg1: T1) => Promise<void>): (arg1: T1, callback: (err: NodeJS.ErrnoException) => void) => void;
-    function callbackify<T1, TResult>(fn: (arg1: T1) => Promise<TResult>): (arg1: T1, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
-    function callbackify<T1, T2>(fn: (arg1: T1, arg2: T2) => Promise<void>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException) => void) => void;
-    function callbackify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2) => Promise<TResult>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
-    function callbackify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException) => void) => void;
-    function callbackify<T1, T2, T3, TResult>(
-        fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
-    function callbackify<T1, T2, T3, T4>(
-        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException) => void) => void;
-    function callbackify<T1, T2, T3, T4, TResult>(
-        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
-    function callbackify<T1, T2, T3, T4, T5>(
-        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException) => void) => void;
-    function callbackify<T1, T2, T3, T4, T5, TResult>(
-        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>,
-    ): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
-    function callbackify<T1, T2, T3, T4, T5, T6>(
-        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<void>,
-    ): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException) => void) => void;
-    function callbackify<T1, T2, T3, T4, T5, T6, TResult>(
-        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<TResult>
-    ): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
-
-    function promisify<TCustom extends Function>(fn: CustomPromisify<TCustom>): TCustom;
-    function promisify<TResult>(fn: (callback: (err: Error | null, result: TResult) => void) => void): () => Promise<TResult>;
-    function promisify(fn: (callback: (err?: Error | null) => void) => void): () => Promise<void>;
-    function promisify<T1, TResult>(fn: (arg1: T1, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1) => Promise<TResult>;
-    function promisify<T1>(fn: (arg1: T1, callback: (err?: Error | null) => void) => void): (arg1: T1) => Promise<void>;
-    function promisify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2) => Promise<TResult>;
-    function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err?: Error | null) => void) => void): (arg1: T1, arg2: T2) => Promise<void>;
-    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>;
-    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>;
-    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>;
-    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>;
-    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>;
-    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>;
-    function promisify(fn: Function): Function;
     namespace promisify {
         const custom: symbol;
     }
-
-    namespace types {
-        function isAnyArrayBuffer(object: any): boolean;
-        function isArgumentsObject(object: any): object is IArguments;
-        function isArrayBuffer(object: any): object is ArrayBuffer;
-        function isAsyncFunction(object: any): boolean;
-        function isBooleanObject(object: any): object is Boolean;
-        function isBoxedPrimitive(object: any): object is (Number | Boolean | String | Symbol /* BigInt */);
-        function isDataView(object: any): object is DataView;
-        function isDate(object: any): object is Date;
-        function isExternal(object: any): boolean;
-        function isFloat32Array(object: any): object is Float32Array;
-        function isFloat64Array(object: any): object is Float64Array;
-        function isGeneratorFunction(object: any): boolean;
-        function isGeneratorObject(object: any): boolean;
-        function isInt8Array(object: any): object is Int8Array;
-        function isInt16Array(object: any): object is Int16Array;
-        function isInt32Array(object: any): object is Int32Array;
-        function isMap(object: any): boolean;
-        function isMapIterator(object: any): boolean;
-        function isNativeError(object: any): object is Error;
-        function isNumberObject(object: any): object is Number;
-        function isPromise(object: any): boolean;
-        function isProxy(object: any): boolean;
-        function isRegExp(object: any): object is RegExp;
-        function isSet(object: any): boolean;
-        function isSetIterator(object: any): boolean;
-        function isSharedArrayBuffer(object: any): boolean;
-        function isStringObject(object: any): boolean;
-        function isSymbolObject(object: any): boolean;
-        function isTypedArray(object: any): object is NodeJS.TypedArray;
-        function isUint8Array(object: any): object is Uint8Array;
-        function isUint8ClampedArray(object: any): object is Uint8ClampedArray;
-        function isUint16Array(object: any): object is Uint16Array;
-        function isUint32Array(object: any): object is Uint32Array;
-        function isWeakMap(object: any): boolean;
-        function isWeakSet(object: any): boolean;
-        function isWebAssemblyCompiledModule(object: any): boolean;
-    }
-
-    class TextDecoder {
-        readonly encoding: string;
-        readonly fatal: boolean;
-        readonly ignoreBOM: boolean;
-        constructor(
-          encoding?: string,
-          options?: { fatal?: boolean; ignoreBOM?: boolean }
-        );
-        decode(
-          input?: NodeJS.TypedArray | DataView | ArrayBuffer | null,
-          options?: { stream?: boolean }
-        ): string;
-    }
-
-    class TextEncoder {
-        readonly encoding: string;
-        constructor();
-        encode(input?: string): Uint8Array;
-    }
-}
-
-declare module "assert" {
-    function internal(value: any, message?: string | Error): void;
-    namespace internal {
-        class AssertionError implements Error {
-            name: string;
-            message: string;
-            actual: any;
-            expected: any;
-            operator: string;
-            generatedMessage: boolean;
-            code: 'ERR_ASSERTION';
-
-            constructor(options?: {
-                message?: string; actual?: any; expected?: any;
-                operator?: string; stackStartFn?: Function
-            });
-        }
-
-        function fail(message?: string | Error): never;
-        /** @deprecated since v10.0.0 - use fail([message]) or other assert functions instead. */
-        function fail(actual: any, expected: any, message?: string | Error, operator?: string, stackStartFn?: Function): never;
-        function ok(value: any, message?: string | Error): void;
-        /** @deprecated since v9.9.0 - use strictEqual() instead. */
-        function equal(actual: any, expected: any, message?: string | Error): void;
-        /** @deprecated since v9.9.0 - use notStrictEqual() instead. */
-        function notEqual(actual: any, expected: any, message?: string | Error): void;
-        /** @deprecated since v9.9.0 - use deepStrictEqual() instead. */
-        function deepEqual(actual: any, expected: any, message?: string | Error): void;
-        /** @deprecated since v9.9.0 - use notDeepStrictEqual() instead. */
-        function notDeepEqual(actual: any, expected: any, message?: string | Error): void;
-        function strictEqual(actual: any, expected: any, message?: string | Error): void;
-        function notStrictEqual(actual: any, expected: any, message?: string | Error): void;
-        function deepStrictEqual(actual: any, expected: any, message?: string | Error): void;
-        function notDeepStrictEqual(actual: any, expected: any, message?: string | Error): void;
-
-        function throws(block: Function, message?: string | Error): void;
-        function throws(block: Function, error: RegExp | Function | Object | Error, message?: string | Error): void;
-        function doesNotThrow(block: Function, message?: string | Error): void;
-        function doesNotThrow(block: Function, error: RegExp | Function, message?: string | Error): void;
-
-        function ifError(value: any): void;
-
-        function rejects(block: Function | Promise<any>, message?: string | Error): Promise<void>;
-        function rejects(block: Function | Promise<any>, error: RegExp | Function | Object | Error, message?: string | Error): Promise<void>;
-        function doesNotReject(block: Function | Promise<any>, message?: string | Error): Promise<void>;
-        function doesNotReject(block: Function | Promise<any>, error: RegExp | Function, message?: string | Error): Promise<void>;
-
-        const strict: typeof internal;
-    }
-
-    export = internal;
-}
-
-declare module "tty" {
-    import * as net from "net";
-
-    function isatty(fd: number): boolean;
-    class ReadStream extends net.Socket {
-        isRaw: boolean;
-        setRawMode(mode: boolean): void;
-        isTTY: boolean;
-    }
-    class WriteStream extends net.Socket {
-        columns: number;
-        rows: number;
-        isTTY: boolean;
-    }
-}
-
-declare module "domain" {
-    import * as events from "events";
-
-    class Domain extends events.EventEmitter implements NodeJS.Domain {
-        run(fn: Function): void;
-        add(emitter: events.EventEmitter): void;
-        remove(emitter: events.EventEmitter): void;
-        bind(cb: (err: Error, data: any) => any): any;
-        intercept(cb: (data: any) => any): any;
-        members: any[];
-        enter(): void;
-        exit(): void;
-    }
-
-    function create(): Domain;
-}
-
-declare module "constants" {
-    const E2BIG: number;
-    const EACCES: number;
-    const EADDRINUSE: number;
-    const EADDRNOTAVAIL: number;
-    const EAFNOSUPPORT: number;
-    const EAGAIN: number;
-    const EALREADY: number;
-    const EBADF: number;
-    const EBADMSG: number;
-    const EBUSY: number;
-    const ECANCELED: number;
-    const ECHILD: number;
-    const ECONNABORTED: number;
-    const ECONNREFUSED: number;
-    const ECONNRESET: number;
-    const EDEADLK: number;
-    const EDESTADDRREQ: number;
-    const EDOM: number;
-    const EEXIST: number;
-    const EFAULT: number;
-    const EFBIG: number;
-    const EHOSTUNREACH: number;
-    const EIDRM: number;
-    const EILSEQ: number;
-    const EINPROGRESS: number;
-    const EINTR: number;
-    const EINVAL: number;
-    const EIO: number;
-    const EISCONN: number;
-    const EISDIR: number;
-    const ELOOP: number;
-    const EMFILE: number;
-    const EMLINK: number;
-    const EMSGSIZE: number;
-    const ENAMETOOLONG: number;
-    const ENETDOWN: number;
-    const ENETRESET: number;
-    const ENETUNREACH: number;
-    const ENFILE: number;
-    const ENOBUFS: number;
-    const ENODATA: number;
-    const ENODEV: number;
-    const ENOENT: number;
-    const ENOEXEC: number;
-    const ENOLCK: number;
-    const ENOLINK: number;
-    const ENOMEM: number;
-    const ENOMSG: number;
-    const ENOPROTOOPT: number;
-    const ENOSPC: number;
-    const ENOSR: number;
-    const ENOSTR: number;
-    const ENOSYS: number;
-    const ENOTCONN: number;
-    const ENOTDIR: number;
-    const ENOTEMPTY: number;
-    const ENOTSOCK: number;
-    const ENOTSUP: number;
-    const ENOTTY: number;
-    const ENXIO: number;
-    const EOPNOTSUPP: number;
-    const EOVERFLOW: number;
-    const EPERM: number;
-    const EPIPE: number;
-    const EPROTO: number;
-    const EPROTONOSUPPORT: number;
-    const EPROTOTYPE: number;
-    const ERANGE: number;
-    const EROFS: number;
-    const ESPIPE: number;
-    const ESRCH: number;
-    const ETIME: number;
-    const ETIMEDOUT: number;
-    const ETXTBSY: number;
-    const EWOULDBLOCK: number;
-    const EXDEV: number;
-    const WSAEINTR: number;
-    const WSAEBADF: number;
-    const WSAEACCES: number;
-    const WSAEFAULT: number;
-    const WSAEINVAL: number;
-    const WSAEMFILE: number;
-    const WSAEWOULDBLOCK: number;
-    const WSAEINPROGRESS: number;
-    const WSAEALREADY: number;
-    const WSAENOTSOCK: number;
-    const WSAEDESTADDRREQ: number;
-    const WSAEMSGSIZE: number;
-    const WSAEPROTOTYPE: number;
-    const WSAENOPROTOOPT: number;
-    const WSAEPROTONOSUPPORT: number;
-    const WSAESOCKTNOSUPPORT: number;
-    const WSAEOPNOTSUPP: number;
-    const WSAEPFNOSUPPORT: number;
-    const WSAEAFNOSUPPORT: number;
-    const WSAEADDRINUSE: number;
-    const WSAEADDRNOTAVAIL: number;
-    const WSAENETDOWN: number;
-    const WSAENETUNREACH: number;
-    const WSAENETRESET: number;
-    const WSAECONNABORTED: number;
-    const WSAECONNRESET: number;
-    const WSAENOBUFS: number;
-    const WSAEISCONN: number;
-    const WSAENOTCONN: number;
-    const WSAESHUTDOWN: number;
-    const WSAETOOMANYREFS: number;
-    const WSAETIMEDOUT: number;
-    const WSAECONNREFUSED: number;
-    const WSAELOOP: number;
-    const WSAENAMETOOLONG: number;
-    const WSAEHOSTDOWN: number;
-    const WSAEHOSTUNREACH: number;
-    const WSAENOTEMPTY: number;
-    const WSAEPROCLIM: number;
-    const WSAEUSERS: number;
-    const WSAEDQUOT: number;
-    const WSAESTALE: number;
-    const WSAEREMOTE: number;
-    const WSASYSNOTREADY: number;
-    const WSAVERNOTSUPPORTED: number;
-    const WSANOTINITIALISED: number;
-    const WSAEDISCON: number;
-    const WSAENOMORE: number;
-    const WSAECANCELLED: number;
-    const WSAEINVALIDPROCTABLE: number;
-    const WSAEINVALIDPROVIDER: number;
-    const WSAEPROVIDERFAILEDINIT: number;
-    const WSASYSCALLFAILURE: number;
-    const WSASERVICE_NOT_FOUND: number;
-    const WSATYPE_NOT_FOUND: number;
-    const WSA_E_NO_MORE: number;
-    const WSA_E_CANCELLED: number;
-    const WSAEREFUSED: number;
-    const SIGHUP: number;
-    const SIGINT: number;
-    const SIGILL: number;
-    const SIGABRT: number;
-    const SIGFPE: number;
-    const SIGKILL: number;
-    const SIGSEGV: number;
-    const SIGTERM: number;
-    const SIGBREAK: number;
-    const SIGWINCH: number;
-    const SSL_OP_ALL: number;
-    const SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: number;
-    const SSL_OP_CIPHER_SERVER_PREFERENCE: number;
-    const SSL_OP_CISCO_ANYCONNECT: number;
-    const SSL_OP_COOKIE_EXCHANGE: number;
-    const SSL_OP_CRYPTOPRO_TLSEXT_BUG: number;
-    const SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: number;
-    const SSL_OP_EPHEMERAL_RSA: number;
-    const SSL_OP_LEGACY_SERVER_CONNECT: number;
-    const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: number;
-    const SSL_OP_MICROSOFT_SESS_ID_BUG: number;
-    const SSL_OP_MSIE_SSLV2_RSA_PADDING: number;
-    const SSL_OP_NETSCAPE_CA_DN_BUG: number;
-    const SSL_OP_NETSCAPE_CHALLENGE_BUG: number;
-    const SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG: number;
-    const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: number;
-    const SSL_OP_NO_COMPRESSION: number;
-    const SSL_OP_NO_QUERY_MTU: number;
-    const SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: number;
-    const SSL_OP_NO_SSLv2: number;
-    const SSL_OP_NO_SSLv3: number;
-    const SSL_OP_NO_TICKET: number;
-    const SSL_OP_NO_TLSv1: number;
-    const SSL_OP_NO_TLSv1_1: number;
-    const SSL_OP_NO_TLSv1_2: number;
-    const SSL_OP_PKCS1_CHECK_1: number;
-    const SSL_OP_PKCS1_CHECK_2: number;
-    const SSL_OP_SINGLE_DH_USE: number;
-    const SSL_OP_SINGLE_ECDH_USE: number;
-    const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: number;
-    const SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG: number;
-    const SSL_OP_TLS_BLOCK_PADDING_BUG: number;
-    const SSL_OP_TLS_D5_BUG: number;
-    const SSL_OP_TLS_ROLLBACK_BUG: number;
-    const ENGINE_METHOD_DSA: number;
-    const ENGINE_METHOD_DH: number;
-    const ENGINE_METHOD_RAND: number;
-    const ENGINE_METHOD_ECDH: number;
-    const ENGINE_METHOD_ECDSA: number;
-    const ENGINE_METHOD_CIPHERS: number;
-    const ENGINE_METHOD_DIGESTS: number;
-    const ENGINE_METHOD_STORE: number;
-    const ENGINE_METHOD_PKEY_METHS: number;
-    const ENGINE_METHOD_PKEY_ASN1_METHS: number;
-    const ENGINE_METHOD_ALL: number;
-    const ENGINE_METHOD_NONE: number;
-    const DH_CHECK_P_NOT_SAFE_PRIME: number;
-    const DH_CHECK_P_NOT_PRIME: number;
-    const DH_UNABLE_TO_CHECK_GENERATOR: number;
-    const DH_NOT_SUITABLE_GENERATOR: number;
-    const NPN_ENABLED: number;
-    const RSA_PKCS1_PADDING: number;
-    const RSA_SSLV23_PADDING: number;
-    const RSA_NO_PADDING: number;
-    const RSA_PKCS1_OAEP_PADDING: number;
-    const RSA_X931_PADDING: number;
-    const RSA_PKCS1_PSS_PADDING: number;
-    const POINT_CONVERSION_COMPRESSED: number;
-    const POINT_CONVERSION_UNCOMPRESSED: number;
-    const POINT_CONVERSION_HYBRID: number;
-    const O_RDONLY: number;
-    const O_WRONLY: number;
-    const O_RDWR: number;
-    const S_IFMT: number;
-    const S_IFREG: number;
-    const S_IFDIR: number;
-    const S_IFCHR: number;
-    const S_IFBLK: number;
-    const S_IFIFO: number;
-    const S_IFSOCK: number;
-    const S_IRWXU: number;
-    const S_IRUSR: number;
-    const S_IWUSR: number;
-    const S_IXUSR: number;
-    const S_IRWXG: number;
-    const S_IRGRP: number;
-    const S_IWGRP: number;
-    const S_IXGRP: number;
-    const S_IRWXO: number;
-    const S_IROTH: number;
-    const S_IWOTH: number;
-    const S_IXOTH: number;
-    const S_IFLNK: number;
-    const O_CREAT: number;
-    const O_EXCL: number;
-    const O_NOCTTY: number;
-    const O_DIRECTORY: number;
-    const O_NOATIME: number;
-    const O_NOFOLLOW: number;
-    const O_SYNC: number;
-    const O_DSYNC: number;
-    const O_SYMLINK: number;
-    const O_DIRECT: number;
-    const O_NONBLOCK: number;
-    const O_TRUNC: number;
-    const O_APPEND: number;
-    const F_OK: number;
-    const R_OK: number;
-    const W_OK: number;
-    const X_OK: number;
-    const COPYFILE_EXCL: number;
-    const COPYFILE_FICLONE: number;
-    const COPYFILE_FICLONE_FORCE: number;
-    const UV_UDP_REUSEADDR: number;
-    const SIGQUIT: number;
-    const SIGTRAP: number;
-    const SIGIOT: number;
-    const SIGBUS: number;
-    const SIGUSR1: number;
-    const SIGUSR2: number;
-    const SIGPIPE: number;
-    const SIGALRM: number;
-    const SIGCHLD: number;
-    const SIGSTKFLT: number;
-    const SIGCONT: number;
-    const SIGSTOP: number;
-    const SIGTSTP: number;
-    const SIGTTIN: number;
-    const SIGTTOU: number;
-    const SIGURG: number;
-    const SIGXCPU: number;
-    const SIGXFSZ: number;
-    const SIGVTALRM: number;
-    const SIGPROF: number;
-    const SIGIO: number;
-    const SIGPOLL: number;
-    const SIGPWR: number;
-    const SIGSYS: number;
-    const SIGUNUSED: number;
-    const defaultCoreCipherList: string;
-    const defaultCipherList: string;
-    const ENGINE_METHOD_RSA: number;
-    const ALPN_ENABLED: number;
-}
-
-declare module "module" {
-    export = NodeJS.Module;
-}
-
-declare module "process" {
-    export = process;
-}
-
-declare module "v8" {
-    interface HeapSpaceInfo {
-        space_name: string;
-        space_size: number;
-        space_used_size: number;
-        space_available_size: number;
-        physical_space_size: number;
-    }
-
-    // ** Signifies if the --zap_code_space option is enabled or not.  1 == enabled, 0 == disabled. */
-    type DoesZapCodeSpaceFlag = 0 | 1;
-
-    interface HeapInfo {
-        total_heap_size: number;
-        total_heap_size_executable: number;
-        total_physical_size: number;
-        total_available_size: number;
-        used_heap_size: number;
-        heap_size_limit: number;
-        malloced_memory: number;
-        peak_malloced_memory: number;
-        does_zap_garbage: DoesZapCodeSpaceFlag;
-    }
-
-    function getHeapStatistics(): HeapInfo;
-    function getHeapSpaceStatistics(): HeapSpaceInfo[];
-    function setFlagsFromString(flags: string): void;
-}
-
-declare module "timers" {
-    function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
-    namespace setTimeout {
-        function __promisify__(ms: number): Promise<void>;
-        function __promisify__<T>(ms: number, value: T): Promise<T>;
-    }
-    function clearTimeout(timeoutId: NodeJS.Timeout): void;
-    function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
-    function clearInterval(intervalId: NodeJS.Timeout): void;
-    function setImmediate(callback: (...args: any[]) => void, ...args: any[]): NodeJS.Immediate;
-    namespace setImmediate {
-        function __promisify__(): Promise<void>;
-        function __promisify__<T>(value: T): Promise<T>;
-    }
-    function clearImmediate(immediateId: NodeJS.Immediate): void;
-}
-
-declare module "console" {
-    export = console;
-}
-
-/**
- * Async Hooks module: https://nodejs.org/api/async_hooks.html
- */
-declare module "async_hooks" {
-    /**
-     * Returns the asyncId of the current execution context.
-     */
-    function executionAsyncId(): number;
-
-    /**
-     * Returns the ID of the resource responsible for calling the callback that is currently being executed.
-     */
-    function triggerAsyncId(): number;
-
-    interface HookCallbacks {
-        /**
-         * Called when a class is constructed that has the possibility to emit an asynchronous event.
-         * @param asyncId a unique ID for the async resource
-         * @param type the type of the async resource
-         * @param triggerAsyncId the unique ID of the async resource in whose execution context this async resource was created
-         * @param resource reference to the resource representing the async operation, needs to be released during destroy
-         */
-        init?(asyncId: number, type: string, triggerAsyncId: number, resource: Object): void;
-
-        /**
-         * When an asynchronous operation is initiated or completes a callback is called to notify the user.
-         * The before callback is called just before said callback is executed.
-         * @param asyncId the unique identifier assigned to the resource about to execute the callback.
-         */
-        before?(asyncId: number): void;
-
-        /**
-         * Called immediately after the callback specified in before is completed.
-         * @param asyncId the unique identifier assigned to the resource which has executed the callback.
-         */
-        after?(asyncId: number): void;
-
-        /**
-         * Called when a promise has resolve() called. This may not be in the same execution id
-         * as the promise itself.
-         * @param asyncId the unique id for the promise that was resolve()d.
-         */
-        promiseResolve?(asyncId: number): void;
-
-        /**
-         * Called after the resource corresponding to asyncId is destroyed
-         * @param asyncId a unique ID for the async resource
-         */
-        destroy?(asyncId: number): void;
-    }
-
-    interface AsyncHook {
-        /**
-         * Enable the callbacks for a given AsyncHook instance. If no callbacks are provided enabling is a noop.
-         */
-        enable(): this;
-
-        /**
-         * Disable the callbacks for a given AsyncHook instance from the global pool of AsyncHook callbacks to be executed. Once a hook has been disabled it will not be called again until enabled.
-         */
-        disable(): this;
-    }
-
-    /**
-     * Registers functions to be called for different lifetime events of each async operation.
-     * @param options the callbacks to register
-     * @return an AsyncHooks instance used for disabling and enabling hooks
-     */
-    function createHook(options: HookCallbacks): AsyncHook;
-
-    interface AsyncResourceOptions {
-      /**
-       * The ID of the execution context that created this async event.
-       * Default: `executionAsyncId()`
-       */
-      triggerAsyncId?: number;
-
-      /**
-       * Disables automatic `emitDestroy` when the object is garbage collected.
-       * This usually does not need to be set (even if `emitDestroy` is called
-       * manually), unless the resource's `asyncId` is retrieved and the
-       * sensitive API's `emitDestroy` is called with it.
-       * Default: `false`
-       */
-      requireManualDestroy?: boolean;
-    }
-
-    /**
-     * The class AsyncResource was designed to be extended by the embedder's async resources.
-     * Using this users can easily trigger the lifetime events of their own resources.
-     */
-    class AsyncResource {
-        /**
-         * AsyncResource() is meant to be extended. Instantiating a
-         * new AsyncResource() also triggers init. If triggerAsyncId is omitted then
-         * async_hook.executionAsyncId() is used.
-         * @param type The type of async event.
-         * @param triggerAsyncId The ID of the execution context that created
-         *   this async event (default: `executionAsyncId()`), or an
-         *   AsyncResourceOptions object (since 9.3)
-         */
-        constructor(type: string, triggerAsyncId?: number|AsyncResourceOptions);
-
-        /**
-         * Call AsyncHooks before callbacks.
-         * @deprecated since 9.6 - Use asyncResource.runInAsyncScope() instead.
-         */
-        emitBefore(): void;
-
-        /**
-         * Call AsyncHooks after callbacks.
-         * @deprecated since 9.6 - Use asyncResource.runInAsyncScope() instead.
-         */
-        emitAfter(): void;
-
-        /**
-         * Call the provided function with the provided arguments in the
-         * execution context of the async resource. This will establish the
-         * context, trigger the AsyncHooks before callbacks, call the function,
-         * trigger the AsyncHooks after callbacks, and then restore the original
-         * execution context.
-         * @param fn The function to call in the execution context of this
-         *   async resource.
-         * @param thisArg The receiver to be used for the function call.
-         * @param args Optional arguments to pass to the function.
-         */
-        runInAsyncScope<This, Result>(fn: (this: This, ...args: any[]) => Result, thisArg?: This, ...args: any[]): Result;
-
-        /**
-         * Call AsyncHooks destroy callbacks.
-         */
-        emitDestroy(): void;
-
-        /**
-         * @return the unique ID assigned to this AsyncResource instance.
-         */
-        asyncId(): number;
-
-        /**
-         * @return the trigger ID for this AsyncResource instance.
-         */
-        triggerAsyncId(): number;
-    }
-}
-
-declare module "http2" {
-    import * as events from "events";
-    import * as fs from "fs";
-    import * as net from "net";
-    import * as stream from "stream";
-    import * as tls from "tls";
-    import * as url from "url";
-
-    import { IncomingHttpHeaders as Http1IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
-    export { OutgoingHttpHeaders } from "http";
-
-    export interface IncomingHttpStatusHeader {
-        ":status"?: number;
-    }
-
-    export interface IncomingHttpHeaders extends Http1IncomingHttpHeaders {
-        ":path"?: string;
-        ":method"?: string;
-        ":authority"?: string;
-        ":scheme"?: string;
-    }
-
-    // Http2Stream
-
-    export interface StreamPriorityOptions {
-        exclusive?: boolean;
-        parent?: number;
-        weight?: number;
-        silent?: boolean;
-    }
-
-    export interface StreamState {
-        localWindowSize?: number;
-        state?: number;
-        streamLocalClose?: number;
-        streamRemoteClose?: number;
-        sumDependencyWeight?: number;
-        weight?: number;
-    }
-
-    export interface ServerStreamResponseOptions {
-        endStream?: boolean;
-        waitForTrailers?: boolean;
-    }
-
-    export interface StatOptions {
-        offset: number;
-        length: number;
-    }
-
-    export interface ServerStreamFileResponseOptions {
-        statCheck?: (stats: fs.Stats, headers: OutgoingHttpHeaders, statOptions: StatOptions) => void | boolean;
-        getTrailers?: (trailers: OutgoingHttpHeaders) => void;
-        offset?: number;
-        length?: number;
-    }
-
-    export interface ServerStreamFileResponseOptionsWithError extends ServerStreamFileResponseOptions {
-        onError?: (err: NodeJS.ErrnoException) => void;
-    }
-
-    export interface Http2Stream extends stream.Duplex {
-        readonly aborted: boolean;
-        readonly closed: boolean;
-        readonly destroyed: boolean;
-        readonly pending: boolean;
-        readonly rstCode: number;
-        readonly sentHeaders: OutgoingHttpHeaders;
-        readonly sentInfoHeaders?: OutgoingHttpHeaders[];
-        readonly sentTrailers?: OutgoingHttpHeaders;
-        readonly session: Http2Session;
-        readonly state: StreamState;
-        /**
-         * Set the true if the END_STREAM flag was set in the request or response HEADERS frame received,
-         * indicating that no additional data should be received and the readable side of the Http2Stream will be closed.
-         */
-        readonly endAfterHeaders: boolean;
-        close(code?: number, callback?: () => void): void;
-        priority(options: StreamPriorityOptions): void;
-        setTimeout(msecs: number, callback?: () => void): void;
-
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "aborted", listener: () => void): this;
-        addListener(event: "close", listener: () => void): this;
-        addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
-        addListener(event: "drain", listener: () => void): this;
-        addListener(event: "end", listener: () => void): this;
-        addListener(event: "error", listener: (err: Error) => void): this;
-        addListener(event: "finish", listener: () => void): this;
-        addListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
-        addListener(event: "pipe", listener: (src: stream.Readable) => void): this;
-        addListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
-        addListener(event: "streamClosed", listener: (code: number) => void): this;
-        addListener(event: "timeout", listener: () => void): this;
-        addListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
-        addListener(event: "wantTrailers", listener: () => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "aborted"): boolean;
-        emit(event: "close"): boolean;
-        emit(event: "data", chunk: Buffer | string): boolean;
-        emit(event: "drain"): boolean;
-        emit(event: "end"): boolean;
-        emit(event: "error", err: Error): boolean;
-        emit(event: "finish"): boolean;
-        emit(event: "frameError", frameType: number, errorCode: number): boolean;
-        emit(event: "pipe", src: stream.Readable): boolean;
-        emit(event: "unpipe", src: stream.Readable): boolean;
-        emit(event: "streamClosed", code: number): boolean;
-        emit(event: "timeout"): boolean;
-        emit(event: "trailers", trailers: IncomingHttpHeaders, flags: number): boolean;
-        emit(event: "wantTrailers"): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "aborted", listener: () => void): this;
-        on(event: "close", listener: () => void): this;
-        on(event: "data", listener: (chunk: Buffer | string) => void): this;
-        on(event: "drain", listener: () => void): this;
-        on(event: "end", listener: () => void): this;
-        on(event: "error", listener: (err: Error) => void): this;
-        on(event: "finish", listener: () => void): this;
-        on(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
-        on(event: "pipe", listener: (src: stream.Readable) => void): this;
-        on(event: "unpipe", listener: (src: stream.Readable) => void): this;
-        on(event: "streamClosed", listener: (code: number) => void): this;
-        on(event: "timeout", listener: () => void): this;
-        on(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
-        on(event: "wantTrailers", listener: () => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "aborted", listener: () => void): this;
-        once(event: "close", listener: () => void): this;
-        once(event: "data", listener: (chunk: Buffer | string) => void): this;
-        once(event: "drain", listener: () => void): this;
-        once(event: "end", listener: () => void): this;
-        once(event: "error", listener: (err: Error) => void): this;
-        once(event: "finish", listener: () => void): this;
-        once(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
-        once(event: "pipe", listener: (src: stream.Readable) => void): this;
-        once(event: "unpipe", listener: (src: stream.Readable) => void): this;
-        once(event: "streamClosed", listener: (code: number) => void): this;
-        once(event: "timeout", listener: () => void): this;
-        once(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
-        once(event: "wantTrailers", listener: () => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "aborted", listener: () => void): this;
-        prependListener(event: "close", listener: () => void): this;
-        prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
-        prependListener(event: "drain", listener: () => void): this;
-        prependListener(event: "end", listener: () => void): this;
-        prependListener(event: "error", listener: (err: Error) => void): this;
-        prependListener(event: "finish", listener: () => void): this;
-        prependListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
-        prependListener(event: "pipe", listener: (src: stream.Readable) => void): this;
-        prependListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
-        prependListener(event: "streamClosed", listener: (code: number) => void): this;
-        prependListener(event: "timeout", listener: () => void): this;
-        prependListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
-        prependListener(event: "wantTrailers", listener: () => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "aborted", listener: () => void): this;
-        prependOnceListener(event: "close", listener: () => void): this;
-        prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
-        prependOnceListener(event: "drain", listener: () => void): this;
-        prependOnceListener(event: "end", listener: () => void): this;
-        prependOnceListener(event: "error", listener: (err: Error) => void): this;
-        prependOnceListener(event: "finish", listener: () => void): this;
-        prependOnceListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
-        prependOnceListener(event: "pipe", listener: (src: stream.Readable) => void): this;
-        prependOnceListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
-        prependOnceListener(event: "streamClosed", listener: (code: number) => void): this;
-        prependOnceListener(event: "timeout", listener: () => void): this;
-        prependOnceListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
-        prependOnceListener(event: "wantTrailers", listener: () => void): this;
-
-        sendTrailers(headers: OutgoingHttpHeaders): this;
-    }
-
-    export interface ClientHttp2Stream extends Http2Stream {
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-        addListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-        addListener(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "headers", headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number): boolean;
-        emit(event: "push", headers: IncomingHttpHeaders, flags: number): boolean;
-        emit(event: "response", headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-        on(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-        on(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-        once(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-        once(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-        prependListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-        prependListener(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-        prependOnceListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-        prependOnceListener(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-    }
-
-    export interface ServerHttp2Stream extends Http2Stream {
-        additionalHeaders(headers: OutgoingHttpHeaders): void;
-        readonly headersSent: boolean;
-        readonly pushAllowed: boolean;
-        pushStream(headers: OutgoingHttpHeaders, callback?: (err: Error | null, pushStream: ServerHttp2Stream, headers: OutgoingHttpHeaders) => void): void;
-        pushStream(headers: OutgoingHttpHeaders, options?: StreamPriorityOptions, callback?: (err: Error | null, pushStream: ServerHttp2Stream, headers: OutgoingHttpHeaders) => void): void;
-        respond(headers?: OutgoingHttpHeaders, options?: ServerStreamResponseOptions): void;
-        respondWithFD(fd: number, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptions): void;
-        respondWithFile(path: string, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptionsWithError): void;
-    }
-
-    // Http2Session
-
-    export interface Settings {
-        headerTableSize?: number;
-        enablePush?: boolean;
-        initialWindowSize?: number;
-        maxFrameSize?: number;
-        maxConcurrentStreams?: number;
-        maxHeaderListSize?: number;
-    }
-
-    export interface ClientSessionRequestOptions {
-        endStream?: boolean;
-        exclusive?: boolean;
-        parent?: number;
-        weight?: number;
-        getTrailers?: (trailers: OutgoingHttpHeaders, flags: number) => void;
-    }
-
-    export interface SessionState {
-        effectiveLocalWindowSize?: number;
-        effectiveRecvDataLength?: number;
-        nextStreamID?: number;
-        localWindowSize?: number;
-        lastProcStreamID?: number;
-        remoteWindowSize?: number;
-        outboundQueueSize?: number;
-        deflateDynamicTableSize?: number;
-        inflateDynamicTableSize?: number;
-    }
-
-    export interface Http2Session extends events.EventEmitter {
-        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 | 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;
-        setTimeout(msecs: number, callback?: () => void): void;
-        readonly socket: net.Socket | tls.TLSSocket;
-        readonly state: SessionState;
-        priority(stream: Http2Stream, options: StreamPriorityOptions): void;
-        settings(settings: Settings): void;
-        readonly type: number;
-        unref(): void;
-
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "close", listener: () => void): this;
-        addListener(event: "error", listener: (err: Error) => void): this;
-        addListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
-        addListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
-        addListener(event: "localSettings", listener: (settings: Settings) => void): this;
-        addListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
-        addListener(event: "timeout", listener: () => void): this;
-        addListener(event: "ping", listener: () => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "close"): boolean;
-        emit(event: "error", err: Error): boolean;
-        emit(event: "frameError", frameType: number, errorCode: number, streamID: number): boolean;
-        emit(event: "goaway", errorCode: number, lastStreamID: number, opaqueData: Buffer): boolean;
-        emit(event: "localSettings", settings: Settings): boolean;
-        emit(event: "remoteSettings", settings: Settings): boolean;
-        emit(event: "timeout"): boolean;
-        emit(event: "ping"): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "close", listener: () => void): this;
-        on(event: "error", listener: (err: Error) => void): this;
-        on(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
-        on(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
-        on(event: "localSettings", listener: (settings: Settings) => void): this;
-        on(event: "remoteSettings", listener: (settings: Settings) => void): this;
-        on(event: "timeout", listener: () => void): this;
-        on(event: "ping", listener: () => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "close", listener: () => void): this;
-        once(event: "error", listener: (err: Error) => void): this;
-        once(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
-        once(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
-        once(event: "localSettings", listener: (settings: Settings) => void): this;
-        once(event: "remoteSettings", listener: (settings: Settings) => void): this;
-        once(event: "timeout", listener: () => void): this;
-        once(event: "ping", listener: () => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "close", listener: () => void): this;
-        prependListener(event: "error", listener: (err: Error) => void): this;
-        prependListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
-        prependListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
-        prependListener(event: "localSettings", listener: (settings: Settings) => void): this;
-        prependListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
-        prependListener(event: "timeout", listener: () => void): this;
-        prependListener(event: "ping", listener: () => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "close", listener: () => void): this;
-        prependOnceListener(event: "error", listener: (err: Error) => void): this;
-        prependOnceListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
-        prependOnceListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
-        prependOnceListener(event: "localSettings", listener: (settings: Settings) => void): this;
-        prependOnceListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
-        prependOnceListener(event: "timeout", listener: () => void): this;
-        prependOnceListener(event: "ping", listener: () => void): this;
-    }
-
-    export interface ClientHttp2Session extends Http2Session {
-        request(headers?: OutgoingHttpHeaders, options?: ClientSessionRequestOptions): ClientHttp2Stream;
-
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
-        addListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
-        addListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "altsvc", alt: string, origin: string, stream: number): boolean;
-        emit(event: "connect", session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket): boolean;
-        emit(event: "stream", stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
-        on(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
-        on(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
-        once(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
-        once(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
-        prependListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
-        prependListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
-        prependOnceListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
-        prependOnceListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-    }
-
-    export interface AlternativeServiceOptions {
-        origin: number | string | url.URL;
-    }
-
-    export interface ServerHttp2Session extends Http2Session {
-        altsvc(alt: string, originOrStream: number | string | url.URL | AlternativeServiceOptions): void;
-        readonly server: Http2Server | Http2SecureServer;
-
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
-        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "connect", session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket): boolean;
-        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
-        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
-        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
-        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
-        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-    }
-
-    // Http2Server
-
-    export interface SessionOptions {
-        maxDeflateDynamicTableSize?: number;
-        maxReservedRemoteStreams?: number;
-        maxSendHeaderBlockLength?: number;
-        paddingStrategy?: number;
-        peerMaxConcurrentStreams?: number;
-        selectPadding?: (frameLen: number, maxFrameLen: number) => number;
-        settings?: Settings;
-        createConnection?: (option: SessionOptions) => stream.Duplex;
-    }
-
-    export type ClientSessionOptions = SessionOptions;
-    export type ServerSessionOptions = SessionOptions;
-
-    export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
-    export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
-
-    export interface ServerOptions extends ServerSessionOptions {
-        allowHTTP1?: boolean;
-    }
-
-    export interface SecureServerOptions extends SecureServerSessionOptions {
-        allowHTTP1?: boolean;
-    }
-
-    export interface Http2Server extends net.Server {
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        addListener(event: "sessionError", listener: (err: Error) => void): this;
-        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-        addListener(event: "timeout", listener: () => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "checkContinue", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
-        emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
-        emit(event: "sessionError", err: Error): boolean;
-        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
-        emit(event: "timeout"): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        on(event: "sessionError", listener: (err: Error) => void): this;
-        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-        on(event: "timeout", listener: () => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        once(event: "sessionError", listener: (err: Error) => void): this;
-        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-        once(event: "timeout", listener: () => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        prependListener(event: "sessionError", listener: (err: Error) => void): this;
-        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-        prependListener(event: "timeout", listener: () => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
-        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-        prependOnceListener(event: "timeout", listener: () => void): this;
-    }
-
-    export interface Http2SecureServer extends tls.Server {
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        addListener(event: "sessionError", listener: (err: Error) => void): this;
-        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-        addListener(event: "timeout", listener: () => void): this;
-        addListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "checkContinue", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
-        emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
-        emit(event: "sessionError", err: Error): boolean;
-        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
-        emit(event: "timeout"): boolean;
-        emit(event: "unknownProtocol", socket: tls.TLSSocket): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        on(event: "sessionError", listener: (err: Error) => void): this;
-        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-        on(event: "timeout", listener: () => void): this;
-        on(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        once(event: "sessionError", listener: (err: Error) => void): this;
-        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-        once(event: "timeout", listener: () => void): this;
-        once(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        prependListener(event: "sessionError", listener: (err: Error) => void): this;
-        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-        prependListener(event: "timeout", listener: () => void): this;
-        prependListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-        prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
-        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-        prependOnceListener(event: "timeout", listener: () => void): this;
-        prependOnceListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
-    }
-
-    export class Http2ServerRequest extends stream.Readable {
-        private constructor();
-        headers: IncomingHttpHeaders;
-        httpVersion: string;
-        method: string;
-        rawHeaders: string[];
-        rawTrailers: string[];
-        setTimeout(msecs: number, callback?: () => void): void;
-        socket: net.Socket | tls.TLSSocket;
-        stream: ServerHttp2Stream;
-        trailers: IncomingHttpHeaders;
-        url: string;
-
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "aborted", hadError: boolean, code: number): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
-    }
-
-    export class Http2ServerResponse extends events.EventEmitter {
-        private constructor();
-        addTrailers(trailers: OutgoingHttpHeaders): void;
-        connection: net.Socket | tls.TLSSocket;
-        end(callback?: () => void): void;
-        end(data?: string | Buffer, callback?: () => void): void;
-        end(data?: string | Buffer, encoding?: string, callback?: () => void): void;
-        readonly finished: boolean;
-        getHeader(name: string): string;
-        getHeaderNames(): string[];
-        getHeaders(): OutgoingHttpHeaders;
-        hasHeader(name: string): boolean;
-        readonly headersSent: boolean;
-        removeHeader(name: string): void;
-        sendDate: boolean;
-        setHeader(name: string, value: number | string | string[]): void;
-        setTimeout(msecs: number, callback?: () => void): void;
-        socket: net.Socket | tls.TLSSocket;
-        statusCode: number;
-        statusMessage: '';
-        stream: ServerHttp2Stream;
-        write(chunk: string | Buffer, callback?: (err: Error) => void): boolean;
-        write(chunk: string | Buffer, encoding?: string, callback?: (err: Error) => void): boolean;
-        writeContinue(): void;
-        writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
-        writeHead(statusCode: number, statusMessage?: string, headers?: OutgoingHttpHeaders): void;
-        createPushResponse(headers: OutgoingHttpHeaders, callback: (err: Error | null, res: Http2ServerResponse) => void): void;
-
-        addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
-        addListener(event: "close", listener: () => void): this;
-        addListener(event: "drain", listener: () => void): this;
-        addListener(event: "error", listener: (error: Error) => void): this;
-        addListener(event: "finish", listener: () => void): this;
-
-        emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "aborted", hadError: boolean, code: number): boolean;
-        emit(event: "close"): boolean;
-        emit(event: "drain"): boolean;
-        emit(event: "error", error: Error): boolean;
-        emit(event: "finish"): boolean;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
-        on(event: "close", listener: () => void): this;
-        on(event: "drain", listener: () => void): this;
-        on(event: "error", listener: (error: Error) => void): this;
-        on(event: "finish", listener: () => void): this;
-
-        once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
-        once(event: "close", listener: () => void): this;
-        once(event: "drain", listener: () => void): this;
-        once(event: "error", listener: (error: Error) => void): this;
-        once(event: "finish", listener: () => void): this;
-
-        prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
-        prependListener(event: "close", listener: () => void): this;
-        prependListener(event: "drain", listener: () => void): this;
-        prependListener(event: "error", listener: (error: Error) => void): this;
-        prependListener(event: "finish", listener: () => void): this;
-
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
-        prependOnceListener(event: "close", listener: () => void): this;
-        prependOnceListener(event: "drain", listener: () => void): this;
-        prependOnceListener(event: "error", listener: (error: Error) => void): this;
-        prependOnceListener(event: "finish", listener: () => void): this;
-    }
-
-    // Public API
-
-    export namespace constants {
-        const NGHTTP2_SESSION_SERVER: number;
-        const NGHTTP2_SESSION_CLIENT: number;
-        const NGHTTP2_STREAM_STATE_IDLE: number;
-        const NGHTTP2_STREAM_STATE_OPEN: number;
-        const NGHTTP2_STREAM_STATE_RESERVED_LOCAL: number;
-        const NGHTTP2_STREAM_STATE_RESERVED_REMOTE: number;
-        const NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL: number;
-        const NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE: number;
-        const NGHTTP2_STREAM_STATE_CLOSED: number;
-        const NGHTTP2_NO_ERROR: number;
-        const NGHTTP2_PROTOCOL_ERROR: number;
-        const NGHTTP2_INTERNAL_ERROR: number;
-        const NGHTTP2_FLOW_CONTROL_ERROR: number;
-        const NGHTTP2_SETTINGS_TIMEOUT: number;
-        const NGHTTP2_STREAM_CLOSED: number;
-        const NGHTTP2_FRAME_SIZE_ERROR: number;
-        const NGHTTP2_REFUSED_STREAM: number;
-        const NGHTTP2_CANCEL: number;
-        const NGHTTP2_COMPRESSION_ERROR: number;
-        const NGHTTP2_CONNECT_ERROR: number;
-        const NGHTTP2_ENHANCE_YOUR_CALM: number;
-        const NGHTTP2_INADEQUATE_SECURITY: number;
-        const NGHTTP2_HTTP_1_1_REQUIRED: number;
-        const NGHTTP2_ERR_FRAME_SIZE_ERROR: number;
-        const NGHTTP2_FLAG_NONE: number;
-        const NGHTTP2_FLAG_END_STREAM: number;
-        const NGHTTP2_FLAG_END_HEADERS: number;
-        const NGHTTP2_FLAG_ACK: number;
-        const NGHTTP2_FLAG_PADDED: number;
-        const NGHTTP2_FLAG_PRIORITY: number;
-        const DEFAULT_SETTINGS_HEADER_TABLE_SIZE: number;
-        const DEFAULT_SETTINGS_ENABLE_PUSH: number;
-        const DEFAULT_SETTINGS_INITIAL_WINDOW_SIZE: number;
-        const DEFAULT_SETTINGS_MAX_FRAME_SIZE: number;
-        const MAX_MAX_FRAME_SIZE: number;
-        const MIN_MAX_FRAME_SIZE: number;
-        const MAX_INITIAL_WINDOW_SIZE: number;
-        const NGHTTP2_DEFAULT_WEIGHT: number;
-        const NGHTTP2_SETTINGS_HEADER_TABLE_SIZE: number;
-        const NGHTTP2_SETTINGS_ENABLE_PUSH: number;
-        const NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS: number;
-        const NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE: number;
-        const NGHTTP2_SETTINGS_MAX_FRAME_SIZE: number;
-        const NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE: number;
-        const PADDING_STRATEGY_NONE: number;
-        const PADDING_STRATEGY_MAX: number;
-        const PADDING_STRATEGY_CALLBACK: number;
-        const HTTP2_HEADER_STATUS: string;
-        const HTTP2_HEADER_METHOD: string;
-        const HTTP2_HEADER_AUTHORITY: string;
-        const HTTP2_HEADER_SCHEME: string;
-        const HTTP2_HEADER_PATH: string;
-        const HTTP2_HEADER_ACCEPT_CHARSET: string;
-        const HTTP2_HEADER_ACCEPT_ENCODING: string;
-        const HTTP2_HEADER_ACCEPT_LANGUAGE: string;
-        const HTTP2_HEADER_ACCEPT_RANGES: string;
-        const HTTP2_HEADER_ACCEPT: string;
-        const HTTP2_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN: string;
-        const HTTP2_HEADER_AGE: string;
-        const HTTP2_HEADER_ALLOW: string;
-        const HTTP2_HEADER_AUTHORIZATION: string;
-        const HTTP2_HEADER_CACHE_CONTROL: string;
-        const HTTP2_HEADER_CONNECTION: string;
-        const HTTP2_HEADER_CONTENT_DISPOSITION: string;
-        const HTTP2_HEADER_CONTENT_ENCODING: string;
-        const HTTP2_HEADER_CONTENT_LANGUAGE: string;
-        const HTTP2_HEADER_CONTENT_LENGTH: string;
-        const HTTP2_HEADER_CONTENT_LOCATION: string;
-        const HTTP2_HEADER_CONTENT_MD5: string;
-        const HTTP2_HEADER_CONTENT_RANGE: string;
-        const HTTP2_HEADER_CONTENT_TYPE: string;
-        const HTTP2_HEADER_COOKIE: string;
-        const HTTP2_HEADER_DATE: string;
-        const HTTP2_HEADER_ETAG: string;
-        const HTTP2_HEADER_EXPECT: string;
-        const HTTP2_HEADER_EXPIRES: string;
-        const HTTP2_HEADER_FROM: string;
-        const HTTP2_HEADER_HOST: string;
-        const HTTP2_HEADER_IF_MATCH: string;
-        const HTTP2_HEADER_IF_MODIFIED_SINCE: string;
-        const HTTP2_HEADER_IF_NONE_MATCH: string;
-        const HTTP2_HEADER_IF_RANGE: string;
-        const HTTP2_HEADER_IF_UNMODIFIED_SINCE: string;
-        const HTTP2_HEADER_LAST_MODIFIED: string;
-        const HTTP2_HEADER_LINK: string;
-        const HTTP2_HEADER_LOCATION: string;
-        const HTTP2_HEADER_MAX_FORWARDS: string;
-        const HTTP2_HEADER_PREFER: string;
-        const HTTP2_HEADER_PROXY_AUTHENTICATE: string;
-        const HTTP2_HEADER_PROXY_AUTHORIZATION: string;
-        const HTTP2_HEADER_RANGE: string;
-        const HTTP2_HEADER_REFERER: string;
-        const HTTP2_HEADER_REFRESH: string;
-        const HTTP2_HEADER_RETRY_AFTER: string;
-        const HTTP2_HEADER_SERVER: string;
-        const HTTP2_HEADER_SET_COOKIE: string;
-        const HTTP2_HEADER_STRICT_TRANSPORT_SECURITY: string;
-        const HTTP2_HEADER_TRANSFER_ENCODING: string;
-        const HTTP2_HEADER_TE: string;
-        const HTTP2_HEADER_UPGRADE: string;
-        const HTTP2_HEADER_USER_AGENT: string;
-        const HTTP2_HEADER_VARY: string;
-        const HTTP2_HEADER_VIA: string;
-        const HTTP2_HEADER_WWW_AUTHENTICATE: string;
-        const HTTP2_HEADER_HTTP2_SETTINGS: string;
-        const HTTP2_HEADER_KEEP_ALIVE: string;
-        const HTTP2_HEADER_PROXY_CONNECTION: string;
-        const HTTP2_METHOD_ACL: string;
-        const HTTP2_METHOD_BASELINE_CONTROL: string;
-        const HTTP2_METHOD_BIND: string;
-        const HTTP2_METHOD_CHECKIN: string;
-        const HTTP2_METHOD_CHECKOUT: string;
-        const HTTP2_METHOD_CONNECT: string;
-        const HTTP2_METHOD_COPY: string;
-        const HTTP2_METHOD_DELETE: string;
-        const HTTP2_METHOD_GET: string;
-        const HTTP2_METHOD_HEAD: string;
-        const HTTP2_METHOD_LABEL: string;
-        const HTTP2_METHOD_LINK: string;
-        const HTTP2_METHOD_LOCK: string;
-        const HTTP2_METHOD_MERGE: string;
-        const HTTP2_METHOD_MKACTIVITY: string;
-        const HTTP2_METHOD_MKCALENDAR: string;
-        const HTTP2_METHOD_MKCOL: string;
-        const HTTP2_METHOD_MKREDIRECTREF: string;
-        const HTTP2_METHOD_MKWORKSPACE: string;
-        const HTTP2_METHOD_MOVE: string;
-        const HTTP2_METHOD_OPTIONS: string;
-        const HTTP2_METHOD_ORDERPATCH: string;
-        const HTTP2_METHOD_PATCH: string;
-        const HTTP2_METHOD_POST: string;
-        const HTTP2_METHOD_PRI: string;
-        const HTTP2_METHOD_PROPFIND: string;
-        const HTTP2_METHOD_PROPPATCH: string;
-        const HTTP2_METHOD_PUT: string;
-        const HTTP2_METHOD_REBIND: string;
-        const HTTP2_METHOD_REPORT: string;
-        const HTTP2_METHOD_SEARCH: string;
-        const HTTP2_METHOD_TRACE: string;
-        const HTTP2_METHOD_UNBIND: string;
-        const HTTP2_METHOD_UNCHECKOUT: string;
-        const HTTP2_METHOD_UNLINK: string;
-        const HTTP2_METHOD_UNLOCK: string;
-        const HTTP2_METHOD_UPDATE: string;
-        const HTTP2_METHOD_UPDATEREDIRECTREF: string;
-        const HTTP2_METHOD_VERSION_CONTROL: string;
-        const HTTP_STATUS_CONTINUE: number;
-        const HTTP_STATUS_SWITCHING_PROTOCOLS: number;
-        const HTTP_STATUS_PROCESSING: number;
-        const HTTP_STATUS_OK: number;
-        const HTTP_STATUS_CREATED: number;
-        const HTTP_STATUS_ACCEPTED: number;
-        const HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION: number;
-        const HTTP_STATUS_NO_CONTENT: number;
-        const HTTP_STATUS_RESET_CONTENT: number;
-        const HTTP_STATUS_PARTIAL_CONTENT: number;
-        const HTTP_STATUS_MULTI_STATUS: number;
-        const HTTP_STATUS_ALREADY_REPORTED: number;
-        const HTTP_STATUS_IM_USED: number;
-        const HTTP_STATUS_MULTIPLE_CHOICES: number;
-        const HTTP_STATUS_MOVED_PERMANENTLY: number;
-        const HTTP_STATUS_FOUND: number;
-        const HTTP_STATUS_SEE_OTHER: number;
-        const HTTP_STATUS_NOT_MODIFIED: number;
-        const HTTP_STATUS_USE_PROXY: number;
-        const HTTP_STATUS_TEMPORARY_REDIRECT: number;
-        const HTTP_STATUS_PERMANENT_REDIRECT: number;
-        const HTTP_STATUS_BAD_REQUEST: number;
-        const HTTP_STATUS_UNAUTHORIZED: number;
-        const HTTP_STATUS_PAYMENT_REQUIRED: number;
-        const HTTP_STATUS_FORBIDDEN: number;
-        const HTTP_STATUS_NOT_FOUND: number;
-        const HTTP_STATUS_METHOD_NOT_ALLOWED: number;
-        const HTTP_STATUS_NOT_ACCEPTABLE: number;
-        const HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED: number;
-        const HTTP_STATUS_REQUEST_TIMEOUT: number;
-        const HTTP_STATUS_CONFLICT: number;
-        const HTTP_STATUS_GONE: number;
-        const HTTP_STATUS_LENGTH_REQUIRED: number;
-        const HTTP_STATUS_PRECONDITION_FAILED: number;
-        const HTTP_STATUS_PAYLOAD_TOO_LARGE: number;
-        const HTTP_STATUS_URI_TOO_LONG: number;
-        const HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE: number;
-        const HTTP_STATUS_RANGE_NOT_SATISFIABLE: number;
-        const HTTP_STATUS_EXPECTATION_FAILED: number;
-        const HTTP_STATUS_TEAPOT: number;
-        const HTTP_STATUS_MISDIRECTED_REQUEST: number;
-        const HTTP_STATUS_UNPROCESSABLE_ENTITY: number;
-        const HTTP_STATUS_LOCKED: number;
-        const HTTP_STATUS_FAILED_DEPENDENCY: number;
-        const HTTP_STATUS_UNORDERED_COLLECTION: number;
-        const HTTP_STATUS_UPGRADE_REQUIRED: number;
-        const HTTP_STATUS_PRECONDITION_REQUIRED: number;
-        const HTTP_STATUS_TOO_MANY_REQUESTS: number;
-        const HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE: number;
-        const HTTP_STATUS_UNAVAILABLE_FOR_LEGAL_REASONS: number;
-        const HTTP_STATUS_INTERNAL_SERVER_ERROR: number;
-        const HTTP_STATUS_NOT_IMPLEMENTED: number;
-        const HTTP_STATUS_BAD_GATEWAY: number;
-        const HTTP_STATUS_SERVICE_UNAVAILABLE: number;
-        const HTTP_STATUS_GATEWAY_TIMEOUT: number;
-        const HTTP_STATUS_HTTP_VERSION_NOT_SUPPORTED: number;
-        const HTTP_STATUS_VARIANT_ALSO_NEGOTIATES: number;
-        const HTTP_STATUS_INSUFFICIENT_STORAGE: number;
-        const HTTP_STATUS_LOOP_DETECTED: number;
-        const HTTP_STATUS_BANDWIDTH_LIMIT_EXCEEDED: number;
-        const HTTP_STATUS_NOT_EXTENDED: number;
-        const HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED: number;
-    }
-
-    export function getDefaultSettings(): Settings;
-    export function getPackedSettings(settings: Settings): Settings;
-    export function getUnpackedSettings(buf: Buffer | Uint8Array): Settings;
-
-    export function createServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;
-    export function createServer(options: ServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;
-
-    export function createSecureServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;
-    export function createSecureServer(options: SecureServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;
-
-    export function connect(authority: string | url.URL, listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): ClientHttp2Session;
-    export function connect(
-        authority: string | url.URL,
-        options?: ClientSessionOptions | SecureClientSessionOptions,
-        listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void,
-    ): ClientHttp2Session;
-}
-
-declare module "perf_hooks" {
-    import { AsyncResource } from "async_hooks";
-
-    interface PerformanceEntry {
-        /**
-         * The total number of milliseconds elapsed for this entry.
-         * This value will not be meaningful for all Performance Entry types.
-         */
-        readonly duration: number;
-
-        /**
-         * The name of the performance entry.
-         */
-        readonly name: string;
-
-        /**
-         * The high resolution millisecond timestamp marking the starting time of the Performance Entry.
-         */
-        readonly startTime: number;
-
-        /**
-         * The type of the performance entry.
-         * Currently it may be one of: 'node', 'mark', 'measure', 'gc', or 'function'.
-         */
-        readonly entryType: string;
-
-        /**
-         * When performanceEntry.entryType is equal to 'gc', the performance.kind property identifies
-         * the type of garbage collection operation that occurred.
-         * The value may be one of perf_hooks.constants.
-         */
-        readonly kind?: number;
-    }
-
-    interface PerformanceNodeTiming extends PerformanceEntry {
-        /**
-         * The high resolution millisecond timestamp at which the Node.js process completed bootstrap.
-         */
-        readonly bootstrapComplete: number;
-
-        /**
-         * The high resolution millisecond timestamp at which cluster processing ended.
-         */
-        readonly clusterSetupEnd: number;
-
-        /**
-         * The high resolution millisecond timestamp at which cluster processing started.
-         */
-        readonly clusterSetupStart: number;
-
-        /**
-         * The high resolution millisecond timestamp at which the Node.js event loop exited.
-         */
-        readonly loopExit: number;
-
-        /**
-         * The high resolution millisecond timestamp at which the Node.js event loop started.
-         */
-        readonly loopStart: number;
-
-        /**
-         * The high resolution millisecond timestamp at which main module load ended.
-         */
-        readonly moduleLoadEnd: number;
-
-        /**
-         * The high resolution millisecond timestamp at which main module load started.
-         */
-        readonly moduleLoadStart: number;
-
-        /**
-         * The high resolution millisecond timestamp at which the Node.js process was initialized.
-         */
-        readonly nodeStart: number;
-
-        /**
-         * The high resolution millisecond timestamp at which preload module load ended.
-         */
-        readonly preloadModuleLoadEnd: number;
-
-        /**
-         * The high resolution millisecond timestamp at which preload module load started.
-         */
-        readonly preloadModuleLoadStart: number;
-
-        /**
-         * The high resolution millisecond timestamp at which third_party_main processing ended.
-         */
-        readonly thirdPartyMainEnd: number;
-
-        /**
-         * The high resolution millisecond timestamp at which third_party_main processing started.
-         */
-        readonly thirdPartyMainStart: number;
-
-        /**
-         * The high resolution millisecond timestamp at which the V8 platform was initialized.
-         */
-        readonly v8Start: number;
-    }
-
-    interface Performance {
-        /**
-         * If name is not provided, removes all PerformanceFunction objects from the Performance Timeline.
-         * If name is provided, removes entries with name.
-         * @param name
-         */
-        clearFunctions(name?: string): void;
-
-        /**
-         * If name is not provided, removes all PerformanceMark objects from the Performance Timeline.
-         * If name is provided, removes only the named mark.
-         * @param name
-         */
-        clearMarks(name?: string): void;
-
-        /**
-         * If name is not provided, removes all PerformanceMeasure objects from the Performance Timeline.
-         * If name is provided, removes only objects whose performanceEntry.name matches name.
-         */
-        clearMeasures(name?: string): void;
-
-        /**
-         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime.
-         * @return list of all PerformanceEntry objects
-         */
-        getEntries(): PerformanceEntry[];
-
-        /**
-         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
-         * whose performanceEntry.name is equal to name, and optionally, whose performanceEntry.entryType is equal to type.
-         * @param name
-         * @param type
-         * @return list of all PerformanceEntry objects
-         */
-        getEntriesByName(name: string, type?: string): PerformanceEntry[];
-
-        /**
-         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
-         * whose performanceEntry.entryType is equal to type.
-         * @param type
-         * @return list of all PerformanceEntry objects
-         */
-        getEntriesByType(type: string): PerformanceEntry[];
-
-        /**
-         * Creates a new PerformanceMark entry in the Performance Timeline.
-         * A PerformanceMark is a subclass of PerformanceEntry whose performanceEntry.entryType is always 'mark',
-         * and whose performanceEntry.duration is always 0.
-         * Performance marks are used to mark specific significant moments in the Performance Timeline.
-         * @param name
-         */
-        mark(name?: string): void;
-
-        /**
-         * Creates a new PerformanceMeasure entry in the Performance Timeline.
-         * A PerformanceMeasure is a subclass of PerformanceEntry whose performanceEntry.entryType is always 'measure',
-         * and whose performanceEntry.duration measures the number of milliseconds elapsed since startMark and endMark.
-         *
-         * The startMark argument may identify any existing PerformanceMark in the the Performance Timeline, or may identify
-         * any of the timestamp properties provided by the PerformanceNodeTiming class. If the named startMark does not exist,
-         * then startMark is set to timeOrigin by default.
-         *
-         * The endMark argument must identify any existing PerformanceMark in the the Performance Timeline or any of the timestamp
-         * properties provided by the PerformanceNodeTiming class. If the named endMark does not exist, an error will be thrown.
-         * @param name
-         * @param startMark
-         * @param endMark
-         */
-        measure(name: string, startMark: string, endMark: string): void;
-
-        /**
-         * An instance of the PerformanceNodeTiming class that provides performance metrics for specific Node.js operational milestones.
-         */
-        readonly nodeTiming: PerformanceNodeTiming;
-
-        /**
-         * @return the current high resolution millisecond timestamp
-         */
-        now(): number;
-
-        /**
-         * The timeOrigin specifies the high resolution millisecond timestamp from which all performance metric durations are measured.
-         */
-        readonly timeOrigin: number;
-
-        /**
-         * Wraps a function within a new function that measures the running time of the wrapped function.
-         * A PerformanceObserver must be subscribed to the 'function' event type in order for the timing details to be accessed.
-         * @param fn
-         */
-        timerify<T extends (...optionalParams: any[]) => any>(fn: T): T;
-    }
-
-    interface PerformanceObserverEntryList {
-        /**
-         * @return a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime.
-         */
-        getEntries(): PerformanceEntry[];
-
-        /**
-         * @return a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
-         * whose performanceEntry.name is equal to name, and optionally, whose performanceEntry.entryType is equal to type.
-         */
-        getEntriesByName(name: string, type?: string): PerformanceEntry[];
-
-        /**
-         * @return Returns a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
-         * whose performanceEntry.entryType is equal to type.
-         */
-        getEntriesByType(type: string): PerformanceEntry[];
-    }
-
-    type PerformanceObserverCallback = (list: PerformanceObserverEntryList, observer: PerformanceObserver) => void;
-
-    class PerformanceObserver extends AsyncResource {
-        constructor(callback: PerformanceObserverCallback);
-
-        /**
-         * Disconnects the PerformanceObserver instance from all notifications.
-         */
-        disconnect(): void;
-
-        /**
-         * Subscribes the PerformanceObserver instance to notifications of new PerformanceEntry instances identified by options.entryTypes.
-         * When options.buffered is false, the callback will be invoked once for every PerformanceEntry instance.
-         * Property buffered defaults to false.
-         * @param options
-         */
-        observe(options: { entryTypes: string[], buffered?: boolean }): void;
-    }
-
-    namespace constants {
-        const NODE_PERFORMANCE_GC_MAJOR: number;
-        const NODE_PERFORMANCE_GC_MINOR: number;
-        const NODE_PERFORMANCE_GC_INCREMENTAL: number;
-        const NODE_PERFORMANCE_GC_WEAKCB: number;
-    }
-
-    const performance: Performance;
-}
-
-declare module "trace_events" {
-    /**
-     * The `Tracing` object is used to enable or disable tracing for sets of
-     * categories. Instances are created using the
-     * `trace_events.createTracing()` method.
-     *
-     * When created, the `Tracing` object is disabled. Calling the
-     * `tracing.enable()` method adds the categories to the set of enabled trace
-     * event categories. Calling `tracing.disable()` will remove the categories
-     * from the set of enabled trace event categories.
-     */
-    export interface Tracing {
-        /**
-         * A comma-separated list of the trace event categories covered by this
-         * `Tracing` object.
-         */
-        readonly categories: string;
-
-        /**
-         * Disables this `Tracing` object.
-         *
-         * Only trace event categories _not_ covered by other enabled `Tracing`
-         * objects and _not_ specified by the `--trace-event-categories` flag
-         * will be disabled.
-         */
-        disable(): void;
-
-        /**
-         * Enables this `Tracing` object for the set of categories covered by
-         * the `Tracing` object.
-         */
-        enable(): void;
-
-        /**
-         * `true` only if the `Tracing` object has been enabled.
-         */
-        readonly enabled: boolean;
-    }
-
-    interface CreateTracingOptions {
-        /**
-         * An array of trace category names. Values included in the array are
-         * coerced to a string when possible. An error will be thrown if the
-         * value cannot be coerced.
-         */
-        categories: string[];
-    }
-
-    /**
-     * Creates and returns a Tracing object for the given set of categories.
-     */
-    export function createTracing(options: CreateTracingOptions): Tracing;
-
-    /**
-     * Returns a comma-separated list of all currently-enabled trace event
-     * categories. The current set of enabled trace event categories is
-     * determined by the union of all currently-enabled `Tracing` objects and
-     * any categories enabled using the `--trace-event-categories` flag.
-     */
-    export function getEnabledCategories(): string;
 }
diff --git a/types/node/inspector.d.ts b/types/node/inspector.d.ts
index a9d0f1140a..2dcd2760ad 100644
--- a/types/node/inspector.d.ts
+++ b/types/node/inspector.d.ts
@@ -8,7 +8,6 @@
 /**
  * The inspector module provides an API for interacting with the V8 inspector.
  */
-// tslint:disable-next-line:no-single-declare-module
 declare module "inspector" {
     import { EventEmitter } from 'events';
 
diff --git a/types/node/module.d.ts b/types/node/module.d.ts
new file mode 100644
index 0000000000..f512be7e5e
--- /dev/null
+++ b/types/node/module.d.ts
@@ -0,0 +1,3 @@
+declare module "module" {
+    export = NodeJS.Module;
+}
diff --git a/types/node/net.d.ts b/types/node/net.d.ts
new file mode 100644
index 0000000000..33858de8df
--- /dev/null
+++ b/types/node/net.d.ts
@@ -0,0 +1,255 @@
+declare module "net" {
+    import * as stream from "stream";
+    import * as events from "events";
+    import * as dns from "dns";
+
+    type LookupFunction = (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void) => void;
+
+    interface AddressInfo {
+        address: string;
+        family: string;
+        port: number;
+    }
+
+    interface SocketConstructorOpts {
+        fd?: number;
+        allowHalfOpen?: boolean;
+        readable?: boolean;
+        writable?: boolean;
+    }
+
+    interface TcpSocketConnectOpts {
+        port: number;
+        host?: string;
+        localAddress?: string;
+        localPort?: number;
+        hints?: number;
+        family?: number;
+        lookup?: LookupFunction;
+    }
+
+    interface IpcSocketConnectOpts {
+        path: string;
+    }
+
+    type SocketConnectOpts = TcpSocketConnectOpts | IpcSocketConnectOpts;
+
+    class Socket extends stream.Duplex {
+        constructor(options?: SocketConstructorOpts);
+
+        // Extended base methods
+        write(buffer: Buffer): boolean;
+        write(buffer: Buffer, cb?: Function): boolean;
+        write(str: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, fd?: string): boolean;
+        write(data: any, encoding?: string, callback?: Function): void;
+
+        connect(options: SocketConnectOpts, connectionListener?: Function): this;
+        connect(port: number, host: string, connectionListener?: Function): this;
+        connect(port: number, connectionListener?: Function): this;
+        connect(path: string, connectionListener?: Function): this;
+
+        setEncoding(encoding?: string): this;
+        pause(): this;
+        resume(): this;
+        setTimeout(timeout: number, callback?: Function): this;
+        setNoDelay(noDelay?: boolean): this;
+        setKeepAlive(enable?: boolean, initialDelay?: number): this;
+        address(): AddressInfo | string;
+        unref(): void;
+        ref(): void;
+
+        readonly bufferSize: number;
+        readonly bytesRead: number;
+        readonly bytesWritten: number;
+        readonly connecting: boolean;
+        readonly destroyed: boolean;
+        readonly localAddress: string;
+        readonly localPort: number;
+        readonly remoteAddress?: string;
+        readonly remoteFamily?: string;
+        readonly remotePort?: number;
+
+        // Extended base methods
+        end(): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+        end(data?: any, encoding?: string): void;
+
+        /**
+         * events.EventEmitter
+         *   1. close
+         *   2. connect
+         *   3. data
+         *   4. drain
+         *   5. end
+         *   6. error
+         *   7. lookup
+         *   8. timeout
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: (had_error: boolean) => void): this;
+        addListener(event: "connect", listener: () => void): this;
+        addListener(event: "data", listener: (data: Buffer) => void): this;
+        addListener(event: "drain", listener: () => void): this;
+        addListener(event: "end", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close", had_error: boolean): boolean;
+        emit(event: "connect"): boolean;
+        emit(event: "data", data: Buffer): boolean;
+        emit(event: "drain"): boolean;
+        emit(event: "end"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "lookup", err: Error, address: string, family: string | number, host: string): boolean;
+        emit(event: "timeout"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: (had_error: boolean) => void): this;
+        on(event: "connect", listener: () => void): this;
+        on(event: "data", listener: (data: Buffer) => void): this;
+        on(event: "drain", listener: () => void): this;
+        on(event: "end", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        on(event: "timeout", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: (had_error: boolean) => void): this;
+        once(event: "connect", listener: () => void): this;
+        once(event: "data", listener: (data: Buffer) => void): this;
+        once(event: "drain", listener: () => void): this;
+        once(event: "end", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        once(event: "timeout", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: (had_error: boolean) => void): this;
+        prependListener(event: "connect", listener: () => void): this;
+        prependListener(event: "data", listener: (data: Buffer) => void): this;
+        prependListener(event: "drain", listener: () => void): this;
+        prependListener(event: "end", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: (had_error: boolean) => void): this;
+        prependOnceListener(event: "connect", listener: () => void): this;
+        prependOnceListener(event: "data", listener: (data: Buffer) => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "end", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+    }
+
+    interface ListenOptions {
+        port?: number;
+        host?: string;
+        backlog?: number;
+        path?: string;
+        exclusive?: boolean;
+        readableAll?: boolean;
+        writableAll?: boolean;
+        /**
+         * @default false
+         */
+        ipv6Only?: boolean;
+    }
+
+    // https://github.com/nodejs/node/blob/master/lib/net.js
+    class Server extends events.EventEmitter {
+        constructor(connectionListener?: (socket: Socket) => void);
+        constructor(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void);
+
+        listen(port?: number, hostname?: string, backlog?: number, listeningListener?: Function): this;
+        listen(port?: number, hostname?: string, listeningListener?: Function): this;
+        listen(port?: number, backlog?: number, listeningListener?: Function): this;
+        listen(port?: number, listeningListener?: Function): this;
+        listen(path: string, backlog?: number, listeningListener?: Function): this;
+        listen(path: string, listeningListener?: Function): this;
+        listen(options: ListenOptions, listeningListener?: Function): this;
+        listen(handle: any, backlog?: number, listeningListener?: Function): this;
+        listen(handle: any, listeningListener?: Function): this;
+        close(callback?: Function): this;
+        address(): AddressInfo | string | null;
+        getConnections(cb: (error: Error | null, count: number) => void): void;
+        ref(): this;
+        unref(): this;
+        maxConnections: number;
+        connections: number;
+        listening: boolean;
+
+        /**
+         * events.EventEmitter
+         *   1. close
+         *   2. connection
+         *   3. error
+         *   4. listening
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "connection", listener: (socket: Socket) => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "listening", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "connection", socket: Socket): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "listening"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "connection", listener: (socket: Socket) => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "listening", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "connection", listener: (socket: Socket) => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "listening", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "connection", listener: (socket: Socket) => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "listening", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "connection", listener: (socket: Socket) => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "listening", listener: () => void): this;
+    }
+
+    interface TcpNetConnectOpts extends TcpSocketConnectOpts, SocketConstructorOpts {
+        timeout?: number;
+    }
+
+    interface IpcNetConnectOpts extends IpcSocketConnectOpts, SocketConstructorOpts {
+        timeout?: number;
+    }
+
+    type NetConnectOpts = TcpNetConnectOpts | IpcNetConnectOpts;
+
+    function createServer(connectionListener?: (socket: Socket) => void): Server;
+    function createServer(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void): Server;
+    function connect(options: NetConnectOpts, connectionListener?: Function): Socket;
+    function connect(port: number, host?: string, connectionListener?: Function): Socket;
+    function connect(path: string, connectionListener?: Function): Socket;
+    function createConnection(options: NetConnectOpts, connectionListener?: Function): Socket;
+    function createConnection(port: number, host?: string, connectionListener?: Function): Socket;
+    function createConnection(path: string, connectionListener?: Function): Socket;
+    function isIP(input: string): number;
+    function isIPv4(input: string): boolean;
+    function isIPv6(input: string): boolean;
+}
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index f351ba8139..089ca86307 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -5,19 +5,14 @@ import events2 = require("events");
 import * as zlib from "zlib";
 import * as url from "url";
 import * as util from "util";
-import * as crypto from "crypto";
 import * as tls from "tls";
 import * as http from "http";
 import * as https from "https";
 import * as net from "net";
-import * as tty from "tty";
-import * as dgram from "dgram";
 import * as querystring from "querystring";
 import * as path from "path";
-import * as readline from "readline";
 import * as childProcess from "child_process";
 import * as cluster from "cluster";
-import * as workerThreads from "worker_threads";
 import * as os from "os";
 import * as vm from "vm";
 import * as console2 from "console";
@@ -34,22 +29,6 @@ import * as perf_hooks from "perf_hooks";
 import * as trace_events from "trace_events";
 import Module = require("module");
 
-// Specifically test buffer module regression.
-import { Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer } from "buffer";
-
-//////////////////////////////////////////////////////////
-/// Global Tests : https://nodejs.org/api/global.html  ///
-//////////////////////////////////////////////////////////
-{
-    {
-        const x: NodeModule = {} as any;
-        const y: NodeModule = {} as any;
-        x.children.push(y);
-        x.parent = require.main;
-        require.main = y;
-    }
-}
-
 //////////////////////////////////////////////////////////
 /// Assert Tests : https://nodejs.org/api/assert.html ///
 //////////////////////////////////////////////////////////
@@ -65,7 +44,7 @@ import { Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer } from "buff
         assert.doesNotThrow(() => {
             const b = false;
             if (b) { throw new Error("a hammer at your face"); }
-        }, undefined, "What the...*crunch*");
+        }, () => 1, "What the...*crunch*");
 
         assert.equal(3, "3", "uses == comparator");
 
@@ -88,7 +67,7 @@ import { Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer } from "buff
 
         assert.strictEqual(1, 1, "uses === comparator");
 
-        assert.throws(() => { throw new Error("a hammer at your face"); }, undefined, "DODGED IT");
+        assert.throws(() => { throw new Error("a hammer at your face"); }, Error, "DODGED IT");
 
         assert.strict.strict.deepEqual([[[1, 2, 3]], 4, 5], [[[1, 2, '3']], 4, 5]);
     }
@@ -254,7 +233,7 @@ import { Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer } from "buff
         listS = fs.readdirSync('path');
         listS = fs.readdirSync('path', { encoding: 'utf8' });
         listS = fs.readdirSync('path', { encoding: null });
-        listS = fs.readdirSync('path', { encoding: undefined });
+        listS = fs.readdirSync('path', { encoding: undefined }) as string[];
         listS = fs.readdirSync('path', 'utf8');
         listS = fs.readdirSync('path', null);
         listS = fs.readdirSync('path', undefined);
@@ -320,7 +299,7 @@ import { Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer } from "buff
     }
 
     {
-        let s: string;
+        let s = '123';
         let b: Buffer;
         fs.readlink('/path/to/folder', (err, linkString) => s = linkString);
         fs.readlink('/path/to/folder', undefined, (err, linkString) => s = linkString);
@@ -349,7 +328,7 @@ import { Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer } from "buff
     }
 
     {
-        let s: string;
+        let s = '123';
         let b: Buffer;
         fs.realpath('/path/to/folder', (err, resolvedPath) => s = resolvedPath);
         fs.realpath('/path/to/folder', undefined, (err, resolvedPath) => s = resolvedPath);
@@ -431,213 +410,6 @@ import { Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer } from "buff
     }
 }
 
-///////////////////////////////////////////////////////
-/// Buffer tests : https://nodejs.org/api/buffer.html
-///////////////////////////////////////////////////////
-
-function bufferTests() {
-    const utf8Buffer = new Buffer('test');
-    const base64Buffer = new Buffer('', 'base64');
-    const octets: Uint8Array = null;
-    const octetBuffer = new Buffer(octets);
-    const sharedBuffer = new Buffer(octets.buffer);
-    const copiedBuffer = new Buffer(utf8Buffer);
-    console.log(Buffer.isBuffer(octetBuffer));
-    console.log(Buffer.isEncoding('utf8'));
-    console.log(Buffer.byteLength('xyz123'));
-    console.log(Buffer.byteLength('xyz123', 'ascii'));
-    const result1 = Buffer.concat([utf8Buffer, base64Buffer]);
-    const result2 = Buffer.concat([utf8Buffer, base64Buffer], 9999999);
-
-    // Class Methods: Buffer.swap16(), Buffer.swa32(), Buffer.swap64()
-    {
-        const buf = Buffer.from([0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8]);
-        buf.swap16();
-        buf.swap32();
-        buf.swap64();
-    }
-
-    // Class Method: Buffer.from(data)
-    {
-        // Array
-        const buf1: Buffer = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
-        // Buffer
-        const buf2: Buffer = Buffer.from(buf1);
-        // String
-        const buf3: Buffer = Buffer.from('this is a tést');
-        // ArrayBuffer
-        const arrUint16: Uint16Array = new Uint16Array(2);
-        arrUint16[0] = 5000;
-        arrUint16[1] = 4000;
-        const buf4: Buffer = Buffer.from(arrUint16.buffer);
-        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]])
-    {
-        const arr: Uint16Array = new Uint16Array(2);
-        arr[0] = 5000;
-        arr[1] = 4000;
-
-        let buf: Buffer;
-        buf = Buffer.from(arr.buffer, 1);
-        buf = Buffer.from(arr.buffer, 0, 1);
-    }
-
-    // Class Method: Buffer.from(str[, encoding])
-    {
-        const buf2: Buffer = Buffer.from('7468697320697320612074c3a97374', 'hex');
-    }
-
-    // Class Method: Buffer.alloc(size[, fill[, encoding]])
-    {
-        const buf1: Buffer = Buffer.alloc(5);
-        const buf2: Buffer = Buffer.alloc(5, 'a');
-        const buf3: Buffer = Buffer.alloc(11, 'aGVsbG8gd29ybGQ=', 'base64');
-    }
-    // Class Method: Buffer.allocUnsafe(size)
-    {
-        const buf: Buffer = Buffer.allocUnsafe(5);
-    }
-    // Class Method: Buffer.allocUnsafeSlow(size)
-    {
-        const buf: Buffer = Buffer.allocUnsafeSlow(10);
-    }
-
-    // Class Method byteLenght
-    {
-        let len: number;
-        len = Buffer.byteLength("foo");
-        len = Buffer.byteLength("foo", "utf8");
-
-        const b = Buffer.from("bar");
-        len = Buffer.byteLength(b);
-        len = Buffer.byteLength(b, "utf16le");
-
-        const ab = new ArrayBuffer(15);
-        len = Buffer.byteLength(ab);
-        len = Buffer.byteLength(ab, "ascii");
-
-        const dv = new DataView(ab);
-        len = Buffer.byteLength(dv);
-        len = Buffer.byteLength(dv, "utf16le");
-    }
-
-    // Class Method poolSize
-    {
-        let s: number;
-        s = Buffer.poolSize;
-        Buffer.poolSize = 4096;
-    }
-
-    // Test that TS 1.6 works with the 'as Buffer' annotation
-    // on isBuffer.
-    let a: Buffer | number;
-    a = new Buffer(10);
-    if (Buffer.isBuffer(a)) {
-        a.writeUInt8(3, 4);
-    }
-
-    // write* methods return offsets.
-    const b = new Buffer(16);
-    let result: number = b.writeUInt32LE(0, 0);
-    result = b.writeUInt16LE(0, 4);
-    result = b.writeUInt8(0, 6);
-    result = b.writeInt8(0, 7);
-    result = b.writeDoubleLE(0, 8);
-
-    // fill returns the input buffer.
-    b.fill('a').fill('b');
-
-    {
-        const buffer = new Buffer('123');
-        let index: number;
-        index = buffer.indexOf("23");
-        index = buffer.indexOf("23", 1);
-        index = buffer.indexOf("23", 1, "utf8");
-        index = buffer.indexOf(23);
-        index = buffer.indexOf(buffer);
-    }
-
-    {
-        const buffer = new Buffer('123');
-        let index: number;
-        index = buffer.lastIndexOf("23");
-        index = buffer.lastIndexOf("23", 1);
-        index = buffer.lastIndexOf("23", 1, "utf8");
-        index = buffer.lastIndexOf(23);
-        index = buffer.lastIndexOf(buffer);
-    }
-
-    {
-        const buffer = new Buffer('123');
-        const val: [number, number] = [1, 1];
-
-        /* comment out for --target es5
-        for (let entry of buffer.entries()) {
-            val = entry;
-        }
-         */
-    }
-
-    {
-        const buffer = new Buffer('123');
-        let includes: boolean;
-        includes = buffer.includes("23");
-        includes = buffer.includes("23", 1);
-        includes = buffer.includes("23", 1, "utf8");
-        includes = buffer.includes(23);
-        includes = buffer.includes(23, 1);
-        includes = buffer.includes(23, 1, "utf8");
-        includes = buffer.includes(buffer);
-        includes = buffer.includes(buffer, 1);
-        includes = buffer.includes(buffer, 1, "utf8");
-    }
-
-    {
-        const buffer = new Buffer('123');
-        const val = 1;
-
-        /* comment out for --target es5
-        for (let key of buffer.keys()) {
-            val = key;
-        }
-         */
-    }
-
-    {
-        const buffer = new Buffer('123');
-        const val = 1;
-
-        /* comment out for --target es5
-        for (let value of buffer.values()) {
-            val = value;
-        }
-         */
-    }
-
-    // Imported Buffer from buffer module works properly
-    {
-        const b = new ImportedBuffer('123');
-        b.writeUInt8(0, 6);
-        const sb = new ImportedSlowBuffer(43);
-        b.writeUInt8(0, 6);
-    }
-
-    // Buffer has Uint8Array's buffer field (an ArrayBuffer).
-    {
-        const buffer = new Buffer('123');
-        const octets = new Uint8Array(buffer.buffer);
-    }
-}
-
 ////////////////////////////////////////////////////
 /// Url tests : http://nodejs.org/api/url.html
 ////////////////////////////////////////////////////
@@ -666,10 +438,10 @@ function bufferTests() {
         assert.equal(helloUrl.query['hello'], 'world');
 
         let strUrl = url.parse('http://example.com/?hello=world');
-        let queryStr: string = strUrl.query;
+        let queryStr: string = strUrl.query!;
 
         strUrl = url.parse('http://example.com/?hello=world', false);
-        queryStr = strUrl.query;
+        queryStr = strUrl.query!;
 
         function getBoolean(): boolean { return false; }
         const urlUrl = url.parse('http://example.com/?hello=world', getBoolean());
@@ -774,8 +546,10 @@ function bufferTests() {
         const params = new url.URLSearchParams([
             ['user', 'abc'],
             ['query', 'first'],
-            ['query', 'second']
-        ]);
+            ['query', 'second'],
+        // ts 2.1/2.* compatibility
+        // tslint:disable-next-line no-unnecessary-type-assertion
+        ] as Array<[string, string]>);
         assert.equal(params.toString(), 'user=abc&query=first&query=second');
     }
 
@@ -789,176 +563,6 @@ function bufferTests() {
     }
 }
 
-/////////////////////////////////////////////////////
-/// util tests : https://nodejs.org/api/util.html ///
-/////////////////////////////////////////////////////
-
-{
-    {
-        // Old and new util.inspect APIs
-        util.inspect(["This is nice"], false, 5);
-        util.inspect(["This is nice"], false, null);
-        util.inspect(["This is nice"], {
-            colors: true,
-            depth: 5,
-            customInspect: false,
-            showProxy: true,
-            maxArrayLength: 10,
-            breakLength: 20,
-            compact: true,
-            sorted(a, b) {
-                return b.localeCompare(a);
-            },
-        });
-        util.inspect(["This is nice"], {
-            colors: true,
-            depth: null,
-            customInspect: false,
-            showProxy: true,
-            maxArrayLength: null,
-            breakLength: Infinity,
-            compact: false,
-            sorted: true,
-        });
-        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 {
-            static fn(): Promise<void> {
-                assert(arguments.length === 0);
-
-                return Promise.resolve();
-            }
-
-            static fnE(): Promise<void> {
-                assert(arguments.length === 0);
-
-                return Promise.reject(new Error('fail'));
-            }
-
-            static fnT1(arg1: string): Promise<void> {
-                assert(arguments.length === 1 && arg1 === 'parameter');
-
-                return Promise.resolve();
-            }
-
-            static fnT1E(arg1: string): Promise<void> {
-                assert(arguments.length === 1 && arg1 === 'parameter');
-
-                return Promise.reject(new Error('fail'));
-            }
-
-            static fnTResult(): Promise<string> {
-                assert(arguments.length === 0);
-
-                return Promise.resolve('result');
-            }
-
-            static fnTResultE(): Promise<string> {
-                assert(arguments.length === 0);
-
-                return Promise.reject(new Error('fail'));
-            }
-
-            static fnT1TResult(arg1: string): Promise<string> {
-                assert(arguments.length === 1 && arg1 === 'parameter');
-
-                return Promise.resolve('result');
-            }
-
-            static fnT1TResultE(arg1: string): Promise<string> {
-                assert(arguments.length === 1 && arg1 === 'parameter');
-
-                return Promise.reject(new Error('fail'));
-            }
-
-            static test(): void {
-                const cfn = util.callbackify(this.fn);
-                const cfnE = util.callbackify(this.fnE);
-                const cfnT1 = util.callbackify(this.fnT1);
-                const cfnT1E = util.callbackify(this.fnT1E);
-                const cfnTResult = util.callbackify(this.fnTResult);
-                const cfnTResultE = util.callbackify(this.fnTResultE);
-                const cfnT1TResult = util.callbackify(this.fnT1TResult);
-                const cfnT1TResultE = util.callbackify(this.fnT1TResultE);
-
-                cfn((err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === undefined));
-                cfnE((err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
-                cfnT1('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === undefined));
-                cfnT1E('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
-                cfnTResult((err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === 'result'));
-                cfnTResultE((err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
-                cfnT1TResult('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === 'result'));
-                cfnT1TResultE('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
-            }
-        }
-        callbackifyTest.test();
-
-        // util.promisify
-        const readPromised = util.promisify(fs.readFile);
-        const sampleRead: Promise<any> = readPromised(__filename).then((data: Buffer): void => { }).catch((error: Error): void => { });
-        const arg0: () => Promise<number> = util.promisify((cb: (err: Error, result: number) => void): void => { });
-        const arg0NoResult: () => Promise<any> = util.promisify((cb: (err: Error) => void): void => { });
-        const arg1: (arg: string) => Promise<number> = util.promisify((arg: string, cb: (err: Error, result: number) => void): void => { });
-        const arg1NoResult: (arg: string) => Promise<any> = util.promisify((arg: string, cb: (err: Error) => void): void => { });
-        const cbOptionalError: () => Promise<void | {}> = util.promisify((cb: (err?: Error | null) => void): void => { cb(); }); // tslint:disable-line void-return
-        assert(typeof util.promisify.custom === 'symbol');
-        // util.deprecate
-        const foo = () => {};
-        // $ExpectType () => void
-        util.deprecate(foo, 'foo() is deprecated, use bar() instead');
-        // $ExpectType <T extends Function>(fn: T, message: string) => T
-        util.deprecate(util.deprecate, 'deprecate() is deprecated, use bar() instead');
-
-        // util.isDeepStrictEqual
-        util.isDeepStrictEqual({foo: 'bar'}, {foo: 'bar'});
-
-        // util.TextDecoder()
-        const td = new util.TextDecoder();
-        new util.TextDecoder("utf-8");
-        new util.TextDecoder("utf-8", { fatal: true });
-        new util.TextDecoder("utf-8", { fatal: true, ignoreBOM: true });
-        const ignoreBom: boolean = td.ignoreBOM;
-        const fatal: boolean = td.fatal;
-        const encoding: string = td.encoding;
-        td.decode(new Int8Array(1));
-        td.decode(new Int16Array(1));
-        td.decode(new Int32Array(1));
-        td.decode(new Uint8Array(1));
-        td.decode(new Uint16Array(1));
-        td.decode(new Uint32Array(1));
-        td.decode(new Uint8ClampedArray(1));
-        td.decode(new Float32Array(1));
-        td.decode(new Float64Array(1));
-        td.decode(new DataView(new Int8Array(1).buffer));
-        td.decode(new ArrayBuffer(1));
-        td.decode(null);
-        td.decode(null, { stream: true });
-        td.decode(new Int8Array(1), { stream: true });
-        const decode: string = td.decode(new Int8Array(1));
-
-        // util.TextEncoder()
-        const te = new util.TextEncoder();
-        const teEncoding: string = te.encoding;
-        const teEncodeRes: Uint8Array = te.encode("TextEncoder");
-
-        // util.types
-
-        // tslint:disable-next-line:no-construct ban-types
-        const maybeBoxed: number | Number = new Number(1);
-        if (util.types.isBoxedPrimitive(maybeBoxed)) {
-            const boxed: Number = maybeBoxed;
-        }
-        const maybeBoxed2: number | Number = 1;
-        if (!util.types.isBoxedPrimitive(maybeBoxed2)) {
-            const boxed: number = maybeBoxed2;
-        }
-    }
-}
-
 ////////////////////////////////////////////////////
 /// Stream tests : http://nodejs.org/api/stream.html
 ////////////////////////////////////////////////////
@@ -987,30 +591,60 @@ function stream_readable_pipe_test() {
 const compressMe = new Buffer("some data");
 const compressMeString = "compress me!";
 
-zlib.deflate(compressMe, (err: Error, result: Buffer) => zlib.inflate(result, (err: Error, result: Buffer) => result));
-zlib.deflate(compressMe, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => zlib.inflate(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result));
-zlib.deflate(compressMeString, (err: Error, result: Buffer) => zlib.inflate(result, (err: Error, result: Buffer) => result));
-zlib.deflate(compressMeString, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => zlib.inflate(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result));
+zlib.deflate(compressMe, (err: Error | null, result: Buffer) => zlib.inflate(result, (err: Error | null, result: Buffer) => result));
+zlib.deflate(
+    compressMe,
+    { finishFlush: zlib.Z_SYNC_FLUSH },
+    (err: Error | null, result: Buffer) => zlib.inflate(
+        result,
+        { finishFlush: zlib.Z_SYNC_FLUSH },
+        (err: Error | null, result: Buffer) => result
+    )
+);
+zlib.deflate(compressMeString, (err: Error | null, result: Buffer) => zlib.inflate(result, (err: Error | null, result: Buffer) => result));
+zlib.deflate(
+    compressMeString,
+    { finishFlush: zlib.Z_SYNC_FLUSH },
+    (err: Error | null, result: Buffer) => zlib.inflate(
+        result,
+        { finishFlush: zlib.Z_SYNC_FLUSH },
+        (err: Error | null, result: Buffer) => result
+    )
+);
 const inflated = zlib.inflateSync(zlib.deflateSync(compressMe));
 const inflatedString = zlib.inflateSync(zlib.deflateSync(compressMeString));
 
-zlib.deflateRaw(compressMe, (err: Error, result: Buffer) => zlib.inflateRaw(result, (err: Error, result: Buffer) => result));
-zlib.deflateRaw(compressMe, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => zlib.inflateRaw(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result));
-zlib.deflateRaw(compressMeString, (err: Error, result: Buffer) => zlib.inflateRaw(result, (err: Error, result: Buffer) => result));
+zlib.deflateRaw(compressMe, (err: Error | null, result: Buffer) => zlib.inflateRaw(result, (err: Error | null, result: Buffer) => result));
+zlib.deflateRaw(
+    compressMe,
+    { finishFlush: zlib.Z_SYNC_FLUSH },
+    (err: Error | null, result: Buffer) => zlib.inflateRaw(
+        result, { finishFlush: zlib.Z_SYNC_FLUSH },
+        (err: Error | null, result: Buffer) => result
+    )
+);
+zlib.deflateRaw(compressMeString, (err: Error | null, result: Buffer) => zlib.inflateRaw(result, (err: Error | null, result: Buffer) => result));
 zlib.deflateRaw(
     compressMeString,
     { finishFlush: zlib.Z_SYNC_FLUSH },
-    (err: Error, result: Buffer) => zlib.inflateRaw(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result),
+    (err: Error | null, result: Buffer) => zlib.inflateRaw(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error | null, result: Buffer) => result),
 );
 const inflatedRaw: Buffer = zlib.inflateRawSync(zlib.deflateRawSync(compressMe));
 const inflatedRawString: Buffer = zlib.inflateRawSync(zlib.deflateRawSync(compressMeString));
 
-zlib.gzip(compressMe, (err: Error, result: Buffer) => zlib.gunzip(result, (err: Error, result: Buffer) => result));
-zlib.gzip(compressMe, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => zlib.gunzip(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result));
+zlib.gzip(compressMe, (err: Error | null, result: Buffer) => zlib.gunzip(result, (err: Error | null, result: Buffer) => result));
+zlib.gzip(
+    compressMe,
+    { finishFlush: zlib.Z_SYNC_FLUSH },
+    (err: Error | null, result: Buffer) => zlib.gunzip(
+        result, { finishFlush: zlib.Z_SYNC_FLUSH },
+        (err: Error | null, result: Buffer) => result
+    )
+);
 const gunzipped: Buffer = zlib.gunzipSync(zlib.gzipSync(compressMe));
 
-zlib.unzip(compressMe, (err: Error, result: Buffer) => result);
-zlib.unzip(compressMe, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result);
+zlib.unzip(compressMe, (err: Error | null, result: Buffer) => result);
+zlib.unzip(compressMe, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error | null, result: Buffer) => result);
 const unzipped: Buffer = zlib.unzipSync(compressMe);
 
 // Simplified constructors
@@ -1023,9 +657,9 @@ function simplified_stream_ctor_test() {
             size;
         },
         destroy(error, cb) {
-            // $ExpectType Error
+            // $ExpectType Error | null
             error;
-            // $ExpectType (error: Error) => void
+            // $ExpectType (error: Error | null) => void
             cb;
         }
     });
@@ -1038,7 +672,7 @@ function simplified_stream_ctor_test() {
             chunk;
             // $ExpectType string
             enc;
-            // $ExpectType (error?: Error) => void
+            // $ExpectType (error?: Error | null | undefined) => void
             cb;
         },
         writev(chunks, cb) {
@@ -1046,21 +680,21 @@ function simplified_stream_ctor_test() {
             this;
             // $ExpectType { chunk: any; encoding: string; }[]
             chunks;
-            // $ExpectType (error?: Error) => void
+            // $ExpectType (error?: Error | null | undefined) => void
             cb;
         },
         destroy(error, cb) {
             // $ExpectType Writable
             this;
-            // $ExpectType Error
+            // $ExpectType Error | null
             error;
-            // $ExpectType (error: Error) => void
+            // $ExpectType (error: Error | null) => void
             cb;
         },
         final(cb) {
             // $ExpectType Writable
             this;
-            // $ExpectType (error?: Error) => void
+            // $ExpectType (error?: Error | null | undefined) => void
             cb;
         }
     });
@@ -1079,7 +713,7 @@ function simplified_stream_ctor_test() {
             chunk;
             // $ExpectType string
             enc;
-            // $ExpectType (error?: Error) => void
+            // $ExpectType (error?: Error | null | undefined) => void
             cb;
         },
         writev(chunks, cb) {
@@ -1087,21 +721,21 @@ function simplified_stream_ctor_test() {
             this;
             // $ExpectType { chunk: any; encoding: string; }[]
             chunks;
-            // $ExpectType (error?: Error) => void
+            // $ExpectType (error?: Error | null | undefined) => void
             cb;
         },
         destroy(error, cb) {
             // $ExpectType Duplex
             this;
-            // $ExpectType Error
+            // $ExpectType Error | null
             error;
-            // $ExpectType (error: Error) => void
+            // $ExpectType (error: Error | null) => void
             cb;
         },
         final(cb) {
             // $ExpectType Duplex
             this;
-            // $ExpectType (error?: Error) => void
+            // $ExpectType (error?: Error | null | undefined) => void
             cb;
         },
         readableObjectMode: true,
@@ -1122,7 +756,7 @@ function simplified_stream_ctor_test() {
             chunk;
             // $ExpectType string
             enc;
-            // $ExpectType (error?: Error) => void
+            // $ExpectType (error?: Error | null | undefined) => void
             cb;
         },
         writev(chunks, cb) {
@@ -1130,21 +764,21 @@ function simplified_stream_ctor_test() {
             this;
             // $ExpectType { chunk: any; encoding: string; }[]
             chunks;
-            // $ExpectType (error?: Error) => void
+            // $ExpectType (error?: Error | null | undefined) => void
             cb;
         },
         destroy(error, cb) {
             // $ExpectType Transform
             this;
-            // $ExpectType Error
+            // $ExpectType Error | null
             error;
-            // $ExpectType (error: Error) => void
+            // $ExpectType (error: Error | null) => void
             cb;
         },
         final(cb) {
             // $ExpectType Transform
             this;
-            // $ExpectType (error?: Error) => void
+            // $ExpectType (error?: Error | null | undefined) => void
             cb;
         },
         transform(chunk, enc, cb) {
@@ -1182,484 +816,6 @@ async function asyncStreamPipelineFinished() {
     await pipeline(process.stdin, process.stdout);
 }
 
-////////////////////////////////////////////////////////
-/// Crypto tests : http://nodejs.org/api/crypto.html ///
-////////////////////////////////////////////////////////
-
-{
-    {
-        // crypto_hash_string_test
-        const hashResult: string = crypto.createHash('md5').update('world').digest('hex');
-    }
-
-    {
-        // crypto_hash_buffer_test
-        const hashResult: string = crypto.createHash('md5')
-            .update(new Buffer('world')).digest('hex');
-    }
-
-    {
-        // crypto_hash_dataview_test
-        const hashResult: string = crypto.createHash('md5')
-            .update(new DataView(new Buffer('world').buffer)).digest('hex');
-    }
-
-    {
-        // crypto_hash_int8array_test
-        const hashResult: string = crypto.createHash('md5')
-            .update(new Int8Array(new Buffer('world').buffer)).digest('hex');
-    }
-
-    {
-        // crypto_hmac_string_test
-        const hmacResult: string = crypto.createHmac('md5', 'hello').update('world').digest('hex');
-    }
-
-    {
-        // crypto_hmac_buffer_test
-        const hmacResult: string = crypto.createHmac('md5', 'hello')
-            .update(new Buffer('world')).digest('hex');
-    }
-
-    {
-        // crypto_hmac_dataview_test
-        const hmacResult: string = crypto.createHmac('md5', 'hello')
-            .update(new DataView(new Buffer('world').buffer)).digest('hex');
-    }
-
-    {
-        // crypto_hmac_int8array_test
-        const 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', () => {
-            const hash: Buffer | string = hmac.read();
-        });
-    }
-
-    {
-        // crypto_cipher_decipher_string_test
-        const key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
-        const clearText = "This is the clear text.";
-        const cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
-        let cipherText: string = cipher.update(clearText, "utf8", "hex");
-        cipherText += cipher.final("hex");
-
-        const decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
-        let clearText2: string = decipher.update(cipherText, "hex", "utf8");
-        clearText2 += decipher.final("utf8");
-
-        assert.equal(clearText2, clearText);
-    }
-
-    {
-        // crypto_cipher_decipher_buffer_test
-        const key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
-        const clearText: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]);
-        const cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
-        const cipherBuffers: Buffer[] = [];
-        cipherBuffers.push(cipher.update(clearText));
-        cipherBuffers.push(cipher.final());
-
-        const cipherText: Buffer = Buffer.concat(cipherBuffers);
-
-        const decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
-        const decipherBuffers: Buffer[] = [];
-        decipherBuffers.push(decipher.update(cipherText));
-        decipherBuffers.push(decipher.final());
-
-        const clearText2: Buffer = Buffer.concat(decipherBuffers);
-
-        assert.deepEqual(clearText2, clearText);
-    }
-
-    {
-        // crypto_cipher_decipher_dataview_test
-        const key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
-        const clearText: DataView = new DataView(new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]).buffer);
-        const cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
-        const cipherBuffers: Buffer[] = [];
-        cipherBuffers.push(cipher.update(clearText));
-        cipherBuffers.push(cipher.final());
-
-        const cipherText: DataView = new DataView(Buffer.concat(cipherBuffers).buffer);
-
-        const decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
-        const decipherBuffers: Buffer[] = [];
-        decipherBuffers.push(decipher.update(cipherText));
-        decipherBuffers.push(decipher.final());
-
-        const clearText2: Buffer = Buffer.concat(decipherBuffers);
-
-        assert.deepEqual(clearText2, clearText);
-    }
-
-    {
-        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
-        const buffer1: Buffer = new Buffer([1, 2, 3, 4, 5]);
-        const buffer2: Buffer = new Buffer([1, 2, 3, 4, 5]);
-        const buffer3: Buffer = new Buffer([5, 4, 3, 2, 1]);
-
-        assert(crypto.timingSafeEqual(buffer1, buffer2));
-        assert(!crypto.timingSafeEqual(buffer1, buffer3));
-    }
-
-    {
-        // crypto_timingsafeequal_uint32array_test
-        const arr1: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
-        const arr2: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
-        const 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
-        const arr1: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
-        const arr2: Int32Array = Int32Array.of(1, 2, 3, 4, 5);
-        const 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
-        const arr1: Int8Array = Int8Array.of(1, 2, 3, 4, 5, ~0, ~1, ~2, ~3, ~4);
-        const arr2: Uint8Array = Uint8Array.of(1, 2, 3, 4, 5, ~0, ~1, ~2, ~3, ~4);
-        const 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
-        const dv1B: Uint8Array = Uint8Array.of(1, 2, 3, 4, 5);
-        const dv2B: Int8Array = Int8Array.of(1, 2, 3, 4, 5);
-        const dv3B: Buffer = Buffer.of(5, 4, 3, 2, 1);
-        const dv4B: Uint8ClampedArray = Uint8ClampedArray.of(5, 4, 3, 2, 1);
-        const dv1: DataView = new DataView(dv1B.buffer, dv1B.byteOffset, dv1B.byteLength);
-        const dv2: DataView = new DataView(dv2B.buffer, dv2B.byteOffset, dv2B.byteLength);
-        const dv3: DataView = new DataView(dv3B.buffer, dv3B.byteOffset, dv3B.byteLength);
-        const 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
-        const ui32_1: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
-        const ui32_2: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
-        const 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
-        const buffer: Buffer = new Buffer(10);
-        crypto.randomFillSync(buffer);
-        crypto.randomFillSync(buffer, 2);
-        crypto.randomFillSync(buffer, 2, 3);
-
-        crypto.randomFill(buffer, (err: Error, buf: Buffer) => void {});
-        crypto.randomFill(buffer, 2, (err: Error, buf: Buffer) => void {});
-        crypto.randomFill(buffer, 2, 3, (err: Error, buf: Buffer) => void {});
-
-        // crypto_randomfill_uint8array_test
-        const ui8arr: Uint8Array = new Uint8Array(10);
-        crypto.randomFillSync(ui8arr);
-        crypto.randomFillSync(ui8arr, 2);
-        crypto.randomFillSync(ui8arr, 2, 3);
-
-        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
-        const 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");
-        const 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");
-    }
-
-    {
-        const rsaRes: {
-            publicKey: Buffer;
-            privateKey: string;
-        } = crypto.generateKeyPairSync('rsa', {
-            modulusLength: 123,
-            publicKeyEncoding: {
-                format: 'der',
-                type: 'pkcs1',
-            },
-            privateKeyEncoding: {
-                cipher: 'some-cipher',
-                format: 'pem',
-                passphrase: 'secret',
-                type: 'pkcs8',
-            },
-        });
-
-        const dsaRes: {
-            publicKey: string;
-            privateKey: Buffer;
-        } = crypto.generateKeyPairSync('dsa', {
-            modulusLength: 123,
-            divisorLength: 123,
-            publicKeyEncoding: {
-                format: 'pem',
-                type: 'spki',
-            },
-            privateKeyEncoding: {
-                cipher: 'some-cipher',
-                format: 'der',
-                passphrase: 'secret',
-                type: 'pkcs8',
-            },
-        });
-
-        const ecRes: {
-            publicKey: string;
-            privateKey: string;
-        } = crypto.generateKeyPairSync('ec', {
-            namedCurve: 'curve',
-            publicKeyEncoding: {
-                format: 'pem',
-                type: 'pkcs1',
-            },
-            privateKeyEncoding: {
-                cipher: 'some-cipher',
-                format: 'pem',
-                passphrase: 'secret',
-                type: 'pkcs8',
-            },
-        });
-    }
-
-    {
-        crypto.generateKeyPair('rsa', {
-            modulusLength: 123,
-            publicKeyEncoding: {
-                format: 'der',
-                type: 'pkcs1',
-            },
-            privateKeyEncoding: {
-                cipher: 'some-cipher',
-                format: 'pem',
-                passphrase: 'secret',
-                type: 'pkcs8',
-            },
-        }, (err: NodeJS.ErrnoException | null, publicKey: Buffer, privateKey: string) => {});
-
-        crypto.generateKeyPair('dsa', {
-            modulusLength: 123,
-            divisorLength: 123,
-            publicKeyEncoding: {
-                format: 'pem',
-                type: 'spki',
-            },
-            privateKeyEncoding: {
-                cipher: 'some-cipher',
-                format: 'der',
-                passphrase: 'secret',
-                type: 'pkcs8',
-            },
-        }, (err: NodeJS.ErrnoException | null, publicKey: string, privateKey: Buffer) => {});
-
-        crypto.generateKeyPair('ec', {
-            namedCurve: 'curve',
-            publicKeyEncoding: {
-                format: 'pem',
-                type: 'pkcs1',
-            },
-            privateKeyEncoding: {
-                cipher: 'some-cipher',
-                format: 'pem',
-                passphrase: 'secret',
-                type: 'pkcs8',
-            },
-        }, (err: NodeJS.ErrnoException | null, publicKey: string, privateKey: string) => {});
-    }
-
-    {
-        const generateKeyPairPromisified = util.promisify(crypto.generateKeyPair);
-
-        const rsaRes: Promise<{
-            publicKey: Buffer;
-            privateKey: string;
-        }> = generateKeyPairPromisified('rsa', {
-            modulusLength: 123,
-            publicKeyEncoding: {
-                format: 'der',
-                type: 'pkcs1',
-            },
-            privateKeyEncoding: {
-                cipher: 'some-cipher',
-                format: 'pem',
-                passphrase: 'secret',
-                type: 'pkcs8',
-            },
-        });
-
-        const dsaRes: Promise<{
-            publicKey: string;
-            privateKey: Buffer;
-        }> = generateKeyPairPromisified('dsa', {
-            modulusLength: 123,
-            divisorLength: 123,
-            publicKeyEncoding: {
-                format: 'pem',
-                type: 'spki',
-            },
-            privateKeyEncoding: {
-                cipher: 'some-cipher',
-                format: 'der',
-                passphrase: 'secret',
-                type: 'pkcs8',
-            },
-        });
-
-        const ecRes: Promise<{
-            publicKey: string;
-            privateKey: string;
-        }> = generateKeyPairPromisified('ec', {
-            namedCurve: 'curve',
-            publicKeyEncoding: {
-                format: 'pem',
-                type: 'pkcs1',
-            },
-            privateKeyEncoding: {
-                cipher: 'some-cipher',
-                format: 'pem',
-                passphrase: 'secret',
-                type: 'pkcs8',
-            },
-        });
-    }
-}
-
 //////////////////////////////////////////////////
 /// TLS tests : http://nodejs.org/api/tls.html ///
 //////////////////////////////////////////////////
@@ -1683,7 +839,7 @@ async function asyncStreamPipelineFinished() {
     }
 
     {
-        let _server: tls.Server;
+        let _server = tls.createServer({});
         let _boolean: boolean;
         const _func1 = (err: Error, resp: Buffer) => { };
         const _func2 = (err: Error, sessionData: any) => { };
@@ -1827,7 +983,8 @@ async function asyncStreamPipelineFinished() {
     }
 
     {
-        let _TLSSocket: tls.TLSSocket;
+        let _TLSSocket = tls.connect({
+        });
         let _boolean: boolean;
         /**
          * events.EventEmitter
@@ -1868,179 +1025,6 @@ async function asyncStreamPipelineFinished() {
     }
 }
 
-////////////////////////////////////////////////////
-/// Http tests : http://nodejs.org/api/http.html ///
-////////////////////////////////////////////////////
-
-{
-    // http Server
-    {
-        const server: http.Server = new http.Server();
-
-        // test public props
-        const maxHeadersCount: number = server.maxHeadersCount;
-        const timeout: number = server.timeout;
-        const listening: boolean = server.listening;
-        const keepAliveTimeout: number = server.keepAliveTimeout;
-        server.setTimeout().setTimeout(1000).setTimeout(() => {}).setTimeout(100, () => {});
-    }
-
-    // http IncomingMessage
-    // http ServerResponse
-    {
-        // incoming
-        const incoming: http.IncomingMessage = new http.IncomingMessage(new net.Socket());
-
-        incoming.setEncoding('utf8');
-
-        // stream
-        incoming.pause();
-        incoming.resume();
-
-        // response
-        const res: http.ServerResponse = new http.ServerResponse(incoming);
-
-        // test headers
-        res.setHeader('Content-Type', 'text/plain');
-        const bool: boolean = res.hasHeader('Content-Type');
-        const headers: string[] = res.getHeaderNames();
-
-        // trailers
-        res.addTrailers([
-            ['x-fOo', 'xOxOxOx'],
-            ['x-foO', 'OxOxOxO'],
-            ['X-fOo', 'xOxOxOx'],
-            ['X-foO', 'OxOxOxO']
-        ]);
-        res.addTrailers({ 'x-foo': 'bar' });
-
-        // writeHead
-        res.writeHead(200, 'OK\r\nContent-Type: text/html\r\n');
-        res.writeHead(200, { 'Transfer-Encoding': 'chunked' });
-        res.writeHead(200);
-
-        // write string
-        res.write('Part of my res.');
-        // write buffer
-        const chunk = Buffer.alloc(16390, 'Й');
-        res.write(chunk);
-        res.write(chunk, 'hex');
-
-        // end
-        res.end("end msg");
-        // without msg
-        res.end();
-
-        // flush
-        res.flushHeaders();
-    }
-
-    // http ClientRequest
-    {
-        let req: http.ClientRequest = new http.ClientRequest("https://www.google.com");
-        req = new http.ClientRequest(new url.URL("https://www.google.com"));
-        req = new http.ClientRequest({ path: 'http://0.0.0.0' });
-        req = new http.ClientRequest({ setHost: false });
-
-        // header
-        req.setHeader('Content-Type', 'text/plain');
-        const bool: boolean = req.hasHeader('Content-Type');
-        const headers: string[] = req.getHeaderNames();
-        req.removeHeader('Date');
-
-        // write
-        const chunk = Buffer.alloc(16390, 'Й');
-        req.write(chunk);
-        req.write('a');
-        req.end();
-
-        // abort
-        req.abort();
-
-        // connection
-        req.connection.on('pause', () => { });
-
-        // event
-        req.on('data', () => { });
-    }
-
-    {
-        // Status codes
-        let codeMessage: string = http.STATUS_CODES['400'];
-        codeMessage = http.STATUS_CODES[400];
-    }
-
-    {
-        let agent: http.Agent = new http.Agent({
-            keepAlive: true,
-            keepAliveMsecs: 10000,
-            maxSockets: Infinity,
-            maxFreeSockets: 256,
-            timeout: 15000
-        });
-
-        agent = http.globalAgent;
-
-        http.request({ agent: false });
-        http.request({ agent });
-        http.request({ agent: undefined });
-    }
-
-    {
-        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 => {});
-    }
-
-    {
-        // Make sure .listen() and .close() return a Server instance
-        http.createServer().listen(0).close().address();
-        net.createServer().listen(0).close().address();
-    }
-
-    {
-        const request = http.request({ path: 'http://0.0.0.0' });
-        request.once('error', () => { });
-        request.setNoDelay(true);
-        request.abort();
-    }
-
-    // http request options
-    {
-        const requestOpts: http.RequestOptions = {
-            timeout: 30000
-        };
-
-        const clientArgs: http.ClientRequestArgs = {
-            timeout: 30000
-        };
-    }
-
-    // http headers
-    {
-        const headers: http.IncomingHttpHeaders = {
-            'content-type': 'application/json',
-            'set-cookie': [ 'type=ninja', 'language=javascript' ]
-        };
-    }
-}
-
 //////////////////////////////////////////////////////
 /// Https tests : http://nodejs.org/api/https.html ///
 //////////////////////////////////////////////////////
@@ -2090,7 +1074,25 @@ async function asyncStreamPipelineFinished() {
     https.globalAgent.options.ca = [];
 
     {
-        const server = new https.Server();
+        function reqListener(req: http.IncomingMessage, res: http.ServerResponse): void {}
+
+        class MyIncomingMessage extends http.IncomingMessage {
+            foo: number;
+        }
+
+        class MyServerResponse extends http.ServerResponse {
+            foo: string;
+        }
+
+        let server = new https.Server({ IncomingMessage: MyIncomingMessage});
+
+        server = new https.Server({
+            IncomingMessage: MyIncomingMessage,
+            ServerResponse: MyServerResponse
+        }, reqListener);
+
+        server = https.createServer({ IncomingMessage: MyIncomingMessage });
+        server = https.createServer({ ServerResponse: MyServerResponse }, reqListener);
 
         const timeout: number = server.timeout;
         const listening: boolean = server.listening;
@@ -2099,134 +1101,6 @@ async function asyncStreamPipelineFinished() {
     }
 }
 
-////////////////////////////////////////////////////
-/// TTY tests : http://nodejs.org/api/tty.html
-////////////////////////////////////////////////////
-
-{
-    const rs: tty.ReadStream = new tty.ReadStream();
-    const ws: tty.WriteStream = new tty.WriteStream();
-
-    const rsIsRaw: boolean = rs.isRaw;
-    rs.setRawMode(true);
-
-    const wsColumns: number = ws.columns;
-    const wsRows: number = ws.rows;
-
-    const isTTY: boolean = tty.isatty(1);
-}
-
-////////////////////////////////////////////////////
-/// Dgram tests : http://nodejs.org/api/dgram.html
-////////////////////////////////////////////////////
-
-{
-    {
-        let ds: dgram.Socket = dgram.createSocket("udp4", (msg: Buffer, rinfo: dgram.RemoteInfo): void => {
-        });
-        ds.bind();
-        ds.bind(41234);
-        ds.bind(4123, 'localhost');
-        ds.bind(4123, 'localhost', () => { });
-        ds.bind(4123, () => { });
-        ds.bind(() => { });
-        const addr: net.AddressInfo | string = ds.address();
-        ds.send(new Buffer("hello"), 0, 5, 5000, "127.0.0.1", (error: Error, bytes: number): void => {
-        });
-        ds.send(new Buffer("hello"), 5000, "127.0.0.1");
-        ds.setMulticastInterface("127.0.0.1");
-        ds = dgram.createSocket({ type: "udp4", reuseAddr: true, recvBufferSize: 1000, sendBufferSize: 1000, lookup: dns.lookup });
-    }
-
-    {
-        let _socket: dgram.Socket;
-        let _boolean: boolean;
-        const _err: Error = new Error();
-        const _str = '';
-        const _rinfo: net.AddressInfo = {
-            address: 'asd',
-            family: 'asd',
-            port: 1,
-        };
-        /**
-         * events.EventEmitter
-         * 1. close
-         * 2. error
-         * 3. listening
-         * 4. message
-         */
-
-        _socket = _socket.addListener("close", () => { });
-        _socket = _socket.addListener("error", (err) => {
-            const _err: Error = err;
-        });
-        _socket = _socket.addListener("listening", () => { });
-        _socket = _socket.addListener("message", (msg, rinfo) => {
-            const _msg: Buffer = msg;
-            const _rinfo: net.AddressInfo = rinfo;
-        });
-
-        _boolean = _socket.emit("close");
-        _boolean = _socket.emit("error", _err);
-        _boolean = _socket.emit("listening");
-        _boolean = _socket.emit("message", _str, _rinfo);
-
-        _socket = _socket.on("close", () => { });
-        _socket = _socket.on("error", (err) => {
-            const _err: Error = err;
-        });
-        _socket = _socket.on("listening", () => { });
-        _socket = _socket.on("message", (msg, rinfo) => {
-            const _msg: Buffer = msg;
-            const _rinfo: net.AddressInfo = rinfo;
-        });
-
-        _socket = _socket.once("close", () => { });
-        _socket = _socket.once("error", (err) => {
-            const _err: Error = err;
-        });
-        _socket = _socket.once("listening", () => { });
-        _socket = _socket.once("message", (msg, rinfo) => {
-            const _msg: Buffer = msg;
-            const _rinfo: net.AddressInfo = rinfo;
-        });
-
-        _socket = _socket.prependListener("close", () => { });
-        _socket = _socket.prependListener("error", (err) => {
-            const _err: Error = err;
-        });
-        _socket = _socket.prependListener("listening", () => { });
-        _socket = _socket.prependListener("message", (msg, rinfo) => {
-            const _msg: Buffer = msg;
-            const _rinfo: net.AddressInfo = rinfo;
-        });
-
-        _socket = _socket.prependOnceListener("close", () => { });
-        _socket = _socket.prependOnceListener("error", (err) => {
-            const _err: Error = err;
-        });
-        _socket = _socket.prependOnceListener("listening", () => { });
-        _socket = _socket.prependOnceListener("message", (msg, rinfo) => {
-            const _msg: Buffer = msg;
-            const _rinfo: net.AddressInfo = rinfo;
-        });
-    }
-
-    {
-        const ds: dgram.Socket = dgram.createSocket({
-            type: 'udp4',
-            recvBufferSize: 10000,
-            sendBufferSize: 15000
-        });
-
-        let size: number;
-        size = ds.getRecvBufferSize();
-        ds.setRecvBufferSize(size);
-        size = ds.getSendBufferSize();
-        ds.setSendBufferSize(size);
-    }
-}
-
 ////////////////////////////////////////////////////
 /// Querystring tests : https://nodejs.org/api/querystring.html
 ////////////////////////////////////////////////////
@@ -2360,7 +1234,7 @@ async function asyncStreamPipelineFinished() {
     // returns
     //        ['foo', 'bar', 'baz']
 
-    process.env["PATH"]; // $ExpectType string
+    process.env["PATH"]; // $ExpectType string | undefined
 
     path.parse('/home/user/dir/file.txt');
     // returns
@@ -2442,180 +1316,6 @@ async function asyncStreamPipelineFinished() {
     //    'C:\home\user\dir\file.txt'
 }
 
-////////////////////////////////////////////////////
-/// readline tests : https://nodejs.org/api/readline.html
-////////////////////////////////////////////////////
-
-{
-    const rl: readline.ReadLine = readline.createInterface(new stream.Readable());
-
-    {
-        const options: readline.ReadLineOptions = {
-            input: new fs.ReadStream()
-        };
-        const input: NodeJS.ReadableStream = new stream.Readable();
-        const output: NodeJS.WritableStream = new stream.Writable();
-        const completer: readline.Completer = str => [['asd'], 'asd'];
-        const terminal = false;
-
-        let result: readline.ReadLine;
-
-        result = readline.createInterface(options);
-        result = readline.createInterface(input);
-        result = readline.createInterface(input, output);
-        result = readline.createInterface(input, output, completer);
-        result = readline.createInterface(input, output, completer, terminal);
-        result = readline.createInterface({
-            input,
-            completer(str: string): readline.CompleterResult {
-                return [['test'], 'test'];
-            }
-        });
-        result = readline.createInterface({
-            input,
-            completer(str: string, callback: (err: any, result: readline.CompleterResult) => void): any {
-                callback(null, [['test'], 'test']);
-            }
-        });
-    }
-
-    {
-        rl.setPrompt("prompt");
-    }
-
-    {
-        rl.prompt();
-        rl.prompt(true);
-    }
-
-    {
-        rl.question("query", (answer: string) => {});
-    }
-
-    {
-        let result: readline.ReadLine;
-
-        result = rl.pause();
-    }
-
-    {
-        let result: readline.ReadLine;
-
-        result = rl.resume();
-    }
-
-    {
-        rl.close();
-    }
-
-    {
-        const data: string | Buffer = "asd";
-        const key: readline.Key = {};
-
-        rl.write(data);
-        rl.write(null, key);
-    }
-
-    {
-        const strm: NodeJS.WritableStream = new stream.Writable();
-        const x = 1;
-        const y = 1;
-
-        readline.cursorTo(strm, x);
-        readline.cursorTo(strm, x, y);
-    }
-
-    {
-        const strm: NodeJS.ReadableStream = new stream.Readable();
-        const readLineInterface: readline.ReadLine = readline.createInterface(new stream.Readable());
-
-        readline.emitKeypressEvents(strm);
-        readline.emitKeypressEvents(strm, readLineInterface);
-    }
-
-    {
-        const strm: NodeJS.WritableStream = new stream.Writable();
-        const dx: number | string = 1;
-        const dy: number | string = 1;
-
-        readline.moveCursor(strm, dx, dy);
-    }
-
-    {
-        const strm: NodeJS.WritableStream = new stream.Writable();
-        readline.clearLine(strm, 1);
-    }
-
-    {
-        const strm: NodeJS.WritableStream = new stream.Writable();
-
-        readline.clearScreenDown(strm);
-    }
-
-    {
-        let _rl: readline.ReadLine;
-        let _boolean: boolean;
-
-        _rl = _rl.addListener("close", () => { });
-        _rl = _rl.addListener("line", (input) => {
-            const _input: any = input;
-        });
-        _rl = _rl.addListener("pause", () => { });
-        _rl = _rl.addListener("resume", () => { });
-        _rl = _rl.addListener("SIGCONT", () => { });
-        _rl = _rl.addListener("SIGINT", () => { });
-        _rl = _rl.addListener("SIGTSTP", () => { });
-
-        _boolean = _rl.emit("close", () => { });
-        _boolean = _rl.emit("line", () => { });
-        _boolean = _rl.emit("pause", () => { });
-        _boolean = _rl.emit("resume", () => { });
-        _boolean = _rl.emit("SIGCONT", () => { });
-        _boolean = _rl.emit("SIGINT", () => { });
-        _boolean = _rl.emit("SIGTSTP", () => { });
-
-        _rl = _rl.on("close", () => { });
-        _rl = _rl.on("line", (input) => {
-            const _input: any = input;
-        });
-        _rl = _rl.on("pause", () => { });
-        _rl = _rl.on("resume", () => { });
-        _rl = _rl.on("SIGCONT", () => { });
-        _rl = _rl.on("SIGINT", () => { });
-        _rl = _rl.on("SIGTSTP", () => { });
-
-        _rl = _rl.once("close", () => { });
-        _rl = _rl.once("line", (input) => {
-            const _input: any = input;
-        });
-        _rl = _rl.once("pause", () => { });
-        _rl = _rl.once("resume", () => { });
-        _rl = _rl.once("SIGCONT", () => { });
-        _rl = _rl.once("SIGINT", () => { });
-        _rl = _rl.once("SIGTSTP", () => { });
-
-        _rl = _rl.prependListener("close", () => { });
-        _rl = _rl.prependListener("line", (input) => {
-            const _input: any = input;
-        });
-        _rl = _rl.prependListener("pause", () => { });
-        _rl = _rl.prependListener("resume", () => { });
-        _rl = _rl.prependListener("SIGCONT", () => { });
-        _rl = _rl.prependListener("SIGINT", () => { });
-        _rl = _rl.prependListener("SIGTSTP", () => { });
-
-        _rl = _rl.prependOnceListener("close", () => { });
-        _rl = _rl.prependOnceListener("line", (input) => {
-            const _input: any = input;
-        });
-        _rl = _rl.prependOnceListener("pause", () => { });
-        _rl = _rl.prependOnceListener("resume", () => { });
-        _rl = _rl.prependOnceListener("SIGCONT", () => { });
-        _rl = _rl.prependOnceListener("SIGINT", () => { });
-        _rl = _rl.prependOnceListener("SIGTSTP", () => { });
-    }
-}
-
 ////////////////////////////////////////////////////
 /// string_decoder tests : https://nodejs.org/api/string_decoder.html
 ////////////////////////////////////////////////////
@@ -2677,7 +1377,7 @@ async function asyncStreamPipelineFinished() {
     }
 
     {
-        let _cp: childProcess.ChildProcess;
+        let _cp = childProcess.spawn('asd');
         const _socket: net.Socket = net.createConnection(1);
         const _server: net.Server = net.createServer();
         let _boolean: boolean;
@@ -2805,8 +1505,8 @@ async function asyncStreamPipelineFinished() {
             const _err: Error = err;
         });
         _cp = _cp.addListener("exit", (code, signal) => {
-            const _code: number = code;
-            const _signal: string = signal;
+            const _code: number | null = code;
+            const _signal: string | null  = signal;
         });
         _cp = _cp.addListener("message", (message, sendHandle) => {
             const _message: any = message;
@@ -2828,8 +1528,8 @@ async function asyncStreamPipelineFinished() {
             const _err: Error = err;
         });
         _cp = _cp.on("exit", (code, signal) => {
-            const _code: number = code;
-            const _signal: string = signal;
+            const _code: number | null  = code;
+            const _signal: string | null  = signal;
         });
         _cp = _cp.on("message", (message, sendHandle) => {
             const _message: any = message;
@@ -2845,8 +1545,8 @@ async function asyncStreamPipelineFinished() {
             const _err: Error = err;
         });
         _cp = _cp.once("exit", (code, signal) => {
-            const _code: number = code;
-            const _signal: string = signal;
+            const _code: number | null  = code;
+            const _signal: string | null  = signal;
         });
         _cp = _cp.once("message", (message, sendHandle) => {
             const _message: any = message;
@@ -2862,8 +1562,8 @@ async function asyncStreamPipelineFinished() {
             const _err: Error = err;
         });
         _cp = _cp.prependListener("exit", (code, signal) => {
-            const _code: number = code;
-            const _signal: string = signal;
+            const _code: number | null  = code;
+            const _signal: string | null  = signal;
         });
         _cp = _cp.prependListener("message", (message, sendHandle) => {
             const _message: any = message;
@@ -2879,8 +1579,8 @@ async function asyncStreamPipelineFinished() {
             const _err: Error = err;
         });
         _cp = _cp.prependOnceListener("exit", (code, signal) => {
-            const _code: number = code;
-            const _signal: string = signal;
+            const _code: number | null  = code;
+            const _signal: string | null  = signal;
         });
         _cp = _cp.prependOnceListener("message", (message, sendHandle) => {
             const _message: any = message;
@@ -2928,63 +1628,13 @@ async function asyncStreamPipelineFinished() {
         cluster.fork();
         Object.keys(cluster.workers).forEach(key => {
             const worker = cluster.workers[key];
-            if (worker.isDead()) {
+            if (worker && worker.isDead()) {
                 console.log('worker %d is dead', worker.process.pid);
             }
         });
     }
 }
 
-//////////////////////////////////////////////////////////////////////
-/// worker_threads tests: https://nodejs.org/api/worker_threads.html ///
-//////////////////////////////////////////////////////////////////////
-
-{
-    {
-        if (workerThreads.isMainThread) {
-            module.exports = async function parseJSAsync(script: string) {
-                return new Promise((resolve, reject) => {
-                    const worker = new workerThreads.Worker(__filename, {
-                        workerData: script
-                    });
-                    worker.on('message', resolve);
-                    worker.on('error', reject);
-                    worker.on('exit', (code) => {
-                        if (code !== 0)
-                            reject(new Error(`Worker stopped with exit code ${code}`));
-                    });
-                });
-            };
-        } else {
-            const script = workerThreads.workerData;
-            workerThreads.parentPort.postMessage(script);
-        }
-    }
-
-    {
-        const { port1, port2 } = new workerThreads.MessageChannel();
-        port1.on('message', (message) => console.log('received', message));
-        port2.postMessage({ foo: 'bar' });
-    }
-
-    {
-        if (workerThreads.isMainThread) {
-            const worker = new workerThreads.Worker(__filename);
-            const subChannel = new workerThreads.MessageChannel();
-            worker.postMessage({ hereIsYourPort: subChannel.port1 }, [subChannel.port1]);
-            subChannel.port2.on('message', (value) => {
-                console.log('received:', value);
-            });
-        } else {
-            workerThreads.parentPort.once('message', (value) => {
-                assert(value.hereIsYourPort instanceof MessagePort);
-                value.hereIsYourPort.postMessage('the worker is sending this');
-                value.hereIsYourPort.close();
-            });
-        }
-    }
-}
-
 ////////////////////////////////////////////////////
 /// os tests : https://nodejs.org/api/os.html
 ////////////////////////////////////////////////////
@@ -3270,19 +1920,19 @@ async function asyncStreamPipelineFinished() {
     }
     {
         const frames: NodeJS.CallSite[] = [];
-        Error.prepareStackTrace(new Error(), frames);
+        Error.prepareStackTrace!(new Error(), frames);
     }
     {
-        const frame: NodeJS.CallSite = null;
+        const frame: NodeJS.CallSite = null!;
         const frameThis: any = frame.getThis();
-        const typeName: string = frame.getTypeName();
-        const func: Function = frame.getFunction();
-        const funcName: string = frame.getFunctionName();
-        const meth: string = frame.getMethodName();
-        const fname: string = frame.getFileName();
-        const lineno: number = frame.getLineNumber();
-        const colno: number = frame.getColumnNumber();
-        const evalOrigin: string = frame.getEvalOrigin();
+        const typeName: string | null  = frame.getTypeName();
+        const func: Function | undefined  = frame.getFunction();
+        const funcName: string | null = frame.getFunctionName();
+        const meth: string | null  = frame.getMethodName();
+        const fname: string | null  = frame.getFileName();
+        const lineno: number | null  = frame.getLineNumber();
+        const colno: number | null  = frame.getColumnNumber();
+        const evalOrigin: string | undefined  = frame.getEvalOrigin();
         const isTop: boolean = frame.isToplevel();
         const isEval: boolean = frame.isEval();
         const isNative: boolean = frame.isNative();
@@ -3431,306 +2081,13 @@ import * as p from "process";
     }
 }
 
-///////////////////////////////////////////////////
-/// Net Tests : https://nodejs.org/api/net.html ///
-///////////////////////////////////////////////////
-
-{
-    {
-        const connectOpts: net.NetConnectOpts = {
-            allowHalfOpen: true,
-            family: 4,
-            host: "localhost",
-            port: 443,
-            timeout: 10E3
-        };
-        const socket: net.Socket = net.createConnection(connectOpts, (): void => {
-            // nothing
-        });
-    }
-
-    {
-        let server = net.createServer();
-        // Check methods which return server instances by chaining calls
-        server = server.listen(0)
-            .close()
-            .ref()
-            .unref();
-
-        // close has an optional callback function. No callback parameters are
-        // specified, so any callback function is permissible.
-        server = server.close((...args: any[]) => { });
-
-        // test the types of the address object fields
-        const address: net.AddressInfo | string = server.address();
-    }
-
-    {
-        const constructorOpts: net.SocketConstructorOpts = {
-            fd: 1,
-            allowHalfOpen: false,
-            readable: false,
-            writable: false
-        };
-
-        /**
-         * net.Socket - events.EventEmitter
-         *   1. close
-         *   2. connect
-         *   3. data
-         *   4. drain
-         *   5. end
-         *   6. error
-         *   7. lookup
-         *   8. timeout
-         */
-        let _socket: net.Socket = new net.Socket(constructorOpts);
-
-        let bool: boolean;
-        let buffer: Buffer;
-        let error: Error;
-        let str: string;
-        let num: number;
-
-        const ipcConnectOpts: net.IpcSocketConnectOpts = {
-            path: "/"
-        };
-        const tcpConnectOpts: net.TcpSocketConnectOpts = {
-            family: 4,
-            hints: 0,
-            host: "localhost",
-            localAddress: "10.0.0.1",
-            localPort: 1234,
-            lookup: (_hostname: string, _options: dns.LookupOneOptions, _callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void => {
-                // nothing
-            },
-            port: 80
-        };
-        _socket = _socket.connect(ipcConnectOpts);
-        _socket = _socket.connect(ipcConnectOpts, (): void => {});
-        _socket = _socket.connect(tcpConnectOpts);
-        _socket = _socket.connect(tcpConnectOpts, (): void => {});
-        _socket = _socket.connect(80, "localhost");
-        _socket = _socket.connect(80, "localhost", (): void => {});
-        _socket = _socket.connect(80);
-        _socket = _socket.connect(80, (): void => {});
-
-        /// addListener
-
-        _socket = _socket.addListener("close", had_error => {
-            bool = had_error;
-        });
-        _socket = _socket.addListener("connect", () => { });
-        _socket = _socket.addListener("data", data => {
-            buffer = data;
-        });
-        _socket = _socket.addListener("drain", () => { });
-        _socket = _socket.addListener("end", () => { });
-        _socket = _socket.addListener("error", err => {
-            error = err;
-        });
-        _socket = _socket.addListener("lookup", (err, address, family, host) => {
-            error = err;
-
-            if (typeof family === 'string') {
-                str = family;
-            } else if (typeof family === 'number') {
-                num = family;
-            }
-
-            str = host;
-        });
-        _socket = _socket.addListener("timeout", () => { });
-
-        /// emit
-        bool = _socket.emit("close", bool);
-        bool = _socket.emit("connect");
-        bool = _socket.emit("data", buffer);
-        bool = _socket.emit("drain");
-        bool = _socket.emit("end");
-        bool = _socket.emit("error", error);
-        bool = _socket.emit("lookup", error, str, str, str);
-        bool = _socket.emit("lookup", error, str, num, str);
-        bool = _socket.emit("timeout");
-
-        /// on
-        _socket = _socket.on("close", had_error => {
-            bool = had_error;
-        });
-        _socket = _socket.on("connect", () => { });
-        _socket = _socket.on("data", data => {
-            buffer = data;
-        });
-        _socket = _socket.on("drain", () => { });
-        _socket = _socket.on("end", () => { });
-        _socket = _socket.on("error", err => {
-            error = err;
-        });
-        _socket = _socket.on("lookup", (err, address, family, host) => {
-            error = err;
-
-            if (typeof family === 'string') {
-                str = family;
-            } else if (typeof family === 'number') {
-                num = family;
-            }
-
-            str = host;
-        });
-        _socket = _socket.on("timeout", () => { });
-
-        /// once
-        _socket = _socket.once("close", had_error => {
-            bool = had_error;
-        });
-        _socket = _socket.once("connect", () => { });
-        _socket = _socket.once("data", data => {
-            buffer = data;
-        });
-        _socket = _socket.once("drain", () => { });
-        _socket = _socket.once("end", () => { });
-        _socket = _socket.once("error", err => {
-            error = err;
-        });
-        _socket = _socket.once("lookup", (err, address, family, host) => {
-            error = err;
-
-            if (typeof family === 'string') {
-                str = family;
-            } else if (typeof family === 'number') {
-                num = family;
-            }
-
-            str = host;
-        });
-        _socket = _socket.once("timeout", () => { });
-
-        /// prependListener
-        _socket = _socket.prependListener("close", had_error => {
-            bool = had_error;
-        });
-        _socket = _socket.prependListener("connect", () => { });
-        _socket = _socket.prependListener("data", data => {
-            buffer = data;
-        });
-        _socket = _socket.prependListener("drain", () => { });
-        _socket = _socket.prependListener("end", () => { });
-        _socket = _socket.prependListener("error", err => {
-            error = err;
-        });
-        _socket = _socket.prependListener("lookup", (err, address, family, host) => {
-            error = err;
-
-            if (typeof family === 'string') {
-                str = family;
-            } else if (typeof family === 'number') {
-                num = family;
-            }
-
-            str = host;
-        });
-        _socket = _socket.prependListener("timeout", () => { });
-
-        /// prependOnceListener
-        _socket = _socket.prependOnceListener("close", had_error => {
-            bool = had_error;
-        });
-        _socket = _socket.prependOnceListener("connect", () => { });
-        _socket = _socket.prependOnceListener("data", data => {
-            buffer = data;
-        });
-        _socket = _socket.prependOnceListener("drain", () => { });
-        _socket = _socket.prependOnceListener("end", () => { });
-        _socket = _socket.prependOnceListener("error", err => {
-            error = err;
-        });
-        _socket = _socket.prependOnceListener("lookup", (err, address, family, host) => {
-            error = err;
-
-            if (typeof family === 'string') {
-                str = family;
-            } else if (typeof family === 'number') {
-                num = family;
-            }
-
-            str = host;
-        });
-        _socket = _socket.prependOnceListener("timeout", () => { });
-
-        bool = _socket.connecting;
-        bool = _socket.destroyed;
-        _socket.destroy();
-    }
-
-    {
-        /**
-         * net.Server - events.EventEmitter
-         *   1. close
-         *   2. connection
-         *   3. error
-         *   4. listening
-         */
-        let _server: net.Server;
-
-        let _socket: net.Socket;
-        let bool: boolean;
-        let error: Error;
-
-        /// addListener
-        _server = _server.addListener("close", () => { });
-        _server = _server.addListener("connection", socket => {
-            _socket = socket;
-        });
-        _server = _server.addListener("error", err => {
-            error = err;
-        });
-        _server = _server.addListener("listening", () => { });
-
-        /// emit
-        bool = _server.emit("close");
-        bool = _server.emit("connection", _socket);
-        bool = _server.emit("error", error);
-        bool = _server.emit("listening");
-
-        /// once
-        _server = _server.once("close", () => { });
-        _server = _server.once("connection", socket => {
-            _socket = socket;
-        });
-        _server = _server.once("error", err => {
-            error = err;
-        });
-        _server = _server.once("listening", () => { });
-
-        /// prependListener
-        _server = _server.prependListener("close", () => { });
-        _server = _server.prependListener("connection", socket => {
-            _socket = socket;
-        });
-        _server = _server.prependListener("error", err => {
-            error = err;
-        });
-        _server = _server.prependListener("listening", () => { });
-
-        /// prependOnceListener
-        _server = _server.prependOnceListener("close", () => { });
-        _server = _server.prependOnceListener("connection", socket => {
-            _socket = socket;
-        });
-        _server = _server.prependOnceListener("error", err => {
-            error = err;
-        });
-        _server = _server.prependOnceListener("listening", () => { });
-    }
-}
-
 /////////////////////////////////////////////////////
 /// repl Tests : https://nodejs.org/api/repl.html ///
 /////////////////////////////////////////////////////
 
 {
     {
-        let _server: repl.REPLServer;
+        let _server = repl.start();
         let _boolean: boolean;
         const _ctx: vm.Context = {};
 
@@ -4172,6 +2529,11 @@ import * as constants from 'constants';
         const deflate = zlib.deflateSync('test');
         const inflate = zlib.inflateSync(deflate.toString());
     }
+
+    {
+        const gzip = zlib.createGzip();
+        const written: number = gzip.bytesWritten;
+    }
 }
 
 ///////////////////////////////////////////////////////////
@@ -4216,10 +2578,10 @@ import * as constants from 'constants';
 
         http2Session.destroy();
 
-        const alpnProtocol: string = http2Session.alpnProtocol;
-        const destroyed: boolean = http2Session.destroyed;
-        const encrypted: boolean = http2Session.encrypted;
-        const originSet: string[] = http2Session.originSet;
+        const alpnProtocol: string | undefined = http2Session.alpnProtocol;
+        const destroyed: boolean | undefined = http2Session.destroyed;
+        const encrypted: boolean | undefined = http2Session.encrypted;
+        const originSet: string[] | undefined = http2Session.originSet;
         const pendingSettingsAck: boolean = http2Session.pendingSettingsAck;
         let settings: http2.Settings = http2Session.localSettings;
         const closed: boolean = http2Session.closed;
@@ -4325,7 +2687,7 @@ import * as constants from 'constants';
         clientHttp2Stream.on('headers', (headers: http2.IncomingHttpHeaders, flags: number) => {});
         clientHttp2Stream.on('push', (headers: http2.IncomingHttpHeaders, flags: number) => {});
         clientHttp2Stream.on('response', (headers: http2.IncomingHttpHeaders & http2.IncomingHttpStatusHeader, flags: number) => {
-            const s: number = headers[':status'];
+            const s: number = headers[':status']!;
         });
 
         // ServerHttp2Stream
@@ -4387,7 +2749,8 @@ import * as constants from 'constants';
 
     // Public API (except constants)
     {
-        let settings: http2.Settings;
+        let settings: http2.Settings = {
+        };
         const serverOptions: http2.ServerOptions = {
             maxDeflateDynamicTableSize: 0,
             maxReservedRemoteStreams: 0,
@@ -4420,7 +2783,8 @@ import * as constants from 'constants';
 
             // Http2ServerResponse
 
-            let outgoingHeaders: http2.OutgoingHttpHeaders;
+            let outgoingHeaders: http2.OutgoingHttpHeaders = {
+            };
             response.addTrailers(outgoingHeaders);
             socket = response.connection;
             const finished: boolean = response.finished;
@@ -4768,10 +3132,10 @@ import * as constants from 'constants';
         // Known post method
         const parameter: inspector.Runtime.EvaluateParameterType = { expression: '2 + 2' };
         session.post('Runtime.evaluate', parameter,
-            (err: Error, params: inspector.Runtime.EvaluateReturnType) => {});
+            (err: Error | null, params: inspector.Runtime.EvaluateReturnType) => {});
         session.post('Runtime.evaluate', (err: Error, params: inspector.Runtime.EvaluateReturnType) => {
-            const exceptionDetails: inspector.Runtime.ExceptionDetails = params.exceptionDetails;
-            const resultClassName: string = params.result.className;
+            const exceptionDetails: inspector.Runtime.ExceptionDetails = params.exceptionDetails!;
+            const resultClassName: string = params.result.className!;
         });
         session.post('Runtime.evaluate');
 
diff --git a/types/node/os.d.ts b/types/node/os.d.ts
new file mode 100644
index 0000000000..c85d217f91
--- /dev/null
+++ b/types/node/os.d.ts
@@ -0,0 +1,192 @@
+declare module "os" {
+    interface CpuInfo {
+        model: string;
+        speed: number;
+        times: {
+            user: number;
+            nice: number;
+            sys: number;
+            idle: number;
+            irq: number;
+        };
+    }
+
+    interface NetworkInterfaceBase {
+        address: string;
+        netmask: string;
+        mac: string;
+        internal: boolean;
+        cidr: string | null;
+    }
+
+    interface NetworkInterfaceInfoIPv4 extends NetworkInterfaceBase {
+        family: "IPv4";
+    }
+
+    interface NetworkInterfaceInfoIPv6 extends NetworkInterfaceBase {
+        family: "IPv6";
+        scopeid: number;
+    }
+
+    type NetworkInterfaceInfo = NetworkInterfaceInfoIPv4 | NetworkInterfaceInfoIPv6;
+
+    function hostname(): string;
+    function loadavg(): number[];
+    function uptime(): number;
+    function freemem(): number;
+    function totalmem(): number;
+    function cpus(): CpuInfo[];
+    function type(): string;
+    function release(): string;
+    function networkInterfaces(): { [index: string]: NetworkInterfaceInfo[] };
+    function homedir(): string;
+    function userInfo(options?: { encoding: string }): { username: string, uid: number, gid: number, shell: any, homedir: string };
+    const constants: {
+        UV_UDP_REUSEADDR: number;
+        signals: {
+            SIGHUP: number;
+            SIGINT: number;
+            SIGQUIT: number;
+            SIGILL: number;
+            SIGTRAP: number;
+            SIGABRT: number;
+            SIGIOT: number;
+            SIGBUS: number;
+            SIGFPE: number;
+            SIGKILL: number;
+            SIGUSR1: number;
+            SIGSEGV: number;
+            SIGUSR2: number;
+            SIGPIPE: number;
+            SIGALRM: number;
+            SIGTERM: number;
+            SIGCHLD: number;
+            SIGSTKFLT: number;
+            SIGCONT: number;
+            SIGSTOP: number;
+            SIGTSTP: number;
+            SIGTTIN: number;
+            SIGTTOU: number;
+            SIGURG: number;
+            SIGXCPU: number;
+            SIGXFSZ: number;
+            SIGVTALRM: number;
+            SIGPROF: number;
+            SIGWINCH: number;
+            SIGIO: number;
+            SIGPOLL: number;
+            SIGPWR: number;
+            SIGSYS: number;
+            SIGUNUSED: number;
+        };
+        errno: {
+            E2BIG: number;
+            EACCES: number;
+            EADDRINUSE: number;
+            EADDRNOTAVAIL: number;
+            EAFNOSUPPORT: number;
+            EAGAIN: number;
+            EALREADY: number;
+            EBADF: number;
+            EBADMSG: number;
+            EBUSY: number;
+            ECANCELED: number;
+            ECHILD: number;
+            ECONNABORTED: number;
+            ECONNREFUSED: number;
+            ECONNRESET: number;
+            EDEADLK: number;
+            EDESTADDRREQ: number;
+            EDOM: number;
+            EDQUOT: number;
+            EEXIST: number;
+            EFAULT: number;
+            EFBIG: number;
+            EHOSTUNREACH: number;
+            EIDRM: number;
+            EILSEQ: number;
+            EINPROGRESS: number;
+            EINTR: number;
+            EINVAL: number;
+            EIO: number;
+            EISCONN: number;
+            EISDIR: number;
+            ELOOP: number;
+            EMFILE: number;
+            EMLINK: number;
+            EMSGSIZE: number;
+            EMULTIHOP: number;
+            ENAMETOOLONG: number;
+            ENETDOWN: number;
+            ENETRESET: number;
+            ENETUNREACH: number;
+            ENFILE: number;
+            ENOBUFS: number;
+            ENODATA: number;
+            ENODEV: number;
+            ENOENT: number;
+            ENOEXEC: number;
+            ENOLCK: number;
+            ENOLINK: number;
+            ENOMEM: number;
+            ENOMSG: number;
+            ENOPROTOOPT: number;
+            ENOSPC: number;
+            ENOSR: number;
+            ENOSTR: number;
+            ENOSYS: number;
+            ENOTCONN: number;
+            ENOTDIR: number;
+            ENOTEMPTY: number;
+            ENOTSOCK: number;
+            ENOTSUP: number;
+            ENOTTY: number;
+            ENXIO: number;
+            EOPNOTSUPP: number;
+            EOVERFLOW: number;
+            EPERM: number;
+            EPIPE: number;
+            EPROTO: number;
+            EPROTONOSUPPORT: number;
+            EPROTOTYPE: number;
+            ERANGE: number;
+            EROFS: number;
+            ESPIPE: number;
+            ESRCH: number;
+            ESTALE: number;
+            ETIME: number;
+            ETIMEDOUT: number;
+            ETXTBSY: number;
+            EWOULDBLOCK: number;
+            EXDEV: number;
+        };
+        priority: {
+            PRIORITY_LOW: number;
+            PRIORITY_BELOW_NORMAL: number;
+            PRIORITY_NORMAL: number;
+            PRIORITY_ABOVE_NORMAL: number;
+            PRIORITY_HIGH: number;
+            PRIORITY_HIGHEST: number;
+        }
+    };
+    function arch(): string;
+    function platform(): NodeJS.Platform;
+    function tmpdir(): string;
+    const EOL: string;
+    function endianness(): "BE" | "LE";
+    /**
+     * Gets the priority of a process.
+     * Defaults to current process.
+     */
+    function getPriority(pid?: number): number;
+    /**
+     * Sets the priority of the current process.
+     * @param priority Must be in range of -20 to 19
+     */
+    function setPriority(priority: number): void;
+    /**
+     * Sets the priority of the process specified process.
+     * @param priority Must be in range of -20 to 19
+     */
+    function setPriority(pid: number, priority: number): void;
+}
diff --git a/types/node/package.json b/types/node/package.json
new file mode 100644
index 0000000000..c1f0c68752
--- /dev/null
+++ b/types/node/package.json
@@ -0,0 +1,11 @@
+{
+    "private": true,
+    "types": "index",
+    "typesVersions": {
+        ">=3.1.0-0": {
+            "*": [
+                "ts3.1/*"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/types/node/path.d.ts b/types/node/path.d.ts
new file mode 100644
index 0000000000..bbc17098f4
--- /dev/null
+++ b/types/node/path.d.ts
@@ -0,0 +1,159 @@
+declare module "path" {
+    /**
+     * A parsed path object generated by path.parse() or consumed by path.format().
+     */
+    interface ParsedPath {
+        /**
+         * The root of the path such as '/' or 'c:\'
+         */
+        root: string;
+        /**
+         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
+         */
+        dir: string;
+        /**
+         * The file name including extension (if any) such as 'index.html'
+         */
+        base: string;
+        /**
+         * The file extension (if any) such as '.html'
+         */
+        ext: string;
+        /**
+         * The file name without extension (if any) such as 'index'
+         */
+        name: string;
+    }
+    interface FormatInputPathObject {
+        /**
+         * The root of the path such as '/' or 'c:\'
+         */
+        root?: string;
+        /**
+         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
+         */
+        dir?: string;
+        /**
+         * The file name including extension (if any) such as 'index.html'
+         */
+        base?: string;
+        /**
+         * The file extension (if any) such as '.html'
+         */
+        ext?: string;
+        /**
+         * The file name without extension (if any) such as 'index'
+         */
+        name?: string;
+    }
+
+    /**
+     * Normalize a string path, reducing '..' and '.' parts.
+     * When multiple slashes are found, they're replaced by a single one; when the path contains a trailing slash, it is preserved. On Windows backslashes are used.
+     *
+     * @param p string path to normalize.
+     */
+    function normalize(p: string): string;
+    /**
+     * Join all arguments together and normalize the resulting path.
+     * Arguments must be strings. In v0.8, non-string arguments were silently ignored. In v0.10 and up, an exception is thrown.
+     *
+     * @param paths paths to join.
+     */
+    function join(...paths: string[]): string;
+    /**
+     * The right-most parameter is considered {to}.  Other parameters are considered an array of {from}.
+     *
+     * Starting from leftmost {from} parameter, resolves {to} to an absolute path.
+     *
+     * If {to} isn't already absolute, {from} arguments are prepended in right to left order,
+     * until an absolute path is found. If after using all {from} paths still no absolute path is found,
+     * the current working directory is used as well. The resulting path is normalized,
+     * and trailing slashes are removed unless the path gets resolved to the root directory.
+     *
+     * @param pathSegments string paths to join.  Non-string arguments are ignored.
+     */
+    function resolve(...pathSegments: string[]): string;
+    /**
+     * Determines whether {path} is an absolute path. An absolute path will always resolve to the same location, regardless of the working directory.
+     *
+     * @param path path to test.
+     */
+    function isAbsolute(path: string): boolean;
+    /**
+     * Solve the relative path from {from} to {to}.
+     * At times we have two absolute paths, and we need to derive the relative path from one to the other. This is actually the reverse transform of path.resolve.
+     */
+    function relative(from: string, to: string): string;
+    /**
+     * Return the directory name of a path. Similar to the Unix dirname command.
+     *
+     * @param p the path to evaluate.
+     */
+    function dirname(p: string): string;
+    /**
+     * Return the last portion of a path. Similar to the Unix basename command.
+     * Often used to extract the file name from a fully qualified path.
+     *
+     * @param p the path to evaluate.
+     * @param ext optionally, an extension to remove from the result.
+     */
+    function basename(p: string, ext?: string): string;
+    /**
+     * Return the extension of the path, from the last '.' to end of string in the last portion of the path.
+     * If there is no '.' in the last portion of the path or the first character of it is '.', then it returns an empty string
+     *
+     * @param p the path to evaluate.
+     */
+    function extname(p: string): string;
+    /**
+     * The platform-specific file separator. '\\' or '/'.
+     */
+    const sep: '\\' | '/';
+    /**
+     * The platform-specific file delimiter. ';' or ':'.
+     */
+    const delimiter: ';' | ':';
+    /**
+     * Returns an object from a path string - the opposite of format().
+     *
+     * @param pathString path to evaluate.
+     */
+    function parse(pathString: string): ParsedPath;
+    /**
+     * Returns a path string from an object - the opposite of parse().
+     *
+     * @param pathString path to evaluate.
+     */
+    function format(pathObject: FormatInputPathObject): string;
+
+    namespace posix {
+        function normalize(p: string): string;
+        function join(...paths: any[]): string;
+        function resolve(...pathSegments: any[]): string;
+        function isAbsolute(p: string): boolean;
+        function relative(from: string, to: string): string;
+        function dirname(p: string): string;
+        function basename(p: string, ext?: string): string;
+        function extname(p: string): string;
+        const sep: string;
+        const delimiter: string;
+        function parse(p: string): ParsedPath;
+        function format(pP: FormatInputPathObject): string;
+    }
+
+    namespace win32 {
+        function normalize(p: string): string;
+        function join(...paths: any[]): string;
+        function resolve(...pathSegments: any[]): string;
+        function isAbsolute(p: string): boolean;
+        function relative(from: string, to: string): string;
+        function dirname(p: string): string;
+        function basename(p: string, ext?: string): string;
+        function extname(p: string): string;
+        const sep: string;
+        const delimiter: string;
+        function parse(p: string): ParsedPath;
+        function format(pP: FormatInputPathObject): string;
+    }
+}
diff --git a/types/node/perf_hooks.d.ts b/types/node/perf_hooks.d.ts
new file mode 100644
index 0000000000..4f68895ce6
--- /dev/null
+++ b/types/node/perf_hooks.d.ts
@@ -0,0 +1,241 @@
+declare module "perf_hooks" {
+    import { AsyncResource } from "async_hooks";
+
+    interface PerformanceEntry {
+        /**
+         * The total number of milliseconds elapsed for this entry.
+         * This value will not be meaningful for all Performance Entry types.
+         */
+        readonly duration: number;
+
+        /**
+         * The name of the performance entry.
+         */
+        readonly name: string;
+
+        /**
+         * The high resolution millisecond timestamp marking the starting time of the Performance Entry.
+         */
+        readonly startTime: number;
+
+        /**
+         * The type of the performance entry.
+         * Currently it may be one of: 'node', 'mark', 'measure', 'gc', or 'function'.
+         */
+        readonly entryType: string;
+
+        /**
+         * When performanceEntry.entryType is equal to 'gc', the performance.kind property identifies
+         * the type of garbage collection operation that occurred.
+         * The value may be one of perf_hooks.constants.
+         */
+        readonly kind?: number;
+    }
+
+    interface PerformanceNodeTiming extends PerformanceEntry {
+        /**
+         * The high resolution millisecond timestamp at which the Node.js process completed bootstrap.
+         */
+        readonly bootstrapComplete: number;
+
+        /**
+         * The high resolution millisecond timestamp at which cluster processing ended.
+         */
+        readonly clusterSetupEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which cluster processing started.
+         */
+        readonly clusterSetupStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the Node.js event loop exited.
+         */
+        readonly loopExit: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the Node.js event loop started.
+         */
+        readonly loopStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which main module load ended.
+         */
+        readonly moduleLoadEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which main module load started.
+         */
+        readonly moduleLoadStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the Node.js process was initialized.
+         */
+        readonly nodeStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which preload module load ended.
+         */
+        readonly preloadModuleLoadEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which preload module load started.
+         */
+        readonly preloadModuleLoadStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which third_party_main processing ended.
+         */
+        readonly thirdPartyMainEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which third_party_main processing started.
+         */
+        readonly thirdPartyMainStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the V8 platform was initialized.
+         */
+        readonly v8Start: number;
+    }
+
+    interface Performance {
+        /**
+         * If name is not provided, removes all PerformanceFunction objects from the Performance Timeline.
+         * If name is provided, removes entries with name.
+         * @param name
+         */
+        clearFunctions(name?: string): void;
+
+        /**
+         * If name is not provided, removes all PerformanceMark objects from the Performance Timeline.
+         * If name is provided, removes only the named mark.
+         * @param name
+         */
+        clearMarks(name?: string): void;
+
+        /**
+         * If name is not provided, removes all PerformanceMeasure objects from the Performance Timeline.
+         * If name is provided, removes only objects whose performanceEntry.name matches name.
+         */
+        clearMeasures(name?: string): void;
+
+        /**
+         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime.
+         * @return list of all PerformanceEntry objects
+         */
+        getEntries(): PerformanceEntry[];
+
+        /**
+         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.name is equal to name, and optionally, whose performanceEntry.entryType is equal to type.
+         * @param name
+         * @param type
+         * @return list of all PerformanceEntry objects
+         */
+        getEntriesByName(name: string, type?: string): PerformanceEntry[];
+
+        /**
+         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.entryType is equal to type.
+         * @param type
+         * @return list of all PerformanceEntry objects
+         */
+        getEntriesByType(type: string): PerformanceEntry[];
+
+        /**
+         * Creates a new PerformanceMark entry in the Performance Timeline.
+         * A PerformanceMark is a subclass of PerformanceEntry whose performanceEntry.entryType is always 'mark',
+         * and whose performanceEntry.duration is always 0.
+         * Performance marks are used to mark specific significant moments in the Performance Timeline.
+         * @param name
+         */
+        mark(name?: string): void;
+
+        /**
+         * Creates a new PerformanceMeasure entry in the Performance Timeline.
+         * A PerformanceMeasure is a subclass of PerformanceEntry whose performanceEntry.entryType is always 'measure',
+         * and whose performanceEntry.duration measures the number of milliseconds elapsed since startMark and endMark.
+         *
+         * The startMark argument may identify any existing PerformanceMark in the the Performance Timeline, or may identify
+         * any of the timestamp properties provided by the PerformanceNodeTiming class. If the named startMark does not exist,
+         * then startMark is set to timeOrigin by default.
+         *
+         * The endMark argument must identify any existing PerformanceMark in the the Performance Timeline or any of the timestamp
+         * properties provided by the PerformanceNodeTiming class. If the named endMark does not exist, an error will be thrown.
+         * @param name
+         * @param startMark
+         * @param endMark
+         */
+        measure(name: string, startMark: string, endMark: string): void;
+
+        /**
+         * An instance of the PerformanceNodeTiming class that provides performance metrics for specific Node.js operational milestones.
+         */
+        readonly nodeTiming: PerformanceNodeTiming;
+
+        /**
+         * @return the current high resolution millisecond timestamp
+         */
+        now(): number;
+
+        /**
+         * The timeOrigin specifies the high resolution millisecond timestamp from which all performance metric durations are measured.
+         */
+        readonly timeOrigin: number;
+
+        /**
+         * Wraps a function within a new function that measures the running time of the wrapped function.
+         * A PerformanceObserver must be subscribed to the 'function' event type in order for the timing details to be accessed.
+         * @param fn
+         */
+        timerify<T extends (...optionalParams: any[]) => any>(fn: T): T;
+    }
+
+    interface PerformanceObserverEntryList {
+        /**
+         * @return a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime.
+         */
+        getEntries(): PerformanceEntry[];
+
+        /**
+         * @return a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.name is equal to name, and optionally, whose performanceEntry.entryType is equal to type.
+         */
+        getEntriesByName(name: string, type?: string): PerformanceEntry[];
+
+        /**
+         * @return Returns a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.entryType is equal to type.
+         */
+        getEntriesByType(type: string): PerformanceEntry[];
+    }
+
+    type PerformanceObserverCallback = (list: PerformanceObserverEntryList, observer: PerformanceObserver) => void;
+
+    class PerformanceObserver extends AsyncResource {
+        constructor(callback: PerformanceObserverCallback);
+
+        /**
+         * Disconnects the PerformanceObserver instance from all notifications.
+         */
+        disconnect(): void;
+
+        /**
+         * Subscribes the PerformanceObserver instance to notifications of new PerformanceEntry instances identified by options.entryTypes.
+         * When options.buffered is false, the callback will be invoked once for every PerformanceEntry instance.
+         * Property buffered defaults to false.
+         * @param options
+         */
+        observe(options: { entryTypes: string[], buffered?: boolean }): void;
+    }
+
+    namespace constants {
+        const NODE_PERFORMANCE_GC_MAJOR: number;
+        const NODE_PERFORMANCE_GC_MINOR: number;
+        const NODE_PERFORMANCE_GC_INCREMENTAL: number;
+        const NODE_PERFORMANCE_GC_WEAKCB: number;
+    }
+
+    const performance: Performance;
+}
diff --git a/types/node/process.d.ts b/types/node/process.d.ts
new file mode 100644
index 0000000000..ccd5c9c198
--- /dev/null
+++ b/types/node/process.d.ts
@@ -0,0 +1,3 @@
+declare module "process" {
+    export = process;
+}
diff --git a/types/node/punycode.d.ts b/types/node/punycode.d.ts
new file mode 100644
index 0000000000..efc55622f1
--- /dev/null
+++ b/types/node/punycode.d.ts
@@ -0,0 +1,12 @@
+declare module "punycode" {
+    function decode(string: string): string;
+    function encode(string: string): string;
+    function toUnicode(domain: string): string;
+    function toASCII(domain: string): string;
+    const ucs2: ucs2;
+    interface ucs2 {
+        decode(string: string): number[];
+        encode(codePoints: number[]): string;
+    }
+    const version: any;
+}
diff --git a/types/node/querystring.d.ts b/types/node/querystring.d.ts
new file mode 100644
index 0000000000..f54d352c6c
--- /dev/null
+++ b/types/node/querystring.d.ts
@@ -0,0 +1,17 @@
+declare module "querystring" {
+    interface StringifyOptions {
+        encodeURIComponent?: Function;
+    }
+
+    interface ParseOptions {
+        maxKeys?: number;
+        decodeURIComponent?: Function;
+    }
+
+    interface ParsedUrlQuery { [key: string]: string | string[]; }
+
+    function stringify(obj?: {}, sep?: string, eq?: string, options?: StringifyOptions): string;
+    function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): ParsedUrlQuery;
+    function escape(str: string): string;
+    function unescape(str: string): string;
+}
diff --git a/types/node/readline.d.ts b/types/node/readline.d.ts
new file mode 100644
index 0000000000..011cf7ad64
--- /dev/null
+++ b/types/node/readline.d.ts
@@ -0,0 +1,136 @@
+declare module "readline" {
+    import * as events from "events";
+    import * as stream from "stream";
+
+    interface Key {
+        sequence?: string;
+        name?: string;
+        ctrl?: boolean;
+        meta?: boolean;
+        shift?: boolean;
+    }
+
+    class Interface extends events.EventEmitter {
+        readonly terminal: boolean;
+
+        /**
+         * NOTE: According to the documentation:
+         *
+         * > Instances of the `readline.Interface` class are constructed using the
+         * > `readline.createInterface()` method.
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/readline.html#readline_class_interface
+         */
+        protected constructor(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean);
+        /**
+         * NOTE: According to the documentation:
+         *
+         * > Instances of the `readline.Interface` class are constructed using the
+         * > `readline.createInterface()` method.
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/readline.html#readline_class_interface
+         */
+        protected constructor(options: ReadLineOptions);
+
+        setPrompt(prompt: string): void;
+        prompt(preserveCursor?: boolean): void;
+        question(query: string, callback: (answer: string) => void): void;
+        pause(): this;
+        resume(): this;
+        close(): void;
+        write(data: string | Buffer, key?: Key): void;
+
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. line
+         * 3. pause
+         * 4. resume
+         * 5. SIGCONT
+         * 6. SIGINT
+         * 7. SIGTSTP
+         */
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "line", listener: (input: string) => void): this;
+        addListener(event: "pause", listener: () => void): this;
+        addListener(event: "resume", listener: () => void): this;
+        addListener(event: "SIGCONT", listener: () => void): this;
+        addListener(event: "SIGINT", listener: () => void): this;
+        addListener(event: "SIGTSTP", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "line", input: string): boolean;
+        emit(event: "pause"): boolean;
+        emit(event: "resume"): boolean;
+        emit(event: "SIGCONT"): boolean;
+        emit(event: "SIGINT"): boolean;
+        emit(event: "SIGTSTP"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "line", listener: (input: string) => void): this;
+        on(event: "pause", listener: () => void): this;
+        on(event: "resume", listener: () => void): this;
+        on(event: "SIGCONT", listener: () => void): this;
+        on(event: "SIGINT", listener: () => void): this;
+        on(event: "SIGTSTP", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "line", listener: (input: string) => void): this;
+        once(event: "pause", listener: () => void): this;
+        once(event: "resume", listener: () => void): this;
+        once(event: "SIGCONT", listener: () => void): this;
+        once(event: "SIGINT", listener: () => void): this;
+        once(event: "SIGTSTP", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "line", listener: (input: string) => void): this;
+        prependListener(event: "pause", listener: () => void): this;
+        prependListener(event: "resume", listener: () => void): this;
+        prependListener(event: "SIGCONT", listener: () => void): this;
+        prependListener(event: "SIGINT", listener: () => void): this;
+        prependListener(event: "SIGTSTP", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "line", listener: (input: string) => void): this;
+        prependOnceListener(event: "pause", listener: () => void): this;
+        prependOnceListener(event: "resume", listener: () => void): this;
+        prependOnceListener(event: "SIGCONT", listener: () => void): this;
+        prependOnceListener(event: "SIGINT", listener: () => void): this;
+        prependOnceListener(event: "SIGTSTP", listener: () => void): this;
+        [Symbol.asyncIterator](): AsyncIterableIterator<string>;
+    }
+
+    type ReadLine = Interface; // type forwarded for backwards compatiblity
+
+    type Completer = (line: string) => CompleterResult;
+    type AsyncCompleter = (line: string, callback: (err: any, result: CompleterResult) => void) => any;
+
+    type CompleterResult = [string[], string];
+
+    interface ReadLineOptions {
+        input: NodeJS.ReadableStream;
+        output?: NodeJS.WritableStream;
+        completer?: Completer | AsyncCompleter;
+        terminal?: boolean;
+        historySize?: number;
+        prompt?: string;
+        crlfDelay?: number;
+        removeHistoryDuplicates?: boolean;
+    }
+
+    function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean): Interface;
+    function createInterface(options: ReadLineOptions): Interface;
+
+    function cursorTo(stream: NodeJS.WritableStream, x: number, y?: number): void;
+    function emitKeypressEvents(stream: NodeJS.ReadableStream, interface?: Interface): void;
+    function moveCursor(stream: NodeJS.WritableStream, dx: number | string, dy: number | string): void;
+    function clearLine(stream: NodeJS.WritableStream, dir: number): void;
+    function clearScreenDown(stream: NodeJS.WritableStream): void;
+}
diff --git a/types/node/repl.d.ts b/types/node/repl.d.ts
new file mode 100644
index 0000000000..cb5a3d037b
--- /dev/null
+++ b/types/node/repl.d.ts
@@ -0,0 +1,372 @@
+declare module "repl" {
+    import { Interface, Completer, AsyncCompleter } from "readline";
+    import { Context } from "vm";
+    import { InspectOptions } from "util";
+
+    interface ReplOptions {
+        /**
+         * The input prompt to display.
+         * Default: `"> "`
+         */
+        prompt?: string;
+        /**
+         * The `Readable` stream from which REPL input will be read.
+         * Default: `process.stdin`
+         */
+        input?: NodeJS.ReadableStream;
+        /**
+         * The `Writable` stream to which REPL output will be written.
+         * Default: `process.stdout`
+         */
+        output?: NodeJS.WritableStream;
+        /**
+         * If `true`, specifies that the output should be treated as a TTY terminal, and have
+         * ANSI/VT100 escape codes written to it.
+         * Default: checking the value of the `isTTY` property on the output stream upon
+         * instantiation.
+         */
+        terminal?: boolean;
+        /**
+         * The function to be used when evaluating each given line of input.
+         * Default: an async wrapper for the JavaScript `eval()` function. An `eval` function can
+         * error with `repl.Recoverable` to indicate the input was incomplete and prompt for
+         * additional lines.
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_default_evaluation
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_custom_evaluation_functions
+         */
+        eval?: REPLEval;
+        /**
+         * If `true`, specifies that the default `writer` function should include ANSI color
+         * styling to REPL output. If a custom `writer` function is provided then this has no
+         * effect.
+         * Default: the REPL instance's `terminal` value.
+         */
+        useColors?: boolean;
+        /**
+         * If `true`, specifies that the default evaluation function will use the JavaScript
+         * `global` as the context as opposed to creating a new separate context for the REPL
+         * instance. The node CLI REPL sets this value to `true`.
+         * Default: `false`.
+         */
+        useGlobal?: boolean;
+        /**
+         * If `true`, specifies that the default writer will not output the return value of a
+         * command if it evaluates to `undefined`.
+         * Default: `false`.
+         */
+        ignoreUndefined?: boolean;
+        /**
+         * The function to invoke to format the output of each command before writing to `output`.
+         * Default: a wrapper for `util.inspect`.
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_customizing_repl_output
+         */
+        writer?: REPLWriter;
+        /**
+         * An optional function used for custom Tab auto completion.
+         *
+         * @see https://nodejs.org/dist/latest-v11.x/docs/api/readline.html#readline_use_of_the_completer_function
+         */
+        completer?: Completer | AsyncCompleter;
+        /**
+         * A flag that specifies whether the default evaluator executes all JavaScript commands in
+         * strict mode or default (sloppy) mode.
+         * Accepted values are:
+         * - `repl.REPL_MODE_SLOPPY` - evaluates expressions in sloppy mode.
+         * - `repl.REPL_MODE_STRICT` - evaluates expressions in strict mode. This is equivalent to
+         *   prefacing every repl statement with `'use strict'`.
+         */
+        replMode?: typeof REPL_MODE_SLOPPY | typeof REPL_MODE_STRICT;
+        /**
+         * Stop evaluating the current piece of code when `SIGINT` is received, i.e. `Ctrl+C` is
+         * pressed. This cannot be used together with a custom `eval` function.
+         * Default: `false`.
+         */
+        breakEvalOnSigint?: boolean;
+    }
+
+    type REPLEval = (this: REPLServer, evalCmd: string, context: Context, file: string, cb: (err: Error | null, result: any) => void) => void;
+    type REPLWriter = (this: REPLServer, obj: any) => string;
+
+    /**
+     * This is the default "writer" value, if none is passed in the REPL options,
+     * and it can be overridden by custom print functions.
+     */
+    const writer: REPLWriter & { options: InspectOptions };
+
+    type REPLCommandAction = (this: REPLServer, text: string) => void;
+
+    interface REPLCommand {
+        /**
+         * Help text to be displayed when `.help` is entered.
+         */
+        help?: string;
+        /**
+         * The function to execute, optionally accepting a single string argument.
+         */
+        action: REPLCommandAction;
+    }
+
+    /**
+     * Provides a customizable Read-Eval-Print-Loop (REPL).
+     *
+     * Instances of `repl.REPLServer` will accept individual lines of user input, evaluate those
+     * according to a user-defined evaluation function, then output the result. Input and output
+     * may be from `stdin` and `stdout`, respectively, or may be connected to any Node.js `stream`.
+     *
+     * Instances of `repl.REPLServer` support automatic completion of inputs, simplistic Emacs-style
+     * line editing, multi-line inputs, ANSI-styled output, saving and restoring current REPL session
+     * state, error recovery, and customizable evaluation functions.
+     *
+     * Instances of `repl.REPLServer` are created using the `repl.start()` method and _should not_
+     * be created directly using the JavaScript `new` keyword.
+     *
+     * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_repl
+     */
+    class REPLServer extends Interface {
+        /**
+         * The `vm.Context` provided to the `eval` function to be used for JavaScript
+         * evaluation.
+         */
+        readonly context: Context;
+        /**
+         * The `Readable` stream from which REPL input will be read.
+         */
+        readonly inputStream: NodeJS.ReadableStream;
+        /**
+         * The `Writable` stream to which REPL output will be written.
+         */
+        readonly outputStream: NodeJS.WritableStream;
+        /**
+         * The commands registered via `replServer.defineCommand()`.
+         */
+        readonly commands: { readonly [name: string]: REPLCommand | undefined };
+        /**
+         * A value indicating whether the REPL is currently in "editor mode".
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_commands_and_special_keys
+         */
+        readonly editorMode: boolean;
+        /**
+         * A value indicating whether the `_` variable has been assigned.
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_assignment_of_the_underscore_variable
+         */
+        readonly underscoreAssigned: boolean;
+        /**
+         * The last evaluation result from the REPL (assigned to the `_` variable inside of the REPL).
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_assignment_of_the_underscore_variable
+         */
+        readonly last: any;
+        /**
+         * A value indicating whether the `_error` variable has been assigned.
+         *
+         * @since v9.8.0
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_assignment_of_the_underscore_variable
+         */
+        readonly underscoreErrAssigned: boolean;
+        /**
+         * The last error raised inside the REPL (assigned to the `_error` variable inside of the REPL).
+         *
+         * @since v9.8.0
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_assignment_of_the_underscore_variable
+         */
+        readonly lastError: any;
+        /**
+         * Specified in the REPL options, this is the function to be used when evaluating each
+         * given line of input. If not specified in the REPL options, this is an async wrapper
+         * for the JavaScript `eval()` function.
+         */
+        readonly eval: REPLEval;
+        /**
+         * Specified in the REPL options, this is a value indicating whether the default
+         * `writer` function should include ANSI color styling to REPL output.
+         */
+        readonly useColors: boolean;
+        /**
+         * Specified in the REPL options, this is a value indicating whether the default `eval`
+         * function will use the JavaScript `global` as the context as opposed to creating a new
+         * separate context for the REPL instance.
+         */
+        readonly useGlobal: boolean;
+        /**
+         * Specified in the REPL options, this is a value indicating whether the default `writer`
+         * function should output the result of a command if it evaluates to `undefined`.
+         */
+        readonly ignoreUndefined: boolean;
+        /**
+         * Specified in the REPL options, this is the function to invoke to format the output of
+         * each command before writing to `outputStream`. If not specified in the REPL options,
+         * this will be a wrapper for `util.inspect`.
+         */
+        readonly writer: REPLWriter;
+        /**
+         * Specified in the REPL options, this is the function to use for custom Tab auto-completion.
+         */
+        readonly completer: Completer | AsyncCompleter;
+        /**
+         * Specified in the REPL options, this is a flag that specifies whether the default `eval`
+         * function should execute all JavaScript commands in strict mode or default (sloppy) mode.
+         * Possible values are:
+         * - `repl.REPL_MODE_SLOPPY` - evaluates expressions in sloppy mode.
+         * - `repl.REPL_MODE_STRICT` - evaluates expressions in strict mode. This is equivalent to
+         *    prefacing every repl statement with `'use strict'`.
+         */
+        readonly replMode: typeof REPL_MODE_SLOPPY | typeof REPL_MODE_STRICT;
+
+        /**
+         * NOTE: According to the documentation:
+         *
+         * > Instances of `repl.REPLServer` are created using the `repl.start()` method and
+         * > _should not_ be created directly using the JavaScript `new` keyword.
+         *
+         * `REPLServer` cannot be subclassed due to implementation specifics in NodeJS.
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_class_replserver
+         */
+        private constructor();
+
+        /**
+         * Used to add new `.`-prefixed commands to the REPL instance. Such commands are invoked
+         * by typing a `.` followed by the `keyword`.
+         *
+         * @param keyword The command keyword (_without_ a leading `.` character).
+         * @param cmd The function to invoke when the command is processed.
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_replserver_definecommand_keyword_cmd
+         */
+        defineCommand(keyword: string, cmd: REPLCommandAction | REPLCommand): void;
+        /**
+         * Readies the REPL instance for input from the user, printing the configured `prompt` to a
+         * new line in the `output` and resuming the `input` to accept new input.
+         *
+         * When multi-line input is being entered, an ellipsis is printed rather than the 'prompt'.
+         *
+         * This method is primarily intended to be called from within the action function for
+         * commands registered using the `replServer.defineCommand()` method.
+         *
+         * @param preserveCursor When `true`, the cursor placement will not be reset to `0`.
+         */
+        displayPrompt(preserveCursor?: boolean): void;
+        /**
+         * Clears any command that has been buffered but not yet executed.
+         *
+         * This method is primarily intended to be called from within the action function for
+         * commands registered using the `replServer.defineCommand()` method.
+         *
+         * @since v9.0.0
+         */
+        clearBufferedCommand(): void;
+
+        /**
+         * events.EventEmitter
+         * 1. close - inherited from `readline.Interface`
+         * 2. line - inherited from `readline.Interface`
+         * 3. pause - inherited from `readline.Interface`
+         * 4. resume - inherited from `readline.Interface`
+         * 5. SIGCONT - inherited from `readline.Interface`
+         * 6. SIGINT - inherited from `readline.Interface`
+         * 7. SIGTSTP - inherited from `readline.Interface`
+         * 8. exit
+         * 9. reset
+         */
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "line", listener: (input: string) => void): this;
+        addListener(event: "pause", listener: () => void): this;
+        addListener(event: "resume", listener: () => void): this;
+        addListener(event: "SIGCONT", listener: () => void): this;
+        addListener(event: "SIGINT", listener: () => void): this;
+        addListener(event: "SIGTSTP", listener: () => void): this;
+        addListener(event: "exit", listener: () => void): this;
+        addListener(event: "reset", listener: (context: Context) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "line", input: string): boolean;
+        emit(event: "pause"): boolean;
+        emit(event: "resume"): boolean;
+        emit(event: "SIGCONT"): boolean;
+        emit(event: "SIGINT"): boolean;
+        emit(event: "SIGTSTP"): boolean;
+        emit(event: "exit"): boolean;
+        emit(event: "reset", context: Context): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "line", listener: (input: string) => void): this;
+        on(event: "pause", listener: () => void): this;
+        on(event: "resume", listener: () => void): this;
+        on(event: "SIGCONT", listener: () => void): this;
+        on(event: "SIGINT", listener: () => void): this;
+        on(event: "SIGTSTP", listener: () => void): this;
+        on(event: "exit", listener: () => void): this;
+        on(event: "reset", listener: (context: Context) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "line", listener: (input: string) => void): this;
+        once(event: "pause", listener: () => void): this;
+        once(event: "resume", listener: () => void): this;
+        once(event: "SIGCONT", listener: () => void): this;
+        once(event: "SIGINT", listener: () => void): this;
+        once(event: "SIGTSTP", listener: () => void): this;
+        once(event: "exit", listener: () => void): this;
+        once(event: "reset", listener: (context: Context) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "line", listener: (input: string) => void): this;
+        prependListener(event: "pause", listener: () => void): this;
+        prependListener(event: "resume", listener: () => void): this;
+        prependListener(event: "SIGCONT", listener: () => void): this;
+        prependListener(event: "SIGINT", listener: () => void): this;
+        prependListener(event: "SIGTSTP", listener: () => void): this;
+        prependListener(event: "exit", listener: () => void): this;
+        prependListener(event: "reset", listener: (context: Context) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "line", listener: (input: string) => void): this;
+        prependOnceListener(event: "pause", listener: () => void): this;
+        prependOnceListener(event: "resume", listener: () => void): this;
+        prependOnceListener(event: "SIGCONT", listener: () => void): this;
+        prependOnceListener(event: "SIGINT", listener: () => void): this;
+        prependOnceListener(event: "SIGTSTP", listener: () => void): this;
+        prependOnceListener(event: "exit", listener: () => void): this;
+        prependOnceListener(event: "reset", listener: (context: Context) => void): this;
+    }
+
+    /**
+     * A flag passed in the REPL options. Evaluates expressions in sloppy mode.
+     */
+    export const REPL_MODE_SLOPPY: symbol; // TODO: unique symbol
+
+    /**
+     * A flag passed in the REPL options. Evaluates expressions in strict mode.
+     * This is equivalent to prefacing every repl statement with `'use strict'`.
+     */
+    export const REPL_MODE_STRICT: symbol; // TODO: unique symbol
+
+    /**
+     * Creates and starts a `repl.REPLServer` instance.
+     *
+     * @param options The options for the `REPLServer`. If `options` is a string, then it specifies
+     * the input prompt.
+     */
+    function start(options?: string | ReplOptions): REPLServer;
+
+    /**
+     * Indicates a recoverable error that a `REPLServer` can use to support multi-line input.
+     *
+     * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_recoverable_errors
+     */
+    class Recoverable extends SyntaxError {
+        err: Error;
+
+        constructor(err: Error);
+    }
+}
diff --git a/types/node/scripts/generate-inspector/inspector.d.ts.template b/types/node/scripts/generate-inspector/inspector.d.ts.template
index 11b8f33403..a6715f12e4 100644
--- a/types/node/scripts/generate-inspector/inspector.d.ts.template
+++ b/types/node/scripts/generate-inspector/inspector.d.ts.template
@@ -8,7 +8,6 @@
 /**
  * The inspector module provides an API for interacting with the V8 inspector.
  */
-// tslint:disable-next-line:no-single-declare-module
 declare module "inspector" {
     import { EventEmitter } from 'events';
 
diff --git a/types/node/stream.d.ts b/types/node/stream.d.ts
new file mode 100644
index 0000000000..122ae563c7
--- /dev/null
+++ b/types/node/stream.d.ts
@@ -0,0 +1,294 @@
+declare module "stream" {
+    import * as events from "events";
+
+    class internal extends events.EventEmitter {
+        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+    }
+
+    namespace internal {
+        class Stream extends internal { }
+
+        interface ReadableOptions {
+            highWaterMark?: number;
+            encoding?: string;
+            objectMode?: boolean;
+            read?(this: Readable, size: number): void;
+            destroy?(this: Readable, error: Error | null, callback: (error: Error | null) => void): void;
+        }
+
+        class Readable extends Stream implements NodeJS.ReadableStream {
+            readable: boolean;
+            readonly readableHighWaterMark: number;
+            readonly readableLength: number;
+            constructor(opts?: ReadableOptions);
+            _read(size: number): void;
+            read(size?: number): any;
+            setEncoding(encoding: string): this;
+            pause(): this;
+            resume(): this;
+            isPaused(): boolean;
+            unpipe(destination?: NodeJS.WritableStream): this;
+            unshift(chunk: any): void;
+            wrap(oldStream: NodeJS.ReadableStream): this;
+            push(chunk: any, encoding?: string): boolean;
+            _destroy(error: Error | null, callback: (error: Error | null) => void): void;
+            destroy(error?: Error): void;
+
+            /**
+             * Event emitter
+             * The defined events on documents including:
+             * 1. close
+             * 2. data
+             * 3. end
+             * 4. readable
+             * 5. error
+             */
+            addListener(event: "close", listener: () => 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: "close"): 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: "close", listener: () => 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: "close", listener: () => 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: "close", listener: () => 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: "close", listener: () => 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: "close", listener: () => 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<any>;
+        }
+
+        interface WritableOptions {
+            highWaterMark?: number;
+            decodeStrings?: boolean;
+            objectMode?: boolean;
+            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;
+        }
+
+        class Writable extends Stream implements NodeJS.WritableStream {
+            writable: boolean;
+            readonly writableHighWaterMark: number;
+            readonly writableLength: number;
+            constructor(opts?: WritableOptions);
+            _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?: () => void): void;
+            end(chunk: any, cb?: () => void): void;
+            end(chunk: any, encoding?: string, cb?: () => void): void;
+            cork(): void;
+            uncork(): void;
+            destroy(error?: Error): void;
+
+            /**
+             * Event emitter
+             * The defined events on documents including:
+             * 1. close
+             * 2. drain
+             * 3. error
+             * 4. finish
+             * 5. pipe
+             * 6. unpipe
+             */
+            addListener(event: "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: "close"): 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: "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: "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: "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: "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: "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;
+        }
+
+        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.
+        class Duplex extends Readable implements Writable {
+            writable: boolean;
+            readonly writableHighWaterMark: number;
+            readonly writableLength: number;
+            constructor(opts?: DuplexOptions);
+            _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?: () => void): void;
+            end(chunk: any, cb?: () => void): void;
+            end(chunk: any, encoding?: string, cb?: () => void): void;
+            cork(): void;
+            uncork(): void;
+        }
+
+        type TransformCallback = (error?: Error | null, data?: any) => void;
+
+        interface TransformOptions extends DuplexOptions {
+            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;
+        }
+
+        class Transform extends Duplex {
+            constructor(opts?: TransformOptions);
+            _transform(chunk: any, encoding: string, callback: TransformCallback): void;
+            _flush(callback: TransformCallback): void;
+        }
+
+        class PassThrough extends Transform { }
+
+        function finished(stream: NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream, callback: (err?: NodeJS.ErrnoException) => void): () => void;
+        namespace finished {
+            function __promisify__(stream: NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream): Promise<void>;
+        }
+
+        function pipeline<T extends NodeJS.WritableStream>(stream1: NodeJS.ReadableStream, stream2: T, callback?: (err: NodeJS.ErrnoException) => void): T;
+        function pipeline<T extends NodeJS.WritableStream>(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream, stream3: T, callback?: (err: NodeJS.ErrnoException) => void): T;
+        function pipeline<T extends NodeJS.WritableStream>(
+            stream1: NodeJS.ReadableStream,
+            stream2: NodeJS.ReadWriteStream,
+            stream3: NodeJS.ReadWriteStream,
+            stream4: T,
+            callback?: (err: NodeJS.ErrnoException) => void,
+        ): T;
+        function pipeline<T extends NodeJS.WritableStream>(
+            stream1: NodeJS.ReadableStream,
+            stream2: NodeJS.ReadWriteStream,
+            stream3: NodeJS.ReadWriteStream,
+            stream4: NodeJS.ReadWriteStream,
+            stream5: T,
+            callback?: (err: NodeJS.ErrnoException) => void,
+        ): T;
+        function pipeline(streams: Array<NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream>, callback?: (err: NodeJS.ErrnoException) => void): NodeJS.WritableStream;
+        function pipeline(
+            stream1: NodeJS.ReadableStream,
+            stream2: NodeJS.ReadWriteStream | NodeJS.WritableStream,
+            ...streams: Array<NodeJS.ReadWriteStream | NodeJS.WritableStream | ((err: NodeJS.ErrnoException) => void)>,
+        ): NodeJS.WritableStream;
+        namespace pipeline {
+            function __promisify__(stream1: NodeJS.ReadableStream, stream2: NodeJS.WritableStream): Promise<void>;
+            function __promisify__(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream, stream3: NodeJS.WritableStream): Promise<void>;
+            function __promisify__(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream, stream3: NodeJS.ReadWriteStream, stream4: NodeJS.WritableStream): Promise<void>;
+            function __promisify__(
+                stream1: NodeJS.ReadableStream,
+                stream2: NodeJS.ReadWriteStream,
+                stream3: NodeJS.ReadWriteStream,
+                stream4: NodeJS.ReadWriteStream,
+                stream5: NodeJS.WritableStream,
+            ): Promise<void>;
+            function __promisify__(streams: Array<NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream>): Promise<void>;
+            function __promisify__(
+                stream1: NodeJS.ReadableStream,
+                stream2: NodeJS.ReadWriteStream | NodeJS.WritableStream,
+                ...streams: Array<NodeJS.ReadWriteStream | NodeJS.WritableStream>,
+            ): Promise<void>;
+        }
+    }
+
+    export = internal;
+}
diff --git a/types/node/string_decoder.d.ts b/types/node/string_decoder.d.ts
new file mode 100644
index 0000000000..762a4d8d50
--- /dev/null
+++ b/types/node/string_decoder.d.ts
@@ -0,0 +1,9 @@
+declare module "string_decoder" {
+    interface NodeStringDecoder {
+        write(buffer: Buffer): string;
+        end(buffer?: Buffer): string;
+    }
+    const StringDecoder: {
+        new(encoding?: string): NodeStringDecoder;
+    };
+}
diff --git a/types/node/test/buffer.ts b/types/node/test/buffer.ts
new file mode 100644
index 0000000000..37b02ef708
--- /dev/null
+++ b/types/node/test/buffer.ts
@@ -0,0 +1,203 @@
+// Specifically test buffer module regression.
+import { Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer } from "buffer";
+
+const utf8Buffer = new Buffer('test');
+const base64Buffer = new Buffer('', 'base64');
+const octets: Uint8Array = new Uint8Array(123);
+const octetBuffer = new Buffer(octets);
+const sharedBuffer = new Buffer(octets.buffer);
+const copiedBuffer = new Buffer(utf8Buffer);
+console.log(Buffer.isBuffer(octetBuffer));
+console.log(Buffer.isEncoding('utf8'));
+console.log(Buffer.byteLength('xyz123'));
+console.log(Buffer.byteLength('xyz123', 'ascii'));
+const result1 = Buffer.concat([utf8Buffer, base64Buffer]);
+const result2 = Buffer.concat([utf8Buffer, base64Buffer], 9999999);
+
+// Class Methods: Buffer.swap16(), Buffer.swa32(), Buffer.swap64()
+{
+    const buf = Buffer.from([0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8]);
+    buf.swap16();
+    buf.swap32();
+    buf.swap64();
+}
+
+// Class Method: Buffer.from(data)
+{
+    // Array
+    const buf1: Buffer = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+    // Buffer
+    const buf2: Buffer = Buffer.from(buf1);
+    // String
+    const buf3: Buffer = Buffer.from('this is a tést');
+    // ArrayBuffer
+    const arrUint16: Uint16Array = new Uint16Array(2);
+    arrUint16[0] = 5000;
+    arrUint16[1] = 4000;
+    const buf4: Buffer = Buffer.from(arrUint16.buffer);
+    const arrUint8: Uint8Array = new Uint8Array(2);
+    const buf5: Buffer = Buffer.from(arrUint8);
+    const buf6: Buffer = Buffer.from(buf1);
+    const buf7: Buffer = Buffer.from(new SharedArrayBuffer(123));
+}
+
+// Class Method: Buffer.from(arrayBuffer[, byteOffset[, length]])
+{
+    const arr: Uint16Array = new Uint16Array(2);
+    arr[0] = 5000;
+    arr[1] = 4000;
+
+    let buf: Buffer;
+    buf = Buffer.from(arr.buffer, 1);
+    buf = Buffer.from(arr.buffer, 0, 1);
+}
+
+// Class Method: Buffer.from(str[, encoding])
+{
+    const buf2: Buffer = Buffer.from('7468697320697320612074c3a97374', 'hex');
+}
+
+// Class Method: Buffer.alloc(size[, fill[, encoding]])
+{
+    const buf1: Buffer = Buffer.alloc(5);
+    const buf2: Buffer = Buffer.alloc(5, 'a');
+    const buf3: Buffer = Buffer.alloc(11, 'aGVsbG8gd29ybGQ=', 'base64');
+}
+// Class Method: Buffer.allocUnsafe(size)
+{
+    const buf: Buffer = Buffer.allocUnsafe(5);
+}
+// Class Method: Buffer.allocUnsafeSlow(size)
+{
+    const buf: Buffer = Buffer.allocUnsafeSlow(10);
+}
+
+// Class Method byteLenght
+{
+    let len: number;
+    len = Buffer.byteLength("foo");
+    len = Buffer.byteLength("foo", "utf8");
+
+    const b = Buffer.from("bar");
+    len = Buffer.byteLength(b);
+    len = Buffer.byteLength(b, "utf16le");
+
+    const ab = new ArrayBuffer(15);
+    len = Buffer.byteLength(ab);
+    len = Buffer.byteLength(ab, "ascii");
+
+    const dv = new DataView(ab);
+    len = Buffer.byteLength(dv);
+    len = Buffer.byteLength(dv, "utf16le");
+}
+
+// Class Method poolSize
+{
+    let s: number;
+    s = Buffer.poolSize;
+    Buffer.poolSize = 4096;
+}
+
+// Test that TS 1.6 works with the 'as Buffer' annotation
+// on isBuffer.
+let a: Buffer | number;
+a = new Buffer(10);
+if (Buffer.isBuffer(a)) {
+    a.writeUInt8(3, 4);
+}
+
+// write* methods return offsets.
+const b = new Buffer(16);
+let result: number = b.writeUInt32LE(0, 0);
+result = b.writeUInt16LE(0, 4);
+result = b.writeUInt8(0, 6);
+result = b.writeInt8(0, 7);
+result = b.writeDoubleLE(0, 8);
+result = b.write('asd');
+result = b.write('asd', 'hex');
+result = b.write('asd', 123, 'hex');
+result = b.write('asd', 123, 123, 'hex');
+
+// fill returns the input buffer.
+b.fill('a').fill('b');
+
+{
+    const buffer = new Buffer('123');
+    let index: number;
+    index = buffer.indexOf("23");
+    index = buffer.indexOf("23", 1);
+    index = buffer.indexOf("23", 1, "utf8");
+    index = buffer.indexOf(23);
+    index = buffer.indexOf(buffer);
+}
+
+{
+    const buffer = new Buffer('123');
+    let index: number;
+    index = buffer.lastIndexOf("23");
+    index = buffer.lastIndexOf("23", 1);
+    index = buffer.lastIndexOf("23", 1, "utf8");
+    index = buffer.lastIndexOf(23);
+    index = buffer.lastIndexOf(buffer);
+}
+
+{
+    const buffer = new Buffer('123');
+    const val: [number, number] = [1, 1];
+
+    /* comment out for --target es5
+    for (let entry of buffer.entries()) {
+        val = entry;
+    }
+        */
+}
+
+{
+    const buffer = new Buffer('123');
+    let includes: boolean;
+    includes = buffer.includes("23");
+    includes = buffer.includes("23", 1);
+    includes = buffer.includes("23", 1, "utf8");
+    includes = buffer.includes(23);
+    includes = buffer.includes(23, 1);
+    includes = buffer.includes(23, 1, "utf8");
+    includes = buffer.includes(buffer);
+    includes = buffer.includes(buffer, 1);
+    includes = buffer.includes(buffer, 1, "utf8");
+}
+
+{
+    const buffer = new Buffer('123');
+    const val = 1;
+
+    /* comment out for --target es5
+    for (let key of buffer.keys()) {
+        val = key;
+    }
+        */
+}
+
+{
+    const buffer = new Buffer('123');
+    const val = 1;
+
+    /* comment out for --target es5
+    for (let value of buffer.values()) {
+        val = value;
+    }
+        */
+}
+
+// Imported Buffer from buffer module works properly
+{
+    const b = new ImportedBuffer('123');
+    b.writeUInt8(0, 6);
+    const sb = new ImportedSlowBuffer(43);
+    b.writeUInt8(0, 6);
+}
+
+// Buffer has Uint8Array's buffer field (an ArrayBuffer).
+{
+    const buffer = new Buffer('123');
+    const octets = new Uint8Array(buffer.buffer);
+}
diff --git a/types/node/test/crypto.ts b/types/node/test/crypto.ts
new file mode 100644
index 0000000000..8238567557
--- /dev/null
+++ b/types/node/test/crypto.ts
@@ -0,0 +1,560 @@
+import * as crypto from 'crypto';
+import * as assert from 'assert';
+import { promisify } from 'util';
+
+{
+    // crypto_hash_string_test
+    const hashResult: string = crypto.createHash('md5').update('world').digest('hex');
+}
+
+{
+    // crypto_hash_buffer_test
+    const hashResult: string = crypto.createHash('md5')
+        .update(new Buffer('world')).digest('hex');
+}
+
+{
+    // crypto_hash_dataview_test
+    const hashResult: string = crypto.createHash('md5')
+        .update(new DataView(new Buffer('world').buffer)).digest('hex');
+}
+
+{
+    // crypto_hash_int8array_test
+    const hashResult: string = crypto.createHash('md5')
+        .update(new Int8Array(new Buffer('world').buffer)).digest('hex');
+}
+
+{
+    // crypto_hmac_string_test
+    const hmacResult: string = crypto.createHmac('md5', 'hello').update('world').digest('hex');
+}
+
+{
+    // crypto_hmac_buffer_test
+    const hmacResult: string = crypto.createHmac('md5', 'hello')
+        .update(new Buffer('world')).digest('hex');
+}
+
+{
+    // crypto_hmac_dataview_test
+    const hmacResult: string = crypto.createHmac('md5', 'hello')
+        .update(new DataView(new Buffer('world').buffer)).digest('hex');
+}
+
+{
+    // crypto_hmac_int8array_test
+    const 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', () => {
+        const hash: Buffer | string = hmac.read();
+    });
+}
+
+{
+    // crypto_cipher_decipher_string_test
+    const key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+    const clearText = "This is the clear text.";
+    const cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+    let cipherText: string = cipher.update(clearText, "utf8", "hex");
+    cipherText += cipher.final("hex");
+
+    const decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+    let clearText2: string = decipher.update(cipherText, "hex", "utf8");
+    clearText2 += decipher.final("utf8");
+
+    assert.equal(clearText2, clearText);
+}
+
+{
+    // crypto_cipher_decipher_buffer_test
+    const key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+    const clearText: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]);
+    const cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+    const cipherBuffers: Buffer[] = [];
+    cipherBuffers.push(cipher.update(clearText));
+    cipherBuffers.push(cipher.final());
+
+    const cipherText: Buffer = Buffer.concat(cipherBuffers);
+
+    const decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+    const decipherBuffers: Buffer[] = [];
+    decipherBuffers.push(decipher.update(cipherText));
+    decipherBuffers.push(decipher.final());
+
+    const clearText2: Buffer = Buffer.concat(decipherBuffers);
+
+    assert.deepEqual(clearText2, clearText);
+}
+
+{
+    // crypto_cipher_decipher_dataview_test
+    const key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+    const clearText: DataView = new DataView(new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]).buffer);
+    const cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+    const cipherBuffers: Buffer[] = [];
+    cipherBuffers.push(cipher.update(clearText));
+    cipherBuffers.push(cipher.final());
+
+    const cipherText: DataView = new DataView(Buffer.concat(cipherBuffers).buffer);
+
+    const decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+    const decipherBuffers: Buffer[] = [];
+    decipherBuffers.push(decipher.update(cipherText));
+    decipherBuffers.push(decipher.final());
+
+    const clearText2: Buffer = Buffer.concat(decipherBuffers);
+
+    assert.deepEqual(clearText2, clearText);
+}
+
+{
+    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
+    const buffer1: Buffer = new Buffer([1, 2, 3, 4, 5]);
+    const buffer2: Buffer = new Buffer([1, 2, 3, 4, 5]);
+    const buffer3: Buffer = new Buffer([5, 4, 3, 2, 1]);
+
+    assert(crypto.timingSafeEqual(buffer1, buffer2));
+    assert(!crypto.timingSafeEqual(buffer1, buffer3));
+}
+
+{
+    // crypto_timingsafeequal_uint32array_test
+    const arr1: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
+    const arr2: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
+    const 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
+    const arr1: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
+    const arr2: Int32Array = Int32Array.of(1, 2, 3, 4, 5);
+    const 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
+    const arr1: Int8Array = Int8Array.of(1, 2, 3, 4, 5, ~0, ~1, ~2, ~3, ~4);
+    const arr2: Uint8Array = Uint8Array.of(1, 2, 3, 4, 5, ~0, ~1, ~2, ~3, ~4);
+    const 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
+    const dv1B: Uint8Array = Uint8Array.of(1, 2, 3, 4, 5);
+    const dv2B: Int8Array = Int8Array.of(1, 2, 3, 4, 5);
+    const dv3B: Buffer = Buffer.of(5, 4, 3, 2, 1);
+    const dv4B: Uint8ClampedArray = Uint8ClampedArray.of(5, 4, 3, 2, 1);
+    const dv1: DataView = new DataView(dv1B.buffer, dv1B.byteOffset, dv1B.byteLength);
+    const dv2: DataView = new DataView(dv2B.buffer, dv2B.byteOffset, dv2B.byteLength);
+    const dv3: DataView = new DataView(dv3B.buffer, dv3B.byteOffset, dv3B.byteLength);
+    const 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
+    const ui32_1: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
+    const ui32_2: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
+    const 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
+    const buffer: Buffer = new Buffer(10);
+    crypto.randomFillSync(buffer);
+    crypto.randomFillSync(buffer, 2);
+    crypto.randomFillSync(buffer, 2, 3);
+
+    crypto.randomFill(buffer, (err: Error | null, buf: Buffer) => void {});
+    crypto.randomFill(buffer, 2, (err: Error | null, buf: Buffer) => void {});
+    crypto.randomFill(buffer, 2, 3, (err: Error | null, buf: Buffer) => void {});
+
+    // crypto_randomfill_uint8array_test
+    const ui8arr: Uint8Array = new Uint8Array(10);
+    crypto.randomFillSync(ui8arr);
+    crypto.randomFillSync(ui8arr, 2);
+    crypto.randomFillSync(ui8arr, 2, 3);
+
+    crypto.randomFill(ui8arr, (err: Error | null, buf: Uint8Array) => void {});
+    crypto.randomFill(ui8arr, 2, (err: Error | null, buf: Uint8Array) => void {});
+    crypto.randomFill(ui8arr, 2, 3, (err: Error | null, buf: Uint8Array) => void {});
+
+    // crypto_randomfill_int32array_test
+    const i32arr: Int32Array = new Int32Array(10);
+    crypto.randomFillSync(i32arr);
+    crypto.randomFillSync(i32arr, 2);
+    crypto.randomFillSync(i32arr, 2, 3);
+
+    crypto.randomFill(i32arr, (err: Error | null, buf: Int32Array) => void {});
+    crypto.randomFill(i32arr, 2, (err: Error | null, buf: Int32Array) => void {});
+    crypto.randomFill(i32arr, 2, 3, (err: Error | null, 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");
+    const 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");
+}
+
+{
+    const rsaRes: {
+        publicKey: Buffer;
+        privateKey: string;
+    } = crypto.generateKeyPairSync('rsa', {
+        modulusLength: 123,
+        publicKeyEncoding: {
+            format: 'der',
+            type: 'pkcs1',
+        },
+        privateKeyEncoding: {
+            cipher: 'some-cipher',
+            format: 'pem',
+            passphrase: 'secret',
+            type: 'pkcs8',
+        },
+    });
+
+    const dsaRes: {
+        publicKey: string;
+        privateKey: Buffer;
+    } = crypto.generateKeyPairSync('dsa', {
+        modulusLength: 123,
+        divisorLength: 123,
+        publicKeyEncoding: {
+            format: 'pem',
+            type: 'spki',
+        },
+        privateKeyEncoding: {
+            cipher: 'some-cipher',
+            format: 'der',
+            passphrase: 'secret',
+            type: 'pkcs8',
+        },
+    });
+
+    const ecRes: {
+        publicKey: string;
+        privateKey: string;
+    } = crypto.generateKeyPairSync('ec', {
+        namedCurve: 'curve',
+        publicKeyEncoding: {
+            format: 'pem',
+            type: 'pkcs1',
+        },
+        privateKeyEncoding: {
+            cipher: 'some-cipher',
+            format: 'pem',
+            passphrase: 'secret',
+            type: 'pkcs8',
+        },
+    });
+}
+
+{
+    crypto.generateKeyPair('rsa', {
+        modulusLength: 123,
+        publicKeyEncoding: {
+            format: 'der',
+            type: 'pkcs1',
+        },
+        privateKeyEncoding: {
+            cipher: 'some-cipher',
+            format: 'pem',
+            passphrase: 'secret',
+            type: 'pkcs8',
+        },
+    }, (err: NodeJS.ErrnoException | null, publicKey: Buffer, privateKey: string) => {});
+
+    crypto.generateKeyPair('dsa', {
+        modulusLength: 123,
+        divisorLength: 123,
+        publicKeyEncoding: {
+            format: 'pem',
+            type: 'spki',
+        },
+        privateKeyEncoding: {
+            cipher: 'some-cipher',
+            format: 'der',
+            passphrase: 'secret',
+            type: 'pkcs8',
+        },
+    }, (err: NodeJS.ErrnoException | null, publicKey: string, privateKey: Buffer) => {});
+
+    crypto.generateKeyPair('ec', {
+        namedCurve: 'curve',
+        publicKeyEncoding: {
+            format: 'pem',
+            type: 'pkcs1',
+        },
+        privateKeyEncoding: {
+            cipher: 'some-cipher',
+            format: 'pem',
+            passphrase: 'secret',
+            type: 'pkcs8',
+        },
+    }, (err: NodeJS.ErrnoException | null, publicKey: string, privateKey: string) => {});
+}
+
+{
+    const generateKeyPairPromisified = promisify(crypto.generateKeyPair);
+
+    const rsaRes: Promise<{
+        publicKey: Buffer;
+        privateKey: string;
+    }> = generateKeyPairPromisified('rsa', {
+        modulusLength: 123,
+        publicKeyEncoding: {
+            format: 'der',
+            type: 'pkcs1',
+        },
+        privateKeyEncoding: {
+            cipher: 'some-cipher',
+            format: 'pem',
+            passphrase: 'secret',
+            type: 'pkcs8',
+        },
+    });
+
+    const dsaRes: Promise<{
+        publicKey: string;
+        privateKey: Buffer;
+    }> = generateKeyPairPromisified('dsa', {
+        modulusLength: 123,
+        divisorLength: 123,
+        publicKeyEncoding: {
+            format: 'pem',
+            type: 'spki',
+        },
+        privateKeyEncoding: {
+            cipher: 'some-cipher',
+            format: 'der',
+            passphrase: 'secret',
+            type: 'pkcs8',
+        },
+    });
+
+    const ecRes: Promise<{
+        publicKey: string;
+        privateKey: string;
+    }> = generateKeyPairPromisified('ec', {
+        namedCurve: 'curve',
+        publicKeyEncoding: {
+            format: 'pem',
+            type: 'pkcs1',
+        },
+        privateKeyEncoding: {
+            cipher: 'some-cipher',
+            format: 'pem',
+            passphrase: 'secret',
+            type: 'pkcs8',
+        },
+    });
+}
+
+{
+    crypto.createPrivateKey(Buffer.from('asdf'));
+    crypto.createPrivateKey({
+        key: 'asd',
+        format: 'der',
+    });
+}
+
+{
+    crypto.createSecretKey(Buffer.from('asdf'));
+}
+
+{
+    // crypto_constants_test
+    let num: number;
+    let str: string;
+
+    num = crypto.constants.OPENSSL_VERSION_NUMBER;
+    num = crypto.constants.SSL_OP_ALL;
+    num = crypto.constants.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
+    num = crypto.constants.SSL_OP_CIPHER_SERVER_PREFERENCE;
+    num = crypto.constants.SSL_OP_CISCO_ANYCONNECT;
+    num = crypto.constants.SSL_OP_COOKIE_EXCHANGE;
+    num = crypto.constants.SSL_OP_CRYPTOPRO_TLSEXT_BUG;
+    num = crypto.constants.SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
+    num = crypto.constants.SSL_OP_EPHEMERAL_RSA;
+    num = crypto.constants.SSL_OP_LEGACY_SERVER_CONNECT;
+    num = crypto.constants.SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER;
+    num = crypto.constants.SSL_OP_MICROSOFT_SESS_ID_BUG;
+    num = crypto.constants.SSL_OP_MSIE_SSLV2_RSA_PADDING;
+    num = crypto.constants.SSL_OP_NETSCAPE_CA_DN_BUG;
+    num = crypto.constants.SSL_OP_NETSCAPE_CHALLENGE_BUG;
+    num = crypto.constants.SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG;
+    num = crypto.constants.SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG;
+    num = crypto.constants.SSL_OP_NO_COMPRESSION;
+    num = crypto.constants.SSL_OP_NO_QUERY_MTU;
+    num = crypto.constants.SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION;
+    num = crypto.constants.SSL_OP_NO_SSLv2;
+    num = crypto.constants.SSL_OP_NO_SSLv3;
+    num = crypto.constants.SSL_OP_NO_TICKET;
+    num = crypto.constants.SSL_OP_NO_TLSv1;
+    num = crypto.constants.SSL_OP_NO_TLSv1_1;
+    num = crypto.constants.SSL_OP_NO_TLSv1_2;
+    num = crypto.constants.SSL_OP_PKCS1_CHECK_1;
+    num = crypto.constants.SSL_OP_PKCS1_CHECK_2;
+    num = crypto.constants.SSL_OP_SINGLE_DH_USE;
+    num = crypto.constants.SSL_OP_SINGLE_ECDH_USE;
+    num = crypto.constants.SSL_OP_SSLEAY_080_CLIENT_DH_BUG;
+    num = crypto.constants.SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG;
+    num = crypto.constants.SSL_OP_TLS_BLOCK_PADDING_BUG;
+    num = crypto.constants.SSL_OP_TLS_D5_BUG;
+    num = crypto.constants.SSL_OP_TLS_ROLLBACK_BUG;
+    num = crypto.constants.ENGINE_METHOD_RSA;
+    num = crypto.constants.ENGINE_METHOD_DSA;
+    num = crypto.constants.ENGINE_METHOD_DH;
+    num = crypto.constants.ENGINE_METHOD_RAND;
+    num = crypto.constants.ENGINE_METHOD_EC;
+    num = crypto.constants.ENGINE_METHOD_CIPHERS;
+    num = crypto.constants.ENGINE_METHOD_DIGESTS;
+    num = crypto.constants.ENGINE_METHOD_PKEY_METHS;
+    num = crypto.constants.ENGINE_METHOD_PKEY_ASN1_METHS;
+    num = crypto.constants.ENGINE_METHOD_ALL;
+    num = crypto.constants.ENGINE_METHOD_NONE;
+    num = crypto.constants.DH_CHECK_P_NOT_SAFE_PRIME;
+    num = crypto.constants.DH_CHECK_P_NOT_PRIME;
+    num = crypto.constants.DH_UNABLE_TO_CHECK_GENERATOR;
+    num = crypto.constants.DH_NOT_SUITABLE_GENERATOR;
+    num = crypto.constants.ALPN_ENABLED;
+    num = crypto.constants.RSA_PKCS1_PADDING;
+    num = crypto.constants.RSA_SSLV23_PADDING;
+    num = crypto.constants.RSA_NO_PADDING;
+    num = crypto.constants.RSA_PKCS1_OAEP_PADDING;
+    num = crypto.constants.RSA_X931_PADDING;
+    num = crypto.constants.RSA_PKCS1_PSS_PADDING;
+    num = crypto.constants.RSA_PSS_SALTLEN_DIGEST;
+    num = crypto.constants.RSA_PSS_SALTLEN_MAX_SIGN;
+    num = crypto.constants.RSA_PSS_SALTLEN_AUTO;
+    num = crypto.constants.POINT_CONVERSION_COMPRESSED;
+    num = crypto.constants.POINT_CONVERSION_UNCOMPRESSED;
+    num = crypto.constants.POINT_CONVERSION_HYBRID;
+
+    str = crypto.constants.defaultCoreCipherList;
+    str = crypto.constants.defaultCipherList;
+}
diff --git a/types/node/test/dgram.ts b/types/node/test/dgram.ts
new file mode 100644
index 0000000000..8749f79743
--- /dev/null
+++ b/types/node/test/dgram.ts
@@ -0,0 +1,108 @@
+import * as dgram from 'dgram';
+import * as net from 'net';
+import * as dns from 'dns';
+
+{
+    let ds: dgram.Socket = dgram.createSocket("udp4", (msg: Buffer, rinfo: dgram.RemoteInfo): void => {
+    });
+    ds.bind();
+    ds.bind(41234);
+    ds.bind(4123, 'localhost');
+    ds.bind(4123, 'localhost', () => { });
+    ds.bind(4123, () => { });
+    ds.bind(() => { });
+    const addr: net.AddressInfo | string = ds.address();
+    ds.send(new Buffer("hello"), 0, 5, 5000, "127.0.0.1", (error: Error | null, bytes: number): void => {
+    });
+    ds.send(new Buffer("hello"), 5000, "127.0.0.1");
+    ds.setMulticastInterface("127.0.0.1");
+    ds = dgram.createSocket({ type: "udp4", reuseAddr: true, recvBufferSize: 1000, sendBufferSize: 1000, lookup: dns.lookup });
+}
+
+{
+    let _socket = new dgram.Socket();
+    let _boolean: boolean;
+    const _err: Error = new Error();
+    const _str = '';
+    const _rinfo: net.AddressInfo = {
+        address: 'asd',
+        family: 'asd',
+        port: 1,
+    };
+    /**
+     * events.EventEmitter
+     * 1. close
+     * 2. error
+     * 3. listening
+     * 4. message
+     */
+
+    _socket = _socket.addListener("close", () => { });
+    _socket = _socket.addListener("error", (err) => {
+        const _err: Error = err;
+    });
+    _socket = _socket.addListener("listening", () => { });
+    _socket = _socket.addListener("message", (msg, rinfo) => {
+        const _msg: Buffer = msg;
+        const _rinfo: net.AddressInfo = rinfo;
+    });
+
+    _boolean = _socket.emit("close");
+    _boolean = _socket.emit("error", _err);
+    _boolean = _socket.emit("listening");
+    _boolean = _socket.emit("message", _str, _rinfo);
+
+    _socket = _socket.on("close", () => { });
+    _socket = _socket.on("error", (err) => {
+        const _err: Error = err;
+    });
+    _socket = _socket.on("listening", () => { });
+    _socket = _socket.on("message", (msg, rinfo) => {
+        const _msg: Buffer = msg;
+        const _rinfo: net.AddressInfo = rinfo;
+    });
+
+    _socket = _socket.once("close", () => { });
+    _socket = _socket.once("error", (err) => {
+        const _err: Error = err;
+    });
+    _socket = _socket.once("listening", () => { });
+    _socket = _socket.once("message", (msg, rinfo) => {
+        const _msg: Buffer = msg;
+        const _rinfo: net.AddressInfo = rinfo;
+    });
+
+    _socket = _socket.prependListener("close", () => { });
+    _socket = _socket.prependListener("error", (err) => {
+        const _err: Error = err;
+    });
+    _socket = _socket.prependListener("listening", () => { });
+    _socket = _socket.prependListener("message", (msg, rinfo) => {
+        const _msg: Buffer = msg;
+        const _rinfo: net.AddressInfo = rinfo;
+    });
+
+    _socket = _socket.prependOnceListener("close", () => { });
+    _socket = _socket.prependOnceListener("error", (err) => {
+        const _err: Error = err;
+    });
+    _socket = _socket.prependOnceListener("listening", () => { });
+    _socket = _socket.prependOnceListener("message", (msg, rinfo) => {
+        const _msg: Buffer = msg;
+        const _rinfo: net.AddressInfo = rinfo;
+    });
+}
+
+{
+    const ds: dgram.Socket = dgram.createSocket({
+        type: 'udp4',
+        recvBufferSize: 10000,
+        sendBufferSize: 15000
+    });
+
+    let size: number;
+    size = ds.getRecvBufferSize();
+    ds.setRecvBufferSize(size);
+    size = ds.getSendBufferSize();
+    ds.setSendBufferSize(size);
+}
diff --git a/types/node/test/global.ts b/types/node/test/global.ts
new file mode 100644
index 0000000000..e29fdf3e25
--- /dev/null
+++ b/types/node/test/global.ts
@@ -0,0 +1,17 @@
+{
+    const x: NodeModule = {} as any;
+    const y: NodeModule = {} as any;
+    x.children.push(y);
+    x.parent = require.main!;
+    require.main = y;
+}
+
+{
+    // const a = new TextEncoder();
+}
+
+{
+    queueMicrotask(() => {
+        // cool
+    });
+}
diff --git a/types/node/test/http.ts b/types/node/test/http.ts
new file mode 100644
index 0000000000..6e4db63a2c
--- /dev/null
+++ b/types/node/test/http.ts
@@ -0,0 +1,196 @@
+import * as http from 'http';
+import * as url from 'url';
+import * as net from 'net';
+
+// http Server
+{
+    function reqListener(req: http.IncomingMessage, res: http.ServerResponse): void {}
+
+    let server: http.Server = new http.Server();
+
+    class MyIncomingMessage extends http.IncomingMessage {
+        foo: number;
+    }
+
+    class MyServerResponse extends http.ServerResponse {
+        foo: string;
+    }
+
+    server = new http.Server({ IncomingMessage: MyIncomingMessage});
+
+    server = new http.Server({
+        IncomingMessage: MyIncomingMessage,
+        ServerResponse: MyServerResponse
+    }, reqListener);
+
+    server = http.createServer(reqListener);
+    server = http.createServer({ IncomingMessage: MyIncomingMessage });
+    server = http.createServer({ ServerResponse: MyServerResponse }, reqListener);
+
+    // test public props
+    const maxHeadersCount: number = server.maxHeadersCount;
+    const timeout: number = server.timeout;
+    const listening: boolean = server.listening;
+    const keepAliveTimeout: number = server.keepAliveTimeout;
+    server.setTimeout().setTimeout(1000).setTimeout(() => {}).setTimeout(100, () => {});
+}
+
+// http IncomingMessage
+// http ServerResponse
+{
+    // incoming
+    const incoming: http.IncomingMessage = new http.IncomingMessage(new net.Socket());
+
+    incoming.setEncoding('utf8');
+
+    // stream
+    incoming.pause();
+    incoming.resume();
+
+    // response
+    const res: http.ServerResponse = new http.ServerResponse(incoming);
+
+    // test headers
+    res.setHeader('Content-Type', 'text/plain');
+    const bool: boolean = res.hasHeader('Content-Type');
+    const headers: string[] = res.getHeaderNames();
+
+    // trailers
+    res.addTrailers([
+        ['x-fOo', 'xOxOxOx'],
+        ['x-foO', 'OxOxOxO'],
+        ['X-fOo', 'xOxOxOx'],
+        ['X-foO', 'OxOxOxO']
+    ]);
+    res.addTrailers({ 'x-foo': 'bar' });
+
+    // writeHead
+    res.writeHead(200, 'OK\r\nContent-Type: text/html\r\n');
+    res.writeHead(200, { 'Transfer-Encoding': 'chunked' });
+    res.writeHead(200);
+
+    // write string
+    res.write('Part of my res.');
+    // write buffer
+    const chunk = Buffer.alloc(16390, 'Й');
+    res.write(chunk);
+    res.write(chunk, 'hex');
+
+    // end
+    res.end("end msg");
+    // without msg
+    res.end();
+
+    // flush
+    res.flushHeaders();
+}
+
+// http ClientRequest
+{
+    let req: http.ClientRequest = new http.ClientRequest("https://www.google.com");
+    req = new http.ClientRequest(new url.URL("https://www.google.com"));
+    req = new http.ClientRequest({ path: 'http://0.0.0.0' });
+    req = new http.ClientRequest({ setHost: false });
+
+    // header
+    req.setHeader('Content-Type', 'text/plain');
+    const bool: boolean = req.hasHeader('Content-Type');
+    const headers: string[] = req.getHeaderNames();
+    req.removeHeader('Date');
+
+    // write
+    const chunk = Buffer.alloc(16390, 'Й');
+    req.write(chunk);
+    req.write('a');
+    req.end();
+
+    // abort
+    req.abort();
+
+    // connection
+    req.connection.on('pause', () => { });
+
+    // event
+    req.on('data', () => { });
+}
+
+{
+    // Status codes
+    let codeMessage: string = http.STATUS_CODES['400']!;
+    codeMessage = http.STATUS_CODES[400]!;
+}
+
+{
+    let agent: http.Agent = new http.Agent({
+        keepAlive: true,
+        keepAliveMsecs: 10000,
+        maxSockets: Infinity,
+        maxFreeSockets: 256,
+        timeout: 15000
+    });
+
+    agent = http.globalAgent;
+
+    http.request({ agent: false });
+    http.request({ agent });
+    http.request({ agent: undefined });
+}
+
+{
+    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 => {});
+}
+
+{
+    // Make sure .listen() and .close() return a Server instance
+    http.createServer().listen(0).close().address();
+    net.createServer().listen(0).close().address();
+}
+
+{
+    const request = http.request({ path: 'http://0.0.0.0' });
+    request.once('error', () => { });
+    request.setNoDelay(true);
+    request.abort();
+}
+
+// http request options
+{
+    const requestOpts: http.RequestOptions = {
+        timeout: 30000
+    };
+
+    const clientArgs: http.ClientRequestArgs = {
+        timeout: 30000
+    };
+}
+
+// http headers
+{
+    const headers: http.IncomingHttpHeaders = {
+        'content-type': 'application/json',
+        'set-cookie': [ 'type=ninja', 'language=javascript' ]
+    };
+}
+
+// statics
+{
+    const maxHeaderSize = http.maxHeaderSize;
+}
diff --git a/types/node/test/net.ts b/types/node/test/net.ts
new file mode 100644
index 0000000000..a2276654c8
--- /dev/null
+++ b/types/node/test/net.ts
@@ -0,0 +1,293 @@
+import * as net from 'net';
+import { LookupOneOptions } from 'dns';
+
+{
+    const connectOpts: net.NetConnectOpts = {
+        allowHalfOpen: true,
+        family: 4,
+        host: "localhost",
+        port: 443,
+        timeout: 10E3
+    };
+    const socket: net.Socket = net.createConnection(connectOpts, (): void => {
+        // nothing
+    });
+}
+
+{
+    let server = net.createServer();
+    // Check methods which return server instances by chaining calls
+    server = server.listen(0)
+        .close()
+        .ref()
+        .unref();
+
+    server.listen({
+        ipv6Only: true,
+    });
+
+    // close has an optional callback function. No callback parameters are
+    // specified, so any callback function is permissible.
+    server = server.close((...args: any[]) => { });
+
+    // test the types of the address object fields
+    const address: net.AddressInfo | string | null = server.address();
+}
+
+{
+    const constructorOpts: net.SocketConstructorOpts = {
+        fd: 1,
+        allowHalfOpen: false,
+        readable: false,
+        writable: false,
+    };
+
+    /**
+     * net.Socket - events.EventEmitter
+     *   1. close
+     *   2. connect
+     *   3. data
+     *   4. drain
+     *   5. end
+     *   6. error
+     *   7. lookup
+     *   8. timeout
+     */
+    let _socket: net.Socket = new net.Socket(constructorOpts);
+
+    let bool = true;
+    let buffer = Buffer.from('123');
+    let error = new Error('asd');
+    let str = '123';
+    let num = 123;
+
+    const ipcConnectOpts: net.IpcSocketConnectOpts = {
+        path: "/"
+    };
+    const tcpConnectOpts: net.TcpSocketConnectOpts = {
+        family: 4,
+        hints: 0,
+        host: "localhost",
+        localAddress: "10.0.0.1",
+        localPort: 1234,
+        lookup: (_hostname: string, _options: LookupOneOptions, _callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void => {
+            // nothing
+        },
+        port: 80
+    };
+    _socket = _socket.connect(ipcConnectOpts);
+    _socket = _socket.connect(ipcConnectOpts, (): void => {});
+    _socket = _socket.connect(tcpConnectOpts);
+    _socket = _socket.connect(tcpConnectOpts, (): void => {});
+    _socket = _socket.connect(80, "localhost");
+    _socket = _socket.connect(80, "localhost", (): void => {});
+    _socket = _socket.connect(80);
+    _socket = _socket.connect(80, (): void => {});
+
+    /// addListener
+
+    _socket = _socket.addListener("close", had_error => {
+        bool = had_error;
+    });
+    _socket = _socket.addListener("connect", () => { });
+    _socket = _socket.addListener("data", data => {
+        buffer = data;
+    });
+    _socket = _socket.addListener("drain", () => { });
+    _socket = _socket.addListener("end", () => { });
+    _socket = _socket.addListener("error", err => {
+        error = err;
+    });
+    _socket = _socket.addListener("lookup", (err, address, family, host) => {
+        error = err;
+
+        if (typeof family === 'string') {
+            str = family;
+        } else if (typeof family === 'number') {
+            num = family;
+        }
+
+        str = host;
+    });
+    _socket = _socket.addListener("timeout", () => { });
+
+    /// emit
+    bool = _socket.emit("close", bool);
+    bool = _socket.emit("connect");
+    bool = _socket.emit("data", buffer);
+    bool = _socket.emit("drain");
+    bool = _socket.emit("end");
+    bool = _socket.emit("error", error);
+    bool = _socket.emit("lookup", error, str, str, str);
+    bool = _socket.emit("lookup", error, str, num, str);
+    bool = _socket.emit("timeout");
+
+    /// on
+    _socket = _socket.on("close", had_error => {
+        bool = had_error;
+    });
+    _socket = _socket.on("connect", () => { });
+    _socket = _socket.on("data", data => {
+        buffer = data;
+    });
+    _socket = _socket.on("drain", () => { });
+    _socket = _socket.on("end", () => { });
+    _socket = _socket.on("error", err => {
+        error = err;
+    });
+    _socket = _socket.on("lookup", (err, address, family, host) => {
+        error = err;
+
+        if (typeof family === 'string') {
+            str = family;
+        } else if (typeof family === 'number') {
+            num = family;
+        }
+
+        str = host;
+    });
+    _socket = _socket.on("timeout", () => { });
+
+    /// once
+    _socket = _socket.once("close", had_error => {
+        bool = had_error;
+    });
+    _socket = _socket.once("connect", () => { });
+    _socket = _socket.once("data", data => {
+        buffer = data;
+    });
+    _socket = _socket.once("drain", () => { });
+    _socket = _socket.once("end", () => { });
+    _socket = _socket.once("error", err => {
+        error = err;
+    });
+    _socket = _socket.once("lookup", (err, address, family, host) => {
+        error = err;
+
+        if (typeof family === 'string') {
+            str = family;
+        } else if (typeof family === 'number') {
+            num = family;
+        }
+
+        str = host;
+    });
+    _socket = _socket.once("timeout", () => { });
+
+    /// prependListener
+    _socket = _socket.prependListener("close", had_error => {
+        bool = had_error;
+    });
+    _socket = _socket.prependListener("connect", () => { });
+    _socket = _socket.prependListener("data", data => {
+        buffer = data;
+    });
+    _socket = _socket.prependListener("drain", () => { });
+    _socket = _socket.prependListener("end", () => { });
+    _socket = _socket.prependListener("error", err => {
+        error = err;
+    });
+    _socket = _socket.prependListener("lookup", (err, address, family, host) => {
+        error = err;
+
+        if (typeof family === 'string') {
+            str = family;
+        } else if (typeof family === 'number') {
+            num = family;
+        }
+
+        str = host;
+    });
+    _socket = _socket.prependListener("timeout", () => { });
+
+    /// prependOnceListener
+    _socket = _socket.prependOnceListener("close", had_error => {
+        bool = had_error;
+    });
+    _socket = _socket.prependOnceListener("connect", () => { });
+    _socket = _socket.prependOnceListener("data", data => {
+        buffer = data;
+    });
+    _socket = _socket.prependOnceListener("drain", () => { });
+    _socket = _socket.prependOnceListener("end", () => { });
+    _socket = _socket.prependOnceListener("error", err => {
+        error = err;
+    });
+    _socket = _socket.prependOnceListener("lookup", (err, address, family, host) => {
+        error = err;
+
+        if (typeof family === 'string') {
+            str = family;
+        } else if (typeof family === 'number') {
+            num = family;
+        }
+
+        str = host;
+    });
+    _socket = _socket.prependOnceListener("timeout", () => { });
+
+    bool = _socket.connecting;
+    bool = _socket.destroyed;
+    _socket.destroy();
+}
+
+{
+    /**
+     * net.Server - events.EventEmitter
+     *   1. close
+     *   2. connection
+     *   3. error
+     *   4. listening
+     */
+    let _server = net.createServer();
+
+    let _socket = net.connect('');
+    let bool: boolean;
+    let error = new Error();
+
+    /// addListener
+    _server = _server.addListener("close", () => { });
+    _server = _server.addListener("connection", socket => {
+        _socket = socket;
+    });
+    _server = _server.addListener("error", err => {
+        error = err;
+    });
+    _server = _server.addListener("listening", () => { });
+
+    /// emit
+    bool = _server.emit("close");
+    bool = _server.emit("connection", _socket);
+    bool = _server.emit("error", error);
+    bool = _server.emit("listening");
+
+    /// once
+    _server = _server.once("close", () => { });
+    _server = _server.once("connection", socket => {
+        _socket = socket;
+    });
+    _server = _server.once("error", err => {
+        error = err;
+    });
+    _server = _server.once("listening", () => { });
+
+    /// prependListener
+    _server = _server.prependListener("close", () => { });
+    _server = _server.prependListener("connection", socket => {
+        _socket = socket;
+    });
+    _server = _server.prependListener("error", err => {
+        error = err;
+    });
+    _server = _server.prependListener("listening", () => { });
+
+    /// prependOnceListener
+    _server = _server.prependOnceListener("close", () => { });
+    _server = _server.prependOnceListener("connection", socket => {
+        _socket = socket;
+    });
+    _server = _server.prependOnceListener("error", err => {
+        error = err;
+    });
+    _server = _server.prependOnceListener("listening", () => { });
+}
diff --git a/types/node/test/readline.ts b/types/node/test/readline.ts
new file mode 100644
index 0000000000..a49eead8ec
--- /dev/null
+++ b/types/node/test/readline.ts
@@ -0,0 +1,185 @@
+import * as readline from 'readline';
+import * as stream from 'stream';
+import * as fs from 'fs';
+
+const rl: readline.ReadLine = readline.createInterface(new stream.Readable());
+
+{
+    const options: readline.ReadLineOptions = {
+        input: new fs.ReadStream()
+    };
+    const input: NodeJS.ReadableStream = new stream.Readable();
+    const output: NodeJS.WritableStream = new stream.Writable();
+    const completer: readline.Completer = str => [['asd'], 'asd'];
+    const terminal = false;
+
+    let result: readline.ReadLine;
+
+    result = readline.createInterface(options);
+    result = readline.createInterface(input);
+    result = readline.createInterface(input, output);
+    result = readline.createInterface(input, output, completer);
+    result = readline.createInterface(input, output, completer, terminal);
+    result = readline.createInterface({
+        input,
+        completer(str: string): readline.CompleterResult {
+            return [['test'], 'test'];
+        }
+    });
+    result = readline.createInterface({
+        input,
+        completer(str: string, callback: (err: any, result: readline.CompleterResult) => void): any {
+            callback(null, [['test'], 'test']);
+        }
+    });
+}
+
+{
+    rl.setPrompt("prompt");
+}
+
+{
+    rl.prompt();
+    rl.prompt(true);
+}
+
+{
+    rl.question("query", (answer: string) => {});
+}
+
+{
+    let result: readline.ReadLine;
+
+    result = rl.pause();
+}
+
+{
+    let result: readline.ReadLine;
+
+    result = rl.resume();
+}
+
+{
+    rl.close();
+}
+
+{
+    const data: string | Buffer = "asd";
+    const key: readline.Key = {};
+
+    rl.write(data);
+    rl.write('asd', key);
+}
+
+{
+    const strm: NodeJS.WritableStream = new stream.Writable();
+    const x = 1;
+    const y = 1;
+
+    readline.cursorTo(strm, x);
+    readline.cursorTo(strm, x, y);
+}
+
+{
+    const strm: NodeJS.ReadableStream = new stream.Readable();
+    const readLineInterface: readline.ReadLine = readline.createInterface(new stream.Readable());
+
+    readline.emitKeypressEvents(strm);
+    readline.emitKeypressEvents(strm, readLineInterface);
+}
+
+{
+    const strm: NodeJS.WritableStream = new stream.Writable();
+    const dx: number | string = 1;
+    const dy: number | string = 1;
+
+    readline.moveCursor(strm, dx, dy);
+}
+
+{
+    const strm: NodeJS.WritableStream = new stream.Writable();
+    readline.clearLine(strm, 1);
+}
+
+{
+    const strm: NodeJS.WritableStream = new stream.Writable();
+
+    readline.clearScreenDown(strm);
+}
+
+{
+    let _rl = readline.createInterface({
+        input: process.stdin,
+    });
+    let _boolean: boolean;
+
+    _rl = _rl.addListener("close", () => { });
+    _rl = _rl.addListener("line", (input) => {
+        const _input: any = input;
+    });
+    _rl = _rl.addListener("pause", () => { });
+    _rl = _rl.addListener("resume", () => { });
+    _rl = _rl.addListener("SIGCONT", () => { });
+    _rl = _rl.addListener("SIGINT", () => { });
+    _rl = _rl.addListener("SIGTSTP", () => { });
+
+    _boolean = _rl.emit("close", () => { });
+    _boolean = _rl.emit("line", () => { });
+    _boolean = _rl.emit("pause", () => { });
+    _boolean = _rl.emit("resume", () => { });
+    _boolean = _rl.emit("SIGCONT", () => { });
+    _boolean = _rl.emit("SIGINT", () => { });
+    _boolean = _rl.emit("SIGTSTP", () => { });
+
+    _rl = _rl.on("close", () => { });
+    _rl = _rl.on("line", (input) => {
+        const _input: any = input;
+    });
+    _rl = _rl.on("pause", () => { });
+    _rl = _rl.on("resume", () => { });
+    _rl = _rl.on("SIGCONT", () => { });
+    _rl = _rl.on("SIGINT", () => { });
+    _rl = _rl.on("SIGTSTP", () => { });
+
+    _rl = _rl.once("close", () => { });
+    _rl = _rl.once("line", (input) => {
+        const _input: any = input;
+    });
+    _rl = _rl.once("pause", () => { });
+    _rl = _rl.once("resume", () => { });
+    _rl = _rl.once("SIGCONT", () => { });
+    _rl = _rl.once("SIGINT", () => { });
+    _rl = _rl.once("SIGTSTP", () => { });
+
+    _rl = _rl.prependListener("close", () => { });
+    _rl = _rl.prependListener("line", (input) => {
+        const _input: any = input;
+    });
+    _rl = _rl.prependListener("pause", () => { });
+    _rl = _rl.prependListener("resume", () => { });
+    _rl = _rl.prependListener("SIGCONT", () => { });
+    _rl = _rl.prependListener("SIGINT", () => { });
+    _rl = _rl.prependListener("SIGTSTP", () => { });
+
+    _rl = _rl.prependOnceListener("close", () => { });
+    _rl = _rl.prependOnceListener("line", (input) => {
+        const _input: any = input;
+    });
+    _rl = _rl.prependOnceListener("pause", () => { });
+    _rl = _rl.prependOnceListener("resume", () => { });
+    _rl = _rl.prependOnceListener("SIGCONT", () => { });
+    _rl = _rl.prependOnceListener("SIGINT", () => { });
+    _rl = _rl.prependOnceListener("SIGTSTP", () => { });
+}
+
+{
+    (async () => {
+        const result = readline.createInterface({
+            input: process.stdin,
+        });
+        // Pending lib upgrade
+        // for await (const line of result) {
+        //
+        // }
+    });
+}
diff --git a/types/node/test/tty.ts b/types/node/test/tty.ts
new file mode 100644
index 0000000000..fdbbee9230
--- /dev/null
+++ b/types/node/test/tty.ts
@@ -0,0 +1,25 @@
+import * as tty from 'tty';
+
+const rs: tty.ReadStream = new tty.ReadStream();
+const ws: tty.WriteStream = new tty.WriteStream();
+
+const rsIsRaw: boolean = rs.isRaw;
+rs.setRawMode(true);
+
+const wsColumns: number = ws.columns;
+const wsRows: number = ws.rows;
+
+ws.clearLine(-1);
+ws.clearLine(0);
+ws.clearLine(1);
+ws.clearScreenDown();
+ws.cursorTo(42, 42);
+ws.addListener('resize', () => {
+});
+ws.getColorDepth();
+ws.getColorDepth({
+});
+ws.clearScreenDown();
+ws.getWindowSize();
+
+const isTTY: boolean = tty.isatty(1);
diff --git a/types/node/test/util.ts b/types/node/test/util.ts
new file mode 100644
index 0000000000..252e8824ae
--- /dev/null
+++ b/types/node/test/util.ts
@@ -0,0 +1,169 @@
+import * as util from 'util';
+import assert = require('assert');
+import { readFile } from 'fs';
+
+{
+    // Old and new util.inspect APIs
+    util.inspect(["This is nice"], false, 5);
+    util.inspect(["This is nice"], false, null);
+    util.inspect(["This is nice"], {
+        colors: true,
+        depth: 5,
+        customInspect: false,
+        showProxy: true,
+        maxArrayLength: 10,
+        breakLength: 20,
+        compact: true,
+        sorted(a, b) {
+            return b.localeCompare(a);
+        },
+        getters: false,
+    });
+    util.inspect(["This is nice"], {
+        colors: true,
+        depth: null,
+        customInspect: false,
+        showProxy: true,
+        maxArrayLength: null,
+        breakLength: Infinity,
+        compact: false,
+        sorted: true,
+        getters: 'set',
+    });
+    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 {
+        static fn(): Promise<void> {
+            assert(arguments.length === 0);
+
+            return Promise.resolve();
+        }
+
+        static fnE(): Promise<void> {
+            assert(arguments.length === 0);
+
+            return Promise.reject(new Error('fail'));
+        }
+
+        static fnT1(arg1: string): Promise<void> {
+            assert(arguments.length === 1 && arg1 === 'parameter');
+
+            return Promise.resolve();
+        }
+
+        static fnT1E(arg1: string): Promise<void> {
+            assert(arguments.length === 1 && arg1 === 'parameter');
+
+            return Promise.reject(new Error('fail'));
+        }
+
+        static fnTResult(): Promise<string> {
+            assert(arguments.length === 0);
+
+            return Promise.resolve('result');
+        }
+
+        static fnTResultE(): Promise<string> {
+            assert(arguments.length === 0);
+
+            return Promise.reject(new Error('fail'));
+        }
+
+        static fnT1TResult(arg1: string): Promise<string> {
+            assert(arguments.length === 1 && arg1 === 'parameter');
+
+            return Promise.resolve('result');
+        }
+
+        static fnT1TResultE(arg1: string): Promise<string> {
+            assert(arguments.length === 1 && arg1 === 'parameter');
+
+            return Promise.reject(new Error('fail'));
+        }
+
+        static test(): void {
+            const cfn = util.callbackify(this.fn);
+            const cfnE = util.callbackify(this.fnE);
+            const cfnT1 = util.callbackify(this.fnT1);
+            const cfnT1E = util.callbackify(this.fnT1E);
+            const cfnTResult = util.callbackify(this.fnTResult);
+            const cfnTResultE = util.callbackify(this.fnTResultE);
+            const cfnT1TResult = util.callbackify(this.fnT1TResult);
+            const cfnT1TResultE = util.callbackify(this.fnT1TResultE);
+
+            cfn((err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === undefined));
+            cfnE((err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
+            cfnT1('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === undefined));
+            cfnT1E('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
+            cfnTResult((err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === 'result'));
+            cfnTResultE((err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
+            cfnT1TResult('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === 'result'));
+            cfnT1TResultE('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
+        }
+    }
+    callbackifyTest.test();
+
+    // util.promisify
+    const readPromised = util.promisify(readFile);
+    const sampleRead: Promise<any> = readPromised(__filename).then((data: Buffer): void => { }).catch((error: Error): void => { });
+    const arg0: () => Promise<number> = util.promisify((cb: (err: Error, result: number) => void): void => { });
+    const arg0NoResult: () => Promise<any> = util.promisify((cb: (err: Error) => void): void => { });
+    const arg1: (arg: string) => Promise<number> = util.promisify((arg: string, cb: (err: Error, result: number) => void): void => { });
+    const arg1NoResult: (arg: string) => Promise<any> = util.promisify((arg: string, cb: (err: Error) => void): void => { });
+    const cbOptionalError: () => Promise<void | {}> = util.promisify((cb: (err?: Error | null) => void): void => { cb(); }); // tslint:disable-line void-return
+    assert(typeof util.promisify.custom === 'symbol');
+    // util.deprecate
+    const foo = () => {};
+    // $ExpectType () => void
+    util.deprecate(foo, 'foo() is deprecated, use bar() instead');
+    // $ExpectType <T extends Function>(fn: T, message: string) => T
+    util.deprecate(util.deprecate, 'deprecate() is deprecated, use bar() instead');
+
+    // util.isDeepStrictEqual
+    util.isDeepStrictEqual({foo: 'bar'}, {foo: 'bar'});
+
+    // util.TextDecoder()
+    const td = new util.TextDecoder();
+    new util.TextDecoder("utf-8");
+    new util.TextDecoder("utf-8", { fatal: true });
+    new util.TextDecoder("utf-8", { fatal: true, ignoreBOM: true });
+    const ignoreBom: boolean = td.ignoreBOM;
+    const fatal: boolean = td.fatal;
+    const encoding: string = td.encoding;
+    td.decode(new Int8Array(1));
+    td.decode(new Int16Array(1));
+    td.decode(new Int32Array(1));
+    td.decode(new Uint8Array(1));
+    td.decode(new Uint16Array(1));
+    td.decode(new Uint32Array(1));
+    td.decode(new Uint8ClampedArray(1));
+    td.decode(new Float32Array(1));
+    td.decode(new Float64Array(1));
+    td.decode(new DataView(new Int8Array(1).buffer));
+    td.decode(new ArrayBuffer(1));
+    td.decode(null);
+    td.decode(null, { stream: true });
+    td.decode(new Int8Array(1), { stream: true });
+    const decode: string = td.decode(new Int8Array(1));
+
+    // util.TextEncoder()
+    const te = new util.TextEncoder();
+    const teEncoding: string = te.encoding;
+    const teEncodeRes: Uint8Array = te.encode("TextEncoder");
+
+    // util.types
+
+    // tslint:disable-next-line:no-construct ban-types
+    const maybeBoxed: number | Number = new Number(1);
+    if (util.types.isBoxedPrimitive(maybeBoxed)) {
+        const boxed: Number = maybeBoxed;
+    }
+    const maybeBoxed2: number | Number = 1;
+    if (!util.types.isBoxedPrimitive(maybeBoxed2)) {
+        const boxed: number = maybeBoxed2;
+    }
+}
diff --git a/types/node/test/worker_threads.ts b/types/node/test/worker_threads.ts
new file mode 100644
index 0000000000..d55304a619
--- /dev/null
+++ b/types/node/test/worker_threads.ts
@@ -0,0 +1,46 @@
+import * as workerThreads from "worker_threads";
+import assert = require("assert");
+
+{
+    if (workerThreads.isMainThread) {
+        module.exports = async function parseJSAsync(script: string) {
+            return new Promise((resolve, reject) => {
+                const worker = new workerThreads.Worker(__filename, {
+                    workerData: script
+                });
+                worker.on('message', resolve);
+                worker.on('error', reject);
+                worker.on('exit', (code) => {
+                    if (code !== 0)
+                        reject(new Error(`Worker stopped with exit code ${code}`));
+                });
+            });
+        };
+    } else {
+        const script = workerThreads.workerData;
+        workerThreads.parentPort!.postMessage(script);
+    }
+}
+
+{
+    const { port1, port2 } = new workerThreads.MessageChannel();
+    port1.on('message', (message) => console.log('received', message));
+    port2.postMessage({ foo: 'bar' });
+}
+
+{
+    if (workerThreads.isMainThread) {
+        const worker = new workerThreads.Worker(__filename);
+        const subChannel = new workerThreads.MessageChannel();
+        worker.postMessage({ hereIsYourPort: subChannel.port1 }, [subChannel.port1]);
+        subChannel.port2.on('message', (value) => {
+            console.log('received:', value);
+        });
+    } else {
+        workerThreads.parentPort!.once('message', (value) => {
+            assert(value.hereIsYourPort instanceof workerThreads.MessagePort);
+            value.hereIsYourPort.postMessage('the worker is sending this');
+            value.hereIsYourPort.close();
+        });
+    }
+}
diff --git a/types/node/timers.d.ts b/types/node/timers.d.ts
new file mode 100644
index 0000000000..e64a6735c3
--- /dev/null
+++ b/types/node/timers.d.ts
@@ -0,0 +1,16 @@
+declare module "timers" {
+    function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
+    namespace setTimeout {
+        function __promisify__(ms: number): Promise<void>;
+        function __promisify__<T>(ms: number, value: T): Promise<T>;
+    }
+    function clearTimeout(timeoutId: NodeJS.Timeout): void;
+    function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
+    function clearInterval(intervalId: NodeJS.Timeout): void;
+    function setImmediate(callback: (...args: any[]) => void, ...args: any[]): NodeJS.Immediate;
+    namespace setImmediate {
+        function __promisify__(): Promise<void>;
+        function __promisify__<T>(value: T): Promise<T>;
+    }
+    function clearImmediate(immediateId: NodeJS.Immediate): void;
+}
diff --git a/types/node/tls.d.ts b/types/node/tls.d.ts
new file mode 100644
index 0000000000..e7222b5a5b
--- /dev/null
+++ b/types/node/tls.d.ts
@@ -0,0 +1,390 @@
+declare module "tls" {
+    import * as crypto from "crypto";
+    import * as dns from "dns";
+    import * as net from "net";
+    import * as stream from "stream";
+
+    const CLIENT_RENEG_LIMIT: number;
+    const CLIENT_RENEG_WINDOW: number;
+
+    interface Certificate {
+        /**
+         * Country code.
+         */
+        C: string;
+        /**
+         * Street.
+         */
+        ST: string;
+        /**
+         * Locality.
+         */
+        L: string;
+        /**
+         * Organization.
+         */
+        O: string;
+        /**
+         * Organizational unit.
+         */
+        OU: string;
+        /**
+         * Common name.
+         */
+        CN: string;
+    }
+
+    interface PeerCertificate {
+        subject: Certificate;
+        issuer: Certificate;
+        subjectaltname: string;
+        infoAccess: { [index: string]: string[] | undefined };
+        modulus: string;
+        exponent: string;
+        valid_from: string;
+        valid_to: string;
+        fingerprint: string;
+        ext_key_usage: string[];
+        serialNumber: string;
+        raw: Buffer;
+    }
+
+    interface DetailedPeerCertificate extends PeerCertificate {
+        issuerCertificate: DetailedPeerCertificate;
+    }
+
+    interface CipherNameAndProtocol {
+        /**
+         * The cipher name.
+         */
+        name: string;
+        /**
+         * SSL/TLS protocol version.
+         */
+        version: string;
+    }
+
+    class TLSSocket extends net.Socket {
+        /**
+         * Construct a new tls.TLSSocket object from an existing TCP socket.
+         */
+        constructor(socket: net.Socket, options?: {
+            /**
+             * An optional TLS context object from tls.createSecureContext()
+             */
+            secureContext?: SecureContext,
+            /**
+             * If true the TLS socket will be instantiated in server-mode.
+             * Defaults to false.
+             */
+            isServer?: boolean,
+            /**
+             * An optional net.Server instance.
+             */
+            server?: net.Server,
+            /**
+             * If true the server will request a certificate from clients that
+             * connect and attempt to verify that certificate. Defaults to
+             * false.
+             */
+            requestCert?: boolean,
+            /**
+             * If true the server will reject any connection which is not
+             * authorized with the list of supplied CAs. This option only has an
+             * effect if requestCert is true. Defaults to false.
+             */
+            rejectUnauthorized?: boolean,
+            /**
+             * An array of strings or a Buffer naming possible NPN protocols.
+             * (Protocols should be ordered by their priority.)
+             */
+            NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array,
+            /**
+             * An array of strings or a Buffer naming possible ALPN protocols.
+             * (Protocols should be ordered by their priority.) When the server
+             * receives both NPN and ALPN extensions from the client, ALPN takes
+             * precedence over NPN and the server does not send an NPN extension
+             * to the client.
+             */
+            ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array,
+            /**
+             * SNICallback(servername, cb) <Function> A function that will be
+             * called if the client supports SNI TLS extension. Two arguments
+             * will be passed when called: servername and cb. SNICallback should
+             * invoke cb(null, ctx), where ctx is a SecureContext instance.
+             * (tls.createSecureContext(...) can be used to get a proper
+             * SecureContext.) If SNICallback wasn't provided the default callback
+             * with high-level API will be used (see below).
+             */
+            SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void,
+            /**
+             * An optional Buffer instance containing a TLS session.
+             */
+            session?: Buffer,
+            /**
+             * If true, specifies that the OCSP status request extension will be
+             * added to the client hello and an 'OCSPResponse' event will be
+             * emitted on the socket before establishing a secure communication
+             */
+            requestOCSP?: boolean
+        });
+
+        /**
+         * A boolean that is true if the peer certificate was signed by one of the specified CAs, otherwise false.
+         */
+        authorized: boolean;
+        /**
+         * The reason why the peer's certificate has not been verified.
+         * This property becomes available only when tlsSocket.authorized === false.
+         */
+        authorizationError: Error;
+        /**
+         * Static boolean value, always true.
+         * May be used to distinguish TLS sockets from regular ones.
+         */
+        encrypted: boolean;
+
+        /**
+         * String containing the selected ALPN protocol.
+         * When ALPN has no selected protocol, tlsSocket.alpnProtocol equals false.
+         */
+        alpnProtocol?: string;
+
+        /**
+         * Returns an object representing the cipher name and the SSL/TLS protocol version of the current connection.
+         * @returns Returns an object representing the cipher name
+         * and the SSL/TLS protocol version of the current connection.
+         */
+        getCipher(): CipherNameAndProtocol;
+        /**
+         * Returns an object representing the peer's certificate.
+         * The returned object has some properties corresponding to the field of the certificate.
+         * If detailed argument is true the full chain with issuer property will be returned,
+         * if false only the top certificate without issuer property.
+         * If the peer does not provide a certificate, it returns null or an empty object.
+         * @param detailed - If true; the full chain with issuer property will be returned.
+         * @returns An object representing the peer's certificate.
+         */
+        getPeerCertificate(detailed: true): DetailedPeerCertificate;
+        getPeerCertificate(detailed?: false): PeerCertificate;
+        getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
+        /**
+         * Returns a string containing the negotiated SSL/TLS protocol version of the current connection.
+         * The value `'unknown'` will be returned for connected sockets that have not completed the handshaking process.
+         * The value `null` will be returned for server sockets or disconnected client sockets.
+         * See https://www.openssl.org/docs/man1.0.2/ssl/SSL_get_version.html for more information.
+         * @returns negotiated SSL/TLS protocol version of the current connection
+         */
+        getProtocol(): string | null;
+        /**
+         * Could be used to speed up handshake establishment when reconnecting to the server.
+         * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
+         */
+        getSession(): any;
+        /**
+         * NOTE: Works only with client TLS sockets.
+         * Useful only for debugging, for session reuse provide session option to tls.connect().
+         * @returns TLS session ticket or undefined if none was negotiated.
+         */
+        getTLSTicket(): any;
+        /**
+         * Initiate TLS renegotiation process.
+         *
+         * NOTE: Can be used to request peer's certificate after the secure connection has been established.
+         * ANOTHER NOTE: When running as the server, socket will be destroyed with an error after handshakeTimeout timeout.
+         * @param options - The options may contain the following fields: rejectUnauthorized,
+         * requestCert (See tls.createServer() for details).
+         * @param callback - callback(err) will be executed with null as err, once the renegotiation
+         * is successfully completed.
+         */
+        renegotiate(options: { rejectUnauthorized?: boolean, requestCert?: boolean }, callback: (err: Error | null) => void): any;
+        /**
+         * Set maximum TLS fragment size (default and maximum value is: 16384, minimum is: 512).
+         * Smaller fragment size decreases buffering latency on the client: large fragments are buffered by
+         * the TLS layer until the entire fragment is received and its integrity is verified;
+         * large fragments can span multiple roundtrips, and their processing can be delayed due to packet
+         * loss or reordering. However, smaller fragments add extra TLS framing bytes and CPU overhead,
+         * which may decrease overall server throughput.
+         * @param size - TLS fragment size (default and maximum value is: 16384, minimum is: 512).
+         * @returns Returns true on success, false otherwise.
+         */
+        setMaxSendFragment(size: number): boolean;
+
+        /**
+         * events.EventEmitter
+         * 1. OCSPResponse
+         * 2. secureConnect
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        addListener(event: "secureConnect", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "OCSPResponse", response: Buffer): boolean;
+        emit(event: "secureConnect"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        on(event: "secureConnect", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        once(event: "secureConnect", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        prependListener(event: "secureConnect", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        prependOnceListener(event: "secureConnect", listener: () => void): this;
+    }
+
+    interface TlsOptions extends SecureContextOptions {
+        handshakeTimeout?: number;
+        requestCert?: boolean;
+        rejectUnauthorized?: boolean;
+        NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void;
+        sessionTimeout?: number;
+        ticketKeys?: Buffer;
+    }
+
+    interface ConnectionOptions extends SecureContextOptions {
+        host?: string;
+        port?: number;
+        path?: string; // Creates unix socket connection to path. If this option is specified, `host` and `port` are ignored.
+        socket?: net.Socket; // Establish secure connection on a given socket rather than creating a new socket
+        rejectUnauthorized?: boolean; // Defaults to true
+        NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        checkServerIdentity?: typeof checkServerIdentity;
+        servername?: string; // SNI TLS Extension
+        session?: Buffer;
+        minDHSize?: number;
+        secureContext?: SecureContext; // If not provided, the entire ConnectionOptions object will be passed to tls.createSecureContext()
+        lookup?: net.LookupFunction;
+        timeout?: number;
+    }
+
+    class Server extends net.Server {
+        addContext(hostName: string, credentials: {
+            key: string;
+            cert: string;
+            ca: string;
+        }): void;
+
+        /**
+         * events.EventEmitter
+         * 1. tlsClientError
+         * 2. newSession
+         * 3. OCSPRequest
+         * 4. resumeSession
+         * 5. secureConnection
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        addListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        addListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        addListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        addListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "tlsClientError", err: Error, tlsSocket: TLSSocket): boolean;
+        emit(event: "newSession", sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void): boolean;
+        emit(event: "OCSPRequest", certificate: Buffer, issuer: Buffer, callback: Function): boolean;
+        emit(event: "resumeSession", sessionId: any, callback: (err: Error, sessionData: any) => void): boolean;
+        emit(event: "secureConnection", tlsSocket: TLSSocket): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        on(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        on(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        on(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        on(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        once(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        once(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        once(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        once(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        prependListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        prependListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        prependListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        prependListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        prependOnceListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        prependOnceListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        prependOnceListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        prependOnceListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+    }
+
+    interface SecurePair {
+        encrypted: any;
+        cleartext: any;
+    }
+
+    type SecureVersion = 'TLSv1.2' | 'TLSv1.1' | 'TLSv1';
+
+    interface SecureContextOptions {
+        pfx?: string | Buffer | Array<string | Buffer | Object>;
+        key?: string | Buffer | Array<Buffer | Object>;
+        passphrase?: string;
+        cert?: string | Buffer | Array<string | Buffer>;
+        ca?: string | Buffer | Array<string | Buffer>;
+        ciphers?: string;
+        honorCipherOrder?: boolean;
+        ecdhCurve?: string;
+        clientCertEngine?: string;
+        crl?: string | Buffer | Array<string | Buffer>;
+        dhparam?: string | Buffer;
+        secureOptions?: number; // Value is a numeric bitmask of the `SSL_OP_*` options
+        secureProtocol?: string; // SSL Method, e.g. SSLv23_method
+        sessionIdContext?: string;
+        /**
+         * Optionally set the maximum TLS version to allow. One
+         * of `TLSv1.2'`, `'TLSv1.1'`, or `'TLSv1'`. Cannot be specified along with the
+         * `secureProtocol` option, use one or the other.  **Default:** `'TLSv1.2'`.
+         */
+        maxVersion?: SecureVersion;
+        /**
+         * Optionally set the minimum TLS version to allow. One
+         * of `TLSv1.2'`, `'TLSv1.1'`, or `'TLSv1'`. Cannot be specified along with the
+         * `secureProtocol` option, use one or the other.  It is not recommended to use
+         * less than TLSv1.2, but it may be required for interoperability.
+         * **Default:** `'TLSv1.2'`, unless changed using CLI options. Using
+         * `--tls-v1.0` changes the default to `'TLSv1'`. Using `--tls-v1.1` changes
+         * the default to `'TLSv1.1'`.
+         */
+        minVersion?: SecureVersion;
+    }
+
+    interface SecureContext {
+        context: any;
+    }
+
+    /*
+     * Verifies the certificate `cert` is issued to host `host`.
+     * @host The hostname to verify the certificate against
+     * @cert PeerCertificate representing the peer's certificate
+     *
+     * Returns Error object, populating it with the reason, host and cert on failure.  On success, returns undefined.
+     */
+    function checkServerIdentity(host: string, cert: PeerCertificate): Error | undefined;
+    function createServer(options: TlsOptions, secureConnectionListener?: (socket: TLSSocket) => void): Server;
+    function connect(options: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
+    function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
+    function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
+    function createSecurePair(credentials?: SecureContext, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair;
+    function createSecureContext(details: SecureContextOptions): SecureContext;
+    function getCiphers(): string[];
+
+    const DEFAULT_ECDH_CURVE: string;
+}
diff --git a/types/node/trace_events.d.ts b/types/node/trace_events.d.ts
new file mode 100644
index 0000000000..9d1a59bdd0
--- /dev/null
+++ b/types/node/trace_events.d.ts
@@ -0,0 +1,61 @@
+declare module "trace_events" {
+    /**
+     * The `Tracing` object is used to enable or disable tracing for sets of
+     * categories. Instances are created using the
+     * `trace_events.createTracing()` method.
+     *
+     * When created, the `Tracing` object is disabled. Calling the
+     * `tracing.enable()` method adds the categories to the set of enabled trace
+     * event categories. Calling `tracing.disable()` will remove the categories
+     * from the set of enabled trace event categories.
+     */
+    export interface Tracing {
+        /**
+         * A comma-separated list of the trace event categories covered by this
+         * `Tracing` object.
+         */
+        readonly categories: string;
+
+        /**
+         * Disables this `Tracing` object.
+         *
+         * Only trace event categories _not_ covered by other enabled `Tracing`
+         * objects and _not_ specified by the `--trace-event-categories` flag
+         * will be disabled.
+         */
+        disable(): void;
+
+        /**
+         * Enables this `Tracing` object for the set of categories covered by
+         * the `Tracing` object.
+         */
+        enable(): void;
+
+        /**
+         * `true` only if the `Tracing` object has been enabled.
+         */
+        readonly enabled: boolean;
+    }
+
+    interface CreateTracingOptions {
+        /**
+         * An array of trace category names. Values included in the array are
+         * coerced to a string when possible. An error will be thrown if the
+         * value cannot be coerced.
+         */
+        categories: string[];
+    }
+
+    /**
+     * Creates and returns a Tracing object for the given set of categories.
+     */
+    export function createTracing(options: CreateTracingOptions): Tracing;
+
+    /**
+     * Returns a comma-separated list of all currently-enabled trace event
+     * categories. The current set of enabled trace event categories is
+     * determined by the union of all currently-enabled `Tracing` objects and
+     * any categories enabled using the `--trace-event-categories` flag.
+     */
+    export function getEnabledCategories(): string;
+}
diff --git a/types/node/ts3.1/index.d.ts b/types/node/ts3.1/index.d.ts
new file mode 100644
index 0000000000..be36602300
--- /dev/null
+++ b/types/node/ts3.1/index.d.ts
@@ -0,0 +1,18 @@
+// NOTE: These definitions support NodeJS and TypeScript 3.1.
+
+// NOTE: TypeScript version-specific augmentations can be found in the following paths:
+//          - ~/base.d.ts         - Shared definitions common to all TypeScript versions
+//          - ~/index.d.ts        - Definitions specific to TypeScript 2.1
+//          - ~/ts3.1/index.d.ts  - Definitions specific to TypeScript 3.1
+
+// Reference required types from the default lib:
+/// <reference lib="es2018" />
+/// <reference lib="esnext.asyncIterable" />
+/// <reference lib="esnext.intl" />
+
+// Base definitions for all NodeJS modules that are not specific to any version of TypeScript:
+// tslint:disable-next-line:no-bad-reference
+/// <reference path="../base.d.ts" />
+
+// TypeScript 3.1-specific augmentations:
+/// <reference path="util.d.ts" />
diff --git a/types/node/ts3.1/node-tests.ts b/types/node/ts3.1/node-tests.ts
new file mode 100644
index 0000000000..18db498871
--- /dev/null
+++ b/types/node/ts3.1/node-tests.ts
@@ -0,0 +1,2 @@
+// tslint:disable-next-line:no-bad-reference
+import "../node-tests";
diff --git a/types/node/ts3.1/tsconfig.json b/types/node/ts3.1/tsconfig.json
new file mode 100644
index 0000000000..c2b32a1695
--- /dev/null
+++ b/types/node/ts3.1/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "files": [
+        "index.d.ts",
+        "node-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/types/node/ts3.1/tslint.json b/types/node/ts3.1/tslint.json
new file mode 100644
index 0000000000..1a8ddd9863
--- /dev/null
+++ b/types/node/ts3.1/tslint.json
@@ -0,0 +1,10 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "ban-types": false,
+    "unified-signatures": false,
+    "no-empty-interface": false,
+    "no-single-declare-module": false,
+    "strict-export-declare-modifiers": false // http2 needs this
+  }
+}
diff --git a/types/node/ts3.1/util.d.ts b/types/node/ts3.1/util.d.ts
new file mode 100644
index 0000000000..e35ef8d0f1
--- /dev/null
+++ b/types/node/ts3.1/util.d.ts
@@ -0,0 +1,10 @@
+// tslint:disable-next-line:no-bad-reference
+/// <reference path="../util.d.ts" />
+declare module "util" {
+    namespace inspect {
+        const custom: unique symbol;
+    }
+    namespace promisify {
+        const custom: unique symbol;
+    }
+}
diff --git a/types/node/tsconfig.json b/types/node/tsconfig.json
index 5c06ec7625..e16d482b6f 100644
--- a/types/node/tsconfig.json
+++ b/types/node/tsconfig.json
@@ -1,8 +1,58 @@
 {
     "files": [
         "index.d.ts",
+        "base.d.ts",
+        "globals.d.ts",
+        "assert.d.ts",
+        "async_hooks.d.ts",
+        "buffer.d.ts",
+        "child_process.d.ts",
+        "cluster.d.ts",
+        "console.d.ts",
+        "constants.d.ts",
+        "crypto.d.ts",
+        "dgram.d.ts",
+        "dns.d.ts",
+        "domain.d.ts",
+        "events.d.ts",
+        "fs.d.ts",
+        "http.d.ts",
+        "http2.d.ts",
+        "https.d.ts",
         "inspector.d.ts",
-        "node-tests.ts"
+        "module.d.ts",
+        "net.d.ts",
+        "os.d.ts",
+        "path.d.ts",
+        "perf_hooks.d.ts",
+        "process.d.ts",
+        "punycode.d.ts",
+        "querystring.d.ts",
+        "readline.d.ts",
+        "repl.d.ts",
+        "stream.d.ts",
+        "string_decoder.d.ts",
+        "timers.d.ts",
+        "tls.d.ts",
+        "trace_events.d.ts",
+        "tty.d.ts",
+        "url.d.ts",
+        "util.d.ts",
+        "v8.d.ts",
+        "vm.d.ts",
+        "worker_threads.d.ts",
+        "zlib.d.ts",
+        "node-tests.ts",
+        "test/http.ts",
+        "test/readline.ts",
+        "test/global.ts",
+        "test/worker_threads.ts",
+        "test/util.ts",
+        "test/net.ts",
+        "test/dgram.ts",
+        "test/buffer.ts",
+        "test/tty.ts",
+        "test/crypto.ts"
     ],
     "compilerOptions": {
         "module": "commonjs",
@@ -13,7 +63,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/node/tslint.json b/types/node/tslint.json
index 5f35deba40..1a8ddd9863 100644
--- a/types/node/tslint.json
+++ b/types/node/tslint.json
@@ -4,6 +4,7 @@
     "ban-types": false,
     "unified-signatures": false,
     "no-empty-interface": false,
+    "no-single-declare-module": false,
     "strict-export-declare-modifiers": false // http2 needs this
   }
 }
diff --git a/types/node/tty.d.ts b/types/node/tty.d.ts
new file mode 100644
index 0000000000..5fadbc2d39
--- /dev/null
+++ b/types/node/tty.d.ts
@@ -0,0 +1,47 @@
+declare module "tty" {
+    import * as net from "net";
+
+    function isatty(fd: number): boolean;
+    class ReadStream extends net.Socket {
+        isRaw: boolean;
+        setRawMode(mode: boolean): void;
+        isTTY: boolean;
+    }
+    /**
+     * -1 - to the left from cursor
+     *  0 - the entire line
+     *  1 - to the right from cursor
+     */
+    type Direction = -1 | 0 | 1;
+    class WriteStream extends net.Socket {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "resize", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "resize"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "resize", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "resize", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "resize", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "resize", listener: () => void): this;
+
+        clearLine(dir: Direction): void;
+        clearScreenDown(): void;
+        cursorTo(x: number, y: number): void;
+        /**
+         * @default `process.env`
+         */
+        getColorDepth(env?: {}): number;
+        getWindowSize(): [number, number];
+        columns: number;
+        rows: number;
+        isTTY: boolean;
+    }
+}
diff --git a/types/node/url.d.ts b/types/node/url.d.ts
new file mode 100644
index 0000000000..1e1d154e8e
--- /dev/null
+++ b/types/node/url.d.ts
@@ -0,0 +1,104 @@
+declare module "url" {
+    import { ParsedUrlQuery } from 'querystring';
+
+    interface UrlObjectCommon {
+        auth?: string;
+        hash?: string;
+        host?: string;
+        hostname?: string;
+        href?: string;
+        path?: string;
+        pathname?: string;
+        protocol?: string;
+        search?: string;
+        slashes?: boolean;
+    }
+
+    // Input to `url.format`
+    interface UrlObject extends UrlObjectCommon {
+        port?: string | number;
+        query?: string | null | { [key: string]: any };
+    }
+
+    // Output of `url.parse`
+    interface Url extends UrlObjectCommon {
+        port?: string;
+        query?: string | null | ParsedUrlQuery;
+    }
+
+    interface UrlWithParsedQuery extends Url {
+        query: ParsedUrlQuery;
+    }
+
+    interface UrlWithStringQuery extends Url {
+        query: string | null;
+    }
+
+    function parse(urlStr: string): UrlWithStringQuery;
+    function parse(urlStr: string, parseQueryString: false | undefined, slashesDenoteHost?: boolean): UrlWithStringQuery;
+    function parse(urlStr: string, parseQueryString: true, slashesDenoteHost?: boolean): UrlWithParsedQuery;
+    function parse(urlStr: string, parseQueryString: boolean, slashesDenoteHost?: boolean): Url;
+
+    function format(URL: URL, options?: URLFormatOptions): string;
+    function format(urlObject: UrlObject | string): string;
+    function resolve(from: string, to: string): string;
+
+    function domainToASCII(domain: string): string;
+    function domainToUnicode(domain: string): string;
+
+    /**
+     * This function ensures the correct decodings of percent-encoded characters as
+     * well as ensuring a cross-platform valid absolute path string.
+     * @param url The file URL string or URL object to convert to a path.
+     */
+    function fileURLToPath(url: string | URL): string;
+
+    /**
+     * This function ensures that path is resolved absolutely, and that the URL
+     * control characters are correctly encoded when converting into a File URL.
+     * @param url The path to convert to a File URL.
+     */
+    function pathToFileURL(url: string): URL;
+
+    interface URLFormatOptions {
+        auth?: boolean;
+        fragment?: boolean;
+        search?: boolean;
+        unicode?: boolean;
+    }
+
+    class URL {
+        constructor(input: string, base?: string | URL);
+        hash: string;
+        host: string;
+        hostname: string;
+        href: string;
+        readonly origin: string;
+        password: string;
+        pathname: string;
+        port: string;
+        protocol: string;
+        search: string;
+        readonly searchParams: URLSearchParams;
+        username: string;
+        toString(): string;
+        toJSON(): string;
+    }
+
+    class URLSearchParams implements Iterable<[string, string]> {
+        constructor(init?: URLSearchParams | string | { [key: string]: string | string[] | undefined } | Iterable<[string, string]> | Array<[string, string]>);
+        append(name: string, value: string): void;
+        delete(name: string): void;
+        entries(): IterableIterator<[string, string]>;
+        forEach(callback: (value: string, name: string, searchParams: this) => void): void;
+        get(name: string): string | null;
+        getAll(name: string): string[];
+        has(name: string): boolean;
+        keys(): IterableIterator<string>;
+        set(name: string, value: string): void;
+        sort(): void;
+        toString(): string;
+        values(): IterableIterator<string>;
+        [Symbol.iterator](): IterableIterator<[string, string]>;
+    }
+}
diff --git a/types/node/util.d.ts b/types/node/util.d.ts
new file mode 100644
index 0000000000..1adf10059f
--- /dev/null
+++ b/types/node/util.d.ts
@@ -0,0 +1,168 @@
+declare module "util" {
+    interface InspectOptions extends NodeJS.InspectOptions { }
+    function format(format: any, ...param: any[]): string;
+    function formatWithOptions(inspectOptions: InspectOptions, format: string, ...param: any[]): string;
+    /** @deprecated since v0.11.3 - use `console.error()` instead. */
+    function debug(string: string): void;
+    /** @deprecated since v0.11.3 - use `console.error()` instead. */
+    function error(...param: any[]): void;
+    /** @deprecated since v0.11.3 - use `console.log()` instead. */
+    function puts(...param: any[]): void;
+    /** @deprecated since v0.11.3 - use `console.log()` instead. */
+    function print(...param: any[]): void;
+    /** @deprecated since v0.11.3 - use a third party module instead. */
+    function log(string: string): void;
+    function inspect(object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
+    function inspect(object: any, options: InspectOptions): string;
+    namespace inspect {
+        let colors: {
+            [color: string]: [number, number] | undefined
+        };
+        let styles: {
+            [style: string]: string | undefined
+        };
+        let defaultOptions: InspectOptions;
+    }
+    /** @deprecated since v4.0.0 - use `Array.isArray()` instead. */
+    function isArray(object: any): object is any[];
+    /** @deprecated since v4.0.0 - use `util.types.isRegExp()` instead. */
+    function isRegExp(object: any): object is RegExp;
+    /** @deprecated since v4.0.0 - use `util.types.isDate()` instead. */
+    function isDate(object: any): object is Date;
+    /** @deprecated since v4.0.0 - use `util.types.isNativeError()` instead. */
+    function isError(object: any): object is Error;
+    function inherits(constructor: any, superConstructor: any): void;
+    function debuglog(key: string): (msg: string, ...param: any[]) => void;
+    /** @deprecated since v4.0.0 - use `typeof value === 'boolean'` instead. */
+    function isBoolean(object: any): object is boolean;
+    /** @deprecated since v4.0.0 - use `Buffer.isBuffer()` instead. */
+    function isBuffer(object: any): object is Buffer;
+    /** @deprecated since v4.0.0 - use `typeof value === 'function'` instead. */
+    function isFunction(object: any): boolean;
+    /** @deprecated since v4.0.0 - use `value === null` instead. */
+    function isNull(object: any): object is null;
+    /** @deprecated since v4.0.0 - use `value === null || value === undefined` instead. */
+    function isNullOrUndefined(object: any): object is null | undefined;
+    /** @deprecated since v4.0.0 - use `typeof value === 'number'` instead. */
+    function isNumber(object: any): object is number;
+    /** @deprecated since v4.0.0 - use `value !== null && typeof value === 'object'` instead. */
+    function isObject(object: any): boolean;
+    /** @deprecated since v4.0.0 - use `(typeof value !== 'object' && typeof value !== 'function') || value === null` instead. */
+    function isPrimitive(object: any): boolean;
+    /** @deprecated since v4.0.0 - use `typeof value === 'string'` instead. */
+    function isString(object: any): object is string;
+    /** @deprecated since v4.0.0 - use `typeof value === 'symbol'` instead. */
+    function isSymbol(object: any): object is symbol;
+    /** @deprecated since v4.0.0 - use `value === undefined` instead. */
+    function isUndefined(object: any): object is undefined;
+    function deprecate<T extends Function>(fn: T, message: string): T;
+    function isDeepStrictEqual(val1: any, val2: any): boolean;
+
+    interface CustomPromisify<TCustom extends Function> extends Function {
+        __promisify__: TCustom;
+    }
+
+    function callbackify(fn: () => Promise<void>): (callback: (err: NodeJS.ErrnoException) => void) => void;
+    function callbackify<TResult>(fn: () => Promise<TResult>): (callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    function callbackify<T1>(fn: (arg1: T1) => Promise<void>): (arg1: T1, callback: (err: NodeJS.ErrnoException) => void) => void;
+    function callbackify<T1, TResult>(fn: (arg1: T1) => Promise<TResult>): (arg1: T1, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    function callbackify<T1, T2>(fn: (arg1: T1, arg2: T2) => Promise<void>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException) => void) => void;
+    function callbackify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2) => Promise<TResult>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    function callbackify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException) => void) => void;
+    function callbackify<T1, T2, T3, TResult>(
+        fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    function callbackify<T1, T2, T3, T4>(
+        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException) => void) => void;
+    function callbackify<T1, T2, T3, T4, TResult>(
+        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    function callbackify<T1, T2, T3, T4, T5>(
+        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException) => void) => void;
+    function callbackify<T1, T2, T3, T4, T5, TResult>(
+        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>,
+    ): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    function callbackify<T1, T2, T3, T4, T5, T6>(
+        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<void>,
+    ): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException) => void) => void;
+    function callbackify<T1, T2, T3, T4, T5, T6, TResult>(
+        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<TResult>
+    ): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+
+    function promisify<TCustom extends Function>(fn: CustomPromisify<TCustom>): TCustom;
+    function promisify<TResult>(fn: (callback: (err: Error | null, result: TResult) => void) => void): () => Promise<TResult>;
+    function promisify(fn: (callback: (err?: Error | null) => void) => void): () => Promise<void>;
+    function promisify<T1, TResult>(fn: (arg1: T1, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1) => Promise<TResult>;
+    function promisify<T1>(fn: (arg1: T1, callback: (err?: Error | null) => void) => void): (arg1: T1) => Promise<void>;
+    function promisify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2) => Promise<TResult>;
+    function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err?: Error | null) => void) => void): (arg1: T1, arg2: T2) => Promise<void>;
+    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>;
+    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>;
+    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>;
+    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>;
+    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>;
+    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>;
+    function promisify(fn: Function): Function;
+
+    namespace types {
+        function isAnyArrayBuffer(object: any): boolean;
+        function isArgumentsObject(object: any): object is IArguments;
+        function isArrayBuffer(object: any): object is ArrayBuffer;
+        function isAsyncFunction(object: any): boolean;
+        function isBooleanObject(object: any): object is Boolean;
+        function isBoxedPrimitive(object: any): object is (Number | Boolean | String | Symbol /* BigInt */);
+        function isDataView(object: any): object is DataView;
+        function isDate(object: any): object is Date;
+        function isExternal(object: any): boolean;
+        function isFloat32Array(object: any): object is Float32Array;
+        function isFloat64Array(object: any): object is Float64Array;
+        function isGeneratorFunction(object: any): boolean;
+        function isGeneratorObject(object: any): boolean;
+        function isInt8Array(object: any): object is Int8Array;
+        function isInt16Array(object: any): object is Int16Array;
+        function isInt32Array(object: any): object is Int32Array;
+        function isMap(object: any): boolean;
+        function isMapIterator(object: any): boolean;
+        function isNativeError(object: any): object is Error;
+        function isNumberObject(object: any): object is Number;
+        function isPromise(object: any): boolean;
+        function isProxy(object: any): boolean;
+        function isRegExp(object: any): object is RegExp;
+        function isSet(object: any): boolean;
+        function isSetIterator(object: any): boolean;
+        function isSharedArrayBuffer(object: any): boolean;
+        function isStringObject(object: any): boolean;
+        function isSymbolObject(object: any): boolean;
+        function isTypedArray(object: any): object is NodeJS.TypedArray;
+        function isUint8Array(object: any): object is Uint8Array;
+        function isUint8ClampedArray(object: any): object is Uint8ClampedArray;
+        function isUint16Array(object: any): object is Uint16Array;
+        function isUint32Array(object: any): object is Uint32Array;
+        function isWeakMap(object: any): boolean;
+        function isWeakSet(object: any): boolean;
+        function isWebAssemblyCompiledModule(object: any): boolean;
+    }
+
+    class TextDecoder {
+        readonly encoding: string;
+        readonly fatal: boolean;
+        readonly ignoreBOM: boolean;
+        constructor(
+          encoding?: string,
+          options?: { fatal?: boolean; ignoreBOM?: boolean }
+        );
+        decode(
+          input?: NodeJS.TypedArray | DataView | ArrayBuffer | null,
+          options?: { stream?: boolean }
+        ): string;
+    }
+
+    class TextEncoder {
+        readonly encoding: string;
+        encode(input?: string): Uint8Array;
+    }
+}
diff --git a/types/node/v10/assert.d.ts b/types/node/v10/assert.d.ts
new file mode 100644
index 0000000000..d73353c5d8
--- /dev/null
+++ b/types/node/v10/assert.d.ts
@@ -0,0 +1,52 @@
+declare module "assert" {
+    function internal(value: any, message?: string | Error): void;
+    namespace internal {
+        class AssertionError implements Error {
+            name: string;
+            message: string;
+            actual: any;
+            expected: any;
+            operator: string;
+            generatedMessage: boolean;
+            code: 'ERR_ASSERTION';
+
+            constructor(options?: {
+                message?: string; actual?: any; expected?: any;
+                operator?: string; stackStartFn?: Function
+            });
+        }
+
+        function fail(message?: string | Error): never;
+        /** @deprecated since v10.0.0 - use fail([message]) or other assert functions instead. */
+        function fail(actual: any, expected: any, message?: string | Error, operator?: string, stackStartFn?: Function): never;
+        function ok(value: any, message?: string | Error): void;
+        /** @deprecated since v9.9.0 - use strictEqual() instead. */
+        function equal(actual: any, expected: any, message?: string | Error): void;
+        /** @deprecated since v9.9.0 - use notStrictEqual() instead. */
+        function notEqual(actual: any, expected: any, message?: string | Error): void;
+        /** @deprecated since v9.9.0 - use deepStrictEqual() instead. */
+        function deepEqual(actual: any, expected: any, message?: string | Error): void;
+        /** @deprecated since v9.9.0 - use notDeepStrictEqual() instead. */
+        function notDeepEqual(actual: any, expected: any, message?: string | Error): void;
+        function strictEqual(actual: any, expected: any, message?: string | Error): void;
+        function notStrictEqual(actual: any, expected: any, message?: string | Error): void;
+        function deepStrictEqual(actual: any, expected: any, message?: string | Error): void;
+        function notDeepStrictEqual(actual: any, expected: any, message?: string | Error): void;
+
+        function throws(block: Function, message?: string | Error): void;
+        function throws(block: Function, error: RegExp | Function | Object | Error, message?: string | Error): void;
+        function doesNotThrow(block: Function, message?: string | Error): void;
+        function doesNotThrow(block: Function, error: RegExp | Function, message?: string | Error): void;
+
+        function ifError(value: any): void;
+
+        function rejects(block: Function | Promise<any>, message?: string | Error): Promise<void>;
+        function rejects(block: Function | Promise<any>, error: RegExp | Function | Object | Error, message?: string | Error): Promise<void>;
+        function doesNotReject(block: Function | Promise<any>, message?: string | Error): Promise<void>;
+        function doesNotReject(block: Function | Promise<any>, error: RegExp | Function, message?: string | Error): Promise<void>;
+
+        const strict: typeof internal;
+    }
+
+    export = internal;
+}
diff --git a/types/node/v10/async_hooks.d.ts b/types/node/v10/async_hooks.d.ts
new file mode 100644
index 0000000000..2c77932ecd
--- /dev/null
+++ b/types/node/v10/async_hooks.d.ts
@@ -0,0 +1,144 @@
+/**
+ * Async Hooks module: https://nodejs.org/api/async_hooks.html
+ */
+declare module "async_hooks" {
+    /**
+     * Returns the asyncId of the current execution context.
+     */
+    function executionAsyncId(): number;
+
+    /**
+     * Returns the ID of the resource responsible for calling the callback that is currently being executed.
+     */
+    function triggerAsyncId(): number;
+
+    interface HookCallbacks {
+        /**
+         * Called when a class is constructed that has the possibility to emit an asynchronous event.
+         * @param asyncId a unique ID for the async resource
+         * @param type the type of the async resource
+         * @param triggerAsyncId the unique ID of the async resource in whose execution context this async resource was created
+         * @param resource reference to the resource representing the async operation, needs to be released during destroy
+         */
+        init?(asyncId: number, type: string, triggerAsyncId: number, resource: Object): void;
+
+        /**
+         * When an asynchronous operation is initiated or completes a callback is called to notify the user.
+         * The before callback is called just before said callback is executed.
+         * @param asyncId the unique identifier assigned to the resource about to execute the callback.
+         */
+        before?(asyncId: number): void;
+
+        /**
+         * Called immediately after the callback specified in before is completed.
+         * @param asyncId the unique identifier assigned to the resource which has executed the callback.
+         */
+        after?(asyncId: number): void;
+
+        /**
+         * Called when a promise has resolve() called. This may not be in the same execution id
+         * as the promise itself.
+         * @param asyncId the unique id for the promise that was resolve()d.
+         */
+        promiseResolve?(asyncId: number): void;
+
+        /**
+         * Called after the resource corresponding to asyncId is destroyed
+         * @param asyncId a unique ID for the async resource
+         */
+        destroy?(asyncId: number): void;
+    }
+
+    interface AsyncHook {
+        /**
+         * Enable the callbacks for a given AsyncHook instance. If no callbacks are provided enabling is a noop.
+         */
+        enable(): this;
+
+        /**
+         * Disable the callbacks for a given AsyncHook instance from the global pool of AsyncHook callbacks to be executed. Once a hook has been disabled it will not be called again until enabled.
+         */
+        disable(): this;
+    }
+
+    /**
+     * Registers functions to be called for different lifetime events of each async operation.
+     * @param options the callbacks to register
+     * @return an AsyncHooks instance used for disabling and enabling hooks
+     */
+    function createHook(options: HookCallbacks): AsyncHook;
+
+    interface AsyncResourceOptions {
+      /**
+       * The ID of the execution context that created this async event.
+       * Default: `executionAsyncId()`
+       */
+      triggerAsyncId?: number;
+
+      /**
+       * Disables automatic `emitDestroy` when the object is garbage collected.
+       * This usually does not need to be set (even if `emitDestroy` is called
+       * manually), unless the resource's `asyncId` is retrieved and the
+       * sensitive API's `emitDestroy` is called with it.
+       * Default: `false`
+       */
+      requireManualDestroy?: boolean;
+    }
+
+    /**
+     * The class AsyncResource was designed to be extended by the embedder's async resources.
+     * Using this users can easily trigger the lifetime events of their own resources.
+     */
+    class AsyncResource {
+        /**
+         * AsyncResource() is meant to be extended. Instantiating a
+         * new AsyncResource() also triggers init. If triggerAsyncId is omitted then
+         * async_hook.executionAsyncId() is used.
+         * @param type The type of async event.
+         * @param triggerAsyncId The ID of the execution context that created
+         *   this async event (default: `executionAsyncId()`), or an
+         *   AsyncResourceOptions object (since 9.3)
+         */
+        constructor(type: string, triggerAsyncId?: number|AsyncResourceOptions);
+
+        /**
+         * Call AsyncHooks before callbacks.
+         * @deprecated since 9.6 - Use asyncResource.runInAsyncScope() instead.
+         */
+        emitBefore(): void;
+
+        /**
+         * Call AsyncHooks after callbacks.
+         * @deprecated since 9.6 - Use asyncResource.runInAsyncScope() instead.
+         */
+        emitAfter(): void;
+
+        /**
+         * Call the provided function with the provided arguments in the
+         * execution context of the async resource. This will establish the
+         * context, trigger the AsyncHooks before callbacks, call the function,
+         * trigger the AsyncHooks after callbacks, and then restore the original
+         * execution context.
+         * @param fn The function to call in the execution context of this
+         *   async resource.
+         * @param thisArg The receiver to be used for the function call.
+         * @param args Optional arguments to pass to the function.
+         */
+        runInAsyncScope<This, Result>(fn: (this: This, ...args: any[]) => Result, thisArg?: This, ...args: any[]): Result;
+
+        /**
+         * Call AsyncHooks destroy callbacks.
+         */
+        emitDestroy(): void;
+
+        /**
+         * @return the unique ID assigned to this AsyncResource instance.
+         */
+        asyncId(): number;
+
+        /**
+         * @return the trigger ID for this AsyncResource instance.
+         */
+        triggerAsyncId(): number;
+    }
+}
diff --git a/types/node/v10/base.d.ts b/types/node/v10/base.d.ts
new file mode 100644
index 0000000000..70983d9515
--- /dev/null
+++ b/types/node/v10/base.d.ts
@@ -0,0 +1,41 @@
+// base definnitions for all NodeJS modules that are not specific to any version of TypeScript
+/// <reference path="globals.d.ts" />
+/// <reference path="assert.d.ts" />
+/// <reference path="async_hooks.d.ts" />
+/// <reference path="buffer.d.ts" />
+/// <reference path="child_process.d.ts" />
+/// <reference path="cluster.d.ts" />
+/// <reference path="console.d.ts" />
+/// <reference path="constants.d.ts" />
+/// <reference path="crypto.d.ts" />
+/// <reference path="dgram.d.ts" />
+/// <reference path="dns.d.ts" />
+/// <reference path="domain.d.ts" />
+/// <reference path="events.d.ts" />
+/// <reference path="fs.d.ts" />
+/// <reference path="http.d.ts" />
+/// <reference path="http2.d.ts" />
+/// <reference path="https.d.ts" />
+/// <reference path="inspector.d.ts" />
+/// <reference path="module.d.ts" />
+/// <reference path="net.d.ts" />
+/// <reference path="os.d.ts" />
+/// <reference path="path.d.ts" />
+/// <reference path="perf_hooks.d.ts" />
+/// <reference path="process.d.ts" />
+/// <reference path="punycode.d.ts" />
+/// <reference path="querystring.d.ts" />
+/// <reference path="readline.d.ts" />
+/// <reference path="repl.d.ts" />
+/// <reference path="stream.d.ts" />
+/// <reference path="string_decoder.d.ts" />
+/// <reference path="timers.d.ts" />
+/// <reference path="tls.d.ts" />
+/// <reference path="trace_events.d.ts" />
+/// <reference path="tty.d.ts" />
+/// <reference path="url.d.ts" />
+/// <reference path="util.d.ts" />
+/// <reference path="v8.d.ts" />
+/// <reference path="vm.d.ts" />
+/// <reference path="worker_threads.d.ts" />
+/// <reference path="zlib.d.ts" />
diff --git a/types/node/v10/buffer.d.ts b/types/node/v10/buffer.d.ts
new file mode 100644
index 0000000000..1d618f2c4b
--- /dev/null
+++ b/types/node/v10/buffer.d.ts
@@ -0,0 +1,12 @@
+declare module "buffer" {
+    export const INSPECT_MAX_BYTES: number;
+    const BuffType: typeof Buffer;
+
+    export const SlowBuffer: {
+        /** @deprecated since v6.0.0, use Buffer.allocUnsafeSlow() */
+        new(size: number): Buffer;
+        prototype: Buffer;
+    };
+
+    export { BuffType as Buffer };
+}
diff --git a/types/node/v10/child_process.d.ts b/types/node/v10/child_process.d.ts
new file mode 100644
index 0000000000..c8d20b8249
--- /dev/null
+++ b/types/node/v10/child_process.d.ts
@@ -0,0 +1,358 @@
+declare module "child_process" {
+    import * as events from "events";
+    import * as stream from "stream";
+    import * as net from "net";
+
+    interface ChildProcess extends events.EventEmitter {
+        stdin: stream.Writable;
+        stdout: stream.Readable;
+        stderr: stream.Readable;
+        stdio: [stream.Writable, stream.Readable, stream.Readable];
+        killed: boolean;
+        pid: number;
+        kill(signal?: string): void;
+        send(message: any, callback?: (error: Error) => void): boolean;
+        send(message: any, sendHandle?: net.Socket | net.Server, callback?: (error: Error) => void): boolean;
+        send(message: any, sendHandle?: net.Socket | net.Server, options?: MessageOptions, callback?: (error: Error) => void): boolean;
+        connected: boolean;
+        disconnect(): void;
+        unref(): void;
+        ref(): void;
+
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. disconnect
+         * 3. error
+         * 4. exit
+         * 5. message
+         */
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: (code: number, signal: string) => void): this;
+        addListener(event: "disconnect", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "exit", listener: (code: number | null, signal: string | null) => void): this;
+        addListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close", code: number, signal: string): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "exit", code: number | null, signal: string | null): boolean;
+        emit(event: "message", message: any, sendHandle: net.Socket | net.Server): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: (code: number, signal: string) => void): this;
+        on(event: "disconnect", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "exit", listener: (code: number | null, signal: string | null) => void): this;
+        on(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: (code: number, signal: string) => void): this;
+        once(event: "disconnect", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "exit", listener: (code: number | null, signal: string | null) => void): this;
+        once(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: (code: number, signal: string) => void): this;
+        prependListener(event: "disconnect", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "exit", listener: (code: number | null, signal: string | null) => void): this;
+        prependListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "disconnect", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "exit", listener: (code: number | null, signal: string | null) => void): this;
+        prependOnceListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+    }
+
+    interface MessageOptions {
+        keepOpen?: boolean;
+    }
+
+    type StdioOptions = "pipe" | "ignore" | "inherit" | Array<("pipe" | "ipc" | "ignore" | "inherit" | stream.Stream | number | null | undefined)>;
+
+    interface SpawnOptions {
+        cwd?: string;
+        env?: NodeJS.ProcessEnv;
+        argv0?: string;
+        stdio?: StdioOptions;
+        detached?: boolean;
+        uid?: number;
+        gid?: number;
+        shell?: boolean | string;
+        windowsVerbatimArguments?: boolean;
+        windowsHide?: boolean;
+    }
+
+    function spawn(command: string, options?: SpawnOptions): ChildProcess;
+    function spawn(command: string, args?: ReadonlyArray<string>, options?: SpawnOptions): ChildProcess;
+
+    interface ExecOptions {
+        cwd?: string;
+        env?: NodeJS.ProcessEnv;
+        shell?: string;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+        uid?: number;
+        gid?: number;
+        windowsHide?: boolean;
+    }
+
+    interface ExecOptionsWithStringEncoding extends ExecOptions {
+        encoding: BufferEncoding;
+    }
+
+    interface ExecOptionsWithBufferEncoding extends ExecOptions {
+        encoding: string | null; // specify `null`.
+    }
+
+    interface ExecException extends Error {
+        cmd?: string;
+        killed?: boolean;
+        code?: number;
+        signal?: string;
+    }
+
+    // no `options` definitely means stdout/stderr are `string`.
+    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`.
+    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`.
+    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`.
+    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`.
+    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`.
+    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.
+    namespace exec {
+        function __promisify__(command: string): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(command: string, options: { encoding: "buffer" | null } & ExecOptions): Promise<{ stdout: Buffer, stderr: Buffer }>;
+        function __promisify__(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(command: string, options: ExecOptions): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(command: string, options?: ({ encoding?: string | null } & ExecOptions) | null): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+    }
+
+    interface ExecFileOptions {
+        cwd?: string;
+        env?: NodeJS.ProcessEnv;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+        uid?: number;
+        gid?: number;
+        windowsHide?: boolean;
+        windowsVerbatimArguments?: boolean;
+    }
+    interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
+        encoding: BufferEncoding;
+    }
+    interface ExecFileOptionsWithBufferEncoding extends ExecFileOptions {
+        encoding: 'buffer' | null;
+    }
+    interface ExecFileOptionsWithOtherEncoding extends ExecFileOptions {
+        encoding: string;
+    }
+
+    function execFile(file: string): ChildProcess;
+    function execFile(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
+    function execFile(file: string, args?: ReadonlyArray<string> | null): ChildProcess;
+    function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
+
+    // no `options` definitely means stdout/stderr are `string`.
+    function execFile(file: string, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    function execFile(file: string, args: ReadonlyArray<string> | undefined | null, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // `options` with `"buffer"` or `null` for `encoding` means stdout/stderr are definitely `Buffer`.
+    function execFile(file: string, options: ExecFileOptionsWithBufferEncoding, callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
+    function execFile(
+        file: string,
+        args: ReadonlyArray<string> | undefined | null,
+        options: ExecFileOptionsWithBufferEncoding,
+        callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void,
+    ): ChildProcess;
+
+    // `options` with well known `encoding` means stdout/stderr are definitely `string`.
+    function execFile(file: string, options: ExecFileOptionsWithStringEncoding, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    function execFile(
+        file: string,
+        args: ReadonlyArray<string> | undefined | null,
+        options: ExecFileOptionsWithStringEncoding,
+        callback: (error: Error | null, stdout: string, stderr: string) => void,
+    ): ChildProcess;
+
+    // `options` with an `encoding` whose type is `string` means stdout/stderr could either be `Buffer` or `string`.
+    // There is no guarantee the `encoding` is unknown as `string` is a superset of `BufferEncoding`.
+    function execFile(
+        file: string,
+        options: ExecFileOptionsWithOtherEncoding,
+        callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void,
+    ): ChildProcess;
+    function execFile(
+        file: string,
+        args: ReadonlyArray<string> | undefined | null,
+        options: ExecFileOptionsWithOtherEncoding,
+        callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void,
+    ): ChildProcess;
+
+    // `options` without an `encoding` means stdout/stderr are definitely `string`.
+    function execFile(file: string, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // fallback if nothing else matches. Worst case is always `string | Buffer`.
+    function execFile(
+        file: string,
+        options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null,
+        callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null,
+    ): ChildProcess;
+    function execFile(
+        file: string,
+        args: ReadonlyArray<string> | undefined | null,
+        options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null,
+        callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null,
+    ): ChildProcess;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace execFile {
+        function __promisify__(file: string): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(file: string, args: string[] | undefined | null): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(file: string, options: ExecFileOptionsWithBufferEncoding): Promise<{ stdout: Buffer, stderr: Buffer }>;
+        function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithBufferEncoding): Promise<{ stdout: Buffer, stderr: Buffer }>;
+        function __promisify__(file: string, options: ExecFileOptionsWithStringEncoding): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithStringEncoding): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(file: string, options: ExecFileOptionsWithOtherEncoding): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+        function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithOtherEncoding): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+        function __promisify__(file: string, options: ExecFileOptions): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptions): Promise<{ stdout: string, stderr: string }>;
+        function __promisify__(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+        function __promisify__(
+            file: string,
+            args: string[] | undefined | null,
+            options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null,
+        ): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+    }
+
+    interface ForkOptions {
+        cwd?: string;
+        env?: NodeJS.ProcessEnv;
+        execPath?: string;
+        execArgv?: string[];
+        silent?: boolean;
+        stdio?: StdioOptions;
+        windowsVerbatimArguments?: boolean;
+        uid?: number;
+        gid?: number;
+    }
+    function fork(modulePath: string, args?: ReadonlyArray<string>, options?: ForkOptions): ChildProcess;
+
+    interface SpawnSyncOptions {
+        argv0?: string; // Not specified in the docs
+        cwd?: string;
+        input?: string | Buffer | NodeJS.TypedArray | DataView;
+        stdio?: StdioOptions;
+        env?: NodeJS.ProcessEnv;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string | number;
+        maxBuffer?: number;
+        encoding?: string;
+        shell?: boolean | string;
+        windowsVerbatimArguments?: boolean;
+        windowsHide?: boolean;
+    }
+    interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
+        encoding: BufferEncoding;
+    }
+    interface SpawnSyncOptionsWithBufferEncoding extends SpawnSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    interface SpawnSyncReturns<T> {
+        pid: number;
+        output: string[];
+        stdout: T;
+        stderr: T;
+        status: number;
+        signal: string;
+        error: Error;
+    }
+    function spawnSync(command: string): SpawnSyncReturns<Buffer>;
+    function spawnSync(command: string, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
+    function spawnSync(command: string, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
+    function spawnSync(command: string, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+    function spawnSync(command: string, args?: ReadonlyArray<string>, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
+    function spawnSync(command: string, args?: ReadonlyArray<string>, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
+    function spawnSync(command: string, args?: ReadonlyArray<string>, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+
+    interface ExecSyncOptions {
+        cwd?: string;
+        input?: string | Buffer | Uint8Array;
+        stdio?: StdioOptions;
+        env?: NodeJS.ProcessEnv;
+        shell?: string;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string | number;
+        maxBuffer?: number;
+        encoding?: string;
+        windowsHide?: boolean;
+    }
+    interface ExecSyncOptionsWithStringEncoding extends ExecSyncOptions {
+        encoding: BufferEncoding;
+    }
+    interface ExecSyncOptionsWithBufferEncoding extends ExecSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    function execSync(command: string): Buffer;
+    function execSync(command: string, options?: ExecSyncOptionsWithStringEncoding): string;
+    function execSync(command: string, options?: ExecSyncOptionsWithBufferEncoding): Buffer;
+    function execSync(command: string, options?: ExecSyncOptions): Buffer;
+
+    interface ExecFileSyncOptions {
+        cwd?: string;
+        input?: string | Buffer | NodeJS.TypedArray | DataView;
+        stdio?: StdioOptions;
+        env?: NodeJS.ProcessEnv;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string | number;
+        maxBuffer?: number;
+        encoding?: string;
+        windowsHide?: boolean;
+        shell?: boolean | string;
+    }
+    interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
+        encoding: BufferEncoding;
+    }
+    interface ExecFileSyncOptionsWithBufferEncoding extends ExecFileSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    function execFileSync(command: string): Buffer;
+    function execFileSync(command: string, options?: ExecFileSyncOptionsWithStringEncoding): string;
+    function execFileSync(command: string, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+    function execFileSync(command: string, options?: ExecFileSyncOptions): Buffer;
+    function execFileSync(command: string, args?: ReadonlyArray<string>, options?: ExecFileSyncOptionsWithStringEncoding): string;
+    function execFileSync(command: string, args?: ReadonlyArray<string>, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+    function execFileSync(command: string, args?: ReadonlyArray<string>, options?: ExecFileSyncOptions): Buffer;
+}
diff --git a/types/node/v10/cluster.d.ts b/types/node/v10/cluster.d.ts
new file mode 100644
index 0000000000..2bfe353140
--- /dev/null
+++ b/types/node/v10/cluster.d.ts
@@ -0,0 +1,261 @@
+declare module "cluster" {
+    import * as child from "child_process";
+    import * as events from "events";
+    import * as net from "net";
+
+    // interfaces
+    interface ClusterSettings {
+        execArgv?: string[]; // default: process.execArgv
+        exec?: string;
+        args?: string[];
+        silent?: boolean;
+        stdio?: any[];
+        uid?: number;
+        gid?: number;
+        inspectPort?: number | (() => number);
+    }
+
+    interface Address {
+        address: string;
+        port: number;
+        addressType: number | "udp4" | "udp6";  // 4, 6, -1, "udp4", "udp6"
+    }
+
+    class Worker extends events.EventEmitter {
+        id: number;
+        process: child.ChildProcess;
+        suicide: boolean;
+        send(message: any, sendHandle?: any, callback?: (error: Error) => void): boolean;
+        kill(signal?: string): void;
+        destroy(signal?: string): void;
+        disconnect(): void;
+        isConnected(): boolean;
+        isDead(): boolean;
+        exitedAfterDisconnect: boolean;
+
+        /**
+         * events.EventEmitter
+         *   1. disconnect
+         *   2. error
+         *   3. exit
+         *   4. listening
+         *   5. message
+         *   6. online
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "disconnect", listener: () => void): this;
+        addListener(event: "error", listener: (error: Error) => void): this;
+        addListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        addListener(event: "listening", listener: (address: Address) => void): this;
+        addListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        addListener(event: "online", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "error", error: Error): boolean;
+        emit(event: "exit", code: number, signal: string): boolean;
+        emit(event: "listening", address: Address): boolean;
+        emit(event: "message", message: any, handle: net.Socket | net.Server): boolean;
+        emit(event: "online"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "disconnect", listener: () => void): this;
+        on(event: "error", listener: (error: Error) => void): this;
+        on(event: "exit", listener: (code: number, signal: string) => void): this;
+        on(event: "listening", listener: (address: Address) => void): this;
+        on(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        on(event: "online", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "disconnect", listener: () => void): this;
+        once(event: "error", listener: (error: Error) => void): this;
+        once(event: "exit", listener: (code: number, signal: string) => void): this;
+        once(event: "listening", listener: (address: Address) => void): this;
+        once(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        once(event: "online", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "disconnect", listener: () => void): this;
+        prependListener(event: "error", listener: (error: Error) => void): this;
+        prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependListener(event: "listening", listener: (address: Address) => void): this;
+        prependListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependListener(event: "online", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "disconnect", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (error: Error) => void): this;
+        prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "listening", listener: (address: Address) => void): this;
+        prependOnceListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependOnceListener(event: "online", listener: () => void): this;
+    }
+
+    interface Cluster extends events.EventEmitter {
+        Worker: Worker;
+        disconnect(callback?: Function): void;
+        fork(env?: any): Worker;
+        isMaster: boolean;
+        isWorker: boolean;
+        // TODO: cluster.schedulingPolicy
+        settings: ClusterSettings;
+        setupMaster(settings?: ClusterSettings): void;
+        worker?: Worker;
+        workers?: {
+            [index: string]: Worker | undefined
+        };
+
+        /**
+         * events.EventEmitter
+         *   1. disconnect
+         *   2. exit
+         *   3. fork
+         *   4. listening
+         *   5. message
+         *   6. online
+         *   7. setup
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        addListener(event: "fork", listener: (worker: Worker) => void): this;
+        addListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        addListener(event: "online", listener: (worker: Worker) => void): this;
+        addListener(event: "setup", listener: (settings: any) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "disconnect", worker: Worker): boolean;
+        emit(event: "exit", worker: Worker, code: number, signal: string): boolean;
+        emit(event: "fork", worker: Worker): boolean;
+        emit(event: "listening", worker: Worker, address: Address): boolean;
+        emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
+        emit(event: "online", worker: Worker): boolean;
+        emit(event: "setup", settings: any): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "disconnect", listener: (worker: Worker) => void): this;
+        on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        on(event: "fork", listener: (worker: Worker) => void): this;
+        on(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        on(event: "online", listener: (worker: Worker) => void): this;
+        on(event: "setup", listener: (settings: any) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "disconnect", listener: (worker: Worker) => void): this;
+        once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        once(event: "fork", listener: (worker: Worker) => void): this;
+        once(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        once(event: "online", listener: (worker: Worker) => void): this;
+        once(event: "setup", listener: (settings: any) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        prependListener(event: "fork", listener: (worker: Worker) => void): this;
+        prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependListener(event: "online", listener: (worker: Worker) => void): this;
+        prependListener(event: "setup", listener: (settings: any) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        prependOnceListener(event: "fork", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        // the handle is a net.Socket or net.Server object, or undefined.
+        prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;
+        prependOnceListener(event: "online", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "setup", listener: (settings: any) => void): this;
+    }
+
+    function disconnect(callback?: Function): void;
+    function fork(env?: any): Worker;
+    const isMaster: boolean;
+    const isWorker: boolean;
+    // TODO: cluster.schedulingPolicy
+    const settings: ClusterSettings;
+    function setupMaster(settings?: ClusterSettings): void;
+    const worker: Worker;
+    const workers: {
+        [index: string]: Worker | undefined
+    };
+
+    /**
+     * events.EventEmitter
+     *   1. disconnect
+     *   2. exit
+     *   3. fork
+     *   4. listening
+     *   5. message
+     *   6. online
+     *   7. setup
+     */
+    function addListener(event: string, listener: (...args: any[]) => void): Cluster;
+    function addListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    function addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    function addListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    function addListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+     // the handle is a net.Socket or net.Server object, or undefined.
+    function addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;
+    function addListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    function addListener(event: "setup", listener: (settings: any) => void): Cluster;
+
+    function emit(event: string | symbol, ...args: any[]): boolean;
+    function emit(event: "disconnect", worker: Worker): boolean;
+    function emit(event: "exit", worker: Worker, code: number, signal: string): boolean;
+    function emit(event: "fork", worker: Worker): boolean;
+    function emit(event: "listening", worker: Worker, address: Address): boolean;
+    function emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
+    function emit(event: "online", worker: Worker): boolean;
+    function emit(event: "setup", settings: any): boolean;
+
+    function on(event: string, listener: (...args: any[]) => void): Cluster;
+    function on(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    function on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    function on(event: "fork", listener: (worker: Worker) => void): Cluster;
+    function on(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    function on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    function on(event: "online", listener: (worker: Worker) => void): Cluster;
+    function on(event: "setup", listener: (settings: any) => void): Cluster;
+
+    function once(event: string, listener: (...args: any[]) => void): Cluster;
+    function once(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    function once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    function once(event: "fork", listener: (worker: Worker) => void): Cluster;
+    function once(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    function once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    function once(event: "online", listener: (worker: Worker) => void): Cluster;
+    function once(event: "setup", listener: (settings: any) => void): Cluster;
+
+    function removeListener(event: string, listener: (...args: any[]) => void): Cluster;
+    function removeAllListeners(event?: string): Cluster;
+    function setMaxListeners(n: number): Cluster;
+    function getMaxListeners(): number;
+    function listeners(event: string): Function[];
+    function listenerCount(type: string): number;
+
+    function prependListener(event: string, listener: (...args: any[]) => void): Cluster;
+    function prependListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    function prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    function prependListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    function prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+     // the handle is a net.Socket or net.Server object, or undefined.
+    function prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;
+    function prependListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    function prependListener(event: "setup", listener: (settings: any) => void): Cluster;
+
+    function prependOnceListener(event: string, listener: (...args: any[]) => void): Cluster;
+    function prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    function prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    function prependOnceListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    function prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+     // the handle is a net.Socket or net.Server object, or undefined.
+    function prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;
+    function prependOnceListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    function prependOnceListener(event: "setup", listener: (settings: any) => void): Cluster;
+
+    function eventNames(): string[];
+}
diff --git a/types/node/v10/console.d.ts b/types/node/v10/console.d.ts
new file mode 100644
index 0000000000..d30d13f871
--- /dev/null
+++ b/types/node/v10/console.d.ts
@@ -0,0 +1,3 @@
+declare module "console" {
+    export = console;
+}
diff --git a/types/node/v10/constants.d.ts b/types/node/v10/constants.d.ts
new file mode 100644
index 0000000000..6c39d64346
--- /dev/null
+++ b/types/node/v10/constants.d.ts
@@ -0,0 +1,279 @@
+declare module "constants" {
+    const E2BIG: number;
+    const EACCES: number;
+    const EADDRINUSE: number;
+    const EADDRNOTAVAIL: number;
+    const EAFNOSUPPORT: number;
+    const EAGAIN: number;
+    const EALREADY: number;
+    const EBADF: number;
+    const EBADMSG: number;
+    const EBUSY: number;
+    const ECANCELED: number;
+    const ECHILD: number;
+    const ECONNABORTED: number;
+    const ECONNREFUSED: number;
+    const ECONNRESET: number;
+    const EDEADLK: number;
+    const EDESTADDRREQ: number;
+    const EDOM: number;
+    const EEXIST: number;
+    const EFAULT: number;
+    const EFBIG: number;
+    const EHOSTUNREACH: number;
+    const EIDRM: number;
+    const EILSEQ: number;
+    const EINPROGRESS: number;
+    const EINTR: number;
+    const EINVAL: number;
+    const EIO: number;
+    const EISCONN: number;
+    const EISDIR: number;
+    const ELOOP: number;
+    const EMFILE: number;
+    const EMLINK: number;
+    const EMSGSIZE: number;
+    const ENAMETOOLONG: number;
+    const ENETDOWN: number;
+    const ENETRESET: number;
+    const ENETUNREACH: number;
+    const ENFILE: number;
+    const ENOBUFS: number;
+    const ENODATA: number;
+    const ENODEV: number;
+    const ENOENT: number;
+    const ENOEXEC: number;
+    const ENOLCK: number;
+    const ENOLINK: number;
+    const ENOMEM: number;
+    const ENOMSG: number;
+    const ENOPROTOOPT: number;
+    const ENOSPC: number;
+    const ENOSR: number;
+    const ENOSTR: number;
+    const ENOSYS: number;
+    const ENOTCONN: number;
+    const ENOTDIR: number;
+    const ENOTEMPTY: number;
+    const ENOTSOCK: number;
+    const ENOTSUP: number;
+    const ENOTTY: number;
+    const ENXIO: number;
+    const EOPNOTSUPP: number;
+    const EOVERFLOW: number;
+    const EPERM: number;
+    const EPIPE: number;
+    const EPROTO: number;
+    const EPROTONOSUPPORT: number;
+    const EPROTOTYPE: number;
+    const ERANGE: number;
+    const EROFS: number;
+    const ESPIPE: number;
+    const ESRCH: number;
+    const ETIME: number;
+    const ETIMEDOUT: number;
+    const ETXTBSY: number;
+    const EWOULDBLOCK: number;
+    const EXDEV: number;
+    const WSAEINTR: number;
+    const WSAEBADF: number;
+    const WSAEACCES: number;
+    const WSAEFAULT: number;
+    const WSAEINVAL: number;
+    const WSAEMFILE: number;
+    const WSAEWOULDBLOCK: number;
+    const WSAEINPROGRESS: number;
+    const WSAEALREADY: number;
+    const WSAENOTSOCK: number;
+    const WSAEDESTADDRREQ: number;
+    const WSAEMSGSIZE: number;
+    const WSAEPROTOTYPE: number;
+    const WSAENOPROTOOPT: number;
+    const WSAEPROTONOSUPPORT: number;
+    const WSAESOCKTNOSUPPORT: number;
+    const WSAEOPNOTSUPP: number;
+    const WSAEPFNOSUPPORT: number;
+    const WSAEAFNOSUPPORT: number;
+    const WSAEADDRINUSE: number;
+    const WSAEADDRNOTAVAIL: number;
+    const WSAENETDOWN: number;
+    const WSAENETUNREACH: number;
+    const WSAENETRESET: number;
+    const WSAECONNABORTED: number;
+    const WSAECONNRESET: number;
+    const WSAENOBUFS: number;
+    const WSAEISCONN: number;
+    const WSAENOTCONN: number;
+    const WSAESHUTDOWN: number;
+    const WSAETOOMANYREFS: number;
+    const WSAETIMEDOUT: number;
+    const WSAECONNREFUSED: number;
+    const WSAELOOP: number;
+    const WSAENAMETOOLONG: number;
+    const WSAEHOSTDOWN: number;
+    const WSAEHOSTUNREACH: number;
+    const WSAENOTEMPTY: number;
+    const WSAEPROCLIM: number;
+    const WSAEUSERS: number;
+    const WSAEDQUOT: number;
+    const WSAESTALE: number;
+    const WSAEREMOTE: number;
+    const WSASYSNOTREADY: number;
+    const WSAVERNOTSUPPORTED: number;
+    const WSANOTINITIALISED: number;
+    const WSAEDISCON: number;
+    const WSAENOMORE: number;
+    const WSAECANCELLED: number;
+    const WSAEINVALIDPROCTABLE: number;
+    const WSAEINVALIDPROVIDER: number;
+    const WSAEPROVIDERFAILEDINIT: number;
+    const WSASYSCALLFAILURE: number;
+    const WSASERVICE_NOT_FOUND: number;
+    const WSATYPE_NOT_FOUND: number;
+    const WSA_E_NO_MORE: number;
+    const WSA_E_CANCELLED: number;
+    const WSAEREFUSED: number;
+    const SIGHUP: number;
+    const SIGINT: number;
+    const SIGILL: number;
+    const SIGABRT: number;
+    const SIGFPE: number;
+    const SIGKILL: number;
+    const SIGSEGV: number;
+    const SIGTERM: number;
+    const SIGBREAK: number;
+    const SIGWINCH: number;
+    const SSL_OP_ALL: number;
+    const SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: number;
+    const SSL_OP_CIPHER_SERVER_PREFERENCE: number;
+    const SSL_OP_CISCO_ANYCONNECT: number;
+    const SSL_OP_COOKIE_EXCHANGE: number;
+    const SSL_OP_CRYPTOPRO_TLSEXT_BUG: number;
+    const SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: number;
+    const SSL_OP_EPHEMERAL_RSA: number;
+    const SSL_OP_LEGACY_SERVER_CONNECT: number;
+    const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: number;
+    const SSL_OP_MICROSOFT_SESS_ID_BUG: number;
+    const SSL_OP_MSIE_SSLV2_RSA_PADDING: number;
+    const SSL_OP_NETSCAPE_CA_DN_BUG: number;
+    const SSL_OP_NETSCAPE_CHALLENGE_BUG: number;
+    const SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG: number;
+    const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: number;
+    const SSL_OP_NO_COMPRESSION: number;
+    const SSL_OP_NO_QUERY_MTU: number;
+    const SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: number;
+    const SSL_OP_NO_SSLv2: number;
+    const SSL_OP_NO_SSLv3: number;
+    const SSL_OP_NO_TICKET: number;
+    const SSL_OP_NO_TLSv1: number;
+    const SSL_OP_NO_TLSv1_1: number;
+    const SSL_OP_NO_TLSv1_2: number;
+    const SSL_OP_PKCS1_CHECK_1: number;
+    const SSL_OP_PKCS1_CHECK_2: number;
+    const SSL_OP_SINGLE_DH_USE: number;
+    const SSL_OP_SINGLE_ECDH_USE: number;
+    const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: number;
+    const SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG: number;
+    const SSL_OP_TLS_BLOCK_PADDING_BUG: number;
+    const SSL_OP_TLS_D5_BUG: number;
+    const SSL_OP_TLS_ROLLBACK_BUG: number;
+    const ENGINE_METHOD_DSA: number;
+    const ENGINE_METHOD_DH: number;
+    const ENGINE_METHOD_RAND: number;
+    const ENGINE_METHOD_ECDH: number;
+    const ENGINE_METHOD_ECDSA: number;
+    const ENGINE_METHOD_CIPHERS: number;
+    const ENGINE_METHOD_DIGESTS: number;
+    const ENGINE_METHOD_STORE: number;
+    const ENGINE_METHOD_PKEY_METHS: number;
+    const ENGINE_METHOD_PKEY_ASN1_METHS: number;
+    const ENGINE_METHOD_ALL: number;
+    const ENGINE_METHOD_NONE: number;
+    const DH_CHECK_P_NOT_SAFE_PRIME: number;
+    const DH_CHECK_P_NOT_PRIME: number;
+    const DH_UNABLE_TO_CHECK_GENERATOR: number;
+    const DH_NOT_SUITABLE_GENERATOR: number;
+    const NPN_ENABLED: number;
+    const RSA_PKCS1_PADDING: number;
+    const RSA_SSLV23_PADDING: number;
+    const RSA_NO_PADDING: number;
+    const RSA_PKCS1_OAEP_PADDING: number;
+    const RSA_X931_PADDING: number;
+    const RSA_PKCS1_PSS_PADDING: number;
+    const POINT_CONVERSION_COMPRESSED: number;
+    const POINT_CONVERSION_UNCOMPRESSED: number;
+    const POINT_CONVERSION_HYBRID: number;
+    const O_RDONLY: number;
+    const O_WRONLY: number;
+    const O_RDWR: number;
+    const S_IFMT: number;
+    const S_IFREG: number;
+    const S_IFDIR: number;
+    const S_IFCHR: number;
+    const S_IFBLK: number;
+    const S_IFIFO: number;
+    const S_IFSOCK: number;
+    const S_IRWXU: number;
+    const S_IRUSR: number;
+    const S_IWUSR: number;
+    const S_IXUSR: number;
+    const S_IRWXG: number;
+    const S_IRGRP: number;
+    const S_IWGRP: number;
+    const S_IXGRP: number;
+    const S_IRWXO: number;
+    const S_IROTH: number;
+    const S_IWOTH: number;
+    const S_IXOTH: number;
+    const S_IFLNK: number;
+    const O_CREAT: number;
+    const O_EXCL: number;
+    const O_NOCTTY: number;
+    const O_DIRECTORY: number;
+    const O_NOATIME: number;
+    const O_NOFOLLOW: number;
+    const O_SYNC: number;
+    const O_DSYNC: number;
+    const O_SYMLINK: number;
+    const O_DIRECT: number;
+    const O_NONBLOCK: number;
+    const O_TRUNC: number;
+    const O_APPEND: number;
+    const F_OK: number;
+    const R_OK: number;
+    const W_OK: number;
+    const X_OK: number;
+    const COPYFILE_EXCL: number;
+    const COPYFILE_FICLONE: number;
+    const COPYFILE_FICLONE_FORCE: number;
+    const UV_UDP_REUSEADDR: number;
+    const SIGQUIT: number;
+    const SIGTRAP: number;
+    const SIGIOT: number;
+    const SIGBUS: number;
+    const SIGUSR1: number;
+    const SIGUSR2: number;
+    const SIGPIPE: number;
+    const SIGALRM: number;
+    const SIGCHLD: number;
+    const SIGSTKFLT: number;
+    const SIGCONT: number;
+    const SIGSTOP: number;
+    const SIGTSTP: number;
+    const SIGTTIN: number;
+    const SIGTTOU: number;
+    const SIGURG: number;
+    const SIGXCPU: number;
+    const SIGXFSZ: number;
+    const SIGVTALRM: number;
+    const SIGPROF: number;
+    const SIGIO: number;
+    const SIGPOLL: number;
+    const SIGPWR: number;
+    const SIGSYS: number;
+    const SIGUNUSED: number;
+    const defaultCoreCipherList: string;
+    const defaultCipherList: string;
+    const ENGINE_METHOD_RSA: number;
+    const ALPN_ENABLED: number;
+}
diff --git a/types/node/v10/crypto.d.ts b/types/node/v10/crypto.d.ts
new file mode 100644
index 0000000000..0d37716a7e
--- /dev/null
+++ b/types/node/v10/crypto.d.ts
@@ -0,0 +1,369 @@
+declare module "crypto" {
+    import * as stream from "stream";
+
+    interface Certificate {
+        exportChallenge(spkac: string | Buffer | NodeJS.TypedArray | DataView): Buffer;
+        exportPublicKey(spkac: string | Buffer | NodeJS.TypedArray | DataView): Buffer;
+        verifySpkac(spkac: Buffer | NodeJS.TypedArray | DataView): boolean;
+    }
+    const Certificate: {
+        new(): Certificate;
+        (): Certificate;
+    };
+
+    /** @deprecated since v10.0.0 */
+    const fips: boolean;
+
+    interface CredentialDetails {
+        pfx: string;
+        key: string;
+        passphrase: string;
+        cert: string;
+        ca: string | string[];
+        crl: string | string[];
+        ciphers: string;
+    }
+    interface Credentials { context?: any; }
+    function createCredentials(details: CredentialDetails): Credentials;
+    function createHash(algorithm: string, options?: stream.TransformOptions): Hash;
+    function createHmac(algorithm: string, key: string | Buffer | NodeJS.TypedArray | DataView, options?: stream.TransformOptions): Hmac;
+
+    type Utf8AsciiLatin1Encoding = "utf8" | "ascii" | "latin1";
+    type HexBase64Latin1Encoding = "latin1" | "hex" | "base64";
+    type Utf8AsciiBinaryEncoding = "utf8" | "ascii" | "binary";
+    type HexBase64BinaryEncoding = "binary" | "base64" | "hex";
+    type ECDHKeyFormat = "compressed" | "uncompressed" | "hybrid";
+
+    interface Hash extends NodeJS.ReadWriteStream {
+        update(data: string | Buffer | NodeJS.TypedArray | DataView): Hash;
+        update(data: string, input_encoding: Utf8AsciiLatin1Encoding): Hash;
+        digest(): Buffer;
+        digest(encoding: HexBase64Latin1Encoding): string;
+    }
+    interface Hmac extends NodeJS.ReadWriteStream {
+        update(data: string | Buffer | NodeJS.TypedArray | DataView): Hmac;
+        update(data: string, input_encoding: Utf8AsciiLatin1Encoding): Hmac;
+        digest(): Buffer;
+        digest(encoding: HexBase64Latin1Encoding): string;
+    }
+    type CipherCCMTypes = 'aes-128-ccm' | 'aes-192-ccm' | 'aes-256-ccm';
+    type CipherGCMTypes = 'aes-128-gcm' | 'aes-192-gcm' | 'aes-256-gcm';
+    interface CipherCCMOptions extends stream.TransformOptions {
+        authTagLength: number;
+    }
+    interface CipherGCMOptions extends stream.TransformOptions {
+        authTagLength?: number;
+    }
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    function createCipher(algorithm: CipherCCMTypes, password: string | Buffer | NodeJS.TypedArray | DataView, options: CipherCCMOptions): CipherCCM;
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    function createCipher(algorithm: CipherGCMTypes, password: string | Buffer | NodeJS.TypedArray | DataView, options?: CipherGCMOptions): CipherGCM;
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    function createCipher(algorithm: string, password: string | Buffer | NodeJS.TypedArray | DataView, options?: stream.TransformOptions): Cipher;
+
+    function createCipheriv(algorithm: CipherCCMTypes, key: string | Buffer | NodeJS.TypedArray | DataView, iv: string | Buffer | NodeJS.TypedArray | DataView, options: CipherCCMOptions): CipherCCM;
+    function createCipheriv(algorithm: CipherGCMTypes, key: string | Buffer | NodeJS.TypedArray | DataView, iv: string | Buffer | NodeJS.TypedArray | DataView, options?: CipherGCMOptions): CipherGCM;
+    function createCipheriv(algorithm: string, key: string | Buffer | NodeJS.TypedArray | DataView, iv: string | Buffer | NodeJS.TypedArray | DataView, options?: stream.TransformOptions): Cipher;
+
+    interface Cipher extends NodeJS.ReadWriteStream {
+        update(data: string | Buffer | NodeJS.TypedArray | DataView): Buffer;
+        update(data: string, input_encoding: Utf8AsciiBinaryEncoding): Buffer;
+        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
+    }
+    interface CipherCCM extends Cipher {
+        setAAD(buffer: Buffer, options: { plaintextLength: number }): this;
+        getAuthTag(): Buffer;
+    }
+    interface CipherGCM extends Cipher {
+        setAAD(buffer: Buffer, options?: { plaintextLength: number }): this;
+        getAuthTag(): Buffer;
+    }
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    function createDecipher(algorithm: CipherCCMTypes, password: string | Buffer | NodeJS.TypedArray | DataView, options: CipherCCMOptions): DecipherCCM;
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    function createDecipher(algorithm: CipherGCMTypes, password: string | Buffer | NodeJS.TypedArray | DataView, options?: CipherGCMOptions): DecipherGCM;
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    function createDecipher(algorithm: string, password: string | Buffer | NodeJS.TypedArray | DataView, options?: stream.TransformOptions): Decipher;
+
+    function createDecipheriv(
+        algorithm: CipherCCMTypes,
+        key: string | Buffer | NodeJS.TypedArray | DataView,
+        iv: string | Buffer | NodeJS.TypedArray | DataView,
+        options: CipherCCMOptions,
+    ): DecipherCCM;
+    function createDecipheriv(
+        algorithm: CipherGCMTypes,
+        key: string | Buffer | NodeJS.TypedArray | DataView,
+        iv: string | Buffer | NodeJS.TypedArray | DataView,
+        options?: CipherGCMOptions,
+    ): DecipherGCM;
+    function createDecipheriv(algorithm: string, key: string | Buffer | NodeJS.TypedArray | DataView, iv: string | Buffer | NodeJS.TypedArray | DataView, options?: stream.TransformOptions): Decipher;
+
+    interface Decipher extends NodeJS.ReadWriteStream {
+        update(data: Buffer | NodeJS.TypedArray | DataView): Buffer;
+        update(data: string, input_encoding: HexBase64BinaryEncoding): Buffer;
+        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 | NodeJS.TypedArray | DataView): this;
+        // setAAD(buffer: Buffer | NodeJS.TypedArray | DataView): this;
+    }
+    interface DecipherCCM extends Decipher {
+        setAuthTag(buffer: Buffer | NodeJS.TypedArray | DataView): this;
+        setAAD(buffer: Buffer | NodeJS.TypedArray | DataView, options: { plaintextLength: number }): this;
+    }
+    interface DecipherGCM extends Decipher {
+        setAuthTag(buffer: Buffer | NodeJS.TypedArray | DataView): this;
+        setAAD(buffer: Buffer | NodeJS.TypedArray | DataView, options?: { plaintextLength: number }): this;
+    }
+
+    function createSign(algorithm: string, options?: stream.WritableOptions): Signer;
+    interface Signer extends NodeJS.WritableStream {
+        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;
+    }
+    function createVerify(algorith: string, options?: stream.WritableOptions): Verify;
+    interface Verify extends NodeJS.WritableStream {
+        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
+    }
+    function createDiffieHellman(prime_length: number, generator?: number | Buffer | NodeJS.TypedArray | DataView): DiffieHellman;
+    function createDiffieHellman(prime: Buffer | NodeJS.TypedArray | DataView): DiffieHellman;
+    function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding): DiffieHellman;
+    function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: number | Buffer | NodeJS.TypedArray | DataView): DiffieHellman;
+    function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: string, generator_encoding: HexBase64Latin1Encoding): DiffieHellman;
+    interface DiffieHellman {
+        generateKeys(): Buffer;
+        generateKeys(encoding: HexBase64Latin1Encoding): string;
+        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;
+        getGenerator(): Buffer;
+        getGenerator(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(): Buffer;
+        getPublicKey(encoding: HexBase64Latin1Encoding): string;
+        getPrivateKey(): Buffer;
+        getPrivateKey(encoding: HexBase64Latin1Encoding): string;
+        setPublicKey(public_key: Buffer | NodeJS.TypedArray | DataView): void;
+        setPublicKey(public_key: string, encoding: string): void;
+        setPrivateKey(private_key: Buffer | NodeJS.TypedArray | DataView): void;
+        setPrivateKey(private_key: string, encoding: string): void;
+        verifyError: number;
+    }
+    function getDiffieHellman(group_name: string): DiffieHellman;
+    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;
+    function pbkdf2Sync(password: string | Buffer | NodeJS.TypedArray | DataView, salt: string | Buffer | NodeJS.TypedArray | DataView, iterations: number, keylen: number, digest: string): Buffer;
+
+    function randomBytes(size: number): Buffer;
+    function randomBytes(size: number, callback: (err: Error | null, buf: Buffer) => void): void;
+    function pseudoRandomBytes(size: number): Buffer;
+    function pseudoRandomBytes(size: number, callback: (err: Error | null, buf: Buffer) => void): void;
+
+    function randomFillSync<T extends Buffer | NodeJS.TypedArray | DataView>(buffer: T, offset?: number, size?: number): T;
+    function randomFill<T extends Buffer | NodeJS.TypedArray | DataView>(buffer: T, callback: (err: Error | null, buf: T) => void): void;
+    function randomFill<T extends Buffer | NodeJS.TypedArray | DataView>(buffer: T, offset: number, callback: (err: Error | null, buf: T) => void): void;
+    function randomFill<T extends Buffer | NodeJS.TypedArray | DataView>(buffer: T, offset: number, size: number, callback: (err: Error | null, buf: T) => void): void;
+
+    interface ScryptOptions {
+        N?: number;
+        r?: number;
+        p?: number;
+        maxmem?: number;
+    }
+    function scrypt(
+        password: string | Buffer | NodeJS.TypedArray | DataView,
+        salt: string | Buffer | NodeJS.TypedArray | DataView,
+        keylen: number, callback: (err: Error | null, derivedKey: Buffer) => void,
+    ): void;
+    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;
+    function scryptSync(password: string | Buffer | NodeJS.TypedArray | DataView, salt: string | Buffer | NodeJS.TypedArray | DataView, keylen: number, options?: ScryptOptions): Buffer;
+
+    interface RsaPublicKey {
+        key: string;
+        padding?: number;
+    }
+    interface RsaPrivateKey {
+        key: string;
+        passphrase?: string;
+        padding?: number;
+    }
+    function publicEncrypt(public_key: string | RsaPublicKey, buffer: Buffer | NodeJS.TypedArray | DataView): Buffer;
+    function privateDecrypt(private_key: string | RsaPrivateKey, buffer: Buffer | NodeJS.TypedArray | DataView): Buffer;
+    function privateEncrypt(private_key: string | RsaPrivateKey, buffer: Buffer | NodeJS.TypedArray | DataView): Buffer;
+    function publicDecrypt(public_key: string | RsaPublicKey, buffer: Buffer | NodeJS.TypedArray | DataView): Buffer;
+    function getCiphers(): string[];
+    function getCurves(): string[];
+    function getHashes(): string[];
+    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 | 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 | NodeJS.TypedArray | DataView): void;
+        setPrivateKey(private_key: string, encoding: HexBase64Latin1Encoding): void;
+    }
+    function createECDH(curve_name: string): ECDH;
+    function timingSafeEqual(a: Buffer | NodeJS.TypedArray | DataView, b: Buffer | NodeJS.TypedArray | DataView): boolean;
+    /** @deprecated since v10.0.0 */
+    const DEFAULT_ENCODING: string;
+
+    export type KeyType = 'rsa' | 'dsa' | 'ec';
+    export type KeyFormat = 'pem' | 'der';
+
+    interface BasePrivateKeyEncodingOptions<T extends KeyFormat> {
+        format: T;
+        cipher: string;
+        passphrase: string;
+    }
+
+    interface RSAKeyPairOptions<PubF extends KeyFormat, PrivF extends KeyFormat> {
+        /**
+         * Key size in bits
+         */
+        modulusLength: number;
+        /**
+         * @default 0x10001
+         */
+        publicExponent?: number;
+
+        publicKeyEncoding: {
+            type: 'pkcs1' | 'spki';
+            format: PubF;
+        };
+        privateKeyEncoding: BasePrivateKeyEncodingOptions<PrivF> & {
+            type: 'pkcs1' | 'pkcs8';
+        };
+    }
+
+    interface DSAKeyPairOptions<PubF extends KeyFormat, PrivF extends KeyFormat> {
+        /**
+         * Key size in bits
+         */
+        modulusLength: number;
+        /**
+         * Size of q in bits
+         */
+        divisorLength: number;
+
+        publicKeyEncoding: {
+            type: 'spki';
+            format: PubF;
+        };
+        privateKeyEncoding: BasePrivateKeyEncodingOptions<PrivF> & {
+            type: 'pkcs8';
+        };
+    }
+
+    interface ECKeyPairOptions<PubF extends KeyFormat, PrivF extends KeyFormat> {
+        /**
+         * Name of the curve to use.
+         */
+        namedCurve: string;
+
+        publicKeyEncoding: {
+            type: 'pkcs1' | 'spki';
+            format: PubF;
+        };
+        privateKeyEncoding: BasePrivateKeyEncodingOptions<PrivF> & {
+            type: 'sec1' | 'pkcs8';
+        };
+    }
+
+    interface KeyPairSyncResult<T1 extends string | Buffer, T2 extends string | Buffer> {
+        publicKey: T1;
+        privateKey: T2;
+    }
+
+    function generateKeyPairSync(type: 'rsa', options: RSAKeyPairOptions<'pem', 'pem'>): KeyPairSyncResult<string, string>;
+    function generateKeyPairSync(type: 'rsa', options: RSAKeyPairOptions<'pem', 'der'>): KeyPairSyncResult<string, Buffer>;
+    function generateKeyPairSync(type: 'rsa', options: RSAKeyPairOptions<'der', 'pem'>): KeyPairSyncResult<Buffer, string>;
+    function generateKeyPairSync(type: 'rsa', options: RSAKeyPairOptions<'der', 'der'>): KeyPairSyncResult<Buffer, Buffer>;
+
+    function generateKeyPairSync(type: 'dsa', options: DSAKeyPairOptions<'pem', 'pem'>): KeyPairSyncResult<string, string>;
+    function generateKeyPairSync(type: 'dsa', options: DSAKeyPairOptions<'pem', 'der'>): KeyPairSyncResult<string, Buffer>;
+    function generateKeyPairSync(type: 'dsa', options: DSAKeyPairOptions<'der', 'pem'>): KeyPairSyncResult<Buffer, string>;
+    function generateKeyPairSync(type: 'dsa', options: DSAKeyPairOptions<'der', 'der'>): KeyPairSyncResult<Buffer, Buffer>;
+
+    function generateKeyPairSync(type: 'ec', options: ECKeyPairOptions<'pem', 'pem'>): KeyPairSyncResult<string, string>;
+    function generateKeyPairSync(type: 'ec', options: ECKeyPairOptions<'pem', 'der'>): KeyPairSyncResult<string, Buffer>;
+    function generateKeyPairSync(type: 'ec', options: ECKeyPairOptions<'der', 'pem'>): KeyPairSyncResult<Buffer, string>;
+    function generateKeyPairSync(type: 'ec', options: ECKeyPairOptions<'der', 'der'>): KeyPairSyncResult<Buffer, Buffer>;
+
+    function generateKeyPair(type: 'rsa', options: RSAKeyPairOptions<'pem', 'pem'>, callback: (err: Error | null, publicKey: string, privateKey: string) => void): void;
+    function generateKeyPair(type: 'rsa', options: RSAKeyPairOptions<'pem', 'der'>, callback: (err: Error | null, publicKey: string, privateKey: Buffer) => void): void;
+    function generateKeyPair(type: 'rsa', options: RSAKeyPairOptions<'der', 'pem'>, callback: (err: Error | null, publicKey: Buffer, privateKey: string) => void): void;
+    function generateKeyPair(type: 'rsa', options: RSAKeyPairOptions<'der', 'der'>, callback: (err: Error | null, publicKey: Buffer, privateKey: Buffer) => void): void;
+
+    function generateKeyPair(type: 'dsa', options: DSAKeyPairOptions<'pem', 'pem'>, callback: (err: Error | null, publicKey: string, privateKey: string) => void): void;
+    function generateKeyPair(type: 'dsa', options: DSAKeyPairOptions<'pem', 'der'>, callback: (err: Error | null, publicKey: string, privateKey: Buffer) => void): void;
+    function generateKeyPair(type: 'dsa', options: DSAKeyPairOptions<'der', 'pem'>, callback: (err: Error | null, publicKey: Buffer, privateKey: string) => void): void;
+    function generateKeyPair(type: 'dsa', options: DSAKeyPairOptions<'der', 'der'>, callback: (err: Error | null, publicKey: Buffer, privateKey: Buffer) => void): void;
+
+    function generateKeyPair(type: 'ec', options: ECKeyPairOptions<'pem', 'pem'>, callback: (err: Error | null, publicKey: string, privateKey: string) => void): void;
+    function generateKeyPair(type: 'ec', options: ECKeyPairOptions<'pem', 'der'>, callback: (err: Error | null, publicKey: string, privateKey: Buffer) => void): void;
+    function generateKeyPair(type: 'ec', options: ECKeyPairOptions<'der', 'pem'>, callback: (err: Error | null, publicKey: Buffer, privateKey: string) => void): void;
+    function generateKeyPair(type: 'ec', options: ECKeyPairOptions<'der', 'der'>, callback: (err: Error | null, publicKey: Buffer, privateKey: Buffer) => void): void;
+
+    namespace generateKeyPair {
+        function __promisify__(type: "rsa", options: RSAKeyPairOptions<'pem', 'pem'>): Promise<{ publicKey: string, privateKey: string }>;
+        function __promisify__(type: "rsa", options: RSAKeyPairOptions<'pem', 'der'>): Promise<{ publicKey: string, privateKey: Buffer }>;
+        function __promisify__(type: "rsa", options: RSAKeyPairOptions<'der', 'pem'>): Promise<{ publicKey: Buffer, privateKey: string }>;
+        function __promisify__(type: "rsa", options: RSAKeyPairOptions<'der', 'der'>): Promise<{ publicKey: Buffer, privateKey: Buffer }>;
+
+        function __promisify__(type: "dsa", options: DSAKeyPairOptions<'pem', 'pem'>): Promise<{ publicKey: string, privateKey: string }>;
+        function __promisify__(type: "dsa", options: DSAKeyPairOptions<'pem', 'der'>): Promise<{ publicKey: string, privateKey: Buffer }>;
+        function __promisify__(type: "dsa", options: DSAKeyPairOptions<'der', 'pem'>): Promise<{ publicKey: Buffer, privateKey: string }>;
+        function __promisify__(type: "dsa", options: DSAKeyPairOptions<'der', 'der'>): Promise<{ publicKey: Buffer, privateKey: Buffer }>;
+
+        function __promisify__(type: "ec", options: ECKeyPairOptions<'pem', 'pem'>): Promise<{ publicKey: string, privateKey: string }>;
+        function __promisify__(type: "ec", options: ECKeyPairOptions<'pem', 'der'>): Promise<{ publicKey: string, privateKey: Buffer }>;
+        function __promisify__(type: "ec", options: ECKeyPairOptions<'der', 'pem'>): Promise<{ publicKey: Buffer, privateKey: string }>;
+        function __promisify__(type: "ec", options: ECKeyPairOptions<'der', 'der'>): Promise<{ publicKey: Buffer, privateKey: Buffer }>;
+    }
+}
diff --git a/types/node/v10/dgram.d.ts b/types/node/v10/dgram.d.ts
new file mode 100644
index 0000000000..48049b47b8
--- /dev/null
+++ b/types/node/v10/dgram.d.ts
@@ -0,0 +1,97 @@
+declare module "dgram" {
+    import { AddressInfo } from "net";
+    import * as dns from "dns";
+    import * as events from "events";
+
+    interface RemoteInfo {
+        address: string;
+        family: string;
+        port: number;
+    }
+
+    interface BindOptions {
+        port: number;
+        address?: string;
+        exclusive?: boolean;
+    }
+
+    type SocketType = "udp4" | "udp6";
+
+    interface SocketOptions {
+        type: SocketType;
+        reuseAddr?: boolean;
+        recvBufferSize?: number;
+        sendBufferSize?: number;
+        lookup?: (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void) => void;
+    }
+
+    function createSocket(type: SocketType, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+    function createSocket(options: SocketOptions, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+
+    class Socket extends events.EventEmitter {
+        send(msg: Buffer | string | Uint8Array | any[], port: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: Buffer | string | Uint8Array, offset: number, length: number, port: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
+        bind(port?: number, address?: string, callback?: () => void): void;
+        bind(port?: number, callback?: () => void): void;
+        bind(callback?: () => void): void;
+        bind(options: BindOptions, callback?: Function): void;
+        close(callback?: () => void): void;
+        address(): AddressInfo | string;
+        setBroadcast(flag: boolean): void;
+        setTTL(ttl: number): void;
+        setMulticastTTL(ttl: number): void;
+        setMulticastInterface(multicastInterface: string): void;
+        setMulticastLoopback(flag: boolean): void;
+        addMembership(multicastAddress: string, multicastInterface?: string): void;
+        dropMembership(multicastAddress: string, multicastInterface?: string): void;
+        ref(): this;
+        unref(): this;
+        setRecvBufferSize(size: number): void;
+        setSendBufferSize(size: number): void;
+        getRecvBufferSize(): number;
+        getSendBufferSize(): number;
+
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. error
+         * 3. listening
+         * 4. message
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "listening", listener: () => void): this;
+        addListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "listening"): boolean;
+        emit(event: "message", msg: Buffer, rinfo: AddressInfo): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "listening", listener: () => void): this;
+        on(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "listening", listener: () => void): this;
+        once(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "listening", listener: () => void): this;
+        prependListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "listening", listener: () => void): this;
+        prependOnceListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+    }
+}
diff --git a/types/node/v10/dns.d.ts b/types/node/v10/dns.d.ts
new file mode 100644
index 0000000000..a77216f797
--- /dev/null
+++ b/types/node/v10/dns.d.ts
@@ -0,0 +1,292 @@
+declare module "dns" {
+    // Supported getaddrinfo flags.
+    const ADDRCONFIG: number;
+    const V4MAPPED: number;
+
+    interface LookupOptions {
+        family?: number;
+        hints?: number;
+        all?: boolean;
+        verbatim?: boolean;
+    }
+
+    interface LookupOneOptions extends LookupOptions {
+        all?: false;
+    }
+
+    interface LookupAllOptions extends LookupOptions {
+        all: true;
+    }
+
+    interface LookupAddress {
+        address: string;
+        family: number;
+    }
+
+    function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+    function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+    function lookup(hostname: string, options: LookupAllOptions, callback: (err: NodeJS.ErrnoException, addresses: LookupAddress[]) => void): void;
+    function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException, address: string | LookupAddress[], family: number) => void): void;
+    function lookup(hostname: string, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace lookup {
+        function __promisify__(hostname: string, options: LookupAllOptions): Promise<{ address: LookupAddress[] }>;
+        function __promisify__(hostname: string, options?: LookupOneOptions | number): Promise<{ address: string, family: number }>;
+        function __promisify__(hostname: string, options?: LookupOptions | number): Promise<{ address: string | LookupAddress[], family?: number }>;
+    }
+
+    function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void;
+
+    namespace lookupService {
+        function __promisify__(address: string, port: number): Promise<{ hostname: string, service: string }>;
+    }
+
+    interface ResolveOptions {
+        ttl: boolean;
+    }
+
+    interface ResolveWithTtlOptions extends ResolveOptions {
+        ttl: true;
+    }
+
+    interface RecordWithTtl {
+        address: string;
+        ttl: number;
+    }
+
+    /** @deprecated Use AnyARecord or AnyAaaaRecord instead. */
+    type AnyRecordWithTtl = AnyARecord | AnyAaaaRecord;
+
+    interface AnyARecord extends RecordWithTtl {
+        type: "A";
+    }
+
+    interface AnyAaaaRecord extends RecordWithTtl {
+        type: "AAAA";
+    }
+
+    interface MxRecord {
+        priority: number;
+        exchange: string;
+    }
+
+    interface AnyMxRecord extends MxRecord {
+        type: "MX";
+    }
+
+    interface NaptrRecord {
+        flags: string;
+        service: string;
+        regexp: string;
+        replacement: string;
+        order: number;
+        preference: number;
+    }
+
+    interface AnyNaptrRecord extends NaptrRecord {
+        type: "NAPTR";
+    }
+
+    interface SoaRecord {
+        nsname: string;
+        hostmaster: string;
+        serial: number;
+        refresh: number;
+        retry: number;
+        expire: number;
+        minttl: number;
+    }
+
+    interface AnySoaRecord extends SoaRecord {
+        type: "SOA";
+    }
+
+    interface SrvRecord {
+        priority: number;
+        weight: number;
+        port: number;
+        name: string;
+    }
+
+    interface AnySrvRecord extends SrvRecord {
+        type: "SRV";
+    }
+
+    interface AnyTxtRecord {
+        type: "TXT";
+        entries: string[];
+    }
+
+    interface AnyNsRecord {
+        type: "NS";
+        value: string;
+    }
+
+    interface AnyPtrRecord {
+        type: "PTR";
+        value: string;
+    }
+
+    interface AnyCnameRecord {
+        type: "CNAME";
+        value: string;
+    }
+
+    type AnyRecord = AnyARecord |
+        AnyAaaaRecord |
+        AnyCnameRecord |
+        AnyMxRecord |
+        AnyNaptrRecord |
+        AnyNsRecord |
+        AnyPtrRecord |
+        AnySoaRecord |
+        AnySrvRecord |
+        AnyTxtRecord;
+
+    function resolve(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve(hostname: string, rrtype: "A", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve(hostname: string, rrtype: "AAAA", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve(hostname: string, rrtype: "ANY", callback: (err: NodeJS.ErrnoException, addresses: AnyRecord[]) => void): void;
+    function resolve(hostname: string, rrtype: "CNAME", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve(hostname: string, rrtype: "MX", callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
+    function resolve(hostname: string, rrtype: "NAPTR", callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
+    function resolve(hostname: string, rrtype: "NS", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve(hostname: string, rrtype: "PTR", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve(hostname: string, rrtype: "SOA", callback: (err: NodeJS.ErrnoException, addresses: SoaRecord) => void): void;
+    function resolve(hostname: string, rrtype: "SRV", callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
+    function resolve(hostname: string, rrtype: "TXT", callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+    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.
+    namespace resolve {
+        function __promisify__(hostname: string, rrtype?: "A" | "AAAA" | "CNAME" | "NS" | "PTR"): Promise<string[]>;
+        function __promisify__(hostname: string, rrtype: "ANY"): Promise<AnyRecord[]>;
+        function __promisify__(hostname: string, rrtype: "MX"): Promise<MxRecord[]>;
+        function __promisify__(hostname: string, rrtype: "NAPTR"): Promise<NaptrRecord[]>;
+        function __promisify__(hostname: string, rrtype: "SOA"): Promise<SoaRecord>;
+        function __promisify__(hostname: string, rrtype: "SRV"): Promise<SrvRecord[]>;
+        function __promisify__(hostname: string, rrtype: "TXT"): Promise<string[][]>;
+        function __promisify__(hostname: string, rrtype: string): Promise<string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][] | AnyRecord[]>;
+    }
+
+    function resolve4(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve4(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
+    function resolve4(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace resolve4 {
+        function __promisify__(hostname: string): Promise<string[]>;
+        function __promisify__(hostname: string, options: ResolveWithTtlOptions): Promise<RecordWithTtl[]>;
+        function __promisify__(hostname: string, options?: ResolveOptions): Promise<string[] | RecordWithTtl[]>;
+    }
+
+    function resolve6(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    function resolve6(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
+    function resolve6(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace resolve6 {
+        function __promisify__(hostname: string): Promise<string[]>;
+        function __promisify__(hostname: string, options: ResolveWithTtlOptions): Promise<RecordWithTtl[]>;
+        function __promisify__(hostname: string, options?: ResolveOptions): Promise<string[] | RecordWithTtl[]>;
+    }
+
+    function resolveCname(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    namespace resolveCname {
+        function __promisify__(hostname: string): Promise<string[]>;
+    }
+
+    function resolveMx(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
+    namespace resolveMx {
+        function __promisify__(hostname: string): Promise<MxRecord[]>;
+    }
+
+    function resolveNaptr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
+    namespace resolveNaptr {
+        function __promisify__(hostname: string): Promise<NaptrRecord[]>;
+    }
+
+    function resolveNs(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    namespace resolveNs {
+        function __promisify__(hostname: string): Promise<string[]>;
+    }
+
+    function resolvePtr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    namespace resolvePtr {
+        function __promisify__(hostname: string): Promise<string[]>;
+    }
+
+    function resolveSoa(hostname: string, callback: (err: NodeJS.ErrnoException, address: SoaRecord) => void): void;
+    namespace resolveSoa {
+        function __promisify__(hostname: string): Promise<SoaRecord>;
+    }
+
+    function resolveSrv(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
+    namespace resolveSrv {
+        function __promisify__(hostname: string): Promise<SrvRecord[]>;
+    }
+
+    function resolveTxt(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+    namespace resolveTxt {
+        function __promisify__(hostname: string): Promise<string[][]>;
+    }
+
+    function resolveAny(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: AnyRecord[]) => void): void;
+    namespace resolveAny {
+        function __promisify__(hostname: string): Promise<AnyRecord[]>;
+    }
+
+    function reverse(ip: string, callback: (err: NodeJS.ErrnoException, hostnames: string[]) => void): void;
+    function setServers(servers: string[]): void;
+    function getServers(): string[];
+
+    // Error codes
+    const NODATA: string;
+    const FORMERR: string;
+    const SERVFAIL: string;
+    const NOTFOUND: string;
+    const NOTIMP: string;
+    const REFUSED: string;
+    const BADQUERY: string;
+    const BADNAME: string;
+    const BADFAMILY: string;
+    const BADRESP: string;
+    const CONNREFUSED: string;
+    const TIMEOUT: string;
+    const EOF: string;
+    const FILE: string;
+    const NOMEM: string;
+    const DESTRUCTION: string;
+    const BADSTR: string;
+    const BADFLAGS: string;
+    const NONAME: string;
+    const BADHINTS: string;
+    const NOTINITIALIZED: string;
+    const LOADIPHLPAPI: string;
+    const ADDRGETNETWORKPARAMS: string;
+    const CANCELLED: string;
+
+    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;
+    }
+}
diff --git a/types/node/v10/domain.d.ts b/types/node/v10/domain.d.ts
new file mode 100644
index 0000000000..6a30decfa5
--- /dev/null
+++ b/types/node/v10/domain.d.ts
@@ -0,0 +1,16 @@
+declare module "domain" {
+    import * as events from "events";
+
+    class Domain extends events.EventEmitter implements NodeJS.Domain {
+        run(fn: Function): void;
+        add(emitter: events.EventEmitter): void;
+        remove(emitter: events.EventEmitter): void;
+        bind(cb: (err: Error, data: any) => any): any;
+        intercept(cb: (data: any) => any): any;
+        members: any[];
+        enter(): void;
+        exit(): void;
+    }
+
+    function create(): Domain;
+}
diff --git a/types/node/v10/events.d.ts b/types/node/v10/events.d.ts
new file mode 100644
index 0000000000..dd0d8d191b
--- /dev/null
+++ b/types/node/v10/events.d.ts
@@ -0,0 +1,29 @@
+declare module "events" {
+    class internal extends NodeJS.EventEmitter { }
+
+    namespace internal {
+         class EventEmitter extends internal {
+            /** @deprecated since v4.0.0 */
+            static listenerCount(emitter: EventEmitter, event: string | symbol): number;
+            static defaultMaxListeners: number;
+
+            addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            on(event: string | symbol, listener: (...args: any[]) => void): this;
+            once(event: string | symbol, listener: (...args: any[]) => void): this;
+            prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            off(event: string | symbol, listener: (...args: any[]) => void): this;
+            removeAllListeners(event?: string | symbol): this;
+            setMaxListeners(n: number): this;
+            getMaxListeners(): number;
+            listeners(event: string | symbol): Function[];
+            rawListeners(event: string | symbol): Function[];
+            emit(event: string | symbol, ...args: any[]): boolean;
+            eventNames(): Array<string | symbol>;
+            listenerCount(type: string | symbol): number;
+        }
+    }
+
+    export = internal;
+}
diff --git a/types/node/v10/fs.d.ts b/types/node/v10/fs.d.ts
new file mode 100644
index 0000000000..e3718475e5
--- /dev/null
+++ b/types/node/v10/fs.d.ts
@@ -0,0 +1,2272 @@
+declare module "fs" {
+    import * as stream from "stream";
+    import * as events from "events";
+    import { URL } from "url";
+
+    /**
+     * Valid types for path values in "fs".
+     */
+    type PathLike = string | Buffer | URL;
+
+    type BinaryData = Buffer | DataView | NodeJS.TypedArray;
+    class Stats {
+        isFile(): boolean;
+        isDirectory(): boolean;
+        isBlockDevice(): boolean;
+        isCharacterDevice(): boolean;
+        isSymbolicLink(): boolean;
+        isFIFO(): boolean;
+        isSocket(): boolean;
+        dev: number;
+        ino: number;
+        mode: number;
+        nlink: number;
+        uid: number;
+        gid: number;
+        rdev: number;
+        size: number;
+        blksize: number;
+        blocks: number;
+        atimeMs: number;
+        mtimeMs: number;
+        ctimeMs: number;
+        birthtimeMs: number;
+        atime: Date;
+        mtime: Date;
+        ctime: Date;
+        birthtime: Date;
+    }
+
+    class Dirent {
+        isFile(): boolean;
+        isDirectory(): boolean;
+        isBlockDevice(): boolean;
+        isCharacterDevice(): boolean;
+        isSymbolicLink(): boolean;
+        isFIFO(): boolean;
+        isSocket(): boolean;
+        name: string;
+    }
+
+    interface FSWatcher extends events.EventEmitter {
+        close(): void;
+
+        /**
+         * events.EventEmitter
+         *   1. change
+         *   2. error
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        addListener(event: "error", listener: (error: Error) => void): this;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        on(event: "error", listener: (error: Error) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        once(event: "error", listener: (error: Error) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        prependListener(event: "error", listener: (error: Error) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        prependOnceListener(event: "error", listener: (error: Error) => void): this;
+    }
+
+    class ReadStream extends stream.Readable {
+        close(): void;
+        bytesRead: number;
+        path: string | Buffer;
+
+        /**
+         * events.EventEmitter
+         *   1. open
+         *   2. close
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "open", listener: (fd: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "open", listener: (fd: number) => void): this;
+        on(event: "close", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "open", listener: (fd: number) => void): this;
+        once(event: "close", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "open", listener: (fd: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "open", listener: (fd: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+    }
+
+    class WriteStream extends stream.Writable {
+        close(): void;
+        bytesWritten: number;
+        path: string | Buffer;
+
+        /**
+         * events.EventEmitter
+         *   1. open
+         *   2. close
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "open", listener: (fd: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "open", listener: (fd: number) => void): this;
+        on(event: "close", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "open", listener: (fd: number) => void): this;
+        once(event: "close", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "open", listener: (fd: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "open", listener: (fd: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+    }
+
+    /**
+     * Asynchronous rename(2) - Change the name or location of a file or directory.
+     * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function rename(oldPath: PathLike, newPath: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace rename {
+        /**
+         * Asynchronous rename(2) - Change the name or location of a file or directory.
+         * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        function __promisify__(oldPath: PathLike, newPath: PathLike): Promise<void>;
+    }
+
+    /**
+     * Synchronous rename(2) - Change the name or location of a file or directory.
+     * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function renameSync(oldPath: PathLike, newPath: PathLike): void;
+
+    /**
+     * Asynchronous truncate(2) - Truncate a file to a specified length.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param len If not specified, defaults to `0`.
+     */
+    function truncate(path: PathLike, len: number | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronous truncate(2) - Truncate a file to a specified length.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function truncate(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace truncate {
+        /**
+         * Asynchronous truncate(2) - Truncate a file to a specified length.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param len If not specified, defaults to `0`.
+         */
+        function __promisify__(path: PathLike, len?: number | null): Promise<void>;
+    }
+
+    /**
+     * Synchronous truncate(2) - Truncate a file to a specified length.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param len If not specified, defaults to `0`.
+     */
+    function truncateSync(path: PathLike, len?: number | null): void;
+
+    /**
+     * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+     * @param fd A file descriptor.
+     * @param len If not specified, defaults to `0`.
+     */
+    function ftruncate(fd: number, len: number | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+     * @param fd A file descriptor.
+     */
+    function ftruncate(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace ftruncate {
+        /**
+         * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+         * @param fd A file descriptor.
+         * @param len If not specified, defaults to `0`.
+         */
+        function __promisify__(fd: number, len?: number | null): Promise<void>;
+    }
+
+    /**
+     * Synchronous ftruncate(2) - Truncate a file to a specified length.
+     * @param fd A file descriptor.
+     * @param len If not specified, defaults to `0`.
+     */
+    function ftruncateSync(fd: number, len?: number | null): void;
+
+    /**
+     * Asynchronous chown(2) - Change ownership of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function chown(path: PathLike, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace chown {
+        /**
+         * Asynchronous chown(2) - Change ownership of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function __promisify__(path: PathLike, uid: number, gid: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous chown(2) - Change ownership of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function chownSync(path: PathLike, uid: number, gid: number): void;
+
+    /**
+     * Asynchronous fchown(2) - Change ownership of a file.
+     * @param fd A file descriptor.
+     */
+    function fchown(fd: number, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace fchown {
+        /**
+         * Asynchronous fchown(2) - Change ownership of a file.
+         * @param fd A file descriptor.
+         */
+        function __promisify__(fd: number, uid: number, gid: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fchown(2) - Change ownership of a file.
+     * @param fd A file descriptor.
+     */
+    function fchownSync(fd: number, uid: number, gid: number): void;
+
+    /**
+     * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function lchown(path: PathLike, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace lchown {
+        /**
+         * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function __promisify__(path: PathLike, uid: number, gid: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function lchownSync(path: PathLike, uid: number, gid: number): void;
+
+    /**
+     * Asynchronous chmod(2) - Change permissions of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    function chmod(path: PathLike, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace chmod {
+        /**
+         * Asynchronous chmod(2) - Change permissions of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        function __promisify__(path: PathLike, mode: string | number): Promise<void>;
+    }
+
+    /**
+     * Synchronous chmod(2) - Change permissions of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    function chmodSync(path: PathLike, mode: string | number): void;
+
+    /**
+     * Asynchronous fchmod(2) - Change permissions of a file.
+     * @param fd A file descriptor.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    function fchmod(fd: number, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace fchmod {
+        /**
+         * Asynchronous fchmod(2) - Change permissions of a file.
+         * @param fd A file descriptor.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        function __promisify__(fd: number, mode: string | number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fchmod(2) - Change permissions of a file.
+     * @param fd A file descriptor.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    function fchmodSync(fd: number, mode: string | number): void;
+
+    /**
+     * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    function lchmod(path: PathLike, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace lchmod {
+        /**
+         * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        function __promisify__(path: PathLike, mode: string | number): Promise<void>;
+    }
+
+    /**
+     * Synchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+     */
+    function lchmodSync(path: PathLike, mode: string | number): void;
+
+    /**
+     * Asynchronous stat(2) - Get file status.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function stat(path: PathLike, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace stat {
+        /**
+         * Asynchronous stat(2) - Get file status.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function __promisify__(path: PathLike): Promise<Stats>;
+    }
+
+    /**
+     * Synchronous stat(2) - Get file status.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function statSync(path: PathLike): Stats;
+
+    /**
+     * Asynchronous fstat(2) - Get file status.
+     * @param fd A file descriptor.
+     */
+    function fstat(fd: number, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace fstat {
+        /**
+         * Asynchronous fstat(2) - Get file status.
+         * @param fd A file descriptor.
+         */
+        function __promisify__(fd: number): Promise<Stats>;
+    }
+
+    /**
+     * Synchronous fstat(2) - Get file status.
+     * @param fd A file descriptor.
+     */
+    function fstatSync(fd: number): Stats;
+
+    /**
+     * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function lstat(path: PathLike, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace lstat {
+        /**
+         * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function __promisify__(path: PathLike): Promise<Stats>;
+    }
+
+    /**
+     * Synchronous lstat(2) - Get file status. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function lstatSync(path: PathLike): Stats;
+
+    /**
+     * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+     * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function link(existingPath: PathLike, newPath: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace link {
+        /**
+         * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+         * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function link(existingPath: PathLike, newPath: PathLike): Promise<void>;
+    }
+
+    /**
+     * Synchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+     * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function linkSync(existingPath: PathLike, newPath: PathLike): void;
+
+    /**
+     * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+     * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+     * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+     */
+    function symlink(target: PathLike, path: PathLike, type: symlink.Type | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+     */
+    function symlink(target: PathLike, path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace symlink {
+        /**
+         * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+         * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+         * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+         * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+         * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+         */
+        function __promisify__(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
+
+        type Type = "dir" | "file" | "junction";
+    }
+
+    /**
+     * Synchronous symlink(2) - Create a new symbolic link to an existing file.
+     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+     * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+     * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+     */
+    function symlinkSync(target: PathLike, path: PathLike, type?: symlink.Type | null): void;
+
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readlink(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, linkString: string) => void): void;
+
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readlink(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, linkString: Buffer) => void): void;
+
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readlink(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, linkString: string | Buffer) => void): void;
+
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function readlink(path: PathLike, callback: (err: NodeJS.ErrnoException, linkString: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace readlink {
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+    }
+
+    /**
+     * Synchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readlinkSync(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
+
+    /**
+     * Synchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readlinkSync(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
+
+    /**
+     * Synchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readlinkSync(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
+
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function realpath(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
+
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function realpath(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, resolvedPath: Buffer) => void): void;
+
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function realpath(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string | Buffer) => void): void;
+
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function realpath(path: PathLike, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace realpath {
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+
+        function native(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
+        function native(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, resolvedPath: Buffer) => void): void;
+        function native(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string | Buffer) => void): void;
+        function native(path: PathLike, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
+    }
+
+    /**
+     * Synchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function realpathSync(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
+
+    /**
+     * Synchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function realpathSync(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
+
+    /**
+     * Synchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function realpathSync(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
+
+    namespace realpathSync {
+        function native(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
+        function native(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
+        function native(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
+    }
+
+    /**
+     * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function unlink(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace unlink {
+        /**
+         * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function __promisify__(path: PathLike): Promise<void>;
+    }
+
+    /**
+     * Synchronous unlink(2) - delete a name and possibly the file it refers to.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function unlinkSync(path: PathLike): void;
+
+    /**
+     * Asynchronous rmdir(2) - delete a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function rmdir(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace rmdir {
+        /**
+         * Asynchronous rmdir(2) - delete a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function __promisify__(path: PathLike): Promise<void>;
+    }
+
+    /**
+     * Synchronous rmdir(2) - delete a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function rmdirSync(path: PathLike): void;
+
+    export interface MakeDirectoryOptions {
+        /**
+         * Indicates whether parent folders should be created.
+         * @default false
+         */
+        recursive?: boolean;
+        /**
+         * A file mode. If a string is passed, it is parsed as an octal integer. If not specified
+         * @default 0o777.
+         */
+        mode?: number;
+    }
+
+    /**
+     * Asynchronous mkdir(2) - create a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options Either the file mode, or an object optionally specifying the file mode and whether parent folders
+     * should be created. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+     */
+    function mkdir(path: PathLike, options: number | string | MakeDirectoryOptions | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronous mkdir(2) - create a directory with a mode of `0o777`.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function mkdir(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace mkdir {
+        /**
+         * Asynchronous mkdir(2) - create a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options Either the file mode, or an object optionally specifying the file mode and whether parent folders
+         * should be created. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+         */
+        function __promisify__(path: PathLike, options?: number | string | MakeDirectoryOptions | null): Promise<void>;
+    }
+
+    /**
+     * Synchronous mkdir(2) - create a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options Either the file mode, or an object optionally specifying the file mode and whether parent folders
+     * should be created. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+     */
+    function mkdirSync(path: PathLike, options?: number | string | MakeDirectoryOptions | null): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function mkdtemp(prefix: string, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, folder: string) => void): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function mkdtemp(prefix: string, options: "buffer" | { encoding: "buffer" }, callback: (err: NodeJS.ErrnoException, folder: Buffer) => void): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function mkdtemp(prefix: string, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, folder: string | Buffer) => void): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     */
+    function mkdtemp(prefix: string, callback: (err: NodeJS.ErrnoException, folder: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace mkdtemp {
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(prefix: string, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(prefix: string, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+    }
+
+    /**
+     * Synchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function mkdtempSync(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
+
+    /**
+     * Synchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function mkdtempSync(prefix: string, options: { encoding: "buffer" } | "buffer"): Buffer;
+
+    /**
+     * Synchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function mkdtempSync(prefix: string, options?: { encoding?: string | null } | string | null): string | Buffer;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readdir(
+        path: PathLike,
+        options: { encoding: BufferEncoding | null; withFileTypes?: false } | BufferEncoding | undefined | null,
+        callback: (err: NodeJS.ErrnoException, files: string[]) => void,
+    ): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readdir(path: PathLike, options: { encoding: "buffer"; withFileTypes?: false } | "buffer", callback: (err: NodeJS.ErrnoException, files: Buffer[]) => void): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readdir(
+        path: PathLike,
+        options: { encoding?: string | null; withFileTypes?: false } | string | undefined | null,
+        callback: (err: NodeJS.ErrnoException, files: string[] | Buffer[]) => void,
+    ): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function readdir(path: PathLike, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options If called with `withFileTypes: true` the result data will be an array of Dirent.
+     */
+    function readdir(path: PathLike, options: { withFileTypes: true }, callback: (err: NodeJS.ErrnoException, files: Dirent[]) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace readdir {
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options?: { encoding: BufferEncoding | null; withFileTypes?: false } | BufferEncoding | null): Promise<string[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options: "buffer" | { encoding: "buffer"; withFileTypes?: false }): Promise<Buffer[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function __promisify__(path: PathLike, options?: { encoding?: string | null; withFileTypes?: false } | string | null): Promise<string[] | Buffer[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options If called with `withFileTypes: true` the result data will be an array of Dirent
+         */
+        function __promisify__(path: PathLike, options: { withFileTypes: true }): Promise<Dirent[]>;
+    }
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readdirSync(path: PathLike, options?: { encoding: BufferEncoding | null; withFileTypes?: false } | BufferEncoding | null): string[];
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readdirSync(path: PathLike, options: { encoding: "buffer"; withFileTypes?: false } | "buffer"): Buffer[];
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    function readdirSync(path: PathLike, options?: { encoding?: string | null; withFileTypes?: false } | string | null): string[] | Buffer[];
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options If called with `withFileTypes: true` the result data will be an array of Dirent.
+     */
+    function readdirSync(path: PathLike, options: { withFileTypes: true }): Dirent[];
+
+    /**
+     * Asynchronous close(2) - close a file descriptor.
+     * @param fd A file descriptor.
+     */
+    function close(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace close {
+        /**
+         * Asynchronous close(2) - close a file descriptor.
+         * @param fd A file descriptor.
+         */
+        function __promisify__(fd: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous close(2) - close a file descriptor.
+     * @param fd A file descriptor.
+     */
+    function closeSync(fd: number): void;
+
+    /**
+     * Asynchronous open(2) - open and possibly create a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
+     */
+    function open(path: PathLike, flags: string | number, mode: string | number | undefined | null, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
+
+    /**
+     * Asynchronous open(2) - open and possibly create a file. If the file is created, its mode will be `0o666`.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    function open(path: PathLike, flags: string | number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace open {
+        /**
+         * Asynchronous open(2) - open and possibly create a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
+         */
+        function __promisify__(path: PathLike, flags: string | number, mode?: string | number | null): Promise<number>;
+    }
+
+    /**
+     * Synchronous open(2) - open and possibly create a file, returning a file descriptor..
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
+     */
+    function openSync(path: PathLike, flags: string | number, mode?: string | number | null): number;
+
+    /**
+     * Asynchronously change file timestamps of the file referenced by the supplied path.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    function utimes(path: PathLike, atime: string | number | Date, mtime: string | number | Date, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace utimes {
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied path.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        function __promisify__(path: PathLike, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+    }
+
+    /**
+     * Synchronously change file timestamps of the file referenced by the supplied path.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    function utimesSync(path: PathLike, atime: string | number | Date, mtime: string | number | Date): void;
+
+    /**
+     * Asynchronously change file timestamps of the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    function futimes(fd: number, atime: string | number | Date, mtime: string | number | Date, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace futimes {
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied file descriptor.
+         * @param fd A file descriptor.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        function __promisify__(fd: number, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+    }
+
+    /**
+     * Synchronously change file timestamps of the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    function futimesSync(fd: number, atime: string | number | Date, mtime: string | number | Date): void;
+
+    /**
+     * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+     * @param fd A file descriptor.
+     */
+    function fsync(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace fsync {
+        /**
+         * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+         * @param fd A file descriptor.
+         */
+        function __promisify__(fd: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+     * @param fd A file descriptor.
+     */
+    function fsyncSync(fd: number): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     */
+    function write<TBuffer extends BinaryData>(
+        fd: number,
+        buffer: TBuffer,
+        offset: number | undefined | null,
+        length: number | undefined | null,
+        position: number | undefined | null,
+        callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void,
+    ): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+     */
+    function write<TBuffer extends BinaryData>(
+        fd: number,
+        buffer: TBuffer,
+        offset: number | undefined | null,
+        length: number | undefined | null,
+        callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void,
+    ): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     */
+    function write<TBuffer extends BinaryData>(fd: number, buffer: TBuffer, offset: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     */
+    function write<TBuffer extends BinaryData>(fd: number, buffer: TBuffer, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     * @param encoding The expected string encoding.
+     */
+    function write(
+        fd: number,
+        string: any,
+        position: number | undefined | null,
+        encoding: string | undefined | null,
+        callback: (err: NodeJS.ErrnoException, written: number, str: string) => void,
+    ): void;
+
+    /**
+     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     */
+    function write(fd: number, string: any, position: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+
+    /**
+     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     */
+    function write(fd: number, string: any, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace write {
+        /**
+         * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+         * @param fd A file descriptor.
+         * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+         * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+         */
+        function __promisify__<TBuffer extends BinaryData>(
+            fd: number,
+            buffer?: TBuffer,
+            offset?: number,
+            length?: number,
+            position?: number | null,
+        ): Promise<{ bytesWritten: number, buffer: TBuffer }>;
+
+        /**
+         * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+         * @param fd A file descriptor.
+         * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+         * @param encoding The expected string encoding.
+         */
+        function __promisify__(fd: number, string: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
+    }
+
+    /**
+     * Synchronously writes `buffer` to the file referenced by the supplied file descriptor, returning the number of bytes written.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     */
+    function writeSync(fd: number, buffer: BinaryData, offset?: number | null, length?: number | null, position?: number | null): number;
+
+    /**
+     * Synchronously writes `string` to the file referenced by the supplied file descriptor, returning the number of bytes written.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     * @param encoding The expected string encoding.
+     */
+    function writeSync(fd: number, string: any, position?: number | null, encoding?: string | null): number;
+
+    /**
+     * Asynchronously reads data from the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param buffer The buffer that the data will be written to.
+     * @param offset The offset in the buffer at which to start writing.
+     * @param length The number of bytes to read.
+     * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+     */
+    function read<TBuffer extends BinaryData>(
+        fd: number,
+        buffer: TBuffer,
+        offset: number,
+        length: number,
+        position: number | null,
+        callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: TBuffer) => void,
+    ): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace read {
+        /**
+         * @param fd A file descriptor.
+         * @param buffer The buffer that the data will be written to.
+         * @param offset The offset in the buffer at which to start writing.
+         * @param length The number of bytes to read.
+         * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+         */
+        function __promisify__<TBuffer extends BinaryData>(fd: number, buffer: TBuffer, offset: number, length: number, position: number | null): Promise<{ bytesRead: number, buffer: TBuffer }>;
+    }
+
+    /**
+     * Synchronously reads data from the file referenced by the supplied file descriptor, returning the number of bytes read.
+     * @param fd A file descriptor.
+     * @param buffer The buffer that the data will be written to.
+     * @param offset The offset in the buffer at which to start writing.
+     * @param length The number of bytes to read.
+     * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+     */
+    function readSync(fd: number, buffer: BinaryData, offset: number, length: number, position: number | null): number;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options An object that may contain an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    function readFile(path: PathLike | number, options: { encoding?: null; flag?: string; } | undefined | null, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    function readFile(path: PathLike | number, options: { encoding: string; flag?: string; } | string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    function readFile(
+        path: PathLike | number,
+        options: { encoding?: string | null; flag?: string; } | string | undefined | null,
+        callback: (err: NodeJS.ErrnoException, data: string | Buffer) => void,
+    ): void;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     */
+    function readFile(path: PathLike | number, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace readFile {
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param options An object that may contain an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        function __promisify__(path: PathLike | number, options?: { encoding?: null; flag?: string; } | null): Promise<Buffer>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        function __promisify__(path: PathLike | number, options: { encoding: string; flag?: string; } | string): Promise<string>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        function __promisify__(path: PathLike | number, options?: { encoding?: string | null; flag?: string; } | string | null): Promise<string | Buffer>;
+    }
+
+    /**
+     * Synchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options An object that may contain an optional flag. If a flag is not provided, it defaults to `'r'`.
+     */
+    function readFileSync(path: PathLike | number, options?: { encoding?: null; flag?: string; } | null): Buffer;
+
+    /**
+     * Synchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    function readFileSync(path: PathLike | number, options: { encoding: string; flag?: string; } | string): string;
+
+    /**
+     * Synchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    function readFileSync(path: PathLike | number, options?: { encoding?: string | null; flag?: string; } | string | null): string | Buffer;
+
+    type WriteFileOptions = { encoding?: string | null; mode?: number | string; flag?: string; } | string | null;
+
+    /**
+     * Asynchronously writes data to a file, replacing the file if it already exists.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'w'` is used.
+     */
+    function writeFile(path: PathLike | number, data: any, options: WriteFileOptions, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronously writes data to a file, replacing the file if it already exists.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     */
+    function writeFile(path: PathLike | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace writeFile {
+        /**
+         * Asynchronously writes data to a file, replacing the file if it already exists.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+         * If `encoding` is not supplied, the default of `'utf8'` is used.
+         * If `mode` is not supplied, the default of `0o666` is used.
+         * If `mode` is a string, it is parsed as an octal integer.
+         * If `flag` is not supplied, the default of `'w'` is used.
+         */
+        function __promisify__(path: PathLike | number, data: any, options?: WriteFileOptions): Promise<void>;
+    }
+
+    /**
+     * Synchronously writes data to a file, replacing the file if it already exists.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'w'` is used.
+     */
+    function writeFileSync(path: PathLike | number, data: any, options?: WriteFileOptions): void;
+
+    /**
+     * Asynchronously append data to a file, creating the file if it does not exist.
+     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'a'` is used.
+     */
+    function appendFile(file: PathLike | number, data: any, options: WriteFileOptions, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronously append data to a file, creating the file if it does not exist.
+     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     */
+    function appendFile(file: PathLike | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace appendFile {
+        /**
+         * Asynchronously append data to a file, creating the file if it does not exist.
+         * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+         * If `encoding` is not supplied, the default of `'utf8'` is used.
+         * If `mode` is not supplied, the default of `0o666` is used.
+         * If `mode` is a string, it is parsed as an octal integer.
+         * If `flag` is not supplied, the default of `'a'` is used.
+         */
+        function __promisify__(file: PathLike | number, data: any, options?: WriteFileOptions): Promise<void>;
+    }
+
+    /**
+     * Synchronously append data to a file, creating the file if it does not exist.
+     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'a'` is used.
+     */
+    function appendFileSync(file: PathLike | number, data: any, options?: WriteFileOptions): void;
+
+    /**
+     * Watch for changes on `filename`. The callback `listener` will be called each time the file is accessed.
+     */
+    function watchFile(filename: PathLike, options: { persistent?: boolean; interval?: number; } | undefined, listener: (curr: Stats, prev: Stats) => void): void;
+
+    /**
+     * Watch for changes on `filename`. The callback `listener` will be called each time the file is accessed.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function watchFile(filename: PathLike, listener: (curr: Stats, prev: Stats) => void): void;
+
+    /**
+     * Stop watching for changes on `filename`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function unwatchFile(filename: PathLike, listener?: (curr: Stats, prev: Stats) => void): void;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `persistent` is not supplied, the default of `true` is used.
+     * If `recursive` is not supplied, the default of `false` is used.
+     */
+    function watch(
+        filename: PathLike,
+        options: { encoding?: BufferEncoding | null, persistent?: boolean, recursive?: boolean } | BufferEncoding | undefined | null,
+        listener?: (event: string, filename: string) => void,
+    ): FSWatcher;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `persistent` is not supplied, the default of `true` is used.
+     * If `recursive` is not supplied, the default of `false` is used.
+     */
+    function watch(filename: PathLike, options: { encoding: "buffer", persistent?: boolean, recursive?: boolean } | "buffer", listener?: (event: string, filename: Buffer) => void): FSWatcher;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `persistent` is not supplied, the default of `true` is used.
+     * If `recursive` is not supplied, the default of `false` is used.
+     */
+    function watch(
+        filename: PathLike,
+        options: { encoding?: string | null, persistent?: boolean, recursive?: boolean } | string | null,
+        listener?: (event: string, filename: string | Buffer) => void,
+    ): FSWatcher;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function watch(filename: PathLike, listener?: (event: string, filename: string) => any): FSWatcher;
+
+    /**
+     * Asynchronously tests whether or not the given path exists by checking with the file system.
+     * @deprecated
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function exists(path: PathLike, callback: (exists: boolean) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace exists {
+        /**
+         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        function __promisify__(path: PathLike): Promise<boolean>;
+    }
+
+    /**
+     * Synchronously tests whether or not the given path exists by checking with the file system.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function existsSync(path: PathLike): boolean;
+
+    namespace constants {
+        // File Access Constants
+
+        /** Constant for fs.access(). File is visible to the calling process. */
+        const F_OK: number;
+
+        /** Constant for fs.access(). File can be read by the calling process. */
+        const R_OK: number;
+
+        /** Constant for fs.access(). File can be written by the calling process. */
+        const W_OK: number;
+
+        /** Constant for fs.access(). File can be executed by the calling process. */
+        const X_OK: number;
+
+        // File Copy Constants
+
+        /** Constant for fs.copyFile. Flag indicating the destination file should not be overwritten if it already exists. */
+        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.
+         */
+        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.
+         */
+        const COPYFILE_FICLONE_FORCE: number;
+
+        // File Open Constants
+
+        /** Constant for fs.open(). Flag indicating to open a file for read-only access. */
+        const O_RDONLY: number;
+
+        /** Constant for fs.open(). Flag indicating to open a file for write-only access. */
+        const O_WRONLY: number;
+
+        /** Constant for fs.open(). Flag indicating to open a file for read-write access. */
+        const O_RDWR: number;
+
+        /** Constant for fs.open(). Flag indicating to create the file if it does not already exist. */
+        const O_CREAT: number;
+
+        /** Constant for fs.open(). Flag indicating that opening a file should fail if the O_CREAT flag is set and the file already exists. */
+        const O_EXCL: number;
+
+        /**
+         * Constant for fs.open(). Flag indicating that if path identifies a terminal device,
+         * opening the path shall not cause that terminal to become the controlling terminal for the process
+         * (if the process does not already have one).
+         */
+        const O_NOCTTY: number;
+
+        /** Constant for fs.open(). Flag indicating that if the file exists and is a regular file, and the file is opened successfully for write access, its length shall be truncated to zero. */
+        const O_TRUNC: number;
+
+        /** Constant for fs.open(). Flag indicating that data will be appended to the end of the file. */
+        const O_APPEND: number;
+
+        /** Constant for fs.open(). Flag indicating that the open should fail if the path is not a directory. */
+        const O_DIRECTORY: number;
+
+        /**
+         * constant for fs.open().
+         * Flag indicating reading accesses to the file system will no longer result in
+         * an update to the atime information associated with the file.
+         * This flag is available on Linux operating systems only.
+         */
+        const O_NOATIME: number;
+
+        /** Constant for fs.open(). Flag indicating that the open should fail if the path is a symbolic link. */
+        const O_NOFOLLOW: number;
+
+        /** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O. */
+        const O_SYNC: number;
+
+        /** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O with write operations waiting for data integrity. */
+        const O_DSYNC: number;
+
+        /** Constant for fs.open(). Flag indicating to open the symbolic link itself rather than the resource it is pointing to. */
+        const O_SYMLINK: number;
+
+        /** Constant for fs.open(). When set, an attempt will be made to minimize caching effects of file I/O. */
+        const O_DIRECT: number;
+
+        /** Constant for fs.open(). Flag indicating to open the file in nonblocking mode when possible. */
+        const O_NONBLOCK: number;
+
+        // File Type Constants
+
+        /** Constant for fs.Stats mode property for determining a file's type. Bit mask used to extract the file type code. */
+        const S_IFMT: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a regular file. */
+        const S_IFREG: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a directory. */
+        const S_IFDIR: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a character-oriented device file. */
+        const S_IFCHR: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a block-oriented device file. */
+        const S_IFBLK: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a FIFO/pipe. */
+        const S_IFIFO: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a symbolic link. */
+        const S_IFLNK: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a socket. */
+        const S_IFSOCK: number;
+
+        // File Mode Constants
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by owner. */
+        const S_IRWXU: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by owner. */
+        const S_IRUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by owner. */
+        const S_IWUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by owner. */
+        const S_IXUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by group. */
+        const S_IRWXG: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by group. */
+        const S_IRGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by group. */
+        const S_IWGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by group. */
+        const S_IXGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by others. */
+        const S_IRWXO: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by others. */
+        const S_IROTH: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by others. */
+        const S_IWOTH: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by others. */
+        const S_IXOTH: number;
+    }
+
+    /**
+     * Asynchronously tests a user's permissions for the file specified by path.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function access(path: PathLike, mode: number | undefined, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronously tests a user's permissions for the file specified by path.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function access(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace access {
+        /**
+         * Asynchronously tests a user's permissions for the file specified by path.
+         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        function __promisify__(path: PathLike, mode?: number): Promise<void>;
+    }
+
+    /**
+     * Synchronously tests a user's permissions for the file specified by path.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function accessSync(path: PathLike, mode?: number): void;
+
+    /**
+     * Returns a new `ReadStream` object.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function createReadStream(path: PathLike, options?: string | {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+        autoClose?: boolean;
+        start?: number;
+        end?: number;
+        highWaterMark?: number;
+    }): ReadStream;
+
+    /**
+     * Returns a new `WriteStream` object.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    function createWriteStream(path: PathLike, options?: string | {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+        autoClose?: boolean;
+        start?: number;
+    }): WriteStream;
+
+    /**
+     * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+     * @param fd A file descriptor.
+     */
+    function fdatasync(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace fdatasync {
+        /**
+         * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+         * @param fd A file descriptor.
+         */
+        function __promisify__(fd: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+     * @param fd A file descriptor.
+     */
+    function fdatasyncSync(fd: number): void;
+
+    /**
+     * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * No arguments other than a possible exception are given to the callback function.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     */
+    function copyFile(src: PathLike, dest: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+    /**
+     * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * No arguments other than a possible exception are given to the callback function.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     * @param flags An integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+     */
+    function copyFile(src: PathLike, dest: PathLike, flags: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    namespace copyFile {
+        /**
+         * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+         * No arguments other than a possible exception are given to the callback function.
+         * Node.js makes no guarantees about the atomicity of the copy operation.
+         * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+         * to remove the destination.
+         * @param src A path to the source file.
+         * @param dest A path to the destination file.
+         * @param flags An optional integer that specifies the behavior of the copy operation.
+         * The only supported flag is fs.constants.COPYFILE_EXCL,
+         * which causes the copy operation to fail if dest already exists.
+         */
+        function __promisify__(src: PathLike, dst: PathLike, flags?: number): Promise<void>;
+    }
+
+    /**
+     * Synchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     * @param flags An optional integer that specifies the behavior of the copy operation.
+     * The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+     */
+    function copyFileSync(src: PathLike, dest: PathLike, flags?: number): void;
+
+    namespace promises {
+        interface FileHandle {
+            /**
+             * Gets the file descriptor for this file handle.
+             */
+            readonly fd: number;
+
+            /**
+             * Asynchronously append data to a file, creating the file if it does not exist. The underlying file will _not_ be closed automatically.
+             * The `FileHandle` must have been opened for appending.
+             * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
+             * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+             * If `encoding` is not supplied, the default of `'utf8'` is used.
+             * If `mode` is not supplied, the default of `0o666` is used.
+             * If `mode` is a string, it is parsed as an octal integer.
+             * If `flag` is not supplied, the default of `'a'` is used.
+             */
+            appendFile(data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
+
+            /**
+             * Asynchronous fchown(2) - Change ownership of a file.
+             */
+            chown(uid: number, gid: number): Promise<void>;
+
+            /**
+             * Asynchronous fchmod(2) - Change permissions of a file.
+             * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+             */
+            chmod(mode: string | number): Promise<void>;
+
+            /**
+             * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+             */
+            datasync(): Promise<void>;
+
+            /**
+             * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+             */
+            sync(): Promise<void>;
+
+            /**
+             * Asynchronously reads data from the file.
+             * The `FileHandle` must have been opened for reading.
+             * @param buffer The buffer that the data will be written to.
+             * @param offset The offset in the buffer at which to start writing.
+             * @param length The number of bytes to read.
+             * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+             */
+            read<TBuffer extends Buffer | Uint8Array>(buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesRead: number, buffer: TBuffer }>;
+
+            /**
+             * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
+             * The `FileHandle` must have been opened for reading.
+             * @param options An object that may contain an optional flag.
+             * If a flag is not provided, it defaults to `'r'`.
+             */
+            readFile(options?: { encoding?: null, flag?: string | number } | null): Promise<Buffer>;
+
+            /**
+             * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
+             * The `FileHandle` must have been opened for reading.
+             * @param options An object that may contain an optional flag.
+             * If a flag is not provided, it defaults to `'r'`.
+             */
+            readFile(options: { encoding: BufferEncoding, flag?: string | number } | BufferEncoding): Promise<string>;
+
+            /**
+             * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
+             * The `FileHandle` must have been opened for reading.
+             * @param options An object that may contain an optional flag.
+             * If a flag is not provided, it defaults to `'r'`.
+             */
+            readFile(options?: { encoding?: string | null, flag?: string | number } | string | null): Promise<string | Buffer>;
+
+            /**
+             * Asynchronous fstat(2) - Get file status.
+             */
+            stat(): Promise<Stats>;
+
+            /**
+             * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+             * @param len If not specified, defaults to `0`.
+             */
+            truncate(len?: number): Promise<void>;
+
+            /**
+             * Asynchronously change file timestamps of the file.
+             * @param atime The last access time. If a string is provided, it will be coerced to number.
+             * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+             */
+            utimes(atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+
+            /**
+             * Asynchronously writes `buffer` to the file.
+             * The `FileHandle` must have been opened for writing.
+             * @param buffer The buffer that the data will be written to.
+             * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+             * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+             * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+             */
+            write<TBuffer extends Buffer | Uint8Array>(buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesWritten: number, buffer: TBuffer }>;
+
+            /**
+             * Asynchronously writes `string` to the file.
+             * The `FileHandle` must have been opened for writing.
+             * It is unsafe to call `write()` multiple times on the same file without waiting for the `Promise`
+             * to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
+             * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+             * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+             * @param encoding The expected string encoding.
+             */
+            write(data: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
+
+            /**
+             * Asynchronously writes data to a file, replacing the file if it already exists. The underlying file will _not_ be closed automatically.
+             * The `FileHandle` must have been opened for writing.
+             * It is unsafe to call `writeFile()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected).
+             * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
+             * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+             * If `encoding` is not supplied, the default of `'utf8'` is used.
+             * If `mode` is not supplied, the default of `0o666` is used.
+             * If `mode` is a string, it is parsed as an octal integer.
+             * If `flag` is not supplied, the default of `'w'` is used.
+             */
+            writeFile(data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
+
+            /**
+             * Asynchronous close(2) - close a `FileHandle`.
+             */
+            close(): Promise<void>;
+        }
+
+        /**
+         * Asynchronously tests a user's permissions for the file specified by path.
+         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        function access(path: PathLike, mode?: number): Promise<void>;
+
+        /**
+         * Asynchronously copies `src` to `dest`. By default, `dest` is overwritten if it already exists.
+         * Node.js makes no guarantees about the atomicity of the copy operation.
+         * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+         * to remove the destination.
+         * @param src A path to the source file.
+         * @param dest A path to the destination file.
+         * @param flags An optional integer that specifies the behavior of the copy operation. The only
+         * supported flag is `fs.constants.COPYFILE_EXCL`, which causes the copy operation to fail if
+         * `dest` already exists.
+         */
+        function copyFile(src: PathLike, dest: PathLike, flags?: number): Promise<void>;
+
+        /**
+         * Asynchronous open(2) - open and possibly create a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not
+         * supplied, defaults to `0o666`.
+         */
+        function open(path: PathLike, flags: string | number, mode?: string | number): Promise<FileHandle>;
+
+        /**
+         * Asynchronously reads data from the file referenced by the supplied `FileHandle`.
+         * @param handle A `FileHandle`.
+         * @param buffer The buffer that the data will be written to.
+         * @param offset The offset in the buffer at which to start writing.
+         * @param length The number of bytes to read.
+         * @param position The offset from the beginning of the file from which data should be read. If
+         * `null`, data will be read from the current position.
+         */
+        function read<TBuffer extends Buffer | Uint8Array>(
+            handle: FileHandle,
+            buffer: TBuffer,
+            offset?: number | null,
+            length?: number | null,
+            position?: number | null,
+        ): Promise<{ bytesRead: number, buffer: TBuffer }>;
+
+        /**
+         * Asynchronously writes `buffer` to the file referenced by the supplied `FileHandle`.
+         * It is unsafe to call `fsPromises.write()` multiple times on the same file without waiting for the `Promise`
+         * to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
+         * @param handle A `FileHandle`.
+         * @param buffer The buffer that the data will be written to.
+         * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+         * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+         */
+        function write<TBuffer extends Buffer | Uint8Array>(
+            handle: FileHandle,
+            buffer: TBuffer,
+            offset?: number | null,
+            length?: number | null, position?: number | null): Promise<{ bytesWritten: number, buffer: TBuffer }>;
+
+        /**
+         * Asynchronously writes `string` to the file referenced by the supplied `FileHandle`.
+         * It is unsafe to call `fsPromises.write()` multiple times on the same file without waiting for the `Promise`
+         * to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
+         * @param handle A `FileHandle`.
+         * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+         * @param encoding The expected string encoding.
+         */
+        function write(handle: FileHandle, string: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
+
+        /**
+         * Asynchronous rename(2) - Change the name or location of a file or directory.
+         * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        function rename(oldPath: PathLike, newPath: PathLike): Promise<void>;
+
+        /**
+         * Asynchronous truncate(2) - Truncate a file to a specified length.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param len If not specified, defaults to `0`.
+         */
+        function truncate(path: PathLike, len?: number): Promise<void>;
+
+        /**
+         * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+         * @param handle A `FileHandle`.
+         * @param len If not specified, defaults to `0`.
+         */
+        function ftruncate(handle: FileHandle, len?: number): Promise<void>;
+
+        /**
+         * Asynchronous rmdir(2) - delete a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function rmdir(path: PathLike): Promise<void>;
+
+        /**
+         * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+         * @param handle A `FileHandle`.
+         */
+        function fdatasync(handle: FileHandle): Promise<void>;
+
+        /**
+         * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+         * @param handle A `FileHandle`.
+         */
+        function fsync(handle: FileHandle): Promise<void>;
+
+        /**
+         * Asynchronous mkdir(2) - create a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options Either the file mode, or an object optionally specifying the file mode and whether parent folders
+         * should be created. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+         */
+        function mkdir(path: PathLike, options?: number | string | MakeDirectoryOptions | null): Promise<void>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readdir(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readdir(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readdir(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string[] | Buffer[]>;
+
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readlink(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readlink(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readlink(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+
+        /**
+         * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+         * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+         * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+         * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+         * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+         */
+        function symlink(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
+
+        /**
+         * Asynchronous fstat(2) - Get file status.
+         * @param handle A `FileHandle`.
+         */
+        function fstat(handle: FileHandle): Promise<Stats>;
+
+        /**
+         * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function lstat(path: PathLike): Promise<Stats>;
+
+        /**
+         * Asynchronous stat(2) - Get file status.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function stat(path: PathLike): Promise<Stats>;
+
+        /**
+         * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+         * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function link(existingPath: PathLike, newPath: PathLike): Promise<void>;
+
+        /**
+         * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function unlink(path: PathLike): Promise<void>;
+
+        /**
+         * Asynchronous fchmod(2) - Change permissions of a file.
+         * @param handle A `FileHandle`.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        function fchmod(handle: FileHandle, mode: string | number): Promise<void>;
+
+        /**
+         * Asynchronous chmod(2) - Change permissions of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        function chmod(path: PathLike, mode: string | number): Promise<void>;
+
+        /**
+         * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        function lchmod(path: PathLike, mode: string | number): Promise<void>;
+
+        /**
+         * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function lchown(path: PathLike, uid: number, gid: number): Promise<void>;
+
+        /**
+         * Asynchronous fchown(2) - Change ownership of a file.
+         * @param handle A `FileHandle`.
+         */
+        function fchown(handle: FileHandle, uid: number, gid: number): Promise<void>;
+
+        /**
+         * Asynchronous chown(2) - Change ownership of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function chown(path: PathLike, uid: number, gid: number): Promise<void>;
+
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied path.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        function utimes(path: PathLike, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied `FileHandle`.
+         * @param handle A `FileHandle`.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        function futimes(handle: FileHandle, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function realpath(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function realpath(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function realpath(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function mkdtemp(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function mkdtemp(prefix: string, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function mkdtemp(prefix: string, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+
+        /**
+         * Asynchronously writes data to a file, replacing the file if it already exists.
+         * It is unsafe to call `fsPromises.writeFile()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected).
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
+         * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+         * If `encoding` is not supplied, the default of `'utf8'` is used.
+         * If `mode` is not supplied, the default of `0o666` is used.
+         * If `mode` is a string, it is parsed as an octal integer.
+         * If `flag` is not supplied, the default of `'w'` is used.
+         */
+        function writeFile(path: PathLike | FileHandle, data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
+
+        /**
+         * Asynchronously append data to a file, creating the file if it does not exist.
+         * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
+         * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+         * If `encoding` is not supplied, the default of `'utf8'` is used.
+         * If `mode` is not supplied, the default of `0o666` is used.
+         * If `mode` is a string, it is parsed as an octal integer.
+         * If `flag` is not supplied, the default of `'a'` is used.
+         */
+        function appendFile(path: PathLike | FileHandle, data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
+         * @param options An object that may contain an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        function readFile(path: PathLike | FileHandle, options?: { encoding?: null, flag?: string | number } | null): Promise<Buffer>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
+         * @param options An object that may contain an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        function readFile(path: PathLike | FileHandle, options: { encoding: BufferEncoding, flag?: string | number } | BufferEncoding): Promise<string>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
+         * @param options An object that may contain an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        function readFile(path: PathLike | FileHandle, options?: { encoding?: string | null, flag?: string | number } | string | null): Promise<string | Buffer>;
+    }
+}
diff --git a/types/node/v10/globals.d.ts b/types/node/v10/globals.d.ts
new file mode 100644
index 0000000000..23cab2f1f8
--- /dev/null
+++ b/types/node/v10/globals.d.ts
@@ -0,0 +1,995 @@
+// This needs to be global to avoid TS2403 in case lib.dom.d.ts is present in the same build
+interface Console {
+    Console: NodeJS.ConsoleConstructor;
+    /**
+     * A simple assertion test that verifies whether `value` is truthy.
+     * If it is not, an `AssertionError` is thrown.
+     * If provided, the error `message` is formatted using `util.format()` and used as the error message.
+     */
+    assert(value: any, message?: string, ...optionalParams: any[]): void;
+    /**
+     * When `stdout` is a TTY, calling `console.clear()` will attempt to clear the TTY.
+     * When `stdout` is not a TTY, this method does nothing.
+     */
+    clear(): void;
+    /**
+     * Maintains an internal counter specific to `label` and outputs to `stdout` the number of times `console.count()` has been called with the given `label`.
+     */
+    count(label?: string): void;
+    /**
+     * Resets the internal counter specific to `label`.
+     */
+    countReset(label?: string): void;
+    /**
+     * The `console.debug()` function is an alias for {@link console.log()}.
+     */
+    debug(message?: any, ...optionalParams: any[]): void;
+    /**
+     * Uses {@link util.inspect()} on `obj` and prints the resulting string to `stdout`.
+     * This function bypasses any custom `inspect()` function defined on `obj`.
+     */
+    dir(obj: any, options?: NodeJS.InspectOptions): void;
+    /**
+     * This method calls {@link console.log()} passing it the arguments received. Please note that this method does not produce any XML formatting
+     */
+    dirxml(...data: any[]): void;
+    /**
+     * Prints to `stderr` with newline.
+     */
+    error(message?: any, ...optionalParams: any[]): void;
+    /**
+     * Increases indentation of subsequent lines by two spaces.
+     * If one or more `label`s are provided, those are printed first without the additional indentation.
+     */
+    group(...label: any[]): void;
+    /**
+     * The `console.groupCollapsed()` function is an alias for {@link console.group()}.
+     */
+    groupCollapsed(): void;
+    /**
+     * Decreases indentation of subsequent lines by two spaces.
+     */
+    groupEnd(): void;
+    /**
+     * The {@link console.info()} function is an alias for {@link console.log()}.
+     */
+    info(message?: any, ...optionalParams: any[]): void;
+    /**
+     * Prints to `stdout` with newline.
+     */
+    log(message?: any, ...optionalParams: any[]): void;
+    /**
+     * This method does not display anything unless used in the inspector.
+     *  Prints to `stdout` the array `array` formatted as a table.
+     */
+    table(tabularData: any, properties?: string[]): void;
+    /**
+     * Starts a timer that can be used to compute the duration of an operation. Timers are identified by a unique `label`.
+     */
+    time(label?: string): void;
+    /**
+     * Stops a timer that was previously started by calling {@link console.time()} and prints the result to `stdout`.
+     */
+    timeEnd(label?: string): void;
+    /**
+     * For a timer that was previously started by calling {@link console.time()}, prints the elapsed time and other `data` arguments to `stdout`.
+     */
+    timeLog(label?: string, ...data: any[]): void;
+    /**
+     * Prints to `stderr` the string 'Trace :', followed by the {@link util.format()} formatted message and stack trace to the current position in the code.
+     */
+    trace(message?: any, ...optionalParams: any[]): void;
+    /**
+     * The {@link console.warn()} function is an alias for {@link console.error()}.
+     */
+    warn(message?: any, ...optionalParams: any[]): void;
+
+    // --- Inspector mode only ---
+    /**
+     * This method does not display anything unless used in the inspector.
+     *  The console.markTimeline() method is the deprecated form of console.timeStamp().
+     *
+     * @deprecated Use console.timeStamp() instead.
+     */
+    markTimeline(label?: string): void;
+    /**
+     * This method does not display anything unless used in the inspector.
+     *  Starts a JavaScript CPU profile with an optional label.
+     */
+    profile(label?: string): void;
+    /**
+     * This method does not display anything unless used in the inspector.
+     *  Stops the current JavaScript CPU profiling session if one has been started and prints the report to the Profiles panel of the inspector.
+     */
+    profileEnd(label?: string): void;
+    /**
+     * This method does not display anything unless used in the inspector.
+     *  Adds an event with the label `label` to the Timeline panel of the inspector.
+     */
+    timeStamp(label?: string): void;
+    /**
+     * This method does not display anything unless used in the inspector.
+     *  The console.timeline() method is the deprecated form of console.time().
+     *
+     * @deprecated Use console.time() instead.
+     */
+    timeline(label?: string): void;
+    /**
+     * This method does not display anything unless used in the inspector.
+     *  The console.timelineEnd() method is the deprecated form of console.timeEnd().
+     *
+     * @deprecated Use console.timeEnd() instead.
+     */
+    timelineEnd(label?: string): void;
+}
+
+interface Error {
+    stack?: string;
+}
+
+// Declare "static" methods in Error
+interface ErrorConstructor {
+    /** Create .stack property on a target object */
+    captureStackTrace(targetObject: Object, constructorOpt?: Function): void;
+
+    /**
+     * Optional override for formatting stack traces
+     *
+     * @see https://github.com/v8/v8/wiki/Stack%20Trace%20API#customizing-stack-traces
+     */
+    prepareStackTrace?: (err: Error, stackTraces: NodeJS.CallSite[]) => any;
+
+    stackTraceLimit: number;
+}
+
+interface SymbolConstructor {
+    readonly observable: symbol;
+}
+
+// Node.js ESNEXT support
+interface String {
+    /** Removes whitespace from the left end of a string. */
+    trimLeft(): string;
+    /** Removes whitespace from the right end of a string. */
+    trimRight(): string;
+}
+
+/*-----------------------------------------------*
+ *                                               *
+ *                   GLOBAL                      *
+ *                                               *
+ ------------------------------------------------*/
+declare var process: NodeJS.Process;
+declare var global: NodeJS.Global;
+declare var console: Console;
+
+declare var __filename: string;
+declare var __dirname: string;
+
+declare function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
+declare namespace setTimeout {
+    function __promisify__(ms: number): Promise<void>;
+    function __promisify__<T>(ms: number, value: T): Promise<T>;
+}
+declare function clearTimeout(timeoutId: NodeJS.Timeout): void;
+declare function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
+declare function clearInterval(intervalId: NodeJS.Timeout): void;
+declare function setImmediate(callback: (...args: any[]) => void, ...args: any[]): NodeJS.Immediate;
+declare namespace setImmediate {
+    function __promisify__(): Promise<void>;
+    function __promisify__<T>(value: T): Promise<T>;
+}
+declare function clearImmediate(immediateId: NodeJS.Immediate): void;
+
+// TODO: change to `type NodeRequireFunction = (id: string) => any;` in next mayor version.
+interface NodeRequireFunction {
+    /* tslint:disable-next-line:callable-types */
+    (id: string): any;
+}
+
+interface NodeRequire extends NodeRequireFunction {
+    resolve: RequireResolve;
+    cache: any;
+    extensions: NodeExtensions;
+    main: NodeModule | undefined;
+}
+
+interface RequireResolve {
+    (id: string, options?: { paths?: string[]; }): string;
+    paths(request: string): string[] | null;
+}
+
+interface NodeExtensions {
+    '.js': (m: NodeModule, filename: string) => any;
+    '.json': (m: NodeModule, filename: string) => any;
+    '.node': (m: NodeModule, filename: string) => any;
+    [ext: string]: (m: NodeModule, filename: string) => any;
+}
+
+declare var require: NodeRequire;
+
+interface NodeModule {
+    exports: any;
+    require: NodeRequireFunction;
+    id: string;
+    filename: string;
+    loaded: boolean;
+    parent: NodeModule | null;
+    children: NodeModule[];
+    paths: string[];
+}
+
+declare var module: NodeModule;
+
+// Same as module.exports
+declare var exports: any;
+
+// Buffer class
+type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "base64" | "latin1" | "binary" | "hex";
+interface Buffer extends Uint8Array {
+    constructor: typeof Buffer;
+    write(string: string, offset?: number, length?: number, encoding?: string): number;
+    toString(encoding?: string, start?: number, end?: number): string;
+    toJSON(): { type: 'Buffer', data: any[] };
+    equals(otherBuffer: Uint8Array): boolean;
+    compare(otherBuffer: Uint8Array, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
+    copy(targetBuffer: Uint8Array, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
+    slice(start?: number, end?: number): Buffer;
+    writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readUInt8(offset: number, noAssert?: boolean): number;
+    readUInt16LE(offset: number, noAssert?: boolean): number;
+    readUInt16BE(offset: number, noAssert?: boolean): number;
+    readUInt32LE(offset: number, noAssert?: boolean): number;
+    readUInt32BE(offset: number, noAssert?: boolean): number;
+    readInt8(offset: number, noAssert?: boolean): number;
+    readInt16LE(offset: number, noAssert?: boolean): number;
+    readInt16BE(offset: number, noAssert?: boolean): number;
+    readInt32LE(offset: number, noAssert?: boolean): number;
+    readInt32BE(offset: number, noAssert?: boolean): number;
+    readFloatLE(offset: number, noAssert?: boolean): number;
+    readFloatBE(offset: number, noAssert?: boolean): number;
+    readDoubleLE(offset: number, noAssert?: boolean): number;
+    readDoubleBE(offset: number, noAssert?: boolean): number;
+    swap16(): Buffer;
+    swap32(): Buffer;
+    swap64(): Buffer;
+    writeUInt8(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt16LE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt16BE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt32LE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt32BE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt8(value: number, offset: number, noAssert?: boolean): number;
+    writeInt16LE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt16BE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt32LE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt32BE(value: number, offset: number, noAssert?: boolean): number;
+    writeFloatLE(value: number, offset: number, noAssert?: boolean): number;
+    writeFloatBE(value: number, offset: number, noAssert?: boolean): number;
+    writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
+    writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
+    fill(value: any, offset?: number, end?: number): this;
+    indexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
+    lastIndexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
+    entries(): IterableIterator<[number, number]>;
+    includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
+    keys(): IterableIterator<number>;
+    values(): IterableIterator<number>;
+}
+
+/**
+ * Raw data is stored in instances of the Buffer class.
+ * A Buffer is similar to an array of integers but corresponds to a raw memory allocation outside the V8 heap.  A Buffer cannot be resized.
+ * Valid string encodings: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
+ */
+declare const Buffer: {
+    /**
+     * Allocates a new buffer containing the given {str}.
+     *
+     * @param str String to store in buffer.
+     * @param encoding encoding to use, optional.  Default is 'utf8'
+     * @deprecated since v10.0.0 - Use `Buffer.from(string[, encoding])` instead.
+     */
+    new(str: string, encoding?: string): Buffer;
+    /**
+     * Allocates a new buffer of {size} octets.
+     *
+     * @param size count of octets to allocate.
+     * @deprecated since v10.0.0 - Use `Buffer.alloc()` instead (also see `Buffer.allocUnsafe()`).
+     */
+    new(size: number): Buffer;
+    /**
+     * Allocates a new buffer containing the given {array} of octets.
+     *
+     * @param array The octets to store.
+     * @deprecated since v10.0.0 - Use `Buffer.from(array)` instead.
+     */
+    new(array: Uint8Array): Buffer;
+    /**
+     * Produces a Buffer backed by the same allocated memory as
+     * 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 | SharedArrayBuffer): Buffer;
+    /**
+     * Allocates a new buffer containing the given {array} of octets.
+     *
+     * @param array The octets to store.
+     * @deprecated since v10.0.0 - Use `Buffer.from(array)` instead.
+     */
+    new(array: any[]): Buffer;
+    /**
+     * Copies the passed {buffer} data onto a new {Buffer} instance.
+     *
+     * @param buffer The buffer to copy.
+     * @deprecated since v10.0.0 - Use `Buffer.from(buffer)` instead.
+     */
+    new(buffer: Buffer): Buffer;
+    prototype: Buffer;
+    /**
+     * When passed a reference to the .buffer property of a TypedArray instance,
+     * the newly created Buffer will share the same allocated memory as the TypedArray.
+     * The optional {byteOffset} and {length} arguments specify a memory range
+     * within the {arrayBuffer} that will be shared by the Buffer.
+     *
+     * @param arrayBuffer The .buffer property of any TypedArray or a new ArrayBuffer()
+     */
+    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[]): 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
+     *
+     * @param obj object to test.
+     */
+    isBuffer(obj: any): obj is Buffer;
+    /**
+     * Returns true if {encoding} is a valid encoding argument.
+     * Valid string encodings in Node 0.12: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
+     *
+     * @param encoding string to test.
+     */
+    isEncoding(encoding: string): boolean | undefined;
+    /**
+     * Gives the actual byte length of a string. encoding defaults to 'utf8'.
+     * This is not the same as String.prototype.length since that returns the number of characters in a string.
+     *
+     * @param string string to test.
+     * @param encoding encoding used to evaluate (defaults to 'utf8')
+     */
+    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.
+     *
+     * If the list has no items, or if the totalLength is 0, then it returns a zero-length buffer.
+     * If the list has exactly one item, then the first item of the list is returned.
+     * If the list has more than one item, then a new Buffer is created.
+     *
+     * @param list An array of Buffer objects to concatenate
+     * @param totalLength Total length of the buffers when concatenated.
+     *   If totalLength is not provided, it is read from the buffers in the list. However, this adds an additional loop to the function, so it is faster to provide the length explicitly.
+     */
+    concat(list: Uint8Array[], totalLength?: number): Buffer;
+    /**
+     * The same as buf1.compare(buf2).
+     */
+    compare(buf1: Uint8Array, buf2: Uint8Array): number;
+    /**
+     * Allocates a new buffer of {size} octets.
+     *
+     * @param size count of octets to allocate.
+     * @param fill if specified, buffer will be initialized by calling buf.fill(fill).
+     *    If parameter is omitted, buffer will be filled with zeros.
+     * @param encoding encoding used for call to buf.fill while initalizing
+     */
+    alloc(size: number, fill?: string | Buffer | number, encoding?: string): Buffer;
+    /**
+     * Allocates a new buffer of {size} octets, leaving memory not initialized, so the contents
+     * of the newly created Buffer are unknown and may contain sensitive data.
+     *
+     * @param size count of octets to allocate
+     */
+    allocUnsafe(size: number): Buffer;
+    /**
+     * Allocates a new non-pooled buffer of {size} octets, leaving memory not initialized, so the contents
+     * of the newly created Buffer are unknown and may contain sensitive data.
+     *
+     * @param size count of octets to allocate
+     */
+    allocUnsafeSlow(size: number): Buffer;
+    /**
+     * This is the number of bytes used to determine the size of pre-allocated, internal Buffer instances used for pooling. This value may be modified.
+     */
+    poolSize: number;
+};
+
+/*----------------------------------------------*
+*                                               *
+*               GLOBAL INTERFACES               *
+*                                               *
+*-----------------------------------------------*/
+declare namespace NodeJS {
+    interface InspectOptions {
+        showHidden?: boolean;
+        depth?: number | null;
+        colors?: boolean;
+        customInspect?: boolean;
+        showProxy?: boolean;
+        maxArrayLength?: number | null;
+        breakLength?: number;
+        compact?: boolean;
+        sorted?: boolean | ((a: string, b: string) => number);
+    }
+
+    interface ConsoleConstructorOptions {
+        stdout: WritableStream;
+        stderr?: WritableStream;
+        ignoreErrors?: boolean;
+        colorMode?: boolean | 'auto';
+    }
+
+    interface ConsoleConstructor {
+        prototype: Console;
+        new(stdout: WritableStream, stderr?: WritableStream, ignoreErrors?: boolean): Console;
+        new(options: ConsoleConstructorOptions): Console;
+    }
+
+    interface CallSite {
+        /**
+         * Value of "this"
+         */
+        getThis(): any;
+
+        /**
+         * Type of "this" as a string.
+         * This is the name of the function stored in the constructor field of
+         * "this", if available.  Otherwise the object's [[Class]] internal
+         * property.
+         */
+        getTypeName(): string | null;
+
+        /**
+         * Current function
+         */
+        getFunction(): Function | undefined;
+
+        /**
+         * Name of the current function, typically its name property.
+         * If a name property is not available an attempt will be made to try
+         * to infer a name from the function's context.
+         */
+        getFunctionName(): string | null;
+
+        /**
+         * Name of the property [of "this" or one of its prototypes] that holds
+         * the current function
+         */
+        getMethodName(): string | null;
+
+        /**
+         * Name of the script [if this function was defined in a script]
+         */
+        getFileName(): string | null;
+
+        /**
+         * Current line number [if this function was defined in a script]
+         */
+        getLineNumber(): number | null;
+
+        /**
+         * Current column number [if this function was defined in a script]
+         */
+        getColumnNumber(): number | null;
+
+        /**
+         * A call site object representing the location where eval was called
+         * [if this function was created using a call to eval]
+         */
+        getEvalOrigin(): string | undefined;
+
+        /**
+         * Is this a toplevel invocation, that is, is "this" the global object?
+         */
+        isToplevel(): boolean;
+
+        /**
+         * Does this call take place in code defined by a call to eval?
+         */
+        isEval(): boolean;
+
+        /**
+         * Is this call in native V8 code?
+         */
+        isNative(): boolean;
+
+        /**
+         * Is this a constructor call?
+         */
+        isConstructor(): boolean;
+    }
+
+    interface ErrnoException extends Error {
+        errno?: number;
+        code?: string;
+        path?: string;
+        syscall?: string;
+        stack?: string;
+    }
+
+    class EventEmitter {
+        addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        on(event: string | symbol, listener: (...args: any[]) => void): this;
+        once(event: string | symbol, listener: (...args: any[]) => void): this;
+        removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        off(event: string | symbol, listener: (...args: any[]) => void): this;
+        removeAllListeners(event?: string | symbol): this;
+        setMaxListeners(n: number): this;
+        getMaxListeners(): number;
+        listeners(event: string | symbol): Function[];
+        rawListeners(event: string | symbol): Function[];
+        emit(event: string | symbol, ...args: any[]): boolean;
+        listenerCount(type: string | symbol): number;
+        // Added in Node 6...
+        prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        eventNames(): Array<string | symbol>;
+    }
+
+    interface ReadableStream extends EventEmitter {
+        readable: boolean;
+        read(size?: number): string | Buffer;
+        setEncoding(encoding: string): this;
+        pause(): this;
+        resume(): this;
+        isPaused(): boolean;
+        pipe<T extends WritableStream>(destination: T, options?: { end?: boolean; }): T;
+        unpipe(destination?: WritableStream): this;
+        unshift(chunk: string): void;
+        unshift(chunk: Buffer): void;
+        wrap(oldStream: ReadableStream): this;
+        [Symbol.asyncIterator](): AsyncIterableIterator<string | Buffer>;
+    }
+
+    interface WritableStream extends EventEmitter {
+        writable: boolean;
+        write(buffer: Buffer | string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        end(cb?: Function): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+    }
+
+    interface ReadWriteStream extends ReadableStream, WritableStream { }
+
+    interface Events extends EventEmitter { }
+
+    interface Domain extends Events {
+        run(fn: Function): void;
+        add(emitter: Events): void;
+        remove(emitter: Events): void;
+        bind(cb: (err: Error, data: any) => any): any;
+        intercept(cb: (data: any) => any): any;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        removeListener(event: string, listener: (...args: any[]) => void): this;
+        removeAllListeners(event?: string): this;
+    }
+
+    interface MemoryUsage {
+        rss: number;
+        heapTotal: number;
+        heapUsed: number;
+        external: number;
+    }
+
+    interface CpuUsage {
+        user: number;
+        system: number;
+    }
+
+    interface ProcessRelease {
+        name: string;
+        sourceUrl?: string;
+        headersUrl?: string;
+        libUrl?: string;
+        lts?: string;
+    }
+
+    interface ProcessVersions {
+        http_parser: string;
+        node: string;
+        v8: string;
+        ares: string;
+        uv: string;
+        zlib: string;
+        modules: string;
+        openssl: string;
+    }
+
+    type Platform = 'aix'
+        | 'android'
+        | 'darwin'
+        | 'freebsd'
+        | 'linux'
+        | 'openbsd'
+        | 'sunos'
+        | 'win32'
+        | 'cygwin';
+
+    type Signals =
+        "SIGABRT" | "SIGALRM" | "SIGBUS" | "SIGCHLD" | "SIGCONT" | "SIGFPE" | "SIGHUP" | "SIGILL" | "SIGINT" | "SIGIO" |
+        "SIGIOT" | "SIGKILL" | "SIGPIPE" | "SIGPOLL" | "SIGPROF" | "SIGPWR" | "SIGQUIT" | "SIGSEGV" | "SIGSTKFLT" |
+        "SIGSTOP" | "SIGSYS" | "SIGTERM" | "SIGTRAP" | "SIGTSTP" | "SIGTTIN" | "SIGTTOU" | "SIGUNUSED" | "SIGURG" |
+        "SIGUSR1" | "SIGUSR2" | "SIGVTALRM" | "SIGWINCH" | "SIGXCPU" | "SIGXFSZ" | "SIGBREAK" | "SIGLOST" | "SIGINFO";
+
+    type MultipleResolveType = 'resolve' | 'reject';
+
+    type BeforeExitListener = (code: number) => void;
+    type DisconnectListener = () => void;
+    type ExitListener = (code: number) => void;
+    type RejectionHandledListener = (promise: Promise<any>) => void;
+    type UncaughtExceptionListener = (error: Error) => void;
+    type UnhandledRejectionListener = (reason: any, promise: Promise<any>) => void;
+    type WarningListener = (warning: Error) => void;
+    type MessageListener = (message: any, sendHandle: any) => void;
+    type SignalsListener = (signal: Signals) => void;
+    type NewListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
+    type RemoveListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
+    type MultipleResolveListener = (type: MultipleResolveType, promise: Promise<any>, value: any) => void;
+
+    interface Socket extends ReadWriteStream {
+        isTTY?: true;
+    }
+
+    interface ProcessEnv {
+        [key: string]: string | undefined;
+    }
+
+    interface WriteStream extends Socket {
+        readonly writableHighWaterMark: number;
+        readonly writableLength: number;
+        columns?: number;
+        rows?: number;
+        _write(chunk: any, encoding: string, callback: Function): void;
+        _destroy(err: Error | null, callback: Function): void;
+        _final(callback: Function): void;
+        setDefaultEncoding(encoding: string): this;
+        cork(): void;
+        uncork(): void;
+        destroy(error?: Error): void;
+    }
+    interface ReadStream extends Socket {
+        readonly readableHighWaterMark: number;
+        readonly readableLength: number;
+        isRaw?: boolean;
+        setRawMode?(mode: boolean): void;
+        _read(size: number): void;
+        _destroy(err: Error | null, callback: Function): void;
+        push(chunk: any, encoding?: string): boolean;
+        destroy(error?: Error): void;
+    }
+
+    interface Process extends EventEmitter {
+        stdout: WriteStream;
+        stderr: WriteStream;
+        stdin: ReadStream;
+        openStdin(): Socket;
+        argv: string[];
+        argv0: string;
+        execArgv: string[];
+        execPath: string;
+        abort(): void;
+        chdir(directory: string): void;
+        cwd(): string;
+        debugPort: number;
+        emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
+        env: ProcessEnv;
+        exit(code?: number): never;
+        exitCode: number;
+        getgid(): number;
+        setgid(id: number | string): void;
+        getuid(): number;
+        setuid(id: number | string): void;
+        geteuid(): number;
+        seteuid(id: number | string): void;
+        getegid(): number;
+        setegid(id: number | string): void;
+        getgroups(): number[];
+        setgroups(groups: Array<string | number>): void;
+        setUncaughtExceptionCaptureCallback(cb: ((err: Error) => void) | null): void;
+        hasUncaughtExceptionCaptureCallback(): boolean;
+        version: string;
+        versions: ProcessVersions;
+        config: {
+            target_defaults: {
+                cflags: any[];
+                default_configuration: string;
+                defines: string[];
+                include_dirs: string[];
+                libraries: string[];
+            };
+            variables: {
+                clang: number;
+                host_arch: string;
+                node_install_npm: boolean;
+                node_install_waf: boolean;
+                node_prefix: string;
+                node_shared_openssl: boolean;
+                node_shared_v8: boolean;
+                node_shared_zlib: boolean;
+                node_use_dtrace: boolean;
+                node_use_etw: boolean;
+                node_use_openssl: boolean;
+                target_arch: string;
+                v8_no_strict_aliasing: number;
+                v8_use_snapshot: boolean;
+                visibility: string;
+            };
+        };
+        kill(pid: number, signal?: string | number): void;
+        pid: number;
+        ppid: number;
+        title: string;
+        arch: string;
+        platform: Platform;
+        mainModule?: NodeModule;
+        memoryUsage(): MemoryUsage;
+        cpuUsage(previousValue?: CpuUsage): CpuUsage;
+        nextTick(callback: Function, ...args: any[]): void;
+        release: ProcessRelease;
+        umask(mask?: number): number;
+        uptime(): number;
+        hrtime(time?: [number, number]): [number, number];
+        domain: Domain;
+
+        // Worker
+        send?(message: any, sendHandle?: any): void;
+        disconnect(): void;
+        connected: boolean;
+
+        /**
+         * The `process.allowedNodeEnvironmentFlags` property is a special,
+         * read-only `Set` of flags allowable within the [`NODE_OPTIONS`][]
+         * environment variable.
+         */
+        allowedNodeEnvironmentFlags: ReadonlySet<string>;
+
+        /**
+         * EventEmitter
+         *   1. beforeExit
+         *   2. disconnect
+         *   3. exit
+         *   4. message
+         *   5. rejectionHandled
+         *   6. uncaughtException
+         *   7. unhandledRejection
+         *   8. warning
+         *   9. message
+         *  10. <All OS Signals>
+         *  11. newListener/removeListener inherited from EventEmitter
+         */
+        addListener(event: "beforeExit", listener: BeforeExitListener): this;
+        addListener(event: "disconnect", listener: DisconnectListener): this;
+        addListener(event: "exit", listener: ExitListener): this;
+        addListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        addListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        addListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        addListener(event: "warning", listener: WarningListener): this;
+        addListener(event: "message", listener: MessageListener): this;
+        addListener(event: Signals, listener: SignalsListener): this;
+        addListener(event: "newListener", listener: NewListenerListener): this;
+        addListener(event: "removeListener", listener: RemoveListenerListener): this;
+        addListener(event: "multipleResolves", listener: MultipleResolveListener): this;
+
+        emit(event: "beforeExit", code: number): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "exit", code: number): boolean;
+        emit(event: "rejectionHandled", promise: Promise<any>): boolean;
+        emit(event: "uncaughtException", error: Error): boolean;
+        emit(event: "unhandledRejection", reason: any, promise: Promise<any>): boolean;
+        emit(event: "warning", warning: Error): boolean;
+        emit(event: "message", message: any, sendHandle: any): this;
+        emit(event: Signals, signal: Signals): boolean;
+        emit(event: "newListener", eventName: string | symbol, listener: (...args: any[]) => void): this;
+        emit(event: "removeListener", eventName: string, listener: (...args: any[]) => void): this;
+        emit(event: "multipleResolves", listener: MultipleResolveListener): this;
+
+        on(event: "beforeExit", listener: BeforeExitListener): this;
+        on(event: "disconnect", listener: DisconnectListener): this;
+        on(event: "exit", listener: ExitListener): this;
+        on(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        on(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        on(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        on(event: "warning", listener: WarningListener): this;
+        on(event: "message", listener: MessageListener): this;
+        on(event: Signals, listener: SignalsListener): this;
+        on(event: "newListener", listener: NewListenerListener): this;
+        on(event: "removeListener", listener: RemoveListenerListener): this;
+        on(event: "multipleResolves", listener: MultipleResolveListener): this;
+
+        once(event: "beforeExit", listener: BeforeExitListener): this;
+        once(event: "disconnect", listener: DisconnectListener): this;
+        once(event: "exit", listener: ExitListener): this;
+        once(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        once(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        once(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        once(event: "warning", listener: WarningListener): this;
+        once(event: "message", listener: MessageListener): this;
+        once(event: Signals, listener: SignalsListener): this;
+        once(event: "newListener", listener: NewListenerListener): this;
+        once(event: "removeListener", listener: RemoveListenerListener): this;
+        once(event: "multipleResolves", listener: MultipleResolveListener): this;
+
+        prependListener(event: "beforeExit", listener: BeforeExitListener): this;
+        prependListener(event: "disconnect", listener: DisconnectListener): this;
+        prependListener(event: "exit", listener: ExitListener): this;
+        prependListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        prependListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        prependListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        prependListener(event: "warning", listener: WarningListener): this;
+        prependListener(event: "message", listener: MessageListener): this;
+        prependListener(event: Signals, listener: SignalsListener): this;
+        prependListener(event: "newListener", listener: NewListenerListener): this;
+        prependListener(event: "removeListener", listener: RemoveListenerListener): this;
+        prependListener(event: "multipleResolves", listener: MultipleResolveListener): this;
+
+        prependOnceListener(event: "beforeExit", listener: BeforeExitListener): this;
+        prependOnceListener(event: "disconnect", listener: DisconnectListener): this;
+        prependOnceListener(event: "exit", listener: ExitListener): this;
+        prependOnceListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        prependOnceListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        prependOnceListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        prependOnceListener(event: "warning", listener: WarningListener): this;
+        prependOnceListener(event: "message", listener: MessageListener): this;
+        prependOnceListener(event: Signals, listener: SignalsListener): this;
+        prependOnceListener(event: "newListener", listener: NewListenerListener): this;
+        prependOnceListener(event: "removeListener", listener: RemoveListenerListener): this;
+        prependOnceListener(event: "multipleResolves", listener: MultipleResolveListener): this;
+
+        listeners(event: "beforeExit"): BeforeExitListener[];
+        listeners(event: "disconnect"): DisconnectListener[];
+        listeners(event: "exit"): ExitListener[];
+        listeners(event: "rejectionHandled"): RejectionHandledListener[];
+        listeners(event: "uncaughtException"): UncaughtExceptionListener[];
+        listeners(event: "unhandledRejection"): UnhandledRejectionListener[];
+        listeners(event: "warning"): WarningListener[];
+        listeners(event: "message"): MessageListener[];
+        listeners(event: Signals): SignalsListener[];
+        listeners(event: "newListener"): NewListenerListener[];
+        listeners(event: "removeListener"): RemoveListenerListener[];
+        listeners(event: "multipleResolves"): MultipleResolveListener[];
+    }
+
+    interface Global {
+        Array: typeof Array;
+        ArrayBuffer: typeof ArrayBuffer;
+        Boolean: typeof Boolean;
+        Buffer: typeof Buffer;
+        DataView: typeof DataView;
+        Date: typeof Date;
+        Error: typeof Error;
+        EvalError: typeof EvalError;
+        Float32Array: typeof Float32Array;
+        Float64Array: typeof Float64Array;
+        Function: typeof Function;
+        GLOBAL: Global;
+        Infinity: typeof Infinity;
+        Int16Array: typeof Int16Array;
+        Int32Array: typeof Int32Array;
+        Int8Array: typeof Int8Array;
+        Intl: typeof Intl;
+        JSON: typeof JSON;
+        Map: MapConstructor;
+        Math: typeof Math;
+        NaN: typeof NaN;
+        Number: typeof Number;
+        Object: typeof Object;
+        Promise: Function;
+        RangeError: typeof RangeError;
+        ReferenceError: typeof ReferenceError;
+        RegExp: typeof RegExp;
+        Set: SetConstructor;
+        String: typeof String;
+        Symbol: Function;
+        SyntaxError: typeof SyntaxError;
+        TypeError: typeof TypeError;
+        URIError: typeof URIError;
+        Uint16Array: typeof Uint16Array;
+        Uint32Array: typeof Uint32Array;
+        Uint8Array: typeof Uint8Array;
+        Uint8ClampedArray: Function;
+        WeakMap: WeakMapConstructor;
+        WeakSet: WeakSetConstructor;
+        clearImmediate: (immediateId: Immediate) => void;
+        clearInterval: (intervalId: Timeout) => void;
+        clearTimeout: (timeoutId: Timeout) => void;
+        console: typeof console;
+        decodeURI: typeof decodeURI;
+        decodeURIComponent: typeof decodeURIComponent;
+        encodeURI: typeof encodeURI;
+        encodeURIComponent: typeof encodeURIComponent;
+        escape: (str: string) => string;
+        eval: typeof eval;
+        global: Global;
+        isFinite: typeof isFinite;
+        isNaN: typeof isNaN;
+        parseFloat: typeof parseFloat;
+        parseInt: typeof parseInt;
+        process: Process;
+        root: Global;
+        setImmediate: (callback: (...args: any[]) => void, ...args: any[]) => Immediate;
+        setInterval: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => Timeout;
+        setTimeout: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => Timeout;
+        undefined: typeof undefined;
+        unescape: (str: string) => string;
+        gc: () => void;
+        v8debug?: any;
+    }
+
+    interface Timer {
+        ref(): void;
+        refresh(): void;
+        unref(): void;
+    }
+
+    class Immediate {
+        ref(): void;
+        unref(): void;
+        _onImmediate: Function; // to distinguish it from the Timeout class
+    }
+
+    class Timeout implements Timer {
+        ref(): void;
+        refresh(): void;
+        unref(): void;
+    }
+
+    class Module {
+        static runMain(): void;
+        static wrap(code: string): string;
+        static createRequireFromPath(path: string): (path: string) => any;
+        static builtinModules: string[];
+
+        static Module: typeof Module;
+
+        exports: any;
+        require: NodeRequireFunction;
+        id: string;
+        filename: string;
+        loaded: boolean;
+        parent: Module | null;
+        children: Module[];
+        paths: string[];
+
+        constructor(id: string, parent?: Module);
+    }
+
+    type TypedArray = Uint8Array | Uint8ClampedArray | Uint16Array | Uint32Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array;
+}
diff --git a/types/node/v10/http.d.ts b/types/node/v10/http.d.ts
new file mode 100644
index 0000000000..5e1ebcc127
--- /dev/null
+++ b/types/node/v10/http.d.ts
@@ -0,0 +1,256 @@
+declare module "http" {
+    import * as events from "events";
+    import * as net from "net";
+    import * as stream from "stream";
+    import { URL } from "url";
+
+    // incoming headers will never contain number
+    interface IncomingHttpHeaders {
+        'accept-patch'?: string;
+        'accept-ranges'?: string;
+        'accept'?: string;
+        'access-control-allow-credentials'?: string;
+        'access-control-allow-headers'?: string;
+        'access-control-allow-methods'?: string;
+        'access-control-allow-origin'?: string;
+        'access-control-expose-headers'?: string;
+        'access-control-max-age'?: string;
+        'age'?: string;
+        'allow'?: string;
+        'alt-svc'?: string;
+        'authorization'?: string;
+        'cache-control'?: string;
+        'connection'?: string;
+        'content-disposition'?: string;
+        'content-encoding'?: string;
+        'content-language'?: string;
+        'content-length'?: string;
+        'content-location'?: string;
+        'content-range'?: string;
+        'content-type'?: string;
+        'cookie'?: string;
+        'date'?: string;
+        'expect'?: string;
+        'expires'?: string;
+        'forwarded'?: string;
+        'from'?: string;
+        'host'?: string;
+        'if-match'?: string;
+        'if-modified-since'?: string;
+        'if-none-match'?: string;
+        'if-unmodified-since'?: string;
+        'last-modified'?: string;
+        'location'?: string;
+        'pragma'?: string;
+        'proxy-authenticate'?: string;
+        'proxy-authorization'?: string;
+        'public-key-pins'?: string;
+        'range'?: string;
+        'referer'?: string;
+        'retry-after'?: string;
+        'set-cookie'?: string[];
+        'strict-transport-security'?: string;
+        'tk'?: string;
+        'trailer'?: string;
+        'transfer-encoding'?: string;
+        'upgrade'?: string;
+        'user-agent'?: string;
+        'vary'?: string;
+        'via'?: string;
+        'warning'?: string;
+        'www-authenticate'?: string;
+        [header: string]: string | string[] | undefined;
+    }
+
+    // outgoing headers allows numbers (as they are converted internally to strings)
+    interface OutgoingHttpHeaders {
+        [header: string]: number | string | string[] | undefined;
+    }
+
+    interface ClientRequestArgs {
+        protocol?: string;
+        host?: string;
+        hostname?: string;
+        family?: number;
+        port?: number | string;
+        defaultPort?: number | string;
+        localAddress?: string;
+        socketPath?: string;
+        method?: string;
+        path?: string;
+        headers?: OutgoingHttpHeaders;
+        auth?: string;
+        agent?: Agent | boolean;
+        _defaultAgent?: Agent;
+        timeout?: number;
+        setHost?: boolean;
+        // https://github.com/nodejs/node/blob/master/lib/_http_client.js#L278
+        createConnection?: (options: ClientRequestArgs, oncreate: (err: Error, socket: net.Socket) => void) => net.Socket;
+    }
+
+    interface ServerOptions {
+        IncomingMessage?: typeof IncomingMessage;
+        ServerResponse?: typeof ServerResponse;
+    }
+
+    type RequestListener = (req: IncomingMessage, res: ServerResponse) => void;
+
+    class Server extends net.Server {
+        constructor(requestListener?: RequestListener);
+        constructor(options: ServerOptions, requestListener?: RequestListener);
+
+        setTimeout(msecs?: number, callback?: () => void): this;
+        setTimeout(callback: () => void): this;
+        maxHeadersCount: number;
+        timeout: number;
+        keepAliveTimeout: number;
+    }
+
+    // https://github.com/nodejs/node/blob/master/lib/_http_outgoing.js
+    class OutgoingMessage extends stream.Writable {
+        upgrading: boolean;
+        chunkedEncoding: boolean;
+        shouldKeepAlive: boolean;
+        useChunkedEncodingByDefault: boolean;
+        sendDate: boolean;
+        finished: boolean;
+        headersSent: boolean;
+        connection: net.Socket;
+
+        constructor();
+
+        setTimeout(msecs: number, callback?: () => void): this;
+        setHeader(name: string, value: number | string | string[]): void;
+        getHeader(name: string): number | string | string[] | undefined;
+        getHeaders(): OutgoingHttpHeaders;
+        getHeaderNames(): string[];
+        hasHeader(name: string): boolean;
+        removeHeader(name: string): void;
+        addTrailers(headers: OutgoingHttpHeaders | Array<[string, string]>): void;
+        flushHeaders(): void;
+    }
+
+    // https://github.com/nodejs/node/blob/master/lib/_http_server.js#L108-L256
+    class ServerResponse extends OutgoingMessage {
+        statusCode: number;
+        statusMessage: string;
+
+        constructor(req: IncomingMessage);
+
+        assignSocket(socket: net.Socket): void;
+        detachSocket(socket: net.Socket): void;
+        // https://github.com/nodejs/node/blob/master/test/parallel/test-http-write-callbacks.js#L53
+        // no args in writeContinue callback
+        writeContinue(callback?: () => void): void;
+        writeHead(statusCode: number, reasonPhrase?: string, headers?: OutgoingHttpHeaders): void;
+        writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
+    }
+
+    // https://github.com/nodejs/node/blob/master/lib/_http_client.js#L77
+    class ClientRequest extends OutgoingMessage {
+        connection: net.Socket;
+        socket: net.Socket;
+        aborted: number;
+
+        constructor(url: string | URL | ClientRequestArgs, cb?: (res: IncomingMessage) => void);
+
+        abort(): void;
+        onSocket(socket: net.Socket): void;
+        setTimeout(timeout: number, callback?: () => void): this;
+        setNoDelay(noDelay?: boolean): void;
+        setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
+    }
+
+    class IncomingMessage extends stream.Readable {
+        constructor(socket: net.Socket);
+
+        httpVersion: string;
+        httpVersionMajor: number;
+        httpVersionMinor: number;
+        connection: net.Socket;
+        headers: IncomingHttpHeaders;
+        rawHeaders: string[];
+        trailers: { [key: string]: string | undefined };
+        rawTrailers: string[];
+        setTimeout(msecs: number, callback: () => void): this;
+        /**
+         * Only valid for request obtained from http.Server.
+         */
+        method?: string;
+        /**
+         * Only valid for request obtained from http.Server.
+         */
+        url?: string;
+        /**
+         * Only valid for response obtained from http.ClientRequest.
+         */
+        statusCode?: number;
+        /**
+         * Only valid for response obtained from http.ClientRequest.
+         */
+        statusMessage?: string;
+        socket: net.Socket;
+        destroy(error?: Error): void;
+    }
+
+    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;
+        /**
+         * Socket timeout in milliseconds. This will set the timeout after the socket is connected.
+         */
+        timeout?: number;
+    }
+
+    class Agent {
+        maxFreeSockets: number;
+        maxSockets: number;
+        sockets: any;
+        requests: any;
+
+        constructor(opts?: AgentOptions);
+
+        /**
+         * Destroy any sockets that are currently in use by the agent.
+         * It is usually not necessary to do this. However, if you are using an agent with KeepAlive enabled,
+         * then it is best to explicitly shut down the agent when you know that it will no longer be used. Otherwise,
+         * sockets may hang open for quite a long time before the server terminates them.
+         */
+        destroy(): void;
+    }
+
+    const METHODS: string[];
+
+    const STATUS_CODES: {
+        [errorCode: number]: string | undefined;
+        [errorCode: string]: string | undefined;
+    };
+
+    function createServer(requestListener?: RequestListener): Server;
+    function createServer(options: ServerOptions, requestListener?: RequestListener): Server;
+    function createClient(port?: number, host?: string): any;
+
+    // although RequestOptions are passed as ClientRequestArgs to ClientRequest directly,
+    // create interface RequestOptions would make the naming more clear to developers
+    interface RequestOptions extends ClientRequestArgs { }
+    function request(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): ClientRequest;
+    function request(url: string | URL, options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
+    function get(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): ClientRequest;
+    function get(url: string | URL, options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
+    let globalAgent: Agent;
+}
diff --git a/types/node/v10/http2.d.ts b/types/node/v10/http2.d.ts
new file mode 100644
index 0000000000..aecbca783f
--- /dev/null
+++ b/types/node/v10/http2.d.ts
@@ -0,0 +1,861 @@
+declare module "http2" {
+    import * as events from "events";
+    import * as fs from "fs";
+    import * as net from "net";
+    import * as stream from "stream";
+    import * as tls from "tls";
+    import * as url from "url";
+
+    import { IncomingHttpHeaders as Http1IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
+    export { OutgoingHttpHeaders } from "http";
+
+    export interface IncomingHttpStatusHeader {
+        ":status"?: number;
+    }
+
+    export interface IncomingHttpHeaders extends Http1IncomingHttpHeaders {
+        ":path"?: string;
+        ":method"?: string;
+        ":authority"?: string;
+        ":scheme"?: string;
+    }
+
+    // Http2Stream
+
+    export interface StreamPriorityOptions {
+        exclusive?: boolean;
+        parent?: number;
+        weight?: number;
+        silent?: boolean;
+    }
+
+    export interface StreamState {
+        localWindowSize?: number;
+        state?: number;
+        streamLocalClose?: number;
+        streamRemoteClose?: number;
+        sumDependencyWeight?: number;
+        weight?: number;
+    }
+
+    export interface ServerStreamResponseOptions {
+        endStream?: boolean;
+        waitForTrailers?: boolean;
+    }
+
+    export interface StatOptions {
+        offset: number;
+        length: number;
+    }
+
+    export interface ServerStreamFileResponseOptions {
+        statCheck?: (stats: fs.Stats, headers: OutgoingHttpHeaders, statOptions: StatOptions) => void | boolean;
+        getTrailers?: (trailers: OutgoingHttpHeaders) => void;
+        offset?: number;
+        length?: number;
+    }
+
+    export interface ServerStreamFileResponseOptionsWithError extends ServerStreamFileResponseOptions {
+        onError?: (err: NodeJS.ErrnoException) => void;
+    }
+
+    export interface Http2Stream extends stream.Duplex {
+        readonly aborted: boolean;
+        readonly closed: boolean;
+        readonly destroyed: boolean;
+        readonly pending: boolean;
+        readonly rstCode: number;
+        readonly sentHeaders: OutgoingHttpHeaders;
+        readonly sentInfoHeaders?: OutgoingHttpHeaders[];
+        readonly sentTrailers?: OutgoingHttpHeaders;
+        readonly session: Http2Session;
+        readonly state: StreamState;
+        /**
+         * Set the true if the END_STREAM flag was set in the request or response HEADERS frame received,
+         * indicating that no additional data should be received and the readable side of the Http2Stream will be closed.
+         */
+        readonly endAfterHeaders: boolean;
+        close(code?: number, callback?: () => void): void;
+        priority(options: StreamPriorityOptions): void;
+        setTimeout(msecs: number, callback?: () => void): void;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "aborted", listener: () => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        addListener(event: "drain", listener: () => void): this;
+        addListener(event: "end", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "finish", listener: () => void): this;
+        addListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        addListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+        addListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        addListener(event: "streamClosed", listener: (code: number) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+        addListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "wantTrailers", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "aborted"): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "data", chunk: Buffer | string): boolean;
+        emit(event: "drain"): boolean;
+        emit(event: "end"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "finish"): boolean;
+        emit(event: "frameError", frameType: number, errorCode: number): boolean;
+        emit(event: "pipe", src: stream.Readable): boolean;
+        emit(event: "unpipe", src: stream.Readable): boolean;
+        emit(event: "streamClosed", code: number): boolean;
+        emit(event: "timeout"): boolean;
+        emit(event: "trailers", trailers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "wantTrailers"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "aborted", listener: () => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "data", listener: (chunk: Buffer | string) => void): this;
+        on(event: "drain", listener: () => void): this;
+        on(event: "end", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "finish", listener: () => void): this;
+        on(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        on(event: "pipe", listener: (src: stream.Readable) => void): this;
+        on(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        on(event: "streamClosed", listener: (code: number) => void): this;
+        on(event: "timeout", listener: () => void): this;
+        on(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "wantTrailers", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "aborted", listener: () => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "data", listener: (chunk: Buffer | string) => void): this;
+        once(event: "drain", listener: () => void): this;
+        once(event: "end", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "finish", listener: () => void): this;
+        once(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        once(event: "pipe", listener: (src: stream.Readable) => void): this;
+        once(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        once(event: "streamClosed", listener: (code: number) => void): this;
+        once(event: "timeout", listener: () => void): this;
+        once(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "wantTrailers", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "aborted", listener: () => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        prependListener(event: "drain", listener: () => void): this;
+        prependListener(event: "end", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "finish", listener: () => void): this;
+        prependListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        prependListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+        prependListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        prependListener(event: "streamClosed", listener: (code: number) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+        prependListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "wantTrailers", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "aborted", listener: () => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "end", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "finish", listener: () => void): this;
+        prependOnceListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        prependOnceListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+        prependOnceListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        prependOnceListener(event: "streamClosed", listener: (code: number) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+        prependOnceListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "wantTrailers", listener: () => void): this;
+
+        sendTrailers(headers: OutgoingHttpHeaders): this;
+    }
+
+    export interface ClientHttp2Stream extends Http2Stream {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+        addListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "headers", headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number): boolean;
+        emit(event: "push", headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "response", headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+        on(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+        once(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+        prependListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+        prependOnceListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+    }
+
+    export interface ServerHttp2Stream extends Http2Stream {
+        additionalHeaders(headers: OutgoingHttpHeaders): void;
+        readonly headersSent: boolean;
+        readonly pushAllowed: boolean;
+        pushStream(headers: OutgoingHttpHeaders, callback?: (err: Error | null, pushStream: ServerHttp2Stream, headers: OutgoingHttpHeaders) => void): void;
+        pushStream(headers: OutgoingHttpHeaders, options?: StreamPriorityOptions, callback?: (err: Error | null, pushStream: ServerHttp2Stream, headers: OutgoingHttpHeaders) => void): void;
+        respond(headers?: OutgoingHttpHeaders, options?: ServerStreamResponseOptions): void;
+        respondWithFD(fd: number, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptions): void;
+        respondWithFile(path: string, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptionsWithError): void;
+    }
+
+    // Http2Session
+
+    export interface Settings {
+        headerTableSize?: number;
+        enablePush?: boolean;
+        initialWindowSize?: number;
+        maxFrameSize?: number;
+        maxConcurrentStreams?: number;
+        maxHeaderListSize?: number;
+    }
+
+    export interface ClientSessionRequestOptions {
+        endStream?: boolean;
+        exclusive?: boolean;
+        parent?: number;
+        weight?: number;
+        getTrailers?: (trailers: OutgoingHttpHeaders, flags: number) => void;
+    }
+
+    export interface SessionState {
+        effectiveLocalWindowSize?: number;
+        effectiveRecvDataLength?: number;
+        nextStreamID?: number;
+        localWindowSize?: number;
+        lastProcStreamID?: number;
+        remoteWindowSize?: number;
+        outboundQueueSize?: number;
+        deflateDynamicTableSize?: number;
+        inflateDynamicTableSize?: number;
+    }
+
+    export interface Http2Session extends events.EventEmitter {
+        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 | 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;
+        setTimeout(msecs: number, callback?: () => void): void;
+        readonly socket: net.Socket | tls.TLSSocket;
+        readonly state: SessionState;
+        priority(stream: Http2Stream, options: StreamPriorityOptions): void;
+        settings(settings: Settings): void;
+        readonly type: number;
+        unref(): void;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        addListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        addListener(event: "localSettings", listener: (settings: Settings) => void): this;
+        addListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+        addListener(event: "ping", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "frameError", frameType: number, errorCode: number, streamID: number): boolean;
+        emit(event: "goaway", errorCode: number, lastStreamID: number, opaqueData: Buffer): boolean;
+        emit(event: "localSettings", settings: Settings): boolean;
+        emit(event: "remoteSettings", settings: Settings): boolean;
+        emit(event: "timeout"): boolean;
+        emit(event: "ping"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        on(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        on(event: "localSettings", listener: (settings: Settings) => void): this;
+        on(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        on(event: "timeout", listener: () => void): this;
+        on(event: "ping", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        once(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        once(event: "localSettings", listener: (settings: Settings) => void): this;
+        once(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        once(event: "timeout", listener: () => void): this;
+        once(event: "ping", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        prependListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        prependListener(event: "localSettings", listener: (settings: Settings) => void): this;
+        prependListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+        prependListener(event: "ping", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        prependOnceListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        prependOnceListener(event: "localSettings", listener: (settings: Settings) => void): this;
+        prependOnceListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+        prependOnceListener(event: "ping", listener: () => void): this;
+    }
+
+    export interface ClientHttp2Session extends Http2Session {
+        request(headers?: OutgoingHttpHeaders, options?: ClientSessionRequestOptions): ClientHttp2Stream;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
+        addListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        addListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "altsvc", alt: string, origin: string, stream: number): boolean;
+        emit(event: "connect", session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket): boolean;
+        emit(event: "stream", stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
+        on(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        on(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
+        once(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        once(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
+        prependListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
+        prependOnceListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
+    }
+
+    export interface AlternativeServiceOptions {
+        origin: number | string | url.URL;
+    }
+
+    export interface ServerHttp2Session extends Http2Session {
+        altsvc(alt: string, originOrStream: number | string | url.URL | AlternativeServiceOptions): void;
+        readonly server: Http2Server | Http2SecureServer;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "connect", session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket): boolean;
+        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+    }
+
+    // Http2Server
+
+    export interface SessionOptions {
+        maxDeflateDynamicTableSize?: number;
+        maxReservedRemoteStreams?: number;
+        maxSendHeaderBlockLength?: number;
+        paddingStrategy?: number;
+        peerMaxConcurrentStreams?: number;
+        selectPadding?: (frameLen: number, maxFrameLen: number) => number;
+        settings?: Settings;
+        createConnection?: (option: SessionOptions) => stream.Duplex;
+    }
+
+    export type ClientSessionOptions = SessionOptions;
+    export type ServerSessionOptions = SessionOptions;
+
+    export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
+    export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
+
+    export interface ServerOptions extends ServerSessionOptions {
+        allowHTTP1?: boolean;
+    }
+
+    export interface SecureServerOptions extends SecureServerSessionOptions {
+        allowHTTP1?: boolean;
+    }
+
+    export interface Http2Server extends net.Server {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        addListener(event: "sessionError", listener: (err: Error) => void): this;
+        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "checkContinue", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
+        emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
+        emit(event: "sessionError", err: Error): boolean;
+        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "timeout"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        on(event: "sessionError", listener: (err: Error) => void): this;
+        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "timeout", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        once(event: "sessionError", listener: (err: Error) => void): this;
+        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "timeout", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+    }
+
+    export interface Http2SecureServer extends tls.Server {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        addListener(event: "sessionError", listener: (err: Error) => void): this;
+        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+        addListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "checkContinue", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
+        emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
+        emit(event: "sessionError", err: Error): boolean;
+        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "timeout"): boolean;
+        emit(event: "unknownProtocol", socket: tls.TLSSocket): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        on(event: "sessionError", listener: (err: Error) => void): this;
+        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "timeout", listener: () => void): this;
+        on(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        once(event: "sessionError", listener: (err: Error) => void): this;
+        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "timeout", listener: () => void): this;
+        once(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+        prependListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+        prependOnceListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+    }
+
+    export class Http2ServerRequest extends stream.Readable {
+        private constructor();
+        headers: IncomingHttpHeaders;
+        httpVersion: string;
+        method: string;
+        rawHeaders: string[];
+        rawTrailers: string[];
+        setTimeout(msecs: number, callback?: () => void): void;
+        socket: net.Socket | tls.TLSSocket;
+        stream: ServerHttp2Stream;
+        trailers: IncomingHttpHeaders;
+        url: string;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "aborted", hadError: boolean, code: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+    }
+
+    export class Http2ServerResponse extends events.EventEmitter {
+        private constructor();
+        addTrailers(trailers: OutgoingHttpHeaders): void;
+        connection: net.Socket | tls.TLSSocket;
+        end(callback?: () => void): void;
+        end(data?: string | Buffer, callback?: () => void): void;
+        end(data?: string | Buffer, encoding?: string, callback?: () => void): void;
+        readonly finished: boolean;
+        getHeader(name: string): string;
+        getHeaderNames(): string[];
+        getHeaders(): OutgoingHttpHeaders;
+        hasHeader(name: string): boolean;
+        readonly headersSent: boolean;
+        removeHeader(name: string): void;
+        sendDate: boolean;
+        setHeader(name: string, value: number | string | string[]): void;
+        setTimeout(msecs: number, callback?: () => void): void;
+        socket: net.Socket | tls.TLSSocket;
+        statusCode: number;
+        statusMessage: '';
+        stream: ServerHttp2Stream;
+        write(chunk: string | Buffer, callback?: (err: Error) => void): boolean;
+        write(chunk: string | Buffer, encoding?: string, callback?: (err: Error) => void): boolean;
+        writeContinue(): void;
+        writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
+        writeHead(statusCode: number, statusMessage?: string, headers?: OutgoingHttpHeaders): void;
+        createPushResponse(headers: OutgoingHttpHeaders, callback: (err: Error | null, res: Http2ServerResponse) => void): void;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "drain", listener: () => void): this;
+        addListener(event: "error", listener: (error: Error) => void): this;
+        addListener(event: "finish", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "aborted", hadError: boolean, code: number): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "drain"): boolean;
+        emit(event: "error", error: Error): boolean;
+        emit(event: "finish"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "drain", listener: () => void): this;
+        on(event: "error", listener: (error: Error) => void): this;
+        on(event: "finish", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "drain", listener: () => void): this;
+        once(event: "error", listener: (error: Error) => void): this;
+        once(event: "finish", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "drain", listener: () => void): this;
+        prependListener(event: "error", listener: (error: Error) => void): this;
+        prependListener(event: "finish", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (error: Error) => void): this;
+        prependOnceListener(event: "finish", listener: () => void): this;
+    }
+
+    // Public API
+
+    export namespace constants {
+        const NGHTTP2_SESSION_SERVER: number;
+        const NGHTTP2_SESSION_CLIENT: number;
+        const NGHTTP2_STREAM_STATE_IDLE: number;
+        const NGHTTP2_STREAM_STATE_OPEN: number;
+        const NGHTTP2_STREAM_STATE_RESERVED_LOCAL: number;
+        const NGHTTP2_STREAM_STATE_RESERVED_REMOTE: number;
+        const NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL: number;
+        const NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE: number;
+        const NGHTTP2_STREAM_STATE_CLOSED: number;
+        const NGHTTP2_NO_ERROR: number;
+        const NGHTTP2_PROTOCOL_ERROR: number;
+        const NGHTTP2_INTERNAL_ERROR: number;
+        const NGHTTP2_FLOW_CONTROL_ERROR: number;
+        const NGHTTP2_SETTINGS_TIMEOUT: number;
+        const NGHTTP2_STREAM_CLOSED: number;
+        const NGHTTP2_FRAME_SIZE_ERROR: number;
+        const NGHTTP2_REFUSED_STREAM: number;
+        const NGHTTP2_CANCEL: number;
+        const NGHTTP2_COMPRESSION_ERROR: number;
+        const NGHTTP2_CONNECT_ERROR: number;
+        const NGHTTP2_ENHANCE_YOUR_CALM: number;
+        const NGHTTP2_INADEQUATE_SECURITY: number;
+        const NGHTTP2_HTTP_1_1_REQUIRED: number;
+        const NGHTTP2_ERR_FRAME_SIZE_ERROR: number;
+        const NGHTTP2_FLAG_NONE: number;
+        const NGHTTP2_FLAG_END_STREAM: number;
+        const NGHTTP2_FLAG_END_HEADERS: number;
+        const NGHTTP2_FLAG_ACK: number;
+        const NGHTTP2_FLAG_PADDED: number;
+        const NGHTTP2_FLAG_PRIORITY: number;
+        const DEFAULT_SETTINGS_HEADER_TABLE_SIZE: number;
+        const DEFAULT_SETTINGS_ENABLE_PUSH: number;
+        const DEFAULT_SETTINGS_INITIAL_WINDOW_SIZE: number;
+        const DEFAULT_SETTINGS_MAX_FRAME_SIZE: number;
+        const MAX_MAX_FRAME_SIZE: number;
+        const MIN_MAX_FRAME_SIZE: number;
+        const MAX_INITIAL_WINDOW_SIZE: number;
+        const NGHTTP2_DEFAULT_WEIGHT: number;
+        const NGHTTP2_SETTINGS_HEADER_TABLE_SIZE: number;
+        const NGHTTP2_SETTINGS_ENABLE_PUSH: number;
+        const NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS: number;
+        const NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE: number;
+        const NGHTTP2_SETTINGS_MAX_FRAME_SIZE: number;
+        const NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE: number;
+        const PADDING_STRATEGY_NONE: number;
+        const PADDING_STRATEGY_MAX: number;
+        const PADDING_STRATEGY_CALLBACK: number;
+        const HTTP2_HEADER_STATUS: string;
+        const HTTP2_HEADER_METHOD: string;
+        const HTTP2_HEADER_AUTHORITY: string;
+        const HTTP2_HEADER_SCHEME: string;
+        const HTTP2_HEADER_PATH: string;
+        const HTTP2_HEADER_ACCEPT_CHARSET: string;
+        const HTTP2_HEADER_ACCEPT_ENCODING: string;
+        const HTTP2_HEADER_ACCEPT_LANGUAGE: string;
+        const HTTP2_HEADER_ACCEPT_RANGES: string;
+        const HTTP2_HEADER_ACCEPT: string;
+        const HTTP2_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN: string;
+        const HTTP2_HEADER_AGE: string;
+        const HTTP2_HEADER_ALLOW: string;
+        const HTTP2_HEADER_AUTHORIZATION: string;
+        const HTTP2_HEADER_CACHE_CONTROL: string;
+        const HTTP2_HEADER_CONNECTION: string;
+        const HTTP2_HEADER_CONTENT_DISPOSITION: string;
+        const HTTP2_HEADER_CONTENT_ENCODING: string;
+        const HTTP2_HEADER_CONTENT_LANGUAGE: string;
+        const HTTP2_HEADER_CONTENT_LENGTH: string;
+        const HTTP2_HEADER_CONTENT_LOCATION: string;
+        const HTTP2_HEADER_CONTENT_MD5: string;
+        const HTTP2_HEADER_CONTENT_RANGE: string;
+        const HTTP2_HEADER_CONTENT_TYPE: string;
+        const HTTP2_HEADER_COOKIE: string;
+        const HTTP2_HEADER_DATE: string;
+        const HTTP2_HEADER_ETAG: string;
+        const HTTP2_HEADER_EXPECT: string;
+        const HTTP2_HEADER_EXPIRES: string;
+        const HTTP2_HEADER_FROM: string;
+        const HTTP2_HEADER_HOST: string;
+        const HTTP2_HEADER_IF_MATCH: string;
+        const HTTP2_HEADER_IF_MODIFIED_SINCE: string;
+        const HTTP2_HEADER_IF_NONE_MATCH: string;
+        const HTTP2_HEADER_IF_RANGE: string;
+        const HTTP2_HEADER_IF_UNMODIFIED_SINCE: string;
+        const HTTP2_HEADER_LAST_MODIFIED: string;
+        const HTTP2_HEADER_LINK: string;
+        const HTTP2_HEADER_LOCATION: string;
+        const HTTP2_HEADER_MAX_FORWARDS: string;
+        const HTTP2_HEADER_PREFER: string;
+        const HTTP2_HEADER_PROXY_AUTHENTICATE: string;
+        const HTTP2_HEADER_PROXY_AUTHORIZATION: string;
+        const HTTP2_HEADER_RANGE: string;
+        const HTTP2_HEADER_REFERER: string;
+        const HTTP2_HEADER_REFRESH: string;
+        const HTTP2_HEADER_RETRY_AFTER: string;
+        const HTTP2_HEADER_SERVER: string;
+        const HTTP2_HEADER_SET_COOKIE: string;
+        const HTTP2_HEADER_STRICT_TRANSPORT_SECURITY: string;
+        const HTTP2_HEADER_TRANSFER_ENCODING: string;
+        const HTTP2_HEADER_TE: string;
+        const HTTP2_HEADER_UPGRADE: string;
+        const HTTP2_HEADER_USER_AGENT: string;
+        const HTTP2_HEADER_VARY: string;
+        const HTTP2_HEADER_VIA: string;
+        const HTTP2_HEADER_WWW_AUTHENTICATE: string;
+        const HTTP2_HEADER_HTTP2_SETTINGS: string;
+        const HTTP2_HEADER_KEEP_ALIVE: string;
+        const HTTP2_HEADER_PROXY_CONNECTION: string;
+        const HTTP2_METHOD_ACL: string;
+        const HTTP2_METHOD_BASELINE_CONTROL: string;
+        const HTTP2_METHOD_BIND: string;
+        const HTTP2_METHOD_CHECKIN: string;
+        const HTTP2_METHOD_CHECKOUT: string;
+        const HTTP2_METHOD_CONNECT: string;
+        const HTTP2_METHOD_COPY: string;
+        const HTTP2_METHOD_DELETE: string;
+        const HTTP2_METHOD_GET: string;
+        const HTTP2_METHOD_HEAD: string;
+        const HTTP2_METHOD_LABEL: string;
+        const HTTP2_METHOD_LINK: string;
+        const HTTP2_METHOD_LOCK: string;
+        const HTTP2_METHOD_MERGE: string;
+        const HTTP2_METHOD_MKACTIVITY: string;
+        const HTTP2_METHOD_MKCALENDAR: string;
+        const HTTP2_METHOD_MKCOL: string;
+        const HTTP2_METHOD_MKREDIRECTREF: string;
+        const HTTP2_METHOD_MKWORKSPACE: string;
+        const HTTP2_METHOD_MOVE: string;
+        const HTTP2_METHOD_OPTIONS: string;
+        const HTTP2_METHOD_ORDERPATCH: string;
+        const HTTP2_METHOD_PATCH: string;
+        const HTTP2_METHOD_POST: string;
+        const HTTP2_METHOD_PRI: string;
+        const HTTP2_METHOD_PROPFIND: string;
+        const HTTP2_METHOD_PROPPATCH: string;
+        const HTTP2_METHOD_PUT: string;
+        const HTTP2_METHOD_REBIND: string;
+        const HTTP2_METHOD_REPORT: string;
+        const HTTP2_METHOD_SEARCH: string;
+        const HTTP2_METHOD_TRACE: string;
+        const HTTP2_METHOD_UNBIND: string;
+        const HTTP2_METHOD_UNCHECKOUT: string;
+        const HTTP2_METHOD_UNLINK: string;
+        const HTTP2_METHOD_UNLOCK: string;
+        const HTTP2_METHOD_UPDATE: string;
+        const HTTP2_METHOD_UPDATEREDIRECTREF: string;
+        const HTTP2_METHOD_VERSION_CONTROL: string;
+        const HTTP_STATUS_CONTINUE: number;
+        const HTTP_STATUS_SWITCHING_PROTOCOLS: number;
+        const HTTP_STATUS_PROCESSING: number;
+        const HTTP_STATUS_OK: number;
+        const HTTP_STATUS_CREATED: number;
+        const HTTP_STATUS_ACCEPTED: number;
+        const HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION: number;
+        const HTTP_STATUS_NO_CONTENT: number;
+        const HTTP_STATUS_RESET_CONTENT: number;
+        const HTTP_STATUS_PARTIAL_CONTENT: number;
+        const HTTP_STATUS_MULTI_STATUS: number;
+        const HTTP_STATUS_ALREADY_REPORTED: number;
+        const HTTP_STATUS_IM_USED: number;
+        const HTTP_STATUS_MULTIPLE_CHOICES: number;
+        const HTTP_STATUS_MOVED_PERMANENTLY: number;
+        const HTTP_STATUS_FOUND: number;
+        const HTTP_STATUS_SEE_OTHER: number;
+        const HTTP_STATUS_NOT_MODIFIED: number;
+        const HTTP_STATUS_USE_PROXY: number;
+        const HTTP_STATUS_TEMPORARY_REDIRECT: number;
+        const HTTP_STATUS_PERMANENT_REDIRECT: number;
+        const HTTP_STATUS_BAD_REQUEST: number;
+        const HTTP_STATUS_UNAUTHORIZED: number;
+        const HTTP_STATUS_PAYMENT_REQUIRED: number;
+        const HTTP_STATUS_FORBIDDEN: number;
+        const HTTP_STATUS_NOT_FOUND: number;
+        const HTTP_STATUS_METHOD_NOT_ALLOWED: number;
+        const HTTP_STATUS_NOT_ACCEPTABLE: number;
+        const HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED: number;
+        const HTTP_STATUS_REQUEST_TIMEOUT: number;
+        const HTTP_STATUS_CONFLICT: number;
+        const HTTP_STATUS_GONE: number;
+        const HTTP_STATUS_LENGTH_REQUIRED: number;
+        const HTTP_STATUS_PRECONDITION_FAILED: number;
+        const HTTP_STATUS_PAYLOAD_TOO_LARGE: number;
+        const HTTP_STATUS_URI_TOO_LONG: number;
+        const HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE: number;
+        const HTTP_STATUS_RANGE_NOT_SATISFIABLE: number;
+        const HTTP_STATUS_EXPECTATION_FAILED: number;
+        const HTTP_STATUS_TEAPOT: number;
+        const HTTP_STATUS_MISDIRECTED_REQUEST: number;
+        const HTTP_STATUS_UNPROCESSABLE_ENTITY: number;
+        const HTTP_STATUS_LOCKED: number;
+        const HTTP_STATUS_FAILED_DEPENDENCY: number;
+        const HTTP_STATUS_UNORDERED_COLLECTION: number;
+        const HTTP_STATUS_UPGRADE_REQUIRED: number;
+        const HTTP_STATUS_PRECONDITION_REQUIRED: number;
+        const HTTP_STATUS_TOO_MANY_REQUESTS: number;
+        const HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE: number;
+        const HTTP_STATUS_UNAVAILABLE_FOR_LEGAL_REASONS: number;
+        const HTTP_STATUS_INTERNAL_SERVER_ERROR: number;
+        const HTTP_STATUS_NOT_IMPLEMENTED: number;
+        const HTTP_STATUS_BAD_GATEWAY: number;
+        const HTTP_STATUS_SERVICE_UNAVAILABLE: number;
+        const HTTP_STATUS_GATEWAY_TIMEOUT: number;
+        const HTTP_STATUS_HTTP_VERSION_NOT_SUPPORTED: number;
+        const HTTP_STATUS_VARIANT_ALSO_NEGOTIATES: number;
+        const HTTP_STATUS_INSUFFICIENT_STORAGE: number;
+        const HTTP_STATUS_LOOP_DETECTED: number;
+        const HTTP_STATUS_BANDWIDTH_LIMIT_EXCEEDED: number;
+        const HTTP_STATUS_NOT_EXTENDED: number;
+        const HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED: number;
+    }
+
+    export function getDefaultSettings(): Settings;
+    export function getPackedSettings(settings: Settings): Settings;
+    export function getUnpackedSettings(buf: Buffer | Uint8Array): Settings;
+
+    export function createServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;
+    export function createServer(options: ServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;
+
+    export function createSecureServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;
+    export function createSecureServer(options: SecureServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;
+
+    export function connect(authority: string | url.URL, listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): ClientHttp2Session;
+    export function connect(
+        authority: string | url.URL,
+        options?: ClientSessionOptions | SecureClientSessionOptions,
+        listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void,
+    ): ClientHttp2Session;
+}
diff --git a/types/node/v10/https.d.ts b/types/node/v10/https.d.ts
new file mode 100644
index 0000000000..2c7064f4df
--- /dev/null
+++ b/types/node/v10/https.d.ts
@@ -0,0 +1,39 @@
+declare module "https" {
+    import * as tls from "tls";
+    import * as events from "events";
+    import * as http from "http";
+    import { URL } from "url";
+
+    type ServerOptions = tls.SecureContextOptions & tls.TlsOptions & http.ServerOptions;
+
+    type RequestOptions = http.RequestOptions & tls.SecureContextOptions & {
+        rejectUnauthorized?: boolean; // Defaults to true
+        servername?: string; // SNI TLS Extension
+    };
+
+    interface AgentOptions extends http.AgentOptions, tls.ConnectionOptions {
+        rejectUnauthorized?: boolean;
+        maxCachedSessions?: number;
+    }
+
+    class Agent extends http.Agent {
+        constructor(options?: AgentOptions);
+        options: AgentOptions;
+    }
+
+    class Server extends tls.Server {
+        constructor(options: ServerOptions, requestListener?: http.RequestListener);
+
+        setTimeout(callback: () => void): this;
+        setTimeout(msecs?: number, callback?: () => void): this;
+        timeout: number;
+        keepAliveTimeout: number;
+    }
+
+    function createServer(options: ServerOptions, requestListener?: http.RequestListener): Server;
+    function request(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    function request(url: string | URL, options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    function get(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    function get(url: string | URL, options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    let globalAgent: Agent;
+}
diff --git a/types/node/v10/index.d.ts b/types/node/v10/index.d.ts
new file mode 100644
index 0000000000..a237502039
--- /dev/null
+++ b/types/node/v10/index.d.ts
@@ -0,0 +1,85 @@
+// Type definitions for Node.js 10.12
+// Project: http://nodejs.org/
+// Definitions by: Microsoft TypeScript <https://github.com/Microsoft>
+//                 DefinitelyTyped <https://github.com/DefinitelyTyped>
+//                 Alberto Schiabel <https://github.com/jkomyno>
+//                 Alexander T. <https://github.com/a-tarasyuk>
+//                 Alvis HT Tang <https://github.com/alvis>
+//                 Andrew Makarov <https://github.com/r3nya>
+//                 Bruno Scheufler <https://github.com/brunoscheufler>
+//                 Chigozirim C. <https://github.com/smac89>
+//                 Christian Vaagland Tellnes <https://github.com/tellnes>
+//                 Deividas Bakanas <https://github.com/DeividasBakanas>
+//                 Eugene Y. Q. Shen <https://github.com/eyqs>
+//                 Flarna <https://github.com/Flarna>
+//                 Hannes Magnusson <https://github.com/Hannes-Magnusson-CK>
+//                 Hoàng Văn Khải <https://github.com/KSXGitHub>
+//                 Huw <https://github.com/hoo29>
+//                 Kelvin Jin <https://github.com/kjin>
+//                 Klaus Meinhardt <https://github.com/ajafff>
+//                 Lishude <https://github.com/islishude>
+//                 Mariusz Wiktorczyk <https://github.com/mwiktorczyk>
+//                 Matthieu Sieben <https://github.com/matthieusieben>
+//                 Mohsen Azimi <https://github.com/mohsen1>
+//                 Nicolas Even <https://github.com/n-e>
+//                 Nicolas Voigt <https://github.com/octo-sniffle>
+//                 Parambir Singh <https://github.com/parambirs>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
+//                 Simon Schick <https://github.com/SimonSchick>
+//                 Thomas den Hollander <https://github.com/ThomasdenH>
+//                 Wilco Bakker <https://github.com/WilcoBakker>
+//                 wwwy3y3 <https://github.com/wwwy3y3>
+//                 Zane Hannan AU <https://github.com/ZaneHannanAU>
+//                 Jeremie Rodriguez <https://github.com/jeremiergz>
+//                 Samuel Ainsworth <https://github.com/samuela>
+//                 Kyle Uehlein <https://github.com/kuehlein>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// NOTE: These definitions support NodeJS and TypeScript 3.1.
+
+// NOTE: TypeScript version-specific augmentations can be found in the following paths:
+//          - ~/base.d.ts         - Shared definitions common to all TypeScript versions
+//          - ~/index.d.ts        - Definitions specific to TypeScript 2.1
+//          - ~/ts3.1/index.d.ts  - Definitions specific to TypeScript 3.1
+
+// NOTE: Augmentations for TypeScript 3.1 and later should use individual files for overrides
+//       within the respective ~/ts3.1 (or later) folder. However, this is disallowed for versions
+//       prior to TypeScript 3.1, so the older definitions will be found here.
+
+// Base definitions for all NodeJS modules that are not specific to any version of TypeScript:
+/// <reference path="base.d.ts" />
+
+// TypeScript 2.1-specific augmentations:
+
+// Forward-declarations for needed types from es2015 and later (in case users are using `--lib es5`)
+interface MapConstructor { }
+interface WeakMapConstructor { }
+interface SetConstructor { }
+interface WeakSetConstructor { }
+interface Set<T> {}
+interface ReadonlySet<T> {}
+interface IteratorResult<T> { }
+interface Iterable<T> { }
+interface Iterator<T> {
+    next(value?: any): IteratorResult<T>;
+}
+interface IterableIterator<T> { }
+interface AsyncIterableIterator<T> {}
+interface SymbolConstructor {
+    readonly iterator: symbol;
+    readonly asyncIterator: symbol;
+}
+declare var Symbol: SymbolConstructor;
+interface SharedArrayBuffer {
+    readonly byteLength: number;
+    slice(begin?: number, end?: number): SharedArrayBuffer;
+}
+
+declare module "util" {
+    namespace inspect {
+        const custom: symbol;
+    }
+    namespace promisify {
+        const custom: symbol;
+    }
+}
diff --git a/types/node/v10/inspector.d.ts b/types/node/v10/inspector.d.ts
new file mode 100644
index 0000000000..2dcd2760ad
--- /dev/null
+++ b/types/node/v10/inspector.d.ts
@@ -0,0 +1,3162 @@
+// tslint:disable-next-line:dt-header
+// Type definitions for inspector
+
+// These definitions are auto-generated.
+// Please see https://github.com/DefinitelyTyped/DefinitelyTyped/pull/19330
+// for more information.
+
+/**
+ * The inspector module provides an API for interacting with the V8 inspector.
+ */
+declare module "inspector" {
+    import { EventEmitter } from 'events';
+
+    interface InspectorNotification<T> {
+        method: string;
+        params: T;
+    }
+
+    namespace Console {
+        /**
+         * Console message.
+         */
+        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;
+        }
+
+        interface MessageAddedEventDataType {
+            /**
+             * Console message that has been added.
+             */
+            message: ConsoleMessage;
+        }
+    }
+
+    namespace Debugger {
+        /**
+         * Breakpoint identifier.
+         */
+        type BreakpointId = string;
+
+        /**
+         * Call frame identifier.
+         */
+        type CallFrameId = string;
+
+        /**
+         * Location in the source code.
+         */
+        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
+         */
+        interface ScriptPosition {
+            lineNumber: number;
+            columnNumber: number;
+        }
+
+        /**
+         * JavaScript call frame. Array of call frames form the call stack.
+         */
+        interface CallFrame {
+            /**
+             * Call frame identifier. This identifier is only valid while the virtual machine is paused.
+             */
+            callFrameId: CallFrameId;
+            /**
+             * Name of the JavaScript function called on this call frame.
+             */
+            functionName: string;
+            /**
+             * Location in the source code.
+             */
+            functionLocation?: Location;
+            /**
+             * Location in the source code.
+             */
+            location: Location;
+            /**
+             * JavaScript script name or url.
+             */
+            url: string;
+            /**
+             * Scope chain for this call frame.
+             */
+            scopeChain: 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.
+         */
+        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?: Location;
+            /**
+             * Location in the source code where scope ends
+             */
+            endLocation?: Location;
+        }
+
+        /**
+         * Search match for resource.
+         */
+        interface SearchMatch {
+            /**
+             * Line number in resource content.
+             */
+            lineNumber: number;
+            /**
+             * Line with match content.
+             */
+            lineContent: string;
+        }
+
+        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;
+        }
+
+        interface ContinueToLocationParameterType {
+            /**
+             * Location to continue to.
+             */
+            location: Location;
+            targetCallFrames?: string;
+        }
+
+        interface EvaluateOnCallFrameParameterType {
+            /**
+             * Call frame identifier to evaluate on.
+             */
+            callFrameId: 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;
+            /**
+             * Terminate execution after timing out (number of milliseconds).
+             * @experimental
+             */
+            timeout?: Runtime.TimeDelta;
+        }
+
+        interface GetPossibleBreakpointsParameterType {
+            /**
+             * Start of range to search possible breakpoint locations in.
+             */
+            start: Location;
+            /**
+             * End of range to search possible breakpoint locations in (excluding). When not specified, end
+             * of scripts is used as end of range.
+             */
+            end?: Location;
+            /**
+             * Only consider locations which are in the same (non-nested) function as start.
+             */
+            restrictToFunction?: boolean;
+        }
+
+        interface GetScriptSourceParameterType {
+            /**
+             * Id of the script to get source for.
+             */
+            scriptId: Runtime.ScriptId;
+        }
+
+        interface GetStackTraceParameterType {
+            stackTraceId: Runtime.StackTraceId;
+        }
+
+        interface PauseOnAsyncCallParameterType {
+            /**
+             * Debugger will pause when async call with given stack trace is started.
+             */
+            parentStackTraceId: Runtime.StackTraceId;
+        }
+
+        interface RemoveBreakpointParameterType {
+            breakpointId: BreakpointId;
+        }
+
+        interface RestartFrameParameterType {
+            /**
+             * Call frame identifier to evaluate on.
+             */
+            callFrameId: CallFrameId;
+        }
+
+        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;
+        }
+
+        interface SetAsyncCallStackDepthParameterType {
+            /**
+             * Maximum depth of async call stacks. Setting to `0` will effectively disable collecting async
+             * call stacks (default).
+             */
+            maxDepth: number;
+        }
+
+        interface SetBlackboxPatternsParameterType {
+            /**
+             * Array of regexps that will be used to check script url for blackbox state.
+             */
+            patterns: string[];
+        }
+
+        interface SetBlackboxedRangesParameterType {
+            /**
+             * Id of the script.
+             */
+            scriptId: Runtime.ScriptId;
+            positions: ScriptPosition[];
+        }
+
+        interface SetBreakpointParameterType {
+            /**
+             * Location to set breakpoint in.
+             */
+            location: 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;
+        }
+
+        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;
+        }
+
+        interface SetBreakpointOnFunctionCallParameterType {
+            /**
+             * Function object id.
+             */
+            objectId: Runtime.RemoteObjectId;
+            /**
+             * Expression to use as a breakpoint condition. When specified, debugger will
+             * stop on the breakpoint if this expression evaluates to true.
+             */
+            condition?: string;
+        }
+
+        interface SetBreakpointsActiveParameterType {
+            /**
+             * New value for breakpoints active state.
+             */
+            active: boolean;
+        }
+
+        interface SetPauseOnExceptionsParameterType {
+            /**
+             * Pause on exceptions mode.
+             */
+            state: string;
+        }
+
+        interface SetReturnValueParameterType {
+            /**
+             * New return value.
+             */
+            newValue: Runtime.CallArgument;
+        }
+
+        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;
+        }
+
+        interface SetSkipAllPausesParameterType {
+            /**
+             * New value for skip pauses state.
+             */
+            skip: boolean;
+        }
+
+        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: CallFrameId;
+        }
+
+        interface StepIntoParameterType {
+            /**
+             * Debugger will issue additional Debugger.paused notification if any async task is scheduled
+             * before next pause.
+             * @experimental
+             */
+            breakOnAsyncCall?: boolean;
+        }
+
+        interface EnableReturnType {
+            /**
+             * Unique identifier of the debugger.
+             * @experimental
+             */
+            debuggerId: Runtime.UniqueDebuggerId;
+        }
+
+        interface EvaluateOnCallFrameReturnType {
+            /**
+             * Object wrapper for the evaluation result.
+             */
+            result: Runtime.RemoteObject;
+            /**
+             * Exception details.
+             */
+            exceptionDetails?: Runtime.ExceptionDetails;
+        }
+
+        interface GetPossibleBreakpointsReturnType {
+            /**
+             * List of the possible breakpoint locations.
+             */
+            locations: BreakLocation[];
+        }
+
+        interface GetScriptSourceReturnType {
+            /**
+             * Script source.
+             */
+            scriptSource: string;
+        }
+
+        interface GetStackTraceReturnType {
+            stackTrace: Runtime.StackTrace;
+        }
+
+        interface RestartFrameReturnType {
+            /**
+             * New stack trace.
+             */
+            callFrames: CallFrame[];
+            /**
+             * Async stack trace, if any.
+             */
+            asyncStackTrace?: Runtime.StackTrace;
+            /**
+             * Async stack trace, if any.
+             * @experimental
+             */
+            asyncStackTraceId?: Runtime.StackTraceId;
+        }
+
+        interface SearchInContentReturnType {
+            /**
+             * List of search matches.
+             */
+            result: SearchMatch[];
+        }
+
+        interface SetBreakpointReturnType {
+            /**
+             * Id of the created breakpoint for further reference.
+             */
+            breakpointId: BreakpointId;
+            /**
+             * Location this breakpoint resolved into.
+             */
+            actualLocation: Location;
+        }
+
+        interface SetBreakpointByUrlReturnType {
+            /**
+             * Id of the created breakpoint for further reference.
+             */
+            breakpointId: BreakpointId;
+            /**
+             * List of the locations this breakpoint resolved into upon addition.
+             */
+            locations: Location[];
+        }
+
+        interface SetBreakpointOnFunctionCallReturnType {
+            /**
+             * Id of the created breakpoint for further reference.
+             */
+            breakpointId: BreakpointId;
+        }
+
+        interface SetScriptSourceReturnType {
+            /**
+             * New stack trace in case editing has happened while VM was stopped.
+             */
+            callFrames?: 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;
+        }
+
+        interface BreakpointResolvedEventDataType {
+            /**
+             * Breakpoint unique identifier.
+             */
+            breakpointId: BreakpointId;
+            /**
+             * Actual breakpoint location.
+             */
+            location: Location;
+        }
+
+        interface PausedEventDataType {
+            /**
+             * Call stack the virtual machine stopped on.
+             */
+            callFrames: 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;
+        }
+
+        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;
+        }
+
+        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;
+        }
+    }
+
+    namespace HeapProfiler {
+        /**
+         * Heap snapshot object id.
+         */
+        type HeapSnapshotObjectId = string;
+
+        /**
+         * Sampling Heap Profile node. Holds callsite information, allocation statistics and child nodes.
+         */
+        interface SamplingHeapProfileNode {
+            /**
+             * Function location.
+             */
+            callFrame: Runtime.CallFrame;
+            /**
+             * Allocations size in bytes for the node excluding children.
+             */
+            selfSize: number;
+            /**
+             * Child nodes.
+             */
+            children: SamplingHeapProfileNode[];
+        }
+
+        /**
+         * Profile.
+         */
+        interface SamplingHeapProfile {
+            head: SamplingHeapProfileNode;
+        }
+
+        interface AddInspectedHeapObjectParameterType {
+            /**
+             * Heap snapshot object id to be accessible by means of $x command line API.
+             */
+            heapObjectId: HeapSnapshotObjectId;
+        }
+
+        interface GetHeapObjectIdParameterType {
+            /**
+             * Identifier of the object to get heap object id for.
+             */
+            objectId: Runtime.RemoteObjectId;
+        }
+
+        interface GetObjectByHeapObjectIdParameterType {
+            objectId: HeapSnapshotObjectId;
+            /**
+             * Symbolic group name that can be used to release multiple objects.
+             */
+            objectGroup?: string;
+        }
+
+        interface StartSamplingParameterType {
+            /**
+             * Average sample interval in bytes. Poisson distribution is used for the intervals. The
+             * default value is 32768 bytes.
+             */
+            samplingInterval?: number;
+        }
+
+        interface StartTrackingHeapObjectsParameterType {
+            trackAllocations?: boolean;
+        }
+
+        interface StopTrackingHeapObjectsParameterType {
+            /**
+             * If true 'reportHeapSnapshotProgress' events will be generated while snapshot is being taken
+             * when the tracking is stopped.
+             */
+            reportProgress?: boolean;
+        }
+
+        interface TakeHeapSnapshotParameterType {
+            /**
+             * If true 'reportHeapSnapshotProgress' events will be generated while snapshot is being taken.
+             */
+            reportProgress?: boolean;
+        }
+
+        interface GetHeapObjectIdReturnType {
+            /**
+             * Id of the heap snapshot object corresponding to the passed remote object id.
+             */
+            heapSnapshotObjectId: HeapSnapshotObjectId;
+        }
+
+        interface GetObjectByHeapObjectIdReturnType {
+            /**
+             * Evaluation result.
+             */
+            result: Runtime.RemoteObject;
+        }
+
+        interface GetSamplingProfileReturnType {
+            /**
+             * Return the sampling profile being collected.
+             */
+            profile: SamplingHeapProfile;
+        }
+
+        interface StopSamplingReturnType {
+            /**
+             * Recorded sampling heap profile.
+             */
+            profile: SamplingHeapProfile;
+        }
+
+        interface AddHeapSnapshotChunkEventDataType {
+            chunk: string;
+        }
+
+        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[];
+        }
+
+        interface LastSeenObjectIdEventDataType {
+            lastSeenObjectId: number;
+            timestamp: number;
+        }
+
+        interface ReportHeapSnapshotProgressEventDataType {
+            done: number;
+            total: number;
+            finished?: boolean;
+        }
+    }
+
+    namespace Profiler {
+        /**
+         * Profile node. Holds callsite information, execution statistics and child nodes.
+         */
+        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?: PositionTickInfo[];
+        }
+
+        /**
+         * Profile.
+         */
+        interface Profile {
+            /**
+             * The list of profile nodes. First item is the root node.
+             */
+            nodes: 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.
+         */
+        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.
+         */
+        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.
+         */
+        interface FunctionCoverage {
+            /**
+             * JavaScript function name.
+             */
+            functionName: string;
+            /**
+             * Source ranges inside the function with coverage data.
+             */
+            ranges: CoverageRange[];
+            /**
+             * Whether coverage data for this function has block granularity.
+             */
+            isBlockCoverage: boolean;
+        }
+
+        /**
+         * Coverage data for a JavaScript script.
+         */
+        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: FunctionCoverage[];
+        }
+
+        /**
+         * Describes a type collected during runtime.
+         * @experimental
+         */
+        interface TypeObject {
+            /**
+             * Name of a type collected with type profiling.
+             */
+            name: string;
+        }
+
+        /**
+         * Source offset and types for a parameter or return value.
+         * @experimental
+         */
+        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: TypeObject[];
+        }
+
+        /**
+         * Type profile data collected during runtime for a JavaScript script.
+         * @experimental
+         */
+        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: TypeProfileEntry[];
+        }
+
+        interface SetSamplingIntervalParameterType {
+            /**
+             * New sampling interval in microseconds.
+             */
+            interval: number;
+        }
+
+        interface StartPreciseCoverageParameterType {
+            /**
+             * Collect accurate call counts beyond simple 'covered' or 'not covered'.
+             */
+            callCount?: boolean;
+            /**
+             * Collect block-based coverage.
+             */
+            detailed?: boolean;
+        }
+
+        interface GetBestEffortCoverageReturnType {
+            /**
+             * Coverage data for the current isolate.
+             */
+            result: ScriptCoverage[];
+        }
+
+        interface StopReturnType {
+            /**
+             * Recorded profile.
+             */
+            profile: Profile;
+        }
+
+        interface TakePreciseCoverageReturnType {
+            /**
+             * Coverage data for the current isolate.
+             */
+            result: ScriptCoverage[];
+        }
+
+        interface TakeTypeProfileReturnType {
+            /**
+             * Type profile for all scripts since startTypeProfile() was turned on.
+             */
+            result: ScriptTypeProfile[];
+        }
+
+        interface ConsoleProfileFinishedEventDataType {
+            id: string;
+            /**
+             * Location of console.profileEnd().
+             */
+            location: Debugger.Location;
+            profile: Profile;
+            /**
+             * Profile title passed as an argument to console.profile().
+             */
+            title?: string;
+        }
+
+        interface ConsoleProfileStartedEventDataType {
+            id: string;
+            /**
+             * Location of console.profile().
+             */
+            location: Debugger.Location;
+            /**
+             * Profile title passed as an argument to console.profile().
+             */
+            title?: string;
+        }
+    }
+
+    namespace Runtime {
+        /**
+         * Unique script identifier.
+         */
+        type ScriptId = string;
+
+        /**
+         * Unique object identifier.
+         */
+        type RemoteObjectId = string;
+
+        /**
+         * Primitive value which cannot be JSON-stringified. Includes values `-0`, `NaN`, `Infinity`,
+         * `-Infinity`, and bigint literals.
+         */
+        type UnserializableValue = string;
+
+        /**
+         * Mirror object referencing original JavaScript object.
+         */
+        interface RemoteObject {
+            /**
+             * Object type.
+             */
+            type: string;
+            /**
+             * Object subtype hint. Specified for `object` type values only.
+             */
+            subtype?: string;
+            /**
+             * Object class (constructor) name. Specified for `object` type values only.
+             */
+            className?: string;
+            /**
+             * Remote object value in case of primitive values or JSON values (if it was requested).
+             */
+            value?: any;
+            /**
+             * Primitive value which can not be JSON-stringified does not have `value`, but gets this
+             * property.
+             */
+            unserializableValue?: UnserializableValue;
+            /**
+             * String representation of the object.
+             */
+            description?: string;
+            /**
+             * Unique object identifier (for non-primitive values).
+             */
+            objectId?: RemoteObjectId;
+            /**
+             * Preview containing abbreviated property values. Specified for `object` type values only.
+             * @experimental
+             */
+            preview?: ObjectPreview;
+            /**
+             * @experimental
+             */
+            customPreview?: CustomPreview;
+        }
+
+        /**
+         * @experimental
+         */
+        interface CustomPreview {
+            header: string;
+            hasBody: boolean;
+            formatterObjectId: RemoteObjectId;
+            bindRemoteObjectFunctionId: RemoteObjectId;
+            configObjectId?: RemoteObjectId;
+        }
+
+        /**
+         * Object containing abbreviated remote object value.
+         * @experimental
+         */
+        interface ObjectPreview {
+            /**
+             * Object type.
+             */
+            type: string;
+            /**
+             * Object subtype hint. Specified for `object` type values only.
+             */
+            subtype?: string;
+            /**
+             * String representation of the object.
+             */
+            description?: string;
+            /**
+             * True iff some of the properties or entries of the original object did not fit.
+             */
+            overflow: boolean;
+            /**
+             * List of the properties.
+             */
+            properties: PropertyPreview[];
+            /**
+             * List of the entries. Specified for `map` and `set` subtype values only.
+             */
+            entries?: EntryPreview[];
+        }
+
+        /**
+         * @experimental
+         */
+        interface PropertyPreview {
+            /**
+             * Property name.
+             */
+            name: string;
+            /**
+             * Object type. Accessor means that the property itself is an accessor property.
+             */
+            type: string;
+            /**
+             * User-friendly property value string.
+             */
+            value?: string;
+            /**
+             * Nested value preview.
+             */
+            valuePreview?: ObjectPreview;
+            /**
+             * Object subtype hint. Specified for `object` type values only.
+             */
+            subtype?: string;
+        }
+
+        /**
+         * @experimental
+         */
+        interface EntryPreview {
+            /**
+             * Preview of the key. Specified for map-like collection entries.
+             */
+            key?: ObjectPreview;
+            /**
+             * Preview of the value.
+             */
+            value: ObjectPreview;
+        }
+
+        /**
+         * Object property descriptor.
+         */
+        interface PropertyDescriptor {
+            /**
+             * Property name or symbol description.
+             */
+            name: string;
+            /**
+             * The value associated with the property.
+             */
+            value?: RemoteObject;
+            /**
+             * True if the value associated with the property may be changed (data descriptors only).
+             */
+            writable?: boolean;
+            /**
+             * A function which serves as a getter for the property, or `undefined` if there is no getter
+             * (accessor descriptors only).
+             */
+            get?: RemoteObject;
+            /**
+             * A function which serves as a setter for the property, or `undefined` if there is no setter
+             * (accessor descriptors only).
+             */
+            set?: RemoteObject;
+            /**
+             * True if the type of this property descriptor may be changed and if the property may be
+             * deleted from the corresponding object.
+             */
+            configurable: boolean;
+            /**
+             * True if this property shows up during enumeration of the properties on the corresponding
+             * object.
+             */
+            enumerable: boolean;
+            /**
+             * True if the result was thrown during the evaluation.
+             */
+            wasThrown?: boolean;
+            /**
+             * True if the property is owned for the object.
+             */
+            isOwn?: boolean;
+            /**
+             * Property symbol object, if the property is of the `symbol` type.
+             */
+            symbol?: RemoteObject;
+        }
+
+        /**
+         * Object internal property descriptor. This property isn't normally visible in JavaScript code.
+         */
+        interface InternalPropertyDescriptor {
+            /**
+             * Conventional property name.
+             */
+            name: string;
+            /**
+             * The value associated with the property.
+             */
+            value?: RemoteObject;
+        }
+
+        /**
+         * Represents function call argument. Either remote object id `objectId`, primitive `value`,
+         * unserializable primitive value or neither of (for undefined) them should be specified.
+         */
+        interface CallArgument {
+            /**
+             * Primitive value or serializable javascript object.
+             */
+            value?: any;
+            /**
+             * Primitive value which can not be JSON-stringified.
+             */
+            unserializableValue?: UnserializableValue;
+            /**
+             * Remote object handle.
+             */
+            objectId?: RemoteObjectId;
+        }
+
+        /**
+         * Id of an execution context.
+         */
+        type ExecutionContextId = number;
+
+        /**
+         * Description of an isolated world.
+         */
+        interface ExecutionContextDescription {
+            /**
+             * Unique id of the execution context. It can be used to specify in which execution context
+             * script evaluation should be performed.
+             */
+            id: ExecutionContextId;
+            /**
+             * Execution context origin.
+             */
+            origin: string;
+            /**
+             * Human readable name describing given context.
+             */
+            name: string;
+            /**
+             * Embedder-specific auxiliary data.
+             */
+            auxData?: {};
+        }
+
+        /**
+         * Detailed information about exception (or error) that was thrown during script compilation or
+         * execution.
+         */
+        interface ExceptionDetails {
+            /**
+             * Exception id.
+             */
+            exceptionId: number;
+            /**
+             * Exception text, which should be used together with exception object when available.
+             */
+            text: string;
+            /**
+             * Line number of the exception location (0-based).
+             */
+            lineNumber: number;
+            /**
+             * Column number of the exception location (0-based).
+             */
+            columnNumber: number;
+            /**
+             * Script ID of the exception location.
+             */
+            scriptId?: ScriptId;
+            /**
+             * URL of the exception location, to be used when the script was not reported.
+             */
+            url?: string;
+            /**
+             * JavaScript stack trace if available.
+             */
+            stackTrace?: StackTrace;
+            /**
+             * Exception object if available.
+             */
+            exception?: RemoteObject;
+            /**
+             * Identifier of the context where exception happened.
+             */
+            executionContextId?: ExecutionContextId;
+        }
+
+        /**
+         * Number of milliseconds since epoch.
+         */
+        type Timestamp = number;
+
+        /**
+         * Number of milliseconds.
+         */
+        type TimeDelta = number;
+
+        /**
+         * Stack entry for runtime errors and assertions.
+         */
+        interface CallFrame {
+            /**
+             * JavaScript function name.
+             */
+            functionName: string;
+            /**
+             * JavaScript script id.
+             */
+            scriptId: ScriptId;
+            /**
+             * JavaScript script name or url.
+             */
+            url: string;
+            /**
+             * JavaScript script line number (0-based).
+             */
+            lineNumber: number;
+            /**
+             * JavaScript script column number (0-based).
+             */
+            columnNumber: number;
+        }
+
+        /**
+         * Call frames for assertions or error messages.
+         */
+        interface StackTrace {
+            /**
+             * String label of this stack trace. For async traces this may be a name of the function that
+             * initiated the async call.
+             */
+            description?: string;
+            /**
+             * JavaScript function name.
+             */
+            callFrames: CallFrame[];
+            /**
+             * Asynchronous JavaScript stack trace that preceded this stack, if available.
+             */
+            parent?: StackTrace;
+            /**
+             * Asynchronous JavaScript stack trace that preceded this stack, if available.
+             * @experimental
+             */
+            parentId?: StackTraceId;
+        }
+
+        /**
+         * Unique identifier of current debugger.
+         * @experimental
+         */
+        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
+         */
+        interface StackTraceId {
+            id: string;
+            debuggerId?: UniqueDebuggerId;
+        }
+
+        interface AwaitPromiseParameterType {
+            /**
+             * Identifier of the promise.
+             */
+            promiseObjectId: RemoteObjectId;
+            /**
+             * Whether the result is expected to be a JSON object that should be sent by value.
+             */
+            returnByValue?: boolean;
+            /**
+             * Whether preview should be generated for the result.
+             */
+            generatePreview?: boolean;
+        }
+
+        interface CallFunctionOnParameterType {
+            /**
+             * Declaration of the function to call.
+             */
+            functionDeclaration: string;
+            /**
+             * Identifier of the object to call function on. Either objectId or executionContextId should
+             * be specified.
+             */
+            objectId?: RemoteObjectId;
+            /**
+             * Call arguments. All call arguments must belong to the same JavaScript world as the target
+             * object.
+             */
+            arguments?: CallArgument[];
+            /**
+             * 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 which should be sent by value.
+             */
+            returnByValue?: boolean;
+            /**
+             * Whether preview should be generated for the result.
+             * @experimental
+             */
+            generatePreview?: boolean;
+            /**
+             * Whether execution should be treated as initiated by user in the UI.
+             */
+            userGesture?: boolean;
+            /**
+             * Whether execution should `await` for resulting value and return once awaited promise is
+             * resolved.
+             */
+            awaitPromise?: boolean;
+            /**
+             * Specifies execution context which global object will be used to call function on. Either
+             * executionContextId or objectId should be specified.
+             */
+            executionContextId?: ExecutionContextId;
+            /**
+             * 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.
+             */
+            objectGroup?: string;
+        }
+
+        interface CompileScriptParameterType {
+            /**
+             * Expression to compile.
+             */
+            expression: string;
+            /**
+             * Source url to be set for the script.
+             */
+            sourceURL: string;
+            /**
+             * Specifies whether the compiled script should be persisted.
+             */
+            persistScript: boolean;
+            /**
+             * Specifies in which execution context to perform script run. If the parameter is omitted the
+             * evaluation will be performed in the context of the inspected page.
+             */
+            executionContextId?: ExecutionContextId;
+        }
+
+        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?: 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;
+            /**
+             * Terminate execution after timing out (number of milliseconds).
+             * @experimental
+             */
+            timeout?: TimeDelta;
+        }
+
+        interface GetPropertiesParameterType {
+            /**
+             * Identifier of the object to return properties for.
+             */
+            objectId: 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;
+        }
+
+        interface GlobalLexicalScopeNamesParameterType {
+            /**
+             * Specifies in which execution context to lookup global scope variables.
+             */
+            executionContextId?: ExecutionContextId;
+        }
+
+        interface QueryObjectsParameterType {
+            /**
+             * Identifier of the prototype to return objects for.
+             */
+            prototypeObjectId: RemoteObjectId;
+            /**
+             * Symbolic group name that can be used to release the results.
+             */
+            objectGroup?: string;
+        }
+
+        interface ReleaseObjectParameterType {
+            /**
+             * Identifier of the object to release.
+             */
+            objectId: RemoteObjectId;
+        }
+
+        interface ReleaseObjectGroupParameterType {
+            /**
+             * Symbolic object group name.
+             */
+            objectGroup: string;
+        }
+
+        interface RunScriptParameterType {
+            /**
+             * Id of the script to run.
+             */
+            scriptId: ScriptId;
+            /**
+             * Specifies in which execution context to perform script run. If the parameter is omitted the
+             * evaluation will be performed in the context of the inspected page.
+             */
+            executionContextId?: ExecutionContextId;
+            /**
+             * Symbolic group name that can be used to release multiple objects.
+             */
+            objectGroup?: string;
+            /**
+             * In silent mode exceptions thrown during evaluation are not reported and do not pause
+             * execution. Overrides `setPauseOnException` state.
+             */
+            silent?: boolean;
+            /**
+             * Determines whether Command Line API should be available during the evaluation.
+             */
+            includeCommandLineAPI?: boolean;
+            /**
+             * Whether the result is expected to be a JSON object which should be sent by value.
+             */
+            returnByValue?: boolean;
+            /**
+             * Whether preview should be generated for the result.
+             */
+            generatePreview?: boolean;
+            /**
+             * Whether execution should `await` for resulting value and return once awaited promise is
+             * resolved.
+             */
+            awaitPromise?: boolean;
+        }
+
+        interface SetCustomObjectFormatterEnabledParameterType {
+            enabled: boolean;
+        }
+
+        interface AwaitPromiseReturnType {
+            /**
+             * Promise result. Will contain rejected value if promise was rejected.
+             */
+            result: RemoteObject;
+            /**
+             * Exception details if stack strace is available.
+             */
+            exceptionDetails?: ExceptionDetails;
+        }
+
+        interface CallFunctionOnReturnType {
+            /**
+             * Call result.
+             */
+            result: RemoteObject;
+            /**
+             * Exception details.
+             */
+            exceptionDetails?: ExceptionDetails;
+        }
+
+        interface CompileScriptReturnType {
+            /**
+             * Id of the script.
+             */
+            scriptId?: ScriptId;
+            /**
+             * Exception details.
+             */
+            exceptionDetails?: ExceptionDetails;
+        }
+
+        interface EvaluateReturnType {
+            /**
+             * Evaluation result.
+             */
+            result: RemoteObject;
+            /**
+             * Exception details.
+             */
+            exceptionDetails?: ExceptionDetails;
+        }
+
+        interface GetIsolateIdReturnType {
+            /**
+             * The isolate id.
+             */
+            id: string;
+        }
+
+        interface GetHeapUsageReturnType {
+            /**
+             * Used heap size in bytes.
+             */
+            usedSize: number;
+            /**
+             * Allocated heap size in bytes.
+             */
+            totalSize: number;
+        }
+
+        interface GetPropertiesReturnType {
+            /**
+             * Object properties.
+             */
+            result: PropertyDescriptor[];
+            /**
+             * Internal object properties (only of the element itself).
+             */
+            internalProperties?: InternalPropertyDescriptor[];
+            /**
+             * Exception details.
+             */
+            exceptionDetails?: ExceptionDetails;
+        }
+
+        interface GlobalLexicalScopeNamesReturnType {
+            names: string[];
+        }
+
+        interface QueryObjectsReturnType {
+            /**
+             * Array with objects.
+             */
+            objects: RemoteObject;
+        }
+
+        interface RunScriptReturnType {
+            /**
+             * Run result.
+             */
+            result: RemoteObject;
+            /**
+             * Exception details.
+             */
+            exceptionDetails?: ExceptionDetails;
+        }
+
+        interface ConsoleAPICalledEventDataType {
+            /**
+             * Type of the call.
+             */
+            type: string;
+            /**
+             * Call arguments.
+             */
+            args: RemoteObject[];
+            /**
+             * Identifier of the context where the call was made.
+             */
+            executionContextId: ExecutionContextId;
+            /**
+             * Call timestamp.
+             */
+            timestamp: Timestamp;
+            /**
+             * Stack trace captured when the call was made.
+             */
+            stackTrace?: StackTrace;
+            /**
+             * Console context descriptor for calls on non-default console context (not console.*):
+             * 'anonymous#unique-logger-id' for call on unnamed context, 'name#unique-logger-id' for call
+             * on named context.
+             * @experimental
+             */
+            context?: string;
+        }
+
+        interface ExceptionRevokedEventDataType {
+            /**
+             * Reason describing why exception was revoked.
+             */
+            reason: string;
+            /**
+             * The id of revoked exception, as reported in `exceptionThrown`.
+             */
+            exceptionId: number;
+        }
+
+        interface ExceptionThrownEventDataType {
+            /**
+             * Timestamp of the exception.
+             */
+            timestamp: Timestamp;
+            exceptionDetails: ExceptionDetails;
+        }
+
+        interface ExecutionContextCreatedEventDataType {
+            /**
+             * A newly created execution context.
+             */
+            context: ExecutionContextDescription;
+        }
+
+        interface ExecutionContextDestroyedEventDataType {
+            /**
+             * Id of the destroyed context
+             */
+            executionContextId: ExecutionContextId;
+        }
+
+        interface InspectRequestedEventDataType {
+            object: RemoteObject;
+            hints: {};
+        }
+    }
+
+    namespace Schema {
+        /**
+         * Description of the protocol domain.
+         */
+        interface Domain {
+            /**
+             * Domain name.
+             */
+            name: string;
+            /**
+             * Domain version.
+             */
+            version: string;
+        }
+
+        interface GetDomainsReturnType {
+            /**
+             * List of supported domains.
+             */
+            domains: Domain[];
+        }
+    }
+
+    namespace NodeTracing {
+        interface TraceConfig {
+            /**
+             * Controls how the trace buffer stores data.
+             */
+            recordMode?: string;
+            /**
+             * Included category filters.
+             */
+            includedCategories: string[];
+        }
+
+        interface StartParameterType {
+            traceConfig: TraceConfig;
+        }
+
+        interface GetCategoriesReturnType {
+            /**
+             * A list of supported tracing categories.
+             */
+            categories: string[];
+        }
+
+        interface DataCollectedEventDataType {
+            value: Array<{}>;
+        }
+    }
+
+    namespace NodeWorker {
+        type WorkerID = string;
+
+        /**
+         * Unique identifier of attached debugging session.
+         */
+        type SessionID = string;
+
+        interface WorkerInfo {
+            workerId: WorkerID;
+            type: string;
+            title: string;
+            url: string;
+        }
+
+        interface SendMessageToWorkerParameterType {
+            message: string;
+            /**
+             * Identifier of the session.
+             */
+            sessionId: SessionID;
+        }
+
+        interface EnableParameterType {
+            /**
+             * Whether to new workers should be paused until the frontend sends `Runtime.runIfWaitingForDebugger`
+             * message to run them.
+             */
+            waitForDebuggerOnStart: boolean;
+        }
+
+        interface AttachedToWorkerEventDataType {
+            /**
+             * Identifier assigned to the session used to send/receive messages.
+             */
+            sessionId: SessionID;
+            workerInfo: WorkerInfo;
+            waitingForDebugger: boolean;
+        }
+
+        interface DetachedFromWorkerEventDataType {
+            /**
+             * Detached session identifier.
+             */
+            sessionId: SessionID;
+        }
+
+        interface ReceivedMessageFromWorkerEventDataType {
+            /**
+             * Identifier of a session which sends a message.
+             */
+            sessionId: SessionID;
+            message: string;
+        }
+    }
+
+    /**
+     * The inspector.Session is used for dispatching messages to the V8 inspector back-end and receiving message responses and notifications.
+     */
+    class Session extends EventEmitter {
+        /**
+         * Create a new instance of the inspector.Session class.
+         * The inspector session needs to be connected through session.connect() before the messages can be dispatched to the inspector backend.
+         */
+        constructor();
+
+        /**
+         * Connects a session to the inspector back-end.
+         * An exception will be thrown if there is already a connected session established either
+         * through the API or by a front-end connected to the Inspector WebSocket port.
+         */
+        connect(): void;
+
+        /**
+         * Immediately close the session. All pending message callbacks will be called with an error.
+         * session.connect() will need to be called to be able to send messages again.
+         * Reconnected session will lose all inspector state, such as enabled agents or configured breakpoints.
+         */
+        disconnect(): void;
+
+        /**
+         * Posts a message to the inspector back-end. callback will be notified when a response is received.
+         * callback is a function that accepts two optional arguments - error and message-specific result.
+         */
+        post(method: string, params?: {}, callback?: (err: Error | null, params?: {}) => void): void;
+        post(method: string, callback?: (err: Error | null, params?: {}) => void): void;
+
+        /**
+         * Does nothing.
+         */
+        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;
+
+        /**
+         * Sets JavaScript breakpoint before each call to the given function.
+         * If another function was created from the same source as a given one,
+         * calling it will also trigger the breakpoint.
+         * @experimental
+         */
+        post(
+            method: "Debugger.setBreakpointOnFunctionCall",
+            params?: Debugger.SetBreakpointOnFunctionCallParameterType,
+            callback?: (err: Error | null, params: Debugger.SetBreakpointOnFunctionCallReturnType) => void
+        ): void;
+        post(method: "Debugger.setBreakpointOnFunctionCall", callback?: (err: Error | null, params: Debugger.SetBreakpointOnFunctionCallReturnType) => 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.
+         */
+        post(method: "Runtime.awaitPromise", params?: Runtime.AwaitPromiseParameterType, callback?: (err: Error | null, params: Runtime.AwaitPromiseReturnType) => void): void;
+        post(method: "Runtime.awaitPromise", callback?: (err: Error | null, params: Runtime.AwaitPromiseReturnType) => void): void;
+
+        /**
+         * Calls function with given declaration on the given object. Object group of the result is
+         * inherited from the target object.
+         */
+        post(method: "Runtime.callFunctionOn", params?: Runtime.CallFunctionOnParameterType, callback?: (err: Error | null, params: Runtime.CallFunctionOnReturnType) => void): void;
+        post(method: "Runtime.callFunctionOn", callback?: (err: Error | null, params: Runtime.CallFunctionOnReturnType) => void): void;
+
+        /**
+         * 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.
+         */
+        post(method: "Runtime.releaseObject", params?: Runtime.ReleaseObjectParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Runtime.releaseObject", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Releases all remote objects that belong to a given group.
+         */
+        post(method: "Runtime.releaseObjectGroup", params?: Runtime.ReleaseObjectGroupParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Runtime.releaseObjectGroup", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Tells inspected instance to run if it was waiting for debugger to attach.
+         */
+        post(method: "Runtime.runIfWaitingForDebugger", callback?: (err: Error | null) => void): void;
+
+        /**
+         * 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;
+
+        /**
+         * @experimental
+         */
+        post(method: "Runtime.setCustomObjectFormatterEnabled", params?: Runtime.SetCustomObjectFormatterEnabledParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Runtime.setCustomObjectFormatterEnabled", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Terminate current or next JavaScript execution.
+         * Will cancel the termination when the outer-most script execution ends.
+         * @experimental
+         */
+        post(method: "Runtime.terminateExecution", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Returns supported domains.
+         */
+        post(method: "Schema.getDomains", callback?: (err: Error | null, params: Schema.GetDomainsReturnType) => void): void;
+
+        /**
+         * Gets supported tracing categories.
+         */
+        post(method: "NodeTracing.getCategories", callback?: (err: Error | null, params: NodeTracing.GetCategoriesReturnType) => void): void;
+
+        /**
+         * Start trace events collection.
+         */
+        post(method: "NodeTracing.start", params?: NodeTracing.StartParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "NodeTracing.start", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Stop trace events collection. Remaining collected events will be sent as a sequence of
+         * dataCollected events followed by tracingComplete event.
+         */
+        post(method: "NodeTracing.stop", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Sends protocol message over session with given id.
+         */
+        post(method: "NodeWorker.sendMessageToWorker", params?: NodeWorker.SendMessageToWorkerParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "NodeWorker.sendMessageToWorker", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Instructs the inspector to attach to running workers. Will also attach to new workers
+         * as they start
+         */
+        post(method: "NodeWorker.enable", params?: NodeWorker.EnableParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "NodeWorker.enable", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Detaches from all running workers and disables attaching to new workers as they are started.
+         */
+        post(method: "NodeWorker.disable", callback?: (err: Error | null) => void): void;
+
+        // Events
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+
+        /**
+         * Emitted when any notification from the V8 Inspector is received.
+         */
+        addListener(event: "inspectorNotification", listener: (message: InspectorNotification<{}>) => void): this;
+
+        /**
+         * Issued when new console message is added.
+         */
+        addListener(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
+
+        /**
+         * Fired when breakpoint is resolved to an actual script and location.
+         */
+        addListener(event: "Debugger.breakpointResolved", listener: (message: InspectorNotification<Debugger.BreakpointResolvedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria.
+         */
+        addListener(event: "Debugger.paused", listener: (message: InspectorNotification<Debugger.PausedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine resumed execution.
+         */
+        addListener(event: "Debugger.resumed", listener: () => void): this;
+
+        /**
+         * Fired when virtual machine fails to parse the script.
+         */
+        addListener(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.
+         */
+        addListener(event: "Debugger.scriptParsed", listener: (message: InspectorNotification<Debugger.ScriptParsedEventDataType>) => void): this;
+
+        addListener(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
+         */
+        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;
+
+        /**
+         * Contains an bucket of collected trace events.
+         */
+        addListener(event: "NodeTracing.dataCollected", listener: (message: InspectorNotification<NodeTracing.DataCollectedEventDataType>) => void): this;
+
+        /**
+         * Signals that tracing is stopped and there is no trace buffers pending flush, all data were
+         * delivered via dataCollected events.
+         */
+        addListener(event: "NodeTracing.tracingComplete", listener: () => void): this;
+
+        /**
+         * Issued when attached to a worker.
+         */
+        addListener(event: "NodeWorker.attachedToWorker", listener: (message: InspectorNotification<NodeWorker.AttachedToWorkerEventDataType>) => void): this;
+
+        /**
+         * Issued when detached from the worker.
+         */
+        addListener(event: "NodeWorker.detachedFromWorker", listener: (message: InspectorNotification<NodeWorker.DetachedFromWorkerEventDataType>) => void): this;
+
+        /**
+         * Notifies about a new protocol message received from the session
+         * (session ID is provided in attachedToWorker notification).
+         */
+        addListener(event: "NodeWorker.receivedMessageFromWorker", listener: (message: InspectorNotification<NodeWorker.ReceivedMessageFromWorkerEventDataType>) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "inspectorNotification", message: InspectorNotification<{}>): 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: "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.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;
+        emit(event: "NodeTracing.dataCollected", message: InspectorNotification<NodeTracing.DataCollectedEventDataType>): boolean;
+        emit(event: "NodeTracing.tracingComplete"): boolean;
+        emit(event: "NodeWorker.attachedToWorker", message: InspectorNotification<NodeWorker.AttachedToWorkerEventDataType>): boolean;
+        emit(event: "NodeWorker.detachedFromWorker", message: InspectorNotification<NodeWorker.DetachedFromWorkerEventDataType>): boolean;
+        emit(event: "NodeWorker.receivedMessageFromWorker", message: InspectorNotification<NodeWorker.ReceivedMessageFromWorkerEventDataType>): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+
+        /**
+         * Emitted when any notification from the V8 Inspector is received.
+         */
+        on(event: "inspectorNotification", listener: (message: InspectorNotification<{}>) => void): this;
+
+        /**
+         * Issued when new console message is added.
+         */
+        on(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
+
+        /**
+         * Fired when breakpoint is resolved to an actual script and location.
+         */
+        on(event: "Debugger.breakpointResolved", listener: (message: InspectorNotification<Debugger.BreakpointResolvedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria.
+         */
+        on(event: "Debugger.paused", listener: (message: InspectorNotification<Debugger.PausedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine resumed execution.
+         */
+        on(event: "Debugger.resumed", listener: () => void): this;
+
+        /**
+         * Fired when virtual machine fails to parse the script.
+         */
+        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;
+
+        /**
+         * Issued when console API was called.
+         */
+        on(event: "Runtime.consoleAPICalled", listener: (message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>) => void): this;
+
+        /**
+         * Issued when unhandled exception was revoked.
+         */
+        on(event: "Runtime.exceptionRevoked", listener: (message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>) => void): this;
+
+        /**
+         * Issued when exception was thrown and unhandled.
+         */
+        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;
+
+        /**
+         * Contains an bucket of collected trace events.
+         */
+        on(event: "NodeTracing.dataCollected", listener: (message: InspectorNotification<NodeTracing.DataCollectedEventDataType>) => void): this;
+
+        /**
+         * Signals that tracing is stopped and there is no trace buffers pending flush, all data were
+         * delivered via dataCollected events.
+         */
+        on(event: "NodeTracing.tracingComplete", listener: () => void): this;
+
+        /**
+         * Issued when attached to a worker.
+         */
+        on(event: "NodeWorker.attachedToWorker", listener: (message: InspectorNotification<NodeWorker.AttachedToWorkerEventDataType>) => void): this;
+
+        /**
+         * Issued when detached from the worker.
+         */
+        on(event: "NodeWorker.detachedFromWorker", listener: (message: InspectorNotification<NodeWorker.DetachedFromWorkerEventDataType>) => void): this;
+
+        /**
+         * Notifies about a new protocol message received from the session
+         * (session ID is provided in attachedToWorker notification).
+         */
+        on(event: "NodeWorker.receivedMessageFromWorker", listener: (message: InspectorNotification<NodeWorker.ReceivedMessageFromWorkerEventDataType>) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+
+        /**
+         * Emitted when any notification from the V8 Inspector is received.
+         */
+        once(event: "inspectorNotification", listener: (message: InspectorNotification<{}>) => void): this;
+
+        /**
+         * Issued when new console message is added.
+         */
+        once(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
+
+        /**
+         * Fired when breakpoint is resolved to an actual script and location.
+         */
+        once(event: "Debugger.breakpointResolved", listener: (message: InspectorNotification<Debugger.BreakpointResolvedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria.
+         */
+        once(event: "Debugger.paused", listener: (message: InspectorNotification<Debugger.PausedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine resumed execution.
+         */
+        once(event: "Debugger.resumed", listener: () => void): this;
+
+        /**
+         * Fired when virtual machine fails to parse the script.
+         */
+        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;
+
+        /**
+         * Issued when console API was called.
+         */
+        once(event: "Runtime.consoleAPICalled", listener: (message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>) => void): this;
+
+        /**
+         * Issued when unhandled exception was revoked.
+         */
+        once(event: "Runtime.exceptionRevoked", listener: (message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>) => void): this;
+
+        /**
+         * Issued when exception was thrown and unhandled.
+         */
+        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;
+
+        /**
+         * Contains an bucket of collected trace events.
+         */
+        once(event: "NodeTracing.dataCollected", listener: (message: InspectorNotification<NodeTracing.DataCollectedEventDataType>) => void): this;
+
+        /**
+         * Signals that tracing is stopped and there is no trace buffers pending flush, all data were
+         * delivered via dataCollected events.
+         */
+        once(event: "NodeTracing.tracingComplete", listener: () => void): this;
+
+        /**
+         * Issued when attached to a worker.
+         */
+        once(event: "NodeWorker.attachedToWorker", listener: (message: InspectorNotification<NodeWorker.AttachedToWorkerEventDataType>) => void): this;
+
+        /**
+         * Issued when detached from the worker.
+         */
+        once(event: "NodeWorker.detachedFromWorker", listener: (message: InspectorNotification<NodeWorker.DetachedFromWorkerEventDataType>) => void): this;
+
+        /**
+         * Notifies about a new protocol message received from the session
+         * (session ID is provided in attachedToWorker notification).
+         */
+        once(event: "NodeWorker.receivedMessageFromWorker", listener: (message: InspectorNotification<NodeWorker.ReceivedMessageFromWorkerEventDataType>) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+
+        /**
+         * Emitted when any notification from the V8 Inspector is received.
+         */
+        prependListener(event: "inspectorNotification", listener: (message: InspectorNotification<{}>) => void): this;
+
+        /**
+         * Issued when new console message is added.
+         */
+        prependListener(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
+
+        /**
+         * Fired when breakpoint is resolved to an actual script and location.
+         */
+        prependListener(event: "Debugger.breakpointResolved", listener: (message: InspectorNotification<Debugger.BreakpointResolvedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria.
+         */
+        prependListener(event: "Debugger.paused", listener: (message: InspectorNotification<Debugger.PausedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine resumed execution.
+         */
+        prependListener(event: "Debugger.resumed", listener: () => void): this;
+
+        /**
+         * Fired when virtual machine fails to parse the script.
+         */
+        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;
+
+        /**
+         * Issued when console API was called.
+         */
+        prependListener(event: "Runtime.consoleAPICalled", listener: (message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>) => void): this;
+
+        /**
+         * Issued when unhandled exception was revoked.
+         */
+        prependListener(event: "Runtime.exceptionRevoked", listener: (message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>) => void): this;
+
+        /**
+         * Issued when exception was thrown and unhandled.
+         */
+        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;
+
+        /**
+         * Contains an bucket of collected trace events.
+         */
+        prependListener(event: "NodeTracing.dataCollected", listener: (message: InspectorNotification<NodeTracing.DataCollectedEventDataType>) => void): this;
+
+        /**
+         * Signals that tracing is stopped and there is no trace buffers pending flush, all data were
+         * delivered via dataCollected events.
+         */
+        prependListener(event: "NodeTracing.tracingComplete", listener: () => void): this;
+
+        /**
+         * Issued when attached to a worker.
+         */
+        prependListener(event: "NodeWorker.attachedToWorker", listener: (message: InspectorNotification<NodeWorker.AttachedToWorkerEventDataType>) => void): this;
+
+        /**
+         * Issued when detached from the worker.
+         */
+        prependListener(event: "NodeWorker.detachedFromWorker", listener: (message: InspectorNotification<NodeWorker.DetachedFromWorkerEventDataType>) => void): this;
+
+        /**
+         * Notifies about a new protocol message received from the session
+         * (session ID is provided in attachedToWorker notification).
+         */
+        prependListener(event: "NodeWorker.receivedMessageFromWorker", listener: (message: InspectorNotification<NodeWorker.ReceivedMessageFromWorkerEventDataType>) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+
+        /**
+         * Emitted when any notification from the V8 Inspector is received.
+         */
+        prependOnceListener(event: "inspectorNotification", listener: (message: InspectorNotification<{}>) => void): this;
+
+        /**
+         * Issued when new console message is added.
+         */
+        prependOnceListener(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
+
+        /**
+         * Fired when breakpoint is resolved to an actual script and location.
+         */
+        prependOnceListener(event: "Debugger.breakpointResolved", listener: (message: InspectorNotification<Debugger.BreakpointResolvedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria.
+         */
+        prependOnceListener(event: "Debugger.paused", listener: (message: InspectorNotification<Debugger.PausedEventDataType>) => void): this;
+
+        /**
+         * Fired when the virtual machine resumed execution.
+         */
+        prependOnceListener(event: "Debugger.resumed", listener: () => void): this;
+
+        /**
+         * Fired when virtual machine fails to parse the script.
+         */
+        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;
+
+        /**
+         * Issued when console API was called.
+         */
+        prependOnceListener(event: "Runtime.consoleAPICalled", listener: (message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>) => void): this;
+
+        /**
+         * Issued when unhandled exception was revoked.
+         */
+        prependOnceListener(event: "Runtime.exceptionRevoked", listener: (message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>) => void): this;
+
+        /**
+         * Issued when exception was thrown and unhandled.
+         */
+        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;
+
+        /**
+         * Contains an bucket of collected trace events.
+         */
+        prependOnceListener(event: "NodeTracing.dataCollected", listener: (message: InspectorNotification<NodeTracing.DataCollectedEventDataType>) => void): this;
+
+        /**
+         * Signals that tracing is stopped and there is no trace buffers pending flush, all data were
+         * delivered via dataCollected events.
+         */
+        prependOnceListener(event: "NodeTracing.tracingComplete", listener: () => void): this;
+
+        /**
+         * Issued when attached to a worker.
+         */
+        prependOnceListener(event: "NodeWorker.attachedToWorker", listener: (message: InspectorNotification<NodeWorker.AttachedToWorkerEventDataType>) => void): this;
+
+        /**
+         * Issued when detached from the worker.
+         */
+        prependOnceListener(event: "NodeWorker.detachedFromWorker", listener: (message: InspectorNotification<NodeWorker.DetachedFromWorkerEventDataType>) => void): this;
+
+        /**
+         * Notifies about a new protocol message received from the session
+         * (session ID is provided in attachedToWorker notification).
+         */
+        prependOnceListener(event: "NodeWorker.receivedMessageFromWorker", listener: (message: InspectorNotification<NodeWorker.ReceivedMessageFromWorkerEventDataType>) => void): this;
+    }
+
+    // Top Level API
+
+    /**
+     * Activate inspector on host and port. Equivalent to node --inspect=[[host:]port], but can be done programatically after node has started.
+     * If wait is true, will block until a client has connected to the inspect port and flow control has been passed to the debugger client.
+     * @param port Port to listen on for inspector connections. Optional, defaults to what was specified on the CLI.
+     * @param host Host to listen on for inspector connections. Optional, defaults to what was specified on the CLI.
+     * @param wait Block until a client has connected. Optional, defaults to false.
+     */
+    function open(port?: number, host?: string, wait?: boolean): void;
+
+    /**
+     * Deactivate the inspector. Blocks until there are no active connections.
+     */
+    function close(): void;
+
+    /**
+     * Return the URL of the active inspector, or undefined if there is none.
+     */
+    function url(): string;
+}
diff --git a/types/node/v10/module.d.ts b/types/node/v10/module.d.ts
new file mode 100644
index 0000000000..f512be7e5e
--- /dev/null
+++ b/types/node/v10/module.d.ts
@@ -0,0 +1,3 @@
+declare module "module" {
+    export = NodeJS.Module;
+}
diff --git a/types/node/v10/net.d.ts b/types/node/v10/net.d.ts
new file mode 100644
index 0000000000..27804375aa
--- /dev/null
+++ b/types/node/v10/net.d.ts
@@ -0,0 +1,251 @@
+declare module "net" {
+    import * as stream from "stream";
+    import * as events from "events";
+    import * as dns from "dns";
+
+    type LookupFunction = (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void) => void;
+
+    interface AddressInfo {
+        address: string;
+        family: string;
+        port: number;
+    }
+
+    interface SocketConstructorOpts {
+        fd?: number;
+        allowHalfOpen?: boolean;
+        readable?: boolean;
+        writable?: boolean;
+    }
+
+    interface TcpSocketConnectOpts {
+        port: number;
+        host?: string;
+        localAddress?: string;
+        localPort?: number;
+        hints?: number;
+        family?: number;
+        lookup?: LookupFunction;
+    }
+
+    interface IpcSocketConnectOpts {
+        path: string;
+    }
+
+    type SocketConnectOpts = TcpSocketConnectOpts | IpcSocketConnectOpts;
+
+    class Socket extends stream.Duplex {
+        constructor(options?: SocketConstructorOpts);
+
+        // Extended base methods
+        write(buffer: Buffer): boolean;
+        write(buffer: Buffer, cb?: Function): boolean;
+        write(str: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, fd?: string): boolean;
+        write(data: any, encoding?: string, callback?: Function): void;
+
+        connect(options: SocketConnectOpts, connectionListener?: Function): this;
+        connect(port: number, host: string, connectionListener?: Function): this;
+        connect(port: number, connectionListener?: Function): this;
+        connect(path: string, connectionListener?: Function): this;
+
+        setEncoding(encoding?: string): this;
+        pause(): this;
+        resume(): this;
+        setTimeout(timeout: number, callback?: Function): this;
+        setNoDelay(noDelay?: boolean): this;
+        setKeepAlive(enable?: boolean, initialDelay?: number): this;
+        address(): AddressInfo | string;
+        unref(): void;
+        ref(): void;
+
+        readonly bufferSize: number;
+        readonly bytesRead: number;
+        readonly bytesWritten: number;
+        readonly connecting: boolean;
+        readonly destroyed: boolean;
+        readonly localAddress: string;
+        readonly localPort: number;
+        readonly remoteAddress?: string;
+        readonly remoteFamily?: string;
+        readonly remotePort?: number;
+
+        // Extended base methods
+        end(): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+        end(data?: any, encoding?: string): void;
+
+        /**
+         * events.EventEmitter
+         *   1. close
+         *   2. connect
+         *   3. data
+         *   4. drain
+         *   5. end
+         *   6. error
+         *   7. lookup
+         *   8. timeout
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: (had_error: boolean) => void): this;
+        addListener(event: "connect", listener: () => void): this;
+        addListener(event: "data", listener: (data: Buffer) => void): this;
+        addListener(event: "drain", listener: () => void): this;
+        addListener(event: "end", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close", had_error: boolean): boolean;
+        emit(event: "connect"): boolean;
+        emit(event: "data", data: Buffer): boolean;
+        emit(event: "drain"): boolean;
+        emit(event: "end"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "lookup", err: Error, address: string, family: string | number, host: string): boolean;
+        emit(event: "timeout"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: (had_error: boolean) => void): this;
+        on(event: "connect", listener: () => void): this;
+        on(event: "data", listener: (data: Buffer) => void): this;
+        on(event: "drain", listener: () => void): this;
+        on(event: "end", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        on(event: "timeout", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: (had_error: boolean) => void): this;
+        once(event: "connect", listener: () => void): this;
+        once(event: "data", listener: (data: Buffer) => void): this;
+        once(event: "drain", listener: () => void): this;
+        once(event: "end", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        once(event: "timeout", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: (had_error: boolean) => void): this;
+        prependListener(event: "connect", listener: () => void): this;
+        prependListener(event: "data", listener: (data: Buffer) => void): this;
+        prependListener(event: "drain", listener: () => void): this;
+        prependListener(event: "end", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: (had_error: boolean) => void): this;
+        prependOnceListener(event: "connect", listener: () => void): this;
+        prependOnceListener(event: "data", listener: (data: Buffer) => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "end", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+    }
+
+    interface ListenOptions {
+        port?: number;
+        host?: string;
+        backlog?: number;
+        path?: string;
+        exclusive?: boolean;
+        readableAll?: boolean;
+        writableAll?: boolean;
+    }
+
+    // https://github.com/nodejs/node/blob/master/lib/net.js
+    class Server extends events.EventEmitter {
+        constructor(connectionListener?: (socket: Socket) => void);
+        constructor(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void);
+
+        listen(port?: number, hostname?: string, backlog?: number, listeningListener?: Function): this;
+        listen(port?: number, hostname?: string, listeningListener?: Function): this;
+        listen(port?: number, backlog?: number, listeningListener?: Function): this;
+        listen(port?: number, listeningListener?: Function): this;
+        listen(path: string, backlog?: number, listeningListener?: Function): this;
+        listen(path: string, listeningListener?: Function): this;
+        listen(options: ListenOptions, listeningListener?: Function): this;
+        listen(handle: any, backlog?: number, listeningListener?: Function): this;
+        listen(handle: any, listeningListener?: Function): this;
+        close(callback?: Function): this;
+        address(): AddressInfo | string;
+        getConnections(cb: (error: Error | null, count: number) => void): void;
+        ref(): this;
+        unref(): this;
+        maxConnections: number;
+        connections: number;
+        listening: boolean;
+
+        /**
+         * events.EventEmitter
+         *   1. close
+         *   2. connection
+         *   3. error
+         *   4. listening
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "connection", listener: (socket: Socket) => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "listening", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "connection", socket: Socket): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "listening"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "connection", listener: (socket: Socket) => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "listening", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "connection", listener: (socket: Socket) => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "listening", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "connection", listener: (socket: Socket) => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "listening", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "connection", listener: (socket: Socket) => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "listening", listener: () => void): this;
+    }
+
+    interface TcpNetConnectOpts extends TcpSocketConnectOpts, SocketConstructorOpts {
+        timeout?: number;
+    }
+
+    interface IpcNetConnectOpts extends IpcSocketConnectOpts, SocketConstructorOpts {
+        timeout?: number;
+    }
+
+    type NetConnectOpts = TcpNetConnectOpts | IpcNetConnectOpts;
+
+    function createServer(connectionListener?: (socket: Socket) => void): Server;
+    function createServer(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void): Server;
+    function connect(options: NetConnectOpts, connectionListener?: Function): Socket;
+    function connect(port: number, host?: string, connectionListener?: Function): Socket;
+    function connect(path: string, connectionListener?: Function): Socket;
+    function createConnection(options: NetConnectOpts, connectionListener?: Function): Socket;
+    function createConnection(port: number, host?: string, connectionListener?: Function): Socket;
+    function createConnection(path: string, connectionListener?: Function): Socket;
+    function isIP(input: string): number;
+    function isIPv4(input: string): boolean;
+    function isIPv6(input: string): boolean;
+}
diff --git a/types/node/v10/node-tests.ts b/types/node/v10/node-tests.ts
new file mode 100644
index 0000000000..3614c30f97
--- /dev/null
+++ b/types/node/v10/node-tests.ts
@@ -0,0 +1,4876 @@
+import assert = require("assert");
+import * as fs from "fs";
+import * as events from "events";
+import events2 = require("events");
+import * as zlib from "zlib";
+import * as url from "url";
+import * as util from "util";
+import * as crypto from "crypto";
+import * as tls from "tls";
+import * as http from "http";
+import * as https from "https";
+import * as net from "net";
+import * as tty from "tty";
+import * as dgram from "dgram";
+import * as querystring from "querystring";
+import * as path from "path";
+import * as readline from "readline";
+import * as childProcess from "child_process";
+import * as cluster from "cluster";
+import * as workerThreads from "worker_threads";
+import * as os from "os";
+import * as vm from "vm";
+import * as console2 from "console";
+import * as string_decoder from "string_decoder";
+import * as stream from "stream";
+import * as timers from "timers";
+import * as repl from "repl";
+import * as v8 from "v8";
+import * as dns from "dns";
+import * as async_hooks from "async_hooks";
+import * as http2 from "http2";
+import * as inspector from "inspector";
+import * as perf_hooks from "perf_hooks";
+import * as trace_events from "trace_events";
+import Module = require("module");
+
+// Specifically test buffer module regression.
+import { Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer } from "buffer";
+
+//////////////////////////////////////////////////////////
+/// Global Tests : https://nodejs.org/api/global.html  ///
+//////////////////////////////////////////////////////////
+{
+    {
+        const x: NodeModule = {} as any;
+        const y: NodeModule = {} as any;
+        x.children.push(y);
+        x.parent = require.main;
+        require.main = y;
+    }
+}
+
+//////////////////////////////////////////////////////////
+/// Assert Tests : https://nodejs.org/api/assert.html ///
+//////////////////////////////////////////////////////////
+
+{
+    {
+        assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
+
+        assert.deepEqual({ x: { y: 3 } }, { x: { y: 3 } }, "DEEP WENT DERP");
+
+        assert.deepStrictEqual({ a: 1 }, { a: 1 }, "uses === comparator");
+
+        assert.doesNotThrow(() => {
+            const b = false;
+            if (b) { throw new Error("a hammer at your face"); }
+        }, undefined, "What the...*crunch*");
+
+        assert.equal(3, "3", "uses == comparator");
+
+        assert.fail('stuff broke');
+
+        assert.fail('actual', 'expected', 'message');
+
+        assert.fail(1, 2, undefined, '>');
+
+        assert.ifError(0);
+
+        assert.notDeepStrictEqual({ x: { y: "3" } }, { x: { y: 3 } }, "uses !== comparator");
+
+        assert.notEqual(1, 2, "uses != comparator");
+
+        assert.notStrictEqual(2, "2", "uses === comparator");
+
+        assert.ok(true);
+        assert.ok(1);
+
+        assert.strictEqual(1, 1, "uses === comparator");
+
+        assert.throws(() => { throw new Error("a hammer at your face"); }, undefined, "DODGED IT");
+
+        assert.strict.strict.deepEqual([[[1, 2, 3]], 4, 5], [[[1, 2, '3']], 4, 5]);
+    }
+}
+
+////////////////////////////////////////////////////
+/// Events tests : http://nodejs.org/api/events.html
+////////////////////////////////////////////////////
+
+{
+    const emitter: events.EventEmitter = new events.EventEmitter();
+    const event: string | symbol = '';
+    const listener: (...args: any[]) => void = () => {};
+    const any: any = 1;
+
+    {
+        let result: events.EventEmitter;
+
+        result = emitter.addListener(event, listener);
+        result = emitter.on(event, listener);
+        result = emitter.once(event, listener);
+        result = emitter.prependListener(event, listener);
+        result = emitter.prependOnceListener(event, listener);
+        result = emitter.removeListener(event, listener);
+        result = emitter.off(event, listener);
+        result = emitter.removeAllListeners();
+        result = emitter.removeAllListeners(event);
+        result = emitter.setMaxListeners(42);
+    }
+
+    {
+        let result: number;
+
+        result = events.EventEmitter.defaultMaxListeners;
+        result = events.EventEmitter.listenerCount(emitter, event); // deprecated
+
+        result = emitter.getMaxListeners();
+        result = emitter.listenerCount(event);
+    }
+
+    {
+        let result: Function[];
+
+        result = emitter.listeners(event);
+    }
+
+    {
+        let result: boolean;
+
+        result = emitter.emit(event);
+        result = emitter.emit(event, any);
+        result = emitter.emit(event, any, any);
+        result = emitter.emit(event, any, any, any);
+    }
+
+    {
+        let result: Array<string | symbol>;
+
+        result = emitter.eventNames();
+    }
+
+    {
+        class Networker extends events.EventEmitter {
+            constructor() {
+                super();
+
+                this.emit("mingling");
+            }
+        }
+    }
+
+    {
+        new events2();
+    }
+}
+
+////////////////////////////////////////////////////
+/// File system tests : http://nodejs.org/api/fs.html
+////////////////////////////////////////////////////
+
+{
+    {
+        fs.writeFile("thebible.txt",
+            "Do unto others as you would have them do unto you.",
+            assert.ifError);
+
+        fs.write(1234, "test", () => { });
+
+        fs.writeFile("Harry Potter",
+            "\"You be wizzing, Harry,\" jived Dumbledore.",
+            {
+                encoding: "ascii"
+            },
+            assert.ifError);
+
+        fs.writeFile("testfile", "content", "utf8", assert.ifError);
+
+        fs.writeFileSync("testfile", "content", "utf8");
+        fs.writeFileSync("testfile", "content", { encoding: "utf8" });
+        fs.writeFileSync("testfile", new DataView(new ArrayBuffer(1)), { encoding: "utf8" });
+    }
+
+    {
+        fs.appendFile("testfile", "foobar", "utf8", assert.ifError);
+        fs.appendFile("testfile", "foobar", { encoding: "utf8" }, assert.ifError);
+        fs.appendFileSync("testfile", "foobar", "utf8");
+        fs.appendFileSync("testfile", "foobar", { encoding: "utf8" });
+    }
+
+    {
+        let content: string;
+        let buffer: Buffer;
+        let stringOrBuffer: string | Buffer;
+        const nullEncoding: string | null = null;
+        const stringEncoding: string | null = 'utf8';
+
+        content = fs.readFileSync('testfile', 'utf8');
+        content = fs.readFileSync('testfile', { encoding: 'utf8' });
+        stringOrBuffer = fs.readFileSync('testfile', stringEncoding);
+        stringOrBuffer = fs.readFileSync('testfile', { encoding: stringEncoding });
+
+        buffer = fs.readFileSync('testfile');
+        buffer = fs.readFileSync('testfile', null);
+        buffer = fs.readFileSync('testfile', { encoding: null });
+        stringOrBuffer = fs.readFileSync('testfile', nullEncoding);
+        stringOrBuffer = fs.readFileSync('testfile', { encoding: nullEncoding });
+
+        buffer = fs.readFileSync('testfile', { flag: 'r' });
+
+        fs.readFile('testfile', 'utf8', (err, data) => content = data);
+        fs.readFile('testfile', { encoding: 'utf8' }, (err, data) => content = data);
+        fs.readFile('testfile', stringEncoding, (err, data) => stringOrBuffer = data);
+        fs.readFile('testfile', { encoding: stringEncoding }, (err, data) => stringOrBuffer = data);
+
+        fs.readFile('testfile', (err, data) => buffer = data);
+        fs.readFile('testfile', null, (err, data) => buffer = data);
+        fs.readFile('testfile', { encoding: null }, (err, data) => buffer = data);
+        fs.readFile('testfile', nullEncoding, (err, data) => stringOrBuffer = data);
+        fs.readFile('testfile', { encoding: nullEncoding }, (err, data) => stringOrBuffer = data);
+
+        fs.readFile('testfile', { flag: 'r' }, (err, data) => buffer = data);
+    }
+
+    {
+        fs.read(1, new DataView(new ArrayBuffer(1)), 0, 1, 0, (err: NodeJS.ErrnoException, bytesRead: number, buffer: DataView) => {});
+    }
+
+    {
+        fs.readSync(1, new DataView(new ArrayBuffer(1)), 0, 1, 0);
+    }
+
+    {
+        let errno: number;
+        fs.readFile('testfile', (err, data) => {
+            if (err && err.errno) {
+                errno = err.errno;
+            }
+        });
+    }
+
+    {
+        let listS: string[];
+        listS = fs.readdirSync('path');
+        listS = fs.readdirSync('path', { encoding: 'utf8' });
+        listS = fs.readdirSync('path', { encoding: null });
+        listS = fs.readdirSync('path', { encoding: undefined });
+        listS = fs.readdirSync('path', 'utf8');
+        listS = fs.readdirSync('path', null);
+        listS = fs.readdirSync('path', undefined);
+        const listDir: fs.Dirent[] = fs.readdirSync('path', { withFileTypes: true });
+        const listDir2: Buffer[] = fs.readdirSync('path', { withFileTypes: false, encoding: 'buffer' });
+
+        let listB: Buffer[];
+        listB = fs.readdirSync('path', { encoding: 'buffer' });
+        listB = fs.readdirSync("path", 'buffer');
+
+        const enc = 'buffer';
+        fs.readdirSync('path', { encoding: enc });
+        fs.readdirSync('path', { });
+
+        fs.readdir('path', { withFileTypes: true }, (err: NodeJS.ErrnoException, files: fs.Dirent[]) => {});
+    }
+    {
+        fs.mkdtemp('/tmp/foo-', (err, folder) => {
+            console.log(folder);
+            // Prints: /tmp/foo-itXde2
+        });
+    }
+
+    {
+        let tempDir: string;
+        tempDir = fs.mkdtempSync('/tmp/foo-');
+    }
+
+    {
+        fs.watch('/tmp/foo-', (event, filename) => {
+            console.log(event, filename);
+        });
+
+        fs.watch('/tmp/foo-', 'utf8', (event, filename) => {
+            console.log(event, filename);
+        });
+
+        fs.watch('/tmp/foo-', {
+            recursive: true,
+            persistent: true,
+            encoding: 'utf8'
+        }, (event, filename) => {
+            console.log(event, filename);
+        });
+    }
+
+    {
+        fs.access('/path/to/folder', (err) => { });
+
+        fs.access(Buffer.from(''), (err) => { });
+
+        fs.access('/path/to/folder', fs.constants.F_OK | fs.constants.R_OK, (err) => { });
+
+        fs.access(Buffer.from(''), fs.constants.F_OK | fs.constants.R_OK, (err) => { });
+
+        fs.accessSync('/path/to/folder');
+
+        fs.accessSync(Buffer.from(''));
+
+        fs.accessSync('path/to/folder', fs.constants.W_OK | fs.constants.X_OK);
+
+        fs.accessSync(Buffer.from(''), fs.constants.W_OK | fs.constants.X_OK);
+    }
+
+    {
+        let s: string;
+        let b: Buffer;
+        fs.readlink('/path/to/folder', (err, linkString) => s = linkString);
+        fs.readlink('/path/to/folder', undefined, (err, linkString) => s = linkString);
+        fs.readlink('/path/to/folder', 'utf8', (err, linkString) => s = linkString);
+        fs.readlink('/path/to/folder', 'buffer', (err, linkString) => b = linkString);
+        fs.readlink('/path/to/folder', s, (err, linkString) => typeof linkString === 'string' ? s = linkString : b = linkString);
+        fs.readlink('/path/to/folder', {}, (err, linkString) => s = linkString);
+        fs.readlink('/path/to/folder', { encoding: undefined }, (err, linkString) => s = linkString);
+        fs.readlink('/path/to/folder', { encoding: 'utf8' }, (err, linkString) => s = linkString);
+        fs.readlink('/path/to/folder', { encoding: 'buffer' }, (err, linkString) => b = linkString);
+        fs.readlink('/path/to/folder', { encoding: s }, (err, linkString) => typeof linkString === "string" ? s = linkString : b = linkString);
+
+        s = fs.readlinkSync('/path/to/folder');
+        s = fs.readlinkSync('/path/to/folder', undefined);
+        s = fs.readlinkSync('/path/to/folder', 'utf8');
+        b = fs.readlinkSync('/path/to/folder', 'buffer');
+        const v1 = fs.readlinkSync('/path/to/folder', s);
+        typeof v1 === "string" ? s = v1 : b = v1;
+
+        s = fs.readlinkSync('/path/to/folder', {});
+        s = fs.readlinkSync('/path/to/folder', { encoding: undefined });
+        s = fs.readlinkSync('/path/to/folder', { encoding: 'utf8' });
+        b = fs.readlinkSync('/path/to/folder', { encoding: 'buffer' });
+        const v2 = fs.readlinkSync('/path/to/folder', { encoding: s });
+        typeof v2 === "string" ? s = v2 : b = v2;
+    }
+
+    {
+        let s: string;
+        let b: Buffer;
+        fs.realpath('/path/to/folder', (err, resolvedPath) => s = resolvedPath);
+        fs.realpath('/path/to/folder', undefined, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath('/path/to/folder', 'utf8', (err, resolvedPath) => s = resolvedPath);
+        fs.realpath('/path/to/folder', 'buffer', (err, resolvedPath) => b = resolvedPath);
+        fs.realpath('/path/to/folder', s, (err, resolvedPath) => typeof resolvedPath === 'string' ? s = resolvedPath : b = resolvedPath);
+        fs.realpath('/path/to/folder', {}, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath('/path/to/folder', { encoding: undefined }, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath('/path/to/folder', { encoding: 'utf8' }, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath('/path/to/folder', { encoding: 'buffer' }, (err, resolvedPath) => b = resolvedPath);
+        fs.realpath('/path/to/folder', { encoding: s }, (err, resolvedPath) => typeof resolvedPath === "string" ? s = resolvedPath : b = resolvedPath);
+
+        s = fs.realpathSync('/path/to/folder');
+        s = fs.realpathSync('/path/to/folder', undefined);
+        s = fs.realpathSync('/path/to/folder', 'utf8');
+        b = fs.realpathSync('/path/to/folder', 'buffer');
+        const v1 = fs.realpathSync('/path/to/folder', s);
+        typeof v1 === "string" ? s = v1 : b = v1;
+
+        s = fs.realpathSync('/path/to/folder', {});
+        s = fs.realpathSync('/path/to/folder', { encoding: undefined });
+        s = fs.realpathSync('/path/to/folder', { encoding: 'utf8' });
+        b = fs.realpathSync('/path/to/folder', { encoding: 'buffer' });
+        const v2 = fs.realpathSync('/path/to/folder', { encoding: s });
+        typeof v2 === "string" ? s = v2 : b = v2;
+
+        // native
+        fs.realpath.native('/path/to/folder', (err, resolvedPath) => s = resolvedPath);
+        fs.realpath.native('/path/to/folder', undefined, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath.native('/path/to/folder', 'utf8', (err, resolvedPath) => s = resolvedPath);
+        fs.realpath.native('/path/to/folder', 'buffer', (err, resolvedPath) => b = resolvedPath);
+        fs.realpath.native('/path/to/folder', s, (err, resolvedPath) => typeof resolvedPath === 'string' ? s = resolvedPath : b = resolvedPath);
+        fs.realpath.native('/path/to/folder', {}, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath.native('/path/to/folder', { encoding: undefined }, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath.native('/path/to/folder', { encoding: 'utf8' }, (err, resolvedPath) => s = resolvedPath);
+        fs.realpath.native('/path/to/folder', { encoding: 'buffer' }, (err, resolvedPath) => b = resolvedPath);
+        fs.realpath.native('/path/to/folder', { encoding: s }, (err, resolvedPath) => typeof resolvedPath === "string" ? s = resolvedPath : b = resolvedPath);
+
+        s = fs.realpathSync.native('/path/to/folder');
+        s = fs.realpathSync.native('/path/to/folder', undefined);
+        s = fs.realpathSync.native('/path/to/folder', 'utf8');
+        b = fs.realpathSync.native('/path/to/folder', 'buffer');
+        const v3 = fs.realpathSync.native('/path/to/folder', s);
+        typeof v3 === "string" ? s = v3 : b = v3;
+
+        s = fs.realpathSync.native('/path/to/folder', {});
+        s = fs.realpathSync.native('/path/to/folder', { encoding: undefined });
+        s = fs.realpathSync.native('/path/to/folder', { encoding: 'utf8' });
+        b = fs.realpathSync.native('/path/to/folder', { encoding: 'buffer' });
+        const v4 = fs.realpathSync.native('/path/to/folder', { encoding: s });
+        typeof v4 === "string" ? s = v4 : b = v4;
+    }
+
+    {
+        fs.copyFile('/path/to/src', '/path/to/dest', (err) => console.error(err));
+        fs.copyFile('/path/to/src', '/path/to/dest', fs.constants.COPYFILE_EXCL, (err) => console.error(err));
+        fs.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);
+    }
+
+    {
+        fs.mkdir('some/test/path', {
+            recursive: true,
+            mode: 0o777,
+        }, () => {
+        });
+
+        fs.mkdirSync('some/test/path', {
+            recursive: true,
+            mode: 0o777,
+        });
+    }
+}
+
+///////////////////////////////////////////////////////
+/// Buffer tests : https://nodejs.org/api/buffer.html
+///////////////////////////////////////////////////////
+
+function bufferTests() {
+    const utf8Buffer = new Buffer('test');
+    const base64Buffer = new Buffer('', 'base64');
+    const octets: Uint8Array = null;
+    const octetBuffer = new Buffer(octets);
+    const sharedBuffer = new Buffer(octets.buffer);
+    const copiedBuffer = new Buffer(utf8Buffer);
+    console.log(Buffer.isBuffer(octetBuffer));
+    console.log(Buffer.isEncoding('utf8'));
+    console.log(Buffer.byteLength('xyz123'));
+    console.log(Buffer.byteLength('xyz123', 'ascii'));
+    const result1 = Buffer.concat([utf8Buffer, base64Buffer]);
+    const result2 = Buffer.concat([utf8Buffer, base64Buffer], 9999999);
+
+    // Class Methods: Buffer.swap16(), Buffer.swa32(), Buffer.swap64()
+    {
+        const buf = Buffer.from([0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8]);
+        buf.swap16();
+        buf.swap32();
+        buf.swap64();
+    }
+
+    // Class Method: Buffer.from(data)
+    {
+        // Array
+        const buf1: Buffer = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+        // Buffer
+        const buf2: Buffer = Buffer.from(buf1);
+        // String
+        const buf3: Buffer = Buffer.from('this is a tést');
+        // ArrayBuffer
+        const arrUint16: Uint16Array = new Uint16Array(2);
+        arrUint16[0] = 5000;
+        arrUint16[1] = 4000;
+        const buf4: Buffer = Buffer.from(arrUint16.buffer);
+        const arrUint8: Uint8Array = new Uint8Array(2);
+        const buf5: Buffer = Buffer.from(arrUint8);
+        const buf6: Buffer = Buffer.from(buf1);
+        const buf7: Buffer = Buffer.from(undefined as SharedArrayBuffer);
+    }
+
+    // Class Method: Buffer.from(arrayBuffer[, byteOffset[, length]])
+    {
+        const arr: Uint16Array = new Uint16Array(2);
+        arr[0] = 5000;
+        arr[1] = 4000;
+
+        let buf: Buffer;
+        buf = Buffer.from(arr.buffer, 1);
+        buf = Buffer.from(arr.buffer, 0, 1);
+    }
+
+    // Class Method: Buffer.from(str[, encoding])
+    {
+        const buf2: Buffer = Buffer.from('7468697320697320612074c3a97374', 'hex');
+    }
+
+    // Class Method: Buffer.alloc(size[, fill[, encoding]])
+    {
+        const buf1: Buffer = Buffer.alloc(5);
+        const buf2: Buffer = Buffer.alloc(5, 'a');
+        const buf3: Buffer = Buffer.alloc(11, 'aGVsbG8gd29ybGQ=', 'base64');
+    }
+    // Class Method: Buffer.allocUnsafe(size)
+    {
+        const buf: Buffer = Buffer.allocUnsafe(5);
+    }
+    // Class Method: Buffer.allocUnsafeSlow(size)
+    {
+        const buf: Buffer = Buffer.allocUnsafeSlow(10);
+    }
+
+    // Class Method byteLenght
+    {
+        let len: number;
+        len = Buffer.byteLength("foo");
+        len = Buffer.byteLength("foo", "utf8");
+
+        const b = Buffer.from("bar");
+        len = Buffer.byteLength(b);
+        len = Buffer.byteLength(b, "utf16le");
+
+        const ab = new ArrayBuffer(15);
+        len = Buffer.byteLength(ab);
+        len = Buffer.byteLength(ab, "ascii");
+
+        const dv = new DataView(ab);
+        len = Buffer.byteLength(dv);
+        len = Buffer.byteLength(dv, "utf16le");
+    }
+
+    // Class Method poolSize
+    {
+        let s: number;
+        s = Buffer.poolSize;
+        Buffer.poolSize = 4096;
+    }
+
+    // Test that TS 1.6 works with the 'as Buffer' annotation
+    // on isBuffer.
+    let a: Buffer | number;
+    a = new Buffer(10);
+    if (Buffer.isBuffer(a)) {
+        a.writeUInt8(3, 4);
+    }
+
+    // write* methods return offsets.
+    const b = new Buffer(16);
+    let result: number = b.writeUInt32LE(0, 0);
+    result = b.writeUInt16LE(0, 4);
+    result = b.writeUInt8(0, 6);
+    result = b.writeInt8(0, 7);
+    result = b.writeDoubleLE(0, 8);
+
+    // fill returns the input buffer.
+    b.fill('a').fill('b');
+
+    {
+        const buffer = new Buffer('123');
+        let index: number;
+        index = buffer.indexOf("23");
+        index = buffer.indexOf("23", 1);
+        index = buffer.indexOf("23", 1, "utf8");
+        index = buffer.indexOf(23);
+        index = buffer.indexOf(buffer);
+    }
+
+    {
+        const buffer = new Buffer('123');
+        let index: number;
+        index = buffer.lastIndexOf("23");
+        index = buffer.lastIndexOf("23", 1);
+        index = buffer.lastIndexOf("23", 1, "utf8");
+        index = buffer.lastIndexOf(23);
+        index = buffer.lastIndexOf(buffer);
+    }
+
+    {
+        const buffer = new Buffer('123');
+        const val: [number, number] = [1, 1];
+
+        /* comment out for --target es5
+        for (let entry of buffer.entries()) {
+            val = entry;
+        }
+         */
+    }
+
+    {
+        const buffer = new Buffer('123');
+        let includes: boolean;
+        includes = buffer.includes("23");
+        includes = buffer.includes("23", 1);
+        includes = buffer.includes("23", 1, "utf8");
+        includes = buffer.includes(23);
+        includes = buffer.includes(23, 1);
+        includes = buffer.includes(23, 1, "utf8");
+        includes = buffer.includes(buffer);
+        includes = buffer.includes(buffer, 1);
+        includes = buffer.includes(buffer, 1, "utf8");
+    }
+
+    {
+        const buffer = new Buffer('123');
+        const val = 1;
+
+        /* comment out for --target es5
+        for (let key of buffer.keys()) {
+            val = key;
+        }
+         */
+    }
+
+    {
+        const buffer = new Buffer('123');
+        const val = 1;
+
+        /* comment out for --target es5
+        for (let value of buffer.values()) {
+            val = value;
+        }
+         */
+    }
+
+    // Imported Buffer from buffer module works properly
+    {
+        const b = new ImportedBuffer('123');
+        b.writeUInt8(0, 6);
+        const sb = new ImportedSlowBuffer(43);
+        b.writeUInt8(0, 6);
+    }
+
+    // Buffer has Uint8Array's buffer field (an ArrayBuffer).
+    {
+        const buffer = new Buffer('123');
+        const octets = new Uint8Array(buffer.buffer);
+    }
+}
+
+////////////////////////////////////////////////////
+/// Url tests : http://nodejs.org/api/url.html
+////////////////////////////////////////////////////
+
+{
+    {
+        url.format(url.parse('http://www.example.com/xyz'));
+
+        url.format('http://www.example.com/xyz');
+
+        // https://google.com/search?q=you're%20a%20lizard%2C%20gary
+        url.format({
+            protocol: 'https',
+            host: "google.com",
+            pathname: 'search',
+            query: { q: "you're a lizard, gary" }
+        });
+
+        const myURL = new url.URL('https://a:b@你好你好?abc#foo');
+        url.format(myURL, { fragment: false, unicode: true, auth: false });
+    }
+
+    {
+        const helloUrl = url.parse('http://example.com/?hello=world', true);
+        let helloQuery = helloUrl.query['hello'];
+        assert.equal(helloUrl.query['hello'], 'world');
+
+        let strUrl = url.parse('http://example.com/?hello=world');
+        let queryStr: string = strUrl.query;
+
+        strUrl = url.parse('http://example.com/?hello=world', false);
+        queryStr = strUrl.query;
+
+        function getBoolean(): boolean { return false; }
+        const urlUrl = url.parse('http://example.com/?hello=world', getBoolean());
+        if (typeof(urlUrl.query) === 'string') {
+            queryStr = urlUrl.query;
+        } else if (urlUrl.query) {
+            helloQuery = urlUrl.query['hello'];
+        }
+    }
+
+    {
+        const ascii: string = url.domainToASCII('español.com');
+        const unicode: string = url.domainToUnicode('xn--espaol-zwa.com');
+    }
+
+    {
+        let myURL = new url.URL('https://theuser:thepwd@example.org:81/foo/path?query=string#bar');
+        assert.equal(myURL.hash, '#bar');
+        assert.equal(myURL.host, 'example.org:81');
+        assert.equal(myURL.hostname, 'example.org');
+        assert.equal(myURL.href, 'https://theuser:thepwd@example.org:81/foo/path?query=string#bar');
+        assert.equal(myURL.origin, 'https://example.org:81');
+        assert.equal(myURL.password, 'thepwd');
+        assert.equal(myURL.username, 'theuser');
+        assert.equal(myURL.pathname, '/foo/path');
+        assert.equal(myURL.port, "81");
+        assert.equal(myURL.protocol, "https:");
+        assert.equal(myURL.search, "?query=string");
+        assert.equal(myURL.toString(), 'https://theuser:thepwd@example.org:81/foo/path?query=string#bar');
+        assert(myURL.searchParams instanceof url.URLSearchParams);
+
+        myURL.host = 'example.org:82';
+        myURL.hostname = 'example.com';
+        myURL.href = 'http://other.com';
+        myURL.hash = 'baz';
+        myURL.password = "otherpwd";
+        myURL.username = "otheruser";
+        myURL.pathname = "/otherPath";
+        myURL.port = "82";
+        myURL.protocol = "http";
+        myURL.search = "a=b";
+        assert.equal(myURL.href, 'http://otheruser:otherpwd@other.com:82/otherPath?a=b#baz');
+
+        myURL = new url.URL('/foo', 'https://example.org/');
+        assert.equal(myURL.href, 'https://example.org/foo');
+        assert.equal(myURL.toJSON(), myURL.href);
+    }
+
+    {
+        const searchParams = new url.URLSearchParams('abc=123');
+
+        assert.equal(searchParams.toString(), 'abc=123');
+        searchParams.forEach((value: string, name: string, me: url.URLSearchParams): void => {
+            assert.equal(name, 'abc');
+            assert.equal(value, '123');
+            assert.equal(me, searchParams);
+        });
+
+        assert.equal(searchParams.get('abc'), '123');
+
+        searchParams.append('abc', 'xyz');
+
+        assert.deepEqual(searchParams.getAll('abc'), ['123', 'xyz']);
+
+        const entries = searchParams.entries();
+        assert.deepEqual(entries.next(), { value: ["abc", "123"], done: false });
+        assert.deepEqual(entries.next(), { value: ["abc", "xyz"], done: false });
+        assert.deepEqual(entries.next(), { value: undefined, done: true });
+
+        const keys = searchParams.keys();
+        assert.deepEqual(keys.next(), { value: "abc", done: false });
+        assert.deepEqual(keys.next(), { value: "abc", done: false });
+        assert.deepEqual(keys.next(), { value: undefined, done: true });
+
+        const values = searchParams.values();
+        assert.deepEqual(values.next(), { value: "123", done: false });
+        assert.deepEqual(values.next(), { value: "xyz", done: false });
+        assert.deepEqual(values.next(), { value: undefined, done: true });
+
+        searchParams.set('abc', 'b');
+        assert.deepEqual(searchParams.getAll('abc'), ['b']);
+
+        searchParams.delete('a');
+        assert(!searchParams.has('a'));
+        assert.equal(searchParams.get('a'), null);
+
+        searchParams.sort();
+    }
+
+    {
+        const searchParams = new url.URLSearchParams({
+            user: 'abc',
+            query: ['first', 'second']
+        });
+
+        assert.equal(searchParams.toString(), 'user=abc&query=first%2Csecond');
+        assert.deepEqual(searchParams.getAll('query'), ['first,second']);
+    }
+
+    {
+        // Using an array
+        const params = new url.URLSearchParams([
+            ['user', 'abc'],
+            ['query', 'first'],
+            ['query', 'second']
+        ]);
+        assert.equal(params.toString(), 'user=abc&query=first&query=second');
+    }
+
+    {
+        let path: string = url.fileURLToPath('file://test');
+        path = url.fileURLToPath(new url.URL('file://test'));
+    }
+
+    {
+        const path: url.URL = url.pathToFileURL('file://test');
+    }
+}
+
+/////////////////////////////////////////////////////
+/// util tests : https://nodejs.org/api/util.html ///
+/////////////////////////////////////////////////////
+
+{
+    {
+        // Old and new util.inspect APIs
+        util.inspect(["This is nice"], false, 5);
+        util.inspect(["This is nice"], false, null);
+        util.inspect(["This is nice"], {
+            colors: true,
+            depth: 5,
+            customInspect: false,
+            showProxy: true,
+            maxArrayLength: 10,
+            breakLength: 20,
+            compact: true,
+            sorted(a, b) {
+                return b.localeCompare(a);
+            },
+        });
+        util.inspect(["This is nice"], {
+            colors: true,
+            depth: null,
+            customInspect: false,
+            showProxy: true,
+            maxArrayLength: null,
+            breakLength: Infinity,
+            compact: false,
+            sorted: true,
+        });
+        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 {
+            static fn(): Promise<void> {
+                assert(arguments.length === 0);
+
+                return Promise.resolve();
+            }
+
+            static fnE(): Promise<void> {
+                assert(arguments.length === 0);
+
+                return Promise.reject(new Error('fail'));
+            }
+
+            static fnT1(arg1: string): Promise<void> {
+                assert(arguments.length === 1 && arg1 === 'parameter');
+
+                return Promise.resolve();
+            }
+
+            static fnT1E(arg1: string): Promise<void> {
+                assert(arguments.length === 1 && arg1 === 'parameter');
+
+                return Promise.reject(new Error('fail'));
+            }
+
+            static fnTResult(): Promise<string> {
+                assert(arguments.length === 0);
+
+                return Promise.resolve('result');
+            }
+
+            static fnTResultE(): Promise<string> {
+                assert(arguments.length === 0);
+
+                return Promise.reject(new Error('fail'));
+            }
+
+            static fnT1TResult(arg1: string): Promise<string> {
+                assert(arguments.length === 1 && arg1 === 'parameter');
+
+                return Promise.resolve('result');
+            }
+
+            static fnT1TResultE(arg1: string): Promise<string> {
+                assert(arguments.length === 1 && arg1 === 'parameter');
+
+                return Promise.reject(new Error('fail'));
+            }
+
+            static test(): void {
+                const cfn = util.callbackify(this.fn);
+                const cfnE = util.callbackify(this.fnE);
+                const cfnT1 = util.callbackify(this.fnT1);
+                const cfnT1E = util.callbackify(this.fnT1E);
+                const cfnTResult = util.callbackify(this.fnTResult);
+                const cfnTResultE = util.callbackify(this.fnTResultE);
+                const cfnT1TResult = util.callbackify(this.fnT1TResult);
+                const cfnT1TResultE = util.callbackify(this.fnT1TResultE);
+
+                cfn((err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === undefined));
+                cfnE((err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
+                cfnT1('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === undefined));
+                cfnT1E('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
+                cfnTResult((err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === 'result'));
+                cfnTResultE((err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
+                cfnT1TResult('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === 'result'));
+                cfnT1TResultE('parameter', (err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
+            }
+        }
+        callbackifyTest.test();
+
+        // util.promisify
+        const readPromised = util.promisify(fs.readFile);
+        const sampleRead: Promise<any> = readPromised(__filename).then((data: Buffer): void => { }).catch((error: Error): void => { });
+        const arg0: () => Promise<number> = util.promisify((cb: (err: Error, result: number) => void): void => { });
+        const arg0NoResult: () => Promise<any> = util.promisify((cb: (err: Error) => void): void => { });
+        const arg1: (arg: string) => Promise<number> = util.promisify((arg: string, cb: (err: Error, result: number) => void): void => { });
+        const arg1NoResult: (arg: string) => Promise<any> = util.promisify((arg: string, cb: (err: Error) => void): void => { });
+        const cbOptionalError: () => Promise<void | {}> = util.promisify((cb: (err?: Error | null) => void): void => { cb(); }); // tslint:disable-line void-return
+        assert(typeof util.promisify.custom === 'symbol');
+        // util.deprecate
+        const foo = () => {};
+        // $ExpectType () => void
+        util.deprecate(foo, 'foo() is deprecated, use bar() instead');
+        // $ExpectType <T extends Function>(fn: T, message: string) => T
+        util.deprecate(util.deprecate, 'deprecate() is deprecated, use bar() instead');
+
+        // util.isDeepStrictEqual
+        util.isDeepStrictEqual({foo: 'bar'}, {foo: 'bar'});
+
+        // util.TextDecoder()
+        const td = new util.TextDecoder();
+        new util.TextDecoder("utf-8");
+        new util.TextDecoder("utf-8", { fatal: true });
+        new util.TextDecoder("utf-8", { fatal: true, ignoreBOM: true });
+        const ignoreBom: boolean = td.ignoreBOM;
+        const fatal: boolean = td.fatal;
+        const encoding: string = td.encoding;
+        td.decode(new Int8Array(1));
+        td.decode(new Int16Array(1));
+        td.decode(new Int32Array(1));
+        td.decode(new Uint8Array(1));
+        td.decode(new Uint16Array(1));
+        td.decode(new Uint32Array(1));
+        td.decode(new Uint8ClampedArray(1));
+        td.decode(new Float32Array(1));
+        td.decode(new Float64Array(1));
+        td.decode(new DataView(new Int8Array(1).buffer));
+        td.decode(new ArrayBuffer(1));
+        td.decode(null);
+        td.decode(null, { stream: true });
+        td.decode(new Int8Array(1), { stream: true });
+        const decode: string = td.decode(new Int8Array(1));
+
+        // util.TextEncoder()
+        const te = new util.TextEncoder();
+        const teEncoding: string = te.encoding;
+        const teEncodeRes: Uint8Array = te.encode("TextEncoder");
+
+        // util.types
+
+        // tslint:disable-next-line:no-construct ban-types
+        const maybeBoxed: number | Number = new Number(1);
+        if (util.types.isBoxedPrimitive(maybeBoxed)) {
+            const boxed: Number = maybeBoxed;
+        }
+        const maybeBoxed2: number | Number = 1;
+        if (!util.types.isBoxedPrimitive(maybeBoxed2)) {
+            const boxed: number = maybeBoxed2;
+        }
+    }
+}
+
+////////////////////////////////////////////////////
+/// Stream tests : http://nodejs.org/api/stream.html
+////////////////////////////////////////////////////
+
+// http://nodejs.org/api/stream.html#stream_readable_pipe_destination_options
+function stream_readable_pipe_test() {
+    const rs = fs.createReadStream(Buffer.from('file.txt'));
+    const r = fs.createReadStream('file.txt');
+    const z = zlib.createGzip({ finishFlush: zlib.constants.Z_FINISH });
+    const w = fs.createWriteStream('file.txt.gz');
+
+    assert(typeof z.bytesRead === 'number');
+    assert(typeof r.bytesRead === 'number');
+    assert(typeof r.path === 'string');
+    assert(rs.path instanceof Buffer);
+
+    r.pipe(z).pipe(w);
+
+    z.flush();
+    r.close();
+    z.close();
+    rs.close();
+}
+
+// helpers
+const compressMe = new Buffer("some data");
+const compressMeString = "compress me!";
+
+zlib.deflate(compressMe, (err: Error, result: Buffer) => zlib.inflate(result, (err: Error, result: Buffer) => result));
+zlib.deflate(compressMe, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => zlib.inflate(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result));
+zlib.deflate(compressMeString, (err: Error, result: Buffer) => zlib.inflate(result, (err: Error, result: Buffer) => result));
+zlib.deflate(compressMeString, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => zlib.inflate(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result));
+const inflated = zlib.inflateSync(zlib.deflateSync(compressMe));
+const inflatedString = zlib.inflateSync(zlib.deflateSync(compressMeString));
+
+zlib.deflateRaw(compressMe, (err: Error, result: Buffer) => zlib.inflateRaw(result, (err: Error, result: Buffer) => result));
+zlib.deflateRaw(compressMe, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => zlib.inflateRaw(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result));
+zlib.deflateRaw(compressMeString, (err: Error, result: Buffer) => zlib.inflateRaw(result, (err: Error, result: Buffer) => result));
+zlib.deflateRaw(
+    compressMeString,
+    { finishFlush: zlib.Z_SYNC_FLUSH },
+    (err: Error, result: Buffer) => zlib.inflateRaw(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result),
+);
+const inflatedRaw: Buffer = zlib.inflateRawSync(zlib.deflateRawSync(compressMe));
+const inflatedRawString: Buffer = zlib.inflateRawSync(zlib.deflateRawSync(compressMeString));
+
+zlib.gzip(compressMe, (err: Error, result: Buffer) => zlib.gunzip(result, (err: Error, result: Buffer) => result));
+zlib.gzip(compressMe, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => zlib.gunzip(result, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result));
+const gunzipped: Buffer = zlib.gunzipSync(zlib.gzipSync(compressMe));
+
+zlib.unzip(compressMe, (err: Error, result: Buffer) => result);
+zlib.unzip(compressMe, { finishFlush: zlib.Z_SYNC_FLUSH }, (err: Error, result: Buffer) => result);
+const unzipped: Buffer = zlib.unzipSync(compressMe);
+
+// Simplified constructors
+function simplified_stream_ctor_test() {
+    new stream.Readable({
+        read(size) {
+            // $ExpectType Readable
+            this;
+            // $ExpectType number
+            size;
+        },
+        destroy(error, cb) {
+            // $ExpectType Error
+            error;
+            // $ExpectType (error: Error) => void
+            cb;
+        }
+    });
+
+    new stream.Writable({
+        write(chunk, enc, cb) {
+            // $ExpectType Writable
+            this;
+            // $ExpectType any
+            chunk;
+            // $ExpectType string
+            enc;
+            // $ExpectType (error?: Error) => void
+            cb;
+        },
+        writev(chunks, cb) {
+            // $ExpectType Writable
+            this;
+            // $ExpectType { chunk: any; encoding: string; }[]
+            chunks;
+            // $ExpectType (error?: Error) => void
+            cb;
+        },
+        destroy(error, cb) {
+            // $ExpectType Writable
+            this;
+            // $ExpectType Error
+            error;
+            // $ExpectType (error: Error) => void
+            cb;
+        },
+        final(cb) {
+            // $ExpectType Writable
+            this;
+            // $ExpectType (error?: Error) => void
+            cb;
+        }
+    });
+
+    new stream.Duplex({
+        read(size) {
+            // $ExpectType Duplex
+            this;
+            // $ExpectType number
+            size;
+        },
+        write(chunk, enc, cb) {
+            // $ExpectType Duplex
+            this;
+            // $ExpectType any
+            chunk;
+            // $ExpectType string
+            enc;
+            // $ExpectType (error?: Error) => void
+            cb;
+        },
+        writev(chunks, 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({
+        read(size) {
+            // $ExpectType Transform
+            this;
+            // $ExpectType number
+            size;
+        },
+        write(chunk, enc, cb) {
+            // $ExpectType Transform
+            this;
+            // $ExpectType any
+            chunk;
+            // $ExpectType string
+            enc;
+            // $ExpectType (error?: Error) => void
+            cb;
+        },
+        writev(chunks, cb) {
+            // $ExpectType Transform
+            this;
+            // $ExpectType { chunk: any; encoding: string; }[]
+            chunks;
+            // $ExpectType (error?: Error) => void
+            cb;
+        },
+        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,
+        writableObjectMode: true
+    });
+}
+
+function streamPipelineFinished() {
+    const cancel = stream.finished(process.stdin, (err?: Error) => {});
+    cancel();
+
+    stream.pipeline(process.stdin, process.stdout, (err?: Error) => {});
+}
+
+async function asyncStreamPipelineFinished() {
+    const finished = util.promisify(stream.finished);
+    await finished(process.stdin);
+
+    const pipeline = util.promisify(stream.pipeline);
+    await pipeline(process.stdin, process.stdout);
+}
+
+////////////////////////////////////////////////////////
+/// Crypto tests : http://nodejs.org/api/crypto.html ///
+////////////////////////////////////////////////////////
+
+{
+    {
+        // crypto_hash_string_test
+        const hashResult: string = crypto.createHash('md5').update('world').digest('hex');
+    }
+
+    {
+        // crypto_hash_buffer_test
+        const hashResult: string = crypto.createHash('md5')
+            .update(new Buffer('world')).digest('hex');
+    }
+
+    {
+        // crypto_hash_dataview_test
+        const hashResult: string = crypto.createHash('md5')
+            .update(new DataView(new Buffer('world').buffer)).digest('hex');
+    }
+
+    {
+        // crypto_hash_int8array_test
+        const hashResult: string = crypto.createHash('md5')
+            .update(new Int8Array(new Buffer('world').buffer)).digest('hex');
+    }
+
+    {
+        // crypto_hmac_string_test
+        const hmacResult: string = crypto.createHmac('md5', 'hello').update('world').digest('hex');
+    }
+
+    {
+        // crypto_hmac_buffer_test
+        const hmacResult: string = crypto.createHmac('md5', 'hello')
+            .update(new Buffer('world')).digest('hex');
+    }
+
+    {
+        // crypto_hmac_dataview_test
+        const hmacResult: string = crypto.createHmac('md5', 'hello')
+            .update(new DataView(new Buffer('world').buffer)).digest('hex');
+    }
+
+    {
+        // crypto_hmac_int8array_test
+        const 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', () => {
+            const hash: Buffer | string = hmac.read();
+        });
+    }
+
+    {
+        // crypto_cipher_decipher_string_test
+        const key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+        const clearText = "This is the clear text.";
+        const cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+        let cipherText: string = cipher.update(clearText, "utf8", "hex");
+        cipherText += cipher.final("hex");
+
+        const decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+        let clearText2: string = decipher.update(cipherText, "hex", "utf8");
+        clearText2 += decipher.final("utf8");
+
+        assert.equal(clearText2, clearText);
+    }
+
+    {
+        // crypto_cipher_decipher_buffer_test
+        const key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+        const clearText: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]);
+        const cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+        const cipherBuffers: Buffer[] = [];
+        cipherBuffers.push(cipher.update(clearText));
+        cipherBuffers.push(cipher.final());
+
+        const cipherText: Buffer = Buffer.concat(cipherBuffers);
+
+        const decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+        const decipherBuffers: Buffer[] = [];
+        decipherBuffers.push(decipher.update(cipherText));
+        decipherBuffers.push(decipher.final());
+
+        const clearText2: Buffer = Buffer.concat(decipherBuffers);
+
+        assert.deepEqual(clearText2, clearText);
+    }
+
+    {
+        // crypto_cipher_decipher_dataview_test
+        const key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+        const clearText: DataView = new DataView(new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]).buffer);
+        const cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+        const cipherBuffers: Buffer[] = [];
+        cipherBuffers.push(cipher.update(clearText));
+        cipherBuffers.push(cipher.final());
+
+        const cipherText: DataView = new DataView(Buffer.concat(cipherBuffers).buffer);
+
+        const decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+        const decipherBuffers: Buffer[] = [];
+        decipherBuffers.push(decipher.update(cipherText));
+        decipherBuffers.push(decipher.final());
+
+        const clearText2: Buffer = Buffer.concat(decipherBuffers);
+
+        assert.deepEqual(clearText2, clearText);
+    }
+
+    {
+        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
+        const buffer1: Buffer = new Buffer([1, 2, 3, 4, 5]);
+        const buffer2: Buffer = new Buffer([1, 2, 3, 4, 5]);
+        const buffer3: Buffer = new Buffer([5, 4, 3, 2, 1]);
+
+        assert(crypto.timingSafeEqual(buffer1, buffer2));
+        assert(!crypto.timingSafeEqual(buffer1, buffer3));
+    }
+
+    {
+        // crypto_timingsafeequal_uint32array_test
+        const arr1: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
+        const arr2: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
+        const 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
+        const arr1: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
+        const arr2: Int32Array = Int32Array.of(1, 2, 3, 4, 5);
+        const 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
+        const arr1: Int8Array = Int8Array.of(1, 2, 3, 4, 5, ~0, ~1, ~2, ~3, ~4);
+        const arr2: Uint8Array = Uint8Array.of(1, 2, 3, 4, 5, ~0, ~1, ~2, ~3, ~4);
+        const 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
+        const dv1B: Uint8Array = Uint8Array.of(1, 2, 3, 4, 5);
+        const dv2B: Int8Array = Int8Array.of(1, 2, 3, 4, 5);
+        const dv3B: Buffer = Buffer.of(5, 4, 3, 2, 1);
+        const dv4B: Uint8ClampedArray = Uint8ClampedArray.of(5, 4, 3, 2, 1);
+        const dv1: DataView = new DataView(dv1B.buffer, dv1B.byteOffset, dv1B.byteLength);
+        const dv2: DataView = new DataView(dv2B.buffer, dv2B.byteOffset, dv2B.byteLength);
+        const dv3: DataView = new DataView(dv3B.buffer, dv3B.byteOffset, dv3B.byteLength);
+        const 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
+        const ui32_1: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
+        const ui32_2: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
+        const 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
+        const buffer: Buffer = new Buffer(10);
+        crypto.randomFillSync(buffer);
+        crypto.randomFillSync(buffer, 2);
+        crypto.randomFillSync(buffer, 2, 3);
+
+        crypto.randomFill(buffer, (err: Error, buf: Buffer) => void {});
+        crypto.randomFill(buffer, 2, (err: Error, buf: Buffer) => void {});
+        crypto.randomFill(buffer, 2, 3, (err: Error, buf: Buffer) => void {});
+
+        // crypto_randomfill_uint8array_test
+        const ui8arr: Uint8Array = new Uint8Array(10);
+        crypto.randomFillSync(ui8arr);
+        crypto.randomFillSync(ui8arr, 2);
+        crypto.randomFillSync(ui8arr, 2, 3);
+
+        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
+        const 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");
+        const 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");
+    }
+
+    {
+        const rsaRes: {
+            publicKey: Buffer;
+            privateKey: string;
+        } = crypto.generateKeyPairSync('rsa', {
+            modulusLength: 123,
+            publicKeyEncoding: {
+                format: 'der',
+                type: 'pkcs1',
+            },
+            privateKeyEncoding: {
+                cipher: 'some-cipher',
+                format: 'pem',
+                passphrase: 'secret',
+                type: 'pkcs8',
+            },
+        });
+
+        const dsaRes: {
+            publicKey: string;
+            privateKey: Buffer;
+        } = crypto.generateKeyPairSync('dsa', {
+            modulusLength: 123,
+            divisorLength: 123,
+            publicKeyEncoding: {
+                format: 'pem',
+                type: 'spki',
+            },
+            privateKeyEncoding: {
+                cipher: 'some-cipher',
+                format: 'der',
+                passphrase: 'secret',
+                type: 'pkcs8',
+            },
+        });
+
+        const ecRes: {
+            publicKey: string;
+            privateKey: string;
+        } = crypto.generateKeyPairSync('ec', {
+            namedCurve: 'curve',
+            publicKeyEncoding: {
+                format: 'pem',
+                type: 'pkcs1',
+            },
+            privateKeyEncoding: {
+                cipher: 'some-cipher',
+                format: 'pem',
+                passphrase: 'secret',
+                type: 'pkcs8',
+            },
+        });
+    }
+
+    {
+        crypto.generateKeyPair('rsa', {
+            modulusLength: 123,
+            publicKeyEncoding: {
+                format: 'der',
+                type: 'pkcs1',
+            },
+            privateKeyEncoding: {
+                cipher: 'some-cipher',
+                format: 'pem',
+                passphrase: 'secret',
+                type: 'pkcs8',
+            },
+        }, (err: NodeJS.ErrnoException | null, publicKey: Buffer, privateKey: string) => {});
+
+        crypto.generateKeyPair('dsa', {
+            modulusLength: 123,
+            divisorLength: 123,
+            publicKeyEncoding: {
+                format: 'pem',
+                type: 'spki',
+            },
+            privateKeyEncoding: {
+                cipher: 'some-cipher',
+                format: 'der',
+                passphrase: 'secret',
+                type: 'pkcs8',
+            },
+        }, (err: NodeJS.ErrnoException | null, publicKey: string, privateKey: Buffer) => {});
+
+        crypto.generateKeyPair('ec', {
+            namedCurve: 'curve',
+            publicKeyEncoding: {
+                format: 'pem',
+                type: 'pkcs1',
+            },
+            privateKeyEncoding: {
+                cipher: 'some-cipher',
+                format: 'pem',
+                passphrase: 'secret',
+                type: 'pkcs8',
+            },
+        }, (err: NodeJS.ErrnoException | null, publicKey: string, privateKey: string) => {});
+    }
+
+    {
+        const generateKeyPairPromisified = util.promisify(crypto.generateKeyPair);
+
+        const rsaRes: Promise<{
+            publicKey: Buffer;
+            privateKey: string;
+        }> = generateKeyPairPromisified('rsa', {
+            modulusLength: 123,
+            publicKeyEncoding: {
+                format: 'der',
+                type: 'pkcs1',
+            },
+            privateKeyEncoding: {
+                cipher: 'some-cipher',
+                format: 'pem',
+                passphrase: 'secret',
+                type: 'pkcs8',
+            },
+        });
+
+        const dsaRes: Promise<{
+            publicKey: string;
+            privateKey: Buffer;
+        }> = generateKeyPairPromisified('dsa', {
+            modulusLength: 123,
+            divisorLength: 123,
+            publicKeyEncoding: {
+                format: 'pem',
+                type: 'spki',
+            },
+            privateKeyEncoding: {
+                cipher: 'some-cipher',
+                format: 'der',
+                passphrase: 'secret',
+                type: 'pkcs8',
+            },
+        });
+
+        const ecRes: Promise<{
+            publicKey: string;
+            privateKey: string;
+        }> = generateKeyPairPromisified('ec', {
+            namedCurve: 'curve',
+            publicKeyEncoding: {
+                format: 'pem',
+                type: 'pkcs1',
+            },
+            privateKeyEncoding: {
+                cipher: 'some-cipher',
+                format: 'pem',
+                passphrase: 'secret',
+                type: 'pkcs8',
+            },
+        });
+    }
+}
+
+//////////////////////////////////////////////////
+/// TLS tests : http://nodejs.org/api/tls.html ///
+//////////////////////////////////////////////////
+
+{
+    {
+        const ctx: tls.SecureContext = tls.createSecureContext({
+            key: "NOT REALLY A KEY",
+            cert: "SOME CERTIFICATE",
+        });
+        const blah = ctx.context;
+
+        const connOpts: tls.ConnectionOptions = {
+            host: "127.0.0.1",
+            port: 55
+        };
+        const tlsSocket = tls.connect(connOpts);
+
+        const ciphers: string[] = tls.getCiphers();
+        const curve: string = tls.DEFAULT_ECDH_CURVE;
+    }
+
+    {
+        let _server: tls.Server;
+        let _boolean: boolean;
+        const _func1 = (err: Error, resp: Buffer) => { };
+        const _func2 = (err: Error, sessionData: any) => { };
+        /**
+         * events.EventEmitter
+         * 1. tlsClientError
+         * 2. newSession
+         * 3. OCSPRequest
+         * 4. resumeSession
+         * 5. secureConnection
+         */
+
+        _server = _server.addListener("tlsClientError", (err, tlsSocket) => {
+            const _err: Error = err;
+            const _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+        _server = _server.addListener("newSession", (sessionId, sessionData, callback) => {
+            const _sessionId: any = sessionId;
+            const _sessionData: any = sessionData;
+            const _func1 = callback;
+        });
+        _server = _server.addListener("OCSPRequest", (certificate, issuer, callback) => {
+            const _certificate: Buffer = certificate;
+            const _issuer: Buffer = issuer;
+            const _callback: Function = callback;
+        });
+        _server = _server.addListener("resumeSession", (sessionId, callback) => {
+            const _sessionId: any = sessionId;
+            const _func2 = callback;
+        });
+        _server = _server.addListener("secureConnection", (tlsSocket) => {
+            const _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+
+        const _err: Error = new Error();
+        const _tlsSocket: tls.TLSSocket = tls.connect(1);
+        const _any: any = 1;
+        const _func: Function = () => {};
+        const _buffer: Buffer = Buffer.from('a');
+        _boolean = _server.emit("tlsClientError", _err, _tlsSocket);
+        _boolean = _server.emit("newSession", _any, _any, _func1);
+        _boolean = _server.emit("OCSPRequest", _buffer, _buffer, _func);
+        _boolean = _server.emit("resumeSession", _any, _func2);
+        _boolean = _server.emit("secureConnection", _tlsSocket);
+
+        _server = _server.on("tlsClientError", (err, tlsSocket) => {
+            const _err: Error = err;
+            const _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+        _server = _server.on("newSession", (sessionId, sessionData, callback) => {
+            const _sessionId: any = sessionId;
+            const _sessionData: any = sessionData;
+            const _func1 = callback;
+        });
+        _server = _server.on("OCSPRequest", (certificate, issuer, callback) => {
+            const _certificate: Buffer = certificate;
+            const _issuer: Buffer = issuer;
+            const _callback: Function = callback;
+        });
+        _server = _server.on("resumeSession", (sessionId, callback) => {
+            const _sessionId: any = sessionId;
+            const _func2 = callback;
+        });
+        _server = _server.on("secureConnection", (tlsSocket) => {
+            const _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+
+        _server = _server.once("tlsClientError", (err, tlsSocket) => {
+            const _err: Error = err;
+            const _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+        _server = _server.once("newSession", (sessionId, sessionData, callback) => {
+            const _sessionId: any = sessionId;
+            const _sessionData: any = sessionData;
+            const _func1 = callback;
+        });
+        _server = _server.once("OCSPRequest", (certificate, issuer, callback) => {
+            const _certificate: Buffer = certificate;
+            const _issuer: Buffer = issuer;
+            const _callback: Function = callback;
+        });
+        _server = _server.once("resumeSession", (sessionId, callback) => {
+            const _sessionId: any = sessionId;
+            const _func2 = callback;
+        });
+        _server = _server.once("secureConnection", (tlsSocket) => {
+            const _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+
+        _server = _server.prependListener("tlsClientError", (err, tlsSocket) => {
+            const _err: Error = err;
+            const _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+        _server = _server.prependListener("newSession", (sessionId, sessionData, callback) => {
+            const _sessionId: any = sessionId;
+            const _sessionData: any = sessionData;
+            const _func1 = callback;
+        });
+        _server = _server.prependListener("OCSPRequest", (certificate, issuer, callback) => {
+            const _certificate: Buffer = certificate;
+            const _issuer: Buffer = issuer;
+            const _callback: Function = callback;
+        });
+        _server = _server.prependListener("resumeSession", (sessionId, callback) => {
+            const _sessionId: any = sessionId;
+            const _func2 = callback;
+        });
+        _server = _server.prependListener("secureConnection", (tlsSocket) => {
+            const _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+
+        _server = _server.prependOnceListener("tlsClientError", (err, tlsSocket) => {
+            const _err: Error = err;
+            const _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+        _server = _server.prependOnceListener("newSession", (sessionId, sessionData, callback) => {
+            const _sessionId: any = sessionId;
+            const _sessionData: any = sessionData;
+            const _func1 = callback;
+        });
+        _server = _server.prependOnceListener("OCSPRequest", (certificate, issuer, callback) => {
+            const _certificate: Buffer = certificate;
+            const _issuer: Buffer = issuer;
+            const _callback: Function = callback;
+        });
+        _server = _server.prependOnceListener("resumeSession", (sessionId, callback) => {
+            const _sessionId: any = sessionId;
+            const _func2 = callback;
+        });
+        _server = _server.prependOnceListener("secureConnection", (tlsSocket) => {
+            const _tlsSocket: tls.TLSSocket = tlsSocket;
+        });
+
+        // close callback parameter is optional
+        _server = _server.close();
+
+        // close callback parameter doesn't specify any arguments, so any
+        // function is acceptable
+        _server = _server.close(() => { });
+        _server = _server.close((...args: any[]) => { });
+    }
+
+    {
+        let _TLSSocket: tls.TLSSocket;
+        let _boolean: boolean;
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. error
+         * 3. listening
+         * 4. message
+         */
+
+        _TLSSocket = _TLSSocket.addListener("OCSPResponse", (response) => {
+            const _response: Buffer = response;
+        });
+        _TLSSocket = _TLSSocket.addListener("secureConnect", () => { });
+
+        const _buffer: Buffer = Buffer.from("");
+        _boolean = _TLSSocket.emit("OCSPResponse", _buffer);
+        _boolean = _TLSSocket.emit("secureConnect");
+
+        _TLSSocket = _TLSSocket.on("OCSPResponse", (response) => {
+            const _response: Buffer = response;
+        });
+        _TLSSocket = _TLSSocket.on("secureConnect", () => { });
+
+        _TLSSocket = _TLSSocket.once("OCSPResponse", (response) => {
+            const _response: Buffer = response;
+        });
+        _TLSSocket = _TLSSocket.once("secureConnect", () => { });
+
+        _TLSSocket = _TLSSocket.prependListener("OCSPResponse", (response) => {
+            const _response: Buffer = response;
+        });
+        _TLSSocket = _TLSSocket.prependListener("secureConnect", () => { });
+
+        _TLSSocket = _TLSSocket.prependOnceListener("OCSPResponse", (response) => {
+            const _response: Buffer = response;
+        });
+        _TLSSocket = _TLSSocket.prependOnceListener("secureConnect", () => { });
+    }
+}
+
+////////////////////////////////////////////////////
+/// Http tests : http://nodejs.org/api/http.html ///
+////////////////////////////////////////////////////
+
+{
+    // http Server
+    {
+        function reqListener(req: http.IncomingMessage, res: http.ServerResponse): void {}
+
+        let server: http.Server = new http.Server();
+
+        class MyIncomingMessage extends http.IncomingMessage {
+            foo: number;
+        }
+
+        class MyServerResponse extends http.ServerResponse {
+            foo: string;
+        }
+
+        server = new http.Server({ IncomingMessage: MyIncomingMessage});
+
+        server = new http.Server({
+            IncomingMessage: MyIncomingMessage,
+            ServerResponse: MyServerResponse
+        }, reqListener);
+
+        server = http.createServer(reqListener);
+        server = http.createServer({ IncomingMessage: MyIncomingMessage });
+        server = http.createServer({ ServerResponse: MyServerResponse }, reqListener);
+
+        // test public props
+        const maxHeadersCount: number = server.maxHeadersCount;
+        const timeout: number = server.timeout;
+        const listening: boolean = server.listening;
+        const keepAliveTimeout: number = server.keepAliveTimeout;
+        server.setTimeout().setTimeout(1000).setTimeout(() => {}).setTimeout(100, () => {});
+    }
+
+    // http IncomingMessage
+    // http ServerResponse
+    {
+        // incoming
+        const incoming: http.IncomingMessage = new http.IncomingMessage(new net.Socket());
+
+        incoming.setEncoding('utf8');
+
+        // stream
+        incoming.pause();
+        incoming.resume();
+
+        // response
+        const res: http.ServerResponse = new http.ServerResponse(incoming);
+
+        // test headers
+        res.setHeader('Content-Type', 'text/plain');
+        const bool: boolean = res.hasHeader('Content-Type');
+        const headers: string[] = res.getHeaderNames();
+
+        // trailers
+        res.addTrailers([
+            ['x-fOo', 'xOxOxOx'],
+            ['x-foO', 'OxOxOxO'],
+            ['X-fOo', 'xOxOxOx'],
+            ['X-foO', 'OxOxOxO']
+        ]);
+        res.addTrailers({ 'x-foo': 'bar' });
+
+        // writeHead
+        res.writeHead(200, 'OK\r\nContent-Type: text/html\r\n');
+        res.writeHead(200, { 'Transfer-Encoding': 'chunked' });
+        res.writeHead(200);
+
+        // write string
+        res.write('Part of my res.');
+        // write buffer
+        const chunk = Buffer.alloc(16390, 'Й');
+        res.write(chunk);
+        res.write(chunk, 'hex');
+
+        // end
+        res.end("end msg");
+        // without msg
+        res.end();
+
+        // flush
+        res.flushHeaders();
+    }
+
+    // http ClientRequest
+    {
+        let req: http.ClientRequest = new http.ClientRequest("https://www.google.com");
+        req = new http.ClientRequest(new url.URL("https://www.google.com"));
+        req = new http.ClientRequest({ path: 'http://0.0.0.0' });
+        req = new http.ClientRequest({ setHost: false });
+
+        // header
+        req.setHeader('Content-Type', 'text/plain');
+        const bool: boolean = req.hasHeader('Content-Type');
+        const headers: string[] = req.getHeaderNames();
+        req.removeHeader('Date');
+
+        // write
+        const chunk = Buffer.alloc(16390, 'Й');
+        req.write(chunk);
+        req.write('a');
+        req.end();
+
+        // abort
+        req.abort();
+
+        // connection
+        req.connection.on('pause', () => { });
+
+        // event
+        req.on('data', () => { });
+    }
+
+    {
+        // Status codes
+        let codeMessage: string = http.STATUS_CODES['400'];
+        codeMessage = http.STATUS_CODES[400];
+    }
+
+    {
+        let agent: http.Agent = new http.Agent({
+            keepAlive: true,
+            keepAliveMsecs: 10000,
+            maxSockets: Infinity,
+            maxFreeSockets: 256,
+            timeout: 15000
+        });
+
+        agent = http.globalAgent;
+
+        http.request({ agent: false });
+        http.request({ agent });
+        http.request({ agent: undefined });
+    }
+
+    {
+        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 => {});
+    }
+
+    {
+        // Make sure .listen() and .close() return a Server instance
+        http.createServer().listen(0).close().address();
+        net.createServer().listen(0).close().address();
+    }
+
+    {
+        const request = http.request({ path: 'http://0.0.0.0' });
+        request.once('error', () => { });
+        request.setNoDelay(true);
+        request.abort();
+    }
+
+    // http request options
+    {
+        const requestOpts: http.RequestOptions = {
+            timeout: 30000
+        };
+
+        const clientArgs: http.ClientRequestArgs = {
+            timeout: 30000
+        };
+    }
+
+    // http headers
+    {
+        const headers: http.IncomingHttpHeaders = {
+            'content-type': 'application/json',
+            'set-cookie': [ 'type=ninja', 'language=javascript' ]
+        };
+    }
+}
+
+//////////////////////////////////////////////////////
+/// Https tests : http://nodejs.org/api/https.html ///
+//////////////////////////////////////////////////////
+
+{
+    let agent: https.Agent = new https.Agent({
+        keepAlive: true,
+        keepAliveMsecs: 10000,
+        maxSockets: Infinity,
+        maxFreeSockets: 256,
+        maxCachedSessions: 100,
+        timeout: 15000
+    });
+
+    agent = https.globalAgent;
+
+    https.request({
+        agent: false
+    });
+    https.request({
+        agent
+    });
+    https.request({
+        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 = [];
+
+    {
+        function reqListener(req: http.IncomingMessage, res: http.ServerResponse): void {}
+
+        class MyIncomingMessage extends http.IncomingMessage {
+            foo: number;
+        }
+
+        class MyServerResponse extends http.ServerResponse {
+            foo: string;
+        }
+
+        let server = new https.Server({ IncomingMessage: MyIncomingMessage});
+
+        server = new https.Server({
+            IncomingMessage: MyIncomingMessage,
+            ServerResponse: MyServerResponse
+        }, reqListener);
+
+        server = https.createServer({ IncomingMessage: MyIncomingMessage });
+        server = https.createServer({ ServerResponse: MyServerResponse }, reqListener);
+
+        const timeout: number = server.timeout;
+        const listening: boolean = server.listening;
+        const keepAliveTimeout: number = server.keepAliveTimeout;
+        server.setTimeout().setTimeout(1000).setTimeout(() => {}).setTimeout(100, () => {});
+    }
+}
+
+////////////////////////////////////////////////////
+/// TTY tests : http://nodejs.org/api/tty.html
+////////////////////////////////////////////////////
+
+{
+    const rs: tty.ReadStream = new tty.ReadStream();
+    const ws: tty.WriteStream = new tty.WriteStream();
+
+    const rsIsRaw: boolean = rs.isRaw;
+    rs.setRawMode(true);
+
+    const wsColumns: number = ws.columns;
+    const wsRows: number = ws.rows;
+
+    const isTTY: boolean = tty.isatty(1);
+}
+
+////////////////////////////////////////////////////
+/// Dgram tests : http://nodejs.org/api/dgram.html
+////////////////////////////////////////////////////
+
+{
+    {
+        let ds: dgram.Socket = dgram.createSocket("udp4", (msg: Buffer, rinfo: dgram.RemoteInfo): void => {
+        });
+        ds.bind();
+        ds.bind(41234);
+        ds.bind(4123, 'localhost');
+        ds.bind(4123, 'localhost', () => { });
+        ds.bind(4123, () => { });
+        ds.bind(() => { });
+        const addr: net.AddressInfo | string = ds.address();
+        ds.send(new Buffer("hello"), 0, 5, 5000, "127.0.0.1", (error: Error, bytes: number): void => {
+        });
+        ds.send(new Buffer("hello"), 5000, "127.0.0.1");
+        ds.setMulticastInterface("127.0.0.1");
+        ds = dgram.createSocket({ type: "udp4", reuseAddr: true, recvBufferSize: 1000, sendBufferSize: 1000, lookup: dns.lookup });
+    }
+
+    {
+        let _socket: dgram.Socket;
+        let _boolean: boolean;
+        const _err: Error = new Error();
+        const _str = '';
+        const _rinfo: net.AddressInfo = {
+            address: 'asd',
+            family: 'asd',
+            port: 1,
+        };
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. error
+         * 3. listening
+         * 4. message
+         */
+
+        _socket = _socket.addListener("close", () => { });
+        _socket = _socket.addListener("error", (err) => {
+            const _err: Error = err;
+        });
+        _socket = _socket.addListener("listening", () => { });
+        _socket = _socket.addListener("message", (msg, rinfo) => {
+            const _msg: Buffer = msg;
+            const _rinfo: net.AddressInfo = rinfo;
+        });
+
+        _boolean = _socket.emit("close");
+        _boolean = _socket.emit("error", _err);
+        _boolean = _socket.emit("listening");
+        _boolean = _socket.emit("message", _str, _rinfo);
+
+        _socket = _socket.on("close", () => { });
+        _socket = _socket.on("error", (err) => {
+            const _err: Error = err;
+        });
+        _socket = _socket.on("listening", () => { });
+        _socket = _socket.on("message", (msg, rinfo) => {
+            const _msg: Buffer = msg;
+            const _rinfo: net.AddressInfo = rinfo;
+        });
+
+        _socket = _socket.once("close", () => { });
+        _socket = _socket.once("error", (err) => {
+            const _err: Error = err;
+        });
+        _socket = _socket.once("listening", () => { });
+        _socket = _socket.once("message", (msg, rinfo) => {
+            const _msg: Buffer = msg;
+            const _rinfo: net.AddressInfo = rinfo;
+        });
+
+        _socket = _socket.prependListener("close", () => { });
+        _socket = _socket.prependListener("error", (err) => {
+            const _err: Error = err;
+        });
+        _socket = _socket.prependListener("listening", () => { });
+        _socket = _socket.prependListener("message", (msg, rinfo) => {
+            const _msg: Buffer = msg;
+            const _rinfo: net.AddressInfo = rinfo;
+        });
+
+        _socket = _socket.prependOnceListener("close", () => { });
+        _socket = _socket.prependOnceListener("error", (err) => {
+            const _err: Error = err;
+        });
+        _socket = _socket.prependOnceListener("listening", () => { });
+        _socket = _socket.prependOnceListener("message", (msg, rinfo) => {
+            const _msg: Buffer = msg;
+            const _rinfo: net.AddressInfo = rinfo;
+        });
+    }
+
+    {
+        const ds: dgram.Socket = dgram.createSocket({
+            type: 'udp4',
+            recvBufferSize: 10000,
+            sendBufferSize: 15000
+        });
+
+        let size: number;
+        size = ds.getRecvBufferSize();
+        ds.setRecvBufferSize(size);
+        size = ds.getSendBufferSize();
+        ds.setSendBufferSize(size);
+    }
+}
+
+////////////////////////////////////////////////////
+/// Querystring tests : https://nodejs.org/api/querystring.html
+////////////////////////////////////////////////////
+
+{
+    interface SampleObject { a: string; }
+
+    {
+        const obj: SampleObject = { a: "" };
+        const sep = '';
+        const eq = '';
+        const options: querystring.StringifyOptions = {};
+        let result: string;
+
+        result = querystring.stringify(obj);
+        result = querystring.stringify(obj, sep);
+        result = querystring.stringify(obj, sep, eq);
+        result = querystring.stringify(obj, sep, eq);
+        result = querystring.stringify(obj, sep, eq, options);
+    }
+
+    {
+        const str = '';
+        const sep = '';
+        const eq = '';
+        const options: querystring.ParseOptions = {};
+        let result: querystring.ParsedUrlQuery;
+
+        result = querystring.parse(str);
+        result = querystring.parse(str, sep);
+        result = querystring.parse(str, sep, eq);
+        result = querystring.parse(str, sep, eq, options);
+    }
+
+    {
+        const str = '';
+        let result: string;
+
+        result = querystring.escape(str);
+        result = querystring.unescape(str);
+    }
+}
+
+////////////////////////////////////////////////////
+/// path tests : http://nodejs.org/api/path.html
+////////////////////////////////////////////////////
+
+{
+    path.normalize('/foo/bar//baz/asdf/quux/..');
+
+    path.join('/foo', 'bar', 'baz/asdf', 'quux', '..');
+    // returns
+    // '/foo/bar/baz/asdf'
+
+    try {
+        path.join('foo', 'bar');
+    } catch (error) { }
+
+    path.resolve('foo/bar', '/tmp/file/', '..', 'a/../subfile');
+    // Is similar to:
+    //
+    // cd foo/bar
+    // cd /tmp/file/
+    // cd ..
+    //    cd a/../subfile
+    // pwd
+
+    path.resolve('/foo/bar', './baz');
+    // returns
+    //    '/foo/bar/baz'
+
+    path.resolve('/foo/bar', '/tmp/file/');
+    // returns
+    //    '/tmp/file'
+
+    path.resolve('wwwroot', 'static_files/png/', '../gif/image.gif');
+    // if currently in /home/myself/node, it returns
+    //    '/home/myself/node/wwwroot/static_files/gif/image.gif'
+
+    path.isAbsolute('/foo/bar'); // true
+    path.isAbsolute('/baz/..');  // true
+    path.isAbsolute('qux/');     // false
+    path.isAbsolute('.');        // false
+
+    path.isAbsolute('//server');  // true
+    path.isAbsolute('C:/foo/..'); // true
+    path.isAbsolute('bar\\baz');   // false
+    path.isAbsolute('.');         // false
+
+    path.relative('C:\\orandea\\test\\aaa', 'C:\\orandea\\impl\\bbb');
+    // returns
+    //    '..\\..\\impl\\bbb'
+
+    path.relative('/data/orandea/test/aaa', '/data/orandea/impl/bbb');
+    // returns
+    //    '../../impl/bbb'
+
+    path.dirname('/foo/bar/baz/asdf/quux');
+    // returns
+    //    '/foo/bar/baz/asdf'
+
+    path.basename('/foo/bar/baz/asdf/quux.html');
+    // returns
+    //    'quux.html'
+
+    path.basename('/foo/bar/baz/asdf/quux.html', '.html');
+    // returns
+    //    'quux'
+
+    path.extname('index.html');
+    // returns
+    //    '.html'
+
+    path.extname('index.coffee.md');
+    // returns
+    //    '.md'
+
+    path.extname('index.');
+    // returns
+    //    '.'
+
+    path.extname('index');
+    // returns
+    //    ''
+
+    'foo/bar/baz'.split(path.sep);
+    // returns
+    //        ['foo', 'bar', 'baz']
+
+    'foo\\bar\\baz'.split(path.sep);
+    // returns
+    //        ['foo', 'bar', 'baz']
+
+    process.env["PATH"]; // $ExpectType string
+
+    path.parse('/home/user/dir/file.txt');
+    // returns
+    //    {
+    //        root : "/",
+    //        dir : "/home/user/dir",
+    //        base : "file.txt",
+    //        ext : ".txt",
+    //        name : "file"
+    //    }
+
+    path.parse('C:\\path\\dir\\index.html');
+    // returns
+    //    {
+    //        root : "C:\",
+    //        dir : "C:\path\dir",
+    //        base : "index.html",
+    //        ext : ".html",
+    //        name : "index"
+    //    }
+
+    path.format({
+        root: "/",
+        dir: "/home/user/dir",
+        base: "file.txt",
+        ext: ".txt",
+        name: "file"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.format({
+        root: "/",
+        dir: "/home/user/dir",
+        ext: ".txt",
+        name: "file"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.format({
+        dir: "/home/user/dir",
+        base: "file.txt"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.posix.format({
+        root: "/",
+        dir: "/home/user/dir",
+        base: "file.txt",
+        ext: ".txt",
+        name: "file"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.posix.format({
+        dir: "/home/user/dir",
+        base: "file.txt"
+    });
+    // returns
+    //    '/home/user/dir/file.txt'
+
+    path.win32.format({
+        root: "C:\\",
+        dir: "C:\\home\\user\\dir",
+        ext: ".txt",
+        name: "file"
+    });
+    // returns
+    //    'C:\home\user\dir\file.txt'
+
+    path.win32.format({
+        dir: "C:\\home\\user\\dir",
+        base: "file.txt"
+    });
+    // returns
+    //    'C:\home\user\dir\file.txt'
+}
+
+////////////////////////////////////////////////////
+/// readline tests : https://nodejs.org/api/readline.html
+////////////////////////////////////////////////////
+
+{
+    const rl: readline.ReadLine = readline.createInterface(new stream.Readable());
+
+    {
+        const options: readline.ReadLineOptions = {
+            input: new fs.ReadStream()
+        };
+        const input: NodeJS.ReadableStream = new stream.Readable();
+        const output: NodeJS.WritableStream = new stream.Writable();
+        const completer: readline.Completer = str => [['asd'], 'asd'];
+        const terminal = false;
+
+        let result: readline.ReadLine;
+
+        result = readline.createInterface(options);
+        result = readline.createInterface(input);
+        result = readline.createInterface(input, output);
+        result = readline.createInterface(input, output, completer);
+        result = readline.createInterface(input, output, completer, terminal);
+        result = readline.createInterface({
+            input,
+            completer(str: string): readline.CompleterResult {
+                return [['test'], 'test'];
+            }
+        });
+        result = readline.createInterface({
+            input,
+            completer(str: string, callback: (err: any, result: readline.CompleterResult) => void): any {
+                callback(null, [['test'], 'test']);
+            }
+        });
+    }
+
+    {
+        rl.setPrompt("prompt");
+    }
+
+    {
+        rl.prompt();
+        rl.prompt(true);
+    }
+
+    {
+        rl.question("query", (answer: string) => {});
+    }
+
+    {
+        let result: readline.ReadLine;
+
+        result = rl.pause();
+    }
+
+    {
+        let result: readline.ReadLine;
+
+        result = rl.resume();
+    }
+
+    {
+        rl.close();
+    }
+
+    {
+        const data: string | Buffer = "asd";
+        const key: readline.Key = {};
+
+        rl.write(data);
+        rl.write(null, key);
+    }
+
+    {
+        const strm: NodeJS.WritableStream = new stream.Writable();
+        const x = 1;
+        const y = 1;
+
+        readline.cursorTo(strm, x);
+        readline.cursorTo(strm, x, y);
+    }
+
+    {
+        const strm: NodeJS.ReadableStream = new stream.Readable();
+        const readLineInterface: readline.ReadLine = readline.createInterface(new stream.Readable());
+
+        readline.emitKeypressEvents(strm);
+        readline.emitKeypressEvents(strm, readLineInterface);
+    }
+
+    {
+        const strm: NodeJS.WritableStream = new stream.Writable();
+        const dx: number | string = 1;
+        const dy: number | string = 1;
+
+        readline.moveCursor(strm, dx, dy);
+    }
+
+    {
+        const strm: NodeJS.WritableStream = new stream.Writable();
+        readline.clearLine(strm, 1);
+    }
+
+    {
+        const strm: NodeJS.WritableStream = new stream.Writable();
+
+        readline.clearScreenDown(strm);
+    }
+
+    {
+        let _rl: readline.ReadLine;
+        let _boolean: boolean;
+
+        _rl = _rl.addListener("close", () => { });
+        _rl = _rl.addListener("line", (input) => {
+            const _input: any = input;
+        });
+        _rl = _rl.addListener("pause", () => { });
+        _rl = _rl.addListener("resume", () => { });
+        _rl = _rl.addListener("SIGCONT", () => { });
+        _rl = _rl.addListener("SIGINT", () => { });
+        _rl = _rl.addListener("SIGTSTP", () => { });
+
+        _boolean = _rl.emit("close", () => { });
+        _boolean = _rl.emit("line", () => { });
+        _boolean = _rl.emit("pause", () => { });
+        _boolean = _rl.emit("resume", () => { });
+        _boolean = _rl.emit("SIGCONT", () => { });
+        _boolean = _rl.emit("SIGINT", () => { });
+        _boolean = _rl.emit("SIGTSTP", () => { });
+
+        _rl = _rl.on("close", () => { });
+        _rl = _rl.on("line", (input) => {
+            const _input: any = input;
+        });
+        _rl = _rl.on("pause", () => { });
+        _rl = _rl.on("resume", () => { });
+        _rl = _rl.on("SIGCONT", () => { });
+        _rl = _rl.on("SIGINT", () => { });
+        _rl = _rl.on("SIGTSTP", () => { });
+
+        _rl = _rl.once("close", () => { });
+        _rl = _rl.once("line", (input) => {
+            const _input: any = input;
+        });
+        _rl = _rl.once("pause", () => { });
+        _rl = _rl.once("resume", () => { });
+        _rl = _rl.once("SIGCONT", () => { });
+        _rl = _rl.once("SIGINT", () => { });
+        _rl = _rl.once("SIGTSTP", () => { });
+
+        _rl = _rl.prependListener("close", () => { });
+        _rl = _rl.prependListener("line", (input) => {
+            const _input: any = input;
+        });
+        _rl = _rl.prependListener("pause", () => { });
+        _rl = _rl.prependListener("resume", () => { });
+        _rl = _rl.prependListener("SIGCONT", () => { });
+        _rl = _rl.prependListener("SIGINT", () => { });
+        _rl = _rl.prependListener("SIGTSTP", () => { });
+
+        _rl = _rl.prependOnceListener("close", () => { });
+        _rl = _rl.prependOnceListener("line", (input) => {
+            const _input: any = input;
+        });
+        _rl = _rl.prependOnceListener("pause", () => { });
+        _rl = _rl.prependOnceListener("resume", () => { });
+        _rl = _rl.prependOnceListener("SIGCONT", () => { });
+        _rl = _rl.prependOnceListener("SIGINT", () => { });
+        _rl = _rl.prependOnceListener("SIGTSTP", () => { });
+    }
+}
+
+////////////////////////////////////////////////////
+/// string_decoder tests : https://nodejs.org/api/string_decoder.html
+////////////////////////////////////////////////////
+
+{
+    const StringDecoder = string_decoder.StringDecoder;
+    const buffer = new Buffer('test');
+    const decoder1 = new StringDecoder();
+    const decoder2 = new StringDecoder('utf8');
+    const part1: string = decoder1.write(new Buffer('test'));
+    const end1: string = decoder1.end();
+    const part2: string = decoder2.write(new Buffer('test'));
+    const end2: string = decoder1.end(new Buffer('test'));
+}
+
+//////////////////////////////////////////////////////////////////////
+/// Child Process tests: https://nodejs.org/api/child_process.html ///
+//////////////////////////////////////////////////////////////////////
+
+{
+    {
+        childProcess.exec("echo test");
+        childProcess.exec("echo test", { windowsHide: true });
+        childProcess.spawn("echo");
+        childProcess.spawn("echo", { 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"});
+        childProcess.spawnSync("echo test", {input: new Uint8Array([])});
+        childProcess.spawnSync("echo test", {input: new DataView(new ArrayBuffer(1))});
+    }
+
+    {
+        childProcess.execFile("npm", () => {});
+        childProcess.execFile("npm", { windowsHide: true }, () => {});
+        childProcess.execFile("npm", ["-v"], () => {});
+        childProcess.execFile("npm", ["-v"], { windowsHide: true, encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
+        childProcess.execFile("npm", ["-v"], { windowsHide: true, encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
+        childProcess.execFile("npm", { encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
+        childProcess.execFile("npm", { encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
+    }
+
+    {
+        childProcess.execFileSync("echo test", {input: new Uint8Array([])});
+        childProcess.execFileSync("echo test", {input: new DataView(new ArrayBuffer(1))});
+    }
+
+    async function testPromisify() {
+        const execFile = util.promisify(childProcess.execFile);
+        let r: { stdout: string | Buffer, stderr: string | Buffer } = await execFile("npm");
+        r = await execFile("npm", ["-v"]);
+        r = await execFile("npm", ["-v"], { encoding: 'utf-8' });
+        r = await execFile("npm", ["-v"], { encoding: 'buffer' });
+        r = await execFile("npm", { encoding: 'utf-8' });
+        r = await execFile("npm", { encoding: 'buffer' });
+    }
+
+    {
+        let _cp: childProcess.ChildProcess;
+        const _socket: net.Socket = net.createConnection(1);
+        const _server: net.Server = net.createServer();
+        let _boolean: boolean;
+
+        _boolean = _cp.send(1);
+        _boolean = _cp.send('one');
+        _boolean = _cp.send({
+            type: 'test'
+        });
+
+        _boolean = _cp.send(1, (error) => {
+            const _err: Error = error;
+        });
+        _boolean = _cp.send('one', (error) => {
+            const _err: Error = error;
+        });
+        _boolean = _cp.send({
+            type: 'test'
+        }, (error) => {
+            const _err: Error = error;
+        });
+
+        _boolean = _cp.send(1, _socket);
+        _boolean = _cp.send('one', _socket);
+        _boolean = _cp.send({
+            type: 'test'
+        }, _socket);
+
+        _boolean = _cp.send(1, _socket, (error) => {
+            const _err: Error = error;
+        });
+        _boolean = _cp.send('one', _socket, (error) => {
+            const _err: Error = error;
+        });
+        _boolean = _cp.send({
+            type: 'test'
+        }, _socket, (error) => {
+            const _err: Error = error;
+        });
+
+        _boolean = _cp.send(1, _socket, {
+            keepOpen: true
+        });
+        _boolean = _cp.send('one', _socket, {
+            keepOpen: true
+        });
+        _boolean = _cp.send({
+            type: 'test'
+        }, _socket, {
+                keepOpen: true
+            });
+
+        _boolean = _cp.send(1, _socket, {
+            keepOpen: true
+        }, (error) => {
+            const _err: Error = error;
+        });
+        _boolean = _cp.send('one', _socket, {
+            keepOpen: true
+        }, (error) => {
+            const _err: Error = error;
+        });
+        _boolean = _cp.send({
+            type: 'test'
+        }, _socket, {
+                keepOpen: true
+            }, (error) => {
+                const _err: Error = error;
+            });
+
+        _boolean = _cp.send(1, _server);
+        _boolean = _cp.send('one', _server);
+        _boolean = _cp.send({
+            type: 'test'
+        }, _server);
+
+        _boolean = _cp.send(1, _server, (error) => {
+            const _err: Error = error;
+        });
+        _boolean = _cp.send('one', _server, (error) => {
+            const _err: Error = error;
+        });
+        _boolean = _cp.send({
+            type: 'test'
+        }, _server, (error) => {
+            const _err: Error = error;
+        });
+
+        _boolean = _cp.send(1, _server, {
+            keepOpen: true
+        });
+        _boolean = _cp.send('one', _server, {
+            keepOpen: true
+        });
+        _boolean = _cp.send({
+            type: 'test'
+        }, _server, {
+                keepOpen: true
+            });
+
+        _boolean = _cp.send(1, _server, {
+            keepOpen: true
+        }, (error) => {
+            const _err: Error = error;
+        });
+        _boolean = _cp.send('one', _server, {
+            keepOpen: true
+        }, (error) => {
+            const _err: Error = error;
+        });
+        _boolean = _cp.send({
+            type: 'test'
+        }, _server, {
+                keepOpen: true
+            }, (error) => {
+                const _err: Error = error;
+            });
+
+        _cp = _cp.addListener("close", (code, signal) => {
+            const _code: number = code;
+            const _signal: string = signal;
+        });
+        _cp = _cp.addListener("disconnect", () => { });
+        _cp = _cp.addListener("error", (err) => {
+            const _err: Error = err;
+        });
+        _cp = _cp.addListener("exit", (code, signal) => {
+            const _code: number = code;
+            const _signal: string = signal;
+        });
+        _cp = _cp.addListener("message", (message, sendHandle) => {
+            const _message: any = message;
+            const _sendHandle: net.Socket | net.Server = sendHandle;
+        });
+
+        _boolean = _cp.emit("close", () => { });
+        _boolean = _cp.emit("disconnect", () => { });
+        _boolean = _cp.emit("error", () => { });
+        _boolean = _cp.emit("exit", () => { });
+        _boolean = _cp.emit("message", () => { });
+
+        _cp = _cp.on("close", (code, signal) => {
+            const _code: number = code;
+            const _signal: string = signal;
+        });
+        _cp = _cp.on("disconnect", () => { });
+        _cp = _cp.on("error", (err) => {
+            const _err: Error = err;
+        });
+        _cp = _cp.on("exit", (code, signal) => {
+            const _code: number = code;
+            const _signal: string = signal;
+        });
+        _cp = _cp.on("message", (message, sendHandle) => {
+            const _message: any = message;
+            const _sendHandle: net.Socket | net.Server = sendHandle;
+        });
+
+        _cp = _cp.once("close", (code, signal) => {
+            const _code: number = code;
+            const _signal: string = signal;
+        });
+        _cp = _cp.once("disconnect", () => { });
+        _cp = _cp.once("error", (err) => {
+            const _err: Error = err;
+        });
+        _cp = _cp.once("exit", (code, signal) => {
+            const _code: number = code;
+            const _signal: string = signal;
+        });
+        _cp = _cp.once("message", (message, sendHandle) => {
+            const _message: any = message;
+            const _sendHandle: net.Socket | net.Server = sendHandle;
+        });
+
+        _cp = _cp.prependListener("close", (code, signal) => {
+            const _code: number = code;
+            const _signal: string = signal;
+        });
+        _cp = _cp.prependListener("disconnect", () => { });
+        _cp = _cp.prependListener("error", (err) => {
+            const _err: Error = err;
+        });
+        _cp = _cp.prependListener("exit", (code, signal) => {
+            const _code: number = code;
+            const _signal: string = signal;
+        });
+        _cp = _cp.prependListener("message", (message, sendHandle) => {
+            const _message: any = message;
+            const _sendHandle: net.Socket | net.Server = sendHandle;
+        });
+
+        _cp = _cp.prependOnceListener("close", (code, signal) => {
+            const _code: number = code;
+            const _signal: string = signal;
+        });
+        _cp = _cp.prependOnceListener("disconnect", () => { });
+        _cp = _cp.prependOnceListener("error", (err) => {
+            const _err: Error = err;
+        });
+        _cp = _cp.prependOnceListener("exit", (code, signal) => {
+            const _code: number = code;
+            const _signal: string = signal;
+        });
+        _cp = _cp.prependOnceListener("message", (message, sendHandle) => {
+            const _message: any = message;
+            const _sendHandle: net.Socket | net.Server = sendHandle;
+        });
+    }
+    {
+        process.stdin.setEncoding('utf8');
+
+        process.stdin.on('readable', () => {
+            const chunk = process.stdin.read();
+            if (chunk !== null) {
+              process.stdout.write(`data: ${chunk}`);
+            }
+        });
+
+        process.stdin.on('end', () => {
+            process.stdout.write('end');
+        });
+
+        process.stdin.pipe(process.stdout);
+
+        console.log(process.stdin.isTTY);
+        console.log(process.stdout.isTTY);
+
+        console.log(process.stdin instanceof net.Socket);
+        console.log(process.stdout instanceof fs.ReadStream);
+
+        const stdin: stream.Readable = process.stdin;
+        console.log(stdin instanceof net.Socket);
+        console.log(stdin instanceof fs.ReadStream);
+
+        const stdout: stream.Writable = process.stdout;
+        console.log(stdout instanceof net.Socket);
+        console.log(stdout instanceof fs.WriteStream);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////
+/// cluster tests: https://nodejs.org/api/cluster.html ///
+//////////////////////////////////////////////////////////////////////
+
+{
+    {
+        cluster.fork();
+        Object.keys(cluster.workers).forEach(key => {
+            const worker = cluster.workers[key];
+            if (worker.isDead()) {
+                console.log('worker %d is dead', worker.process.pid);
+            }
+        });
+    }
+}
+
+//////////////////////////////////////////////////////////////////////
+/// worker_threads tests: https://nodejs.org/api/worker_threads.html ///
+//////////////////////////////////////////////////////////////////////
+
+{
+    {
+        if (workerThreads.isMainThread) {
+            module.exports = async function parseJSAsync(script: string) {
+                return new Promise((resolve, reject) => {
+                    const worker = new workerThreads.Worker(__filename, {
+                        workerData: script
+                    });
+                    worker.on('message', resolve);
+                    worker.on('error', reject);
+                    worker.on('exit', (code) => {
+                        if (code !== 0)
+                            reject(new Error(`Worker stopped with exit code ${code}`));
+                    });
+                });
+            };
+        } else {
+            const script = workerThreads.workerData;
+            workerThreads.parentPort.postMessage(script);
+        }
+    }
+
+    {
+        const { port1, port2 } = new workerThreads.MessageChannel();
+        port1.on('message', (message) => console.log('received', message));
+        port2.postMessage({ foo: 'bar' });
+    }
+
+    {
+        if (workerThreads.isMainThread) {
+            const worker = new workerThreads.Worker(__filename);
+            const subChannel = new workerThreads.MessageChannel();
+            worker.postMessage({ hereIsYourPort: subChannel.port1 }, [subChannel.port1]);
+            subChannel.port2.on('message', (value) => {
+                console.log('received:', value);
+            });
+        } else {
+            workerThreads.parentPort.once('message', (value) => {
+                assert(value.hereIsYourPort instanceof MessagePort);
+                value.hereIsYourPort.postMessage('the worker is sending this');
+                value.hereIsYourPort.close();
+            });
+        }
+    }
+}
+
+////////////////////////////////////////////////////
+/// os tests : https://nodejs.org/api/os.html
+////////////////////////////////////////////////////
+
+{
+    {
+        let result: string;
+
+        result = os.tmpdir();
+        result = os.homedir();
+        result = os.endianness();
+        result = os.hostname();
+        result = os.type();
+        result = os.arch();
+        result = os.release();
+        result = os.EOL;
+    }
+
+    {
+        let result: number;
+
+        result = os.uptime();
+        result = os.totalmem();
+        result = os.freemem();
+    }
+
+    {
+        let result: number[];
+
+        result = os.loadavg();
+    }
+
+    {
+        let result: os.CpuInfo[];
+
+        result = os.cpus();
+    }
+
+    {
+        let result: { [index: string]: os.NetworkInterfaceInfo[] };
+
+        result = os.networkInterfaces();
+    }
+
+    {
+        let result: number;
+
+        result = os.constants.signals.SIGHUP;
+        result = os.constants.signals.SIGINT;
+        result = os.constants.signals.SIGQUIT;
+        result = os.constants.signals.SIGILL;
+        result = os.constants.signals.SIGTRAP;
+        result = os.constants.signals.SIGABRT;
+        result = os.constants.signals.SIGIOT;
+        result = os.constants.signals.SIGBUS;
+        result = os.constants.signals.SIGFPE;
+        result = os.constants.signals.SIGKILL;
+        result = os.constants.signals.SIGUSR1;
+        result = os.constants.signals.SIGSEGV;
+        result = os.constants.signals.SIGUSR2;
+        result = os.constants.signals.SIGPIPE;
+        result = os.constants.signals.SIGALRM;
+        result = os.constants.signals.SIGTERM;
+        result = os.constants.signals.SIGCHLD;
+        result = os.constants.signals.SIGSTKFLT;
+        result = os.constants.signals.SIGCONT;
+        result = os.constants.signals.SIGSTOP;
+        result = os.constants.signals.SIGTSTP;
+        result = os.constants.signals.SIGTTIN;
+        result = os.constants.signals.SIGTTOU;
+        result = os.constants.signals.SIGURG;
+        result = os.constants.signals.SIGXCPU;
+        result = os.constants.signals.SIGXFSZ;
+        result = os.constants.signals.SIGVTALRM;
+        result = os.constants.signals.SIGPROF;
+        result = os.constants.signals.SIGWINCH;
+        result = os.constants.signals.SIGIO;
+        result = os.constants.signals.SIGPOLL;
+        result = os.constants.signals.SIGPWR;
+        result = os.constants.signals.SIGSYS;
+        result = os.constants.signals.SIGUNUSED;
+    }
+
+    {
+        let result: number;
+
+        result = os.constants.errno.E2BIG;
+        result = os.constants.errno.EACCES;
+        result = os.constants.errno.EADDRINUSE;
+        result = os.constants.errno.EADDRNOTAVAIL;
+        result = os.constants.errno.EAFNOSUPPORT;
+        result = os.constants.errno.EAGAIN;
+        result = os.constants.errno.EALREADY;
+        result = os.constants.errno.EBADF;
+        result = os.constants.errno.EBADMSG;
+        result = os.constants.errno.EBUSY;
+        result = os.constants.errno.ECANCELED;
+        result = os.constants.errno.ECHILD;
+        result = os.constants.errno.ECONNABORTED;
+        result = os.constants.errno.ECONNREFUSED;
+        result = os.constants.errno.ECONNRESET;
+        result = os.constants.errno.EDEADLK;
+        result = os.constants.errno.EDESTADDRREQ;
+        result = os.constants.errno.EDOM;
+        result = os.constants.errno.EDQUOT;
+        result = os.constants.errno.EEXIST;
+        result = os.constants.errno.EFAULT;
+        result = os.constants.errno.EFBIG;
+        result = os.constants.errno.EHOSTUNREACH;
+        result = os.constants.errno.EIDRM;
+        result = os.constants.errno.EILSEQ;
+        result = os.constants.errno.EINPROGRESS;
+        result = os.constants.errno.EINTR;
+        result = os.constants.errno.EINVAL;
+        result = os.constants.errno.EIO;
+        result = os.constants.errno.EISCONN;
+        result = os.constants.errno.EISDIR;
+        result = os.constants.errno.ELOOP;
+        result = os.constants.errno.EMFILE;
+        result = os.constants.errno.EMLINK;
+        result = os.constants.errno.EMSGSIZE;
+        result = os.constants.errno.EMULTIHOP;
+        result = os.constants.errno.ENAMETOOLONG;
+        result = os.constants.errno.ENETDOWN;
+        result = os.constants.errno.ENETRESET;
+        result = os.constants.errno.ENETUNREACH;
+        result = os.constants.errno.ENFILE;
+        result = os.constants.errno.ENOBUFS;
+        result = os.constants.errno.ENODATA;
+        result = os.constants.errno.ENODEV;
+        result = os.constants.errno.ENOENT;
+        result = os.constants.errno.ENOEXEC;
+        result = os.constants.errno.ENOLCK;
+        result = os.constants.errno.ENOLINK;
+        result = os.constants.errno.ENOMEM;
+        result = os.constants.errno.ENOMSG;
+        result = os.constants.errno.ENOPROTOOPT;
+        result = os.constants.errno.ENOSPC;
+        result = os.constants.errno.ENOSR;
+        result = os.constants.errno.ENOSTR;
+        result = os.constants.errno.ENOSYS;
+        result = os.constants.errno.ENOTCONN;
+        result = os.constants.errno.ENOTDIR;
+        result = os.constants.errno.ENOTEMPTY;
+        result = os.constants.errno.ENOTSOCK;
+        result = os.constants.errno.ENOTSUP;
+        result = os.constants.errno.ENOTTY;
+        result = os.constants.errno.ENXIO;
+        result = os.constants.errno.EOPNOTSUPP;
+        result = os.constants.errno.EOVERFLOW;
+        result = os.constants.errno.EPERM;
+        result = os.constants.errno.EPIPE;
+        result = os.constants.errno.EPROTO;
+        result = os.constants.errno.EPROTONOSUPPORT;
+        result = os.constants.errno.EPROTOTYPE;
+        result = os.constants.errno.ERANGE;
+        result = os.constants.errno.EROFS;
+        result = os.constants.errno.ESPIPE;
+        result = os.constants.errno.ESRCH;
+        result = os.constants.errno.ESTALE;
+        result = os.constants.errno.ETIME;
+        result = os.constants.errno.ETIMEDOUT;
+        result = os.constants.errno.ETXTBSY;
+        result = os.constants.errno.EWOULDBLOCK;
+        result = os.constants.errno.EXDEV;
+    }
+
+    {
+        const prio = os.getPriority();
+        os.setPriority(prio + 1);
+
+        const prio2 = os.getPriority(1);
+        os.setPriority(2, prio + 1);
+
+        os.setPriority(os.constants.priority.PRIORITY_LOW);
+    }
+}
+
+////////////////////////////////////////////////////
+/// vm tests : https://nodejs.org/api/vm.html
+////////////////////////////////////////////////////
+
+{
+    {
+        const sandbox = {
+            animal: 'cat',
+            count: 2
+        };
+
+        const context = vm.createContext(sandbox);
+        console.log(vm.isContext(context));
+        const script = new vm.Script('count += 1; name = "kitty"');
+
+        for (let i = 0; i < 10; ++i) {
+            script.runInContext(context);
+        }
+
+        console.log(util.inspect(sandbox));
+
+        vm.runInNewContext('count += 1; name = "kitty"', sandbox);
+        console.log(util.inspect(sandbox));
+    }
+
+    {
+        const sandboxes = [{}, {}, {}];
+
+        const script = new vm.Script('globalVar = "set"');
+
+        sandboxes.forEach((sandbox) => {
+            script.runInNewContext(sandbox);
+            script.runInThisContext();
+        });
+
+        console.log(util.inspect(sandboxes));
+
+        const localVar = 'initial value';
+        vm.runInThisContext('localVar = "vm";');
+
+        console.log(localVar);
+    }
+
+    {
+        vm.runInThisContext('console.log("hello world"', './my-file.js');
+    }
+
+    {
+        const fn: Function = vm.compileFunction('console.log("test")', [], {
+            parsingContext: vm.createContext(),
+            contextExtensions: [{
+                a: 1,
+            }],
+            produceCachedData: false,
+            cachedData: Buffer.from('nope'),
+        });
+    }
+}
+
+/////////////////////////////////////////////////////
+/// Timers tests : https://nodejs.org/api/timers.html
+/////////////////////////////////////////////////////
+
+{
+    {
+        const immediateId = timers.setImmediate(() => { console.log("immediate"); });
+        timers.clearImmediate(immediateId);
+    }
+    {
+        const counter = 0;
+        const timeout = timers.setInterval(() => { console.log("interval"); }, 20);
+        timeout.unref();
+        timeout.ref();
+        timers.clearInterval(timeout);
+    }
+    {
+        const counter = 0;
+        const timeout = timers.setTimeout(() => { console.log("timeout"); }, 20);
+        timeout.unref();
+        timeout.ref();
+        timers.clearTimeout(timeout);
+    }
+    async function testPromisify() {
+        const setTimeout = util.promisify(timers.setTimeout);
+        let v: void = await setTimeout(100); // tslint:disable-line no-void-expression void-return
+        let s: string = await setTimeout(100, "");
+
+        const setImmediate = util.promisify(timers.setImmediate);
+        v = await setImmediate(); // tslint:disable-line no-void-expression
+        s = await setImmediate("");
+    }
+}
+
+/////////////////////////////////////////////////////////
+/// Errors Tests : https://nodejs.org/api/errors.html ///
+/////////////////////////////////////////////////////////
+
+{
+    {
+        Error.stackTraceLimit = Infinity;
+    }
+    {
+        const myObject = {};
+        Error.captureStackTrace(myObject);
+    }
+    {
+        const frames: NodeJS.CallSite[] = [];
+        Error.prepareStackTrace(new Error(), frames);
+    }
+    {
+        const frame: NodeJS.CallSite = null;
+        const frameThis: any = frame.getThis();
+        const typeName: string = frame.getTypeName();
+        const func: Function = frame.getFunction();
+        const funcName: string = frame.getFunctionName();
+        const meth: string = frame.getMethodName();
+        const fname: string = frame.getFileName();
+        const lineno: number = frame.getLineNumber();
+        const colno: number = frame.getColumnNumber();
+        const evalOrigin: string = frame.getEvalOrigin();
+        const isTop: boolean = frame.isToplevel();
+        const isEval: boolean = frame.isEval();
+        const isNative: boolean = frame.isNative();
+        const isConstr: boolean = frame.isConstructor();
+    }
+}
+
+///////////////////////////////////////////////////////////
+/// Process Tests : https://nodejs.org/api/process.html ///
+///////////////////////////////////////////////////////////
+
+import * as p from "process";
+{
+    {
+        let eventEmitter: events.EventEmitter;
+        eventEmitter = process;                // Test that process implements EventEmitter...
+
+        let _p: NodeJS.Process = process;
+        _p = p;
+    }
+    {
+        assert(process.argv[0] === process.argv0);
+    }
+    {
+        let module: NodeModule | undefined;
+        module = process.mainModule;
+    }
+    {
+        process.on("message", (req: any) => { });
+        process.addListener("beforeExit", (code: number) => { });
+        process.once("disconnect", () => { });
+        process.prependListener("exit", (code: number) => { });
+        process.prependOnceListener("rejectionHandled", (promise: Promise<any>) => { });
+        process.on("uncaughtException", (error: Error) => { });
+        process.addListener("unhandledRejection", (reason: any, promise: Promise<any>) => { });
+        process.once("warning", (warning: Error) => { });
+        process.prependListener("message", (message: any, sendHandle: any) => { });
+        process.prependOnceListener("SIGBREAK", () => { });
+        process.on("newListener", (event: string | symbol, listener: Function) => { });
+        process.once("removeListener", (event: string | symbol, listener: Function) => { });
+        process.on("multipleResolves", (type: NodeJS.MultipleResolveType, prom: Promise<any>, value: any) => {});
+
+        const listeners = process.listeners('uncaughtException');
+        const oldHandler = listeners[listeners.length - 1];
+        process.addListener('uncaughtException', oldHandler);
+    }
+    {
+        function myCb(err: Error): void {
+        }
+        process.setUncaughtExceptionCaptureCallback(myCb);
+        process.setUncaughtExceptionCaptureCallback(null);
+        const b: boolean = process.hasUncaughtExceptionCaptureCallback();
+    }
+    {
+        // process.allowedNodeEnvironmentFlags.has('asdf');
+    }
+}
+
+///////////////////////////////////////////////////////////
+/// Console Tests : https://nodejs.org/api/console.html ///
+///////////////////////////////////////////////////////////
+
+{
+    {
+        let _c: Console = console;
+        _c = console2;
+    }
+    {
+        const writeStream = fs.createWriteStream('./index.d.ts');
+        let consoleInstance: Console = new console.Console(writeStream);
+
+        consoleInstance = new console.Console(writeStream, writeStream);
+        consoleInstance = new console.Console(writeStream, writeStream, true);
+        consoleInstance = new console.Console({
+            stdout: writeStream,
+            stderr: writeStream,
+            colorMode: 'auto',
+            ignoreErrors: true
+        });
+        consoleInstance = new console.Console({
+            stdout: writeStream,
+            colorMode: false
+        });
+        consoleInstance = new console.Console({
+            stdout: writeStream
+        });
+    }
+    {
+        console.assert('value');
+        console.assert('value', 'message');
+        console.assert('value', 'message', 'foo', 'bar');
+        console.clear();
+        console.count();
+        console.count('label');
+        console.countReset();
+        console.countReset('label');
+        console.debug();
+        console.debug('message');
+        console.debug('message', 'foo', 'bar');
+        console.dir('obj');
+        console.dir('obj', { depth: 1 });
+        console.error();
+        console.error('message');
+        console.error('message', 'foo', 'bar');
+        console.group();
+        console.group('label');
+        console.group('label1', 'label2');
+        console.groupCollapsed();
+        console.groupEnd();
+        console.info();
+        console.info('message');
+        console.info('message', 'foo', 'bar');
+        console.log();
+        console.log('message');
+        console.log('message', 'foo', 'bar');
+        console.table({ foo: 'bar' });
+        console.table([{ foo: 'bar' }]);
+        console.table([{ foo: 'bar' }], ['foo']);
+        console.time();
+        console.time('label');
+        console.timeEnd();
+        console.timeEnd('label');
+        console.timeLog();
+        console.timeLog('label');
+        console.timeLog('label', 'foo', 'bar');
+        console.trace();
+        console.trace('message');
+        console.trace('message', 'foo', 'bar');
+        console.warn();
+        console.warn('message');
+        console.warn('message', 'foo', 'bar');
+
+        // --- Inspector mode only ---
+        console.markTimeline();
+        console.markTimeline('label');
+        console.profile();
+        console.profile('label');
+        console.profileEnd();
+        console.profileEnd('label');
+        console.timeStamp();
+        console.timeStamp('label');
+        console.timeline();
+        console.timeline('label');
+        console.timelineEnd();
+        console.timelineEnd('label');
+    }
+}
+
+///////////////////////////////////////////////////
+/// Net Tests : https://nodejs.org/api/net.html ///
+///////////////////////////////////////////////////
+
+{
+    {
+        const connectOpts: net.NetConnectOpts = {
+            allowHalfOpen: true,
+            family: 4,
+            host: "localhost",
+            port: 443,
+            timeout: 10E3
+        };
+        const socket: net.Socket = net.createConnection(connectOpts, (): void => {
+            // nothing
+        });
+    }
+
+    {
+        let server = net.createServer();
+        // Check methods which return server instances by chaining calls
+        server = server.listen(0)
+            .close()
+            .ref()
+            .unref();
+
+        // close has an optional callback function. No callback parameters are
+        // specified, so any callback function is permissible.
+        server = server.close((...args: any[]) => { });
+
+        // test the types of the address object fields
+        const address: net.AddressInfo | string = server.address();
+    }
+
+    {
+        const constructorOpts: net.SocketConstructorOpts = {
+            fd: 1,
+            allowHalfOpen: false,
+            readable: false,
+            writable: false
+        };
+
+        /**
+         * net.Socket - events.EventEmitter
+         *   1. close
+         *   2. connect
+         *   3. data
+         *   4. drain
+         *   5. end
+         *   6. error
+         *   7. lookup
+         *   8. timeout
+         */
+        let _socket: net.Socket = new net.Socket(constructorOpts);
+
+        let bool: boolean;
+        let buffer: Buffer;
+        let error: Error;
+        let str: string;
+        let num: number;
+
+        const ipcConnectOpts: net.IpcSocketConnectOpts = {
+            path: "/"
+        };
+        const tcpConnectOpts: net.TcpSocketConnectOpts = {
+            family: 4,
+            hints: 0,
+            host: "localhost",
+            localAddress: "10.0.0.1",
+            localPort: 1234,
+            lookup: (_hostname: string, _options: dns.LookupOneOptions, _callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void => {
+                // nothing
+            },
+            port: 80
+        };
+        _socket = _socket.connect(ipcConnectOpts);
+        _socket = _socket.connect(ipcConnectOpts, (): void => {});
+        _socket = _socket.connect(tcpConnectOpts);
+        _socket = _socket.connect(tcpConnectOpts, (): void => {});
+        _socket = _socket.connect(80, "localhost");
+        _socket = _socket.connect(80, "localhost", (): void => {});
+        _socket = _socket.connect(80);
+        _socket = _socket.connect(80, (): void => {});
+
+        /// addListener
+
+        _socket = _socket.addListener("close", had_error => {
+            bool = had_error;
+        });
+        _socket = _socket.addListener("connect", () => { });
+        _socket = _socket.addListener("data", data => {
+            buffer = data;
+        });
+        _socket = _socket.addListener("drain", () => { });
+        _socket = _socket.addListener("end", () => { });
+        _socket = _socket.addListener("error", err => {
+            error = err;
+        });
+        _socket = _socket.addListener("lookup", (err, address, family, host) => {
+            error = err;
+
+            if (typeof family === 'string') {
+                str = family;
+            } else if (typeof family === 'number') {
+                num = family;
+            }
+
+            str = host;
+        });
+        _socket = _socket.addListener("timeout", () => { });
+
+        /// emit
+        bool = _socket.emit("close", bool);
+        bool = _socket.emit("connect");
+        bool = _socket.emit("data", buffer);
+        bool = _socket.emit("drain");
+        bool = _socket.emit("end");
+        bool = _socket.emit("error", error);
+        bool = _socket.emit("lookup", error, str, str, str);
+        bool = _socket.emit("lookup", error, str, num, str);
+        bool = _socket.emit("timeout");
+
+        /// on
+        _socket = _socket.on("close", had_error => {
+            bool = had_error;
+        });
+        _socket = _socket.on("connect", () => { });
+        _socket = _socket.on("data", data => {
+            buffer = data;
+        });
+        _socket = _socket.on("drain", () => { });
+        _socket = _socket.on("end", () => { });
+        _socket = _socket.on("error", err => {
+            error = err;
+        });
+        _socket = _socket.on("lookup", (err, address, family, host) => {
+            error = err;
+
+            if (typeof family === 'string') {
+                str = family;
+            } else if (typeof family === 'number') {
+                num = family;
+            }
+
+            str = host;
+        });
+        _socket = _socket.on("timeout", () => { });
+
+        /// once
+        _socket = _socket.once("close", had_error => {
+            bool = had_error;
+        });
+        _socket = _socket.once("connect", () => { });
+        _socket = _socket.once("data", data => {
+            buffer = data;
+        });
+        _socket = _socket.once("drain", () => { });
+        _socket = _socket.once("end", () => { });
+        _socket = _socket.once("error", err => {
+            error = err;
+        });
+        _socket = _socket.once("lookup", (err, address, family, host) => {
+            error = err;
+
+            if (typeof family === 'string') {
+                str = family;
+            } else if (typeof family === 'number') {
+                num = family;
+            }
+
+            str = host;
+        });
+        _socket = _socket.once("timeout", () => { });
+
+        /// prependListener
+        _socket = _socket.prependListener("close", had_error => {
+            bool = had_error;
+        });
+        _socket = _socket.prependListener("connect", () => { });
+        _socket = _socket.prependListener("data", data => {
+            buffer = data;
+        });
+        _socket = _socket.prependListener("drain", () => { });
+        _socket = _socket.prependListener("end", () => { });
+        _socket = _socket.prependListener("error", err => {
+            error = err;
+        });
+        _socket = _socket.prependListener("lookup", (err, address, family, host) => {
+            error = err;
+
+            if (typeof family === 'string') {
+                str = family;
+            } else if (typeof family === 'number') {
+                num = family;
+            }
+
+            str = host;
+        });
+        _socket = _socket.prependListener("timeout", () => { });
+
+        /// prependOnceListener
+        _socket = _socket.prependOnceListener("close", had_error => {
+            bool = had_error;
+        });
+        _socket = _socket.prependOnceListener("connect", () => { });
+        _socket = _socket.prependOnceListener("data", data => {
+            buffer = data;
+        });
+        _socket = _socket.prependOnceListener("drain", () => { });
+        _socket = _socket.prependOnceListener("end", () => { });
+        _socket = _socket.prependOnceListener("error", err => {
+            error = err;
+        });
+        _socket = _socket.prependOnceListener("lookup", (err, address, family, host) => {
+            error = err;
+
+            if (typeof family === 'string') {
+                str = family;
+            } else if (typeof family === 'number') {
+                num = family;
+            }
+
+            str = host;
+        });
+        _socket = _socket.prependOnceListener("timeout", () => { });
+
+        bool = _socket.connecting;
+        bool = _socket.destroyed;
+        _socket.destroy();
+    }
+
+    {
+        /**
+         * net.Server - events.EventEmitter
+         *   1. close
+         *   2. connection
+         *   3. error
+         *   4. listening
+         */
+        let _server: net.Server;
+
+        let _socket: net.Socket;
+        let bool: boolean;
+        let error: Error;
+
+        /// addListener
+        _server = _server.addListener("close", () => { });
+        _server = _server.addListener("connection", socket => {
+            _socket = socket;
+        });
+        _server = _server.addListener("error", err => {
+            error = err;
+        });
+        _server = _server.addListener("listening", () => { });
+
+        /// emit
+        bool = _server.emit("close");
+        bool = _server.emit("connection", _socket);
+        bool = _server.emit("error", error);
+        bool = _server.emit("listening");
+
+        /// once
+        _server = _server.once("close", () => { });
+        _server = _server.once("connection", socket => {
+            _socket = socket;
+        });
+        _server = _server.once("error", err => {
+            error = err;
+        });
+        _server = _server.once("listening", () => { });
+
+        /// prependListener
+        _server = _server.prependListener("close", () => { });
+        _server = _server.prependListener("connection", socket => {
+            _socket = socket;
+        });
+        _server = _server.prependListener("error", err => {
+            error = err;
+        });
+        _server = _server.prependListener("listening", () => { });
+
+        /// prependOnceListener
+        _server = _server.prependOnceListener("close", () => { });
+        _server = _server.prependOnceListener("connection", socket => {
+            _socket = socket;
+        });
+        _server = _server.prependOnceListener("error", err => {
+            error = err;
+        });
+        _server = _server.prependOnceListener("listening", () => { });
+    }
+}
+
+/////////////////////////////////////////////////////
+/// repl Tests : https://nodejs.org/api/repl.html ///
+/////////////////////////////////////////////////////
+
+{
+    {
+        let _server: repl.REPLServer;
+        let _boolean: boolean;
+        const _ctx: vm.Context = {};
+
+        _server = _server.addListener("exit", () => { });
+        _server = _server.addListener("reset", () => { });
+
+        _boolean = _server.emit("exit", () => { });
+        _boolean = _server.emit("reset", _ctx);
+
+        _server = _server.on("exit", () => { });
+        _server = _server.on("reset", () => { });
+
+        _server = _server.once("exit", () => { });
+        _server = _server.once("reset", () => { });
+
+        _server = _server.prependListener("exit", () => { });
+        _server = _server.prependListener("reset", () => { });
+
+        _server = _server.prependOnceListener("exit", () => { });
+        _server = _server.prependOnceListener("reset", () => { });
+
+        _server.outputStream.write("test");
+        const line = _server.inputStream.read();
+
+        _server.clearBufferedCommand();
+        _server.displayPrompt();
+        _server.displayPrompt(true);
+        _server.defineCommand("cmd", function(text) {
+            // $ExpectType string
+            text;
+            // $ExpectType REPLServer
+            this;
+        });
+        _server.defineCommand("cmd", {
+            help: "",
+            action(text) {
+                // $ExpectType string
+                text;
+                // $ExpectType REPLServer
+                this;
+            }
+        });
+
+        repl.start({
+            eval() {
+                // $ExpectType REPLServer
+                this;
+            },
+            writer() {
+                // $ExpectType REPLServer
+                this;
+                return "";
+            }
+        });
+
+        function test() {
+            throw new repl.Recoverable(new Error("test"));
+        }
+
+        _server.context['key0'] = 1;
+        _server.context['key1'] = "";
+        _server.context['key2'] = true;
+        _server.context['key3'] = [];
+        _server.context['key4'] = {};
+    }
+}
+
+///////////////////////////////////////////////////
+/// DNS Tests : https://nodejs.org/api/dns.html ///
+///////////////////////////////////////////////////
+
+{
+    dns.lookup("nodejs.org", (err, address, family) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: string = address;
+        const _family: number = family;
+    });
+    dns.lookup("nodejs.org", 4, (err, address, family) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: string = address;
+        const _family: number = family;
+    });
+    dns.lookup("nodejs.org", 6, (err, address, family) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: string = address;
+        const _family: number = family;
+    });
+    dns.lookup("nodejs.org", {}, (err, address, family) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: string = address;
+        const _family: number = family;
+    });
+    dns.lookup(
+        "nodejs.org",
+        {
+            family: 4,
+            hints: dns.ADDRCONFIG | dns.V4MAPPED,
+            all: false
+        },
+        (err, address, family) => {
+            const _err: NodeJS.ErrnoException = err;
+            const _address: string = address;
+            const _family: number = family;
+        }
+    );
+    dns.lookup("nodejs.org", { all: true }, (err, addresses) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: dns.LookupAddress[] = addresses;
+    });
+    dns.lookup("nodejs.org", { all: true, verbatim: true }, (err, addresses) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: dns.LookupAddress[] = addresses;
+    });
+
+    function trueOrFalse(): boolean {
+        return Math.random() > 0.5 ? true : false;
+    }
+    dns.lookup("nodejs.org", { all: trueOrFalse() }, (err, addresses, family) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _addresses: string | dns.LookupAddress[] = addresses;
+        const _family: number | undefined = family;
+    });
+
+    dns.lookupService("127.0.0.1", 0, (err, hostname, service) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _hostname: string = hostname;
+        const _service: string = service;
+    });
+
+    dns.resolve("nodejs.org", (err, addresses) => {
+        const _addresses: string[] = addresses;
+    });
+    dns.resolve("nodejs.org", "A", (err, addresses) => {
+        const _addresses: string[] = addresses;
+    });
+    dns.resolve("nodejs.org", "AAAA", (err, addresses) => {
+        const _addresses: string[] = addresses;
+    });
+    dns.resolve("nodejs.org", "ANY", (err, addresses) => {
+        const _addresses: dns.AnyRecord[] = addresses;
+    });
+    dns.resolve("nodejs.org", "MX", (err, addresses) => {
+        const _addresses: dns.MxRecord[] = addresses;
+    });
+
+    dns.resolve4("nodejs.org", (err, addresses) => {
+        const _addresses: string[] = addresses;
+    });
+    dns.resolve4("nodejs.org", { ttl: true }, (err, addresses) => {
+        const _addresses: dns.RecordWithTtl[] = addresses;
+    });
+    {
+        const ttl = false;
+        dns.resolve4("nodejs.org", { ttl }, (err, addresses) => {
+            const _addresses: string[] | dns.RecordWithTtl[] = addresses;
+        });
+    }
+
+    dns.resolve6("nodejs.org", (err, addresses) => {
+        const _addresses: string[] = addresses;
+    });
+    dns.resolve6("nodejs.org", { ttl: true }, (err, addresses) => {
+        const _addresses: dns.RecordWithTtl[] = addresses;
+    });
+    {
+        const ttl = false;
+        dns.resolve6("nodejs.org", { ttl }, (err, addresses) => {
+            const _addresses: string[] | dns.RecordWithTtl[] = addresses;
+        });
+    }
+    {
+        const resolver = new dns.Resolver();
+        resolver.setServers(["4.4.4.4"]);
+        resolver.resolve("nodejs.org", (err, addresses) => {
+            const _addresses: string[] = addresses;
+        });
+        resolver.cancel();
+    }
+}
+
+/*****************************************************************************
+ *                                                                           *
+ * The following tests are the modules not mentioned in document but existed *
+ *                                                                           *
+ *****************************************************************************/
+
+///////////////////////////////////////////////////////////
+/// Constants Tests                                     ///
+///////////////////////////////////////////////////////////
+
+import * as constants from 'constants';
+{
+    let str: string;
+    let num: number;
+    num = constants.SIGHUP;
+    num = constants.SIGINT;
+    num = constants.SIGQUIT;
+    num = constants.SIGILL;
+    num = constants.SIGTRAP;
+    num = constants.SIGABRT;
+    num = constants.SIGIOT;
+    num = constants.SIGBUS;
+    num = constants.SIGFPE;
+    num = constants.SIGKILL;
+    num = constants.SIGUSR1;
+    num = constants.SIGSEGV;
+    num = constants.SIGUSR2;
+    num = constants.SIGPIPE;
+    num = constants.SIGALRM;
+    num = constants.SIGTERM;
+    num = constants.SIGCHLD;
+    num = constants.SIGSTKFLT;
+    num = constants.SIGCONT;
+    num = constants.SIGSTOP;
+    num = constants.SIGTSTP;
+    num = constants.SIGTTIN;
+    num = constants.SIGTTOU;
+    num = constants.SIGURG;
+    num = constants.SIGXCPU;
+    num = constants.SIGXFSZ;
+    num = constants.SIGVTALRM;
+    num = constants.SIGPROF;
+    num = constants.SIGWINCH;
+    num = constants.SIGIO;
+    num = constants.SIGPOLL;
+    num = constants.SIGPWR;
+    num = constants.SIGSYS;
+    num = constants.SIGUNUSED;
+    num = constants.O_RDONLY;
+    num = constants.O_WRONLY;
+    num = constants.O_RDWR;
+    num = constants.S_IFMT;
+    num = constants.S_IFREG;
+    num = constants.S_IFDIR;
+    num = constants.S_IFCHR;
+    num = constants.S_IFBLK;
+    num = constants.S_IFIFO;
+    num = constants.S_IFLNK;
+    num = constants.S_IFSOCK;
+    num = constants.O_CREAT;
+    num = constants.O_EXCL;
+    num = constants.O_NOCTTY;
+    num = constants.O_TRUNC;
+    num = constants.O_APPEND;
+    num = constants.O_DIRECTORY;
+    num = constants.O_NOATIME;
+    num = constants.O_NOFOLLOW;
+    num = constants.O_SYNC;
+    num = constants.O_DSYNC;
+    num = constants.O_DIRECT;
+    num = constants.O_NONBLOCK;
+    num = constants.S_IRWXU;
+    num = constants.S_IRUSR;
+    num = constants.S_IWUSR;
+    num = constants.S_IXUSR;
+    num = constants.S_IRWXG;
+    num = constants.S_IRGRP;
+    num = constants.S_IWGRP;
+    num = constants.S_IXGRP;
+    num = constants.S_IRWXO;
+    num = constants.S_IROTH;
+    num = constants.S_IWOTH;
+    num = constants.S_IXOTH;
+    num = constants.F_OK;
+    num = constants.R_OK;
+    num = constants.W_OK;
+    num = constants.X_OK;
+    num = constants.SSL_OP_ALL;
+    num = constants.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
+    num = constants.SSL_OP_CIPHER_SERVER_PREFERENCE;
+    num = constants.SSL_OP_CISCO_ANYCONNECT;
+    num = constants.SSL_OP_COOKIE_EXCHANGE;
+    num = constants.SSL_OP_CRYPTOPRO_TLSEXT_BUG;
+    num = constants.SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
+    num = constants.SSL_OP_EPHEMERAL_RSA;
+    num = constants.SSL_OP_LEGACY_SERVER_CONNECT;
+    num = constants.SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER;
+    num = constants.SSL_OP_MICROSOFT_SESS_ID_BUG;
+    num = constants.SSL_OP_MSIE_SSLV2_RSA_PADDING;
+    num = constants.SSL_OP_NETSCAPE_CA_DN_BUG;
+    num = constants.SSL_OP_NETSCAPE_CHALLENGE_BUG;
+    num = constants.SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG;
+    num = constants.SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG;
+    num = constants.SSL_OP_NO_COMPRESSION;
+    num = constants.SSL_OP_NO_QUERY_MTU;
+    num = constants.SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION;
+    num = constants.SSL_OP_NO_SSLv2;
+    num = constants.SSL_OP_NO_SSLv3;
+    num = constants.SSL_OP_NO_TICKET;
+    num = constants.SSL_OP_NO_TLSv1;
+    num = constants.SSL_OP_NO_TLSv1_1;
+    num = constants.SSL_OP_NO_TLSv1_2;
+    num = constants.SSL_OP_PKCS1_CHECK_1;
+    num = constants.SSL_OP_PKCS1_CHECK_2;
+    num = constants.SSL_OP_SINGLE_DH_USE;
+    num = constants.SSL_OP_SINGLE_ECDH_USE;
+    num = constants.SSL_OP_SSLEAY_080_CLIENT_DH_BUG;
+    num = constants.SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG;
+    num = constants.SSL_OP_TLS_BLOCK_PADDING_BUG;
+    num = constants.SSL_OP_TLS_D5_BUG;
+    num = constants.SSL_OP_TLS_ROLLBACK_BUG;
+    num = constants.ENGINE_METHOD_RSA;
+    num = constants.ENGINE_METHOD_DSA;
+    num = constants.ENGINE_METHOD_DH;
+    num = constants.ENGINE_METHOD_RAND;
+    num = constants.ENGINE_METHOD_ECDH;
+    num = constants.ENGINE_METHOD_ECDSA;
+    num = constants.ENGINE_METHOD_CIPHERS;
+    num = constants.ENGINE_METHOD_DIGESTS;
+    num = constants.ENGINE_METHOD_STORE;
+    num = constants.ENGINE_METHOD_PKEY_METHS;
+    num = constants.ENGINE_METHOD_PKEY_ASN1_METHS;
+    num = constants.ENGINE_METHOD_ALL;
+    num = constants.ENGINE_METHOD_NONE;
+    num = constants.DH_CHECK_P_NOT_SAFE_PRIME;
+    num = constants.DH_CHECK_P_NOT_PRIME;
+    num = constants.DH_UNABLE_TO_CHECK_GENERATOR;
+    num = constants.DH_NOT_SUITABLE_GENERATOR;
+    num = constants.NPN_ENABLED;
+    num = constants.ALPN_ENABLED;
+    num = constants.RSA_PKCS1_PADDING;
+    num = constants.RSA_SSLV23_PADDING;
+    num = constants.RSA_NO_PADDING;
+    num = constants.RSA_PKCS1_OAEP_PADDING;
+    num = constants.RSA_X931_PADDING;
+    num = constants.RSA_PKCS1_PSS_PADDING;
+    num = constants.POINT_CONVERSION_COMPRESSED;
+    num = constants.POINT_CONVERSION_UNCOMPRESSED;
+    num = constants.POINT_CONVERSION_HYBRID;
+    str = constants.defaultCoreCipherList;
+    str = constants.defaultCipherList;
+}
+
+////////////////////////////////////////////////////
+/// v8 tests : https://nodejs.org/api/v8.html
+////////////////////////////////////////////////////
+
+{
+    const heapStats = v8.getHeapStatistics();
+    const heapSpaceStats = v8.getHeapSpaceStatistics();
+
+    const zapsGarbage: number = heapStats.does_zap_garbage;
+
+    v8.setFlagsFromString('--collect_maps');
+}
+
+////////////////////////////////////////////////////
+/// PerfHooks tests : https://nodejs.org/api/perf_hooks.html
+////////////////////////////////////////////////////
+{
+    perf_hooks.performance.mark('start');
+    (
+        () => {}
+    )();
+    perf_hooks.performance.mark('end');
+
+    const { duration } = perf_hooks.performance.getEntriesByName('discover')[0];
+    const timeOrigin = perf_hooks.performance.timeOrigin;
+
+    const performanceObserverCallback: perf_hooks.PerformanceObserverCallback = (list, obs) => {
+        const {
+            duration,
+            entryType,
+            name,
+            startTime,
+        } = list.getEntries()[0];
+        obs.disconnect();
+        perf_hooks.performance.clearFunctions();
+    };
+    const obs = new perf_hooks.PerformanceObserver(performanceObserverCallback);
+    obs.observe({
+        entryTypes: ['function'],
+        buffered: true,
+    });
+}
+
+////////////////////////////////////////////////////
+/// AsyncHooks tests : https://nodejs.org/api/async_hooks.html
+////////////////////////////////////////////////////
+{
+    const hooks: async_hooks.HookCallbacks = {
+        init() {},
+        before() {},
+        after() {},
+        destroy() {},
+        promiseResolve() {},
+    };
+
+    const asyncHook = async_hooks.createHook(hooks);
+
+    asyncHook.enable().disable().enable();
+
+    const tId: number = async_hooks.triggerAsyncId();
+    const eId: number = async_hooks.executionAsyncId();
+
+    class TestResource extends async_hooks.AsyncResource {
+        constructor() {
+            super('TEST_RESOURCE');
+        }
+    }
+
+    class AnotherTestResource extends async_hooks.AsyncResource {
+        constructor() {
+            super('TEST_RESOURCE', 42);
+            const aId: number = this.asyncId();
+            const tId: number = this.triggerAsyncId();
+        }
+        run() {
+            this.runInAsyncScope(() => {});
+            this.runInAsyncScope(Array.prototype.find, [], () => true);
+        }
+        destroy() {
+            this.emitDestroy();
+        }
+    }
+
+    // check AsyncResource constructor options.
+    new async_hooks.AsyncResource('');
+    new async_hooks.AsyncResource('', 0);
+    new async_hooks.AsyncResource('', {});
+    new async_hooks.AsyncResource('', { triggerAsyncId: 0 });
+    new async_hooks.AsyncResource('', {
+      triggerAsyncId: 0,
+      requireManualDestroy: true
+    });
+}
+
+////////////////////////////////////////////////////
+/// zlib tests : http://nodejs.org/api/zlib.html ///
+////////////////////////////////////////////////////
+
+{
+    {
+        const gzipped = zlib.gzipSync('test');
+        const unzipped = zlib.gunzipSync(gzipped.toString());
+    }
+
+    {
+        const deflate = zlib.deflateSync('test');
+        const inflate = zlib.inflateSync(deflate.toString());
+    }
+
+    {
+        const gzip = zlib.createGzip();
+        const written: number = gzip.bytesWritten;
+    }
+}
+
+///////////////////////////////////////////////////////////
+/// HTTP/2 Tests                                        ///
+///////////////////////////////////////////////////////////
+
+{
+    // Headers & Settings
+    {
+        const headers: http2.OutgoingHttpHeaders = {
+            ':status': 200,
+            'content-type': 'text-plain',
+            ABC: ['has', 'more', 'than', 'one', 'value'],
+            undef: undefined
+        };
+
+        const settings: http2.Settings = {
+            headerTableSize: 0,
+            enablePush: true,
+            initialWindowSize: 0,
+            maxFrameSize: 0,
+            maxConcurrentStreams: 0,
+            maxHeaderListSize: 0
+        };
+    }
+
+    // Http2Session
+    {
+        const http2Session: http2.Http2Session = {} as any;
+        const ee: events.EventEmitter = http2Session;
+
+        http2Session.on('close', () => {});
+        http2Session.on('connect', (session: http2.Http2Session, socket: net.Socket) => {});
+        http2Session.on('error', (err: Error) => {});
+        http2Session.on('frameError', (frameType: number, errorCode: number, streamID: number) => {});
+        http2Session.on('goaway', (errorCode: number, lastStreamID: number, opaqueData: Buffer) => {});
+        http2Session.on('localSettings', (settings: http2.Settings) => {});
+        http2Session.on('remoteSettings', (settings: http2.Settings) => {});
+        http2Session.on('stream', (stream: http2.Http2Stream, headers: http2.IncomingHttpHeaders, flags: number) => {});
+        http2Session.on('timeout', () => {});
+        http2Session.on('ping', () => {});
+
+        http2Session.destroy();
+
+        const alpnProtocol: string = http2Session.alpnProtocol;
+        const destroyed: boolean = http2Session.destroyed;
+        const encrypted: boolean = http2Session.encrypted;
+        const originSet: string[] = http2Session.originSet;
+        const pendingSettingsAck: boolean = http2Session.pendingSettingsAck;
+        let settings: http2.Settings = http2Session.localSettings;
+        const closed: boolean = http2Session.closed;
+        const connecting: boolean = http2Session.connecting;
+        settings = http2Session.remoteSettings;
+
+        http2Session.ref();
+        http2Session.unref();
+
+        const headers: http2.OutgoingHttpHeaders = {};
+        const options: http2.ClientSessionRequestOptions = {
+            endStream: true,
+            exclusive: true,
+            parent: 0,
+            weight: 0,
+            getTrailers: (trailers: http2.OutgoingHttpHeaders) => {}
+        };
+        (http2Session as http2.ClientHttp2Session).request();
+        (http2Session as http2.ClientHttp2Session).request(headers);
+        (http2Session as http2.ClientHttp2Session).request(headers, options);
+
+        const stream: http2.Http2Stream = {} as any;
+        http2Session.rstStream(stream);
+        http2Session.rstStream(stream, 0);
+
+        http2Session.setTimeout(100, () => {});
+        http2Session.close(() => {});
+
+        const socket: net.Socket | tls.TLSSocket = http2Session.socket;
+        let state: http2.SessionState = http2Session.state;
+        state = {
+            effectiveLocalWindowSize: 0,
+            effectiveRecvDataLength: 0,
+            nextStreamID: 0,
+            localWindowSize: 0,
+            lastProcStreamID: 0,
+            remoteWindowSize: 0,
+            outboundQueueSize: 0,
+            deflateDynamicTableSize: 0,
+            inflateDynamicTableSize: 0
+        };
+
+        http2Session.priority(stream, {
+            exclusive: true,
+            parent: 0,
+            weight: 0,
+            silent: true
+        });
+
+        http2Session.settings(settings);
+
+      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
+    {
+        const http2Stream: http2.Http2Stream = {} as any;
+        const duplex: stream.Duplex = http2Stream;
+
+        http2Stream.on('aborted', () => {});
+        http2Stream.on('error', (err: Error) => {});
+        http2Stream.on('frameError', (frameType: number, errorCode: number, streamID: number) => {});
+        http2Stream.on('streamClosed', (code: number) => {});
+        http2Stream.on('timeout', () => {});
+        http2Stream.on('trailers', (trailers: http2.IncomingHttpHeaders, flags: number) => {});
+        http2Stream.on('wantTrailers', () => {});
+
+        const aborted: boolean = http2Stream.aborted;
+        const closed: boolean = http2Stream.closed;
+        const destroyed: boolean = http2Stream.destroyed;
+        const pending: boolean = http2Stream.pending;
+
+        http2Stream.priority({
+            exclusive: true,
+            parent: 0,
+            weight: 0,
+            silent: true
+        });
+
+        const sesh: http2.Http2Session = http2Stream.session;
+
+        http2Stream.setTimeout(100, () => {});
+
+        let state: http2.StreamState = http2Stream.state;
+        state = {
+            localWindowSize: 0,
+            state: 0,
+            streamLocalClose: 0,
+            streamRemoteClose: 0,
+            sumDependencyWeight: 0,
+            weight: 0
+        };
+
+        http2Stream.close();
+        http2Stream.close(0);
+        http2Stream.close(0, () => {});
+        http2Stream.close(undefined, () => {});
+
+        // ClientHttp2Stream
+        const clientHttp2Stream: http2.ClientHttp2Stream = {} as any;
+        clientHttp2Stream.on('headers', (headers: http2.IncomingHttpHeaders, flags: number) => {});
+        clientHttp2Stream.on('push', (headers: http2.IncomingHttpHeaders, flags: number) => {});
+        clientHttp2Stream.on('response', (headers: http2.IncomingHttpHeaders & http2.IncomingHttpStatusHeader, flags: number) => {
+            const s: number = headers[':status'];
+        });
+
+        // ServerHttp2Stream
+        const serverHttp2Stream: http2.ServerHttp2Stream = {} as any;
+        const headers: http2.OutgoingHttpHeaders = {};
+
+        serverHttp2Stream.additionalHeaders(headers);
+        const headerSent: boolean = serverHttp2Stream.headersSent;
+        const pushAllowed: boolean = serverHttp2Stream.pushAllowed;
+        serverHttp2Stream.pushStream(headers, (err: Error | null, pushStream: http2.ServerHttp2Stream, headers: http2.OutgoingHttpHeaders) => {});
+
+        const options: http2.ServerStreamResponseOptions = {
+            endStream: true,
+            waitForTrailers: true,
+        };
+        serverHttp2Stream.respond();
+        serverHttp2Stream.respond(headers);
+        serverHttp2Stream.respond(headers, options);
+
+        const options2: http2.ServerStreamFileResponseOptions = {
+            statCheck: (stats: fs.Stats, headers: http2.OutgoingHttpHeaders, statOptions: http2.StatOptions) => {},
+            getTrailers: (trailers: http2.OutgoingHttpHeaders) => {},
+            offset: 0,
+            length: 0
+        };
+        serverHttp2Stream.respondWithFD(0);
+        serverHttp2Stream.respondWithFD(0, headers);
+        serverHttp2Stream.respondWithFD(0, headers, options2);
+        serverHttp2Stream.respondWithFD(0, headers, {statCheck: () => false});
+        const options3: http2.ServerStreamFileResponseOptionsWithError = {
+            onError: (err: NodeJS.ErrnoException) => {},
+            statCheck: (stats: fs.Stats, headers: http2.OutgoingHttpHeaders, statOptions: http2.StatOptions) => {},
+            getTrailers: (trailers: http2.OutgoingHttpHeaders) => {},
+            offset: 0,
+            length: 0
+        };
+        serverHttp2Stream.respondWithFile('');
+        serverHttp2Stream.respondWithFile('', headers);
+        serverHttp2Stream.respondWithFile('', headers, options3);
+        serverHttp2Stream.respondWithFile('', headers, {statCheck: () => false});
+    }
+
+    // Http2Server / Http2SecureServer
+    {
+        const http2Server: http2.Http2Server = http2.createServer();
+        const http2SecureServer: http2.Http2SecureServer = http2.createSecureServer();
+        const s1: net.Server = http2Server;
+        const s2: tls.Server = http2SecureServer;
+        [http2Server, http2SecureServer].forEach((server) => {
+            server.on('sessionError', (err: Error) => {});
+            server.on('checkContinue', (stream: http2.ServerHttp2Stream, headers: http2.IncomingHttpHeaders, flags: number) => {});
+            server.on('stream', (stream: http2.ServerHttp2Stream, headers: http2.IncomingHttpHeaders, flags: number) => {});
+            server.on('request', (request: http2.Http2ServerRequest, response: http2.Http2ServerResponse) => {});
+            server.on('timeout', () => {});
+        });
+
+        http2SecureServer.on('unknownProtocol', (socket: tls.TLSSocket) => {});
+    }
+
+    // Public API (except constants)
+    {
+        let settings: http2.Settings;
+        const serverOptions: http2.ServerOptions = {
+            maxDeflateDynamicTableSize: 0,
+            maxReservedRemoteStreams: 0,
+            maxSendHeaderBlockLength: 0,
+            paddingStrategy: 0,
+            peerMaxConcurrentStreams: 0,
+            selectPadding: (frameLen: number, maxFrameLen: number) => 0,
+            settings,
+            allowHTTP1: true
+        };
+        // tslint:disable-next-line prefer-object-spread (ts2.1 feature)
+        const secureServerOptions: http2.SecureServerOptions = Object.assign({}, serverOptions);
+        secureServerOptions.ca = '';
+        const onRequestHandler = (request: http2.Http2ServerRequest, response: http2.Http2ServerResponse) => {
+            // Http2ServerRequest
+
+            const readable: stream.Readable = request;
+            let incomingHeaders: http2.IncomingHttpHeaders = request.headers;
+            incomingHeaders = request.trailers;
+            const httpVersion: string = request.httpVersion;
+            let method: string = request.method;
+            let rawHeaders: string[] = request.rawHeaders;
+            rawHeaders = request.rawTrailers;
+            let socket: net.Socket | tls.TLSSocket = request.socket;
+            let stream: http2.ServerHttp2Stream = request.stream;
+            const url: string = request.url;
+
+            request.setTimeout(0, () => {});
+            request.on('aborted', (hadError: boolean, code: number) => {});
+
+            // Http2ServerResponse
+
+            let outgoingHeaders: http2.OutgoingHttpHeaders;
+            response.addTrailers(outgoingHeaders);
+            socket = response.connection;
+            const finished: boolean = response.finished;
+            response.sendDate = true;
+            response.statusCode = 200;
+            response.statusMessage = '';
+            socket = response.socket;
+            stream = response.stream;
+
+            method = response.getHeader(':method');
+            const headers: string[] = response.getHeaderNames();
+            outgoingHeaders = response.getHeaders();
+            const hasMethod = response.hasHeader(':method');
+            response.removeHeader(':method');
+            response.setHeader(':method', 'GET');
+            response.setHeader(':status', 200);
+            response.setHeader('some-list', ['', '']);
+            const headersSent: boolean = response.headersSent;
+
+            response.setTimeout(0, () => {});
+            response.createPushResponse(outgoingHeaders, (err: Error | null, res: http2.Http2ServerResponse) => {});
+
+            response.writeContinue();
+            response.writeHead(200);
+            response.writeHead(200, outgoingHeaders);
+            response.writeHead(200, 'OK', outgoingHeaders);
+            response.writeHead(200, 'OK');
+            response.write('');
+            response.write('', (err: Error) => {});
+            response.write('', 'utf8');
+            response.write('', 'utf8', (err: Error) => {});
+            response.write(Buffer.from([]));
+            response.write(Buffer.from([]), (err: Error) => {});
+            response.write(Buffer.from([]), 'utf8');
+            response.write(Buffer.from([]), 'utf8', (err: Error) => {});
+            response.end();
+            response.end(() => {});
+            response.end('');
+            response.end('', () => {});
+            response.end('', 'utf8');
+            response.end('', 'utf8', () => {});
+            response.end(Buffer.from([]));
+            response.end(Buffer.from([]), () => {});
+            response.end(Buffer.from([]), 'utf8');
+            response.end(Buffer.from([]), 'utf8', () => {});
+
+            request.on('aborted', (hadError: boolean, code: number) => {});
+            request.on('close', () => {});
+            request.on('drain', () => {});
+            request.on('error', (error: Error) => {});
+            request.on('finish', () => {});
+        };
+
+        let http2Server: http2.Http2Server;
+        let http2SecureServer: http2.Http2SecureServer;
+
+        http2Server = http2.createServer();
+        http2Server = http2.createServer(serverOptions);
+        http2Server = http2.createServer(onRequestHandler);
+        http2Server = http2.createServer(serverOptions, onRequestHandler);
+
+        http2SecureServer = http2.createSecureServer();
+        http2SecureServer = http2.createSecureServer(secureServerOptions);
+        http2SecureServer = http2.createSecureServer(onRequestHandler);
+        http2SecureServer = http2.createSecureServer(secureServerOptions, onRequestHandler);
+
+        const clientSessionOptions: http2.ClientSessionOptions = {
+            maxDeflateDynamicTableSize: 0,
+            maxReservedRemoteStreams: 0,
+            maxSendHeaderBlockLength: 0,
+            paddingStrategy: 0,
+            peerMaxConcurrentStreams: 0,
+            selectPadding: (frameLen: number, maxFrameLen: number) => 0,
+            settings
+        };
+        // tslint:disable-next-line prefer-object-spread (ts2.1 feature)
+        const secureClientSessionOptions: http2.SecureClientSessionOptions = Object.assign({}, clientSessionOptions);
+        secureClientSessionOptions.ca = '';
+        const onConnectHandler = (session: http2.Http2Session, socket: net.Socket) => {};
+
+        const serverHttp2Session: http2.ServerHttp2Session = {} as any;
+
+        serverHttp2Session.altsvc('', '');
+        serverHttp2Session.altsvc('', 0);
+        serverHttp2Session.altsvc('', new url.URL(''));
+        serverHttp2Session.altsvc('', { origin: '' });
+        serverHttp2Session.altsvc('', { origin: 0 });
+        serverHttp2Session.altsvc('', { origin: new url.URL('') });
+
+        let clientHttp2Session: http2.ClientHttp2Session;
+
+        clientHttp2Session = http2.connect('');
+        clientHttp2Session = http2.connect('', onConnectHandler);
+        clientHttp2Session = http2.connect('', clientSessionOptions);
+        clientHttp2Session = http2.connect('', clientSessionOptions, onConnectHandler);
+        clientHttp2Session = http2.connect('', secureClientSessionOptions);
+        clientHttp2Session = http2.connect('', secureClientSessionOptions, onConnectHandler);
+        clientHttp2Session.on('altsvc', (alt: string, origin: string, number: number) => {});
+
+        settings = http2.getDefaultSettings();
+        settings = http2.getPackedSettings(settings);
+        settings = http2.getUnpackedSettings(Buffer.from([]));
+        settings = http2.getUnpackedSettings(Uint8Array.from([]));
+    }
+
+    // constants
+    {
+        const constants = http2.constants;
+        let num: number;
+        let str: string;
+        num = constants.NGHTTP2_SESSION_SERVER;
+        num = constants.NGHTTP2_SESSION_CLIENT;
+        num = constants.NGHTTP2_STREAM_STATE_IDLE;
+        num = constants.NGHTTP2_STREAM_STATE_OPEN;
+        num = constants.NGHTTP2_STREAM_STATE_RESERVED_LOCAL;
+        num = constants.NGHTTP2_STREAM_STATE_RESERVED_REMOTE;
+        num = constants.NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL;
+        num = constants.NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE;
+        num = constants.NGHTTP2_STREAM_STATE_CLOSED;
+        num = constants.NGHTTP2_NO_ERROR;
+        num = constants.NGHTTP2_PROTOCOL_ERROR;
+        num = constants.NGHTTP2_INTERNAL_ERROR;
+        num = constants.NGHTTP2_FLOW_CONTROL_ERROR;
+        num = constants.NGHTTP2_SETTINGS_TIMEOUT;
+        num = constants.NGHTTP2_STREAM_CLOSED;
+        num = constants.NGHTTP2_FRAME_SIZE_ERROR;
+        num = constants.NGHTTP2_REFUSED_STREAM;
+        num = constants.NGHTTP2_CANCEL;
+        num = constants.NGHTTP2_COMPRESSION_ERROR;
+        num = constants.NGHTTP2_CONNECT_ERROR;
+        num = constants.NGHTTP2_ENHANCE_YOUR_CALM;
+        num = constants.NGHTTP2_INADEQUATE_SECURITY;
+        num = constants.NGHTTP2_HTTP_1_1_REQUIRED;
+        num = constants.NGHTTP2_ERR_FRAME_SIZE_ERROR;
+        num = constants.NGHTTP2_FLAG_NONE;
+        num = constants.NGHTTP2_FLAG_END_STREAM;
+        num = constants.NGHTTP2_FLAG_END_HEADERS;
+        num = constants.NGHTTP2_FLAG_ACK;
+        num = constants.NGHTTP2_FLAG_PADDED;
+        num = constants.NGHTTP2_FLAG_PRIORITY;
+        num = constants.DEFAULT_SETTINGS_HEADER_TABLE_SIZE;
+        num = constants.DEFAULT_SETTINGS_ENABLE_PUSH;
+        num = constants.DEFAULT_SETTINGS_INITIAL_WINDOW_SIZE;
+        num = constants.DEFAULT_SETTINGS_MAX_FRAME_SIZE;
+        num = constants.MAX_MAX_FRAME_SIZE;
+        num = constants.MIN_MAX_FRAME_SIZE;
+        num = constants.MAX_INITIAL_WINDOW_SIZE;
+        num = constants.NGHTTP2_DEFAULT_WEIGHT;
+        num = constants.NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
+        num = constants.NGHTTP2_SETTINGS_ENABLE_PUSH;
+        num = constants.NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
+        num = constants.NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
+        num = constants.NGHTTP2_SETTINGS_MAX_FRAME_SIZE;
+        num = constants.NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE;
+        num = constants.PADDING_STRATEGY_NONE;
+        num = constants.PADDING_STRATEGY_MAX;
+        num = constants.PADDING_STRATEGY_CALLBACK;
+        num = constants.HTTP_STATUS_CONTINUE;
+        num = constants.HTTP_STATUS_SWITCHING_PROTOCOLS;
+        num = constants.HTTP_STATUS_PROCESSING;
+        num = constants.HTTP_STATUS_OK;
+        num = constants.HTTP_STATUS_CREATED;
+        num = constants.HTTP_STATUS_ACCEPTED;
+        num = constants.HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION;
+        num = constants.HTTP_STATUS_NO_CONTENT;
+        num = constants.HTTP_STATUS_RESET_CONTENT;
+        num = constants.HTTP_STATUS_PARTIAL_CONTENT;
+        num = constants.HTTP_STATUS_MULTI_STATUS;
+        num = constants.HTTP_STATUS_ALREADY_REPORTED;
+        num = constants.HTTP_STATUS_IM_USED;
+        num = constants.HTTP_STATUS_MULTIPLE_CHOICES;
+        num = constants.HTTP_STATUS_MOVED_PERMANENTLY;
+        num = constants.HTTP_STATUS_FOUND;
+        num = constants.HTTP_STATUS_SEE_OTHER;
+        num = constants.HTTP_STATUS_NOT_MODIFIED;
+        num = constants.HTTP_STATUS_USE_PROXY;
+        num = constants.HTTP_STATUS_TEMPORARY_REDIRECT;
+        num = constants.HTTP_STATUS_PERMANENT_REDIRECT;
+        num = constants.HTTP_STATUS_BAD_REQUEST;
+        num = constants.HTTP_STATUS_UNAUTHORIZED;
+        num = constants.HTTP_STATUS_PAYMENT_REQUIRED;
+        num = constants.HTTP_STATUS_FORBIDDEN;
+        num = constants.HTTP_STATUS_NOT_FOUND;
+        num = constants.HTTP_STATUS_METHOD_NOT_ALLOWED;
+        num = constants.HTTP_STATUS_NOT_ACCEPTABLE;
+        num = constants.HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED;
+        num = constants.HTTP_STATUS_REQUEST_TIMEOUT;
+        num = constants.HTTP_STATUS_CONFLICT;
+        num = constants.HTTP_STATUS_GONE;
+        num = constants.HTTP_STATUS_LENGTH_REQUIRED;
+        num = constants.HTTP_STATUS_PRECONDITION_FAILED;
+        num = constants.HTTP_STATUS_PAYLOAD_TOO_LARGE;
+        num = constants.HTTP_STATUS_URI_TOO_LONG;
+        num = constants.HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE;
+        num = constants.HTTP_STATUS_RANGE_NOT_SATISFIABLE;
+        num = constants.HTTP_STATUS_EXPECTATION_FAILED;
+        num = constants.HTTP_STATUS_TEAPOT;
+        num = constants.HTTP_STATUS_MISDIRECTED_REQUEST;
+        num = constants.HTTP_STATUS_UNPROCESSABLE_ENTITY;
+        num = constants.HTTP_STATUS_LOCKED;
+        num = constants.HTTP_STATUS_FAILED_DEPENDENCY;
+        num = constants.HTTP_STATUS_UNORDERED_COLLECTION;
+        num = constants.HTTP_STATUS_UPGRADE_REQUIRED;
+        num = constants.HTTP_STATUS_PRECONDITION_REQUIRED;
+        num = constants.HTTP_STATUS_TOO_MANY_REQUESTS;
+        num = constants.HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE;
+        num = constants.HTTP_STATUS_UNAVAILABLE_FOR_LEGAL_REASONS;
+        num = constants.HTTP_STATUS_INTERNAL_SERVER_ERROR;
+        num = constants.HTTP_STATUS_NOT_IMPLEMENTED;
+        num = constants.HTTP_STATUS_BAD_GATEWAY;
+        num = constants.HTTP_STATUS_SERVICE_UNAVAILABLE;
+        num = constants.HTTP_STATUS_GATEWAY_TIMEOUT;
+        num = constants.HTTP_STATUS_HTTP_VERSION_NOT_SUPPORTED;
+        num = constants.HTTP_STATUS_VARIANT_ALSO_NEGOTIATES;
+        num = constants.HTTP_STATUS_INSUFFICIENT_STORAGE;
+        num = constants.HTTP_STATUS_LOOP_DETECTED;
+        num = constants.HTTP_STATUS_BANDWIDTH_LIMIT_EXCEEDED;
+        num = constants.HTTP_STATUS_NOT_EXTENDED;
+        num = constants.HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED;
+        str = constants.HTTP2_HEADER_STATUS;
+        str = constants.HTTP2_HEADER_METHOD;
+        str = constants.HTTP2_HEADER_AUTHORITY;
+        str = constants.HTTP2_HEADER_SCHEME;
+        str = constants.HTTP2_HEADER_PATH;
+        str = constants.HTTP2_HEADER_ACCEPT_CHARSET;
+        str = constants.HTTP2_HEADER_ACCEPT_ENCODING;
+        str = constants.HTTP2_HEADER_ACCEPT_LANGUAGE;
+        str = constants.HTTP2_HEADER_ACCEPT_RANGES;
+        str = constants.HTTP2_HEADER_ACCEPT;
+        str = constants.HTTP2_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN;
+        str = constants.HTTP2_HEADER_AGE;
+        str = constants.HTTP2_HEADER_ALLOW;
+        str = constants.HTTP2_HEADER_AUTHORIZATION;
+        str = constants.HTTP2_HEADER_CACHE_CONTROL;
+        str = constants.HTTP2_HEADER_CONNECTION;
+        str = constants.HTTP2_HEADER_CONTENT_DISPOSITION;
+        str = constants.HTTP2_HEADER_CONTENT_ENCODING;
+        str = constants.HTTP2_HEADER_CONTENT_LANGUAGE;
+        str = constants.HTTP2_HEADER_CONTENT_LENGTH;
+        str = constants.HTTP2_HEADER_CONTENT_LOCATION;
+        str = constants.HTTP2_HEADER_CONTENT_MD5;
+        str = constants.HTTP2_HEADER_CONTENT_RANGE;
+        str = constants.HTTP2_HEADER_CONTENT_TYPE;
+        str = constants.HTTP2_HEADER_COOKIE;
+        str = constants.HTTP2_HEADER_DATE;
+        str = constants.HTTP2_HEADER_ETAG;
+        str = constants.HTTP2_HEADER_EXPECT;
+        str = constants.HTTP2_HEADER_EXPIRES;
+        str = constants.HTTP2_HEADER_FROM;
+        str = constants.HTTP2_HEADER_HOST;
+        str = constants.HTTP2_HEADER_IF_MATCH;
+        str = constants.HTTP2_HEADER_IF_MODIFIED_SINCE;
+        str = constants.HTTP2_HEADER_IF_NONE_MATCH;
+        str = constants.HTTP2_HEADER_IF_RANGE;
+        str = constants.HTTP2_HEADER_IF_UNMODIFIED_SINCE;
+        str = constants.HTTP2_HEADER_LAST_MODIFIED;
+        str = constants.HTTP2_HEADER_LINK;
+        str = constants.HTTP2_HEADER_LOCATION;
+        str = constants.HTTP2_HEADER_MAX_FORWARDS;
+        str = constants.HTTP2_HEADER_PREFER;
+        str = constants.HTTP2_HEADER_PROXY_AUTHENTICATE;
+        str = constants.HTTP2_HEADER_PROXY_AUTHORIZATION;
+        str = constants.HTTP2_HEADER_RANGE;
+        str = constants.HTTP2_HEADER_REFERER;
+        str = constants.HTTP2_HEADER_REFRESH;
+        str = constants.HTTP2_HEADER_RETRY_AFTER;
+        str = constants.HTTP2_HEADER_SERVER;
+        str = constants.HTTP2_HEADER_SET_COOKIE;
+        str = constants.HTTP2_HEADER_STRICT_TRANSPORT_SECURITY;
+        str = constants.HTTP2_HEADER_TRANSFER_ENCODING;
+        str = constants.HTTP2_HEADER_TE;
+        str = constants.HTTP2_HEADER_UPGRADE;
+        str = constants.HTTP2_HEADER_USER_AGENT;
+        str = constants.HTTP2_HEADER_VARY;
+        str = constants.HTTP2_HEADER_VIA;
+        str = constants.HTTP2_HEADER_WWW_AUTHENTICATE;
+        str = constants.HTTP2_HEADER_HTTP2_SETTINGS;
+        str = constants.HTTP2_HEADER_KEEP_ALIVE;
+        str = constants.HTTP2_HEADER_PROXY_CONNECTION;
+        str = constants.HTTP2_METHOD_ACL;
+        str = constants.HTTP2_METHOD_BASELINE_CONTROL;
+        str = constants.HTTP2_METHOD_BIND;
+        str = constants.HTTP2_METHOD_CHECKIN;
+        str = constants.HTTP2_METHOD_CHECKOUT;
+        str = constants.HTTP2_METHOD_CONNECT;
+        str = constants.HTTP2_METHOD_COPY;
+        str = constants.HTTP2_METHOD_DELETE;
+        str = constants.HTTP2_METHOD_GET;
+        str = constants.HTTP2_METHOD_HEAD;
+        str = constants.HTTP2_METHOD_LABEL;
+        str = constants.HTTP2_METHOD_LINK;
+        str = constants.HTTP2_METHOD_LOCK;
+        str = constants.HTTP2_METHOD_MERGE;
+        str = constants.HTTP2_METHOD_MKACTIVITY;
+        str = constants.HTTP2_METHOD_MKCALENDAR;
+        str = constants.HTTP2_METHOD_MKCOL;
+        str = constants.HTTP2_METHOD_MKREDIRECTREF;
+        str = constants.HTTP2_METHOD_MKWORKSPACE;
+        str = constants.HTTP2_METHOD_MOVE;
+        str = constants.HTTP2_METHOD_OPTIONS;
+        str = constants.HTTP2_METHOD_ORDERPATCH;
+        str = constants.HTTP2_METHOD_PATCH;
+        str = constants.HTTP2_METHOD_POST;
+        str = constants.HTTP2_METHOD_PRI;
+        str = constants.HTTP2_METHOD_PROPFIND;
+        str = constants.HTTP2_METHOD_PROPPATCH;
+        str = constants.HTTP2_METHOD_PUT;
+        str = constants.HTTP2_METHOD_REBIND;
+        str = constants.HTTP2_METHOD_REPORT;
+        str = constants.HTTP2_METHOD_SEARCH;
+        str = constants.HTTP2_METHOD_TRACE;
+        str = constants.HTTP2_METHOD_UNBIND;
+        str = constants.HTTP2_METHOD_UNCHECKOUT;
+        str = constants.HTTP2_METHOD_UNLINK;
+        str = constants.HTTP2_METHOD_UNLOCK;
+        str = constants.HTTP2_METHOD_UPDATE;
+        str = constants.HTTP2_METHOD_UPDATEREDIRECTREF;
+        str = constants.HTTP2_METHOD_VERSION_CONTROL;
+    }
+}
+
+///////////////////////////////////////////////////////////
+/// Inspector Tests                                     ///
+///////////////////////////////////////////////////////////
+
+{
+    {
+        const b: inspector.Console.ConsoleMessage = {source: 'test', text: 'test', level: 'error' };
+        inspector.open();
+        inspector.open(0);
+        inspector.open(0, 'localhost');
+        inspector.open(0, 'localhost', true);
+        inspector.close();
+        const inspectorUrl: string = inspector.url();
+
+        const session = new inspector.Session();
+        session.connect();
+        session.disconnect();
+
+        // Unknown post method
+        session.post('A.b', { key: 'value' }, (err, params) => {});
+        // TODO: parameters are implicitly 'any' and need type annotation
+        session.post('A.b', (err: Error | null, params?: {}) => {});
+        session.post('A.b');
+        // Known post method
+        const parameter: inspector.Runtime.EvaluateParameterType = { expression: '2 + 2' };
+        session.post('Runtime.evaluate', parameter,
+            (err: Error, params: inspector.Runtime.EvaluateReturnType) => {});
+        session.post('Runtime.evaluate', (err: Error, params: inspector.Runtime.EvaluateReturnType) => {
+            const exceptionDetails: inspector.Runtime.ExceptionDetails = params.exceptionDetails;
+            const resultClassName: string = params.result.className;
+        });
+        session.post('Runtime.evaluate');
+
+        // General event
+        session.on('inspectorNotification', message => {
+            message; // $ExpectType InspectorNotification<{}>
+        });
+        // Known events
+        session.on('Debugger.paused', (message: inspector.InspectorNotification<inspector.Debugger.PausedEventDataType>) => {
+            const method: string = message.method;
+            const pauseReason: string = message.params.reason;
+        });
+        session.on('Debugger.resumed', () => {});
+        // Node Inspector events
+        session.on('NodeTracing.dataCollected', (message: inspector.InspectorNotification<inspector.NodeTracing.DataCollectedEventDataType>) => {
+          const value: Array<{}> = message.params.value;
+        });
+    }
+}
+
+///////////////////////////////////////////////////////////
+/// Trace Events Tests                                  ///
+///////////////////////////////////////////////////////////
+
+{
+    const enabledCategories: string = trace_events.getEnabledCategories();
+    const tracing: trace_events.Tracing = trace_events.createTracing({ categories: ['node', 'v8'] });
+    const categories: string = tracing.categories;
+    const enabled: boolean = tracing.enabled;
+    tracing.enable();
+    tracing.disable();
+}
+
+////////////////////////////////////////////////////
+/// module tests : http://nodejs.org/api/modules.html
+////////////////////////////////////////////////////
+import moduleModule = require('module');
+
+{
+    require.extensions[".ts"] = () => "";
+
+    Module.runMain();
+    const s: string = Module.wrap("some code");
+
+    const m1: Module = new Module("moduleId");
+    const m2: Module = new Module.Module("moduleId");
+    const b: string[] = Module.builtinModules;
+    let paths: string[] = module.paths;
+    paths = m1.paths;
+
+    moduleModule.createRequireFromPath('./test')('test');
+}
+
+////////////////////////////////////////////////////
+/// Node.js ESNEXT Support
+////////////////////////////////////////////////////
+
+{
+    const s = 'foo';
+    const s1: string = s.trimLeft();
+    const s2: string = s.trimRight();
+}
diff --git a/types/node/v10/os.d.ts b/types/node/v10/os.d.ts
new file mode 100644
index 0000000000..c85d217f91
--- /dev/null
+++ b/types/node/v10/os.d.ts
@@ -0,0 +1,192 @@
+declare module "os" {
+    interface CpuInfo {
+        model: string;
+        speed: number;
+        times: {
+            user: number;
+            nice: number;
+            sys: number;
+            idle: number;
+            irq: number;
+        };
+    }
+
+    interface NetworkInterfaceBase {
+        address: string;
+        netmask: string;
+        mac: string;
+        internal: boolean;
+        cidr: string | null;
+    }
+
+    interface NetworkInterfaceInfoIPv4 extends NetworkInterfaceBase {
+        family: "IPv4";
+    }
+
+    interface NetworkInterfaceInfoIPv6 extends NetworkInterfaceBase {
+        family: "IPv6";
+        scopeid: number;
+    }
+
+    type NetworkInterfaceInfo = NetworkInterfaceInfoIPv4 | NetworkInterfaceInfoIPv6;
+
+    function hostname(): string;
+    function loadavg(): number[];
+    function uptime(): number;
+    function freemem(): number;
+    function totalmem(): number;
+    function cpus(): CpuInfo[];
+    function type(): string;
+    function release(): string;
+    function networkInterfaces(): { [index: string]: NetworkInterfaceInfo[] };
+    function homedir(): string;
+    function userInfo(options?: { encoding: string }): { username: string, uid: number, gid: number, shell: any, homedir: string };
+    const constants: {
+        UV_UDP_REUSEADDR: number;
+        signals: {
+            SIGHUP: number;
+            SIGINT: number;
+            SIGQUIT: number;
+            SIGILL: number;
+            SIGTRAP: number;
+            SIGABRT: number;
+            SIGIOT: number;
+            SIGBUS: number;
+            SIGFPE: number;
+            SIGKILL: number;
+            SIGUSR1: number;
+            SIGSEGV: number;
+            SIGUSR2: number;
+            SIGPIPE: number;
+            SIGALRM: number;
+            SIGTERM: number;
+            SIGCHLD: number;
+            SIGSTKFLT: number;
+            SIGCONT: number;
+            SIGSTOP: number;
+            SIGTSTP: number;
+            SIGTTIN: number;
+            SIGTTOU: number;
+            SIGURG: number;
+            SIGXCPU: number;
+            SIGXFSZ: number;
+            SIGVTALRM: number;
+            SIGPROF: number;
+            SIGWINCH: number;
+            SIGIO: number;
+            SIGPOLL: number;
+            SIGPWR: number;
+            SIGSYS: number;
+            SIGUNUSED: number;
+        };
+        errno: {
+            E2BIG: number;
+            EACCES: number;
+            EADDRINUSE: number;
+            EADDRNOTAVAIL: number;
+            EAFNOSUPPORT: number;
+            EAGAIN: number;
+            EALREADY: number;
+            EBADF: number;
+            EBADMSG: number;
+            EBUSY: number;
+            ECANCELED: number;
+            ECHILD: number;
+            ECONNABORTED: number;
+            ECONNREFUSED: number;
+            ECONNRESET: number;
+            EDEADLK: number;
+            EDESTADDRREQ: number;
+            EDOM: number;
+            EDQUOT: number;
+            EEXIST: number;
+            EFAULT: number;
+            EFBIG: number;
+            EHOSTUNREACH: number;
+            EIDRM: number;
+            EILSEQ: number;
+            EINPROGRESS: number;
+            EINTR: number;
+            EINVAL: number;
+            EIO: number;
+            EISCONN: number;
+            EISDIR: number;
+            ELOOP: number;
+            EMFILE: number;
+            EMLINK: number;
+            EMSGSIZE: number;
+            EMULTIHOP: number;
+            ENAMETOOLONG: number;
+            ENETDOWN: number;
+            ENETRESET: number;
+            ENETUNREACH: number;
+            ENFILE: number;
+            ENOBUFS: number;
+            ENODATA: number;
+            ENODEV: number;
+            ENOENT: number;
+            ENOEXEC: number;
+            ENOLCK: number;
+            ENOLINK: number;
+            ENOMEM: number;
+            ENOMSG: number;
+            ENOPROTOOPT: number;
+            ENOSPC: number;
+            ENOSR: number;
+            ENOSTR: number;
+            ENOSYS: number;
+            ENOTCONN: number;
+            ENOTDIR: number;
+            ENOTEMPTY: number;
+            ENOTSOCK: number;
+            ENOTSUP: number;
+            ENOTTY: number;
+            ENXIO: number;
+            EOPNOTSUPP: number;
+            EOVERFLOW: number;
+            EPERM: number;
+            EPIPE: number;
+            EPROTO: number;
+            EPROTONOSUPPORT: number;
+            EPROTOTYPE: number;
+            ERANGE: number;
+            EROFS: number;
+            ESPIPE: number;
+            ESRCH: number;
+            ESTALE: number;
+            ETIME: number;
+            ETIMEDOUT: number;
+            ETXTBSY: number;
+            EWOULDBLOCK: number;
+            EXDEV: number;
+        };
+        priority: {
+            PRIORITY_LOW: number;
+            PRIORITY_BELOW_NORMAL: number;
+            PRIORITY_NORMAL: number;
+            PRIORITY_ABOVE_NORMAL: number;
+            PRIORITY_HIGH: number;
+            PRIORITY_HIGHEST: number;
+        }
+    };
+    function arch(): string;
+    function platform(): NodeJS.Platform;
+    function tmpdir(): string;
+    const EOL: string;
+    function endianness(): "BE" | "LE";
+    /**
+     * Gets the priority of a process.
+     * Defaults to current process.
+     */
+    function getPriority(pid?: number): number;
+    /**
+     * Sets the priority of the current process.
+     * @param priority Must be in range of -20 to 19
+     */
+    function setPriority(priority: number): void;
+    /**
+     * Sets the priority of the process specified process.
+     * @param priority Must be in range of -20 to 19
+     */
+    function setPriority(pid: number, priority: number): void;
+}
diff --git a/types/node/v10/package.json b/types/node/v10/package.json
new file mode 100644
index 0000000000..c1f0c68752
--- /dev/null
+++ b/types/node/v10/package.json
@@ -0,0 +1,11 @@
+{
+    "private": true,
+    "types": "index",
+    "typesVersions": {
+        ">=3.1.0-0": {
+            "*": [
+                "ts3.1/*"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/types/node/v10/path.d.ts b/types/node/v10/path.d.ts
new file mode 100644
index 0000000000..bbc17098f4
--- /dev/null
+++ b/types/node/v10/path.d.ts
@@ -0,0 +1,159 @@
+declare module "path" {
+    /**
+     * A parsed path object generated by path.parse() or consumed by path.format().
+     */
+    interface ParsedPath {
+        /**
+         * The root of the path such as '/' or 'c:\'
+         */
+        root: string;
+        /**
+         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
+         */
+        dir: string;
+        /**
+         * The file name including extension (if any) such as 'index.html'
+         */
+        base: string;
+        /**
+         * The file extension (if any) such as '.html'
+         */
+        ext: string;
+        /**
+         * The file name without extension (if any) such as 'index'
+         */
+        name: string;
+    }
+    interface FormatInputPathObject {
+        /**
+         * The root of the path such as '/' or 'c:\'
+         */
+        root?: string;
+        /**
+         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
+         */
+        dir?: string;
+        /**
+         * The file name including extension (if any) such as 'index.html'
+         */
+        base?: string;
+        /**
+         * The file extension (if any) such as '.html'
+         */
+        ext?: string;
+        /**
+         * The file name without extension (if any) such as 'index'
+         */
+        name?: string;
+    }
+
+    /**
+     * Normalize a string path, reducing '..' and '.' parts.
+     * When multiple slashes are found, they're replaced by a single one; when the path contains a trailing slash, it is preserved. On Windows backslashes are used.
+     *
+     * @param p string path to normalize.
+     */
+    function normalize(p: string): string;
+    /**
+     * Join all arguments together and normalize the resulting path.
+     * Arguments must be strings. In v0.8, non-string arguments were silently ignored. In v0.10 and up, an exception is thrown.
+     *
+     * @param paths paths to join.
+     */
+    function join(...paths: string[]): string;
+    /**
+     * The right-most parameter is considered {to}.  Other parameters are considered an array of {from}.
+     *
+     * Starting from leftmost {from} parameter, resolves {to} to an absolute path.
+     *
+     * If {to} isn't already absolute, {from} arguments are prepended in right to left order,
+     * until an absolute path is found. If after using all {from} paths still no absolute path is found,
+     * the current working directory is used as well. The resulting path is normalized,
+     * and trailing slashes are removed unless the path gets resolved to the root directory.
+     *
+     * @param pathSegments string paths to join.  Non-string arguments are ignored.
+     */
+    function resolve(...pathSegments: string[]): string;
+    /**
+     * Determines whether {path} is an absolute path. An absolute path will always resolve to the same location, regardless of the working directory.
+     *
+     * @param path path to test.
+     */
+    function isAbsolute(path: string): boolean;
+    /**
+     * Solve the relative path from {from} to {to}.
+     * At times we have two absolute paths, and we need to derive the relative path from one to the other. This is actually the reverse transform of path.resolve.
+     */
+    function relative(from: string, to: string): string;
+    /**
+     * Return the directory name of a path. Similar to the Unix dirname command.
+     *
+     * @param p the path to evaluate.
+     */
+    function dirname(p: string): string;
+    /**
+     * Return the last portion of a path. Similar to the Unix basename command.
+     * Often used to extract the file name from a fully qualified path.
+     *
+     * @param p the path to evaluate.
+     * @param ext optionally, an extension to remove from the result.
+     */
+    function basename(p: string, ext?: string): string;
+    /**
+     * Return the extension of the path, from the last '.' to end of string in the last portion of the path.
+     * If there is no '.' in the last portion of the path or the first character of it is '.', then it returns an empty string
+     *
+     * @param p the path to evaluate.
+     */
+    function extname(p: string): string;
+    /**
+     * The platform-specific file separator. '\\' or '/'.
+     */
+    const sep: '\\' | '/';
+    /**
+     * The platform-specific file delimiter. ';' or ':'.
+     */
+    const delimiter: ';' | ':';
+    /**
+     * Returns an object from a path string - the opposite of format().
+     *
+     * @param pathString path to evaluate.
+     */
+    function parse(pathString: string): ParsedPath;
+    /**
+     * Returns a path string from an object - the opposite of parse().
+     *
+     * @param pathString path to evaluate.
+     */
+    function format(pathObject: FormatInputPathObject): string;
+
+    namespace posix {
+        function normalize(p: string): string;
+        function join(...paths: any[]): string;
+        function resolve(...pathSegments: any[]): string;
+        function isAbsolute(p: string): boolean;
+        function relative(from: string, to: string): string;
+        function dirname(p: string): string;
+        function basename(p: string, ext?: string): string;
+        function extname(p: string): string;
+        const sep: string;
+        const delimiter: string;
+        function parse(p: string): ParsedPath;
+        function format(pP: FormatInputPathObject): string;
+    }
+
+    namespace win32 {
+        function normalize(p: string): string;
+        function join(...paths: any[]): string;
+        function resolve(...pathSegments: any[]): string;
+        function isAbsolute(p: string): boolean;
+        function relative(from: string, to: string): string;
+        function dirname(p: string): string;
+        function basename(p: string, ext?: string): string;
+        function extname(p: string): string;
+        const sep: string;
+        const delimiter: string;
+        function parse(p: string): ParsedPath;
+        function format(pP: FormatInputPathObject): string;
+    }
+}
diff --git a/types/node/v10/perf_hooks.d.ts b/types/node/v10/perf_hooks.d.ts
new file mode 100644
index 0000000000..4f68895ce6
--- /dev/null
+++ b/types/node/v10/perf_hooks.d.ts
@@ -0,0 +1,241 @@
+declare module "perf_hooks" {
+    import { AsyncResource } from "async_hooks";
+
+    interface PerformanceEntry {
+        /**
+         * The total number of milliseconds elapsed for this entry.
+         * This value will not be meaningful for all Performance Entry types.
+         */
+        readonly duration: number;
+
+        /**
+         * The name of the performance entry.
+         */
+        readonly name: string;
+
+        /**
+         * The high resolution millisecond timestamp marking the starting time of the Performance Entry.
+         */
+        readonly startTime: number;
+
+        /**
+         * The type of the performance entry.
+         * Currently it may be one of: 'node', 'mark', 'measure', 'gc', or 'function'.
+         */
+        readonly entryType: string;
+
+        /**
+         * When performanceEntry.entryType is equal to 'gc', the performance.kind property identifies
+         * the type of garbage collection operation that occurred.
+         * The value may be one of perf_hooks.constants.
+         */
+        readonly kind?: number;
+    }
+
+    interface PerformanceNodeTiming extends PerformanceEntry {
+        /**
+         * The high resolution millisecond timestamp at which the Node.js process completed bootstrap.
+         */
+        readonly bootstrapComplete: number;
+
+        /**
+         * The high resolution millisecond timestamp at which cluster processing ended.
+         */
+        readonly clusterSetupEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which cluster processing started.
+         */
+        readonly clusterSetupStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the Node.js event loop exited.
+         */
+        readonly loopExit: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the Node.js event loop started.
+         */
+        readonly loopStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which main module load ended.
+         */
+        readonly moduleLoadEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which main module load started.
+         */
+        readonly moduleLoadStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the Node.js process was initialized.
+         */
+        readonly nodeStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which preload module load ended.
+         */
+        readonly preloadModuleLoadEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which preload module load started.
+         */
+        readonly preloadModuleLoadStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which third_party_main processing ended.
+         */
+        readonly thirdPartyMainEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which third_party_main processing started.
+         */
+        readonly thirdPartyMainStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the V8 platform was initialized.
+         */
+        readonly v8Start: number;
+    }
+
+    interface Performance {
+        /**
+         * If name is not provided, removes all PerformanceFunction objects from the Performance Timeline.
+         * If name is provided, removes entries with name.
+         * @param name
+         */
+        clearFunctions(name?: string): void;
+
+        /**
+         * If name is not provided, removes all PerformanceMark objects from the Performance Timeline.
+         * If name is provided, removes only the named mark.
+         * @param name
+         */
+        clearMarks(name?: string): void;
+
+        /**
+         * If name is not provided, removes all PerformanceMeasure objects from the Performance Timeline.
+         * If name is provided, removes only objects whose performanceEntry.name matches name.
+         */
+        clearMeasures(name?: string): void;
+
+        /**
+         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime.
+         * @return list of all PerformanceEntry objects
+         */
+        getEntries(): PerformanceEntry[];
+
+        /**
+         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.name is equal to name, and optionally, whose performanceEntry.entryType is equal to type.
+         * @param name
+         * @param type
+         * @return list of all PerformanceEntry objects
+         */
+        getEntriesByName(name: string, type?: string): PerformanceEntry[];
+
+        /**
+         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.entryType is equal to type.
+         * @param type
+         * @return list of all PerformanceEntry objects
+         */
+        getEntriesByType(type: string): PerformanceEntry[];
+
+        /**
+         * Creates a new PerformanceMark entry in the Performance Timeline.
+         * A PerformanceMark is a subclass of PerformanceEntry whose performanceEntry.entryType is always 'mark',
+         * and whose performanceEntry.duration is always 0.
+         * Performance marks are used to mark specific significant moments in the Performance Timeline.
+         * @param name
+         */
+        mark(name?: string): void;
+
+        /**
+         * Creates a new PerformanceMeasure entry in the Performance Timeline.
+         * A PerformanceMeasure is a subclass of PerformanceEntry whose performanceEntry.entryType is always 'measure',
+         * and whose performanceEntry.duration measures the number of milliseconds elapsed since startMark and endMark.
+         *
+         * The startMark argument may identify any existing PerformanceMark in the the Performance Timeline, or may identify
+         * any of the timestamp properties provided by the PerformanceNodeTiming class. If the named startMark does not exist,
+         * then startMark is set to timeOrigin by default.
+         *
+         * The endMark argument must identify any existing PerformanceMark in the the Performance Timeline or any of the timestamp
+         * properties provided by the PerformanceNodeTiming class. If the named endMark does not exist, an error will be thrown.
+         * @param name
+         * @param startMark
+         * @param endMark
+         */
+        measure(name: string, startMark: string, endMark: string): void;
+
+        /**
+         * An instance of the PerformanceNodeTiming class that provides performance metrics for specific Node.js operational milestones.
+         */
+        readonly nodeTiming: PerformanceNodeTiming;
+
+        /**
+         * @return the current high resolution millisecond timestamp
+         */
+        now(): number;
+
+        /**
+         * The timeOrigin specifies the high resolution millisecond timestamp from which all performance metric durations are measured.
+         */
+        readonly timeOrigin: number;
+
+        /**
+         * Wraps a function within a new function that measures the running time of the wrapped function.
+         * A PerformanceObserver must be subscribed to the 'function' event type in order for the timing details to be accessed.
+         * @param fn
+         */
+        timerify<T extends (...optionalParams: any[]) => any>(fn: T): T;
+    }
+
+    interface PerformanceObserverEntryList {
+        /**
+         * @return a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime.
+         */
+        getEntries(): PerformanceEntry[];
+
+        /**
+         * @return a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.name is equal to name, and optionally, whose performanceEntry.entryType is equal to type.
+         */
+        getEntriesByName(name: string, type?: string): PerformanceEntry[];
+
+        /**
+         * @return Returns a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.entryType is equal to type.
+         */
+        getEntriesByType(type: string): PerformanceEntry[];
+    }
+
+    type PerformanceObserverCallback = (list: PerformanceObserverEntryList, observer: PerformanceObserver) => void;
+
+    class PerformanceObserver extends AsyncResource {
+        constructor(callback: PerformanceObserverCallback);
+
+        /**
+         * Disconnects the PerformanceObserver instance from all notifications.
+         */
+        disconnect(): void;
+
+        /**
+         * Subscribes the PerformanceObserver instance to notifications of new PerformanceEntry instances identified by options.entryTypes.
+         * When options.buffered is false, the callback will be invoked once for every PerformanceEntry instance.
+         * Property buffered defaults to false.
+         * @param options
+         */
+        observe(options: { entryTypes: string[], buffered?: boolean }): void;
+    }
+
+    namespace constants {
+        const NODE_PERFORMANCE_GC_MAJOR: number;
+        const NODE_PERFORMANCE_GC_MINOR: number;
+        const NODE_PERFORMANCE_GC_INCREMENTAL: number;
+        const NODE_PERFORMANCE_GC_WEAKCB: number;
+    }
+
+    const performance: Performance;
+}
diff --git a/types/node/v10/process.d.ts b/types/node/v10/process.d.ts
new file mode 100644
index 0000000000..ccd5c9c198
--- /dev/null
+++ b/types/node/v10/process.d.ts
@@ -0,0 +1,3 @@
+declare module "process" {
+    export = process;
+}
diff --git a/types/node/v10/punycode.d.ts b/types/node/v10/punycode.d.ts
new file mode 100644
index 0000000000..efc55622f1
--- /dev/null
+++ b/types/node/v10/punycode.d.ts
@@ -0,0 +1,12 @@
+declare module "punycode" {
+    function decode(string: string): string;
+    function encode(string: string): string;
+    function toUnicode(domain: string): string;
+    function toASCII(domain: string): string;
+    const ucs2: ucs2;
+    interface ucs2 {
+        decode(string: string): number[];
+        encode(codePoints: number[]): string;
+    }
+    const version: any;
+}
diff --git a/types/node/v10/querystring.d.ts b/types/node/v10/querystring.d.ts
new file mode 100644
index 0000000000..f54d352c6c
--- /dev/null
+++ b/types/node/v10/querystring.d.ts
@@ -0,0 +1,17 @@
+declare module "querystring" {
+    interface StringifyOptions {
+        encodeURIComponent?: Function;
+    }
+
+    interface ParseOptions {
+        maxKeys?: number;
+        decodeURIComponent?: Function;
+    }
+
+    interface ParsedUrlQuery { [key: string]: string | string[]; }
+
+    function stringify(obj?: {}, sep?: string, eq?: string, options?: StringifyOptions): string;
+    function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): ParsedUrlQuery;
+    function escape(str: string): string;
+    function unescape(str: string): string;
+}
diff --git a/types/node/v10/readline.d.ts b/types/node/v10/readline.d.ts
new file mode 100644
index 0000000000..9c25da4982
--- /dev/null
+++ b/types/node/v10/readline.d.ts
@@ -0,0 +1,135 @@
+declare module "readline" {
+    import * as events from "events";
+    import * as stream from "stream";
+
+    interface Key {
+        sequence?: string;
+        name?: string;
+        ctrl?: boolean;
+        meta?: boolean;
+        shift?: boolean;
+    }
+
+    class Interface extends events.EventEmitter {
+        readonly terminal: boolean;
+
+        /**
+         * NOTE: According to the documentation:
+         *
+         * > Instances of the `readline.Interface` class are constructed using the
+         * > `readline.createInterface()` method.
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/readline.html#readline_class_interface
+         */
+        protected constructor(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean);
+        /**
+         * NOTE: According to the documentation:
+         *
+         * > Instances of the `readline.Interface` class are constructed using the
+         * > `readline.createInterface()` method.
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/readline.html#readline_class_interface
+         */
+        protected constructor(options: ReadLineOptions);
+
+        setPrompt(prompt: string): void;
+        prompt(preserveCursor?: boolean): void;
+        question(query: string, callback: (answer: string) => void): void;
+        pause(): this;
+        resume(): this;
+        close(): void;
+        write(data: string | Buffer, key?: Key): void;
+
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. line
+         * 3. pause
+         * 4. resume
+         * 5. SIGCONT
+         * 6. SIGINT
+         * 7. SIGTSTP
+         */
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "line", listener: (input: string) => void): this;
+        addListener(event: "pause", listener: () => void): this;
+        addListener(event: "resume", listener: () => void): this;
+        addListener(event: "SIGCONT", listener: () => void): this;
+        addListener(event: "SIGINT", listener: () => void): this;
+        addListener(event: "SIGTSTP", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "line", input: string): boolean;
+        emit(event: "pause"): boolean;
+        emit(event: "resume"): boolean;
+        emit(event: "SIGCONT"): boolean;
+        emit(event: "SIGINT"): boolean;
+        emit(event: "SIGTSTP"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "line", listener: (input: string) => void): this;
+        on(event: "pause", listener: () => void): this;
+        on(event: "resume", listener: () => void): this;
+        on(event: "SIGCONT", listener: () => void): this;
+        on(event: "SIGINT", listener: () => void): this;
+        on(event: "SIGTSTP", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "line", listener: (input: string) => void): this;
+        once(event: "pause", listener: () => void): this;
+        once(event: "resume", listener: () => void): this;
+        once(event: "SIGCONT", listener: () => void): this;
+        once(event: "SIGINT", listener: () => void): this;
+        once(event: "SIGTSTP", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "line", listener: (input: string) => void): this;
+        prependListener(event: "pause", listener: () => void): this;
+        prependListener(event: "resume", listener: () => void): this;
+        prependListener(event: "SIGCONT", listener: () => void): this;
+        prependListener(event: "SIGINT", listener: () => void): this;
+        prependListener(event: "SIGTSTP", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "line", listener: (input: string) => void): this;
+        prependOnceListener(event: "pause", listener: () => void): this;
+        prependOnceListener(event: "resume", listener: () => void): this;
+        prependOnceListener(event: "SIGCONT", listener: () => void): this;
+        prependOnceListener(event: "SIGINT", listener: () => void): this;
+        prependOnceListener(event: "SIGTSTP", listener: () => void): this;
+    }
+
+    type ReadLine = Interface; // type forwarded for backwards compatiblity
+
+    type Completer = (line: string) => CompleterResult;
+    type AsyncCompleter = (line: string, callback: (err: any, result: CompleterResult) => void) => any;
+
+    type CompleterResult = [string[], string];
+
+    interface ReadLineOptions {
+        input: NodeJS.ReadableStream;
+        output?: NodeJS.WritableStream;
+        completer?: Completer | AsyncCompleter;
+        terminal?: boolean;
+        historySize?: number;
+        prompt?: string;
+        crlfDelay?: number;
+        removeHistoryDuplicates?: boolean;
+    }
+
+    function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean): Interface;
+    function createInterface(options: ReadLineOptions): Interface;
+
+    function cursorTo(stream: NodeJS.WritableStream, x: number, y?: number): void;
+    function emitKeypressEvents(stream: NodeJS.ReadableStream, interface?: Interface): void;
+    function moveCursor(stream: NodeJS.WritableStream, dx: number | string, dy: number | string): void;
+    function clearLine(stream: NodeJS.WritableStream, dir: number): void;
+    function clearScreenDown(stream: NodeJS.WritableStream): void;
+}
diff --git a/types/node/v10/repl.d.ts b/types/node/v10/repl.d.ts
new file mode 100644
index 0000000000..cb5a3d037b
--- /dev/null
+++ b/types/node/v10/repl.d.ts
@@ -0,0 +1,372 @@
+declare module "repl" {
+    import { Interface, Completer, AsyncCompleter } from "readline";
+    import { Context } from "vm";
+    import { InspectOptions } from "util";
+
+    interface ReplOptions {
+        /**
+         * The input prompt to display.
+         * Default: `"> "`
+         */
+        prompt?: string;
+        /**
+         * The `Readable` stream from which REPL input will be read.
+         * Default: `process.stdin`
+         */
+        input?: NodeJS.ReadableStream;
+        /**
+         * The `Writable` stream to which REPL output will be written.
+         * Default: `process.stdout`
+         */
+        output?: NodeJS.WritableStream;
+        /**
+         * If `true`, specifies that the output should be treated as a TTY terminal, and have
+         * ANSI/VT100 escape codes written to it.
+         * Default: checking the value of the `isTTY` property on the output stream upon
+         * instantiation.
+         */
+        terminal?: boolean;
+        /**
+         * The function to be used when evaluating each given line of input.
+         * Default: an async wrapper for the JavaScript `eval()` function. An `eval` function can
+         * error with `repl.Recoverable` to indicate the input was incomplete and prompt for
+         * additional lines.
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_default_evaluation
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_custom_evaluation_functions
+         */
+        eval?: REPLEval;
+        /**
+         * If `true`, specifies that the default `writer` function should include ANSI color
+         * styling to REPL output. If a custom `writer` function is provided then this has no
+         * effect.
+         * Default: the REPL instance's `terminal` value.
+         */
+        useColors?: boolean;
+        /**
+         * If `true`, specifies that the default evaluation function will use the JavaScript
+         * `global` as the context as opposed to creating a new separate context for the REPL
+         * instance. The node CLI REPL sets this value to `true`.
+         * Default: `false`.
+         */
+        useGlobal?: boolean;
+        /**
+         * If `true`, specifies that the default writer will not output the return value of a
+         * command if it evaluates to `undefined`.
+         * Default: `false`.
+         */
+        ignoreUndefined?: boolean;
+        /**
+         * The function to invoke to format the output of each command before writing to `output`.
+         * Default: a wrapper for `util.inspect`.
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_customizing_repl_output
+         */
+        writer?: REPLWriter;
+        /**
+         * An optional function used for custom Tab auto completion.
+         *
+         * @see https://nodejs.org/dist/latest-v11.x/docs/api/readline.html#readline_use_of_the_completer_function
+         */
+        completer?: Completer | AsyncCompleter;
+        /**
+         * A flag that specifies whether the default evaluator executes all JavaScript commands in
+         * strict mode or default (sloppy) mode.
+         * Accepted values are:
+         * - `repl.REPL_MODE_SLOPPY` - evaluates expressions in sloppy mode.
+         * - `repl.REPL_MODE_STRICT` - evaluates expressions in strict mode. This is equivalent to
+         *   prefacing every repl statement with `'use strict'`.
+         */
+        replMode?: typeof REPL_MODE_SLOPPY | typeof REPL_MODE_STRICT;
+        /**
+         * Stop evaluating the current piece of code when `SIGINT` is received, i.e. `Ctrl+C` is
+         * pressed. This cannot be used together with a custom `eval` function.
+         * Default: `false`.
+         */
+        breakEvalOnSigint?: boolean;
+    }
+
+    type REPLEval = (this: REPLServer, evalCmd: string, context: Context, file: string, cb: (err: Error | null, result: any) => void) => void;
+    type REPLWriter = (this: REPLServer, obj: any) => string;
+
+    /**
+     * This is the default "writer" value, if none is passed in the REPL options,
+     * and it can be overridden by custom print functions.
+     */
+    const writer: REPLWriter & { options: InspectOptions };
+
+    type REPLCommandAction = (this: REPLServer, text: string) => void;
+
+    interface REPLCommand {
+        /**
+         * Help text to be displayed when `.help` is entered.
+         */
+        help?: string;
+        /**
+         * The function to execute, optionally accepting a single string argument.
+         */
+        action: REPLCommandAction;
+    }
+
+    /**
+     * Provides a customizable Read-Eval-Print-Loop (REPL).
+     *
+     * Instances of `repl.REPLServer` will accept individual lines of user input, evaluate those
+     * according to a user-defined evaluation function, then output the result. Input and output
+     * may be from `stdin` and `stdout`, respectively, or may be connected to any Node.js `stream`.
+     *
+     * Instances of `repl.REPLServer` support automatic completion of inputs, simplistic Emacs-style
+     * line editing, multi-line inputs, ANSI-styled output, saving and restoring current REPL session
+     * state, error recovery, and customizable evaluation functions.
+     *
+     * Instances of `repl.REPLServer` are created using the `repl.start()` method and _should not_
+     * be created directly using the JavaScript `new` keyword.
+     *
+     * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_repl
+     */
+    class REPLServer extends Interface {
+        /**
+         * The `vm.Context` provided to the `eval` function to be used for JavaScript
+         * evaluation.
+         */
+        readonly context: Context;
+        /**
+         * The `Readable` stream from which REPL input will be read.
+         */
+        readonly inputStream: NodeJS.ReadableStream;
+        /**
+         * The `Writable` stream to which REPL output will be written.
+         */
+        readonly outputStream: NodeJS.WritableStream;
+        /**
+         * The commands registered via `replServer.defineCommand()`.
+         */
+        readonly commands: { readonly [name: string]: REPLCommand | undefined };
+        /**
+         * A value indicating whether the REPL is currently in "editor mode".
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_commands_and_special_keys
+         */
+        readonly editorMode: boolean;
+        /**
+         * A value indicating whether the `_` variable has been assigned.
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_assignment_of_the_underscore_variable
+         */
+        readonly underscoreAssigned: boolean;
+        /**
+         * The last evaluation result from the REPL (assigned to the `_` variable inside of the REPL).
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_assignment_of_the_underscore_variable
+         */
+        readonly last: any;
+        /**
+         * A value indicating whether the `_error` variable has been assigned.
+         *
+         * @since v9.8.0
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_assignment_of_the_underscore_variable
+         */
+        readonly underscoreErrAssigned: boolean;
+        /**
+         * The last error raised inside the REPL (assigned to the `_error` variable inside of the REPL).
+         *
+         * @since v9.8.0
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_assignment_of_the_underscore_variable
+         */
+        readonly lastError: any;
+        /**
+         * Specified in the REPL options, this is the function to be used when evaluating each
+         * given line of input. If not specified in the REPL options, this is an async wrapper
+         * for the JavaScript `eval()` function.
+         */
+        readonly eval: REPLEval;
+        /**
+         * Specified in the REPL options, this is a value indicating whether the default
+         * `writer` function should include ANSI color styling to REPL output.
+         */
+        readonly useColors: boolean;
+        /**
+         * Specified in the REPL options, this is a value indicating whether the default `eval`
+         * function will use the JavaScript `global` as the context as opposed to creating a new
+         * separate context for the REPL instance.
+         */
+        readonly useGlobal: boolean;
+        /**
+         * Specified in the REPL options, this is a value indicating whether the default `writer`
+         * function should output the result of a command if it evaluates to `undefined`.
+         */
+        readonly ignoreUndefined: boolean;
+        /**
+         * Specified in the REPL options, this is the function to invoke to format the output of
+         * each command before writing to `outputStream`. If not specified in the REPL options,
+         * this will be a wrapper for `util.inspect`.
+         */
+        readonly writer: REPLWriter;
+        /**
+         * Specified in the REPL options, this is the function to use for custom Tab auto-completion.
+         */
+        readonly completer: Completer | AsyncCompleter;
+        /**
+         * Specified in the REPL options, this is a flag that specifies whether the default `eval`
+         * function should execute all JavaScript commands in strict mode or default (sloppy) mode.
+         * Possible values are:
+         * - `repl.REPL_MODE_SLOPPY` - evaluates expressions in sloppy mode.
+         * - `repl.REPL_MODE_STRICT` - evaluates expressions in strict mode. This is equivalent to
+         *    prefacing every repl statement with `'use strict'`.
+         */
+        readonly replMode: typeof REPL_MODE_SLOPPY | typeof REPL_MODE_STRICT;
+
+        /**
+         * NOTE: According to the documentation:
+         *
+         * > Instances of `repl.REPLServer` are created using the `repl.start()` method and
+         * > _should not_ be created directly using the JavaScript `new` keyword.
+         *
+         * `REPLServer` cannot be subclassed due to implementation specifics in NodeJS.
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_class_replserver
+         */
+        private constructor();
+
+        /**
+         * Used to add new `.`-prefixed commands to the REPL instance. Such commands are invoked
+         * by typing a `.` followed by the `keyword`.
+         *
+         * @param keyword The command keyword (_without_ a leading `.` character).
+         * @param cmd The function to invoke when the command is processed.
+         *
+         * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_replserver_definecommand_keyword_cmd
+         */
+        defineCommand(keyword: string, cmd: REPLCommandAction | REPLCommand): void;
+        /**
+         * Readies the REPL instance for input from the user, printing the configured `prompt` to a
+         * new line in the `output` and resuming the `input` to accept new input.
+         *
+         * When multi-line input is being entered, an ellipsis is printed rather than the 'prompt'.
+         *
+         * This method is primarily intended to be called from within the action function for
+         * commands registered using the `replServer.defineCommand()` method.
+         *
+         * @param preserveCursor When `true`, the cursor placement will not be reset to `0`.
+         */
+        displayPrompt(preserveCursor?: boolean): void;
+        /**
+         * Clears any command that has been buffered but not yet executed.
+         *
+         * This method is primarily intended to be called from within the action function for
+         * commands registered using the `replServer.defineCommand()` method.
+         *
+         * @since v9.0.0
+         */
+        clearBufferedCommand(): void;
+
+        /**
+         * events.EventEmitter
+         * 1. close - inherited from `readline.Interface`
+         * 2. line - inherited from `readline.Interface`
+         * 3. pause - inherited from `readline.Interface`
+         * 4. resume - inherited from `readline.Interface`
+         * 5. SIGCONT - inherited from `readline.Interface`
+         * 6. SIGINT - inherited from `readline.Interface`
+         * 7. SIGTSTP - inherited from `readline.Interface`
+         * 8. exit
+         * 9. reset
+         */
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "line", listener: (input: string) => void): this;
+        addListener(event: "pause", listener: () => void): this;
+        addListener(event: "resume", listener: () => void): this;
+        addListener(event: "SIGCONT", listener: () => void): this;
+        addListener(event: "SIGINT", listener: () => void): this;
+        addListener(event: "SIGTSTP", listener: () => void): this;
+        addListener(event: "exit", listener: () => void): this;
+        addListener(event: "reset", listener: (context: Context) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "line", input: string): boolean;
+        emit(event: "pause"): boolean;
+        emit(event: "resume"): boolean;
+        emit(event: "SIGCONT"): boolean;
+        emit(event: "SIGINT"): boolean;
+        emit(event: "SIGTSTP"): boolean;
+        emit(event: "exit"): boolean;
+        emit(event: "reset", context: Context): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "line", listener: (input: string) => void): this;
+        on(event: "pause", listener: () => void): this;
+        on(event: "resume", listener: () => void): this;
+        on(event: "SIGCONT", listener: () => void): this;
+        on(event: "SIGINT", listener: () => void): this;
+        on(event: "SIGTSTP", listener: () => void): this;
+        on(event: "exit", listener: () => void): this;
+        on(event: "reset", listener: (context: Context) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "line", listener: (input: string) => void): this;
+        once(event: "pause", listener: () => void): this;
+        once(event: "resume", listener: () => void): this;
+        once(event: "SIGCONT", listener: () => void): this;
+        once(event: "SIGINT", listener: () => void): this;
+        once(event: "SIGTSTP", listener: () => void): this;
+        once(event: "exit", listener: () => void): this;
+        once(event: "reset", listener: (context: Context) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "line", listener: (input: string) => void): this;
+        prependListener(event: "pause", listener: () => void): this;
+        prependListener(event: "resume", listener: () => void): this;
+        prependListener(event: "SIGCONT", listener: () => void): this;
+        prependListener(event: "SIGINT", listener: () => void): this;
+        prependListener(event: "SIGTSTP", listener: () => void): this;
+        prependListener(event: "exit", listener: () => void): this;
+        prependListener(event: "reset", listener: (context: Context) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "line", listener: (input: string) => void): this;
+        prependOnceListener(event: "pause", listener: () => void): this;
+        prependOnceListener(event: "resume", listener: () => void): this;
+        prependOnceListener(event: "SIGCONT", listener: () => void): this;
+        prependOnceListener(event: "SIGINT", listener: () => void): this;
+        prependOnceListener(event: "SIGTSTP", listener: () => void): this;
+        prependOnceListener(event: "exit", listener: () => void): this;
+        prependOnceListener(event: "reset", listener: (context: Context) => void): this;
+    }
+
+    /**
+     * A flag passed in the REPL options. Evaluates expressions in sloppy mode.
+     */
+    export const REPL_MODE_SLOPPY: symbol; // TODO: unique symbol
+
+    /**
+     * A flag passed in the REPL options. Evaluates expressions in strict mode.
+     * This is equivalent to prefacing every repl statement with `'use strict'`.
+     */
+    export const REPL_MODE_STRICT: symbol; // TODO: unique symbol
+
+    /**
+     * Creates and starts a `repl.REPLServer` instance.
+     *
+     * @param options The options for the `REPLServer`. If `options` is a string, then it specifies
+     * the input prompt.
+     */
+    function start(options?: string | ReplOptions): REPLServer;
+
+    /**
+     * Indicates a recoverable error that a `REPLServer` can use to support multi-line input.
+     *
+     * @see https://nodejs.org/dist/latest-v10.x/docs/api/repl.html#repl_recoverable_errors
+     */
+    class Recoverable extends SyntaxError {
+        err: Error;
+
+        constructor(err: Error);
+    }
+}
diff --git a/types/node/v10/stream.d.ts b/types/node/v10/stream.d.ts
new file mode 100644
index 0000000000..a4428728db
--- /dev/null
+++ b/types/node/v10/stream.d.ts
@@ -0,0 +1,294 @@
+declare module "stream" {
+    import * as events from "events";
+
+    class internal extends events.EventEmitter {
+        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+    }
+
+    namespace internal {
+        class Stream extends internal { }
+
+        interface ReadableOptions {
+            highWaterMark?: number;
+            encoding?: string;
+            objectMode?: boolean;
+            read?(this: Readable, size: number): void;
+            destroy?(this: Readable, error: Error | null, callback: (error: Error | null) => void): void;
+        }
+
+        class Readable extends Stream implements NodeJS.ReadableStream {
+            readable: boolean;
+            readonly readableHighWaterMark: number;
+            readonly readableLength: number;
+            constructor(opts?: ReadableOptions);
+            _read(size: number): void;
+            read(size?: number): any;
+            setEncoding(encoding: string): this;
+            pause(): this;
+            resume(): this;
+            isPaused(): boolean;
+            unpipe(destination?: NodeJS.WritableStream): this;
+            unshift(chunk: any): void;
+            wrap(oldStream: NodeJS.ReadableStream): this;
+            push(chunk: any, encoding?: string): boolean;
+            _destroy(error: Error | null, callback: (error: Error | null) => void): void;
+            destroy(error?: Error): void;
+
+            /**
+             * Event emitter
+             * The defined events on documents including:
+             * 1. close
+             * 2. data
+             * 3. end
+             * 4. readable
+             * 5. error
+             */
+            addListener(event: "close", listener: () => 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: "close"): 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: "close", listener: () => 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: "close", listener: () => 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: "close", listener: () => 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: "close", listener: () => 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: "close", listener: () => 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<any>;
+        }
+
+        interface WritableOptions {
+            highWaterMark?: number;
+            decodeStrings?: boolean;
+            objectMode?: boolean;
+            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;
+        }
+
+        class Writable extends Stream implements NodeJS.WritableStream {
+            writable: boolean;
+            readonly writableHighWaterMark: number;
+            readonly writableLength: number;
+            constructor(opts?: WritableOptions);
+            _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?: () => void): void;
+            end(chunk: any, cb?: () => void): void;
+            end(chunk: any, encoding?: string, cb?: () => void): void;
+            cork(): void;
+            uncork(): void;
+            destroy(error?: Error): void;
+
+            /**
+             * Event emitter
+             * The defined events on documents including:
+             * 1. close
+             * 2. drain
+             * 3. error
+             * 4. finish
+             * 5. pipe
+             * 6. unpipe
+             */
+            addListener(event: "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: "close"): 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: "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: "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: "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: "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: "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;
+        }
+
+        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.
+        class Duplex extends Readable implements Writable {
+            writable: boolean;
+            readonly writableHighWaterMark: number;
+            readonly writableLength: number;
+            constructor(opts?: DuplexOptions);
+            _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?: () => void): void;
+            end(chunk: any, cb?: () => void): void;
+            end(chunk: any, encoding?: string, cb?: () => void): void;
+            cork(): void;
+            uncork(): void;
+        }
+
+        type TransformCallback = (error?: Error, data?: any) => void;
+
+        interface TransformOptions extends DuplexOptions {
+            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;
+        }
+
+        class Transform extends Duplex {
+            constructor(opts?: TransformOptions);
+            _transform(chunk: any, encoding: string, callback: TransformCallback): void;
+            _flush(callback: TransformCallback): void;
+        }
+
+        class PassThrough extends Transform { }
+
+        function finished(stream: NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream, callback: (err?: NodeJS.ErrnoException) => void): () => void;
+        namespace finished {
+            function __promisify__(stream: NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream): Promise<void>;
+        }
+
+        function pipeline<T extends NodeJS.WritableStream>(stream1: NodeJS.ReadableStream, stream2: T, callback?: (err: NodeJS.ErrnoException) => void): T;
+        function pipeline<T extends NodeJS.WritableStream>(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream, stream3: T, callback?: (err: NodeJS.ErrnoException) => void): T;
+        function pipeline<T extends NodeJS.WritableStream>(
+            stream1: NodeJS.ReadableStream,
+            stream2: NodeJS.ReadWriteStream,
+            stream3: NodeJS.ReadWriteStream,
+            stream4: T,
+            callback?: (err: NodeJS.ErrnoException) => void,
+        ): T;
+        function pipeline<T extends NodeJS.WritableStream>(
+            stream1: NodeJS.ReadableStream,
+            stream2: NodeJS.ReadWriteStream,
+            stream3: NodeJS.ReadWriteStream,
+            stream4: NodeJS.ReadWriteStream,
+            stream5: T,
+            callback?: (err: NodeJS.ErrnoException) => void,
+        ): T;
+        function pipeline(streams: Array<NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream>, callback?: (err: NodeJS.ErrnoException) => void): NodeJS.WritableStream;
+        function pipeline(
+            stream1: NodeJS.ReadableStream,
+            stream2: NodeJS.ReadWriteStream | NodeJS.WritableStream,
+            ...streams: Array<NodeJS.ReadWriteStream | NodeJS.WritableStream | ((err: NodeJS.ErrnoException) => void)>,
+        ): NodeJS.WritableStream;
+        namespace pipeline {
+            function __promisify__(stream1: NodeJS.ReadableStream, stream2: NodeJS.WritableStream): Promise<void>;
+            function __promisify__(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream, stream3: NodeJS.WritableStream): Promise<void>;
+            function __promisify__(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream, stream3: NodeJS.ReadWriteStream, stream4: NodeJS.WritableStream): Promise<void>;
+            function __promisify__(
+                stream1: NodeJS.ReadableStream,
+                stream2: NodeJS.ReadWriteStream,
+                stream3: NodeJS.ReadWriteStream,
+                stream4: NodeJS.ReadWriteStream,
+                stream5: NodeJS.WritableStream,
+            ): Promise<void>;
+            function __promisify__(streams: Array<NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream>): Promise<void>;
+            function __promisify__(
+                stream1: NodeJS.ReadableStream,
+                stream2: NodeJS.ReadWriteStream | NodeJS.WritableStream,
+                ...streams: Array<NodeJS.ReadWriteStream | NodeJS.WritableStream>,
+            ): Promise<void>;
+        }
+    }
+
+    export = internal;
+}
diff --git a/types/node/v10/string_decoder.d.ts b/types/node/v10/string_decoder.d.ts
new file mode 100644
index 0000000000..762a4d8d50
--- /dev/null
+++ b/types/node/v10/string_decoder.d.ts
@@ -0,0 +1,9 @@
+declare module "string_decoder" {
+    interface NodeStringDecoder {
+        write(buffer: Buffer): string;
+        end(buffer?: Buffer): string;
+    }
+    const StringDecoder: {
+        new(encoding?: string): NodeStringDecoder;
+    };
+}
diff --git a/types/node/v10/timers.d.ts b/types/node/v10/timers.d.ts
new file mode 100644
index 0000000000..e64a6735c3
--- /dev/null
+++ b/types/node/v10/timers.d.ts
@@ -0,0 +1,16 @@
+declare module "timers" {
+    function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
+    namespace setTimeout {
+        function __promisify__(ms: number): Promise<void>;
+        function __promisify__<T>(ms: number, value: T): Promise<T>;
+    }
+    function clearTimeout(timeoutId: NodeJS.Timeout): void;
+    function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
+    function clearInterval(intervalId: NodeJS.Timeout): void;
+    function setImmediate(callback: (...args: any[]) => void, ...args: any[]): NodeJS.Immediate;
+    namespace setImmediate {
+        function __promisify__(): Promise<void>;
+        function __promisify__<T>(value: T): Promise<T>;
+    }
+    function clearImmediate(immediateId: NodeJS.Immediate): void;
+}
diff --git a/types/node/v10/tls.d.ts b/types/node/v10/tls.d.ts
new file mode 100644
index 0000000000..f59dcc7629
--- /dev/null
+++ b/types/node/v10/tls.d.ts
@@ -0,0 +1,371 @@
+declare module "tls" {
+    import * as crypto from "crypto";
+    import * as dns from "dns";
+    import * as net from "net";
+    import * as stream from "stream";
+
+    const CLIENT_RENEG_LIMIT: number;
+    const CLIENT_RENEG_WINDOW: number;
+
+    interface Certificate {
+        /**
+         * Country code.
+         */
+        C: string;
+        /**
+         * Street.
+         */
+        ST: string;
+        /**
+         * Locality.
+         */
+        L: string;
+        /**
+         * Organization.
+         */
+        O: string;
+        /**
+         * Organizational unit.
+         */
+        OU: string;
+        /**
+         * Common name.
+         */
+        CN: string;
+    }
+
+    interface PeerCertificate {
+        subject: Certificate;
+        issuer: Certificate;
+        subjectaltname: string;
+        infoAccess: { [index: string]: string[] | undefined };
+        modulus: string;
+        exponent: string;
+        valid_from: string;
+        valid_to: string;
+        fingerprint: string;
+        ext_key_usage: string[];
+        serialNumber: string;
+        raw: Buffer;
+    }
+
+    interface DetailedPeerCertificate extends PeerCertificate {
+        issuerCertificate: DetailedPeerCertificate;
+    }
+
+    interface CipherNameAndProtocol {
+        /**
+         * The cipher name.
+         */
+        name: string;
+        /**
+         * SSL/TLS protocol version.
+         */
+        version: string;
+    }
+
+    class TLSSocket extends net.Socket {
+        /**
+         * Construct a new tls.TLSSocket object from an existing TCP socket.
+         */
+        constructor(socket: net.Socket, options?: {
+            /**
+             * An optional TLS context object from tls.createSecureContext()
+             */
+            secureContext?: SecureContext,
+            /**
+             * If true the TLS socket will be instantiated in server-mode.
+             * Defaults to false.
+             */
+            isServer?: boolean,
+            /**
+             * An optional net.Server instance.
+             */
+            server?: net.Server,
+            /**
+             * If true the server will request a certificate from clients that
+             * connect and attempt to verify that certificate. Defaults to
+             * false.
+             */
+            requestCert?: boolean,
+            /**
+             * If true the server will reject any connection which is not
+             * authorized with the list of supplied CAs. This option only has an
+             * effect if requestCert is true. Defaults to false.
+             */
+            rejectUnauthorized?: boolean,
+            /**
+             * An array of strings or a Buffer naming possible NPN protocols.
+             * (Protocols should be ordered by their priority.)
+             */
+            NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array,
+            /**
+             * An array of strings or a Buffer naming possible ALPN protocols.
+             * (Protocols should be ordered by their priority.) When the server
+             * receives both NPN and ALPN extensions from the client, ALPN takes
+             * precedence over NPN and the server does not send an NPN extension
+             * to the client.
+             */
+            ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array,
+            /**
+             * SNICallback(servername, cb) <Function> A function that will be
+             * called if the client supports SNI TLS extension. Two arguments
+             * will be passed when called: servername and cb. SNICallback should
+             * invoke cb(null, ctx), where ctx is a SecureContext instance.
+             * (tls.createSecureContext(...) can be used to get a proper
+             * SecureContext.) If SNICallback wasn't provided the default callback
+             * with high-level API will be used (see below).
+             */
+            SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void,
+            /**
+             * An optional Buffer instance containing a TLS session.
+             */
+            session?: Buffer,
+            /**
+             * If true, specifies that the OCSP status request extension will be
+             * added to the client hello and an 'OCSPResponse' event will be
+             * emitted on the socket before establishing a secure communication
+             */
+            requestOCSP?: boolean
+        });
+
+        /**
+         * A boolean that is true if the peer certificate was signed by one of the specified CAs, otherwise false.
+         */
+        authorized: boolean;
+        /**
+         * The reason why the peer's certificate has not been verified.
+         * This property becomes available only when tlsSocket.authorized === false.
+         */
+        authorizationError: Error;
+        /**
+         * Static boolean value, always true.
+         * May be used to distinguish TLS sockets from regular ones.
+         */
+        encrypted: boolean;
+
+        /**
+         * String containing the selected ALPN protocol.
+         * When ALPN has no selected protocol, tlsSocket.alpnProtocol equals false.
+         */
+        alpnProtocol?: string;
+
+        /**
+         * Returns an object representing the cipher name and the SSL/TLS protocol version of the current connection.
+         * @returns Returns an object representing the cipher name
+         * and the SSL/TLS protocol version of the current connection.
+         */
+        getCipher(): CipherNameAndProtocol;
+        /**
+         * Returns an object representing the peer's certificate.
+         * The returned object has some properties corresponding to the field of the certificate.
+         * If detailed argument is true the full chain with issuer property will be returned,
+         * if false only the top certificate without issuer property.
+         * If the peer does not provide a certificate, it returns null or an empty object.
+         * @param detailed - If true; the full chain with issuer property will be returned.
+         * @returns An object representing the peer's certificate.
+         */
+        getPeerCertificate(detailed: true): DetailedPeerCertificate;
+        getPeerCertificate(detailed?: false): PeerCertificate;
+        getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
+        /**
+         * Returns a string containing the negotiated SSL/TLS protocol version of the current connection.
+         * The value `'unknown'` will be returned for connected sockets that have not completed the handshaking process.
+         * The value `null` will be returned for server sockets or disconnected client sockets.
+         * See https://www.openssl.org/docs/man1.0.2/ssl/SSL_get_version.html for more information.
+         * @returns negotiated SSL/TLS protocol version of the current connection
+         */
+        getProtocol(): string | null;
+        /**
+         * Could be used to speed up handshake establishment when reconnecting to the server.
+         * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
+         */
+        getSession(): any;
+        /**
+         * NOTE: Works only with client TLS sockets.
+         * Useful only for debugging, for session reuse provide session option to tls.connect().
+         * @returns TLS session ticket or undefined if none was negotiated.
+         */
+        getTLSTicket(): any;
+        /**
+         * Initiate TLS renegotiation process.
+         *
+         * NOTE: Can be used to request peer's certificate after the secure connection has been established.
+         * ANOTHER NOTE: When running as the server, socket will be destroyed with an error after handshakeTimeout timeout.
+         * @param options - The options may contain the following fields: rejectUnauthorized,
+         * requestCert (See tls.createServer() for details).
+         * @param callback - callback(err) will be executed with null as err, once the renegotiation
+         * is successfully completed.
+         */
+        renegotiate(options: { rejectUnauthorized?: boolean, requestCert?: boolean }, callback: (err: Error | null) => void): any;
+        /**
+         * Set maximum TLS fragment size (default and maximum value is: 16384, minimum is: 512).
+         * Smaller fragment size decreases buffering latency on the client: large fragments are buffered by
+         * the TLS layer until the entire fragment is received and its integrity is verified;
+         * large fragments can span multiple roundtrips, and their processing can be delayed due to packet
+         * loss or reordering. However, smaller fragments add extra TLS framing bytes and CPU overhead,
+         * which may decrease overall server throughput.
+         * @param size - TLS fragment size (default and maximum value is: 16384, minimum is: 512).
+         * @returns Returns true on success, false otherwise.
+         */
+        setMaxSendFragment(size: number): boolean;
+
+        /**
+         * events.EventEmitter
+         * 1. OCSPResponse
+         * 2. secureConnect
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        addListener(event: "secureConnect", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "OCSPResponse", response: Buffer): boolean;
+        emit(event: "secureConnect"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        on(event: "secureConnect", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        once(event: "secureConnect", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        prependListener(event: "secureConnect", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        prependOnceListener(event: "secureConnect", listener: () => void): this;
+    }
+
+    interface TlsOptions extends SecureContextOptions {
+        handshakeTimeout?: number;
+        requestCert?: boolean;
+        rejectUnauthorized?: boolean;
+        NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void;
+        sessionTimeout?: number;
+        ticketKeys?: Buffer;
+    }
+
+    interface ConnectionOptions extends SecureContextOptions {
+        host?: string;
+        port?: number;
+        path?: string; // Creates unix socket connection to path. If this option is specified, `host` and `port` are ignored.
+        socket?: net.Socket; // Establish secure connection on a given socket rather than creating a new socket
+        rejectUnauthorized?: boolean; // Defaults to true
+        NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        checkServerIdentity?: typeof checkServerIdentity;
+        servername?: string; // SNI TLS Extension
+        session?: Buffer;
+        minDHSize?: number;
+        secureContext?: SecureContext; // If not provided, the entire ConnectionOptions object will be passed to tls.createSecureContext()
+        lookup?: net.LookupFunction;
+    }
+
+    class Server extends net.Server {
+        addContext(hostName: string, credentials: {
+            key: string;
+            cert: string;
+            ca: string;
+        }): void;
+
+        /**
+         * events.EventEmitter
+         * 1. tlsClientError
+         * 2. newSession
+         * 3. OCSPRequest
+         * 4. resumeSession
+         * 5. secureConnection
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        addListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        addListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        addListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        addListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "tlsClientError", err: Error, tlsSocket: TLSSocket): boolean;
+        emit(event: "newSession", sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void): boolean;
+        emit(event: "OCSPRequest", certificate: Buffer, issuer: Buffer, callback: Function): boolean;
+        emit(event: "resumeSession", sessionId: any, callback: (err: Error, sessionData: any) => void): boolean;
+        emit(event: "secureConnection", tlsSocket: TLSSocket): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        on(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        on(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        on(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        on(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        once(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        once(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        once(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        once(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        prependListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        prependListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        prependListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        prependListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        prependOnceListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        prependOnceListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        prependOnceListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        prependOnceListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+    }
+
+    interface SecurePair {
+        encrypted: any;
+        cleartext: any;
+    }
+
+    interface SecureContextOptions {
+        pfx?: string | Buffer | Array<string | Buffer | Object>;
+        key?: string | Buffer | Array<Buffer | Object>;
+        passphrase?: string;
+        cert?: string | Buffer | Array<string | Buffer>;
+        ca?: string | Buffer | Array<string | Buffer>;
+        ciphers?: string;
+        honorCipherOrder?: boolean;
+        ecdhCurve?: string;
+        clientCertEngine?: string;
+        crl?: string | Buffer | Array<string | Buffer>;
+        dhparam?: string | Buffer;
+        secureOptions?: number; // Value is a numeric bitmask of the `SSL_OP_*` options
+        secureProtocol?: string; // SSL Method, e.g. SSLv23_method
+        sessionIdContext?: string;
+    }
+
+    interface SecureContext {
+        context: any;
+    }
+
+    /*
+     * Verifies the certificate `cert` is issued to host `host`.
+     * @host The hostname to verify the certificate against
+     * @cert PeerCertificate representing the peer's certificate
+     *
+     * Returns Error object, populating it with the reason, host and cert on failure.  On success, returns undefined.
+     */
+    function checkServerIdentity(host: string, cert: PeerCertificate): Error | undefined;
+    function createServer(options: TlsOptions, secureConnectionListener?: (socket: TLSSocket) => void): Server;
+    function connect(options: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
+    function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
+    function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
+    function createSecurePair(credentials?: crypto.Credentials, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair;
+    function createSecureContext(details: SecureContextOptions): SecureContext;
+    function getCiphers(): string[];
+
+    const DEFAULT_ECDH_CURVE: string;
+}
diff --git a/types/node/v10/trace_events.d.ts b/types/node/v10/trace_events.d.ts
new file mode 100644
index 0000000000..9d1a59bdd0
--- /dev/null
+++ b/types/node/v10/trace_events.d.ts
@@ -0,0 +1,61 @@
+declare module "trace_events" {
+    /**
+     * The `Tracing` object is used to enable or disable tracing for sets of
+     * categories. Instances are created using the
+     * `trace_events.createTracing()` method.
+     *
+     * When created, the `Tracing` object is disabled. Calling the
+     * `tracing.enable()` method adds the categories to the set of enabled trace
+     * event categories. Calling `tracing.disable()` will remove the categories
+     * from the set of enabled trace event categories.
+     */
+    export interface Tracing {
+        /**
+         * A comma-separated list of the trace event categories covered by this
+         * `Tracing` object.
+         */
+        readonly categories: string;
+
+        /**
+         * Disables this `Tracing` object.
+         *
+         * Only trace event categories _not_ covered by other enabled `Tracing`
+         * objects and _not_ specified by the `--trace-event-categories` flag
+         * will be disabled.
+         */
+        disable(): void;
+
+        /**
+         * Enables this `Tracing` object for the set of categories covered by
+         * the `Tracing` object.
+         */
+        enable(): void;
+
+        /**
+         * `true` only if the `Tracing` object has been enabled.
+         */
+        readonly enabled: boolean;
+    }
+
+    interface CreateTracingOptions {
+        /**
+         * An array of trace category names. Values included in the array are
+         * coerced to a string when possible. An error will be thrown if the
+         * value cannot be coerced.
+         */
+        categories: string[];
+    }
+
+    /**
+     * Creates and returns a Tracing object for the given set of categories.
+     */
+    export function createTracing(options: CreateTracingOptions): Tracing;
+
+    /**
+     * Returns a comma-separated list of all currently-enabled trace event
+     * categories. The current set of enabled trace event categories is
+     * determined by the union of all currently-enabled `Tracing` objects and
+     * any categories enabled using the `--trace-event-categories` flag.
+     */
+    export function getEnabledCategories(): string;
+}
diff --git a/types/node/v10/ts3.1/index.d.ts b/types/node/v10/ts3.1/index.d.ts
new file mode 100644
index 0000000000..be36602300
--- /dev/null
+++ b/types/node/v10/ts3.1/index.d.ts
@@ -0,0 +1,18 @@
+// NOTE: These definitions support NodeJS and TypeScript 3.1.
+
+// NOTE: TypeScript version-specific augmentations can be found in the following paths:
+//          - ~/base.d.ts         - Shared definitions common to all TypeScript versions
+//          - ~/index.d.ts        - Definitions specific to TypeScript 2.1
+//          - ~/ts3.1/index.d.ts  - Definitions specific to TypeScript 3.1
+
+// Reference required types from the default lib:
+/// <reference lib="es2018" />
+/// <reference lib="esnext.asyncIterable" />
+/// <reference lib="esnext.intl" />
+
+// Base definitions for all NodeJS modules that are not specific to any version of TypeScript:
+// tslint:disable-next-line:no-bad-reference
+/// <reference path="../base.d.ts" />
+
+// TypeScript 3.1-specific augmentations:
+/// <reference path="util.d.ts" />
diff --git a/types/node/v10/ts3.1/node-tests.ts b/types/node/v10/ts3.1/node-tests.ts
new file mode 100644
index 0000000000..18db498871
--- /dev/null
+++ b/types/node/v10/ts3.1/node-tests.ts
@@ -0,0 +1,2 @@
+// tslint:disable-next-line:no-bad-reference
+import "../node-tests";
diff --git a/types/node/v10/ts3.1/tsconfig.json b/types/node/v10/ts3.1/tsconfig.json
new file mode 100644
index 0000000000..de75d02481
--- /dev/null
+++ b/types/node/v10/ts3.1/tsconfig.json
@@ -0,0 +1,30 @@
+{
+    "files": [
+        "index.d.ts",
+        "node-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../../",
+        "typeRoots": [
+            "../../../"
+        ],
+        "paths": {
+            "node": [
+                "node/v10"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/types/node/v10/ts3.1/tslint.json b/types/node/v10/ts3.1/tslint.json
new file mode 100644
index 0000000000..1a8ddd9863
--- /dev/null
+++ b/types/node/v10/ts3.1/tslint.json
@@ -0,0 +1,10 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "ban-types": false,
+    "unified-signatures": false,
+    "no-empty-interface": false,
+    "no-single-declare-module": false,
+    "strict-export-declare-modifiers": false // http2 needs this
+  }
+}
diff --git a/types/node/v10/ts3.1/util.d.ts b/types/node/v10/ts3.1/util.d.ts
new file mode 100644
index 0000000000..e35ef8d0f1
--- /dev/null
+++ b/types/node/v10/ts3.1/util.d.ts
@@ -0,0 +1,10 @@
+// tslint:disable-next-line:no-bad-reference
+/// <reference path="../util.d.ts" />
+declare module "util" {
+    namespace inspect {
+        const custom: unique symbol;
+    }
+    namespace promisify {
+        const custom: unique symbol;
+    }
+}
diff --git a/types/node/v10/tsconfig.json b/types/node/v10/tsconfig.json
new file mode 100644
index 0000000000..d6dea0e2b3
--- /dev/null
+++ b/types/node/v10/tsconfig.json
@@ -0,0 +1,71 @@
+{
+    "files": [
+        "index.d.ts",
+        "base.d.ts",
+        "globals.d.ts",
+        "assert.d.ts",
+        "async_hooks.d.ts",
+        "buffer.d.ts",
+        "child_process.d.ts",
+        "cluster.d.ts",
+        "console.d.ts",
+        "constants.d.ts",
+        "crypto.d.ts",
+        "dgram.d.ts",
+        "dns.d.ts",
+        "domain.d.ts",
+        "events.d.ts",
+        "fs.d.ts",
+        "http.d.ts",
+        "http2.d.ts",
+        "https.d.ts",
+        "inspector.d.ts",
+        "module.d.ts",
+        "net.d.ts",
+        "os.d.ts",
+        "path.d.ts",
+        "perf_hooks.d.ts",
+        "process.d.ts",
+        "punycode.d.ts",
+        "querystring.d.ts",
+        "readline.d.ts",
+        "repl.d.ts",
+        "stream.d.ts",
+        "string_decoder.d.ts",
+        "timers.d.ts",
+        "tls.d.ts",
+        "trace_events.d.ts",
+        "tty.d.ts",
+        "url.d.ts",
+        "util.d.ts",
+        "v8.d.ts",
+        "vm.d.ts",
+        "worker_threads.d.ts",
+        "zlib.d.ts",
+        "node-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "node": [
+                "node/v10"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/types/node/v10/tslint.json b/types/node/v10/tslint.json
new file mode 100644
index 0000000000..1a8ddd9863
--- /dev/null
+++ b/types/node/v10/tslint.json
@@ -0,0 +1,10 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "ban-types": false,
+    "unified-signatures": false,
+    "no-empty-interface": false,
+    "no-single-declare-module": false,
+    "strict-export-declare-modifiers": false // http2 needs this
+  }
+}
diff --git a/types/node/v10/tty.d.ts b/types/node/v10/tty.d.ts
new file mode 100644
index 0000000000..7d75c89f58
--- /dev/null
+++ b/types/node/v10/tty.d.ts
@@ -0,0 +1,15 @@
+declare module "tty" {
+    import * as net from "net";
+
+    function isatty(fd: number): boolean;
+    class ReadStream extends net.Socket {
+        isRaw: boolean;
+        setRawMode(mode: boolean): void;
+        isTTY: boolean;
+    }
+    class WriteStream extends net.Socket {
+        columns: number;
+        rows: number;
+        isTTY: boolean;
+    }
+}
diff --git a/types/node/v10/url.d.ts b/types/node/v10/url.d.ts
new file mode 100644
index 0000000000..1e1d154e8e
--- /dev/null
+++ b/types/node/v10/url.d.ts
@@ -0,0 +1,104 @@
+declare module "url" {
+    import { ParsedUrlQuery } from 'querystring';
+
+    interface UrlObjectCommon {
+        auth?: string;
+        hash?: string;
+        host?: string;
+        hostname?: string;
+        href?: string;
+        path?: string;
+        pathname?: string;
+        protocol?: string;
+        search?: string;
+        slashes?: boolean;
+    }
+
+    // Input to `url.format`
+    interface UrlObject extends UrlObjectCommon {
+        port?: string | number;
+        query?: string | null | { [key: string]: any };
+    }
+
+    // Output of `url.parse`
+    interface Url extends UrlObjectCommon {
+        port?: string;
+        query?: string | null | ParsedUrlQuery;
+    }
+
+    interface UrlWithParsedQuery extends Url {
+        query: ParsedUrlQuery;
+    }
+
+    interface UrlWithStringQuery extends Url {
+        query: string | null;
+    }
+
+    function parse(urlStr: string): UrlWithStringQuery;
+    function parse(urlStr: string, parseQueryString: false | undefined, slashesDenoteHost?: boolean): UrlWithStringQuery;
+    function parse(urlStr: string, parseQueryString: true, slashesDenoteHost?: boolean): UrlWithParsedQuery;
+    function parse(urlStr: string, parseQueryString: boolean, slashesDenoteHost?: boolean): Url;
+
+    function format(URL: URL, options?: URLFormatOptions): string;
+    function format(urlObject: UrlObject | string): string;
+    function resolve(from: string, to: string): string;
+
+    function domainToASCII(domain: string): string;
+    function domainToUnicode(domain: string): string;
+
+    /**
+     * This function ensures the correct decodings of percent-encoded characters as
+     * well as ensuring a cross-platform valid absolute path string.
+     * @param url The file URL string or URL object to convert to a path.
+     */
+    function fileURLToPath(url: string | URL): string;
+
+    /**
+     * This function ensures that path is resolved absolutely, and that the URL
+     * control characters are correctly encoded when converting into a File URL.
+     * @param url The path to convert to a File URL.
+     */
+    function pathToFileURL(url: string): URL;
+
+    interface URLFormatOptions {
+        auth?: boolean;
+        fragment?: boolean;
+        search?: boolean;
+        unicode?: boolean;
+    }
+
+    class URL {
+        constructor(input: string, base?: string | URL);
+        hash: string;
+        host: string;
+        hostname: string;
+        href: string;
+        readonly origin: string;
+        password: string;
+        pathname: string;
+        port: string;
+        protocol: string;
+        search: string;
+        readonly searchParams: URLSearchParams;
+        username: string;
+        toString(): string;
+        toJSON(): string;
+    }
+
+    class URLSearchParams implements Iterable<[string, string]> {
+        constructor(init?: URLSearchParams | string | { [key: string]: string | string[] | undefined } | Iterable<[string, string]> | Array<[string, string]>);
+        append(name: string, value: string): void;
+        delete(name: string): void;
+        entries(): IterableIterator<[string, string]>;
+        forEach(callback: (value: string, name: string, searchParams: this) => void): void;
+        get(name: string): string | null;
+        getAll(name: string): string[];
+        has(name: string): boolean;
+        keys(): IterableIterator<string>;
+        set(name: string, value: string): void;
+        sort(): void;
+        toString(): string;
+        values(): IterableIterator<string>;
+        [Symbol.iterator](): IterableIterator<[string, string]>;
+    }
+}
diff --git a/types/node/v10/util.d.ts b/types/node/v10/util.d.ts
new file mode 100644
index 0000000000..9da88fe9cb
--- /dev/null
+++ b/types/node/v10/util.d.ts
@@ -0,0 +1,169 @@
+declare module "util" {
+    interface InspectOptions extends NodeJS.InspectOptions { }
+    function format(format: any, ...param: any[]): string;
+    function formatWithOptions(inspectOptions: InspectOptions, format: string, ...param: any[]): string;
+    /** @deprecated since v0.11.3 - use `console.error()` instead. */
+    function debug(string: string): void;
+    /** @deprecated since v0.11.3 - use `console.error()` instead. */
+    function error(...param: any[]): void;
+    /** @deprecated since v0.11.3 - use `console.log()` instead. */
+    function puts(...param: any[]): void;
+    /** @deprecated since v0.11.3 - use `console.log()` instead. */
+    function print(...param: any[]): void;
+    /** @deprecated since v0.11.3 - use a third party module instead. */
+    function log(string: string): void;
+    function inspect(object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
+    function inspect(object: any, options: InspectOptions): string;
+    namespace inspect {
+        let colors: {
+            [color: string]: [number, number] | undefined
+        };
+        let styles: {
+            [style: string]: string | undefined
+        };
+        let defaultOptions: InspectOptions;
+    }
+    /** @deprecated since v4.0.0 - use `Array.isArray()` instead. */
+    function isArray(object: any): object is any[];
+    /** @deprecated since v4.0.0 - use `util.types.isRegExp()` instead. */
+    function isRegExp(object: any): object is RegExp;
+    /** @deprecated since v4.0.0 - use `util.types.isDate()` instead. */
+    function isDate(object: any): object is Date;
+    /** @deprecated since v4.0.0 - use `util.types.isNativeError()` instead. */
+    function isError(object: any): object is Error;
+    function inherits(constructor: any, superConstructor: any): void;
+    function debuglog(key: string): (msg: string, ...param: any[]) => void;
+    /** @deprecated since v4.0.0 - use `typeof value === 'boolean'` instead. */
+    function isBoolean(object: any): object is boolean;
+    /** @deprecated since v4.0.0 - use `Buffer.isBuffer()` instead. */
+    function isBuffer(object: any): object is Buffer;
+    /** @deprecated since v4.0.0 - use `typeof value === 'function'` instead. */
+    function isFunction(object: any): boolean;
+    /** @deprecated since v4.0.0 - use `value === null` instead. */
+    function isNull(object: any): object is null;
+    /** @deprecated since v4.0.0 - use `value === null || value === undefined` instead. */
+    function isNullOrUndefined(object: any): object is null | undefined;
+    /** @deprecated since v4.0.0 - use `typeof value === 'number'` instead. */
+    function isNumber(object: any): object is number;
+    /** @deprecated since v4.0.0 - use `value !== null && typeof value === 'object'` instead. */
+    function isObject(object: any): boolean;
+    /** @deprecated since v4.0.0 - use `(typeof value !== 'object' && typeof value !== 'function') || value === null` instead. */
+    function isPrimitive(object: any): boolean;
+    /** @deprecated since v4.0.0 - use `typeof value === 'string'` instead. */
+    function isString(object: any): object is string;
+    /** @deprecated since v4.0.0 - use `typeof value === 'symbol'` instead. */
+    function isSymbol(object: any): object is symbol;
+    /** @deprecated since v4.0.0 - use `value === undefined` instead. */
+    function isUndefined(object: any): object is undefined;
+    function deprecate<T extends Function>(fn: T, message: string): T;
+    function isDeepStrictEqual(val1: any, val2: any): boolean;
+
+    interface CustomPromisify<TCustom extends Function> extends Function {
+        __promisify__: TCustom;
+    }
+
+    function callbackify(fn: () => Promise<void>): (callback: (err: NodeJS.ErrnoException) => void) => void;
+    function callbackify<TResult>(fn: () => Promise<TResult>): (callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    function callbackify<T1>(fn: (arg1: T1) => Promise<void>): (arg1: T1, callback: (err: NodeJS.ErrnoException) => void) => void;
+    function callbackify<T1, TResult>(fn: (arg1: T1) => Promise<TResult>): (arg1: T1, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    function callbackify<T1, T2>(fn: (arg1: T1, arg2: T2) => Promise<void>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException) => void) => void;
+    function callbackify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2) => Promise<TResult>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    function callbackify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException) => void) => void;
+    function callbackify<T1, T2, T3, TResult>(
+        fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    function callbackify<T1, T2, T3, T4>(
+        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException) => void) => void;
+    function callbackify<T1, T2, T3, T4, TResult>(
+        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    function callbackify<T1, T2, T3, T4, T5>(
+        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException) => void) => void;
+    function callbackify<T1, T2, T3, T4, T5, TResult>(
+        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>,
+    ): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    function callbackify<T1, T2, T3, T4, T5, T6>(
+        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<void>,
+    ): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException) => void) => void;
+    function callbackify<T1, T2, T3, T4, T5, T6, TResult>(
+        fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<TResult>
+    ): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+
+    function promisify<TCustom extends Function>(fn: CustomPromisify<TCustom>): TCustom;
+    function promisify<TResult>(fn: (callback: (err: Error | null, result: TResult) => void) => void): () => Promise<TResult>;
+    function promisify(fn: (callback: (err?: Error | null) => void) => void): () => Promise<void>;
+    function promisify<T1, TResult>(fn: (arg1: T1, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1) => Promise<TResult>;
+    function promisify<T1>(fn: (arg1: T1, callback: (err?: Error | null) => void) => void): (arg1: T1) => Promise<void>;
+    function promisify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2) => Promise<TResult>;
+    function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err?: Error | null) => void) => void): (arg1: T1, arg2: T2) => Promise<void>;
+    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>;
+    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>;
+    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>;
+    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>;
+    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>;
+    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>;
+    function promisify(fn: Function): Function;
+
+    namespace types {
+        function isAnyArrayBuffer(object: any): boolean;
+        function isArgumentsObject(object: any): object is IArguments;
+        function isArrayBuffer(object: any): object is ArrayBuffer;
+        function isAsyncFunction(object: any): boolean;
+        function isBooleanObject(object: any): object is Boolean;
+        function isBoxedPrimitive(object: any): object is (Number | Boolean | String | Symbol /* BigInt */);
+        function isDataView(object: any): object is DataView;
+        function isDate(object: any): object is Date;
+        function isExternal(object: any): boolean;
+        function isFloat32Array(object: any): object is Float32Array;
+        function isFloat64Array(object: any): object is Float64Array;
+        function isGeneratorFunction(object: any): boolean;
+        function isGeneratorObject(object: any): boolean;
+        function isInt8Array(object: any): object is Int8Array;
+        function isInt16Array(object: any): object is Int16Array;
+        function isInt32Array(object: any): object is Int32Array;
+        function isMap(object: any): boolean;
+        function isMapIterator(object: any): boolean;
+        function isNativeError(object: any): object is Error;
+        function isNumberObject(object: any): object is Number;
+        function isPromise(object: any): boolean;
+        function isProxy(object: any): boolean;
+        function isRegExp(object: any): object is RegExp;
+        function isSet(object: any): boolean;
+        function isSetIterator(object: any): boolean;
+        function isSharedArrayBuffer(object: any): boolean;
+        function isStringObject(object: any): boolean;
+        function isSymbolObject(object: any): boolean;
+        function isTypedArray(object: any): object is NodeJS.TypedArray;
+        function isUint8Array(object: any): object is Uint8Array;
+        function isUint8ClampedArray(object: any): object is Uint8ClampedArray;
+        function isUint16Array(object: any): object is Uint16Array;
+        function isUint32Array(object: any): object is Uint32Array;
+        function isWeakMap(object: any): boolean;
+        function isWeakSet(object: any): boolean;
+        function isWebAssemblyCompiledModule(object: any): boolean;
+    }
+
+    class TextDecoder {
+        readonly encoding: string;
+        readonly fatal: boolean;
+        readonly ignoreBOM: boolean;
+        constructor(
+          encoding?: string,
+          options?: { fatal?: boolean; ignoreBOM?: boolean }
+        );
+        decode(
+          input?: NodeJS.TypedArray | DataView | ArrayBuffer | null,
+          options?: { stream?: boolean }
+        ): string;
+    }
+
+    class TextEncoder {
+        readonly encoding: string;
+        constructor();
+        encode(input?: string): Uint8Array;
+    }
+}
diff --git a/types/node/v10/v8.d.ts b/types/node/v10/v8.d.ts
new file mode 100644
index 0000000000..ee5f707234
--- /dev/null
+++ b/types/node/v10/v8.d.ts
@@ -0,0 +1,28 @@
+declare module "v8" {
+    interface HeapSpaceInfo {
+        space_name: string;
+        space_size: number;
+        space_used_size: number;
+        space_available_size: number;
+        physical_space_size: number;
+    }
+
+    // ** Signifies if the --zap_code_space option is enabled or not.  1 == enabled, 0 == disabled. */
+    type DoesZapCodeSpaceFlag = 0 | 1;
+
+    interface HeapInfo {
+        total_heap_size: number;
+        total_heap_size_executable: number;
+        total_physical_size: number;
+        total_available_size: number;
+        used_heap_size: number;
+        heap_size_limit: number;
+        malloced_memory: number;
+        peak_malloced_memory: number;
+        does_zap_garbage: DoesZapCodeSpaceFlag;
+    }
+
+    function getHeapStatistics(): HeapInfo;
+    function getHeapSpaceStatistics(): HeapSpaceInfo[];
+    function setFlagsFromString(flags: string): void;
+}
diff --git a/types/node/v10/vm.d.ts b/types/node/v10/vm.d.ts
new file mode 100644
index 0000000000..404fa9c820
--- /dev/null
+++ b/types/node/v10/vm.d.ts
@@ -0,0 +1,64 @@
+declare module "vm" {
+    interface Context {
+        [key: string]: any;
+    }
+    interface BaseOptions {
+        /**
+         * Specifies the filename used in stack traces produced by this script.
+         * Default: `''`.
+         */
+        filename?: string;
+        /**
+         * Specifies the line number offset that is displayed in stack traces produced by this script.
+         * Default: `0`.
+         */
+        lineOffset?: number;
+        /**
+         * Specifies the column number offset that is displayed in stack traces produced by this script.
+         * Default: `0`
+         */
+        columnOffset?: number;
+    }
+    interface ScriptOptions extends BaseOptions {
+        displayErrors?: boolean;
+        timeout?: number;
+        cachedData?: Buffer;
+        produceCachedData?: boolean;
+    }
+    interface RunningScriptOptions extends BaseOptions {
+        displayErrors?: boolean;
+        timeout?: number;
+    }
+    interface CompileFunctionOptions extends BaseOptions {
+        /**
+         * Provides an optional data with V8's code cache data for the supplied source.
+         */
+        cachedData?: Buffer;
+        /**
+         * Specifies whether to produce new cache data.
+         * Default: `false`,
+         */
+        produceCachedData?: boolean;
+        /**
+         * The sandbox/context in which the said function should be compiled in.
+         */
+        parsingContext?: Context;
+
+        /**
+         * An array containing a collection of context extensions (objects wrapping the current scope) to be applied while compiling
+         */
+        contextExtensions?: Object[];
+    }
+    class Script {
+        constructor(code: string, options?: ScriptOptions);
+        runInContext(contextifiedSandbox: Context, options?: RunningScriptOptions): any;
+        runInNewContext(sandbox?: Context, options?: RunningScriptOptions): any;
+        runInThisContext(options?: RunningScriptOptions): any;
+    }
+    function createContext(sandbox?: Context): Context;
+    function isContext(sandbox: Context): boolean;
+    function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions | string): any;
+    function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions | string): any;
+    function runInThisContext(code: string, options?: RunningScriptOptions | string): any;
+    function compileFunction(code: string, params: string[], options: CompileFunctionOptions): Function;
+}
diff --git a/types/node/v10/worker_threads.d.ts b/types/node/v10/worker_threads.d.ts
new file mode 100644
index 0000000000..b20748a34f
--- /dev/null
+++ b/types/node/v10/worker_threads.d.ts
@@ -0,0 +1,124 @@
+declare module "worker_threads" {
+    import { EventEmitter } from "events";
+    import { Readable, Writable } from "stream";
+
+    const isMainThread: boolean;
+    const parentPort: null | MessagePort;
+    const threadId: number;
+    const workerData: any;
+
+    class MessageChannel {
+        readonly port1: MessagePort;
+        readonly port2: MessagePort;
+    }
+
+    class MessagePort extends EventEmitter {
+        close(): void;
+        postMessage(value: any, transferList?: Array<ArrayBuffer | MessagePort>): void;
+        ref(): void;
+        unref(): void;
+        start(): void;
+
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "message", listener: (value: any) => void): this;
+        addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        emit(event: "close"): boolean;
+        emit(event: "message", value: any): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+
+        on(event: "close", listener: () => void): this;
+        on(event: "message", listener: (value: any) => void): this;
+        on(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        once(event: "close", listener: () => void): this;
+        once(event: "message", listener: (value: any) => void): this;
+        once(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "message", listener: (value: any) => void): this;
+        prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "message", listener: (value: any) => void): this;
+        prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        removeListener(event: "close", listener: () => void): this;
+        removeListener(event: "message", listener: (value: any) => void): this;
+        removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        off(event: "close", listener: () => void): this;
+        off(event: "message", listener: (value: any) => void): this;
+        off(event: string | symbol, listener: (...args: any[]) => void): this;
+    }
+
+    interface WorkerOptions {
+        eval?: boolean;
+        workerData?: any;
+        stdin?: boolean;
+        stdout?: boolean;
+        stderr?: boolean;
+    }
+
+    class Worker extends EventEmitter {
+        readonly stdin: Writable | null;
+        readonly stdout: Readable;
+        readonly stderr: Readable;
+        readonly threadId: number;
+
+        constructor(filename: string, options?: WorkerOptions);
+
+        postMessage(value: any, transferList?: Array<ArrayBuffer | MessagePort>): void;
+        ref(): void;
+        unref(): void;
+        terminate(callback?: (err: any, exitCode: number) => void): void;
+
+        addListener(event: "error", listener: (err: any) => void): this;
+        addListener(event: "exit", listener: (exitCode: number) => void): this;
+        addListener(event: "message", listener: (value: any) => void): this;
+        addListener(event: "online", listener: () => void): this;
+        addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        emit(event: "error", err: any): boolean;
+        emit(event: "exit", exitCode: number): boolean;
+        emit(event: "message", value: any): boolean;
+        emit(event: "online"): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+
+        on(event: "error", listener: (err: any) => void): this;
+        on(event: "exit", listener: (exitCode: number) => void): this;
+        on(event: "message", listener: (value: any) => void): this;
+        on(event: "online", listener: () => void): this;
+        on(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        once(event: "error", listener: (err: any) => void): this;
+        once(event: "exit", listener: (exitCode: number) => void): this;
+        once(event: "message", listener: (value: any) => void): this;
+        once(event: "online", listener: () => void): this;
+        once(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        prependListener(event: "error", listener: (err: any) => void): this;
+        prependListener(event: "exit", listener: (exitCode: number) => void): this;
+        prependListener(event: "message", listener: (value: any) => void): this;
+        prependListener(event: "online", listener: () => void): this;
+        prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        prependOnceListener(event: "error", listener: (err: any) => void): this;
+        prependOnceListener(event: "exit", listener: (exitCode: number) => void): this;
+        prependOnceListener(event: "message", listener: (value: any) => void): this;
+        prependOnceListener(event: "online", listener: () => void): this;
+        prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        removeListener(event: "error", listener: (err: any) => void): this;
+        removeListener(event: "exit", listener: (exitCode: number) => void): this;
+        removeListener(event: "message", listener: (value: any) => void): this;
+        removeListener(event: "online", listener: () => void): this;
+        removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        off(event: "error", listener: (err: any) => void): this;
+        off(event: "exit", listener: (exitCode: number) => void): this;
+        off(event: "message", listener: (value: any) => void): this;
+        off(event: "online", listener: () => void): this;
+        off(event: string | symbol, listener: (...args: any[]) => void): this;
+    }
+}
diff --git a/types/node/v10/zlib.d.ts b/types/node/v10/zlib.d.ts
new file mode 100644
index 0000000000..dff374b8f5
--- /dev/null
+++ b/types/node/v10/zlib.d.ts
@@ -0,0 +1,141 @@
+declare module "zlib" {
+    import * as stream from "stream";
+
+    interface ZlibOptions {
+        flush?: number; // default: zlib.constants.Z_NO_FLUSH
+        finishFlush?: number; // default: zlib.constants.Z_FINISH
+        chunkSize?: number; // default: 16*1024
+        windowBits?: number;
+        level?: number; // compression only
+        memLevel?: number; // compression only
+        strategy?: number; // compression only
+        dictionary?: Buffer | NodeJS.TypedArray | DataView | ArrayBuffer; // deflate/inflate only, empty dictionary by default
+    }
+
+    interface Zlib {
+        /** @deprecated Use bytesWritten instead. */
+        readonly bytesRead: number;
+        readonly bytesWritten: number;
+        shell?: boolean | string;
+        close(callback?: () => void): void;
+        flush(kind?: number | (() => void), callback?: () => void): void;
+    }
+
+    interface ZlibParams {
+        params(level: number, strategy: number, callback: () => void): void;
+    }
+
+    interface ZlibReset {
+        reset(): void;
+    }
+
+    interface Gzip extends stream.Transform, Zlib { }
+    interface Gunzip extends stream.Transform, Zlib { }
+    interface Deflate extends stream.Transform, Zlib, ZlibReset, ZlibParams { }
+    interface Inflate extends stream.Transform, Zlib, ZlibReset { }
+    interface DeflateRaw extends stream.Transform, Zlib, ZlibReset, ZlibParams { }
+    interface InflateRaw extends stream.Transform, Zlib, ZlibReset { }
+    interface Unzip extends stream.Transform, Zlib { }
+
+    function createGzip(options?: ZlibOptions): Gzip;
+    function createGunzip(options?: ZlibOptions): Gunzip;
+    function createDeflate(options?: ZlibOptions): Deflate;
+    function createInflate(options?: ZlibOptions): Inflate;
+    function createDeflateRaw(options?: ZlibOptions): DeflateRaw;
+    function createInflateRaw(options?: ZlibOptions): InflateRaw;
+    function createUnzip(options?: ZlibOptions): Unzip;
+
+    type InputType = string | Buffer | DataView | ArrayBuffer | NodeJS.TypedArray;
+    function deflate(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    function deflate(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    function deflateSync(buf: InputType, options?: ZlibOptions): Buffer;
+    function deflateRaw(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    function deflateRaw(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    function deflateRawSync(buf: InputType, options?: ZlibOptions): Buffer;
+    function gzip(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    function gzip(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    function gzipSync(buf: InputType, options?: ZlibOptions): Buffer;
+    function gunzip(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    function gunzip(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    function gunzipSync(buf: InputType, options?: ZlibOptions): Buffer;
+    function inflate(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    function inflate(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    function inflateSync(buf: InputType, options?: ZlibOptions): Buffer;
+    function inflateRaw(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    function inflateRaw(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    function inflateRawSync(buf: InputType, options?: ZlibOptions): Buffer;
+    function unzip(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    function unzip(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    function unzipSync(buf: InputType, options?: ZlibOptions): Buffer;
+
+    namespace constants {
+        // Allowed flush values.
+
+        const Z_NO_FLUSH: number;
+        const Z_PARTIAL_FLUSH: number;
+        const Z_SYNC_FLUSH: number;
+        const Z_FULL_FLUSH: number;
+        const Z_FINISH: number;
+        const Z_BLOCK: number;
+        const Z_TREES: number;
+
+        // Return codes for the compression/decompression functions. Negative values are errors, positive values are used for special but normal events.
+
+        const Z_OK: number;
+        const Z_STREAM_END: number;
+        const Z_NEED_DICT: number;
+        const Z_ERRNO: number;
+        const Z_STREAM_ERROR: number;
+        const Z_DATA_ERROR: number;
+        const Z_MEM_ERROR: number;
+        const Z_BUF_ERROR: number;
+        const Z_VERSION_ERROR: number;
+
+        // Compression levels.
+
+        const Z_NO_COMPRESSION: number;
+        const Z_BEST_SPEED: number;
+        const Z_BEST_COMPRESSION: number;
+        const Z_DEFAULT_COMPRESSION: number;
+
+        // Compression strategy.
+
+        const Z_FILTERED: number;
+        const Z_HUFFMAN_ONLY: number;
+        const Z_RLE: number;
+        const Z_FIXED: number;
+        const Z_DEFAULT_STRATEGY: number;
+    }
+
+    // Constants
+    const Z_NO_FLUSH: number;
+    const Z_PARTIAL_FLUSH: number;
+    const Z_SYNC_FLUSH: number;
+    const Z_FULL_FLUSH: number;
+    const Z_FINISH: number;
+    const Z_BLOCK: number;
+    const Z_TREES: number;
+    const Z_OK: number;
+    const Z_STREAM_END: number;
+    const Z_NEED_DICT: number;
+    const Z_ERRNO: number;
+    const Z_STREAM_ERROR: number;
+    const Z_DATA_ERROR: number;
+    const Z_MEM_ERROR: number;
+    const Z_BUF_ERROR: number;
+    const Z_VERSION_ERROR: number;
+    const Z_NO_COMPRESSION: number;
+    const Z_BEST_SPEED: number;
+    const Z_BEST_COMPRESSION: number;
+    const Z_DEFAULT_COMPRESSION: number;
+    const Z_FILTERED: number;
+    const Z_HUFFMAN_ONLY: number;
+    const Z_RLE: number;
+    const Z_FIXED: number;
+    const Z_DEFAULT_STRATEGY: number;
+    const Z_BINARY: number;
+    const Z_TEXT: number;
+    const Z_ASCII: number;
+    const Z_UNKNOWN: number;
+    const Z_DEFLATED: number;
+}
diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index 26210a1857..f52a8d01f8 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -672,14 +672,14 @@ declare module "http" {
     // incoming headers will never contain number
     export interface IncomingHttpHeaders {
         'accept'?: string;
-        'access-control-allow-origin'?: string;
-        'access-control-allow-credentials'?: string;
-        'access-control-expose-headers'?: string;
-        'access-control-max-age'?: string;
-        'access-control-allow-methods'?: string;
-        'access-control-allow-headers'?: string;
         'accept-patch'?: string;
         'accept-ranges'?: string;
+        'access-control-allow-credentials'?: string;
+        'access-control-allow-headers'?: string;
+        'access-control-allow-methods'?: string;
+        'access-control-allow-origin'?: string;
+        'access-control-expose-headers'?: string;
+        'access-control-max-age'?: string;
         'age'?: string;
         'allow'?: string;
         'alt-svc'?: string;
@@ -703,9 +703,9 @@ declare module "http" {
         'retry-after'?: string;
         'set-cookie'?: string[];
         'strict-transport-security'?: string;
+        'tk'?: string;
         'trailer'?: string;
         'transfer-encoding'?: string;
-        'tk'?: string;
         'upgrade'?: string;
         'user-agent'?: string;
         'vary'?: string;
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 5ed74da702..6dd1ad1dc0 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -741,14 +741,14 @@ declare module "http" {
     // incoming headers will never contain number
     export interface IncomingHttpHeaders {
         'accept'?: string;
-        'access-control-allow-origin'?: string;
-        'access-control-allow-credentials'?: string;
-        'access-control-expose-headers'?: string;
-        'access-control-max-age'?: string;
-        'access-control-allow-methods'?: string;
-        'access-control-allow-headers'?: string;
         'accept-patch'?: string;
         'accept-ranges'?: string;
+        'access-control-allow-credentials'?: string;
+        'access-control-allow-headers'?: string;
+        'access-control-allow-methods'?: string;
+        'access-control-allow-origin'?: string;
+        'access-control-expose-headers'?: string;
+        'access-control-max-age'?: string;
         'age'?: string;
         'allow'?: string;
         'alt-svc'?: string;
@@ -772,9 +772,9 @@ declare module "http" {
         'retry-after'?: string;
         'set-cookie'?: string[];
         'strict-transport-security'?: string;
+        'tk'?: string;
         'trailer'?: string;
         'transfer-encoding'?: string;
-        'tk'?: string;
         'upgrade'?: string;
         'user-agent'?: string;
         'vary'?: string;
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index 932d988912..a4fde30a97 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -738,14 +738,14 @@ declare module "http" {
     // incoming headers will never contain number
     export interface IncomingHttpHeaders {
         'accept'?: string;
-        'access-control-allow-origin'?: string;
-        'access-control-allow-credentials'?: string;
-        'access-control-expose-headers'?: string;
-        'access-control-max-age'?: string;
-        'access-control-allow-methods'?: string;
-        'access-control-allow-headers'?: string;
         'accept-patch'?: string;
         'accept-ranges'?: string;
+        'access-control-allow-credentials'?: string;
+        'access-control-allow-headers'?: string;
+        'access-control-allow-methods'?: string;
+        'access-control-allow-origin'?: string;
+        'access-control-expose-headers'?: string;
+        'access-control-max-age'?: string;
         'age'?: string;
         'allow'?: string;
         'alt-svc'?: string;
@@ -769,9 +769,9 @@ declare module "http" {
         'retry-after'?: string;
         'set-cookie'?: string[];
         'strict-transport-security'?: string;
+        'tk'?: string;
         'trailer'?: string;
         'transfer-encoding'?: string;
-        'tk'?: string;
         'upgrade'?: string;
         'user-agent'?: string;
         'vary'?: string;
diff --git a/types/node/v8.d.ts b/types/node/v8.d.ts
new file mode 100644
index 0000000000..ee5f707234
--- /dev/null
+++ b/types/node/v8.d.ts
@@ -0,0 +1,28 @@
+declare module "v8" {
+    interface HeapSpaceInfo {
+        space_name: string;
+        space_size: number;
+        space_used_size: number;
+        space_available_size: number;
+        physical_space_size: number;
+    }
+
+    // ** Signifies if the --zap_code_space option is enabled or not.  1 == enabled, 0 == disabled. */
+    type DoesZapCodeSpaceFlag = 0 | 1;
+
+    interface HeapInfo {
+        total_heap_size: number;
+        total_heap_size_executable: number;
+        total_physical_size: number;
+        total_available_size: number;
+        used_heap_size: number;
+        heap_size_limit: number;
+        malloced_memory: number;
+        peak_malloced_memory: number;
+        does_zap_garbage: DoesZapCodeSpaceFlag;
+    }
+
+    function getHeapStatistics(): HeapInfo;
+    function getHeapSpaceStatistics(): HeapSpaceInfo[];
+    function setFlagsFromString(flags: string): void;
+}
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index e0e901fea6..1fac090367 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -967,18 +967,18 @@ declare module "http" {
     // incoming headers will never contain number
     export interface IncomingHttpHeaders {
         'accept'?: string;
-        'access-control-allow-origin'?: string;
-        'access-control-allow-credentials'?: string;
-        'access-control-expose-headers'?: string;
-        'access-control-max-age'?: string;
-        'access-control-allow-methods'?: string;
-        'access-control-allow-headers'?: string;
         'accept-patch'?: string;
         'accept-ranges'?: string;
-        'authorization'?: string;
+        'access-control-allow-credentials'?: string;
+        'access-control-allow-headers'?: string;
+        'access-control-allow-methods'?: string;
+        'access-control-allow-origin'?: string;
+        'access-control-expose-headers'?: string;
+        'access-control-max-age'?: string;
         'age'?: string;
         'allow'?: string;
         'alt-svc'?: string;
+        'authorization'?: string;
         'cache-control'?: string;
         'connection'?: string;
         'content-disposition'?: string;
@@ -999,9 +999,9 @@ declare module "http" {
         'retry-after'?: string;
         'set-cookie'?: string[];
         'strict-transport-security'?: string;
+        'tk'?: string;
         'trailer'?: string;
         'transfer-encoding'?: string;
-        'tk'?: string;
         'upgrade'?: string;
         'user-agent'?: string;
         'vary'?: string;
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index 5bafe1ec47..220afd9e60 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -1052,18 +1052,18 @@ declare module "http" {
     // incoming headers will never contain number
     export interface IncomingHttpHeaders {
         'accept'?: string;
-        'access-control-allow-origin'?: string;
-        'access-control-allow-credentials'?: string;
-        'access-control-expose-headers'?: string;
-        'access-control-max-age'?: string;
-        'access-control-allow-methods'?: string;
-        'access-control-allow-headers'?: string;
         'accept-patch'?: string;
         'accept-ranges'?: string;
-        'authorization'?: string;
+        'access-control-allow-credentials'?: string;
+        'access-control-allow-headers'?: string;
+        'access-control-allow-methods'?: string;
+        'access-control-allow-origin'?: string;
+        'access-control-expose-headers'?: string;
+        'access-control-max-age'?: string;
         'age'?: string;
         'allow'?: string;
         'alt-svc'?: string;
+        'authorization'?: string;
         'cache-control'?: string;
         'connection'?: string;
         'content-disposition'?: string;
@@ -1084,9 +1084,9 @@ declare module "http" {
         'retry-after'?: string;
         'set-cookie'?: string[];
         'strict-transport-security'?: string;
+        'tk'?: string;
         'trailer'?: string;
         'transfer-encoding'?: string;
-        'tk'?: string;
         'upgrade'?: string;
         'user-agent'?: string;
         'vary'?: string;
diff --git a/types/node/vm.d.ts b/types/node/vm.d.ts
new file mode 100644
index 0000000000..404fa9c820
--- /dev/null
+++ b/types/node/vm.d.ts
@@ -0,0 +1,64 @@
+declare module "vm" {
+    interface Context {
+        [key: string]: any;
+    }
+    interface BaseOptions {
+        /**
+         * Specifies the filename used in stack traces produced by this script.
+         * Default: `''`.
+         */
+        filename?: string;
+        /**
+         * Specifies the line number offset that is displayed in stack traces produced by this script.
+         * Default: `0`.
+         */
+        lineOffset?: number;
+        /**
+         * Specifies the column number offset that is displayed in stack traces produced by this script.
+         * Default: `0`
+         */
+        columnOffset?: number;
+    }
+    interface ScriptOptions extends BaseOptions {
+        displayErrors?: boolean;
+        timeout?: number;
+        cachedData?: Buffer;
+        produceCachedData?: boolean;
+    }
+    interface RunningScriptOptions extends BaseOptions {
+        displayErrors?: boolean;
+        timeout?: number;
+    }
+    interface CompileFunctionOptions extends BaseOptions {
+        /**
+         * Provides an optional data with V8's code cache data for the supplied source.
+         */
+        cachedData?: Buffer;
+        /**
+         * Specifies whether to produce new cache data.
+         * Default: `false`,
+         */
+        produceCachedData?: boolean;
+        /**
+         * The sandbox/context in which the said function should be compiled in.
+         */
+        parsingContext?: Context;
+
+        /**
+         * An array containing a collection of context extensions (objects wrapping the current scope) to be applied while compiling
+         */
+        contextExtensions?: Object[];
+    }
+    class Script {
+        constructor(code: string, options?: ScriptOptions);
+        runInContext(contextifiedSandbox: Context, options?: RunningScriptOptions): any;
+        runInNewContext(sandbox?: Context, options?: RunningScriptOptions): any;
+        runInThisContext(options?: RunningScriptOptions): any;
+    }
+    function createContext(sandbox?: Context): Context;
+    function isContext(sandbox: Context): boolean;
+    function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions | string): any;
+    function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions | string): any;
+    function runInThisContext(code: string, options?: RunningScriptOptions | string): any;
+    function compileFunction(code: string, params: string[], options: CompileFunctionOptions): Function;
+}
diff --git a/types/node/worker_threads.d.ts b/types/node/worker_threads.d.ts
new file mode 100644
index 0000000000..b011b8ff32
--- /dev/null
+++ b/types/node/worker_threads.d.ts
@@ -0,0 +1,125 @@
+declare module "worker_threads" {
+    import { EventEmitter } from "events";
+    import { Readable, Writable } from "stream";
+
+    const isMainThread: boolean;
+    const parentPort: null | MessagePort;
+    const threadId: number;
+    const workerData: any;
+
+    class MessageChannel {
+        readonly port1: MessagePort;
+        readonly port2: MessagePort;
+    }
+
+    class MessagePort extends EventEmitter {
+        close(): void;
+        postMessage(value: any, transferList?: Array<ArrayBuffer | MessagePort>): void;
+        ref(): void;
+        unref(): void;
+        start(): void;
+
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "message", listener: (value: any) => void): this;
+        addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        emit(event: "close"): boolean;
+        emit(event: "message", value: any): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+
+        on(event: "close", listener: () => void): this;
+        on(event: "message", listener: (value: any) => void): this;
+        on(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        once(event: "close", listener: () => void): this;
+        once(event: "message", listener: (value: any) => void): this;
+        once(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "message", listener: (value: any) => void): this;
+        prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "message", listener: (value: any) => void): this;
+        prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        removeListener(event: "close", listener: () => void): this;
+        removeListener(event: "message", listener: (value: any) => void): this;
+        removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        off(event: "close", listener: () => void): this;
+        off(event: "message", listener: (value: any) => void): this;
+        off(event: string | symbol, listener: (...args: any[]) => void): this;
+    }
+
+    interface WorkerOptions {
+        eval?: boolean;
+        workerData?: any;
+        stdin?: boolean;
+        stdout?: boolean;
+        stderr?: boolean;
+        execArgv?: string[];
+    }
+
+    class Worker extends EventEmitter {
+        readonly stdin: Writable | null;
+        readonly stdout: Readable;
+        readonly stderr: Readable;
+        readonly threadId: number;
+
+        constructor(filename: string, options?: WorkerOptions);
+
+        postMessage(value: any, transferList?: Array<ArrayBuffer | MessagePort>): void;
+        ref(): void;
+        unref(): void;
+        terminate(callback?: (err: any, exitCode: number) => void): void;
+
+        addListener(event: "error", listener: (err: any) => void): this;
+        addListener(event: "exit", listener: (exitCode: number) => void): this;
+        addListener(event: "message", listener: (value: any) => void): this;
+        addListener(event: "online", listener: () => void): this;
+        addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        emit(event: "error", err: any): boolean;
+        emit(event: "exit", exitCode: number): boolean;
+        emit(event: "message", value: any): boolean;
+        emit(event: "online"): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+
+        on(event: "error", listener: (err: any) => void): this;
+        on(event: "exit", listener: (exitCode: number) => void): this;
+        on(event: "message", listener: (value: any) => void): this;
+        on(event: "online", listener: () => void): this;
+        on(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        once(event: "error", listener: (err: any) => void): this;
+        once(event: "exit", listener: (exitCode: number) => void): this;
+        once(event: "message", listener: (value: any) => void): this;
+        once(event: "online", listener: () => void): this;
+        once(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        prependListener(event: "error", listener: (err: any) => void): this;
+        prependListener(event: "exit", listener: (exitCode: number) => void): this;
+        prependListener(event: "message", listener: (value: any) => void): this;
+        prependListener(event: "online", listener: () => void): this;
+        prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        prependOnceListener(event: "error", listener: (err: any) => void): this;
+        prependOnceListener(event: "exit", listener: (exitCode: number) => void): this;
+        prependOnceListener(event: "message", listener: (value: any) => void): this;
+        prependOnceListener(event: "online", listener: () => void): this;
+        prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        removeListener(event: "error", listener: (err: any) => void): this;
+        removeListener(event: "exit", listener: (exitCode: number) => void): this;
+        removeListener(event: "message", listener: (value: any) => void): this;
+        removeListener(event: "online", listener: () => void): this;
+        removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        off(event: "error", listener: (err: any) => void): this;
+        off(event: "exit", listener: (exitCode: number) => void): this;
+        off(event: "message", listener: (value: any) => void): this;
+        off(event: "online", listener: () => void): this;
+        off(event: string | symbol, listener: (...args: any[]) => void): this;
+    }
+}
diff --git a/types/node/zlib.d.ts b/types/node/zlib.d.ts
new file mode 100644
index 0000000000..dff374b8f5
--- /dev/null
+++ b/types/node/zlib.d.ts
@@ -0,0 +1,141 @@
+declare module "zlib" {
+    import * as stream from "stream";
+
+    interface ZlibOptions {
+        flush?: number; // default: zlib.constants.Z_NO_FLUSH
+        finishFlush?: number; // default: zlib.constants.Z_FINISH
+        chunkSize?: number; // default: 16*1024
+        windowBits?: number;
+        level?: number; // compression only
+        memLevel?: number; // compression only
+        strategy?: number; // compression only
+        dictionary?: Buffer | NodeJS.TypedArray | DataView | ArrayBuffer; // deflate/inflate only, empty dictionary by default
+    }
+
+    interface Zlib {
+        /** @deprecated Use bytesWritten instead. */
+        readonly bytesRead: number;
+        readonly bytesWritten: number;
+        shell?: boolean | string;
+        close(callback?: () => void): void;
+        flush(kind?: number | (() => void), callback?: () => void): void;
+    }
+
+    interface ZlibParams {
+        params(level: number, strategy: number, callback: () => void): void;
+    }
+
+    interface ZlibReset {
+        reset(): void;
+    }
+
+    interface Gzip extends stream.Transform, Zlib { }
+    interface Gunzip extends stream.Transform, Zlib { }
+    interface Deflate extends stream.Transform, Zlib, ZlibReset, ZlibParams { }
+    interface Inflate extends stream.Transform, Zlib, ZlibReset { }
+    interface DeflateRaw extends stream.Transform, Zlib, ZlibReset, ZlibParams { }
+    interface InflateRaw extends stream.Transform, Zlib, ZlibReset { }
+    interface Unzip extends stream.Transform, Zlib { }
+
+    function createGzip(options?: ZlibOptions): Gzip;
+    function createGunzip(options?: ZlibOptions): Gunzip;
+    function createDeflate(options?: ZlibOptions): Deflate;
+    function createInflate(options?: ZlibOptions): Inflate;
+    function createDeflateRaw(options?: ZlibOptions): DeflateRaw;
+    function createInflateRaw(options?: ZlibOptions): InflateRaw;
+    function createUnzip(options?: ZlibOptions): Unzip;
+
+    type InputType = string | Buffer | DataView | ArrayBuffer | NodeJS.TypedArray;
+    function deflate(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    function deflate(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    function deflateSync(buf: InputType, options?: ZlibOptions): Buffer;
+    function deflateRaw(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    function deflateRaw(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    function deflateRawSync(buf: InputType, options?: ZlibOptions): Buffer;
+    function gzip(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    function gzip(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    function gzipSync(buf: InputType, options?: ZlibOptions): Buffer;
+    function gunzip(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    function gunzip(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    function gunzipSync(buf: InputType, options?: ZlibOptions): Buffer;
+    function inflate(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    function inflate(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    function inflateSync(buf: InputType, options?: ZlibOptions): Buffer;
+    function inflateRaw(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    function inflateRaw(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    function inflateRawSync(buf: InputType, options?: ZlibOptions): Buffer;
+    function unzip(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    function unzip(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    function unzipSync(buf: InputType, options?: ZlibOptions): Buffer;
+
+    namespace constants {
+        // Allowed flush values.
+
+        const Z_NO_FLUSH: number;
+        const Z_PARTIAL_FLUSH: number;
+        const Z_SYNC_FLUSH: number;
+        const Z_FULL_FLUSH: number;
+        const Z_FINISH: number;
+        const Z_BLOCK: number;
+        const Z_TREES: number;
+
+        // Return codes for the compression/decompression functions. Negative values are errors, positive values are used for special but normal events.
+
+        const Z_OK: number;
+        const Z_STREAM_END: number;
+        const Z_NEED_DICT: number;
+        const Z_ERRNO: number;
+        const Z_STREAM_ERROR: number;
+        const Z_DATA_ERROR: number;
+        const Z_MEM_ERROR: number;
+        const Z_BUF_ERROR: number;
+        const Z_VERSION_ERROR: number;
+
+        // Compression levels.
+
+        const Z_NO_COMPRESSION: number;
+        const Z_BEST_SPEED: number;
+        const Z_BEST_COMPRESSION: number;
+        const Z_DEFAULT_COMPRESSION: number;
+
+        // Compression strategy.
+
+        const Z_FILTERED: number;
+        const Z_HUFFMAN_ONLY: number;
+        const Z_RLE: number;
+        const Z_FIXED: number;
+        const Z_DEFAULT_STRATEGY: number;
+    }
+
+    // Constants
+    const Z_NO_FLUSH: number;
+    const Z_PARTIAL_FLUSH: number;
+    const Z_SYNC_FLUSH: number;
+    const Z_FULL_FLUSH: number;
+    const Z_FINISH: number;
+    const Z_BLOCK: number;
+    const Z_TREES: number;
+    const Z_OK: number;
+    const Z_STREAM_END: number;
+    const Z_NEED_DICT: number;
+    const Z_ERRNO: number;
+    const Z_STREAM_ERROR: number;
+    const Z_DATA_ERROR: number;
+    const Z_MEM_ERROR: number;
+    const Z_BUF_ERROR: number;
+    const Z_VERSION_ERROR: number;
+    const Z_NO_COMPRESSION: number;
+    const Z_BEST_SPEED: number;
+    const Z_BEST_COMPRESSION: number;
+    const Z_DEFAULT_COMPRESSION: number;
+    const Z_FILTERED: number;
+    const Z_HUFFMAN_ONLY: number;
+    const Z_RLE: number;
+    const Z_FIXED: number;
+    const Z_DEFAULT_STRATEGY: number;
+    const Z_BINARY: number;
+    const Z_TEXT: number;
+    const Z_ASCII: number;
+    const Z_UNKNOWN: number;
+    const Z_DEFLATED: number;
+}
diff --git a/types/nodegit/index.d.ts b/types/nodegit/index.d.ts
index d1afcd6ea4..8f0dd811a0 100644
--- a/types/nodegit/index.d.ts
+++ b/types/nodegit/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for nodegit 0.22
-// Project: https://github.com/nodegit/nodegit
+// Type definitions for nodegit 0.24
+// Project: https://github.com/nodegit/nodegit, http://nodegit.org
 // Definitions by: Dolan Miu <https://github.com/dolanmiu>, Tobias Nießen <https://github.com/tniessen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
@@ -79,7 +79,7 @@ export { Refspec } from './ref-spec';
 export { Reference } from './reference';
 export { RemoteCallbacks } from './remote-callbacks';
 export { Remote } from './remote';
-export { Repository } from './repository';
+export { Repository, RepositoryInitOptions } from './repository';
 export { Reset } from './reset';
 export { Revparse } from './rev-parse';
 export { Revwalk } from './rev-walk';
diff --git a/types/nodegit/index_.d.ts b/types/nodegit/index_.d.ts
index 932691a89c..1fce02c942 100644
--- a/types/nodegit/index_.d.ts
+++ b/types/nodegit/index_.d.ts
@@ -26,7 +26,7 @@ export class Index {
     static open(indexPath: string): Promise<Index>;
 
     add(sourceEntry: IndexEntry): number;
-    addAll(pathspec: Strarray | string | string[], flags: number, callback?: Function): Promise<number>;
+    addAll(pathspec?: Strarray | string | string[], flags?: number, callback?: Function): Promise<number>;
     addByPath(path: string): Promise<number>;
     caps(): number;
     checksum(): Oid;
diff --git a/types/nodegit/nodegit-tests.ts b/types/nodegit/nodegit-tests.ts
index 1732844d1c..a908f8a58f 100644
--- a/types/nodegit/nodegit-tests.ts
+++ b/types/nodegit/nodegit-tests.ts
@@ -62,3 +62,5 @@ const signature = Git.Signature.now("name", "email");
 signature.name();
 signature.email();
 signature.when();
+
+repo.createBlobFromBuffer(Buffer.from("test")).then((oid: Git.Oid) => oid.cpy());
diff --git a/types/nodegit/repository.d.ts b/types/nodegit/repository.d.ts
index 6066f770b2..d74b39834d 100644
--- a/types/nodegit/repository.d.ts
+++ b/types/nodegit/repository.d.ts
@@ -153,7 +153,7 @@ export class Repository {
     /**
      * Create a blob from a buffer
      */
-    createBlobFromBuffer(buffer: Buffer): Oid;
+    createBlobFromBuffer(buffer: Buffer): Promise<Oid>;
     treeBuilder(tree: Tree): Promise<Treebuilder>;
     /**
      * Gets the default signature for the default user and now timestamp
diff --git a/types/nodemailer-mailgun-transport/index.d.ts b/types/nodemailer-mailgun-transport/index.d.ts
index 71acb6691e..5e63a200e1 100644
--- a/types/nodemailer-mailgun-transport/index.d.ts
+++ b/types/nodemailer-mailgun-transport/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for nodemailer-mailgun-transport 1.3
-// Project: https://github.com/orliesaurus/nodemailer-mailgun-transport
+// Project: https://github.com/orliesaurus/nodemailer-mailgun-transport, http://mailgun.com
 // Definitions by: Oto Ciulis <https://github.com/otociulis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/nodemailer-ses-transport/index.d.ts b/types/nodemailer-ses-transport/index.d.ts
index c753ec46d6..c424cff7ef 100644
--- a/types/nodemailer-ses-transport/index.d.ts
+++ b/types/nodemailer-ses-transport/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for nodemailer-ses-transport 3.1
-// Project: https://github.com/andris9/nodemailer-ses-transport
+// Project: http://github.com/andris9/nodemailer-ses-transport
 // Definitions by: Seth Westphal <https://github.com/westy92>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/nodemailer/index.d.ts b/types/nodemailer/index.d.ts
index 31175bd148..98958bce87 100644
--- a/types/nodemailer/index.d.ts
+++ b/types/nodemailer/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Nodemailer 4.6
-// Project: https://github.com/nodemailer/nodemailer
+// Project: https://github.com/nodemailer/nodemailer, https://nodemailer.com
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 //                 Piotr Roszatycki <https://github.com/dex4er>
 //                 Daniel Chao <https://github.com/bioball>
diff --git a/types/nouislider/index.d.ts b/types/nouislider/index.d.ts
index 76b62371fe..bc3f625cda 100644
--- a/types/nouislider/index.d.ts
+++ b/types/nouislider/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for nouislider v9.0.0
+// Type definitions for nouislider v9.0.1
 // Project: https://github.com/leongersen/noUiSlider
 // Definitions by: Patrick Davies <https://github.com/bleuarg>, Guust Nieuwenhuis <https://github.com/lagaffe>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -11,7 +11,7 @@ declare namespace noUiSlider {
 	/**
      * To create a slider, call noUiSlider.create() with an element and your options.
      */
-	function create(target: HTMLElement, options: Options): void;
+	function create(target: HTMLElement, options: Options): noUiSlider.noUiSlider;
 
 	interface Options {
 		/**
diff --git a/types/npm-license-crawler/index.d.ts b/types/npm-license-crawler/index.d.ts
new file mode 100644
index 0000000000..82c486b795
--- /dev/null
+++ b/types/npm-license-crawler/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for npm-license-crawler 0.1
+// Project: https://github.com/mwittig/npm-license-crawler
+// Definitions by: Florian Keller <https://github.com/ffflorian>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export interface Licenses {
+    [repository: string]: {
+        licenses: string;
+        licenseUrl: string;
+        parents: string;
+        repository: string;
+    };
+}
+
+export interface CrawlerOptions {
+    /** export the data as comma-separated values to the given file. The path will be created if it does not exist. */
+    csv?: string;
+    /** show only third-party licenses, i.e., only list the dependencies defined in package.json. */
+    dependencies?: boolean;
+    /** show only development dependencies */
+    development?: boolean;
+    /** path to a directory to be excluded (and its subdirectories) from the search. */
+    exclude?: string | string[];
+    /** export data as JSON to the given file. The path will be created if it does not exist. */
+    json?: string;
+    /** omit version numbers in result (e.g. "npm-license-crawler@0.1.5" becomes "npm-license-crawler") */
+    omitVersion?: boolean;
+    /** show only direct dependencies licenses, i.e., don't list dependencies of dependencies. */
+    onlyDirectDependencies?: boolean;
+    /** show only production dependencies */
+    production?: boolean;
+    /** output the relative file path for license files. */
+    relativeLicensePath?: boolean;
+    /** path to the directory the license search should start from. If omitted the current working directory is assumed. */
+    start: string | string[];
+    /** show only licenses that can't be determined or have been guessed. */
+    unknown?: boolean;
+}
+
+export type Callback = (error: Error | null, licenses: Licenses) => void;
+
+export function dumpLicenses(args: CrawlerOptions, callback: Callback): void;
diff --git a/types/npm-license-crawler/npm-license-crawler-tests.ts b/types/npm-license-crawler/npm-license-crawler-tests.ts
new file mode 100644
index 0000000000..dae39fec09
--- /dev/null
+++ b/types/npm-license-crawler/npm-license-crawler-tests.ts
@@ -0,0 +1,15 @@
+import { CrawlerOptions, dumpLicenses } from 'npm-license-crawler';
+
+const options: CrawlerOptions = {
+    start: ['../..'],
+    exclude: ['.'],
+    json: 'licenses.json',
+    unknown: true,
+};
+
+dumpLicenses(options, (error, res) => {
+    res.name.licenses; // $ExpectType string
+    res.name.licenseUrl; // $ExpectType string
+    res.name.parents; // $ExpectType string
+    res.name.repository; // $ExpectType string
+});
diff --git a/types/npm-license-crawler/tsconfig.json b/types/npm-license-crawler/tsconfig.json
new file mode 100644
index 0000000000..59df3a8697
--- /dev/null
+++ b/types/npm-license-crawler/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "npm-license-crawler-tests.ts"
+    ]
+}
diff --git a/types/npm-license-crawler/tslint.json b/types/npm-license-crawler/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/npm-license-crawler/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/npm-packlist/index.d.ts b/types/npm-packlist/index.d.ts
index 934d2f8967..33926112da 100644
--- a/types/npm-packlist/index.d.ts
+++ b/types/npm-packlist/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for npm-packlist 1.1
-// Project: https://github.com/npm/npm-packlist
+// Project: https://github.com/npm/npm-packlist, https://www.npmjs.com/package/npm-packlist
 // Definitions by: Klaus Meinhardt <https://github.com/ajafff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/npm/index.d.ts b/types/npm/index.d.ts
index 21ee933e59..066a932440 100644
--- a/types/npm/index.d.ts
+++ b/types/npm/index.d.ts
@@ -167,8 +167,8 @@ declare namespace NPM {
         Conf: ConfigStatic;
         defs: ConfigDefs;
 
-        get(setting: string): string;
-        set(setting: string, value: string): void;
+        get(setting: string): any;
+        set(setting: string, value: any): void;
 
         loadPrefix(cb: ErrorCallback): void;
         loadCAFile(caFilePath: string, cb: ErrorCallback): void;
diff --git a/types/npm/npm-tests.ts b/types/npm/npm-tests.ts
index 8ca5f01887..460e6f450a 100644
--- a/types/npm/npm-tests.ts
+++ b/types/npm/npm-tests.ts
@@ -22,4 +22,6 @@ npm.load({}, function (er) {
     npm.on("log", function (message: string) {
         console.log(message);
     });
+    
+    npm.config.set('audit', false);
 })
diff --git a/types/nssm/index.d.ts b/types/nssm/index.d.ts
new file mode 100644
index 0000000000..e181e6fc6e
--- /dev/null
+++ b/types/nssm/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for nssm 0.1
+// Project: https://github.com/alykoshin/nssm
+// Definitions by: Joram van den Boezem <https://github.com/hongaar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+type Command =
+    | 'install'
+    | 'remove'
+    | 'start'
+    | 'stop'
+    | 'restart'
+    | 'status'
+    | 'pause'
+    | 'continue'
+    | 'rotate'
+    | 'get'
+    | 'set'
+    | 'reset';
+
+type NssmThen<T> = <TResult1 = T, TResult2 = never>(
+    onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null,
+    onrejected?: ((reason: Error, stderr: string) => TResult2 | PromiseLike<TResult2>) | null
+) => NssmPromise<TResult1 | TResult2>;
+
+type NssmCatch<T> = <TResult = never>(
+    onrejected?: ((reason: Error, stderr: string) => TResult | PromiseLike<TResult>) | null
+) => NssmPromise<T | TResult>;
+
+interface NssmPromise<T> extends Promise<T> {
+    then: NssmThen<T>;
+    catch: NssmCatch<T>;
+}
+
+type CallbackFn = (error?: string, result?: string) => void;
+type ZeroArgCommandFn = (callback: CallbackFn) => void;
+type OneArgCommandFn = (arg1: string, callback: CallbackFn) => void;
+type TwoArgCommandFn = (arg1: string, arg2: string, callback: CallbackFn) => void;
+type PromiseCommandFn = (arg1?: string, arg2?: string) => NssmPromise<string>;
+
+type NssmCommandFn =
+    & ZeroArgCommandFn
+    & OneArgCommandFn
+    & TwoArgCommandFn
+    & PromiseCommandFn;
+
+export = nssm;
+
+declare function nssm(serviceName: string, options?: nssm.NssmOptions): nssm.Nssm;
+
+declare namespace nssm {
+    type Nssm = {
+        [key in Command]: NssmCommandFn
+    };
+
+    interface NssmOptions {
+        nssmExe?: string;
+    }
+}
diff --git a/types/nssm/nssm-tests.ts b/types/nssm/nssm-tests.ts
new file mode 100644
index 0000000000..ceabc27e51
--- /dev/null
+++ b/types/nssm/nssm-tests.ts
@@ -0,0 +1,42 @@
+// https://github.com/alykoshin/nssm/blob/master/examples/promise_chain.js
+
+import nssm = require('nssm');
+
+const svcName = 'test';
+const options: nssm.NssmOptions = { nssmExe: 'nssm.exe' };
+const testService = nssm(svcName, options);
+
+const propertyName = 'Start';
+
+const console: { log: (...message: any[]) => void } = { log: (...args) => void (args) };
+
+testService.set('start', 'manual')
+    .then((stdout) => {
+        console.log(`stdout: ${stdout}`);
+        return testService.get('start');
+    })
+    .then((stdout) => {
+        console.log(`stdout: ${stdout}`);
+        return testService.start();
+    })
+    .then((stdout) => {
+        console.log(`stdout: ${stdout}`);
+        return testService.stop();
+    })
+    .then((stdout) => {
+        console.log(`stdout: ${stdout}`);
+    })
+    .catch((error, stdout) => {
+        console.log(`error: ${error}, stdout: ${stdout}`);
+    })
+;
+
+// https://github.com/alykoshin/nssm/blob/master/examples/get_callback.js
+
+testService.get(propertyName, (error, stdout) => {
+    if (error) {
+        console.log('error:', error, ' stderr:', stdout);
+        return;
+    }
+    console.log(`stdout: ${stdout}`);
+});
diff --git a/types/nssm/tsconfig.json b/types/nssm/tsconfig.json
new file mode 100644
index 0000000000..6b9d947f9b
--- /dev/null
+++ b/types/nssm/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "nssm-tests.ts"
+    ]
+}
diff --git a/types/nssm/tslint.json b/types/nssm/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/nssm/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/nunjucks/index.d.ts b/types/nunjucks/index.d.ts
index 13869f0d60..142c1c1f71 100644
--- a/types/nunjucks/index.d.ts
+++ b/types/nunjucks/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for nunjucks 3.1
-// Project: http://mozilla.github.io/nunjucks/
+// Project: http://mozilla.github.io/nunjucks/, https://github.com/mozilla/nunjucks
 // Definitions by: Ruben Slabbert <https://github.com/RubenSlabbert>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/nwmatcher/index.d.ts b/types/nwmatcher/index.d.ts
index cd0f97360e..bd577f50dc 100644
--- a/types/nwmatcher/index.d.ts
+++ b/types/nwmatcher/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for nwmatcher 1.4
-// Project: https://github.com/dperini/nwmatcher
+// Project: https://github.com/dperini/nwmatcher, http://javascript.nwbox.com/nwmatcher
 // Definitions by: Wouter van Heeswijk <https://github.com/woutervh->
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/obelisk.js/index.d.ts b/types/obelisk.js/index.d.ts
index 2e4cf8bc3d..d28643e2c5 100644
--- a/types/obelisk.js/index.d.ts
+++ b/types/obelisk.js/index.d.ts
@@ -1,228 +1,262 @@
-// Type definitions for obelisk.js v1.1.0
+// Type definitions for obelisk.js 1.2
 // Project: https://github.com/nosir/obelisk.js/
 // Definitions by: Brian Drupieski <https://github.com/bdrupieski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare namespace obelisk {
+export as namespace obelisk;
 
-    export var version: string;
-    export var author: string;
+export var version: string;
+export var author: string;
 
-    export class Matrix {
-        constructor(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number);
+export class Matrix {
+    constructor(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number);
 
-        a: number;
-        b: number;
-        c: number;
-        d: number;
-        tx: number;
-        ty: number;
-    }
+    a: number;
+    b: number;
+    c: number;
+    d: number;
+    tx: number;
+    ty: number;
+}
+
+export class Point {
+    constructor(x?: number, y?: number);
 
-    export class Point {
-        constructor(x?: number, y?: number);
+    x: number;
+    y: number;
+}
 
-        x: number;
-        y: number;
-    }
+export class Point3D {
+    constructor(x?: number, y?: number, z?: number);
+
+    x: number;
+    y: number;
+    z: number;
+
+    toGlobalCoordinates(offset?: obelisk.Point): obelisk.Point;
+}
+
+export class ColorGeom {
+    static get32(color: number): number;
+    static applyBrightness(color: number, brightness: number, highlight?: boolean): number;
+}
+
+export class ColorPattern {
+    static GRASS_GREEN: number;
+    static YELLOW: number;
+    static WINE_RED: number;
+    static PINK: number;
+    static PURPLE: number;
+    static BLUE: number;
+    static GRAY: number;
+    static BLACK: number;
+    static FINE_COLORS: number[];
+
+    static getRandomComfortableColor(): number;
+}
+
+export class CanvasTool {
+    static getPixel(imageData: ImageData, x: number, y: number): number;
+}
+
+export class CanvasManager {
+    static defaultCanvas: HTMLCanvasElement;
+
+    static getDefaultCanvas(): HTMLCanvasElement;
+    static getNewCanvas(): HTMLCanvasElement;
+}
+
+export class AbstractColor {
+    constructor();
+
+    inner: number;
+    border: number;
+    borderHighlight: number;
+    left: number;
+    right: number;
+    horizontal: number;
+    leftSlope: number;
+    rightSlope: number;
+}
+
+export class CubeColor extends AbstractColor {
+    constructor(border?: number, borderHighlight?: number, left?: number, right?: number, horizontal?: number);
+
+    BRIGHTNESS_GAIN: number;
+
+    getByHorizontalColor(horizontal: number): CubeColor;
+}
+
+export class PyramidColor extends AbstractColor {
+    constructor(border?: number, borderHighlight?: number, left?: number, right?: number);
+
+    BRIGHTNESS_GAIN: number;
+
+    getByRightColor(horizontal: number): PyramidColor;
+}
+
+export class SideColor extends AbstractColor {
+    constructor(border?: number, inner?: number);
+
+    BRIGHTNESS_GAIN: number;
+
+    getByInnerColor(inner: number): SideColor;
+}
+
+export class SlopeColor extends AbstractColor {
+    constructor(
+        border?: number,
+        borderHighlight?: number,
+        left?: number,
+        right?: number,
+        leftSlope?: number,
+        rightSlope?: number,
+    );
+
+    BRIGHTNESS_GAIN: number;
+
+    getByHorizontalColor(horizontal: number): SlopeColor;
+}
+
+export class LineColor extends AbstractColor {
+    constructor(border?: number, inner?: number);
+}
+
+export class AbstractDimension {
+    constructor();
+
+    xAxis: number;
+    yAxis: number;
+    zAxis: number;
+    tall: boolean;
+}
+
+export class BrickDimension extends AbstractDimension {
+    constructor(xAxis?: number, yAxis?: number);
+}
+
+export class CubeDimension extends AbstractDimension {
+    constructor(xAxis?: number, yAxis?: number, zAxis?: number);
+}
+
+export class PyramidDimension extends AbstractDimension {
+    constructor(axis?: number, tall?: boolean);
+}
+
+export class SideXDimension extends AbstractDimension {
+    constructor(xAxis?: number, zAxis?: number);
+}
+
+export class SideYDimension extends AbstractDimension {
+    constructor(yAxis?: number, zAxis?: number);
+}
 
-    export class Point3D {
-        constructor(x?: number, y?: number, z?: number);
+export class SlopeDimension extends AbstractDimension {
+    constructor(xAxis?: number, yAxis?: number);
+}
 
-        x: number;
-        y: number;
-        z: number;
+export class LineXDimension extends AbstractDimension {
+    constructor(axis?: number);
+}
 
-        toGlobalCoordinates(offset?: obelisk.Point): obelisk.Point;
-    }
+export class LineYDimension extends AbstractDimension {
+    constructor(axis?: number);
+}
+
+export class LineZDimension extends AbstractDimension {
+    constructor(axis?: number);
+}
+
+export class BitmapData {
+    constructor(w: number, h: number, useDefaultCanvas?: boolean);
+
+    imageData: ImageData;
+    canvas: HTMLCanvasElement;
+    context: CanvasRenderingContext2D;
 
-    export class ColorGeom {
-        static get32(color: number): number;
-        static applyBrightness(color: number, brightness: number, highlight?: boolean): number;
-    }
+    setPixel(posX: number, posY: number, color: number): void;
+    setPixelByIndex(index: number, color: number): void;
+    checkPixelAvailable(x: number, y: number): boolean;
+    floodFill(posX: number, posY: number, color: number): void;
+}
 
-    export class ColorPattern {
-        static GRASS_GREEN: number;
-        static YELLOW: number;
-        static WINE_RED: number;
-        static PINK: number;
-        static PURPLE: number;
-        static BLUE: number;
-        static GRAY: number;
-        static BLACK: number;
-        static FINE_COLORS: number[];
+export class PixelObject {
+    constructor(primitive: AbstractPrimitive, point3D?: Point3D);
 
-        static getRandomComfortableColor(): number;
-    }
+    x: number;
+    y: number;
+    canvas: HTMLCanvasElement;
+}
+
+export class PixelView {
+    constructor(canvas: HTMLCanvasElement, point?: Point);
+
+    canvas: HTMLCanvasElement;
+    context: CanvasRenderingContext2D;
+    point: Point;
+
+    renderObject(primitive: AbstractPrimitive, point3D?: Point3D): void;
+    clear(): void;
+}
+
+export class AbstractPrimitive {
+    constructor();
+
+    canvas: HTMLCanvasElement;
+    w: number;
+    h: number;
+    dimension: AbstractDimension;
+    color: AbstractColor;
+    border: boolean;
+    bitmapData: BitmapData;
+    useDefaultCanvas: boolean;
+    matrix: Matrix;
+}
 
-    export class CanvasTool {
-        static getPixel(imageData: ImageData, x: number, y: number): number;
-    }
-
-    export class CanvasManager {
-        static defaultCanvas: HTMLCanvasElement;
-
-        static getDefaultCanvas(): HTMLCanvasElement;
-        static getNewCanvas(): HTMLCanvasElement;
-    }
-
-    export class AbstractColor {
-        constructor();
-
-        inner: number;
-        border: number;
-        borderHighlight: number;
-        left: number;
-        right: number;
-        horizontal: number;
-        leftSlope: number;
-        rightSlope: number;
-    }
-
-    export class CubeColor extends AbstractColor {
-        constructor(border?: number, borderHighlight?: number, left?: number, right?: number, horizontal?: number);
-
-        BRIGHTNESS_GAIN: number;
-
-        getByHorizontalColor(horizontal: number): CubeColor;
-    }
-
-    export class PyramidColor extends AbstractColor {
-        constructor(border?: number, borderHighlight?: number, left?: number, right?: number);
-
-        BRIGHTNESS_GAIN: number;
-
-        getByRightColor(horizontal: number): PyramidColor;
-    }
-
-    export class SideColor extends AbstractColor {
-        constructor(border?: number, inner?: number);
-
-        BRIGHTNESS_GAIN: number;
-
-        getByInnerColor(inner: number): SideColor;
-    }
-
-    export class SlopeColor extends AbstractColor {
-        constructor(border?: number, borderHighlight?: number, left?: number, right?: number, leftSlope?: number, rightSlope?: number);
-
-        BRIGHTNESS_GAIN: number;
-
-        getByHorizontalColor(horizontal: number): SlopeColor;
-    }
-
-    export class AbstractDimension {
-        constructor();
-
-        xAxis: number;
-        yAxis: number;
-        zAxis: number;
-        tall: boolean;
-    }
-
-    export class BrickDimension extends AbstractDimension {
-        constructor(xAxis?: number, yAxis?: number);
-    }
-
-    export class CubeDimension extends AbstractDimension {
-        constructor(xAxis?: number, yAxis?: number, zAxis?: number);
-    }
-
-    export class PyramidDimension extends AbstractDimension {
-        constructor(axis?: number, tall?: boolean);
-    }
-
-    export class SideXDimension extends AbstractDimension {
-        constructor(xAxis?: number, zAxis?: number);
-    }
-
-    export class SideYDimension extends AbstractDimension {
-        constructor(yAxis?: number, zAxis?: number);
-    }
-
-    export class SlopeDimension extends AbstractDimension {
-        constructor(xAxis?: number, yAxis?: number);
-    }
-
-    export class BitmapData {
-        constructor(w: number, h: number, useDefaultCanvas?: boolean);
-
-        imageData: ImageData;
-        canvas: HTMLCanvasElement;
-        context : CanvasRenderingContext2D;
-
-        setPixel(posX: number, posY: number, color: number): void;
-        setPixelByIndex(index: number, color: number): void;
-        checkPixelAvailable(x: number, y: number): boolean;
-        floodFill(posX: number, posY: number, color: number): void;
-    }
-
-    export class PixelObject {
-        constructor(primitive: AbstractPrimitive, point3D?: Point3D);
-
-        x: number;
-        y: number;
-        canvas: HTMLCanvasElement;
-    }
-
-    export class PixelView {
-        constructor(canvas: HTMLCanvasElement, point?: Point);
-
-        canvas: HTMLCanvasElement;
-        context: CanvasRenderingContext2D;
-        point: Point;
-
-        renderObject(primitive: AbstractPrimitive, point3D?: Point3D): void;
-        clear(): void;
-    }
-
-    export class AbstractPrimitive {
-        constructor();
-
-        canvas: HTMLCanvasElement;
-        w: number;
-        h: number;
-        dimension: AbstractDimension;
-        color: AbstractColor;
-        border: boolean;
-        bitmapData: BitmapData;
-        useDefaultCanvas: boolean;
-        matrix: Matrix;
-    }
-
-    export class Brick extends AbstractPrimitive {
-        constructor(dimension?: BrickDimension, color?: SideColor, border?: boolean, useDefaultCanvas?: boolean);
-    }
-
-    export class Cube extends AbstractPrimitive {
-        constructor(dimension?: CubeDimension, color?: CubeColor, border?: boolean, useDefaultCanvas?: boolean);
-    }
-
-    export class Pyramid extends AbstractPrimitive {
-        constructor(dimension?: PyramidDimension, color?: PyramidColor, border?: boolean, useDefaultCanvas?: boolean);
-    }
-
-    export class SideX extends AbstractPrimitive {
-        constructor(dimension?: SideXDimension, color?: SideColor, border?: boolean, useDefaultCanvas?: boolean);
-    }
-
-    export class SideY extends AbstractPrimitive {
-        constructor(dimension?: SideYDimension, color?: SideColor, border?: boolean, useDefaultCanvas?: boolean);
-    }
-
-    export class SlopeEast extends AbstractPrimitive {
-        constructor(dimension?: SlopeDimension, color?: SlopeColor, border?: boolean, useDefaultCanvas?: boolean);
-    }
-
-    export class SlopeNorth extends AbstractPrimitive {
-        constructor(dimension?: SlopeDimension, color?: SlopeColor, border?: boolean, useDefaultCanvas?: boolean);
-    }
-
-    export class SlopeSouth extends AbstractPrimitive {
-        constructor(dimension?: SlopeDimension, color?: SlopeColor, border?: boolean, useDefaultCanvas?: boolean);
-    }
-
-    export class SlopeWest extends AbstractPrimitive {
-        constructor(dimension?: SlopeDimension, color?: SlopeColor, border?: boolean, useDefaultCanvas?: boolean);
-    }
+export class Brick extends AbstractPrimitive {
+    constructor(dimension?: BrickDimension, color?: SideColor, border?: boolean, useDefaultCanvas?: boolean);
+}
+
+export class Cube extends AbstractPrimitive {
+    constructor(dimension?: CubeDimension, color?: CubeColor, border?: boolean, useDefaultCanvas?: boolean);
+}
+
+export class Pyramid extends AbstractPrimitive {
+    constructor(dimension?: PyramidDimension, color?: PyramidColor, border?: boolean, useDefaultCanvas?: boolean);
+}
+
+export class SideX extends AbstractPrimitive {
+    constructor(dimension?: SideXDimension, color?: SideColor, border?: boolean, useDefaultCanvas?: boolean);
+}
+
+export class SideY extends AbstractPrimitive {
+    constructor(dimension?: SideYDimension, color?: SideColor, border?: boolean, useDefaultCanvas?: boolean);
+}
+
+export class SlopeEast extends AbstractPrimitive {
+    constructor(dimension?: SlopeDimension, color?: SlopeColor, border?: boolean, useDefaultCanvas?: boolean);
+}
+
+export class SlopeNorth extends AbstractPrimitive {
+    constructor(dimension?: SlopeDimension, color?: SlopeColor, border?: boolean, useDefaultCanvas?: boolean);
+}
+
+export class SlopeSouth extends AbstractPrimitive {
+    constructor(dimension?: SlopeDimension, color?: SlopeColor, border?: boolean, useDefaultCanvas?: boolean);
+}
+
+export class SlopeWest extends AbstractPrimitive {
+    constructor(dimension?: SlopeDimension, color?: SlopeColor, border?: boolean, useDefaultCanvas?: boolean);
+}
+
+export class LineX extends AbstractPrimitive {
+    constructor(dimension?: LineXDimension, color?: LineColor, useDefaultCanvas?: boolean);
+}
+
+export class LineY extends AbstractPrimitive {
+    constructor(dimension?: LineYDimension, color?: LineColor, useDefaultCanvas?: boolean);
+}
+
+export class LineZ extends AbstractPrimitive {
+    constructor(dimension?: LineZDimension, color?: LineColor, useDefaultCanvas?: boolean);
 }
diff --git a/types/obelisk.js/obelisk.js-tests.ts b/types/obelisk.js/obelisk.js-tests.ts
index e47b474467..4cc4328409 100644
--- a/types/obelisk.js/obelisk.js-tests.ts
+++ b/types/obelisk.js/obelisk.js-tests.ts
@@ -1,3 +1,5 @@
+import * as obelisk from 'obelisk.js';
+
 function test_brick() {
     var canvas = <HTMLCanvasElement>document.getElementById('canvas-demo');
 
@@ -143,4 +145,31 @@ function test_gif_rendering() {
     var floorDimension = new obelisk.CubeDimension((size - 2) * (WIDTH + 2), (size - 2) * 9, size);
     var floor = new obelisk.Cube(floorDimension, new obelisk.CubeColor(), false);
     pixelViewFloor.renderObject(floor, new obelisk.Point3D(-20, -30, 0));
-}
\ No newline at end of file
+}
+
+function test_line_rendering() {
+    var canvas = document.getElementById('canvas-demo') as HTMLCanvasElement;
+
+    // create pixel view container in point
+    var point = new obelisk.Point(400, 200);
+    var pixelView = new obelisk.PixelView(canvas, point);
+
+    // create brick
+    var colorX = new obelisk.LineColor(obelisk.ColorPattern.PINK);
+    var colorY = new obelisk.LineColor(obelisk.ColorPattern.BLACK);
+    var colorZ = new obelisk.LineColor(obelisk.ColorPattern.BLUE);
+
+    var dimensionX = new obelisk.LineXDimension(100);
+    var dimensionY = new obelisk.LineYDimension(100);
+    var dimensionZ = new obelisk.LineZDimension(100);
+
+    var lineX = new obelisk.LineX(dimensionX, colorX);
+    var lineY = new obelisk.LineY(dimensionY, colorY);
+    var lineZ = new obelisk.LineZ(dimensionZ, colorZ);
+
+    // render in view
+    var p3D = new obelisk.Point3D(0, 0, 0);
+    pixelView.renderObject(lineX, p3D);
+    pixelView.renderObject(lineY, p3D);
+    pixelView.renderObject(lineZ, p3D);
+}
diff --git a/types/obelisk.js/tslint.json b/types/obelisk.js/tslint.json
index d67ffb3a73..40aa0a5f91 100644
--- a/types/obelisk.js/tslint.json
+++ b/types/obelisk.js/tslint.json
@@ -7,7 +7,7 @@
         "ban-types": false,
         "callable-types": false,
         "comment-format": false,
-        "dt-header": false,
+        "dt-header": true,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/office-js-preview/index.d.ts b/types/office-js-preview/index.d.ts
index fab2c5095a..45e991646f 100644
--- a/types/office-js-preview/index.d.ts
+++ b/types/office-js-preview/index.d.ts
@@ -20,7 +20,7 @@ declare namespace Office {
      */
     var Promise: IPromiseConstructor;
 
-    // Note: this is a copy of the PromiseConstructor object from
+    // **Note**: this is a copy of the PromiseConstructor object from
     //     https://github.com/Microsoft/TypeScript/blob/master/lib/lib.es2015.promise.d.ts
     // It is necessary so that even with targeting "ES5" and not specifying any libs,
     //     developers will still get IntelliSense for "Office.Promise" just as they would with a regular Promise.
@@ -628,7 +628,7 @@ declare namespace Office {
         * 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. 
+        * **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**
@@ -729,7 +729,7 @@ declare namespace Office {
         * 
         * 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.
+        * When using in Outlook, the applicable modes are Compose or Read.
         * 
         * **Support details**
         * 
@@ -797,9 +797,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         mailbox: Office.Mailbox;
         /**
@@ -823,9 +824,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         roamingSettings: Office.RoamingSettings;
         /**
@@ -905,11 +907,11 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * <table><tr><td>Add-in type</td><td>Content, task pane, Outlook</td></tr>
-         * 
-         * <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>
+         * <table>
+         *   <tr><td>Add-in type</td><td>Content, task pane, Outlook</td></tr>
+         *   <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 Event {
             
@@ -945,9 +947,10 @@ 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>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>
+             * <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>
              * 
              * **Support details**
              * 
@@ -997,9 +1000,10 @@ declare namespace Office {
         * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
         *
         * @remarks
-        * <table><tr><td>Hosts</td><td>Word, Excel, Outlook, PowerPoint</td></tr>
-        *
-        * <tr><td>Requirement sets</td><td>DialogApi, Mailbox 1.4</td></tr></table>
+        * <table>
+        *   <tr><td>Hosts</td><td>Word, Excel, Outlook, PowerPoint</td></tr>
+        *   <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 
@@ -1093,6 +1097,105 @@ declare namespace Office {
         * @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<Dialog>) => void): void;
+        /**
+        * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
+        *
+        * @remarks
+        * <table>
+        *   <tr><td>Hosts</td><td>Word, Excel, Outlook, PowerPoint</td></tr>
+        *   <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/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.
+        *
+        * 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 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.
+        *
+        * - Every dialog box is centered on the screen when opened.
+        *
+        * - Dialog boxes appear on top of the host application and in the order in which they were created.
+        *
+        * Use a dialog box to:
+        *
+        * - Display authentication pages to collect user credentials.
+        *
+        * - 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>
+        *   <tr>
+        *     <td>12009</td>
+        *     <td>The user chose to ignore the dialog box. This error can occur in online versions of Office, where users may choose not to allow an add-in to present a dialog.</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 callback - Optional. Accepts a callback method to handle the dialog creation attempt. If successful, the AsyncResult.value is a Dialog object.
+        */
         displayDialogAsync(startAddress: string, 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. 
@@ -1348,7 +1451,7 @@ declare namespace Office {
         /**
          * 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.
+         * **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
         /**
@@ -1683,43 +1786,43 @@ declare namespace Office {
          * 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.
+         * **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.
          * 
-         * Note: 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.
          * 
-         * Note: 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.
          * 
-         * Note: 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.
          * 
-         * Note: Only applies to data in PowerPoint when calling the {@link Office.Document | Document}.getSelectedData method to get the current 
+         * **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.
-        * Note: Only applies to data in Excel, Word, and PowerPoint.
+        * **Note**: Only applies to data in Excel, Word, and PowerPoint.
         */
         Image,
         /**
          * Data is returned or set as XML data containing an SVG image.
-         * Note: Only applies to data in Excel, Word, and PowerPoint.
+         * **Note**: Only applies to data in Excel, Word, and PowerPoint.
          */
         XmlSvg
     }
@@ -1813,7 +1916,7 @@ declare namespace Office {
      * 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>
+     * <table><tr><td>BindingDataChanged and BindingSelectionChanged hosts</td><td>Access, Excel, Word</td></tr></table>
      *
      * @remarks
      * 
@@ -2291,6 +2394,17 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * 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 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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.AsyncResult<void>) => void): void;
         /**
          * Returns the data contained within the binding.
@@ -2307,6 +2421,19 @@ declare namespace Office {
          *                  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<T>(options?: GetBindingDataOptions, callback?: (result: AsyncResult<T>) => void): void;
+        /**
+         * Returns the data contained within the binding.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>MatrixBindings, TableBindings, TextBindings</td></tr></table>
+         *
+         * 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 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<T>(callback?: (result: AsyncResult<T>) => void): void;
         /**
          * Removes the specified handler from the binding for the specified event type.
@@ -2319,6 +2446,15 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         removeHandlerAsync(eventType: Office.EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Removes the specified handler from the binding for the specified event type.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>BindingEvents</td></tr></table>
+         *
+         * @param eventType The event type. For bindings, it can be `Office.EventType.BindingDataChanged` or `Office.EventType.BindingSelectionChanged`.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         removeHandlerAsync(eventType: Office.EventType, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Writes data to the bound section of the document represented by the specified binding object.
@@ -2392,7 +2528,7 @@ declare namespace Office {
          *   </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>
+         *     <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>
          * 
@@ -2451,6 +2587,134 @@ declare namespace Office {
          * @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): void;
+        /**
+         * Writes data to the bound section of the document represented by the specified binding object.
+         *
+         * @remarks
+         *
+         * <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:
+         *
+         *        string: Excel, Excel Online, Word, and Word Online only
+         *
+         *        array of arrays: Excel and Word only
+         *
+         *        {@link Office.TableData}: Access, Excel, and Word only
+         *
+         *        HTML: Word and Word Online only
+         *
+         *        Office Open XML: Word only
+         *
+         * @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, callback?: (result: AsyncResult<void>) => void): void;
     }
 
@@ -2566,7 +2830,7 @@ declare namespace Office {
          * 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 
+         *     **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 
@@ -2576,7 +2840,7 @@ declare namespace Office {
          * 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 
+         *     **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**
@@ -2601,6 +2865,50 @@ declare namespace Office {
          *                  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<Binding>) => void): void;
+        /**
+         * Creates a binding against a named object in the document.
+         *
+         * @remarks
+         * <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.
+         *
+         *     **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).
+         *
+         * 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.
+         *
+         * **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> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *  </table>
+         * @param itemName Name of the bindable object in the document. For Example 'MyExpenses' table in Excel."
+         * @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 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, callback?: (result: AsyncResult<Binding>) => void): void;
         /**
          * Create a binding by prompting the user to make a selection on the document.
@@ -2633,6 +2941,35 @@ declare namespace Office {
          *                  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<Binding>) => void): void;
+        /**
+         * Create a binding by prompting the user to make a selection on the document.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>Not in a set</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.
+         * 
+         * **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> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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 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, callback?: (result: AsyncResult<Binding>) => void): void;
         /**
          * Create a binding based on the user's current selection.
@@ -2670,6 +3007,40 @@ declare namespace Office {
          *                  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<Binding>) => void): void;
+        /**
+         * Create a binding based on the user's current selection.
+         *
+         * @remarks
+         * <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.
+         * 
+         * **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> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><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 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, callback?: (result: AsyncResult<Binding>) => void): void;
         /**
          * Gets all bindings that were previously created.
@@ -2698,6 +3069,31 @@ declare namespace Office {
          *                  The `value` property of the result is an array that contains each binding created for the referenced Bindings object.
          */
         getAllAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<Binding[]>) => void): void;
+        /**
+         * Gets all bindings that were previously created.
+         *
+         * @remarks
+         * <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *  </table>
+         *
+         * @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(callback?: (result: AsyncResult<Binding[]>) => void): void;
         /**
          * Retrieves a binding based on its Name
@@ -2727,8 +3123,36 @@ declare namespace Office {
          * @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 Binding object specified by the id in the call.
-          */
+         */
         getByIdAsync(id: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<Binding>) => void): void;
+        /**
+         * Retrieves a binding based on its Name
+         *
+         * @remarks
+         * <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *  </table>
+         *
+         * @param id Specifies the unique name of the binding object. Required.
+         * @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, callback?: (result: AsyncResult<Binding>) => void): void;
         /**
          * Removes the binding from the document
@@ -2759,6 +3183,33 @@ declare namespace Office {
          * @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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Removes the binding from the document
+         *
+         * @remarks
+         * <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *  </table>
+         *
+         * @param id Specifies the unique name to be used to identify the binding object. Required.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         releaseByIdAsync(id: string, callback?: (result: AsyncResult<void>) => void): void;
     }
     /**
@@ -2815,6 +3266,16 @@ declare namespace Office {
          *                  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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<CustomXmlNode[]>) => void): void;
+        /**
+         * Gets the nodes associated with the XPath expression.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+         *
+         * @param xPath The XPath expression that specifies the nodes to get. Required.
+         * @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, callback?: (result: AsyncResult<CustomXmlNode[]>) => void): void;
         /**
          * Gets the node value.
@@ -2827,6 +3288,15 @@ declare namespace Office {
          *                  The `value` property of the result is a string that contains the value of the referenced node.
          */
         getNodeValueAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Gets the node value.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+         *
+         * @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(callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Gets the text of an XML node in a custom XML part.
@@ -2839,6 +3309,15 @@ declare namespace Office {
          *                  The `value` property of the result is a string that contains the inner text of the referenced nodes.
          */
         getTextAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Gets the text of an XML node in a custom XML part.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+         *
+         * @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(callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Gets the node's XML.
@@ -2851,6 +3330,15 @@ declare namespace Office {
          *                  The `value` property of the result is a string that contains the XML of the referenced node.
          */
         getXmlAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Gets the node's XML.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+         *
+         * @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(callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Sets the node value.
@@ -2863,20 +3351,42 @@ declare namespace Office {
          * @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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Sets the node value.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+         *
+         * @param value The value to be set on the node
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         setNodeValueAsync(value: string, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Asynchronously sets the text of an XML node in a custom XML part.
          *
          * @remarks
-         * <table><tr><td>Hosts</td><td>Word</td></tr>
-         *
-         * <tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+         * <table>
+         *   <tr><td>Hosts</td><td>Word</td></tr>
+         *   <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 {@link Office.AsyncResult}.
          */
         setTextAsync(text: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Asynchronously sets the text of an XML node in a custom XML part.
+         *
+         * @remarks
+         * <table>
+         *   <tr><td>Hosts</td><td>Word</td></tr>
+         *   <tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr>
+         * </table>
+         *
+         * @param text Required. The text value of the XML node.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         setTextAsync(text: string, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Sets the node XML.
@@ -2889,6 +3399,15 @@ declare namespace Office {
          * @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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Sets the node XML.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+         *
+         * @param xml The XML to be set on the node
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         setXmlAsync(xml: string, callback?: (result: AsyncResult<void>) => void): void;
     }
     /**
@@ -2924,7 +3443,6 @@ declare namespace Office {
          * 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.
          *
@@ -2940,45 +3458,68 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         addHandlerAsync(eventType: Office.EventType, handler: (result: any) => void, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Adds an event handler to the object using the specified event type.
+         *
+         * @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 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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         addHandlerAsync(eventType: Office.EventType, handler: (result: any) => void, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Deletes the Custom XML Part.
          *
-         * @remarks
-         *
          * @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}.
          */
         deleteAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Deletes the Custom XML Part.
+         *
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         deleteAsync(callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Asynchronously gets any CustomXmlNodes in this custom XML part which match the specified XPath.
          *
-         * @remarks
-         *
          * @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 {@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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<CustomXmlNode[]>) => void): void;
+        /**
+         * Asynchronously gets any CustomXmlNodes in this custom XML part which match the specified XPath.
+         *
+         * @param xPath An XPath expression that specifies the nodes you want returned. Required.
+         * @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, callback?: (result: AsyncResult<CustomXmlNode[]>) => void): void;
         /**
          * Asynchronously gets the XML inside this custom XML part.
          *
-         * @remarks
-         *
          * @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 string that contains the XML of the referenced CustomXmlPart object.
-        */
+         */
         getXmlAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Asynchronously gets the XML inside this custom XML part.
+         *
+         * @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(callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Removes an event handler for the specified event type.
          *
-         * @remarks
-         *
          * @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.
@@ -2986,6 +3527,14 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         removeHandlerAsync(eventType: Office.EventType, handler?: (result: any) => void, options?: RemoveHandlerOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Removes an event handler for the specified event type.
+         *
+         * @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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         removeHandlerAsync(eventType: Office.EventType, handler?: (result: any) => void, callback?: (result: AsyncResult<void>) => void): void;
     }
 
@@ -3126,6 +3675,13 @@ declare namespace Office {
          *                  The `value` property of the result is the newly created CustomXmlPart object.
          */
         addAsync(xml: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<CustomXmlPart>) => void): void;
+        /**
+         * Asynchronously adds a new custom XML part to a file.
+         *
+         * @param xml The XML to add to the newly created custom XML part.
+         * @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, callback?: (result: AsyncResult<CustomXmlPart>) => void): void;
         /**
          * Asynchronously gets the specified custom XML part by its id.
@@ -3137,6 +3693,14 @@ declare namespace Office {
          *                  If there is no custom XML part with the specified id, the method returns null.
          */
         getByIdAsync(id: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<CustomXmlPart>) => void): void;
+        /**
+         * Asynchronously gets the specified custom XML part by its id.
+         *
+         * @param id The GUID of the custom XML part, including opening and closing braces.
+         * @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, callback?: (result: AsyncResult<CustomXmlPart>) => void): void;
         /**
          * Asynchronously gets the specified custom XML part(s) by its namespace.
@@ -3147,6 +3711,13 @@ declare namespace Office {
          *                  The `value` property of the result is an array of CustomXmlPart objects that match the specified namespace.
         */
         getByNamespaceAsync(ns: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<CustomXmlPart[]>) => void): void;
+        /**
+         * Asynchronously gets the specified custom XML part(s) by its namespace.
+         *
+         * @param ns  The namespace URI.
+         * @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, callback?: (result: AsyncResult<CustomXmlPart[]>) => void): void;
     }
     /**
@@ -3183,6 +3754,16 @@ declare namespace Office {
          * @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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Asynchronously adds a prefix to namespace mapping to use when querying an item.
+         *
+         * @remarks
+         * 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 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, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Asynchronously gets the namespace mapped to the specified prefix.
@@ -3198,6 +3779,18 @@ declare namespace Office {
          *                  The `value` property of the result is a string that contains the namespace mapped to the specified prefix.
          */
         getNamespaceAsync(prefix: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Asynchronously gets the namespace mapped to the specified prefix.
+         *
+         * @remarks
+         *
+         * 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 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, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Asynchronously gets the prefix for the specified namespace.
@@ -3211,8 +3804,20 @@ declare namespace Office {
          * @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 string that contains the prefix of the specified namespace.
-        */
+         */
         getPrefixAsync(ns: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Asynchronously gets the prefix for the specified namespace.
+         *
+         * @remarks
+         *
+         * 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 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, callback?: (result: AsyncResult<string>) => void): void;
     }
     /**
@@ -3369,6 +3974,37 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Adds an event handler for a Document object event.
+         *
+         * @remarks
+         * <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> OneNote    </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </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 {@link Office.DocumentSelectionChangedEventArgs}. Required.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Returns the state of the current view of the presentation (edit or read).
@@ -3397,8 +4033,35 @@ declare namespace Office {
          *                  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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<"edit" | "read">) => void): void;
+        /**
+         * Returns the state of the current view of the presentation (edit or read).
+         *
+         * @remarks
+         * <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *  </table>
+         *
+         * @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(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). 
@@ -3444,6 +4107,48 @@ declare namespace Office {
          *                  The `value` property of the result is the File object.
          */
         getFileAsync(fileType: FileType, options?: GetFileOptions, callback?: (result: AsyncResult<Office.File>) => 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.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>File</td></tr></table>
+         *
+         * 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:
+         *
+         * Excel for Windows desktop, iPad, and Excel Online: `Office.FileType.Compressed`
+         * 
+         * Excel for Mac: `Office.FileType.Compressed`, `Office.FileType.Pdf`
+         *
+         * PowerPoint for Windows desktop, Mac, iPad, and PowerPoint Online: `Office.FileType.Compressed`, `Office.FileType.Pdf`
+         *
+         * Word for Windows desktop, Mac, iPad, and Word Online: `Office.FileType.Compressed`, `Office.FileType.Pdf`, `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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *  </table>
+         *
+         * @param fileType The format in which the file will be returned
+         * @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, callback?: (result: AsyncResult<Office.File>) => void): void;
         /**
          * Gets file properties of the current document.
@@ -3472,8 +4177,35 @@ declare namespace Office {
          * @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 {@link Office.AsyncResult}.
          *                  The `value` property of the result is the file's properties (with the URL found at `asyncResult.value.url`).
-        */
+         */
         getFilePropertiesAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<Office.FileProperties>) => void): void;
+        /**
+         * Gets file properties of the current document.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>Not in a set</td></tr></table>
+         *
+         * 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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *  </table>
+         *
+         * @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(callback?: (result: AsyncResult<Office.FileProperties>) => void): void;
         /**
          * Reads the data contained in the current selection in the document.
@@ -3571,6 +4303,98 @@ declare namespace Office {
          *                  (See Remarks for more information about data coercion.)
          */
         getSelectedDataAsync<T>(coercionType: Office.CoercionType, options?: GetSelectedDataOptions, callback?: (result: AsyncResult<T>) => void): void;
+        /**
+         * Reads the data contained in the current selection in the document.
+         *
+         * @remarks
+         * <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, PowerPoint, Project, and Word</td>
+         *     <td>`Office.CoercionType.Text` (string)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Excel and Word</td>
+         *     <td>`Office.CoercionType.Matrix` (array of arrays)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Access, Excel, and Word</td>
+         *     <td>`Office.CoercionType.Table` (TableData object)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Word</td>
+         *     <td>`Office.CoercionType.Html`</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Word</td>
+         *     <td>`Office.CoercionType.Ooxml` (Office Open XML)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>PowerPoint and PowerPoint Online</td>
+         *     <td>`Office.CoercionType.SlideRange`</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Excel, PowerPoint, and Word</td>
+         *     <td>`Office.CoercionType.XmlSvg`</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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </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 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<T>(coercionType: Office.CoercionType, callback?: (result: AsyncResult<T>) => void): void;
         /**
          * Goes to the specified object or location in the document.
@@ -3614,6 +4438,46 @@ declare namespace Office {
          *                  The `value` property of the result is the current view.
          */
         goToByIdAsync(id: string | number, goToType: GoToType, options?: GoToByIdOptions, callback?: (result: AsyncResult<any>) => void): void;
+        /**
+         * Goes to the specified object or location in the document.
+         *
+         * @remarks
+         * <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 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).
+         * 
+         * **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> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </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 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, callback?: (result: AsyncResult<any>) => void): void;
         /**
          * Removes an event handler for the specified event type.
@@ -3644,6 +4508,33 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         removeHandlerAsync(eventType: Office.EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Removes an event handler for the specified event type.
+         *
+         * @remarks
+         * <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> OneNote    </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         removeHandlerAsync(eventType: Office.EventType, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Writes the specified data into the current selection.
@@ -3656,26 +4547,94 @@ declare namespace Office {
          * 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>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>
+         *   <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</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>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>
+         *   <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. 
@@ -3762,6 +4721,188 @@ declare namespace Office {
          *                  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): void;
+        /**
+         * Writes the specified data into the current selection.
+         *
+         * @remarks
+         * <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, PowerPoint, Project, and Word</td>
+         *     <td>`Office.CoercionType.Text` (string)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Excel and Word</td>
+         *     <td>`Office.CoercionType.Matrix` (array of arrays)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Access, Excel, and Word</td>
+         *     <td>`Office.CoercionType.Table` (TableData object)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Word</td>
+         *     <td>`Office.CoercionType.Html`</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Word</td>
+         *     <td>`Office.CoercionType.Ooxml` (Office Open XML)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>PowerPoint and PowerPoint Online</td>
+         *     <td>`Office.CoercionType.SlideRange`</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Excel, PowerPoint, and Word</td>
+         *     <td>`Office.CoercionType.XmlSvg`</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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </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 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[][], callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Project documents only. Get Project field (Ex. ProjectWebAccessURL).
@@ -3787,6 +4928,28 @@ declare namespace Office {
          *  </table>
          */
         getProjectFieldAsync(fieldId: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<any>) => void): void;
+        /**
+         * Project documents only. Get Project field (Ex. ProjectWebAccessURL).
+         * @param fieldId Project level fields.
+         * @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, callback?: (result: AsyncResult<any>) => void): void;
         /**
          * Project documents only. Get resource field for provided resource Id. (Ex.ResourceName)
@@ -3813,6 +4976,29 @@ declare namespace Office {
          *  </table>
          */
         getResourceFieldAsync(resourceId: string, fieldId: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => 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 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, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Project documents only. Get the current selected Resource's Id.
@@ -3837,6 +5023,27 @@ declare namespace Office {
          *  </table>
          */
         getSelectedResourceAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Project documents only. Get the current selected Resource's Id.
+         * @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(callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Project documents only. Get the current selected Task's Id.
@@ -3861,6 +5068,27 @@ declare namespace Office {
          *  </table>
          */
         getSelectedTaskAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Project documents only. Get the current selected Task's Id.
+         * @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(callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Project documents only. Get the current selected View Type (Ex. Gantt) and View Name.
@@ -3887,6 +5115,29 @@ declare namespace Office {
          *  </table>
          */
         getSelectedViewAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<any>) => void): void;
+        /**
+         * Project documents only. Get the current selected View Type (Ex. Gantt) and View Name.
+         * @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(callback?: (result: AsyncResult<any>) => void): void;
         /**
          * Project documents only. Get the Task Name, WSS Task Id, and ResourceNames for given taskId.
@@ -3915,6 +5166,31 @@ declare namespace Office {
          *  </table>
          */
         getTaskAsync(taskId: string, 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 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, callback?: (result: AsyncResult<any>) => void): void;
         /**
          * Project documents only. Get task field for provided task Id. (Ex. StartDate).
@@ -3941,6 +5217,29 @@ declare namespace Office {
          *  </table>
          */
         getTaskFieldAsync(taskId: string, fieldId: number, 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 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, 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.
@@ -3967,11 +5266,34 @@ declare namespace Office {
          *  </table>
          */
         getWSSUrlAsync(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 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(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.
+         * **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}.
@@ -3989,16 +5311,40 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <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 resources in the current project.
+         * 
+         * **Important**: This API works only in Project 2016 on Windows desktop.
+         * 
+         * @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(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.
+         * **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}.
@@ -4021,11 +5367,35 @@ declare namespace Office {
          *  </table>
          */
         getMaxTaskIndexAsync(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 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(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.
+         * **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.
@@ -4049,11 +5419,36 @@ declare namespace Office {
          *  </table>
          */
         getResourceByIndexAsync(resourceIndex: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => 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 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, 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.
+         * **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.
@@ -4077,11 +5472,36 @@ declare namespace Office {
          *  </table>
          */
         getTaskByIndexAsync(taskIndex: 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 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, 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.
+         * **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.
@@ -4106,11 +5526,37 @@ declare namespace Office {
          *  </table>
          */
         setResourceFieldAsync(resourceId: string, fieldId: number, fieldValue: string | number | boolean | object, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => 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 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, 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.
+         * **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.
@@ -4135,6 +5581,32 @@ declare namespace Office {
          *  </table>
          */
         setTaskFieldAsync(taskId: 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 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, callback?: (result: AsyncResult<void>) => void): void;
     }
     /**
@@ -4295,18 +5767,20 @@ declare namespace Office {
         * Gets the number of columns in the matrix data structure, as an integer value.
         *
         * @remarks
-        * <table><tr><td>Hosts</td><td>Access, Excel, PowerPoint, Project, Word</td></tr>
-        *
-        * <tr><td>Requirement Sets</td><td>MatrixBindings</td></tr></table>
+        * <table>
+        *   <tr><td>Hosts</td><td>Access, Excel, PowerPoint, Project, Word</td></tr>
+        *   <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
-        * <table><tr><td>Hosts</td><td>Access, Excel, PowerPoint, Project, Word</td></tr>
-        *
-        * <tr><td>Requirement Sets</td><td>MatrixBindings</td></tr></table>
+        * <table>
+        *   <tr><td>Hosts</td><td>Access, Excel, PowerPoint, Project, Word</td></tr>
+        *   <tr><td>Requirement Sets</td><td>MatrixBindings</td></tr>
+        * </table>
         */
         rowCount: number;
     }
@@ -4314,9 +5788,10 @@ 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
-     * <table><tr><td>Hosts</td><td>Access, Excel, PowerPoint, Word</td></tr>
-     *
-     * <tr><td>Requirement Sets</td><td>Settings</td></tr></table>
+     * <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.
@@ -4332,7 +5807,7 @@ declare namespace Office {
         /**
          * 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 
+         * **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.
          *
@@ -4386,6 +5861,61 @@ declare namespace Office {
          *  </table>
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * 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.
+         *
+         * @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.
+         *
+         * @param eventType Specifies the type of event to add. Required.
+         * @param handler The event handler function to add, whose only parameter is of type {@link Office.SettingsChangedEventArgs}. Required.
+         * @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> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *  </table>
+         */
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Retrieves the specified setting.
@@ -4477,7 +6007,7 @@ declare namespace Office {
         /**
          * 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 
+         * **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.
          *
@@ -4542,6 +6072,40 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         removeHandlerAsync(eventType: Office.EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Removes an event handler for the settingsChanged event.
+         *
+         * @remarks
+         *
+         * <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>                            </td><td> Y                          </td><td>                 </td></tr>
+         *  </table>
+         *
+         * @param eventType Specifies the type of event to remove. Required.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         removeHandlerAsync(eventType: Office.EventType, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Persists the in-memory copy of the settings property bag in the document.
@@ -4551,7 +6115,7 @@ declare namespace Office {
          * 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 
+         * **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.
@@ -4600,11 +6164,66 @@ declare namespace Office {
          * @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): 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.
+         *
+         * **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.
+         * 
+         * <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *  </table>
+         * 
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         saveAsync(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. 
+         * **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.
@@ -4654,7 +6273,7 @@ declare namespace Office {
      * 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 
+     * **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.
@@ -4861,6 +6480,47 @@ declare namespace Office {
          * @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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Adds the specified data to the table as additional columns.
+         *
+         * @remarks
+         *
+         * 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):
+         *
+         *  - 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.
+         *
+         *  - 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.
+         * 
+         * **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> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         addColumnsAsync(tableData: TableData | any[][], callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Adds the specified data to the table as additional rows.
@@ -4902,6 +6562,44 @@ declare namespace Office {
          * @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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Adds the specified data to the table as additional rows.
+         *
+         * @remarks
+         *
+         * 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.
+         *
+         *  - 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.
+         * 
+         * **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> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         addRowsAsync(rows: TableData | any[][], callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Deletes all non-header rows and their values in the table, shifting appropriately for the host application.
@@ -4930,6 +6628,31 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         deleteAllDataValuesAsync(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
+         *
+         * 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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *  </table>
+         *
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         deleteAllDataValuesAsync(callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Clears formatting on the bound table.
@@ -4955,6 +6678,28 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         clearFormatsAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Clears formatting on the bound table.
+         *
+         * @remarks
+         * See {@link https://docs.microsoft.com/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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *  </table>
+         *
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         clearFormatsAsync(callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Gets the formatting on specified items in the table.
@@ -5010,6 +6755,58 @@ declare namespace Office {
          *                  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?: Office.AsyncContextOptions, callback?: (result: AsyncResult< ({ cells: any, format: any})[]>) => 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 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[], callback?: (result: AsyncResult< ({ cells: any, format: any})[]>) => void): void;
         /**
          * Sets formatting on specified items and data in the table.
@@ -5124,14 +6921,126 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         setFormatsAsync(cellFormat: any[], options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Sets formatting on specified items and data in the table.
+         *
+         * @remarks
+         * 
+         * **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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *  </table>
+         *
+         * @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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         setFormatsAsync(cellFormat: any[], callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Updates table formatting options on the bound table.
          *
          * @remarks
-         * <table><tr><td>Hosts</td><td>Excel</td></tr>
-         *
-         * <tr><td>Requirement Sets</td><td>Not in a set</td></tr></table>
+         * <table>
+         *   <tr><td>Hosts</td><td>Excel</td></tr>
+         *   <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.
          * 
@@ -5178,15 +7087,68 @@ declare namespace Office {
          * 
          */
         setTableOptionsAsync(tableOptions: any, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Updates table formatting options on the bound table.
+         *
+         * @remarks
+         * <table>
+         *   <tr><td>Hosts</td><td>Excel</td></tr>
+         *   <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel </strong></td><td> Y                          </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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         * 
+         */
         setTableOptionsAsync(tableOptions: any, callback?: (result: AsyncResult<void>) => void): void;
     }
     /**
-     * Represents the data in a table or a {@link Office.TableBinding}.
+     * Represents the data in a table or an {@link Office.TableBinding}.
      *
      * @remarks
-     * <table><tr><td>Hosts</td><td>Excel, Word</td></tr>
-     *
-     * <tr><td>Requirement Sets</td><td>TableBindings</td></tr></table>
+     * <table>
+     *   <tr><td>Hosts</td><td>Excel, Word</td></tr>
+     *   <tr><td>Requirement Sets</td><td>TableBindings</td></tr>
+     * </table>
      */
     class TableData {
         constructor(rows: any[][], headers: any[]);
@@ -5195,10 +7157,11 @@ declare namespace Office {
          * Gets or sets the headers of the table.
          * 
          * @remarks
-         * <table><tr><td>Hosts</td><td>Excel, Word</td></tr>
+         * <table>
+         *   <tr><td>Hosts</td><td>Excel, Word</td></tr>
+         *   <tr><td>Requirement Sets</td><td>TableBindings</td></tr>
+         * </table>
          *
-         * <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']].
          *
@@ -5215,10 +7178,11 @@ declare namespace Office {
          * Returns an empty array if there are no rows.
          * 
          * @remarks
-         * <table><tr><td>Hosts</td><td>Excel, Word</td></tr>
+         * <table>
+         *   <tr><td>Hosts</td><td>Excel, Word</td></tr>
+         *   <tr><td>Requirement Sets</td><td>TableBindings</td></tr>
+         * </table>
          *
-         * <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']].
          *
@@ -7465,9 +9429,9 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          * 
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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
          */
@@ -7498,9 +9462,9 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          * 
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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
          */
@@ -7521,9 +9485,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 {
             /**
@@ -7545,9 +9509,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 Days {
             /**
@@ -7597,9 +9561,9 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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
          */
@@ -7635,9 +9599,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 {
             /**
@@ -7675,9 +9639,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 {
             /**
@@ -7699,9 +9663,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 {
             /**
@@ -7713,15 +9677,37 @@ declare namespace Office {
              */
             Appointment = "appointment"
         }
+        /**
+         * Specifies an appointment location's type.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * <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 LocationType {
+            /**
+             * A custom location.
+             */
+            Custom = "custom",
+            /**
+             * A conference room or similar resource.
+             */
+            Room = "room"
+        }
         /**
          * Specifies the month.
          * 
          * [Api set: Mailbox 1.7]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 Month {
             /**
@@ -7797,9 +9783,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 {
             /**
@@ -7825,9 +9811,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 RecurrenceTimeZone {
             /**
@@ -8383,9 +10369,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 RecurrenceType {
             /**
@@ -8415,9 +10401,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 {
             /**
@@ -8447,9 +10433,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 {
             /**
@@ -8471,9 +10457,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 WeekNumber {
             /**
@@ -8517,9 +10503,10 @@ declare namespace Office {
      * [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>
+     * <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 {
         /**
@@ -8529,9 +10516,10 @@ 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>Compose or read</td></tr></table>
+         * <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;
         /**
@@ -8555,9 +10543,10 @@ 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>Compose or read</td></tr></table>
+         * <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;
         /**
@@ -8575,8 +10564,10 @@ 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>Compose or read</td></tr></table>
+        * <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;
         /**
@@ -8594,9 +10585,10 @@ 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>Compose or read</td></tr></table>
+        * <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[];
@@ -8615,9 +10607,10 @@ 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>Compose or read</td></tr></table>
+         * <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[];
         /**
@@ -8641,9 +10634,10 @@ 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>Compose or read</td></tr></table>
+         * <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;
         /**
@@ -8663,9 +10657,10 @@ 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>Compose or read</td></tr></table>
+         * <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;
     }
@@ -8675,9 +10670,10 @@ declare namespace Office {
      * [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>
+     * <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
      */
@@ -8702,14 +10698,15 @@ declare namespace Office {
     /**
      * Represents an attachment on an item from the server. Read mode only.
      *
-     * An array of AttachmentDetail objects is returned as the attachments property of an Appointment or Message object.
+     * An array of **AttachmentDetails** objects is returned as the attachments property of an appointment or message 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>
+     * <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>
      */
     interface AttachmentDetails {
         /**
@@ -8744,9 +10741,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface Body {
         /**
@@ -8761,13 +10759,10 @@ 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>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, this method also has the following signature:
-         * 
-         * `getAsync(coercionType: Office.CoercionType, callback: (result: Office.AsyncResult<string>) => void): void;`
+         * <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 coercionType - The format for the returned body.
          * @param options - Optional. An object literal that contains one or more of the following properties:
@@ -8788,25 +10783,46 @@ 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>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>
+         * <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 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 Office.AsyncResult.
          *                  The body is provided in the requested format in the asyncResult.value property.
          */
         getAsync(coercionType: Office.CoercionType, callback: (result: Office.AsyncResult<string>) => 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.
+         *
+         * [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>
+         *
+         * @param coercionType - The format for the returned body.
+         */
+        getAsync(coercionType: Office.CoercionType): void;
         /**
          * Gets a value that indicates whether the content is in HTML or text format.
          *
          * [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</td></tr></table>
+         * <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 - 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.
@@ -8814,6 +10830,34 @@ declare namespace Office {
          *                  The content type is returned as one of the CoercionType values in the asyncResult.value property.
          */
         getTypeAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<Office.CoercionType>) => void): void;
+        /**
+         * Gets a value that indicates whether the content is in HTML or text format.
+         *
+         * [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</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.
+         *                  The content type is returned as one of the CoercionType values in the asyncResult.value property.
+         */
+        getTypeAsync(callback?: (result: Office.AsyncResult<Office.CoercionType>) => void): void;
+        /**
+         * Gets a value that indicates whether the content is in HTML or text format.
+         *
+         * [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</td></tr>
+         * </table>
+         *
+         */
+        getTypeAsync(): void;
         /**
          * Adds the specified content to the beginning of the item body.
          *
@@ -8826,20 +10870,12 @@ declare namespace Office {
          * [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>
+         * <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>
          * 
-         * <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 this signature, this method also has the following signatures:
-         * 
-         * `prependAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;`
-         * 
-         * `prependAsync(data: string, callback: (result: Office.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.
@@ -8860,33 +10896,11 @@ declare namespace Office {
          * [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>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: 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.
-         *
-         * 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
-         * <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>
+         * <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 Office.AsyncResult.
@@ -8905,9 +10919,11 @@ declare namespace Office {
          * [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>DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.</td></tr></table>
+         * <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.
          */
@@ -8925,20 +10941,13 @@ 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>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><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>
+         * <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>
+         *   <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 this signature, this method also has the following signatures:
-         * 
-         * `setAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;`
-         * 
-         * `setAsync(data: string, callback: (result: Office.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.
@@ -8960,36 +10969,12 @@ 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>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><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: 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 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
-         * <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><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>
+         * <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>
+         *   <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 Office.AsyncResult.
@@ -9009,11 +10994,12 @@ 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>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><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>
+         * <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>
+         *   <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.
          */
@@ -9032,20 +11018,13 @@ declare namespace Office {
          * [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>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>
+         * <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>
+         *   <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 this signature, this method also has the following signatures:
-         * 
-         * `setSelectedDataAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;`
-         * 
-         * `setSelectedDataAsync(data: string, callback: (result: Office.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.
@@ -9067,36 +11046,12 @@ declare namespace Office {
          * [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>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: 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.
-         *
-         * 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
-         * <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><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>
+         * <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>
+         *   <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 Office.AsyncResult.
@@ -9116,11 +11071,12 @@ declare namespace Office {
          * [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>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>
+         * <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>
+         *   <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.
          */
@@ -9135,9 +11091,10 @@ declare namespace Office {
      * [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>Read</td></tr></table>
+     * <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>
      */
     interface Contact {
         /**
@@ -9149,7 +11106,7 @@ declare namespace Office {
          */
         businessName: string;
         /**
-         * An array of strings containing the SMTP email addresses associated with the contact. Nullable,
+         * An array of strings containing the SMTP email addresses associated with the contact. Nullable.
          */
         emailAddresses: string[];
         /**
@@ -9176,9 +11133,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface CustomProperties {
         /**
@@ -9189,9 +11147,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         get(name: string): any;
         /**
@@ -9206,9 +11165,10 @@ declare namespace Office {
          * [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>
+         * <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 name - The name of the property to be set.
          * @param value - The value of the property to be set.
@@ -9223,9 +11183,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         remove(name: string): void;
         /**
@@ -9247,11 +11208,57 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         saveAsync(callback?: (result: Office.AsyncResult<void>) => void, asyncContext?: any): 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.
+         *
+         * 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 Office.AsyncResult.
+         *
+         * [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>
+         */
+        saveAsync(callback?: (result: Office.AsyncResult<void>) => void): 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.
+         *
+         * 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.
+         *
+         * [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>
+         */
+        saveAsync(): void;
     }
     /**
      * Provides diagnostic information to an Outlook add-in.
@@ -9259,9 +11266,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface Diagnostics {
         /**
@@ -9272,9 +11280,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         hostName: string;
         /**
@@ -9286,9 +11295,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         hostVersion: string;
         /**
@@ -9311,9 +11321,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         OWAView: MailboxEnums.OWAView | "OneColumn" | "TwoColumns" | "ThreeColumns";
     }
@@ -9323,9 +11334,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface EmailAddressDetails {
         /**
@@ -9353,9 +11365,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface EmailUser {
         /**
@@ -9367,6 +11380,188 @@ declare namespace Office {
          */
         emailAddress: string;
     }
+    /**
+     * Represents the set of locations on an appointment.
+     * 
+     * [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
+     */
+    export interface EnhancedLocation {
+        /**
+         * Adds to the set of locations associated with the appointment.
+         * 
+         * [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>Compose</td></tr>
+         *   <tr><td>Errors</td><td>InvalidFormatError - The format of the specified data object is not valid.</td></tr>
+         * </table>
+         * 
+         * @param locationIdentifiers The locations to be added to the current list of locations.
+         * @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. Check the `status` property of asyncResult to determine if the call succeeded.
+         * 
+         * @beta
+         */
+        addAsync(locationIdentifiers: LocationIdentifier[], options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResultStatus) => void): void;
+        /**
+         * Adds to the set of locations associated with the appointment.
+         * 
+         * [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>Compose</td></tr>
+         *   <tr><td>Errors</td><td>InvalidFormatError - The format of the specified data object is not valid.</td></tr>
+         * </table>
+         * 
+         * @param locationIdentifiers The locations to be added to the current list of locations.
+         * @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. Check the `status` property of asyncResult to determine if the call succeeded.
+         * 
+         * @beta
+         */
+        addAsync(locationIdentifiers: LocationIdentifier[], callback?: (result: Office.AsyncResultStatus) => void): void;
+        /**
+         * Adds to the set of locations associated with the appointment.
+         * 
+         * [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>Compose</td></tr>
+         *   <tr><td>Errors</td><td>InvalidFormatError - The format of the specified data object is not valid.</td></tr>
+         * </table>
+         * 
+         * @param locationIdentifiers The locations to be added to the current list of locations.
+         * 
+         * @beta
+         */
+        addAsync(locationIdentifiers: LocationIdentifier[]): void;
+        /**
+         * Gets the set of locations associated with the appointment.
+         * 
+         * [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 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
+         */
+        getAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<LocationDetails[]>) => void): void;
+        /**
+         * Gets the set of locations associated with the appointment.
+         * 
+         * [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 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
+         */
+        getAsync(callback?: (result: Office.AsyncResult<LocationDetails[]>) => void): void;
+        /**
+         * Gets the set of locations associated with the appointment.
+         * 
+         * [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
+         */
+        getAsync(): void;
+        /**
+         * Removes the set of locations associated with the appointment.
+         * 
+         * If there are multiple locations with the same name, all matching locations will be removed even if only one was specified in locationIdentifiers.
+         * 
+         * [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>Compose</td></tr>
+         * </table>
+         * 
+         * @param locationIdentifiers The locations to be removed from the current list of locations.
+         * @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. Check the `status` property of asyncResult to determine if the call succeeded.
+         * 
+         * @beta
+         */
+        removeAsync(locationIdentifiers: LocationIdentifier[], options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResultStatus) => void): void;
+        /**
+         * Removes the set of locations associated with the appointment.
+         * 
+         * If there are multiple locations with the same name, all matching locations will be removed even if only one was specified in locationIdentifiers.
+         * 
+         * [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>Compose</td></tr>
+         * </table>
+         * 
+         * @param locationIdentifiers The locations to be removed from the current list of locations.
+         * @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. Check the `status` property of asyncResult to determine if the call succeeded.
+         * 
+         * @beta
+         */
+        removeAsync(locationIdentifiers: LocationIdentifier[], callback?: (result: Office.AsyncResultStatus) => void): void;
+        /**
+         * Removes the set of locations associated with the appointment.
+         * 
+         * If there are multiple locations with the same name, all matching locations will be removed even if only one was specified in locationIdentifiers.
+         * 
+         * [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>Compose</td></tr>
+         * </table>
+         * 
+         * @param locationIdentifiers The locations to be removed from the current list of locations.
+         * 
+         * @beta
+         */
+        removeAsync(locationIdentifiers: LocationIdentifier[]): void;
+    }
     /**
      * Represents a collection of entities found in an email message or appointment. Read mode only.
      *
@@ -9393,9 +11588,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface Entities {
         /**
@@ -9434,9 +11630,10 @@ declare namespace Office {
      * [Api set: Mailbox 1.7]
      * 
      * @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>
+     * <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>
      */
     interface From {
         /**
@@ -9449,13 +11646,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          * 
          * @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>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `getAsync(callback?: (result: Office.AsyncResult<EmailAddressDetails>) => void): void;`
+         * <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.
@@ -9474,14 +11668,32 @@ 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>Compose</td></tr></table>
+         * <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 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: Office.AsyncResult<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 {@link Office.EmailAddressDetails} in the asyncResult.value property.
+         * 
+         * [Api set: Mailbox 1.7]
+         * 
+         * @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>
+         */
+        getAsync(): void;
     }
 
     /**
@@ -9493,9 +11705,10 @@ declare namespace Office {
      * [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>
+     * <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
      */
@@ -9507,13 +11720,10 @@ declare namespace Office {
          * [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, this method also has the following signature:
-         * 
-         * `getAsync(names: string[], callback: (result: Office.AsyncResult<InternetHeaders>) => void): void;`
+         * <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 names - The names of the internet headers to be returned.
          * @param options - Optional. An object literal that contains one or more of the following properties:
@@ -9531,9 +11741,10 @@ declare namespace Office {
          * [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>
+         * <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 names - The names of the internet headers to be returned.
          * @param callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
@@ -9542,19 +11753,33 @@ declare namespace Office {
          * @beta
          */
         getAsync(names: string[], callback?: (result: Office.AsyncResult<InternetHeaders>) => void): void;
+        /**
+         * Given an array of internet header names, this method returns a dictionary containing those internet headers and their values. 
+         * If the add-in requests an x-header that is not available, that x-header will not be returned in the results. 
+         *
+         * [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 names - The names of the internet headers to be returned.
+         * 
+         * @beta
+         */
+        getAsync(names: string[]): void;
         /**
          * Given an array of internet header names, this method removes the specified headers from the internet header collection.
          *
          * [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>Compose</td></tr></table>
-         * 
-         * In addition to this signature, this method also has the following signature:
-         * 
-         * `removeAsync(names: string[], callback: (result: Office.AsyncResult<Body>) => void): void;`
+         * <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 names - The names of the internet headers to be removed.
          * @param options - Optional. An object literal that contains one or more of the following properties:
@@ -9571,9 +11796,10 @@ declare namespace Office {
          * [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>Compose</td></tr></table>
+         * <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 names - The names of the internet headers to be removed.
          * @param callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
@@ -9582,6 +11808,22 @@ declare namespace Office {
          * @beta
          */
         removeAsync(names: string[], callback?: (result: Office.AsyncResult<InternetHeaders>) => void): void;
+        /**
+         * Given an array of internet header names, this method removes the specified headers from the internet header collection.
+         *
+         * [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>Compose</td></tr>
+         * </table>
+         * 
+         * @param names - The names of the internet headers to be removed.
+         * 
+         * @beta
+         */
+        removeAsync(names: string[]): void;
         /**
          * Sets the specified internet headers to the specified values.
          * 
@@ -9591,14 +11833,11 @@ declare namespace Office {
          * [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>
+         * <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>
          *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
-         *
-         * In addition to this signature, this method also has the following signatures:
-         * 
-         * `setAsync(headers: string, callback: (result: Office.AsyncResult<void>) => void): void;`
-         * 
          * @param headers - The names and corresponding values of the headers to be set. Should be a dictionary object with keys being the names of the 
          *                internet headers and values being the values of the internet headers.
          * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -9618,9 +11857,10 @@ declare namespace Office {
          * [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>Compose</td></tr>
+         * <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 headers - The names and corresponding values of the headers to be set. Should be a dictionary object with keys being the names of the 
          *                internet headers and values being the values of the internet headers.
@@ -9630,6 +11870,82 @@ declare namespace Office {
          * @beta
          */
         setAsync(headers: Object, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Sets the specified internet headers to the specified values.
+         * 
+         * The setAsync method creates a new header if the specified header does not already exist; otherwise, the existing value is replaced with 
+         * the new 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>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 headers - The names and corresponding values of the headers to be set. Should be a dictionary object with keys being the names of the 
+         *                internet headers and values being the values of the internet headers.
+         * 
+         * @beta
+         */
+        setAsync(headers: Object): void;
+    }
+
+    /**
+     * Represents a location. Read only.
+     * 
+     * [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
+     */
+    export interface LocationDetails {
+        /**
+         * The LocationIdentifier of the location.
+         */
+        locationIdentifier: LocationIdentifier;
+        /**
+         * The location's display name.
+         */
+        displayName: string;
+        /**
+         * The email address associated with the location.
+         */
+        emailAddress: string;
+    }
+
+    /**
+     * Represents the id of a location.
+     * 
+     * [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
+     */
+    interface LocationIdentifier {
+        /**
+         * The location's unique id.
+         * 
+         * For **Room** type, it's the room's email address.
+         * 
+         * For **Custom** type, it's the displayName.
+         */
+        id: string;
+        /**
+         * The location's type.
+         */
+        type: MailboxEnums.LocationType;
     }
 
     /**
@@ -9639,9 +11955,10 @@ declare namespace Office {
      * [Api set: Mailbox 1.7]
      * 
      * @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>
+     * <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>
      */
     interface Organizer {
         /**
@@ -9650,9 +11967,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          * 
          * @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>
+         * <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.
@@ -9660,21 +11978,50 @@ declare namespace Office {
          *                  The `value` property of the result is message's organizer value, as an EmailAddressDetails object.
          */
         getAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<EmailAddressDetails>) => void): void;
+        /**
+         * Gets the organizer value of an appointment as an {@link Office.EmailAddressDetails} in the asyncResult.value property.
+         * 
+         * [Api set: Mailbox 1.7]
+         * 
+         * @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 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(callback?: (result: Office.AsyncResult<EmailAddressDetails>) => void): void;
+        /**
+         * Gets the organizer value of an appointment as an {@link Office.EmailAddressDetails} in the asyncResult.value property.
+         * 
+         * [Api set: Mailbox 1.7]
+         * 
+         * @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>
+         */
+        getAsync(): 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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface Appointment extends Item {
     }
     /**
      * 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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface AppointmentCompose extends Appointment, ItemCompose {
          /**
@@ -9684,37 +12031,12 @@ 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>
+         * <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>
          */
         body: Body;
-        /**
-         * 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>Appointment Organizer</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>Appointment Organizer</td></tr></table>
-         *
-         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
-         */
-        dateTimeModified: Date;
         /**
          * Gets or sets the date and time that the appointment is to end.
          *
@@ -9728,11 +12050,28 @@ 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>
+         * <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 or sets the locations of the appointment. The `enhancedLocation` property returns an {@link Office.EnhancedLocation} object that 
+         * provides methods to get, remove, or add locations on an item.
+         * 
+         * [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
+         */
+        enhancedLocation: EnhancedLocation;
         /**
          * Gets the type of item that an instance represents.
          *
@@ -9742,9 +12081,10 @@ 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>
+         * <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>
          */
         itemType: MailboxEnums.ItemType;
         /**
@@ -9755,9 +12095,10 @@ 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>
+         * <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;
         /**
@@ -9767,9 +12108,10 @@ 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>
+         * <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>
          */
         notificationMessages: NotificationMessages;
         /**
@@ -9781,9 +12123,10 @@ 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>
+         * <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;
         /**
@@ -9795,9 +12138,10 @@ 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>
+         * <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>
          */
         organizer: Organizer;
         /**
@@ -9806,18 +12150,19 @@ declare namespace Office {
          * 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**: 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 
+         * **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 1.7]
          * 
          * @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>
+         * <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>
          */
         recurrence: Recurrence;
         /**
@@ -9829,9 +12174,10 @@ 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>
+         * <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;
         /**
@@ -9840,7 +12186,7 @@ declare namespace Office {
          * 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. 
+         * **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}.
@@ -9852,9 +12198,10 @@ 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>
+         * <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>
          */
         seriesId: string;
         /**
@@ -9870,9 +12217,10 @@ 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>
+         * <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>
          */
         start: Time;
         /**
@@ -9886,9 +12234,10 @@ 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>
+         * <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>
          */
         subject: Subject;
         /**
@@ -9901,20 +12250,14 @@ declare namespace Office {
          * [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>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>
+         * <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>
          * 
-         * 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: Office.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.
@@ -9935,11 +12278,13 @@ declare namespace Office {
          * [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>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>
+         * <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 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.
@@ -9955,34 +12300,13 @@ declare namespace Office {
          * [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>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 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>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>
+         * <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 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.
@@ -10001,11 +12325,13 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -10019,6 +12345,57 @@ declare namespace Office {
          * @beta
          */
         addFileAttachmentFromBase64Async(base64File: string, attachmentName: string, options?: Office.AsyncContextOptions, callback?: (result: Office.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 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.
+         * 
+         * @beta
+         */
+        addFileAttachmentFromBase64Async(base64File: string, attachmentName: string, callback?: (result: Office.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.
+         * 
+         * @beta
+         */
+        addFileAttachmentFromBase64Async(base64File: string, attachmentName: string): void;
         /**
          * Adds an event handler for a supported event.
          * 
@@ -10029,13 +12406,10 @@ 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>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.AsyncResult<void>) => void): void;`
+         * <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. 
@@ -10056,9 +12430,10 @@ 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>
+         * <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. 
@@ -10067,6 +12442,26 @@ declare namespace Office {
          *                asyncResult, which is an Office.AsyncResult object.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.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.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+         * 
+         * [Api set: Mailbox 1.7]
+         *
+         * @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.
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: any): void;
         /**
          * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
          *
@@ -10083,20 +12478,12 @@ declare namespace Office {
          * [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>Appointment Organizer</td></tr>
-         *
-         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         * <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>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr>
+         * </table>
          * 
-         * In addition to this signature, this method also has the following signatures:
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string): void;`
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: Office.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.
@@ -10122,11 +12509,11 @@ declare namespace Office {
          * [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>Appointment Organizer</td></tr>
-         *
-         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         * <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>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.
@@ -10148,39 +12535,11 @@ declare namespace Office {
          * [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>Appointment Organizer</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>Appointment Organizer</td></tr>
-         *
-         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         * <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>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.
@@ -10197,16 +12556,17 @@ declare namespace Office {
          *
          * 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, 
+         * **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>Appointment Organizer</td></tr></table>
+         * <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 Organizer</td></tr>
+         * </table>
          */
         close(): void;
         /**
@@ -10216,9 +12576,10 @@ 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>Compose</td></tr></table>
+         * <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 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.
@@ -10230,17 +12591,52 @@ declare namespace Office {
          */
         getAttachmentsAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<AttachmentDetails[]>) => void): 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.
+         * Gets the item's attachments as an array.
          * 
          * [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>
+         * <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 - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. If the call fails, the asyncResult.error property will contain and error code with the reason for 
+         *                 the failure.
+         * 
+         * @beta
+         */
+        getAttachmentsAsync(callback?: (result: Office.AsyncResult<AttachmentDetails[]>) => void): void;
+        /**
+         * Gets the item's attachments as an array.
+         * 
+         * [Api set: Mailbox Preview]
          *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         * @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
+         */
+        getAttachmentsAsync(): 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}.
          *
@@ -10253,6 +12649,48 @@ declare namespace Office {
          * @beta
          */
         getInitializationContextAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<string>) => void): 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}.
+         *
+         * @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(callback?: (result: Office.AsyncResult<string>) => void): 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}.
+         *
+         * @beta
+         */
+        getInitializationContextAsync(): void;
         /**
          * Asynchronously returns selected data from the subject or body of a message.
          *
@@ -10269,9 +12707,10 @@ 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>ReadWriteItem</td></tr>
-         *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         * <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>
+         * </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.
@@ -10296,9 +12735,10 @@ 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>ReadWriteItem</td></tr>
-         *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         * <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>
+         * </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.
@@ -10321,9 +12761,10 @@ 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>
+         * <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.
@@ -10331,6 +12772,30 @@ declare namespace Office {
          *                    This object can be accessed by the asyncResult.asyncContext property in the callback function.
          */
         loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void, userContext?: any): 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.
+         */
+        loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void): void;
         /**
          * Removes an attachment from a message or appointment.
          *
@@ -10344,19 +12809,11 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signatures:
-         * 
-         * `removeAttachmentAsync(attachmentId: string): void;`
-         * 
-         * `removeAttachmentAsync(attachmentId: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `removeAttachmentAsync(attachmentId: string, callback: (result: Office.AsyncResult<void>) => void): void;`
+         * <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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr>
+         * </table>
          *
          * @param attachmentId - The identifier of the attachment to remove.
          * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -10378,39 +12835,15 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr>
+         * </table>
          *
          * @param attachmentId - The identifier of the attachment to remove.
          */
         removeAttachmentAsync(attachmentId: 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 an inline form then subsequently pops out the 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>Appointment Organizer</td></tr>
-         *
-         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
-         *
-         * @param attachmentId - The identifier of the attachment 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.
-         */
-        removeAttachmentAsync(attachmentId: string, options: Office.AsyncContextOptions): void;
         /**
          * Removes an attachment from a message or appointment.
          *
@@ -10425,11 +12858,11 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr>
+         * </table>
          *
          * @param attachmentId - The identifier of the attachment to remove.
          * @param callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
@@ -10447,13 +12880,10 @@ 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>
-        * 
-        * In addition to this signature, the method also has the following signature:
-        * 
-        * `removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;`
+        * <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 revoke the handler.
         * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -10472,15 +12902,34 @@ 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>
+        * <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 revoke the handler.
         * @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.
         */
        removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;
+       /**
+        * Removes the event handlers for a supported event type.
+        * 
+        * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+        * `Office.EventType.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+        * 
+        * [Api set: Mailbox 1.7]
+        *
+        * @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 revoke the handler.
+        */
+       removeHandlerAsync(eventType: Office.EventType): void;
         /**
          * Asynchronously saves an item.
          *
@@ -10492,11 +12941,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -10506,20 +12955,12 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>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: Office.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 of type Office.AsyncResult. 
@@ -10536,11 +12977,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -10550,49 +12991,14 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>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>Appointment Organizer</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.
          *
@@ -10603,11 +13009,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -10617,11 +13023,11 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>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.
          */
@@ -10637,20 +13043,12 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>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: Office.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.
@@ -10677,11 +13075,11 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>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.
@@ -10698,40 +13096,11 @@ 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>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>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>Appointment Organizer</td></tr>
-         *
-         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>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.
@@ -10744,8 +13113,9 @@ declare namespace Office {
     /**
      * 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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface AppointmentRead extends Appointment, ItemRead {
         /**
@@ -10755,11 +13125,12 @@ 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>
+         * <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>
          *
-         * <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 
+         * **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}.
          *
          */
@@ -10771,35 +13142,38 @@ 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 Attendee</td></tr></table>
+         * <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: Body;
         /**
-         * Gets the date and time that an item was created. Read mode only.
+         * Gets the date and time that an item was created.
          *
          * [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>
+         * <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>
          */
         dateTimeCreated: Date;
         /**
-         * Gets the date and time that an item was last modified. Read mode only.
+         * Gets the date and time that an item was last modified.
          *
          * [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>
+         * <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>
          *
-         * <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.
+         * **Note**: This member is not supported in Outlook for iOS or Outlook for Android.
          */
         dateTimeModified: Date;
         /**
@@ -10815,11 +13189,30 @@ 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 Attendee</td></tr></table>
+         * <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 locations of an appointment.
+         *
+         * The enhancedLocation property returns an {@link Office.EnhancedLocation} object that allows you to get the set of locations (each represented by 
+         * an {@link Office.LocationDetails} object) associated with the appointment.
+         * 
+         * [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
+         */
+        enhancedLocation: EnhancedLocation;
         /**
          * Gets the Exchange Web Services item class of the selected item.
          *
@@ -10830,9 +13223,10 @@ 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 Attendee</td></tr></table>
+         * <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>
          * 
          * The itemClass property specifies the message class of the selected item. The following are the default message classes for the message or appointment item.
          * 
@@ -10844,8 +13238,8 @@ declare namespace Office {
          *   </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>
+         *     <td>These are calendar items of the item class IPM.Appointment or IPM.Appointment.Occurrence.</td>
+         *     <td>IPM.Appointment,IPM.Appointment.Occurrence</td>
          *   </tr>
          *   <tr>
          *     <td>Message items</td>
@@ -10863,7 +13257,7 @@ declare namespace Office {
          * 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. 
+         * **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}.
@@ -10872,9 +13266,10 @@ 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 Attendee</td></tr></table>
+         * <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>
          */
         itemId: string;
         /**
@@ -10886,9 +13281,10 @@ 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 Attendee</td></tr></table>
+         * <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>
          */
         itemType: MailboxEnums.ItemType;
         /**
@@ -10900,9 +13296,10 @@ 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 Attendee</td></tr></table>
+         * <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;
         /**
@@ -10915,9 +13312,10 @@ 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 Attendee</td></tr></table>
+         * <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;
         /**
@@ -10927,9 +13325,10 @@ 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 Attendee</td></tr></table>
+         * <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: NotificationMessages;
         /**
@@ -10942,9 +13341,10 @@ 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 Attendee</td></tr></table>
+         * <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[];
         /**
@@ -10954,9 +13354,10 @@ 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 Attendee</td></tr></table>
+         * <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;
         /**
@@ -10965,18 +13366,19 @@ declare namespace Office {
          * 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**: 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 
+         * **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 1.7]
          * 
          * @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>
+         * <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>
          */
         recurrence: Recurrence;
         /**
@@ -10989,9 +13391,10 @@ 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 Attendee</td></tr></table>
+         * <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[];
         /**
@@ -11004,9 +13407,10 @@ 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 Attendee</td></tr></table>
+         * <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;
         /**
@@ -11015,7 +13419,7 @@ declare namespace Office {
          * 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. 
+         * **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}.
@@ -11027,9 +13431,10 @@ 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 Attendee</td></tr></table>
+         * <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>
          */
         seriesId: string;
         /**
@@ -11043,9 +13448,10 @@ 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 Attendee</td></tr></table>
+         * <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>
          */
         subject: string;
 
@@ -11059,13 +13465,10 @@ 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 Attendee</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.AsyncResult<void>) => void): void;`
+         * <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. 
@@ -11076,7 +13479,6 @@ declare namespace Office {
          *                asyncResult, which is an Office.AsyncResult object.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, options?: any, callback?: (result: Office.AsyncResult<void>) => void): void;
-
         /**
          * Adds an event handler for a supported event.
          * 
@@ -11087,9 +13489,10 @@ 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 Attendee</td></tr></table>
+         * <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. 
@@ -11098,6 +13501,26 @@ declare namespace Office {
          *                asyncResult, which is an Office.AsyncResult object.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.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.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+         * 
+         * [Api set: Mailbox 1.7]
+         *
+         * @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.
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: any): 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.
@@ -11110,18 +13533,46 @@ declare namespace Office {
          * 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.
+         * **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>Appointment Attendee</td></tr></table>
+         * <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 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
+         *                   OR an {@link Office.ReplyFormData} object that contains body or attachment data and a callback function.
+         * @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.
+         */
+        displayReplyAllForm(formData: string | ReplyFormData, callback?: (result: Office.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>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 an {@link Office.ReplyFormData} object that contains body or attachment data and a callback function.
          */
         displayReplyAllForm(formData: string | ReplyFormData): void;
         /**
@@ -11135,38 +13586,63 @@ declare namespace Office {
          * 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.
+         * **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>
+         * <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>
          *
-         * <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 an {@link Office.ReplyFormData} object that contains body or attachment data and a callback function.
+         * @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.
+         */
+        displayReplyForm(formData: string | ReplyFormData, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Displays a reply form that includes only the sender of the selected message or the organizer of the selected appointment.
          *
-         * @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.
+         * 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>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 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 
+         * **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 Attendee</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `getInitializationContextAsync(callback?: (result: Office.AsyncResult<string>) => void): void;`
+         * <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 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.
@@ -11182,15 +13658,16 @@ declare namespace Office {
         /**
          * 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
          *
-         * <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>
+         * <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 - 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. 
@@ -11201,24 +13678,42 @@ declare namespace Office {
          * @beta
          */
         getInitializationContextAsync(callback?: (result: Office.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>Appointment Attendee</td></tr>
+         * </table>
+         * 
+         * @beta
+         */
+        getInitializationContextAsync(): 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.
+         * **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>Appointment Attendee</td></tr></table>
+         * <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>
          */
         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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          * 
@@ -11230,9 +13725,10 @@ declare namespace Office {
          * 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>
+         * <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.
          * 
@@ -11240,7 +13736,7 @@ declare namespace Office {
          *   <tr>
          *     <th>Value of entityType</th>
          *     <th>Type of objects in returned array</th>
-         *     <th>Required Permission Leve</th>
+         *     <th>Required Permission Level</th>
          *   </tr>
          *   <tr>
          *     <td>Address</td>
@@ -11286,15 +13782,16 @@ declare namespace Office {
          * 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.
+         * **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>Appointment Attendee</td></tr></table>
+         * <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 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, 
@@ -11316,7 +13813,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
@@ -11327,9 +13824,10 @@ 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 Attendee</td></tr></table>
+         * <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>
          */
         getRegExMatches(): any;
         /**
@@ -11342,7 +13840,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
@@ -11351,9 +13849,10 @@ 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 Attendee</td></tr></table>
+         * <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 name - The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
          */
@@ -11361,15 +13860,16 @@ declare namespace Office {
         /**
          * 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.
+         * **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>Appointment Attendee</td></tr></table>
+         * <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 name - The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
          */
@@ -11388,7 +13888,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.6]
          *
@@ -11399,9 +13899,10 @@ 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 Attendee</td></tr></table>
+         * <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>
          */
         getSelectedRegExMatches(): any;
        /**
@@ -11419,9 +13920,10 @@ 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 Attendee</td></tr></table>
+        * <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.
@@ -11429,6 +13931,30 @@ declare namespace Office {
         *                    This object can be accessed by the asyncResult.asyncContext property in the callback function.
         */
        loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void, userContext?: any): 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 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.
+        */
+       loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void): void;
 
        /**
         * Removes the event handlers for a supported event type.
@@ -11440,13 +13966,10 @@ 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 Attendee</td></tr></table>
-        * 
-        * In addition to this signature, the method also has the following signature:
-        * 
-        * `removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;`
+        * <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 revoke the handler.
         * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -11465,15 +13988,34 @@ 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 Attendee</td></tr></table>
+        * <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 revoke the handler.
         * @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.
         */
        removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void; 
+       /**
+        * Removes the event handlers for a supported event type.
+        * 
+        * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+        * `Office.EventType.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+        * 
+        * [Api set: Mailbox 1.7]
+        *
+        * @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 revoke the handler.
+        */
+       removeHandlerAsync(eventType: Office.EventType): void; 
     }
 
     /**
@@ -11483,9 +14025,10 @@ declare namespace Office {
      * [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>
+     * <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 Item {
         /**
@@ -11495,37 +14038,12 @@ 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>Compose or read</td></tr></table>
+         * <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: Body;
-        /**
-         * 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>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>Read</td></tr></table>
-         *
-         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
-         */
-        dateTimeModified: Date;
         /**
          * Gets the type of item that an instance represents.
          *
@@ -11536,9 +14054,10 @@ 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>Compose or read</td></tr></table>
+         * <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: MailboxEnums.ItemType;
         /**
@@ -11548,42 +14067,20 @@ 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>Compose or read</td></tr></table>
+         * <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: 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 1.7]
-         * 
-         * @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>
-         */
-        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. 
+         * **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}.
@@ -11595,9 +14092,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         seriesId: string;
 
@@ -11611,13 +14109,10 @@ 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>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: Office.AsyncResult<void>) => void): void;`
+         * <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. 
@@ -11639,9 +14134,10 @@ 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>Compose or read</td></tr></table>
+         * <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. 
@@ -11652,7 +14148,28 @@ declare namespace Office {
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.AsyncResult<void>) => void): void;
 
         /**
-         * Gets an attachment from a message or appointment and returns it as an `AttachmentContent` object.
+         * Adds an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+         * 
+         * [Api set: Mailbox 1.7]
+         *
+         * @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.
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: any): void;
+
+        /**
+         * Gets an attachment from a message or appointment and returns it as an **AttachmentContent** object.
          * 
          * The `getAttachmentContentAsync` method gets the attachment with the specified identifier from the item. As a best practice, you should use 
          * the identifier to retrieve an attachment in the same session that the attachmentIds were retrieved with the `getAttachmentsAsync` or 
@@ -11664,11 +14181,11 @@ 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>Compose or read</td></tr>
-         * 
-         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>
+         *   <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr>
+         * </table>
          * 
          * @param attachmentId - The identifier of the attachment you want to get. 
          * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -11680,24 +14197,74 @@ declare namespace Office {
          * @beta
          */
         getAttachmentContentAsync(attachmentId: string, options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<AttachmentContent>) => void): void;
+
+        /**
+         * Gets an attachment from a message or appointment and returns it as an **AttachmentContent** object.
+         * 
+         * The `getAttachmentContentAsync` method gets the attachment with the specified identifier from the item. As a best practice, you should use 
+         * the identifier to retrieve an attachment in the same session that the attachmentIds were retrieved with the `getAttachmentsAsync` or 
+         * `item.attachments` call. 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 an inline form then subsequently pops out the form to 
+         * continue in a separate window.
+         * 
+         * [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>
+         *   <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr>
+         * </table>
+         * 
+         * @param attachmentId - The identifier of the attachment you want to get. 
+         * 
+         * @beta
+         */
+        getAttachmentContentAsync(attachmentId: string): void;
+
+        /**
+         * Gets an attachment from a message or appointment and returns it as an **AttachmentContent** object.
+         * 
+         * The `getAttachmentContentAsync` method gets the attachment with the specified identifier from the item. As a best practice, you should use 
+         * the identifier to retrieve an attachment in the same session that the attachmentIds were retrieved with the `getAttachmentsAsync` or 
+         * `item.attachments` call. 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 an inline form then subsequently pops out the form to 
+         * continue in a separate window.
+         * 
+         * [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>
+         *   <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr>
+         * </table>
+         * 
+         * @param attachmentId - The identifier of the attachment you want to get. 
+         * @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. If the call fails, the asyncResult.error property will contain and error code 
+         *                 with the reason for the failure.
+         * 
+         * @beta
+         */
+        getAttachmentContentAsync(attachmentId: string, callback?: (result: Office.AsyncResult<AttachmentContent>) => 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 
+         * **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 Attendee</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `getInitializationContextAsync(callback?: (result: Office.AsyncResult<string>) => void): void;`
+         * <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 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.
@@ -11710,6 +14277,50 @@ declare namespace Office {
          * @beta
          */
         getInitializationContextAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.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>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 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: Office.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>Compose or Read</td></tr>
+         * </table>
+         * 
+         * @beta
+         */
+        getInitializationContextAsync(): void;
 
        /**
         * Gets the properties of an appointment or message in a shared folder, calendar, or mailbox.
@@ -11717,14 +14328,11 @@ declare namespace Office {
         * [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>
+        * <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, this method also has the following signature:
-        * 
-        * `getAsync(callback: (result: Office.AsyncResult<SharedProperties>) => 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 
@@ -11741,9 +14349,10 @@ declare namespace Office {
         * [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>
+        * <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.
@@ -11768,9 +14377,10 @@ 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>Compose or read</td></tr></table>
+        * <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.
@@ -11779,6 +14389,31 @@ declare namespace Office {
         */
        loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void, userContext?: any): 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.
+        */
+       loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void): void;
+
        /**
         * Removes the event handlers for a supported event type.
         * 
@@ -11789,13 +14424,10 @@ 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>Compose or read</td></tr></table>
-        * 
-        * In addition to this signature, the method also has the following signature:
-        * 
-        * `removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;`
+        * <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 revoke the handler.
         * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -11815,21 +14447,42 @@ 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>Compose or read</td></tr></table>
+        * <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 revoke the handler.
         * @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.
         */
        removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;
+
+       /**
+        * Removes the event handlers for a supported event type.
+        * 
+        * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+        * `Office.EventType.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+        * 
+        * [Api set: Mailbox 1.7]
+        *
+        * @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 revoke the handler.
+        */
+       removeHandlerAsync(eventType: Office.EventType): 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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface ItemCompose extends Item {
         /**
@@ -11843,9 +14496,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         subject: Subject;
         /**
@@ -11858,20 +14512,14 @@ declare namespace Office {
          * [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>
+         * <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>
          * 
-         * 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: Office.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.
@@ -11894,11 +14542,13 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -11914,35 +14564,13 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -11963,11 +14591,13 @@ declare namespace Office {
          * [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>
+         * <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 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.
@@ -11981,6 +14611,57 @@ declare namespace Office {
          * @beta
          */
         addFileAttachmentFromBase64Async(base64File: string, attachmentName: string, options?: Office.AsyncContextOptions, callback?: (result: Office.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>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 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 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.
+         * 
+         * @beta
+         */
+        addFileAttachmentFromBase64Async(base64File: string, attachmentName: string, callback?: (result: Office.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>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 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.
+         * 
+         * @beta
+         */
+        addFileAttachmentFromBase64Async(base64File: string, attachmentName: string): void;
 
         /**
          * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
@@ -11998,20 +14679,12 @@ declare namespace Office {
          * [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>
+         * <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 this signature, this method also has the following signatures:
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string): void;`
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: Office.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.
@@ -12038,11 +14711,11 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -12064,39 +14737,11 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -12115,16 +14760,17 @@ declare namespace Office {
          *
          * 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, 
+         * **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>
+         * <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;
         /**
@@ -12134,9 +14780,10 @@ 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>Compose</td></tr></table>
+         * <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 - 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.
@@ -12148,17 +14795,52 @@ declare namespace Office {
          */
         getAttachmentsAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<AttachmentDetails[]>) => void): 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.
+         * Gets the item's attachments as an array.
          * 
          * [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>
+         * <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 callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. If the call fails, the asyncResult.error property will contain and error code with the reason for 
+         *                 the failure.
+         * 
+         * @beta
+         */
+        getAttachmentsAsync(callback?: (result: Office.AsyncResult<AttachmentDetails[]>) => void): void;
+        /**
+         * Gets the item's attachments as an array.
+         * 
+         * [Api set: Mailbox Preview]
          *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         * @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
+         */
+        getAttachmentsAsync(): 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>Compose</td></tr>
+         * </table>
          *
          * More information on {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | actionable messages}.
          *
@@ -12174,38 +14856,56 @@ declare namespace Office {
          */
         getInitializationContextAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<string>) => void): void;
         /**
-         * Asynchronously returns selected data from the subject or body of a message.
+         * Gets initialization data passed when the add-in is activated by an actionable 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.
+         * **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>ReadWriteItem</td></tr>
+         * <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>
          *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
+         * More information on {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | actionable messages}.
          *
-         * @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.
+         * @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
          */
-        getSelectedDataAsync(coercionType: Office.CoercionType, callback: (result: Office.AsyncResult<any>) => void): void;
+        getInitializationContextAsync(callback?: (result: Office.AsyncResult<string>) => void): 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>Compose</td></tr>
+         * </table>
+         *
+         * More information on {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | actionable messages}.
+         *
+         * @beta
+         */
+        getInitializationContextAsync(): 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 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]
@@ -12215,9 +14915,10 @@ 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>ReadWriteItem</td></tr>
-         *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
+         * <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.
@@ -12227,6 +14928,33 @@ declare namespace Office {
          *                 type Office.AsyncResult.
          */
         getSelectedDataAsync(coercionType: Office.CoercionType, options: Office.AsyncContextOptions, callback: (result: Office.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 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: Office.AsyncResult<any>) => void): void;
         /**
          * Removes an attachment from a message or appointment.
          *
@@ -12240,20 +14968,12 @@ 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>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>
+         * <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(attachmentId: string): void;`
-         * 
-         * `removeAttachmentAsync(attachmentId: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `removeAttachmentAsync(attachmentId: string, callback: (result: Office.AsyncResult<void>) => void): void;`
-         *
          * @param attachmentId - The identifier of the attachment 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.
@@ -12275,11 +14995,11 @@ 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>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>
+         * <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 attachmentId - The identifier of the attachment to remove.
          */
@@ -12297,11 +15017,11 @@ 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>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>
+         * <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 attachmentId - The identifier of the attachment to remove.
          * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -12321,11 +15041,11 @@ 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>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>
+         * <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 attachmentId - The identifier of the attachment to remove.
          * @param callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
@@ -12345,11 +15065,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -12359,20 +15079,12 @@ 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>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>
+         * <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: Office.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 
@@ -12391,11 +15103,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -12405,11 +15117,11 @@ 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>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>
+         * <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;
@@ -12424,11 +15136,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -12438,46 +15150,11 @@ 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>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>
+         * <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. 
@@ -12495,20 +15172,12 @@ 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>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>
+         * <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: Office.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.
@@ -12535,11 +15204,11 @@ 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>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>
+         * <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.
@@ -12556,41 +15225,11 @@ 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>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>
+         * <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.
@@ -12602,8 +15241,9 @@ declare namespace Office {
     /**
      * 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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface ItemRead extends Item {
         /**
@@ -12612,11 +15252,12 @@ declare namespace Office {
          * [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>
+         * <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>
          *
-         * <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. 
+         * **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}.
          *
@@ -12633,9 +15274,10 @@ 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>Read</td></tr></table>
+         * <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.
@@ -12648,8 +15290,8 @@ declare namespace Office {
          *   </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>
+         *     <td>These are calendar items of the item class IPM.Appointment or IPM.Appointment.Occurrence.</td>
+         *     <td>IPM.Appointment,IPM.Appointment.Occurrence</td>
          *   </tr>
          *   <tr>
          *     <td>Message items</td>
@@ -12666,7 +15308,7 @@ declare namespace Office {
          * 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. 
+         * **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}.
@@ -12675,9 +15317,10 @@ 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>Read</td></tr></table>
+         * <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;
         /**
@@ -12690,9 +15333,10 @@ 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>Read</td></tr></table>
+         * <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;
         /**
@@ -12706,9 +15350,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         subject: string;
         /**
@@ -12723,18 +15368,46 @@ declare namespace Office {
          * 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.
+         * **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>
+         * <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
+         *                   OR an {@link Office.ReplyFormData} object that contains body or attachment data and a callback function.
+         * @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.
+         */
+        displayReplyAllForm(formData: string | ReplyFormData, callback?: (result: Office.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>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;
         /**
@@ -12748,38 +15421,63 @@ declare namespace Office {
          * 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.
+         * **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>
+         * <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>
          *
-         * <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.
+         * @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.
+         */
+        displayReplyForm(formData: string | ReplyFormData, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Displays a reply form that includes only the sender of the selected message or the organizer of the selected appointment.
          *
-         * @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.
+         * 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 
+         * **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: Office.AsyncResult<string>) => void): void;`
+         * <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 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.
@@ -12795,16 +15493,17 @@ declare namespace Office {
         /**
          * 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 
+         * **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>
+         * <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. 
@@ -12815,24 +15514,43 @@ declare namespace Office {
          * @beta
          */
         getInitializationContextAsync(callback?: (result: Office.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>
+         * 
+         * @beta
+         */
+        getInitializationContextAsync(): 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.
+         * **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>
+         * <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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          * 
@@ -12844,9 +15562,10 @@ declare namespace Office {
          * 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>
+         * <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.
@@ -12855,7 +15574,7 @@ declare namespace Office {
          *   <tr>
          *     <th>Value of entityType</th>
          *     <th>Type of objects in returned array</th>
-         *     <th>Required Permission Leve</th>
+         *     <th>Required Permission Level</th>
          *   </tr>
          *   <tr>
          *     <td>Address</td>
@@ -12901,15 +15620,16 @@ declare namespace Office {
          * 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.
+         * **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>
+         * <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, 
@@ -12931,7 +15651,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
@@ -12942,9 +15662,10 @@ 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>Read</td></tr></table>
+         * <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;
         /**
@@ -12957,7 +15678,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
@@ -12966,9 +15687,10 @@ 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>Read</td></tr></table>
+         * <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.
          */
@@ -12976,15 +15698,16 @@ declare namespace Office {
         /**
          * 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.
+         * **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>
+         * <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.
          */
@@ -13001,7 +15724,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.6]
          *
@@ -13012,17 +15735,19 @@ 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>Read</td></tr></table>
+         * <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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface Message extends Item {
         /**
@@ -13039,9 +15764,10 @@ 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>Compose or read</td></tr></table>
+         * <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;
     }
@@ -13049,8 +15775,9 @@ declare namespace Office {
      /**
      * 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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface MessageCompose extends Message, ItemCompose {
         /**
@@ -13060,9 +15787,10 @@ 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>Message Compose</td></tr></table>
+         * <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;
         /**
@@ -13072,25 +15800,27 @@ 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>Message Compose</td></tr></table>
+         * <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: 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 cc property returns an {@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>
+         * <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;
         /**
@@ -13107,37 +15837,12 @@ 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>Message Compose</td></tr></table>
+         * <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.
-         */
-        dateTimeModified: Date;
         /**
          * Gets the email address of the sender of a message.
          *
@@ -13150,9 +15855,10 @@ 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>Message Compose</td></tr></table>
+         * <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>
          */
         from: From;
         /**
@@ -13164,9 +15870,10 @@ 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>Message Compose</td></tr></table>
+         * <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
          */
@@ -13181,9 +15888,10 @@ 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>Message Compose</td></tr></table>
+         * <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: MailboxEnums.ItemType;
         /**
@@ -13193,40 +15901,19 @@ 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>Message Compose</td></tr></table>
+         * <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: 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 1.7]
-         * 
-         * @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>
-         */
-        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. 
+         * **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}.
@@ -13238,9 +15925,10 @@ 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>Message Compose</td></tr></table>
+         * <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>
          */
         seriesId: string;
         /**
@@ -13254,9 +15942,10 @@ 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>Message Compose</td></tr></table>
+         * <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;
         /**
@@ -13269,9 +15958,10 @@ 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>Message Compose</td></tr></table>
+         * <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>
          */
         to: Recipients;
 
@@ -13285,20 +15975,14 @@ declare namespace Office {
          * [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>
+         * <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: Office.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.
@@ -13321,11 +16005,13 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -13341,34 +16027,13 @@ declare namespace Office {
          * [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: 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>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>
+         * <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.
@@ -13388,11 +16053,13 @@ declare namespace Office {
          * [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>
+         * <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 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.
@@ -13406,6 +16073,33 @@ declare namespace Office {
          * @beta
          */
         addFileAttachmentFromBase64Async(base64File: string, attachmentName: string, options?: Office.AsyncContextOptions, callback?: (result: Office.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>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 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 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.
+         * 
+         * @beta
+         */
+        addFileAttachmentFromBase64Async(base64File: string, attachmentName: string, callback?: (result: Office.AsyncResult<string>) => void): void;
         /**
          * Adds an event handler for a supported event.
          * 
@@ -13416,13 +16110,10 @@ 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>Message Compose</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.AsyncResult<void>) => void): void;`
+         * <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. 
@@ -13443,9 +16134,10 @@ 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>Message Compose</td></tr></table>
+         * <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. 
@@ -13454,6 +16146,26 @@ declare namespace Office {
          *                asyncResult, which is an Office.AsyncResult object.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.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.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+         * 
+         * [Api set: Mailbox 1.7]
+         *
+         * @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.
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: any): void;
         /**
          * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
          *
@@ -13470,20 +16182,12 @@ declare namespace Office {
          * [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>
+         * <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 this signature, this method also has the following signatures:
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string): void;`
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: Office.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.
@@ -13510,11 +16214,11 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -13536,39 +16240,11 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -13586,16 +16262,17 @@ declare namespace Office {
          *
          * 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, 
+         * **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>
+         * <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;
         /**
@@ -13605,9 +16282,10 @@ 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>Compose</td></tr></table>
+         * <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 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.
@@ -13618,19 +16296,54 @@ declare namespace Office {
          * @beta
          */
         getAttachmentsAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<AttachmentDetails[]>) => void): void;
+        /**
+         * Gets the item's attachments as an array.
+         * 
+         * [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 callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. If the call fails, the asyncResult.error property will contain and error code with the reason for 
+         *                 the failure.
+         * 
+         * @beta
+         */
+        getAttachmentsAsync(callback?: (result: Office.AsyncResult<AttachmentDetails[]>) => void): void;
+        /**
+         * Gets the item's attachments as an array.
+         * 
+         * [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
+         */
+        getAttachmentsAsync(): 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 
+         * **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>
+         * <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}.
          *
@@ -13646,31 +16359,51 @@ declare namespace Office {
          */
         getInitializationContextAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<string>) => void): void;
         /**
-         * Asynchronously returns selected data from the subject or body of a message.
+         * Gets initialization data passed when the add-in is activated by an actionable 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.
+         * **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>ReadWriteItem</td></tr>
+         * <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>
          *
-         * <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 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.
+         * @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
          */
-        getSelectedDataAsync(coercionType: Office.CoercionType, callback: (result: Office.AsyncResult<any>) => void): void;
+        getInitializationContextAsync(callback?: (result: Office.AsyncResult<string>) => void): 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}.
+         *
+         * @beta
+         */
+        getInitializationContextAsync(): void;
         /**
          * Asynchronously returns selected data from the subject or body of a message.
          *
@@ -13687,9 +16420,10 @@ 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>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>
+         * <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.
@@ -13699,6 +16433,33 @@ declare namespace Office {
          *                 type Office.AsyncResult.
          */
         getSelectedDataAsync(coercionType: Office.CoercionType, options: Office.AsyncContextOptions, callback: (result: Office.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 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: Office.AsyncResult<any>) => void): void;
         /**
          * Asynchronously loads custom properties for this add-in on the selected item.
          *
@@ -13714,9 +16475,10 @@ 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>Message Compose</td></tr></table>
+         * <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 callback - When the method completes, the function passed in the callback parameter is called with a single parameter of 
          *                 type Office.AsyncResult.
@@ -13724,6 +16486,30 @@ declare namespace Office {
          *                    This object can be accessed by the asyncResult.asyncContext property in the callback function.
          */
         loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void, userContext?: any): 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>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.
+         */
+        loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void): void;
         /**
          * Removes an attachment from a message or appointment.
          *
@@ -13737,20 +16523,12 @@ 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>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>
+         * <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(attachmentId: string): void;`
-         * 
-         * `removeAttachmentAsync(attachmentId: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `removeAttachmentAsync(attachmentId: string, callback: (result: Office.AsyncResult<void>) => void): void;`
-         *
          * @param attachmentId - The identifier of the attachment 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.
@@ -13772,11 +16550,11 @@ 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>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>
+         * <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 attachmentId - The identifier of the attachment to remove.
          */
@@ -13794,35 +16572,11 @@ 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>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 attachmentId - The identifier of the attachment 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.
-         */
-        removeAttachmentAsync(attachmentId: 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 an inline form then subsequently pops out the 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>
+         * <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 attachmentId - The identifier of the attachment to remove.
          * @param callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
@@ -13840,13 +16594,10 @@ 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>Message Compose</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;`
+         * <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 revoke the handler.
          * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -13865,15 +16616,35 @@ 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>Message Compose</td></tr></table>
+         * <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 revoke the handler.
          * @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.
          */
         removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Removes the event handlers for a supported event type.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+         * 
+         * [Api set: Mailbox 1.7]
+         *
+         * @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 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.
+         */
+        removeHandlerAsync(eventType: Office.EventType): void;
         /**
          * Asynchronously saves an item.
          *
@@ -13885,11 +16656,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -13899,20 +16670,12 @@ 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>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>
+         * <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: Office.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 
@@ -13930,11 +16693,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -13944,48 +16707,14 @@ 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>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>
+         * <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.
          *
@@ -13997,11 +16726,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -14011,11 +16740,11 @@ 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>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>
+         * <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. 
@@ -14032,20 +16761,12 @@ 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>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>
+         * <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: Office.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.
@@ -14071,11 +16792,11 @@ 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>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>
+         * <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.
@@ -14092,40 +16813,11 @@ 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>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>
+         * <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.
@@ -14137,8 +16829,9 @@ declare namespace Office {
     /**
      * 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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface MessageRead extends Message, ItemRead {
         /**
@@ -14148,11 +16841,12 @@ 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>Message Read</td></tr></table>
+         * <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. 
+         * **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}.
          *
@@ -14165,9 +16859,10 @@ 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>Message Read</td></tr></table>
+         * <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: Body;
         /**
@@ -14181,9 +16876,10 @@ 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>Message Read</td></tr></table>
+         * <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[];
         /**
@@ -14200,35 +16896,38 @@ 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>Message Read</td></tr></table>
+         * <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.
+         * Gets the date and time that an item was created.
          *
          * [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>
+         * <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.
+         * Gets the date and time that an item was last modified.
          *
          * [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>
+         * <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>
          *
-         * <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.
+         * **Note**: This member is not supported in Outlook for iOS or Outlook for Android.
          */
         dateTimeModified: Date;
         /**
@@ -14237,7 +16936,7 @@ declare namespace Office {
          * 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.
+         * **Note**: The recipientType property of the EmailAddressDetails object in the from property is undefined.
          * 
          * The from property returns an EmailAddressDetails object.
          * 
@@ -14245,9 +16944,10 @@ 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>Message Read</td></tr></table>
+         * <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>
          */
         from: EmailAddressDetails;
         /**
@@ -14259,9 +16959,10 @@ 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>Message Read</td></tr></table>
+         * <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
          */
@@ -14273,9 +16974,10 @@ 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>Message Read</td></tr></table>
+         * <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>
          */
         internetMessageId: string;
         /**
@@ -14288,9 +16990,10 @@ 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>Message Read</td></tr></table>
+         * <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.
@@ -14303,8 +17006,8 @@ declare namespace Office {
          *   </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>
+         *     <td>These are calendar items of the item class IPM.Appointment or IPM.Appointment.Occurrence.</td>
+         *     <td>IPM.Appointment,IPM.Appointment.Occurrence</td>
          *   </tr>
          *   <tr>
          *     <td>Message items</td>
@@ -14322,7 +17025,7 @@ declare namespace Office {
          * 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. 
+         * **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}.
@@ -14331,9 +17034,10 @@ 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>Message Read</td></tr></table>
+         * <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;
         /**
@@ -14346,9 +17050,10 @@ 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>Message Read</td></tr></table>
+         * <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: MailboxEnums.ItemType;
         /**
@@ -14362,9 +17067,10 @@ 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>Message Read</td></tr></table>
+         * <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;
         /**
@@ -14374,9 +17080,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         notificationMessages: NotificationMessages;
         /**
@@ -14387,18 +17094,19 @@ declare namespace Office {
          * 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**: 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 
+         * **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 1.7]
          * 
          * @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>
+         * <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>
          */
         recurrence: Recurrence;
         /**
@@ -14407,7 +17115,7 @@ declare namespace Office {
          * 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. 
+         * **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}.
@@ -14419,9 +17127,10 @@ 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>Message Read</td></tr></table>
+         * <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>
          */
         seriesId: string;
         /**
@@ -14430,15 +17139,16 @@ declare namespace Office {
          * 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.
+         * **Note**: The recipientType property of the EmailAddressDetails object in the sender property is undefined.
          *
          * [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>
+         * <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>
          */
         sender: EmailAddressDetails;
         /**
@@ -14452,9 +17162,10 @@ 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>Message Read</td></tr></table>
+         * <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>
          */
         subject: string;
         /**
@@ -14468,9 +17179,10 @@ 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>Message Read</td></tr></table>
+         * <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[];
 
@@ -14484,13 +17196,10 @@ 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>Message Read</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.AsyncResult<void>) => void): void;`
+         * <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. 
@@ -14501,7 +17210,6 @@ declare namespace Office {
          *                asyncResult, which is an Office.AsyncResult object.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, options?: any, callback?: (result: Office.AsyncResult<void>) => void): void;
-
         /**
          * Adds an event handler for a supported event.
          * 
@@ -14512,9 +17220,10 @@ 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>Message Read</td></tr></table>
+         * <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. 
@@ -14523,6 +17232,26 @@ declare namespace Office {
          *                asyncResult, which is an Office.AsyncResult object.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.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.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+         * 
+         * [Api set: Mailbox 1.7]
+         *
+         * @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.
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: any): 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.
@@ -14535,18 +17264,46 @@ declare namespace Office {
          * 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.
+         * **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>
+         * <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
+         *                   OR an {@link Office.ReplyFormData} object that contains body or attachment data and a callback function.
+         * @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.
+         */
+        displayReplyAllForm(formData: string | ReplyFormData, callback?: (result: Office.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;
         /**
@@ -14560,39 +17317,64 @@ declare namespace Office {
          * 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.
+         * **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>
+         * <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>
          *
-         * <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.
+         * @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.
+         */
+        displayReplyForm(formData: string | ReplyFormData, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Displays a reply form that includes only the sender of the selected message or the organizer of the selected appointment.
          *
-         * @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.
+         * 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 
+         * **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: Office.AsyncResult<string>) => void): void;`
+         * <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 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.
@@ -14609,16 +17391,17 @@ declare namespace Office {
          * 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 
+         * **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>
+         * <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. 
@@ -14629,24 +17412,44 @@ declare namespace Office {
          * @beta
          */
         getInitializationContextAsync(callback?: (result: Office.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>
+         * 
+         * @beta
+         */
+        getInitializationContextAsync(): 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.
+         * **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>
+         * <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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
@@ -14659,9 +17462,10 @@ 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>Restricted</td></tr>
-         *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         * <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 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.
@@ -14670,7 +17474,7 @@ declare namespace Office {
          *   <tr>
          *     <th>Value of entityType</th>
          *     <th>Type of objects in returned array</th>
-         *     <th>Required Permission Leve</th>
+         *     <th>Required Permission Level</th>
          *   </tr>
          *   <tr>
          *     <td>Address</td>
@@ -14716,15 +17520,16 @@ declare namespace Office {
          * 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.
+         * **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>
+         * <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, 
@@ -14746,7 +17551,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
@@ -14757,9 +17562,10 @@ 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>Message Read</td></tr></table>
+         * <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;
         /**
@@ -14772,7 +17578,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
@@ -14781,9 +17587,10 @@ 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>Message Read</td></tr></table>
+         * <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.
          */
@@ -14791,15 +17598,16 @@ declare namespace Office {
         /**
          * 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.
+         * **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>
+         * <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.
          */
@@ -14818,7 +17626,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.6]
          *
@@ -14829,9 +17637,10 @@ 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>Message Read</td></tr></table>
+         * <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;
         /**
@@ -14849,9 +17658,10 @@ 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>Message Read</td></tr></table>
+         * <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.
@@ -14859,6 +17669,30 @@ declare namespace Office {
          *                    This object can be accessed by the asyncResult.asyncContext property in the callback function.
          */
         loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void, userContext?: any): 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>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.
+         */
+        loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void): void;
         /**
          * Removes the event handlers for a supported event type.
          * 
@@ -14869,13 +17703,10 @@ 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>Message Read</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;`
+         * <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 revoke the handler.
          * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -14894,15 +17725,34 @@ 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>Message Read</td></tr></table>
+         * <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 revoke the handler.
          * @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.
          */
         removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Removes the event handlers for a supported event type.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+         * 
+         * [Api set: Mailbox 1.7]
+         *
+         * @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 revoke the handler.
+         */
+        removeHandlerAsync(eventType: Office.EventType): void;
     }
 
     /**
@@ -14912,9 +17762,10 @@ 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>Read</td></tr></table>
+     * <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>
      */
     interface LocalClientTime {
         /**
@@ -14956,9 +17807,10 @@ declare namespace Office {
      * [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</td></tr></table>
+     * <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>
      */
     interface Location {
         /**
@@ -14975,14 +17827,10 @@ declare namespace Office {
          * [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</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `getAsync(callback: (result: Office.AsyncResult<string>) => void): void;`
-         * 
+         * <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>
          */
         getAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<string>) => void): void;
         /**
@@ -14997,11 +17845,27 @@ declare namespace Office {
          * [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</td></tr></table>
+         * <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>
          */
         getAsync(callback: (result: Office.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.
+         *
+         * [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</td></tr>
+         * </table>
+         */
+        getAsync(): void;
         /**
          * Sets the location of an appointment.
          *
@@ -15017,19 +17881,11 @@ declare namespace Office {
          * [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</td></tr>
-         *
-         * <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: Office.AsyncContextOptions): void;`
-         * 
-         * `setAsync(location: string, callback: (result: Office.AsyncResult<void>) => void): void;`
+         * <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>
+         *   <tr><td>Errors</td><td>DataExceedsMaximumSize - The location parameter is longer than 255 characters.</td></tr>
+         * </table>
          */
         setAsync(location: string, options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<void>) => void): void;
         /**
@@ -15043,33 +17899,13 @@ declare namespace Office {
          * [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</td></tr>
-         *
-         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The location parameter is longer than 255 characters.</td></tr></table>
+         * <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>
+         *   <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.
-         *
-         * @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.
-         *
-         * [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</td></tr>
-         *
-         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The location parameter is longer than 255 characters.</td></tr></table>
-         */
-        setAsync(location: string, options: Office.AsyncContextOptions): void;
         /**
          * Sets the location of an appointment.
          *
@@ -15083,11 +17919,11 @@ declare namespace Office {
          * [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</td></tr>
-         *
-         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The location parameter is longer than 255 characters.</td></tr></table>
+         * <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>
+         *   <tr><td>Errors</td><td>DataExceedsMaximumSize - The location parameter is longer than 255 characters.</td></tr>
+         * </table>
          */
         setAsync(location: string, callback: (result: Office.AsyncResult<void>) => void): void;
     }
@@ -15105,9 +17941,10 @@ declare namespace Office {
      * [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>
+     * <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 Mailbox {
         /**
@@ -15133,9 +17970,10 @@ declare namespace Office {
          * [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>
+         * <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: Diagnostics;
         /**
@@ -15150,13 +17988,14 @@ 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>Compose or read</td></tr></table>
+         * <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://docs.microsoft.com/outlook/add-ins/get-attachments-of-an-outlook-item | get attachments from the selected item}.
          *
-         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
+         * **Note**: This member is not supported in Outlook for iOS or Outlook for Android.
          */
         ewsUrl: string;
         /**
@@ -15177,9 +18016,10 @@ 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>Compose or read</td></tr></table>
+         * <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.
          */
@@ -15199,9 +18039,10 @@ 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>Compose or read</td></tr></table>
+         * <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. 
@@ -15211,21 +18052,62 @@ declare namespace Office {
          *                 type Office.AsyncResult.
          */
         addHandlerAsync(eventType: Office.EventType, handler: (type: Office.EventType) => void, options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Adds an event handler for a supported event.
+         *
+         * Currently, the only supported event type is `Office.EventType.ItemChanged`. In Preview, `Office.EventType.OfficeThemeChanged` is also supported.
+         *
+         * [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>
+         *
+         * @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 of 
+         *                 type Office.AsyncResult.
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: (type: Office.EventType) => void, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Adds an event handler for a supported event.
+         *
+         * Currently, the only supported event type is `Office.EventType.ItemChanged`. In Preview, `Office.EventType.OfficeThemeChanged` is also supported.
+         *
+         * [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>
+         *
+         * @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.
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: (type: Office.EventType) => 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.
          *
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [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 or read</td></tr></table>
+         * <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>
          *
          * @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.
@@ -15248,9 +18130,10 @@ 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>Compose or read</td></tr></table>
+         * <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 timeValue - A Date object.
          */
@@ -15258,15 +18141,16 @@ declare namespace Office {
         /**
          * Converts an item ID formatted for EWS into REST format.
          *
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [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 or read</td></tr></table>
+         * <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>
          *
          * 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://docs.microsoft.com/previous-versions/office/office-365-api/api/version-2.0/mail-rest-operations | Outlook Mail API} or the {@link https://graph.microsoft.io/ | Microsoft Graph}. 
@@ -15286,9 +18170,10 @@ 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>Compose or read</td></tr></table>
+         * <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 input - The local time value to convert.
          * @returns A Date object with the time expressed in UTC.
@@ -15309,15 +18194,16 @@ declare namespace Office {
          * 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.
+         * **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>Compose or read</td></tr></table>
+         * <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 itemId - The Exchange Web Services (EWS) identifier for an existing calendar appointment.
          */
@@ -15335,15 +18221,16 @@ declare namespace Office {
          * 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.
+         * **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>Compose or read</td></tr></table>
+         * <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 itemId - The Exchange Web Services (EWS) identifier for an existing message.
          */
@@ -15364,15 +18251,16 @@ declare namespace Office {
          *
          * If any of the parameters exceed the specified size limits, or if an unknown parameter name is specified, an exception is thrown.
          *
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * **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>
+         * <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 parameters - An AppointmentForm describing the new appointment. All properties are optional.
          */
@@ -15389,9 +18277,10 @@ 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>Read</td></tr></table>
+         * <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 parameters - A dictionary containing all values to be filled in for the user in the new form. All parameters are optional.
          * 
@@ -15446,22 +18335,17 @@ declare namespace Office {
          *
          * The add-in should use the ewsUrl property to determine the correct URL to use when making EWS calls.
          *
-         * Note: It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible.
+         * **Note**: It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible.
          *
          * [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 and read</td></tr></table>
+         * <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 has the following signatures:
-         * 
-         * `getCallbackTokenAsync(callback: (result: Office.AsyncResult<string>) => void): void;`
-         * 
-         * `getCallbackTokenAsync(callback: (result: Office.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.
@@ -15489,9 +18373,10 @@ 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>Compose and read</td></tr></table>
+         * <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. 
          *                 The token is provided as a string in the `asyncResult.value` property.
@@ -15517,9 +18402,10 @@ 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>Compose and read</td></tr></table>
+         * <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. The token is provided as a string in the `asyncResult.value` property.
@@ -15536,9 +18422,10 @@ 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>Compose and read</td></tr></table>
+         * <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 getUserIdentityTokenAsync method returns a token that you can use to identify and 
          * {@link https://docs.microsoft.com/outlook/add-ins/authentication | authenticate the add-in and user with a third-party system}.
@@ -15550,6 +18437,29 @@ declare namespace Office {
          * @param userContext - Optional. Any state data that is passed to the asynchronous method.|
          */
         getUserIdentityTokenAsync(callback: (result: Office.AsyncResult<string>) => void, userContext?: any): void;
+        /**
+         * Gets a token identifying the user and the Office Add-in.
+         *
+         * The token is provided as a string in the asyncResult.value 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>Compose or Read</td></tr>
+         * </table>
+         *
+         * The getUserIdentityTokenAsync method returns a token that you can use to identify and 
+         * {@link https://docs.microsoft.com/outlook/add-ins/authentication | 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 Office.AsyncResult.
+         *                 The token is provided as a string in the `asyncResult.value` property.
+         *                 If there was an error, then the `asyncResult.error` and `asyncResult.diagnostics` properties may provide additional information.
+         */
+        getUserIdentityTokenAsync(callback: (result: Office.AsyncResult<string>) => void): void;
         /**
          * Makes an asynchronous request to an Exchange Web Services (EWS) service on the Exchange server that hosts the user's mailbox.
          *
@@ -15568,13 +18478,13 @@ declare namespace Office {
          * 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:
+         * **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 
+         * **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*
@@ -15592,9 +18502,10 @@ 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>ReadWriteMailbox</td></tr>
-         *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose and read</td></tr></table>
+         * <table>
+         *   <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteMailbox</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 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 Office.AsyncResult.
@@ -15603,6 +18514,59 @@ declare namespace Office {
          * @param userContext - Optional. Any state data that is passed to the asynchronous method.
          */
         makeEwsRequestAsync(data: any, callback: (result: Office.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.
+         *
+         * In these cases, add-ins should use REST APIs to access the user's mailbox instead.
+         *
+         * The makeEwsRequestAsync method sends an EWS request on behalf of the add-in to Exchange.
+         *
+         * You cannot request Folder Associated Items with the makeEwsRequestAsync method.
+         *
+         * 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 {@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.
+         *
+         * **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.
+         *
+         * *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.
+         *
+         * `<?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.
+         *
+         * [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>ReadWriteMailbox</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 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 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.
+         */
+        makeEwsRequestAsync(data: any, callback: (result: Office.AsyncResult<string>) => void): void;
         /**
          * Removes the event handlers for a supported event type.
          *
@@ -15612,9 +18576,10 @@ 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>Compose or read</td></tr></table>
+         * <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 revoke the handler.
          * @param options - Optional. Provides an option for preserving context data of any type, unchanged, for use in a callback.
@@ -15622,6 +18587,42 @@ declare namespace Office {
          *                 type Office.AsyncResult.
          */
         removeHandlerAsync(eventType: Office.EventType, options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Removes the event handlers for a supported event type.
+         *
+         * Currently, the only supported event type is `Office.EventType.ItemChanged`. In Preview, `Office.EventType.OfficeThemeChanged` is also supported.
+         *
+         * [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>
+         *
+         * @param eventType - The event that should revoke the handler.
+         * @param callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
+         */
+        removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Removes the event handlers for a supported event type.
+         *
+         * Currently, the only supported event type is `Office.EventType.ItemChanged`. In Preview, `Office.EventType.OfficeThemeChanged` is also supported.
+         *
+         * [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>
+         *
+         * @param eventType - The event that should revoke the handler.
+         */
+        removeHandlerAsync(eventType: Office.EventType): void;
     }
 
     /**
@@ -15637,9 +18638,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface MeetingSuggestion {
         /**
@@ -15657,7 +18659,7 @@ declare namespace Office {
         /**
          * Gets a string that was identified as a meeting suggestion.
          */
-        meetingstring: string;
+        meetingString: string;
         /**
          * Gets the date and time that a suggested meeting is to begin.
          */
@@ -15673,9 +18675,10 @@ 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>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>
+     * <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>
      */
     interface NotificationMessageDetails {
         /**
@@ -15713,9 +18716,10 @@ 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>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>
+     * <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>
      */
     interface NotificationMessages {
         /**
@@ -15735,18 +18739,10 @@ 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>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 signatures:
-         * 
-         * `addAsync(key: string, JSONmessage: NotificationMessageDetails): void;`
-         * 
-         * `addAsync(key: string, JSONmessage: NotificationMessageDetails, options: Office.AsyncContextOptions): void;`
-         * 
-         * `addAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: Office.AsyncResult<void>) => void): void;`
-         * 
+         * <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>
          */
         addAsync(key: string, JSONmessage: NotificationMessageDetails, options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<void>) => void): void;
         /**
@@ -15762,31 +18758,12 @@ 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>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>
+         * <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>
          */
         addAsync(key: string, JSONmessage: NotificationMessageDetails): 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 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
-         * <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>
-         */
-        addAsync(key: string, JSONmessage: NotificationMessageDetails, options: Office.AsyncContextOptions): void;
         /**
          * Adds a notification to an item.
          *
@@ -15802,9 +18779,10 @@ 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>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>
+         * <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>
          */
         addAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: Office.AsyncResult<void>) => void): void;
         /**
@@ -15813,14 +18791,11 @@ 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>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>
+         * <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, this method also has the following signature:
-         * 
-         * `getAllAsync(callback: (result: Office.AsyncResult<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 Office.AsyncResult.
@@ -15833,35 +18808,39 @@ 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>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>
+         * <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 - 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: Office.AsyncResult<NotificationMessageDetails[]>) => void): void;
+        /**
+         * Returns all keys and 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>
+         */
+        getAllAsync(): void;
         /**
          * Removes a notification message 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>
+         * <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, this method also has the following signatures:
-         * 
-         * `removeAsync(key: string): void;`
-         * 
-         * `removeAsync(key: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `removeAsync(key: string, callback: (result: Office.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 Office.AsyncResult.
          */
@@ -15872,9 +18851,10 @@ 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>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>
+         * <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 key - The key for the notification message to remove.
          */
@@ -15885,24 +18865,10 @@ 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>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 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: Office.AsyncContextOptions): void;
-        /**
-         * Removes a notification message 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>
+         * <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 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 
@@ -15917,18 +18883,11 @@ 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>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>
+         * <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, this method also has the following signatures:
-         * 
-         * `replaceAsync(key: string, JSONmessage: NotificationMessageDetails): void;`
-         * 
-         * `replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options: Office.AsyncContextOptions): void;`
-         * 
-         * `replaceAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: Office.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.
@@ -15946,9 +18905,10 @@ 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>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>
+         * <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 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. 
@@ -15963,28 +18923,10 @@ 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>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 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 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: Office.AsyncContextOptions): void;
-        /**
-         * Replaces a notification message that has a given key with another message.
-         *
-         * If a notification message with the specified key doesn't exist, replaceAsync will add the notification.
-         *
-         * [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>
+         * <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 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. 
@@ -16003,9 +18945,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface PhoneNumber {
         /**
@@ -16025,9 +18968,10 @@ declare namespace Office {
      * [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</td></tr></table>
+     * <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>
      */
     interface Recipients {
         /**
@@ -16044,20 +18988,12 @@ declare namespace Office {
          * [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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
+         * <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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr>
+         * </table>
          * 
-         * In addition to this signature, this method also has the following signatures:
-         * 
-         * `addAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;`
-         * 
-         * `addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: Office.AsyncContextOptions): void;`
-         * 
-         * `addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: Office.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.
@@ -16079,11 +19015,11 @@ declare namespace Office {
          * [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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
+         * <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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr>
+         * </table>
          *
          * @param recipients - The recipients to add to the recipients list.
          */
@@ -16102,36 +19038,11 @@ declare namespace Office {
          * [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>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: Office.AsyncContextOptions): void;
-        /**
-         * Adds a recipient list to the existing recipients for an appointment or message.
-         *
-         * The recipients parameter can be an array of one of the following:
-         *
-         * - Strings containing SMTP email addresses
-         *
-         * - {@link Office.EmailUser} objects
-         *
-         * - {@link Office.EmailAddressDetails} objects
-         *
-         * [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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
+         * <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>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 
@@ -16146,14 +19057,11 @@ declare namespace Office {
          * [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</td></tr></table>
+         * <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>
          * 
-         * In addition to this signature, this method also has the following signature:
-         * 
-         * `getAsync(callback: (result: Office.AsyncResult<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 
@@ -16169,9 +19077,10 @@ declare namespace Office {
          * [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</td></tr></table>
+         * <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 callback - When the method completes, the function passed in the callback parameter is called with a single parameter of 
          *                 type Office.AsyncResult.
@@ -16194,20 +19103,12 @@ declare namespace Office {
          * [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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
+         * <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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr>
+         * </table>
          * 
-         * In addition to this signature, this method also has the following signatures:
-         * 
-         * `setAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;`
-         * 
-         * `setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: Office.AsyncContextOptions): void;`
-         * 
-         * `setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: Office.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.
@@ -16233,11 +19134,11 @@ declare namespace Office {
          * [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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
+         * <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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr>
+         * </table>
          *
          * @param recipients - The recipients to add to the recipients list.
          */
@@ -16258,38 +19159,11 @@ declare namespace Office {
          * [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>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: Office.AsyncContextOptions): void;
-        /**
-         * Sets a recipient list for an appointment or message.
-         *
-         * The setAsync method overwrites the current recipient list.
-         *
-         * The recipients parameter can be an array of one of the following:
-         *
-         * - Strings containing SMTP email addresses
-         *
-         * - {@link Office.EmailUser} objects
-         *
-         * - {@link Office.EmailAddressDetails} objects
-         *
-         * [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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
+         * <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>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 
@@ -16310,9 +19184,10 @@ 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>Compose or read</td></tr></table>
+     * <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>
      * 
      * **States**
      * 
@@ -16362,9 +19237,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         recurrenceProperties: RecurrenceProperties;
         /**
@@ -16374,9 +19250,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         recurrenceTimeZone: RecurrenceTimeZone;
 
@@ -16387,9 +19264,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         recurrenceType: MailboxEnums.RecurrenceType;
 
@@ -16402,9 +19280,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         seriesTime: SeriesTime;
 
@@ -16417,13 +19296,10 @@ 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>Compose or read</td></tr></table>
-         * 
-         * In addition to this signature, this method also has the following signature:
-         * 
-         * `getAsync(callback?: (result: Office.AsyncResult<Recurrence>) => void): void;`
+         * <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 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.
@@ -16442,9 +19318,10 @@ 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>Compose or read</td></tr></table>
+         * <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 - 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.
@@ -16453,23 +19330,35 @@ declare namespace Office {
         getAsync(callback?: (result: Office.AsyncResult<Recurrence>) => void): void;
 
         /**
-         * Sets the recurrence pattern of an appointment series.
+         * Returns the current recurrence object of an appointment series.
          * 
-         * Note: setAsync should only be available for series items and not instance items.
+         * This method returns the entire recurrence object for the appointment series.
          * 
          * [Api set: Mailbox 1.7]
          * 
          * @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>
+         * <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>
+         */
+        getAsync(): void;
+
+        /**
+         * Sets the recurrence pattern of an appointment series.
          * 
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         * **Note**: setAsync should only be available for series items and not instance items.
          * 
-         * <tr><td>Errors</td><td>InvalidEndTime - The appointment end time is before its start time.</td></tr></table>
+         * [Api set: Mailbox 1.7]
          * 
-         * In addition to this signature, this method also has the following signature:
+         * @remarks
          * 
-         * `setAsync(recurrencePattern: Recurrence, callback?: (result: Office.AsyncResult<void>) => void): void;`
+         * <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>InvalidEndTime - The appointment end time is before its start time.</td></tr>
+         * </table>
          * 
          * @param recurrencePattern - A recurrence object.
          * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -16482,23 +19371,44 @@ declare namespace Office {
         /**
          * Sets the recurrence pattern of an appointment series.
          * 
-         * Note: setAsync should only be available for series items and not instance items.
+         * **Note**: setAsync should only be available for series items and not instance items.
          * 
          * [Api set: Mailbox 1.7]
          * 
          * @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>InvalidEndTime - The appointment end time is before its start time.</td></tr></table>
+         * <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>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 Office.AsyncResult object.
          */
         setAsync(recurrencePattern: Recurrence, callback?: (result: Office.AsyncResult<void>) => void): void;
+
+        /**
+         * Sets the recurrence pattern of an appointment series.
+         * 
+         * **Note**: setAsync should only be available for series items and not instance items.
+         * 
+         * [Api set: Mailbox 1.7]
+         * 
+         * @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>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 Office.AsyncResult object.
+         */
+        setAsync(recurrencePattern: Recurrence): void;
     }
 
     /**
@@ -16508,9 +19418,10 @@ 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>Compose or read</td></tr></table>
+     * <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>
      */
     interface RecurrenceProperties {
         /**
@@ -16551,9 +19462,10 @@ 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>Compose or read</td></tr></table>
+     * <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>
      */
     interface RecurrenceTimeZone {
         /**
@@ -16608,7 +19520,7 @@ declare namespace Office {
         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 Office.AsyncResult object.
+         * asyncResult, which is an Office.AsyncResult object.
          */
         callback?: (result: Office.AsyncResult<any>) => void;
     }
@@ -16624,7 +19536,7 @@ declare namespace Office {
      *
      * 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. 
+     * **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.
@@ -16632,9 +19544,10 @@ declare namespace Office {
      * [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>
+     * <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 RoamingSettings {
         /**
@@ -16643,9 +19556,10 @@ declare namespace Office {
          * [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>
+         * <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>
          *
          * @param name - The case-sensitive name of the setting to retrieve.
          * @returns Type: String | Number | Boolean | Object | Array
@@ -16657,9 +19571,10 @@ declare namespace Office {
          * [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>
+         * <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>
          *
          * @param name - The case-sensitive name of the setting to remove.
          */
@@ -16674,14 +19589,31 @@ declare namespace Office {
          * [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>
+         * <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>
          *
          * @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: Office.AsyncResult<void>) => void): void;
+        /**
+         * 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.
+         *
+         * [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>
+         */
+        saveAsync(): void;
         /**
          * Sets or creates the specified setting.
          *
@@ -16695,9 +19627,10 @@ declare namespace Office {
          * [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>
+         * <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>
          *
          * @param name - The case-sensitive name of the setting to set or create.
          * @param value - Specifies the value to be stored.
@@ -16712,9 +19645,10 @@ declare namespace Office {
      * [Api set: Mailbox 1.7]
      *
      * @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>
+     * <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>
      */
     interface SeriesTime {
         /**
@@ -16723,9 +19657,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>
+         * <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>
          */
         getDuration(): number;
 
@@ -16735,9 +19670,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>
+         * <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>
          */
         getEndDate(): string;
 
@@ -16749,9 +19685,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>
+         * <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>
          */
         getEndTime(): string;
 
@@ -16761,9 +19698,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>
+         * <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>
          */
         getStartDate(): string;
 
@@ -16774,9 +19712,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>
+         * <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>
          */
         getStartTime(): string;
 
@@ -16786,9 +19725,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>
+         * <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 minutes - The length of the appointment in minutes.
          */
@@ -16800,16 +19740,11 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>Invalid date format - The date is not in an acceptable format.</td></tr></table>
-         * 
-         * In addition to this signature, this method also has the following 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").
+         * <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>Invalid date format - The date is not in an acceptable format.</td></tr>
+         * </table>
          * 
          * @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.
@@ -16822,11 +19757,11 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>Invalid date format - The date is not in an acceptable format.</td></tr></table>
+         * <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>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".
          */
@@ -16837,16 +19772,12 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>
+         *   <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>Invalid date format - The date is not in an acceptable format.</td></tr>
+         * </table>
          * 
-         * <tr><td>Errors</td><td>Invalid date format - The date is not in an acceptable format.</td></tr></table>
-         * 
-         * In addition to this signature, this method also has the following 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.
          * @param day - The day value of the start date.
@@ -16859,11 +19790,11 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>Invalid date format - The date is not in an acceptable format.</td></tr></table>
+         * <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>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".
          */
@@ -16876,15 +19807,11 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>Invalid time format - The time is not in an acceptable format.</td></tr></table>
-         * 
-         * In addition to this signature, this method also has the following signature:
-         * 
-         * `setStartTime(time: string): void;` (Where time is the start time of all instances represented by standard datetime string format: "THH:mm:ss:mmm").
+         * <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>Invalid time format - The time is not in an acceptable format.</td></tr>
+         * </table>
          * 
          * @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.
@@ -16898,11 +19825,11 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>Invalid time format - The time is not in an acceptable format.</td></tr></table>
+         * <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>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".
          */
@@ -16915,9 +19842,10 @@ declare namespace Office {
      * [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>
+     * <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
      */
@@ -16942,9 +19870,10 @@ declare namespace Office {
      * [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</td></tr></table>
+     * <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>
      */
     interface Subject {
         /**
@@ -16955,14 +19884,11 @@ declare namespace Office {
          * [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</td></tr></table>
+         * <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>
          * 
-         * In addition to this signature, this method also has the following signature:
-         * 
-         * `getAsync(callback: (result: Office.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 
@@ -16978,9 +19904,10 @@ declare namespace Office {
          * [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</td></tr></table>
+         * <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 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.
@@ -16995,20 +19922,12 @@ declare namespace Office {
          * [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</td></tr>
-         *
-         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The subject parameter is longer than 255 characters.</td></tr></table>
+         * <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>
+         *   <tr><td>Errors</td><td>DataExceedsMaximumSize - The subject parameter is longer than 255 characters.</td></tr>
+         * </table>
          * 
-         * In addition to this signature, this method also has the following signatures:
-         * 
-         * `setAsync(subject: string): void;`
-         * 
-         * `setAsync(subject: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `setAsync(subject: string, callback: (result: Office.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.
@@ -17025,11 +19944,11 @@ declare namespace Office {
          * [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</td></tr>
-         *
-         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The subject parameter is longer than 255 characters.</td></tr></table>
+         * <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>
+         *   <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.
          */
@@ -17043,31 +19962,11 @@ declare namespace Office {
          * [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</td></tr>
-         *
-         * <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: 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.
-         *
-         * [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</td></tr>
-         *
-         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The subject parameter is longer than 255 characters.</td></tr></table>
+         * <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>
+         *   <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 
@@ -17085,9 +19984,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface TaskSuggestion {
         /**
@@ -17105,9 +20005,10 @@ declare namespace Office {
      * [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</td></tr></table>
+     * <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>
      */
     interface Time {
         /**
@@ -17119,14 +20020,11 @@ declare namespace Office {
          * [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</td></tr></table>
+         * <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>
          * 
-         * In addition to this signature, this method also has the following signature:
-         * 
-         * `getAsync(callback: (result: Office.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 Office.AsyncResult.
@@ -17142,9 +20040,10 @@ declare namespace Office {
          * [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</td></tr></table>
+         * <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 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 a Date object.
@@ -17161,20 +20060,12 @@ declare namespace Office {
          * [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>InvalidEndTime - The appointment end time is before the appointment start time.</td></tr></table>
+         * <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>InvalidEndTime - The appointment end time is before the appointment start time.</td></tr>
+         * </table>
          * 
-         * In addition to this signature, this method also has the following signatures:
-         * 
-         * `setAsync(dateTime: Date): void;`
-         * 
-         * `setAsync(dateTime: Date, options: Office.AsyncContextOptions): void;`
-         * 
-         * `setAsync(dateTime: Date, callback: (result: Office.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.
@@ -17194,11 +20085,11 @@ declare namespace Office {
          * [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>InvalidEndTime - The appointment end time is before the appointment start time.</td></tr></table>
+         * <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>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).
          */
@@ -17214,33 +20105,11 @@ declare namespace Office {
          * [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>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: 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.
-         *
-         * The time must be in UTC; you can get the correct UTC time by using the convertToUtcClientTime method.
-         *
-         * [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>InvalidEndTime - The appointment end time is before the appointment start time.</td></tr></table>
+         * <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>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 
@@ -17256,23 +20125,25 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface UserProfile {
         /**
          * 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.
+         * **Note**: This member is currently only supported in Outlook 2016 for Mac, build 16.9.1212 and greater.
          *
          * [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>Compose or read</td></tr></table>
+         * <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 possible account types are listed in the following table.
          * 
@@ -17306,9 +20177,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         displayName: string;
         /**
@@ -17317,9 +20189,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         emailAddress: string;
         /**
@@ -17328,9 +20201,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         timeZone: string;
     }
@@ -19838,7 +22712,7 @@ declare namespace Excel {
         copy(positionType?: "None" | "Before" | "After" | "Beginning" | "End", relativeTo?: Excel.Worksheet): Excel.Worksheet;
         /**
          *
-         * Deletes the worksheet from the workbook.
+         * Deletes the worksheet from the workbook. Note that if the worksheet's visibility is set to "VeryHidden", the delete operation will fail with a GeneralException.
          *
          * [Api set: ExcelApi 1.1]
          */
diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 0c13640c74..d6aef3d1c9 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -20,7 +20,7 @@ declare namespace Office {
      */
     var Promise: IPromiseConstructor;
 
-    // Note: this is a copy of the PromiseConstructor object from
+    // **Note**: this is a copy of the PromiseConstructor object from
     //     https://github.com/Microsoft/TypeScript/blob/master/lib/lib.es2015.promise.d.ts
     // It is necessary so that even with targeting "ES5" and not specifying any libs,
     //     developers will still get IntelliSense for "Office.Promise" just as they would with a regular Promise.
@@ -628,7 +628,7 @@ declare namespace Office {
         * 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. 
+        * **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**
@@ -729,7 +729,7 @@ declare namespace Office {
         * 
         * 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.
+        * When using in Outlook, the applicable modes are Compose or Read.
         * 
         * **Support details**
         * 
@@ -797,9 +797,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         mailbox: Office.Mailbox;
         /**
@@ -823,9 +824,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         roamingSettings: Office.RoamingSettings;
         /**
@@ -905,11 +907,11 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * <table><tr><td>Add-in type</td><td>Content, task pane, Outlook</td></tr>
-         * 
-         * <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>
+         * <table>
+         *   <tr><td>Add-in type</td><td>Content, task pane, Outlook</td></tr>
+         *   <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 Event {
             
@@ -945,9 +947,10 @@ 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>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>
+             * <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>
              * 
              * **Support details**
              * 
@@ -997,9 +1000,10 @@ declare namespace Office {
         * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
         *
         * @remarks
-        * <table><tr><td>Hosts</td><td>Word, Excel, Outlook, PowerPoint</td></tr>
-        *
-        * <tr><td>Requirement sets</td><td>DialogApi, Mailbox 1.4</td></tr></table>
+        * <table>
+        *   <tr><td>Hosts</td><td>Word, Excel, Outlook, PowerPoint</td></tr>
+        *   <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 
@@ -1093,6 +1097,105 @@ declare namespace Office {
         * @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<Dialog>) => void): void;
+        /**
+        * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
+        *
+        * @remarks
+        * <table>
+        *   <tr><td>Hosts</td><td>Word, Excel, Outlook, PowerPoint</td></tr>
+        *   <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/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.
+        *
+        * 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 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.
+        *
+        * - Every dialog box is centered on the screen when opened.
+        *
+        * - Dialog boxes appear on top of the host application and in the order in which they were created.
+        *
+        * Use a dialog box to:
+        *
+        * - Display authentication pages to collect user credentials.
+        *
+        * - 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>
+        *   <tr>
+        *     <td>12009</td>
+        *     <td>The user chose to ignore the dialog box. This error can occur in online versions of Office, where users may choose not to allow an add-in to present a dialog.</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 callback - Optional. Accepts a callback method to handle the dialog creation attempt. If successful, the AsyncResult.value is a Dialog object.
+        */
         displayDialogAsync(startAddress: string, 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. 
@@ -1348,7 +1451,7 @@ declare namespace Office {
         /**
          * 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.
+         * **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
         /**
@@ -1683,43 +1786,43 @@ declare namespace Office {
          * 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.
+         * **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.
          * 
-         * Note: 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.
          * 
-         * Note: 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.
          * 
-         * Note: 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.
          * 
-         * Note: Only applies to data in PowerPoint when calling the {@link Office.Document | Document}.getSelectedData method to get the current 
+         * **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.
-        * Note: Only applies to data in Excel, Word, and PowerPoint.
+        * **Note**: Only applies to data in Excel, Word, and PowerPoint.
         */
         Image,
         /**
          * Data is returned or set as XML data containing an SVG image.
-         * Note: Only applies to data in Excel, Word, and PowerPoint.
+         * **Note**: Only applies to data in Excel, Word, and PowerPoint.
          */
         XmlSvg
     }
@@ -1813,7 +1916,7 @@ declare namespace Office {
      * 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>
+     * <table><tr><td>BindingDataChanged and BindingSelectionChanged hosts</td><td>Access, Excel, Word</td></tr></table>
      *
      * @remarks
      * 
@@ -2291,6 +2394,17 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * 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 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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.AsyncResult<void>) => void): void;
         /**
          * Returns the data contained within the binding.
@@ -2307,6 +2421,19 @@ declare namespace Office {
          *                  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<T>(options?: GetBindingDataOptions, callback?: (result: AsyncResult<T>) => void): void;
+        /**
+         * Returns the data contained within the binding.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>MatrixBindings, TableBindings, TextBindings</td></tr></table>
+         *
+         * 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 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<T>(callback?: (result: AsyncResult<T>) => void): void;
         /**
          * Removes the specified handler from the binding for the specified event type.
@@ -2319,6 +2446,15 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         removeHandlerAsync(eventType: Office.EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Removes the specified handler from the binding for the specified event type.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>BindingEvents</td></tr></table>
+         *
+         * @param eventType The event type. For bindings, it can be `Office.EventType.BindingDataChanged` or `Office.EventType.BindingSelectionChanged`.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         removeHandlerAsync(eventType: Office.EventType, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Writes data to the bound section of the document represented by the specified binding object.
@@ -2392,7 +2528,7 @@ declare namespace Office {
          *   </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>
+         *     <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>
          * 
@@ -2451,6 +2587,134 @@ declare namespace Office {
          * @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): void;
+        /**
+         * Writes data to the bound section of the document represented by the specified binding object.
+         *
+         * @remarks
+         *
+         * <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:
+         *
+         *        string: Excel, Excel Online, Word, and Word Online only
+         *
+         *        array of arrays: Excel and Word only
+         *
+         *        {@link Office.TableData}: Access, Excel, and Word only
+         *
+         *        HTML: Word and Word Online only
+         *
+         *        Office Open XML: Word only
+         *
+         * @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, callback?: (result: AsyncResult<void>) => void): void;
     }
 
@@ -2566,7 +2830,7 @@ declare namespace Office {
          * 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 
+         *     **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 
@@ -2576,7 +2840,7 @@ declare namespace Office {
          * 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 
+         *     **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**
@@ -2601,6 +2865,50 @@ declare namespace Office {
          *                  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<Binding>) => void): void;
+        /**
+         * Creates a binding against a named object in the document.
+         *
+         * @remarks
+         * <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.
+         *
+         *     **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).
+         *
+         * 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.
+         *
+         * **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> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *  </table>
+         * @param itemName Name of the bindable object in the document. For Example 'MyExpenses' table in Excel."
+         * @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 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, callback?: (result: AsyncResult<Binding>) => void): void;
         /**
          * Create a binding by prompting the user to make a selection on the document.
@@ -2633,6 +2941,35 @@ declare namespace Office {
          *                  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<Binding>) => void): void;
+        /**
+         * Create a binding by prompting the user to make a selection on the document.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>Not in a set</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.
+         * 
+         * **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> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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 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, callback?: (result: AsyncResult<Binding>) => void): void;
         /**
          * Create a binding based on the user's current selection.
@@ -2670,6 +3007,40 @@ declare namespace Office {
          *                  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<Binding>) => void): void;
+        /**
+         * Create a binding based on the user's current selection.
+         *
+         * @remarks
+         * <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.
+         * 
+         * **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> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><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 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, callback?: (result: AsyncResult<Binding>) => void): void;
         /**
          * Gets all bindings that were previously created.
@@ -2698,6 +3069,31 @@ declare namespace Office {
          *                  The `value` property of the result is an array that contains each binding created for the referenced Bindings object.
          */
         getAllAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<Binding[]>) => void): void;
+        /**
+         * Gets all bindings that were previously created.
+         *
+         * @remarks
+         * <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *  </table>
+         *
+         * @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(callback?: (result: AsyncResult<Binding[]>) => void): void;
         /**
          * Retrieves a binding based on its Name
@@ -2727,8 +3123,36 @@ declare namespace Office {
          * @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 Binding object specified by the id in the call.
-          */
+         */
         getByIdAsync(id: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<Binding>) => void): void;
+        /**
+         * Retrieves a binding based on its Name
+         *
+         * @remarks
+         * <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *  </table>
+         *
+         * @param id Specifies the unique name of the binding object. Required.
+         * @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, callback?: (result: AsyncResult<Binding>) => void): void;
         /**
          * Removes the binding from the document
@@ -2759,6 +3183,33 @@ declare namespace Office {
          * @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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Removes the binding from the document
+         *
+         * @remarks
+         * <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *  </table>
+         *
+         * @param id Specifies the unique name to be used to identify the binding object. Required.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         releaseByIdAsync(id: string, callback?: (result: AsyncResult<void>) => void): void;
     }
     /**
@@ -2815,6 +3266,16 @@ declare namespace Office {
          *                  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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<CustomXmlNode[]>) => void): void;
+        /**
+         * Gets the nodes associated with the XPath expression.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+         *
+         * @param xPath The XPath expression that specifies the nodes to get. Required.
+         * @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, callback?: (result: AsyncResult<CustomXmlNode[]>) => void): void;
         /**
          * Gets the node value.
@@ -2827,6 +3288,15 @@ declare namespace Office {
          *                  The `value` property of the result is a string that contains the value of the referenced node.
          */
         getNodeValueAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Gets the node value.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+         *
+         * @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(callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Gets the text of an XML node in a custom XML part.
@@ -2839,6 +3309,15 @@ declare namespace Office {
          *                  The `value` property of the result is a string that contains the inner text of the referenced nodes.
          */
         getTextAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Gets the text of an XML node in a custom XML part.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+         *
+         * @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(callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Gets the node's XML.
@@ -2851,6 +3330,15 @@ declare namespace Office {
          *                  The `value` property of the result is a string that contains the XML of the referenced node.
          */
         getXmlAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Gets the node's XML.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+         *
+         * @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(callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Sets the node value.
@@ -2863,20 +3351,42 @@ declare namespace Office {
          * @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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Sets the node value.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+         *
+         * @param value The value to be set on the node
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         setNodeValueAsync(value: string, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Asynchronously sets the text of an XML node in a custom XML part.
          *
          * @remarks
-         * <table><tr><td>Hosts</td><td>Word</td></tr>
-         *
-         * <tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+         * <table>
+         *   <tr><td>Hosts</td><td>Word</td></tr>
+         *   <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 {@link Office.AsyncResult}.
          */
         setTextAsync(text: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Asynchronously sets the text of an XML node in a custom XML part.
+         *
+         * @remarks
+         * <table>
+         *   <tr><td>Hosts</td><td>Word</td></tr>
+         *   <tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr>
+         * </table>
+         *
+         * @param text Required. The text value of the XML node.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         setTextAsync(text: string, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Sets the node XML.
@@ -2889,6 +3399,15 @@ declare namespace Office {
          * @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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Sets the node XML.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+         *
+         * @param xml The XML to be set on the node
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         setXmlAsync(xml: string, callback?: (result: AsyncResult<void>) => void): void;
     }
     /**
@@ -2924,7 +3443,6 @@ declare namespace Office {
          * 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.
          *
@@ -2940,45 +3458,68 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         addHandlerAsync(eventType: Office.EventType, handler: (result: any) => void, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Adds an event handler to the object using the specified event type.
+         *
+         * @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 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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         addHandlerAsync(eventType: Office.EventType, handler: (result: any) => void, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Deletes the Custom XML Part.
          *
-         * @remarks
-         *
          * @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}.
          */
         deleteAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Deletes the Custom XML Part.
+         *
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         deleteAsync(callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Asynchronously gets any CustomXmlNodes in this custom XML part which match the specified XPath.
          *
-         * @remarks
-         *
          * @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 {@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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<CustomXmlNode[]>) => void): void;
+        /**
+         * Asynchronously gets any CustomXmlNodes in this custom XML part which match the specified XPath.
+         *
+         * @param xPath An XPath expression that specifies the nodes you want returned. Required.
+         * @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, callback?: (result: AsyncResult<CustomXmlNode[]>) => void): void;
         /**
          * Asynchronously gets the XML inside this custom XML part.
          *
-         * @remarks
-         *
          * @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 string that contains the XML of the referenced CustomXmlPart object.
-        */
+         */
         getXmlAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Asynchronously gets the XML inside this custom XML part.
+         *
+         * @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(callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Removes an event handler for the specified event type.
          *
-         * @remarks
-         *
          * @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.
@@ -2986,6 +3527,14 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         removeHandlerAsync(eventType: Office.EventType, handler?: (result: any) => void, options?: RemoveHandlerOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Removes an event handler for the specified event type.
+         *
+         * @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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         removeHandlerAsync(eventType: Office.EventType, handler?: (result: any) => void, callback?: (result: AsyncResult<void>) => void): void;
     }
 
@@ -3126,6 +3675,13 @@ declare namespace Office {
          *                  The `value` property of the result is the newly created CustomXmlPart object.
          */
         addAsync(xml: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<CustomXmlPart>) => void): void;
+        /**
+         * Asynchronously adds a new custom XML part to a file.
+         *
+         * @param xml The XML to add to the newly created custom XML part.
+         * @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, callback?: (result: AsyncResult<CustomXmlPart>) => void): void;
         /**
          * Asynchronously gets the specified custom XML part by its id.
@@ -3137,6 +3693,14 @@ declare namespace Office {
          *                  If there is no custom XML part with the specified id, the method returns null.
          */
         getByIdAsync(id: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<CustomXmlPart>) => void): void;
+        /**
+         * Asynchronously gets the specified custom XML part by its id.
+         *
+         * @param id The GUID of the custom XML part, including opening and closing braces.
+         * @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, callback?: (result: AsyncResult<CustomXmlPart>) => void): void;
         /**
          * Asynchronously gets the specified custom XML part(s) by its namespace.
@@ -3147,6 +3711,13 @@ declare namespace Office {
          *                  The `value` property of the result is an array of CustomXmlPart objects that match the specified namespace.
         */
         getByNamespaceAsync(ns: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<CustomXmlPart[]>) => void): void;
+        /**
+         * Asynchronously gets the specified custom XML part(s) by its namespace.
+         *
+         * @param ns  The namespace URI.
+         * @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, callback?: (result: AsyncResult<CustomXmlPart[]>) => void): void;
     }
     /**
@@ -3183,6 +3754,16 @@ declare namespace Office {
          * @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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Asynchronously adds a prefix to namespace mapping to use when querying an item.
+         *
+         * @remarks
+         * 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 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, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Asynchronously gets the namespace mapped to the specified prefix.
@@ -3198,6 +3779,18 @@ declare namespace Office {
          *                  The `value` property of the result is a string that contains the namespace mapped to the specified prefix.
          */
         getNamespaceAsync(prefix: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Asynchronously gets the namespace mapped to the specified prefix.
+         *
+         * @remarks
+         *
+         * 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 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, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Asynchronously gets the prefix for the specified namespace.
@@ -3211,8 +3804,20 @@ declare namespace Office {
          * @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 string that contains the prefix of the specified namespace.
-        */
+         */
         getPrefixAsync(ns: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Asynchronously gets the prefix for the specified namespace.
+         *
+         * @remarks
+         *
+         * 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 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, callback?: (result: AsyncResult<string>) => void): void;
     }
     /**
@@ -3369,6 +3974,37 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Adds an event handler for a Document object event.
+         *
+         * @remarks
+         * <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> OneNote    </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </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 {@link Office.DocumentSelectionChangedEventArgs}. Required.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Returns the state of the current view of the presentation (edit or read).
@@ -3397,8 +4033,35 @@ declare namespace Office {
          *                  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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<"edit" | "read">) => void): void;
+        /**
+         * Returns the state of the current view of the presentation (edit or read).
+         *
+         * @remarks
+         * <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *  </table>
+         *
+         * @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(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). 
@@ -3444,6 +4107,48 @@ declare namespace Office {
          *                  The `value` property of the result is the File object.
          */
         getFileAsync(fileType: FileType, options?: GetFileOptions, callback?: (result: AsyncResult<Office.File>) => 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.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>File</td></tr></table>
+         *
+         * 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:
+         *
+         * Excel for Windows desktop, iPad, and Excel Online: `Office.FileType.Compressed`
+         * 
+         * Excel for Mac: `Office.FileType.Compressed`, `Office.FileType.Pdf`
+         *
+         * PowerPoint for Windows desktop, Mac, iPad, and PowerPoint Online: `Office.FileType.Compressed`, `Office.FileType.Pdf`
+         *
+         * Word for Windows desktop, Mac, iPad, and Word Online: `Office.FileType.Compressed`, `Office.FileType.Pdf`, `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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *  </table>
+         *
+         * @param fileType The format in which the file will be returned
+         * @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, callback?: (result: AsyncResult<Office.File>) => void): void;
         /**
          * Gets file properties of the current document.
@@ -3472,8 +4177,35 @@ declare namespace Office {
          * @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 {@link Office.AsyncResult}.
          *                  The `value` property of the result is the file's properties (with the URL found at `asyncResult.value.url`).
-        */
+         */
         getFilePropertiesAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<Office.FileProperties>) => void): void;
+        /**
+         * Gets file properties of the current document.
+         *
+         * @remarks
+         * <table><tr><td>Requirement Sets</td><td>Not in a set</td></tr></table>
+         *
+         * 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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *  </table>
+         *
+         * @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(callback?: (result: AsyncResult<Office.FileProperties>) => void): void;
         /**
          * Reads the data contained in the current selection in the document.
@@ -3571,6 +4303,98 @@ declare namespace Office {
          *                  (See Remarks for more information about data coercion.)
          */
         getSelectedDataAsync<T>(coercionType: Office.CoercionType, options?: GetSelectedDataOptions, callback?: (result: AsyncResult<T>) => void): void;
+        /**
+         * Reads the data contained in the current selection in the document.
+         *
+         * @remarks
+         * <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, PowerPoint, Project, and Word</td>
+         *     <td>`Office.CoercionType.Text` (string)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Excel and Word</td>
+         *     <td>`Office.CoercionType.Matrix` (array of arrays)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Access, Excel, and Word</td>
+         *     <td>`Office.CoercionType.Table` (TableData object)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Word</td>
+         *     <td>`Office.CoercionType.Html`</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Word</td>
+         *     <td>`Office.CoercionType.Ooxml` (Office Open XML)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>PowerPoint and PowerPoint Online</td>
+         *     <td>`Office.CoercionType.SlideRange`</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Excel, PowerPoint, and Word</td>
+         *     <td>`Office.CoercionType.XmlSvg`</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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </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 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<T>(coercionType: Office.CoercionType, callback?: (result: AsyncResult<T>) => void): void;
         /**
          * Goes to the specified object or location in the document.
@@ -3614,6 +4438,46 @@ declare namespace Office {
          *                  The `value` property of the result is the current view.
          */
         goToByIdAsync(id: string | number, goToType: GoToType, options?: GoToByIdOptions, callback?: (result: AsyncResult<any>) => void): void;
+        /**
+         * Goes to the specified object or location in the document.
+         *
+         * @remarks
+         * <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 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).
+         * 
+         * **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> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </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 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, callback?: (result: AsyncResult<any>) => void): void;
         /**
          * Removes an event handler for the specified event type.
@@ -3644,6 +4508,33 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         removeHandlerAsync(eventType: Office.EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Removes an event handler for the specified event type.
+         *
+         * @remarks
+         * <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> OneNote    </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         removeHandlerAsync(eventType: Office.EventType, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Writes the specified data into the current selection.
@@ -3656,26 +4547,94 @@ declare namespace Office {
          * 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>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>
+         *   <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</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>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>
+         *   <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. 
@@ -3762,6 +4721,188 @@ declare namespace Office {
          *                  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): void;
+        /**
+         * Writes the specified data into the current selection.
+         *
+         * @remarks
+         * <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, PowerPoint, Project, and Word</td>
+         *     <td>`Office.CoercionType.Text` (string)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Excel and Word</td>
+         *     <td>`Office.CoercionType.Matrix` (array of arrays)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Access, Excel, and Word</td>
+         *     <td>`Office.CoercionType.Table` (TableData object)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Word</td>
+         *     <td>`Office.CoercionType.Html`</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Word</td>
+         *     <td>`Office.CoercionType.Ooxml` (Office Open XML)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>PowerPoint and PowerPoint Online</td>
+         *     <td>`Office.CoercionType.SlideRange`</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Excel, PowerPoint, and Word</td>
+         *     <td>`Office.CoercionType.XmlSvg`</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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </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 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[][], callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Project documents only. Get Project field (Ex. ProjectWebAccessURL).
@@ -3787,6 +4928,28 @@ declare namespace Office {
          *  </table>
          */
         getProjectFieldAsync(fieldId: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<any>) => void): void;
+        /**
+         * Project documents only. Get Project field (Ex. ProjectWebAccessURL).
+         * @param fieldId Project level fields.
+         * @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, callback?: (result: AsyncResult<any>) => void): void;
         /**
          * Project documents only. Get resource field for provided resource Id. (Ex.ResourceName)
@@ -3813,6 +4976,29 @@ declare namespace Office {
          *  </table>
          */
         getResourceFieldAsync(resourceId: string, fieldId: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => 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 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, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Project documents only. Get the current selected Resource's Id.
@@ -3837,6 +5023,27 @@ declare namespace Office {
          *  </table>
          */
         getSelectedResourceAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Project documents only. Get the current selected Resource's Id.
+         * @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(callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Project documents only. Get the current selected Task's Id.
@@ -3861,6 +5068,27 @@ declare namespace Office {
          *  </table>
          */
         getSelectedTaskAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Project documents only. Get the current selected Task's Id.
+         * @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(callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Project documents only. Get the current selected View Type (Ex. Gantt) and View Name.
@@ -3887,6 +5115,29 @@ declare namespace Office {
          *  </table>
          */
         getSelectedViewAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<any>) => void): void;
+        /**
+         * Project documents only. Get the current selected View Type (Ex. Gantt) and View Name.
+         * @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(callback?: (result: AsyncResult<any>) => void): void;
         /**
          * Project documents only. Get the Task Name, WSS Task Id, and ResourceNames for given taskId.
@@ -3915,6 +5166,31 @@ declare namespace Office {
          *  </table>
          */
         getTaskAsync(taskId: string, 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 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, callback?: (result: AsyncResult<any>) => void): void;
         /**
          * Project documents only. Get task field for provided task Id. (Ex. StartDate).
@@ -3941,6 +5217,29 @@ declare namespace Office {
          *  </table>
          */
         getTaskFieldAsync(taskId: string, fieldId: number, 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 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, 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.
@@ -3967,11 +5266,34 @@ declare namespace Office {
          *  </table>
          */
         getWSSUrlAsync(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 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(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.
+         * **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}.
@@ -3989,16 +5311,40 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <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 resources in the current project.
+         * 
+         * **Important**: This API works only in Project 2016 on Windows desktop.
+         * 
+         * @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(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.
+         * **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}.
@@ -4021,11 +5367,35 @@ declare namespace Office {
          *  </table>
          */
         getMaxTaskIndexAsync(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 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(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.
+         * **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.
@@ -4049,11 +5419,36 @@ declare namespace Office {
          *  </table>
          */
         getResourceByIndexAsync(resourceIndex: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => 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 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, 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.
+         * **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.
@@ -4077,11 +5472,36 @@ declare namespace Office {
          *  </table>
          */
         getTaskByIndexAsync(taskIndex: 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 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, 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.
+         * **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.
@@ -4106,11 +5526,37 @@ declare namespace Office {
          *  </table>
          */
         setResourceFieldAsync(resourceId: string, fieldId: number, fieldValue: string | number | boolean | object, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => 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 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, 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.
+         * **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.
@@ -4135,6 +5581,32 @@ declare namespace Office {
          *  </table>
          */
         setTaskFieldAsync(taskId: 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 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, callback?: (result: AsyncResult<void>) => void): void;
     }
     /**
@@ -4295,18 +5767,20 @@ declare namespace Office {
         * Gets the number of columns in the matrix data structure, as an integer value.
         *
         * @remarks
-        * <table><tr><td>Hosts</td><td>Access, Excel, PowerPoint, Project, Word</td></tr>
-        *
-        * <tr><td>Requirement Sets</td><td>MatrixBindings</td></tr></table>
+        * <table>
+        *   <tr><td>Hosts</td><td>Access, Excel, PowerPoint, Project, Word</td></tr>
+        *   <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
-        * <table><tr><td>Hosts</td><td>Access, Excel, PowerPoint, Project, Word</td></tr>
-        *
-        * <tr><td>Requirement Sets</td><td>MatrixBindings</td></tr></table>
+        * <table>
+        *   <tr><td>Hosts</td><td>Access, Excel, PowerPoint, Project, Word</td></tr>
+        *   <tr><td>Requirement Sets</td><td>MatrixBindings</td></tr>
+        * </table>
         */
         rowCount: number;
     }
@@ -4314,9 +5788,10 @@ 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
-     * <table><tr><td>Hosts</td><td>Access, Excel, PowerPoint, Word</td></tr>
-     *
-     * <tr><td>Requirement Sets</td><td>Settings</td></tr></table>
+     * <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.
@@ -4332,7 +5807,7 @@ declare namespace Office {
         /**
          * 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 
+         * **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.
          *
@@ -4386,6 +5861,61 @@ declare namespace Office {
          *  </table>
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * 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.
+         *
+         * @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.
+         *
+         * @param eventType Specifies the type of event to add. Required.
+         * @param handler The event handler function to add, whose only parameter is of type {@link Office.SettingsChangedEventArgs}. Required.
+         * @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> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *  </table>
+         */
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Retrieves the specified setting.
@@ -4477,7 +6007,7 @@ declare namespace Office {
         /**
          * 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 
+         * **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.
          *
@@ -4542,6 +6072,40 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         removeHandlerAsync(eventType: Office.EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Removes an event handler for the settingsChanged event.
+         *
+         * @remarks
+         *
+         * <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>                            </td><td> Y                          </td><td>                 </td></tr>
+         *  </table>
+         *
+         * @param eventType Specifies the type of event to remove. Required.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         removeHandlerAsync(eventType: Office.EventType, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Persists the in-memory copy of the settings property bag in the document.
@@ -4551,7 +6115,7 @@ declare namespace Office {
          * 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 
+         * **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.
@@ -4600,11 +6164,66 @@ declare namespace Office {
          * @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): 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.
+         *
+         * **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.
+         * 
+         * <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *  </table>
+         * 
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         saveAsync(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. 
+         * **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.
@@ -4654,7 +6273,7 @@ declare namespace Office {
      * 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 
+     * **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.
@@ -4861,6 +6480,47 @@ declare namespace Office {
          * @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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Adds the specified data to the table as additional columns.
+         *
+         * @remarks
+         *
+         * 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):
+         *
+         *  - 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.
+         *
+         *  - 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.
+         * 
+         * **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> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         addColumnsAsync(tableData: TableData | any[][], callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Adds the specified data to the table as additional rows.
@@ -4902,6 +6562,44 @@ declare namespace Office {
          * @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?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Adds the specified data to the table as additional rows.
+         *
+         * @remarks
+         *
+         * 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.
+         *
+         *  - 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.
+         * 
+         * **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> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         addRowsAsync(rows: TableData | any[][], callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Deletes all non-header rows and their values in the table, shifting appropriately for the host application.
@@ -4930,6 +6628,31 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         deleteAllDataValuesAsync(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
+         *
+         * 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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </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><td> Y              </td></tr>
+         *  </table>
+         *
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         deleteAllDataValuesAsync(callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Clears formatting on the bound table.
@@ -4955,6 +6678,28 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         clearFormatsAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Clears formatting on the bound table.
+         *
+         * @remarks
+         * See {@link https://docs.microsoft.com/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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *  </table>
+         *
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         clearFormatsAsync(callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Gets the formatting on specified items in the table.
@@ -5010,6 +6755,58 @@ declare namespace Office {
          *                  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?: Office.AsyncContextOptions, callback?: (result: AsyncResult< ({ cells: any, format: any})[]>) => 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 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[], callback?: (result: AsyncResult< ({ cells: any, format: any})[]>) => void): void;
         /**
          * Sets formatting on specified items and data in the table.
@@ -5124,14 +6921,126 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
         setFormatsAsync(cellFormat: any[], options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Sets formatting on specified items and data in the table.
+         *
+         * @remarks
+         * 
+         * **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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *  </table>
+         *
+         * @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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         */
         setFormatsAsync(cellFormat: any[], callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Updates table formatting options on the bound table.
          *
          * @remarks
-         * <table><tr><td>Hosts</td><td>Excel</td></tr>
-         *
-         * <tr><td>Requirement Sets</td><td>Not in a set</td></tr></table>
+         * <table>
+         *   <tr><td>Hosts</td><td>Excel</td></tr>
+         *   <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.
          * 
@@ -5178,15 +7087,68 @@ declare namespace Office {
          * 
          */
         setTableOptionsAsync(tableOptions: any, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Updates table formatting options on the bound table.
+         *
+         * @remarks
+         * <table>
+         *   <tr><td>Hosts</td><td>Excel</td></tr>
+         *   <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><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel </strong></td><td> Y                          </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 callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         * 
+         */
         setTableOptionsAsync(tableOptions: any, callback?: (result: AsyncResult<void>) => void): void;
     }
     /**
-     * Represents the data in a table or a {@link Office.TableBinding}.
+     * Represents the data in a table or an {@link Office.TableBinding}.
      *
      * @remarks
-     * <table><tr><td>Hosts</td><td>Excel, Word</td></tr>
-     *
-     * <tr><td>Requirement Sets</td><td>TableBindings</td></tr></table>
+     * <table>
+     *   <tr><td>Hosts</td><td>Excel, Word</td></tr>
+     *   <tr><td>Requirement Sets</td><td>TableBindings</td></tr>
+     * </table>
      */
     class TableData {
         constructor(rows: any[][], headers: any[]);
@@ -5195,10 +7157,11 @@ declare namespace Office {
          * Gets or sets the headers of the table.
          * 
          * @remarks
-         * <table><tr><td>Hosts</td><td>Excel, Word</td></tr>
+         * <table>
+         *   <tr><td>Hosts</td><td>Excel, Word</td></tr>
+         *   <tr><td>Requirement Sets</td><td>TableBindings</td></tr>
+         * </table>
          *
-         * <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']].
          *
@@ -5215,10 +7178,11 @@ declare namespace Office {
          * Returns an empty array if there are no rows.
          * 
          * @remarks
-         * <table><tr><td>Hosts</td><td>Excel, Word</td></tr>
+         * <table>
+         *   <tr><td>Hosts</td><td>Excel, Word</td></tr>
+         *   <tr><td>Requirement Sets</td><td>TableBindings</td></tr>
+         * </table>
          *
-         * <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']].
          *
@@ -7465,9 +9429,9 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          * 
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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
          */
@@ -7498,9 +9462,9 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          * 
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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
          */
@@ -7521,9 +9485,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 {
             /**
@@ -7545,9 +9509,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 Days {
             /**
@@ -7597,9 +9561,9 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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
          */
@@ -7635,9 +9599,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 {
             /**
@@ -7675,9 +9639,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 {
             /**
@@ -7699,9 +9663,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 {
             /**
@@ -7713,15 +9677,37 @@ declare namespace Office {
              */
             Appointment = "appointment"
         }
+        /**
+         * Specifies an appointment location's type.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * <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 LocationType {
+            /**
+             * A custom location.
+             */
+            Custom = "custom",
+            /**
+             * A conference room or similar resource.
+             */
+            Room = "room"
+        }
         /**
          * Specifies the month.
          * 
          * [Api set: Mailbox 1.7]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 Month {
             /**
@@ -7797,9 +9783,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 {
             /**
@@ -7825,9 +9811,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 RecurrenceTimeZone {
             /**
@@ -8383,9 +10369,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 RecurrenceType {
             /**
@@ -8415,9 +10401,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 {
             /**
@@ -8447,9 +10433,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 {
             /**
@@ -8471,9 +10457,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @remarks
-         * <table><tr><td>
-         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
-         * </td><td>Compose or read</td></tr></table>
+         * <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 WeekNumber {
             /**
@@ -8517,9 +10503,10 @@ declare namespace Office {
      * [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>
+     * <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 {
         /**
@@ -8529,9 +10516,10 @@ 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>Compose or read</td></tr></table>
+         * <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;
         /**
@@ -8555,9 +10543,10 @@ 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>Compose or read</td></tr></table>
+         * <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;
         /**
@@ -8575,8 +10564,10 @@ 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>Compose or read</td></tr></table>
+        * <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;
         /**
@@ -8594,9 +10585,10 @@ 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>Compose or read</td></tr></table>
+        * <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[];
@@ -8615,9 +10607,10 @@ 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>Compose or read</td></tr></table>
+         * <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[];
         /**
@@ -8641,9 +10634,10 @@ 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>Compose or read</td></tr></table>
+         * <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;
         /**
@@ -8663,9 +10657,10 @@ 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>Compose or read</td></tr></table>
+         * <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;
     }
@@ -8675,9 +10670,10 @@ declare namespace Office {
      * [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>
+     * <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
      */
@@ -8702,14 +10698,15 @@ declare namespace Office {
     /**
      * Represents an attachment on an item from the server. Read mode only.
      *
-     * An array of AttachmentDetail objects is returned as the attachments property of an Appointment or Message object.
+     * An array of **AttachmentDetails** objects is returned as the attachments property of an appointment or message 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>
+     * <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>
      */
     interface AttachmentDetails {
         /**
@@ -8744,9 +10741,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface Body {
         /**
@@ -8761,13 +10759,10 @@ 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>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, this method also has the following signature:
-         * 
-         * `getAsync(coercionType: Office.CoercionType, callback: (result: Office.AsyncResult<string>) => void): void;`
+         * <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 coercionType - The format for the returned body.
          * @param options - Optional. An object literal that contains one or more of the following properties:
@@ -8788,25 +10783,46 @@ 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>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>
+         * <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 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 Office.AsyncResult.
          *                  The body is provided in the requested format in the asyncResult.value property.
          */
         getAsync(coercionType: Office.CoercionType, callback: (result: Office.AsyncResult<string>) => 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.
+         *
+         * [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>
+         *
+         * @param coercionType - The format for the returned body.
+         */
+        getAsync(coercionType: Office.CoercionType): void;
         /**
          * Gets a value that indicates whether the content is in HTML or text format.
          *
          * [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</td></tr></table>
+         * <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 - 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.
@@ -8814,6 +10830,34 @@ declare namespace Office {
          *                  The content type is returned as one of the CoercionType values in the asyncResult.value property.
          */
         getTypeAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<Office.CoercionType>) => void): void;
+        /**
+         * Gets a value that indicates whether the content is in HTML or text format.
+         *
+         * [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</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.
+         *                  The content type is returned as one of the CoercionType values in the asyncResult.value property.
+         */
+        getTypeAsync(callback?: (result: Office.AsyncResult<Office.CoercionType>) => void): void;
+        /**
+         * Gets a value that indicates whether the content is in HTML or text format.
+         *
+         * [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</td></tr>
+         * </table>
+         *
+         */
+        getTypeAsync(): void;
         /**
          * Adds the specified content to the beginning of the item body.
          *
@@ -8826,20 +10870,12 @@ declare namespace Office {
          * [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>
+         * <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>
          * 
-         * <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 this signature, this method also has the following signatures:
-         * 
-         * `prependAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;`
-         * 
-         * `prependAsync(data: string, callback: (result: Office.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.
@@ -8860,33 +10896,11 @@ declare namespace Office {
          * [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>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: 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.
-         *
-         * 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
-         * <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>
+         * <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 Office.AsyncResult.
@@ -8905,9 +10919,11 @@ declare namespace Office {
          * [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>DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.</td></tr></table>
+         * <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.
          */
@@ -8925,20 +10941,13 @@ 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>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><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>
+         * <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>
+         *   <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 this signature, this method also has the following signatures:
-         * 
-         * `setAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;`
-         * 
-         * `setAsync(data: string, callback: (result: Office.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.
@@ -8960,36 +10969,12 @@ 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>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><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: 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 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
-         * <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><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>
+         * <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>
+         *   <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 Office.AsyncResult.
@@ -9009,11 +10994,12 @@ 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>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><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>
+         * <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>
+         *   <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.
          */
@@ -9032,20 +11018,13 @@ declare namespace Office {
          * [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>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>
+         * <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>
+         *   <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 this signature, this method also has the following signatures:
-         * 
-         * `setSelectedDataAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;`
-         * 
-         * `setSelectedDataAsync(data: string, callback: (result: Office.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.
@@ -9067,36 +11046,12 @@ declare namespace Office {
          * [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>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: 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.
-         *
-         * 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
-         * <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><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>
+         * <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>
+         *   <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 Office.AsyncResult.
@@ -9116,11 +11071,12 @@ declare namespace Office {
          * [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>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>
+         * <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>
+         *   <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.
          */
@@ -9135,9 +11091,10 @@ declare namespace Office {
      * [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>Read</td></tr></table>
+     * <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>
      */
     interface Contact {
         /**
@@ -9149,7 +11106,7 @@ declare namespace Office {
          */
         businessName: string;
         /**
-         * An array of strings containing the SMTP email addresses associated with the contact. Nullable,
+         * An array of strings containing the SMTP email addresses associated with the contact. Nullable.
          */
         emailAddresses: string[];
         /**
@@ -9176,9 +11133,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface CustomProperties {
         /**
@@ -9189,9 +11147,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         get(name: string): any;
         /**
@@ -9206,9 +11165,10 @@ declare namespace Office {
          * [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>
+         * <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 name - The name of the property to be set.
          * @param value - The value of the property to be set.
@@ -9223,9 +11183,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         remove(name: string): void;
         /**
@@ -9247,11 +11208,57 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         saveAsync(callback?: (result: Office.AsyncResult<void>) => void, asyncContext?: any): 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.
+         *
+         * 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 Office.AsyncResult.
+         *
+         * [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>
+         */
+        saveAsync(callback?: (result: Office.AsyncResult<void>) => void): 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.
+         *
+         * 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.
+         *
+         * [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>
+         */
+        saveAsync(): void;
     }
     /**
      * Provides diagnostic information to an Outlook add-in.
@@ -9259,9 +11266,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface Diagnostics {
         /**
@@ -9272,9 +11280,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         hostName: string;
         /**
@@ -9286,9 +11295,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         hostVersion: string;
         /**
@@ -9311,9 +11321,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         OWAView: MailboxEnums.OWAView | "OneColumn" | "TwoColumns" | "ThreeColumns";
     }
@@ -9323,9 +11334,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface EmailAddressDetails {
         /**
@@ -9353,9 +11365,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface EmailUser {
         /**
@@ -9367,6 +11380,188 @@ declare namespace Office {
          */
         emailAddress: string;
     }
+    /**
+     * Represents the set of locations on an appointment.
+     * 
+     * [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
+     */
+    export interface EnhancedLocation {
+        /**
+         * Adds to the set of locations associated with the appointment.
+         * 
+         * [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>Compose</td></tr>
+         *   <tr><td>Errors</td><td>InvalidFormatError - The format of the specified data object is not valid.</td></tr>
+         * </table>
+         * 
+         * @param locationIdentifiers The locations to be added to the current list of locations.
+         * @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. Check the `status` property of asyncResult to determine if the call succeeded.
+         * 
+         * @beta
+         */
+        addAsync(locationIdentifiers: LocationIdentifier[], options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResultStatus) => void): void;
+        /**
+         * Adds to the set of locations associated with the appointment.
+         * 
+         * [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>Compose</td></tr>
+         *   <tr><td>Errors</td><td>InvalidFormatError - The format of the specified data object is not valid.</td></tr>
+         * </table>
+         * 
+         * @param locationIdentifiers The locations to be added to the current list of locations.
+         * @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. Check the `status` property of asyncResult to determine if the call succeeded.
+         * 
+         * @beta
+         */
+        addAsync(locationIdentifiers: LocationIdentifier[], callback?: (result: Office.AsyncResultStatus) => void): void;
+        /**
+         * Adds to the set of locations associated with the appointment.
+         * 
+         * [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>Compose</td></tr>
+         *   <tr><td>Errors</td><td>InvalidFormatError - The format of the specified data object is not valid.</td></tr>
+         * </table>
+         * 
+         * @param locationIdentifiers The locations to be added to the current list of locations.
+         * 
+         * @beta
+         */
+        addAsync(locationIdentifiers: LocationIdentifier[]): void;
+        /**
+         * Gets the set of locations associated with the appointment.
+         * 
+         * [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 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
+         */
+        getAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<LocationDetails[]>) => void): void;
+        /**
+         * Gets the set of locations associated with the appointment.
+         * 
+         * [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 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
+         */
+        getAsync(callback?: (result: Office.AsyncResult<LocationDetails[]>) => void): void;
+        /**
+         * Gets the set of locations associated with the appointment.
+         * 
+         * [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
+         */
+        getAsync(): void;
+        /**
+         * Removes the set of locations associated with the appointment.
+         * 
+         * If there are multiple locations with the same name, all matching locations will be removed even if only one was specified in locationIdentifiers.
+         * 
+         * [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>Compose</td></tr>
+         * </table>
+         * 
+         * @param locationIdentifiers The locations to be removed from the current list of locations.
+         * @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. Check the `status` property of asyncResult to determine if the call succeeded.
+         * 
+         * @beta
+         */
+        removeAsync(locationIdentifiers: LocationIdentifier[], options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResultStatus) => void): void;
+        /**
+         * Removes the set of locations associated with the appointment.
+         * 
+         * If there are multiple locations with the same name, all matching locations will be removed even if only one was specified in locationIdentifiers.
+         * 
+         * [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>Compose</td></tr>
+         * </table>
+         * 
+         * @param locationIdentifiers The locations to be removed from the current list of locations.
+         * @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. Check the `status` property of asyncResult to determine if the call succeeded.
+         * 
+         * @beta
+         */
+        removeAsync(locationIdentifiers: LocationIdentifier[], callback?: (result: Office.AsyncResultStatus) => void): void;
+        /**
+         * Removes the set of locations associated with the appointment.
+         * 
+         * If there are multiple locations with the same name, all matching locations will be removed even if only one was specified in locationIdentifiers.
+         * 
+         * [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>Compose</td></tr>
+         * </table>
+         * 
+         * @param locationIdentifiers The locations to be removed from the current list of locations.
+         * 
+         * @beta
+         */
+        removeAsync(locationIdentifiers: LocationIdentifier[]): void;
+    }
     /**
      * Represents a collection of entities found in an email message or appointment. Read mode only.
      *
@@ -9393,9 +11588,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface Entities {
         /**
@@ -9434,9 +11630,10 @@ declare namespace Office {
      * [Api set: Mailbox 1.7]
      * 
      * @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>
+     * <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>
      */
     interface From {
         /**
@@ -9449,13 +11646,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          * 
          * @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>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `getAsync(callback?: (result: Office.AsyncResult<EmailAddressDetails>) => void): void;`
+         * <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.
@@ -9474,14 +11668,32 @@ 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>Compose</td></tr></table>
+         * <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 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: Office.AsyncResult<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 {@link Office.EmailAddressDetails} in the asyncResult.value property.
+         * 
+         * [Api set: Mailbox 1.7]
+         * 
+         * @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>
+         */
+        getAsync(): void;
     }
 
     /**
@@ -9493,9 +11705,10 @@ declare namespace Office {
      * [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>
+     * <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
      */
@@ -9507,13 +11720,10 @@ declare namespace Office {
          * [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, this method also has the following signature:
-         * 
-         * `getAsync(names: string[], callback: (result: Office.AsyncResult<InternetHeaders>) => void): void;`
+         * <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 names - The names of the internet headers to be returned.
          * @param options - Optional. An object literal that contains one or more of the following properties:
@@ -9531,9 +11741,10 @@ declare namespace Office {
          * [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>
+         * <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 names - The names of the internet headers to be returned.
          * @param callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
@@ -9542,19 +11753,33 @@ declare namespace Office {
          * @beta
          */
         getAsync(names: string[], callback?: (result: Office.AsyncResult<InternetHeaders>) => void): void;
+        /**
+         * Given an array of internet header names, this method returns a dictionary containing those internet headers and their values. 
+         * If the add-in requests an x-header that is not available, that x-header will not be returned in the results. 
+         *
+         * [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 names - The names of the internet headers to be returned.
+         * 
+         * @beta
+         */
+        getAsync(names: string[]): void;
         /**
          * Given an array of internet header names, this method removes the specified headers from the internet header collection.
          *
          * [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>Compose</td></tr></table>
-         * 
-         * In addition to this signature, this method also has the following signature:
-         * 
-         * `removeAsync(names: string[], callback: (result: Office.AsyncResult<Body>) => void): void;`
+         * <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 names - The names of the internet headers to be removed.
          * @param options - Optional. An object literal that contains one or more of the following properties:
@@ -9571,9 +11796,10 @@ declare namespace Office {
          * [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>Compose</td></tr></table>
+         * <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 names - The names of the internet headers to be removed.
          * @param callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
@@ -9582,6 +11808,22 @@ declare namespace Office {
          * @beta
          */
         removeAsync(names: string[], callback?: (result: Office.AsyncResult<InternetHeaders>) => void): void;
+        /**
+         * Given an array of internet header names, this method removes the specified headers from the internet header collection.
+         *
+         * [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>Compose</td></tr>
+         * </table>
+         * 
+         * @param names - The names of the internet headers to be removed.
+         * 
+         * @beta
+         */
+        removeAsync(names: string[]): void;
         /**
          * Sets the specified internet headers to the specified values.
          * 
@@ -9591,14 +11833,11 @@ declare namespace Office {
          * [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>
+         * <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>
          *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
-         *
-         * In addition to this signature, this method also has the following signatures:
-         * 
-         * `setAsync(headers: string, callback: (result: Office.AsyncResult<void>) => void): void;`
-         * 
          * @param headers - The names and corresponding values of the headers to be set. Should be a dictionary object with keys being the names of the 
          *                internet headers and values being the values of the internet headers.
          * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -9618,9 +11857,10 @@ declare namespace Office {
          * [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>Compose</td></tr>
+         * <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 headers - The names and corresponding values of the headers to be set. Should be a dictionary object with keys being the names of the 
          *                internet headers and values being the values of the internet headers.
@@ -9630,6 +11870,82 @@ declare namespace Office {
          * @beta
          */
         setAsync(headers: Object, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Sets the specified internet headers to the specified values.
+         * 
+         * The setAsync method creates a new header if the specified header does not already exist; otherwise, the existing value is replaced with 
+         * the new 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>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 headers - The names and corresponding values of the headers to be set. Should be a dictionary object with keys being the names of the 
+         *                internet headers and values being the values of the internet headers.
+         * 
+         * @beta
+         */
+        setAsync(headers: Object): void;
+    }
+
+    /**
+     * Represents a location. Read only.
+     * 
+     * [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
+     */
+    export interface LocationDetails {
+        /**
+         * The LocationIdentifier of the location.
+         */
+        locationIdentifier: LocationIdentifier;
+        /**
+         * The location's display name.
+         */
+        displayName: string;
+        /**
+         * The email address associated with the location.
+         */
+        emailAddress: string;
+    }
+
+    /**
+     * Represents the id of a location.
+     * 
+     * [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
+     */
+    interface LocationIdentifier {
+        /**
+         * The location's unique id.
+         * 
+         * For **Room** type, it's the room's email address.
+         * 
+         * For **Custom** type, it's the displayName.
+         */
+        id: string;
+        /**
+         * The location's type.
+         */
+        type: MailboxEnums.LocationType;
     }
 
     /**
@@ -9639,9 +11955,10 @@ declare namespace Office {
      * [Api set: Mailbox 1.7]
      * 
      * @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>
+     * <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>
      */
     interface Organizer {
         /**
@@ -9650,9 +11967,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          * 
          * @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>
+         * <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.
@@ -9660,21 +11978,50 @@ declare namespace Office {
          *                  The `value` property of the result is message's organizer value, as an EmailAddressDetails object.
          */
         getAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<EmailAddressDetails>) => void): void;
+        /**
+         * Gets the organizer value of an appointment as an {@link Office.EmailAddressDetails} in the asyncResult.value property.
+         * 
+         * [Api set: Mailbox 1.7]
+         * 
+         * @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 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(callback?: (result: Office.AsyncResult<EmailAddressDetails>) => void): void;
+        /**
+         * Gets the organizer value of an appointment as an {@link Office.EmailAddressDetails} in the asyncResult.value property.
+         * 
+         * [Api set: Mailbox 1.7]
+         * 
+         * @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>
+         */
+        getAsync(): 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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface Appointment extends Item {
     }
     /**
      * 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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface AppointmentCompose extends Appointment, ItemCompose {
          /**
@@ -9684,37 +12031,12 @@ 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>
+         * <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>
          */
         body: Body;
-        /**
-         * 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>Appointment Organizer</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>Appointment Organizer</td></tr></table>
-         *
-         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
-         */
-        dateTimeModified: Date;
         /**
          * Gets or sets the date and time that the appointment is to end.
          *
@@ -9728,11 +12050,28 @@ 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>
+         * <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 or sets the locations of the appointment. The `enhancedLocation` property returns an {@link Office.EnhancedLocation} object that 
+         * provides methods to get, remove, or add locations on an item.
+         * 
+         * [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
+         */
+        enhancedLocation: EnhancedLocation;
         /**
          * Gets the type of item that an instance represents.
          *
@@ -9742,9 +12081,10 @@ 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>
+         * <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>
          */
         itemType: MailboxEnums.ItemType;
         /**
@@ -9755,9 +12095,10 @@ 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>
+         * <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;
         /**
@@ -9767,9 +12108,10 @@ 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>
+         * <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>
          */
         notificationMessages: NotificationMessages;
         /**
@@ -9781,9 +12123,10 @@ 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>
+         * <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;
         /**
@@ -9795,9 +12138,10 @@ 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>
+         * <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>
          */
         organizer: Organizer;
         /**
@@ -9806,18 +12150,19 @@ declare namespace Office {
          * 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**: 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 
+         * **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 1.7]
          * 
          * @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>
+         * <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>
          */
         recurrence: Recurrence;
         /**
@@ -9829,9 +12174,10 @@ 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>
+         * <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;
         /**
@@ -9840,7 +12186,7 @@ declare namespace Office {
          * 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. 
+         * **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}.
@@ -9852,9 +12198,10 @@ 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>
+         * <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>
          */
         seriesId: string;
         /**
@@ -9870,9 +12217,10 @@ 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>
+         * <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>
          */
         start: Time;
         /**
@@ -9886,9 +12234,10 @@ 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>
+         * <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>
          */
         subject: Subject;
         /**
@@ -9901,20 +12250,14 @@ declare namespace Office {
          * [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>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>
+         * <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>
          * 
-         * 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: Office.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.
@@ -9935,11 +12278,13 @@ declare namespace Office {
          * [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>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>
+         * <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 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.
@@ -9955,34 +12300,13 @@ declare namespace Office {
          * [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>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 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>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>
+         * <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 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.
@@ -10001,11 +12325,13 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -10019,6 +12345,57 @@ declare namespace Office {
          * @beta
          */
         addFileAttachmentFromBase64Async(base64File: string, attachmentName: string, options?: Office.AsyncContextOptions, callback?: (result: Office.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 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.
+         * 
+         * @beta
+         */
+        addFileAttachmentFromBase64Async(base64File: string, attachmentName: string, callback?: (result: Office.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.
+         * 
+         * @beta
+         */
+        addFileAttachmentFromBase64Async(base64File: string, attachmentName: string): void;
         /**
          * Adds an event handler for a supported event.
          * 
@@ -10029,13 +12406,10 @@ 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>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.AsyncResult<void>) => void): void;`
+         * <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. 
@@ -10056,9 +12430,10 @@ 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>
+         * <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. 
@@ -10067,6 +12442,26 @@ declare namespace Office {
          *                asyncResult, which is an Office.AsyncResult object.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.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.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+         * 
+         * [Api set: Mailbox 1.7]
+         *
+         * @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.
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: any): void;
         /**
          * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
          *
@@ -10083,20 +12478,12 @@ declare namespace Office {
          * [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>Appointment Organizer</td></tr>
-         *
-         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         * <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>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr>
+         * </table>
          * 
-         * In addition to this signature, this method also has the following signatures:
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string): void;`
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: Office.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.
@@ -10122,11 +12509,11 @@ declare namespace Office {
          * [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>Appointment Organizer</td></tr>
-         *
-         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         * <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>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.
@@ -10148,39 +12535,11 @@ declare namespace Office {
          * [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>Appointment Organizer</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>Appointment Organizer</td></tr>
-         *
-         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         * <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>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.
@@ -10197,16 +12556,17 @@ declare namespace Office {
          *
          * 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, 
+         * **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>Appointment Organizer</td></tr></table>
+         * <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 Organizer</td></tr>
+         * </table>
          */
         close(): void;
         /**
@@ -10216,9 +12576,10 @@ 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>Compose</td></tr></table>
+         * <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 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.
@@ -10230,17 +12591,52 @@ declare namespace Office {
          */
         getAttachmentsAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<AttachmentDetails[]>) => void): 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.
+         * Gets the item's attachments as an array.
          * 
          * [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>
+         * <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 - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. If the call fails, the asyncResult.error property will contain and error code with the reason for 
+         *                 the failure.
+         * 
+         * @beta
+         */
+        getAttachmentsAsync(callback?: (result: Office.AsyncResult<AttachmentDetails[]>) => void): void;
+        /**
+         * Gets the item's attachments as an array.
+         * 
+         * [Api set: Mailbox Preview]
          *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         * @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
+         */
+        getAttachmentsAsync(): 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}.
          *
@@ -10253,6 +12649,48 @@ declare namespace Office {
          * @beta
          */
         getInitializationContextAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<string>) => void): 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}.
+         *
+         * @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(callback?: (result: Office.AsyncResult<string>) => void): 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}.
+         *
+         * @beta
+         */
+        getInitializationContextAsync(): void;
         /**
          * Asynchronously returns selected data from the subject or body of a message.
          *
@@ -10269,9 +12707,10 @@ 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>ReadWriteItem</td></tr>
-         *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         * <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>
+         * </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.
@@ -10296,9 +12735,10 @@ 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>ReadWriteItem</td></tr>
-         *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         * <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>
+         * </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.
@@ -10321,9 +12761,10 @@ 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>
+         * <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.
@@ -10331,6 +12772,30 @@ declare namespace Office {
          *                    This object can be accessed by the asyncResult.asyncContext property in the callback function.
          */
         loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void, userContext?: any): 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.
+         */
+        loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void): void;
         /**
          * Removes an attachment from a message or appointment.
          *
@@ -10344,19 +12809,11 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signatures:
-         * 
-         * `removeAttachmentAsync(attachmentId: string): void;`
-         * 
-         * `removeAttachmentAsync(attachmentId: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `removeAttachmentAsync(attachmentId: string, callback: (result: Office.AsyncResult<void>) => void): void;`
+         * <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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr>
+         * </table>
          *
          * @param attachmentId - The identifier of the attachment to remove.
          * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -10378,39 +12835,15 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr>
+         * </table>
          *
          * @param attachmentId - The identifier of the attachment to remove.
          */
         removeAttachmentAsync(attachmentId: 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 an inline form then subsequently pops out the 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>Appointment Organizer</td></tr>
-         *
-         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
-         *
-         * @param attachmentId - The identifier of the attachment 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.
-         */
-        removeAttachmentAsync(attachmentId: string, options: Office.AsyncContextOptions): void;
         /**
          * Removes an attachment from a message or appointment.
          *
@@ -10425,11 +12858,11 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr>
+         * </table>
          *
          * @param attachmentId - The identifier of the attachment to remove.
          * @param callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
@@ -10447,13 +12880,10 @@ 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>
-        * 
-        * In addition to this signature, the method also has the following signature:
-        * 
-        * `removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;`
+        * <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 revoke the handler.
         * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -10472,15 +12902,34 @@ 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>
+        * <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 revoke the handler.
         * @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.
         */
        removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;
+       /**
+        * Removes the event handlers for a supported event type.
+        * 
+        * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+        * `Office.EventType.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+        * 
+        * [Api set: Mailbox 1.7]
+        *
+        * @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 revoke the handler.
+        */
+       removeHandlerAsync(eventType: Office.EventType): void;
         /**
          * Asynchronously saves an item.
          *
@@ -10492,11 +12941,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -10506,20 +12955,12 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>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: Office.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 of type Office.AsyncResult. 
@@ -10536,11 +12977,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -10550,49 +12991,14 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>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>Appointment Organizer</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.
          *
@@ -10603,11 +13009,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -10617,11 +13023,11 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>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.
          */
@@ -10637,20 +13043,12 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>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: Office.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.
@@ -10677,11 +13075,11 @@ 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>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>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>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.
@@ -10698,40 +13096,11 @@ 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>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>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>Appointment Organizer</td></tr>
-         *
-         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>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.
@@ -10744,8 +13113,9 @@ declare namespace Office {
     /**
      * 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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface AppointmentRead extends Appointment, ItemRead {
         /**
@@ -10755,11 +13125,12 @@ 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>
+         * <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>
          *
-         * <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 
+         * **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}.
          *
          */
@@ -10771,35 +13142,38 @@ 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 Attendee</td></tr></table>
+         * <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: Body;
         /**
-         * Gets the date and time that an item was created. Read mode only.
+         * Gets the date and time that an item was created.
          *
          * [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>
+         * <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>
          */
         dateTimeCreated: Date;
         /**
-         * Gets the date and time that an item was last modified. Read mode only.
+         * Gets the date and time that an item was last modified.
          *
          * [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>
+         * <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>
          *
-         * <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.
+         * **Note**: This member is not supported in Outlook for iOS or Outlook for Android.
          */
         dateTimeModified: Date;
         /**
@@ -10815,11 +13189,30 @@ 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 Attendee</td></tr></table>
+         * <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 locations of an appointment.
+         *
+         * The enhancedLocation property returns an {@link Office.EnhancedLocation} object that allows you to get the set of locations (each represented by 
+         * an {@link Office.LocationDetails} object) associated with the appointment.
+         * 
+         * [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
+         */
+        enhancedLocation: EnhancedLocation;
         /**
          * Gets the Exchange Web Services item class of the selected item.
          *
@@ -10830,9 +13223,10 @@ 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 Attendee</td></tr></table>
+         * <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>
          * 
          * The itemClass property specifies the message class of the selected item. The following are the default message classes for the message or appointment item.
          * 
@@ -10844,8 +13238,8 @@ declare namespace Office {
          *   </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>
+         *     <td>These are calendar items of the item class IPM.Appointment or IPM.Appointment.Occurrence.</td>
+         *     <td>IPM.Appointment,IPM.Appointment.Occurrence</td>
          *   </tr>
          *   <tr>
          *     <td>Message items</td>
@@ -10863,7 +13257,7 @@ declare namespace Office {
          * 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. 
+         * **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}.
@@ -10872,9 +13266,10 @@ 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 Attendee</td></tr></table>
+         * <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>
          */
         itemId: string;
         /**
@@ -10886,9 +13281,10 @@ 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 Attendee</td></tr></table>
+         * <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>
          */
         itemType: MailboxEnums.ItemType;
         /**
@@ -10900,9 +13296,10 @@ 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 Attendee</td></tr></table>
+         * <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;
         /**
@@ -10915,9 +13312,10 @@ 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 Attendee</td></tr></table>
+         * <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;
         /**
@@ -10927,9 +13325,10 @@ 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 Attendee</td></tr></table>
+         * <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: NotificationMessages;
         /**
@@ -10942,9 +13341,10 @@ 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 Attendee</td></tr></table>
+         * <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[];
         /**
@@ -10954,9 +13354,10 @@ 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 Attendee</td></tr></table>
+         * <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;
         /**
@@ -10965,18 +13366,19 @@ declare namespace Office {
          * 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**: 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 
+         * **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 1.7]
          * 
          * @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>
+         * <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>
          */
         recurrence: Recurrence;
         /**
@@ -10989,9 +13391,10 @@ 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 Attendee</td></tr></table>
+         * <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[];
         /**
@@ -11004,9 +13407,10 @@ 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 Attendee</td></tr></table>
+         * <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;
         /**
@@ -11015,7 +13419,7 @@ declare namespace Office {
          * 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. 
+         * **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}.
@@ -11027,9 +13431,10 @@ 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 Attendee</td></tr></table>
+         * <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>
          */
         seriesId: string;
         /**
@@ -11043,9 +13448,10 @@ 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 Attendee</td></tr></table>
+         * <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>
          */
         subject: string;
 
@@ -11059,13 +13465,10 @@ 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 Attendee</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.AsyncResult<void>) => void): void;`
+         * <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. 
@@ -11076,7 +13479,6 @@ declare namespace Office {
          *                asyncResult, which is an Office.AsyncResult object.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, options?: any, callback?: (result: Office.AsyncResult<void>) => void): void;
-
         /**
          * Adds an event handler for a supported event.
          * 
@@ -11087,9 +13489,10 @@ 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 Attendee</td></tr></table>
+         * <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. 
@@ -11098,6 +13501,26 @@ declare namespace Office {
          *                asyncResult, which is an Office.AsyncResult object.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.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.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+         * 
+         * [Api set: Mailbox 1.7]
+         *
+         * @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.
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: any): 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.
@@ -11110,18 +13533,46 @@ declare namespace Office {
          * 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.
+         * **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>Appointment Attendee</td></tr></table>
+         * <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 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
+         *                   OR an {@link Office.ReplyFormData} object that contains body or attachment data and a callback function.
+         * @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.
+         */
+        displayReplyAllForm(formData: string | ReplyFormData, callback?: (result: Office.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>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 an {@link Office.ReplyFormData} object that contains body or attachment data and a callback function.
          */
         displayReplyAllForm(formData: string | ReplyFormData): void;
         /**
@@ -11135,38 +13586,63 @@ declare namespace Office {
          * 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.
+         * **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>
+         * <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>
          *
-         * <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 an {@link Office.ReplyFormData} object that contains body or attachment data and a callback function.
+         * @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.
+         */
+        displayReplyForm(formData: string | ReplyFormData, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Displays a reply form that includes only the sender of the selected message or the organizer of the selected appointment.
          *
-         * @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.
+         * 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>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 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 
+         * **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 Attendee</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `getInitializationContextAsync(callback?: (result: Office.AsyncResult<string>) => void): void;`
+         * <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 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.
@@ -11182,15 +13658,16 @@ declare namespace Office {
         /**
          * 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
          *
-         * <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>
+         * <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 - 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. 
@@ -11201,24 +13678,42 @@ declare namespace Office {
          * @beta
          */
         getInitializationContextAsync(callback?: (result: Office.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>Appointment Attendee</td></tr>
+         * </table>
+         * 
+         * @beta
+         */
+        getInitializationContextAsync(): 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.
+         * **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>Appointment Attendee</td></tr></table>
+         * <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>
          */
         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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          * 
@@ -11230,9 +13725,10 @@ declare namespace Office {
          * 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>
+         * <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.
          * 
@@ -11240,7 +13736,7 @@ declare namespace Office {
          *   <tr>
          *     <th>Value of entityType</th>
          *     <th>Type of objects in returned array</th>
-         *     <th>Required Permission Leve</th>
+         *     <th>Required Permission Level</th>
          *   </tr>
          *   <tr>
          *     <td>Address</td>
@@ -11286,15 +13782,16 @@ declare namespace Office {
          * 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.
+         * **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>Appointment Attendee</td></tr></table>
+         * <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 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, 
@@ -11316,7 +13813,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
@@ -11327,9 +13824,10 @@ 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 Attendee</td></tr></table>
+         * <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>
          */
         getRegExMatches(): any;
         /**
@@ -11342,7 +13840,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
@@ -11351,9 +13849,10 @@ 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 Attendee</td></tr></table>
+         * <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 name - The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
          */
@@ -11361,15 +13860,16 @@ declare namespace Office {
         /**
          * 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.
+         * **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>Appointment Attendee</td></tr></table>
+         * <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 name - The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
          */
@@ -11388,7 +13888,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.6]
          *
@@ -11399,9 +13899,10 @@ 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 Attendee</td></tr></table>
+         * <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>
          */
         getSelectedRegExMatches(): any;
        /**
@@ -11419,9 +13920,10 @@ 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 Attendee</td></tr></table>
+        * <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.
@@ -11429,6 +13931,30 @@ declare namespace Office {
         *                    This object can be accessed by the asyncResult.asyncContext property in the callback function.
         */
        loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void, userContext?: any): 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 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.
+        */
+       loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void): void;
 
        /**
         * Removes the event handlers for a supported event type.
@@ -11440,13 +13966,10 @@ 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 Attendee</td></tr></table>
-        * 
-        * In addition to this signature, the method also has the following signature:
-        * 
-        * `removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;`
+        * <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 revoke the handler.
         * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -11465,15 +13988,34 @@ 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 Attendee</td></tr></table>
+        * <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 revoke the handler.
         * @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.
         */
        removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void; 
+       /**
+        * Removes the event handlers for a supported event type.
+        * 
+        * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+        * `Office.EventType.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+        * 
+        * [Api set: Mailbox 1.7]
+        *
+        * @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 revoke the handler.
+        */
+       removeHandlerAsync(eventType: Office.EventType): void; 
     }
 
     /**
@@ -11483,9 +14025,10 @@ declare namespace Office {
      * [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>
+     * <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 Item {
         /**
@@ -11495,37 +14038,12 @@ 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>Compose or read</td></tr></table>
+         * <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: Body;
-        /**
-         * 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>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>Read</td></tr></table>
-         *
-         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
-         */
-        dateTimeModified: Date;
         /**
          * Gets the type of item that an instance represents.
          *
@@ -11536,9 +14054,10 @@ 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>Compose or read</td></tr></table>
+         * <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: MailboxEnums.ItemType;
         /**
@@ -11548,42 +14067,20 @@ 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>Compose or read</td></tr></table>
+         * <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: 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 1.7]
-         * 
-         * @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>
-         */
-        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. 
+         * **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}.
@@ -11595,9 +14092,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         seriesId: string;
 
@@ -11611,13 +14109,10 @@ 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>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: Office.AsyncResult<void>) => void): void;`
+         * <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. 
@@ -11639,9 +14134,10 @@ 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>Compose or read</td></tr></table>
+         * <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. 
@@ -11652,7 +14148,28 @@ declare namespace Office {
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.AsyncResult<void>) => void): void;
 
         /**
-         * Gets an attachment from a message or appointment and returns it as an `AttachmentContent` object.
+         * Adds an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+         * 
+         * [Api set: Mailbox 1.7]
+         *
+         * @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.
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: any): void;
+
+        /**
+         * Gets an attachment from a message or appointment and returns it as an **AttachmentContent** object.
          * 
          * The `getAttachmentContentAsync` method gets the attachment with the specified identifier from the item. As a best practice, you should use 
          * the identifier to retrieve an attachment in the same session that the attachmentIds were retrieved with the `getAttachmentsAsync` or 
@@ -11664,11 +14181,11 @@ 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>Compose or read</td></tr>
-         * 
-         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * <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>
+         *   <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr>
+         * </table>
          * 
          * @param attachmentId - The identifier of the attachment you want to get. 
          * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -11680,24 +14197,74 @@ declare namespace Office {
          * @beta
          */
         getAttachmentContentAsync(attachmentId: string, options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<AttachmentContent>) => void): void;
+
+        /**
+         * Gets an attachment from a message or appointment and returns it as an **AttachmentContent** object.
+         * 
+         * The `getAttachmentContentAsync` method gets the attachment with the specified identifier from the item. As a best practice, you should use 
+         * the identifier to retrieve an attachment in the same session that the attachmentIds were retrieved with the `getAttachmentsAsync` or 
+         * `item.attachments` call. 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 an inline form then subsequently pops out the form to 
+         * continue in a separate window.
+         * 
+         * [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>
+         *   <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr>
+         * </table>
+         * 
+         * @param attachmentId - The identifier of the attachment you want to get. 
+         * 
+         * @beta
+         */
+        getAttachmentContentAsync(attachmentId: string): void;
+
+        /**
+         * Gets an attachment from a message or appointment and returns it as an **AttachmentContent** object.
+         * 
+         * The `getAttachmentContentAsync` method gets the attachment with the specified identifier from the item. As a best practice, you should use 
+         * the identifier to retrieve an attachment in the same session that the attachmentIds were retrieved with the `getAttachmentsAsync` or 
+         * `item.attachments` call. 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 an inline form then subsequently pops out the form to 
+         * continue in a separate window.
+         * 
+         * [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>
+         *   <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr>
+         * </table>
+         * 
+         * @param attachmentId - The identifier of the attachment you want to get. 
+         * @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. If the call fails, the asyncResult.error property will contain and error code 
+         *                 with the reason for the failure.
+         * 
+         * @beta
+         */
+        getAttachmentContentAsync(attachmentId: string, callback?: (result: Office.AsyncResult<AttachmentContent>) => 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 
+         * **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 Attendee</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `getInitializationContextAsync(callback?: (result: Office.AsyncResult<string>) => void): void;`
+         * <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 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.
@@ -11710,6 +14277,50 @@ declare namespace Office {
          * @beta
          */
         getInitializationContextAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.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>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 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: Office.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>Compose or Read</td></tr>
+         * </table>
+         * 
+         * @beta
+         */
+        getInitializationContextAsync(): void;
 
        /**
         * Gets the properties of an appointment or message in a shared folder, calendar, or mailbox.
@@ -11717,14 +14328,11 @@ declare namespace Office {
         * [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>
+        * <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, this method also has the following signature:
-        * 
-        * `getAsync(callback: (result: Office.AsyncResult<SharedProperties>) => 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 
@@ -11741,9 +14349,10 @@ declare namespace Office {
         * [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>
+        * <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.
@@ -11768,9 +14377,10 @@ 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>Compose or read</td></tr></table>
+        * <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.
@@ -11779,6 +14389,31 @@ declare namespace Office {
         */
        loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void, userContext?: any): 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.
+        */
+       loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void): void;
+
        /**
         * Removes the event handlers for a supported event type.
         * 
@@ -11789,13 +14424,10 @@ 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>Compose or read</td></tr></table>
-        * 
-        * In addition to this signature, the method also has the following signature:
-        * 
-        * `removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;`
+        * <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 revoke the handler.
         * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -11815,21 +14447,42 @@ 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>Compose or read</td></tr></table>
+        * <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 revoke the handler.
         * @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.
         */
        removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;
+
+       /**
+        * Removes the event handlers for a supported event type.
+        * 
+        * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+        * `Office.EventType.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+        * 
+        * [Api set: Mailbox 1.7]
+        *
+        * @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 revoke the handler.
+        */
+       removeHandlerAsync(eventType: Office.EventType): 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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface ItemCompose extends Item {
         /**
@@ -11843,9 +14496,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         subject: Subject;
         /**
@@ -11858,20 +14512,14 @@ declare namespace Office {
          * [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>
+         * <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>
          * 
-         * 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: Office.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.
@@ -11894,11 +14542,13 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -11914,35 +14564,13 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -11963,11 +14591,13 @@ declare namespace Office {
          * [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>
+         * <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 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.
@@ -11981,6 +14611,57 @@ declare namespace Office {
          * @beta
          */
         addFileAttachmentFromBase64Async(base64File: string, attachmentName: string, options?: Office.AsyncContextOptions, callback?: (result: Office.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>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 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 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.
+         * 
+         * @beta
+         */
+        addFileAttachmentFromBase64Async(base64File: string, attachmentName: string, callback?: (result: Office.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>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 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.
+         * 
+         * @beta
+         */
+        addFileAttachmentFromBase64Async(base64File: string, attachmentName: string): void;
 
         /**
          * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
@@ -11998,20 +14679,12 @@ declare namespace Office {
          * [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>
+         * <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 this signature, this method also has the following signatures:
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string): void;`
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: Office.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.
@@ -12038,11 +14711,11 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -12064,39 +14737,11 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -12115,16 +14760,17 @@ declare namespace Office {
          *
          * 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, 
+         * **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>
+         * <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;
         /**
@@ -12134,9 +14780,10 @@ 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>Compose</td></tr></table>
+         * <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 - 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.
@@ -12148,17 +14795,52 @@ declare namespace Office {
          */
         getAttachmentsAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<AttachmentDetails[]>) => void): 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.
+         * Gets the item's attachments as an array.
          * 
          * [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>
+         * <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 callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. If the call fails, the asyncResult.error property will contain and error code with the reason for 
+         *                 the failure.
+         * 
+         * @beta
+         */
+        getAttachmentsAsync(callback?: (result: Office.AsyncResult<AttachmentDetails[]>) => void): void;
+        /**
+         * Gets the item's attachments as an array.
+         * 
+         * [Api set: Mailbox Preview]
          *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         * @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
+         */
+        getAttachmentsAsync(): 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>Compose</td></tr>
+         * </table>
          *
          * More information on {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | actionable messages}.
          *
@@ -12174,38 +14856,56 @@ declare namespace Office {
          */
         getInitializationContextAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<string>) => void): void;
         /**
-         * Asynchronously returns selected data from the subject or body of a message.
+         * Gets initialization data passed when the add-in is activated by an actionable 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.
+         * **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>ReadWriteItem</td></tr>
+         * <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>
          *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
+         * More information on {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | actionable messages}.
          *
-         * @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.
+         * @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
          */
-        getSelectedDataAsync(coercionType: Office.CoercionType, callback: (result: Office.AsyncResult<any>) => void): void;
+        getInitializationContextAsync(callback?: (result: Office.AsyncResult<string>) => void): 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>Compose</td></tr>
+         * </table>
+         *
+         * More information on {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | actionable messages}.
+         *
+         * @beta
+         */
+        getInitializationContextAsync(): 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 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]
@@ -12215,9 +14915,10 @@ 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>ReadWriteItem</td></tr>
-         *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
+         * <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.
@@ -12227,6 +14928,33 @@ declare namespace Office {
          *                 type Office.AsyncResult.
          */
         getSelectedDataAsync(coercionType: Office.CoercionType, options: Office.AsyncContextOptions, callback: (result: Office.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 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: Office.AsyncResult<any>) => void): void;
         /**
          * Removes an attachment from a message or appointment.
          *
@@ -12240,20 +14968,12 @@ 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>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>
+         * <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(attachmentId: string): void;`
-         * 
-         * `removeAttachmentAsync(attachmentId: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `removeAttachmentAsync(attachmentId: string, callback: (result: Office.AsyncResult<void>) => void): void;`
-         *
          * @param attachmentId - The identifier of the attachment 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.
@@ -12275,11 +14995,11 @@ 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>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>
+         * <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 attachmentId - The identifier of the attachment to remove.
          */
@@ -12297,11 +15017,11 @@ 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>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>
+         * <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 attachmentId - The identifier of the attachment to remove.
          * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -12321,11 +15041,11 @@ 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>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>
+         * <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 attachmentId - The identifier of the attachment to remove.
          * @param callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
@@ -12345,11 +15065,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -12359,20 +15079,12 @@ 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>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>
+         * <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: Office.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 
@@ -12391,11 +15103,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -12405,11 +15117,11 @@ 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>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>
+         * <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;
@@ -12424,11 +15136,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -12438,46 +15150,11 @@ 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>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>
+         * <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. 
@@ -12495,20 +15172,12 @@ 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>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>
+         * <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: Office.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.
@@ -12535,11 +15204,11 @@ 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>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>
+         * <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.
@@ -12556,41 +15225,11 @@ 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>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>
+         * <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.
@@ -12602,8 +15241,9 @@ declare namespace Office {
     /**
      * 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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface ItemRead extends Item {
         /**
@@ -12612,11 +15252,12 @@ declare namespace Office {
          * [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>
+         * <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>
          *
-         * <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. 
+         * **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}.
          *
@@ -12633,9 +15274,10 @@ 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>Read</td></tr></table>
+         * <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.
@@ -12648,8 +15290,8 @@ declare namespace Office {
          *   </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>
+         *     <td>These are calendar items of the item class IPM.Appointment or IPM.Appointment.Occurrence.</td>
+         *     <td>IPM.Appointment,IPM.Appointment.Occurrence</td>
          *   </tr>
          *   <tr>
          *     <td>Message items</td>
@@ -12666,7 +15308,7 @@ declare namespace Office {
          * 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. 
+         * **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}.
@@ -12675,9 +15317,10 @@ 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>Read</td></tr></table>
+         * <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;
         /**
@@ -12690,9 +15333,10 @@ 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>Read</td></tr></table>
+         * <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;
         /**
@@ -12706,9 +15350,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         subject: string;
         /**
@@ -12723,18 +15368,46 @@ declare namespace Office {
          * 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.
+         * **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>
+         * <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
+         *                   OR an {@link Office.ReplyFormData} object that contains body or attachment data and a callback function.
+         * @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.
+         */
+        displayReplyAllForm(formData: string | ReplyFormData, callback?: (result: Office.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>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;
         /**
@@ -12748,38 +15421,63 @@ declare namespace Office {
          * 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.
+         * **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>
+         * <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>
          *
-         * <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.
+         * @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.
+         */
+        displayReplyForm(formData: string | ReplyFormData, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Displays a reply form that includes only the sender of the selected message or the organizer of the selected appointment.
          *
-         * @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.
+         * 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 
+         * **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: Office.AsyncResult<string>) => void): void;`
+         * <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 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.
@@ -12795,16 +15493,17 @@ declare namespace Office {
         /**
          * 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 
+         * **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>
+         * <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. 
@@ -12815,24 +15514,43 @@ declare namespace Office {
          * @beta
          */
         getInitializationContextAsync(callback?: (result: Office.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>
+         * 
+         * @beta
+         */
+        getInitializationContextAsync(): 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.
+         * **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>
+         * <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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          * 
@@ -12844,9 +15562,10 @@ declare namespace Office {
          * 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>
+         * <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.
@@ -12855,7 +15574,7 @@ declare namespace Office {
          *   <tr>
          *     <th>Value of entityType</th>
          *     <th>Type of objects in returned array</th>
-         *     <th>Required Permission Leve</th>
+         *     <th>Required Permission Level</th>
          *   </tr>
          *   <tr>
          *     <td>Address</td>
@@ -12901,15 +15620,16 @@ declare namespace Office {
          * 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.
+         * **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>
+         * <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, 
@@ -12931,7 +15651,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
@@ -12942,9 +15662,10 @@ 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>Read</td></tr></table>
+         * <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;
         /**
@@ -12957,7 +15678,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
@@ -12966,9 +15687,10 @@ 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>Read</td></tr></table>
+         * <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.
          */
@@ -12976,15 +15698,16 @@ declare namespace Office {
         /**
          * 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.
+         * **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>
+         * <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.
          */
@@ -13001,7 +15724,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.6]
          *
@@ -13012,17 +15735,19 @@ 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>Read</td></tr></table>
+         * <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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface Message extends Item {
         /**
@@ -13039,9 +15764,10 @@ 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>Compose or read</td></tr></table>
+         * <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;
     }
@@ -13049,8 +15775,9 @@ declare namespace Office {
      /**
      * 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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface MessageCompose extends Message, ItemCompose {
         /**
@@ -13060,9 +15787,10 @@ 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>Message Compose</td></tr></table>
+         * <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;
         /**
@@ -13072,25 +15800,27 @@ 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>Message Compose</td></tr></table>
+         * <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: 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 cc property returns an {@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>
+         * <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;
         /**
@@ -13107,37 +15837,12 @@ 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>Message Compose</td></tr></table>
+         * <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.
-         */
-        dateTimeModified: Date;
         /**
          * Gets the email address of the sender of a message.
          *
@@ -13150,9 +15855,10 @@ 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>Message Compose</td></tr></table>
+         * <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>
          */
         from: From;
         /**
@@ -13164,9 +15870,10 @@ 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>Message Compose</td></tr></table>
+         * <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
          */
@@ -13181,9 +15888,10 @@ 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>Message Compose</td></tr></table>
+         * <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: MailboxEnums.ItemType;
         /**
@@ -13193,40 +15901,19 @@ 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>Message Compose</td></tr></table>
+         * <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: 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 1.7]
-         * 
-         * @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>
-         */
-        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. 
+         * **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}.
@@ -13238,9 +15925,10 @@ 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>Message Compose</td></tr></table>
+         * <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>
          */
         seriesId: string;
         /**
@@ -13254,9 +15942,10 @@ 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>Message Compose</td></tr></table>
+         * <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;
         /**
@@ -13269,9 +15958,10 @@ 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>Message Compose</td></tr></table>
+         * <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>
          */
         to: Recipients;
 
@@ -13285,20 +15975,14 @@ declare namespace Office {
          * [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>
+         * <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: Office.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.
@@ -13321,11 +16005,13 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -13341,34 +16027,13 @@ declare namespace Office {
          * [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: 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>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>
+         * <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.
@@ -13388,11 +16053,13 @@ declare namespace Office {
          * [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>
+         * <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 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.
@@ -13406,6 +16073,33 @@ declare namespace Office {
          * @beta
          */
         addFileAttachmentFromBase64Async(base64File: string, attachmentName: string, options?: Office.AsyncContextOptions, callback?: (result: Office.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>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 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 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.
+         * 
+         * @beta
+         */
+        addFileAttachmentFromBase64Async(base64File: string, attachmentName: string, callback?: (result: Office.AsyncResult<string>) => void): void;
         /**
          * Adds an event handler for a supported event.
          * 
@@ -13416,13 +16110,10 @@ 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>Message Compose</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.AsyncResult<void>) => void): void;`
+         * <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. 
@@ -13443,9 +16134,10 @@ 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>Message Compose</td></tr></table>
+         * <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. 
@@ -13454,6 +16146,26 @@ declare namespace Office {
          *                asyncResult, which is an Office.AsyncResult object.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.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.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+         * 
+         * [Api set: Mailbox 1.7]
+         *
+         * @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.
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: any): void;
         /**
          * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
          *
@@ -13470,20 +16182,12 @@ declare namespace Office {
          * [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>
+         * <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 this signature, this method also has the following signatures:
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string): void;`
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: Office.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.
@@ -13510,11 +16214,11 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -13536,39 +16240,11 @@ declare namespace Office {
          * [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>
+         * <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.
@@ -13586,16 +16262,17 @@ declare namespace Office {
          *
          * 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, 
+         * **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>
+         * <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;
         /**
@@ -13605,9 +16282,10 @@ 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>Compose</td></tr></table>
+         * <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 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.
@@ -13618,19 +16296,54 @@ declare namespace Office {
          * @beta
          */
         getAttachmentsAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<AttachmentDetails[]>) => void): void;
+        /**
+         * Gets the item's attachments as an array.
+         * 
+         * [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 callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. If the call fails, the asyncResult.error property will contain and error code with the reason for 
+         *                 the failure.
+         * 
+         * @beta
+         */
+        getAttachmentsAsync(callback?: (result: Office.AsyncResult<AttachmentDetails[]>) => void): void;
+        /**
+         * Gets the item's attachments as an array.
+         * 
+         * [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
+         */
+        getAttachmentsAsync(): 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 
+         * **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>
+         * <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}.
          *
@@ -13646,31 +16359,51 @@ declare namespace Office {
          */
         getInitializationContextAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<string>) => void): void;
         /**
-         * Asynchronously returns selected data from the subject or body of a message.
+         * Gets initialization data passed when the add-in is activated by an actionable 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.
+         * **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>ReadWriteItem</td></tr>
+         * <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>
          *
-         * <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 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.
+         * @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
          */
-        getSelectedDataAsync(coercionType: Office.CoercionType, callback: (result: Office.AsyncResult<any>) => void): void;
+        getInitializationContextAsync(callback?: (result: Office.AsyncResult<string>) => void): 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}.
+         *
+         * @beta
+         */
+        getInitializationContextAsync(): void;
         /**
          * Asynchronously returns selected data from the subject or body of a message.
          *
@@ -13687,9 +16420,10 @@ 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>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>
+         * <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.
@@ -13699,6 +16433,33 @@ declare namespace Office {
          *                 type Office.AsyncResult.
          */
         getSelectedDataAsync(coercionType: Office.CoercionType, options: Office.AsyncContextOptions, callback: (result: Office.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 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: Office.AsyncResult<any>) => void): void;
         /**
          * Asynchronously loads custom properties for this add-in on the selected item.
          *
@@ -13714,9 +16475,10 @@ 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>Message Compose</td></tr></table>
+         * <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 callback - When the method completes, the function passed in the callback parameter is called with a single parameter of 
          *                 type Office.AsyncResult.
@@ -13724,6 +16486,30 @@ declare namespace Office {
          *                    This object can be accessed by the asyncResult.asyncContext property in the callback function.
          */
         loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void, userContext?: any): 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>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.
+         */
+        loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void): void;
         /**
          * Removes an attachment from a message or appointment.
          *
@@ -13737,20 +16523,12 @@ 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>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>
+         * <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(attachmentId: string): void;`
-         * 
-         * `removeAttachmentAsync(attachmentId: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `removeAttachmentAsync(attachmentId: string, callback: (result: Office.AsyncResult<void>) => void): void;`
-         *
          * @param attachmentId - The identifier of the attachment 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.
@@ -13772,11 +16550,11 @@ 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>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>
+         * <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 attachmentId - The identifier of the attachment to remove.
          */
@@ -13794,35 +16572,11 @@ 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>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 attachmentId - The identifier of the attachment 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.
-         */
-        removeAttachmentAsync(attachmentId: 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 an inline form then subsequently pops out the 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>
+         * <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 attachmentId - The identifier of the attachment to remove.
          * @param callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
@@ -13840,13 +16594,10 @@ 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>Message Compose</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;`
+         * <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 revoke the handler.
          * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -13865,15 +16616,35 @@ 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>Message Compose</td></tr></table>
+         * <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 revoke the handler.
          * @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.
          */
         removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Removes the event handlers for a supported event type.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+         * 
+         * [Api set: Mailbox 1.7]
+         *
+         * @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 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.
+         */
+        removeHandlerAsync(eventType: Office.EventType): void;
         /**
          * Asynchronously saves an item.
          *
@@ -13885,11 +16656,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -13899,20 +16670,12 @@ 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>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>
+         * <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: Office.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 
@@ -13930,11 +16693,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -13944,48 +16707,14 @@ 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>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>
+         * <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.
          *
@@ -13997,11 +16726,11 @@ declare namespace Office {
          * 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 
+         * **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:
+         * **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.
          *
@@ -14011,11 +16740,11 @@ 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>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>
+         * <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. 
@@ -14032,20 +16761,12 @@ 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>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>
+         * <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: Office.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.
@@ -14071,11 +16792,11 @@ 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>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>
+         * <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.
@@ -14092,40 +16813,11 @@ 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>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>
+         * <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.
@@ -14137,8 +16829,9 @@ declare namespace Office {
     /**
      * 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.
+     * **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
+     * {@link https://docs.microsoft.com/office/dev/add-ins/reference/objectmodel/preview-requirement-set/office.context.mailbox.item | Object Model} page for more information.
      */
     interface MessageRead extends Message, ItemRead {
         /**
@@ -14148,11 +16841,12 @@ 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>Message Read</td></tr></table>
+         * <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. 
+         * **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}.
          *
@@ -14165,9 +16859,10 @@ 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>Message Read</td></tr></table>
+         * <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: Body;
         /**
@@ -14181,9 +16876,10 @@ 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>Message Read</td></tr></table>
+         * <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[];
         /**
@@ -14200,35 +16896,38 @@ 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>Message Read</td></tr></table>
+         * <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.
+         * Gets the date and time that an item was created.
          *
          * [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>
+         * <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.
+         * Gets the date and time that an item was last modified.
          *
          * [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>
+         * <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>
          *
-         * <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.
+         * **Note**: This member is not supported in Outlook for iOS or Outlook for Android.
          */
         dateTimeModified: Date;
         /**
@@ -14237,7 +16936,7 @@ declare namespace Office {
          * 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.
+         * **Note**: The recipientType property of the EmailAddressDetails object in the from property is undefined.
          * 
          * The from property returns an EmailAddressDetails object.
          * 
@@ -14245,9 +16944,10 @@ 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>Message Read</td></tr></table>
+         * <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>
          */
         from: EmailAddressDetails;
         /**
@@ -14259,9 +16959,10 @@ 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>Message Read</td></tr></table>
+         * <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
          */
@@ -14273,9 +16974,10 @@ 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>Message Read</td></tr></table>
+         * <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>
          */
         internetMessageId: string;
         /**
@@ -14288,9 +16990,10 @@ 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>Message Read</td></tr></table>
+         * <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.
@@ -14303,8 +17006,8 @@ declare namespace Office {
          *   </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>
+         *     <td>These are calendar items of the item class IPM.Appointment or IPM.Appointment.Occurrence.</td>
+         *     <td>IPM.Appointment,IPM.Appointment.Occurrence</td>
          *   </tr>
          *   <tr>
          *     <td>Message items</td>
@@ -14322,7 +17025,7 @@ declare namespace Office {
          * 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. 
+         * **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}.
@@ -14331,9 +17034,10 @@ 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>Message Read</td></tr></table>
+         * <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;
         /**
@@ -14346,9 +17050,10 @@ 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>Message Read</td></tr></table>
+         * <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: MailboxEnums.ItemType;
         /**
@@ -14362,9 +17067,10 @@ 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>Message Read</td></tr></table>
+         * <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;
         /**
@@ -14374,9 +17080,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         notificationMessages: NotificationMessages;
         /**
@@ -14387,18 +17094,19 @@ declare namespace Office {
          * 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**: 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 
+         * **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 1.7]
          * 
          * @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>
+         * <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>
          */
         recurrence: Recurrence;
         /**
@@ -14407,7 +17115,7 @@ declare namespace Office {
          * 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. 
+         * **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}.
@@ -14419,9 +17127,10 @@ 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>Message Read</td></tr></table>
+         * <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>
          */
         seriesId: string;
         /**
@@ -14430,15 +17139,16 @@ declare namespace Office {
          * 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.
+         * **Note**: The recipientType property of the EmailAddressDetails object in the sender property is undefined.
          *
          * [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>
+         * <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>
          */
         sender: EmailAddressDetails;
         /**
@@ -14452,9 +17162,10 @@ 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>Message Read</td></tr></table>
+         * <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>
          */
         subject: string;
         /**
@@ -14468,9 +17179,10 @@ 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>Message Read</td></tr></table>
+         * <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[];
 
@@ -14484,13 +17196,10 @@ 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>Message Read</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.AsyncResult<void>) => void): void;`
+         * <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. 
@@ -14501,7 +17210,6 @@ declare namespace Office {
          *                asyncResult, which is an Office.AsyncResult object.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, options?: any, callback?: (result: Office.AsyncResult<void>) => void): void;
-
         /**
          * Adds an event handler for a supported event.
          * 
@@ -14512,9 +17220,10 @@ 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>Message Read</td></tr></table>
+         * <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. 
@@ -14523,6 +17232,26 @@ declare namespace Office {
          *                asyncResult, which is an Office.AsyncResult object.
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: Office.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.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+         * 
+         * [Api set: Mailbox 1.7]
+         *
+         * @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.
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: any): 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.
@@ -14535,18 +17264,46 @@ declare namespace Office {
          * 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.
+         * **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>
+         * <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
+         *                   OR an {@link Office.ReplyFormData} object that contains body or attachment data and a callback function.
+         * @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.
+         */
+        displayReplyAllForm(formData: string | ReplyFormData, callback?: (result: Office.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;
         /**
@@ -14560,39 +17317,64 @@ declare namespace Office {
          * 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.
+         * **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>
+         * <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>
          *
-         * <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.
+         * @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.
+         */
+        displayReplyForm(formData: string | ReplyFormData, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Displays a reply form that includes only the sender of the selected message or the organizer of the selected appointment.
          *
-         * @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.
+         * 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 
+         * **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: Office.AsyncResult<string>) => void): void;`
+         * <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 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.
@@ -14609,16 +17391,17 @@ declare namespace Office {
          * 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 
+         * **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>
+         * <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. 
@@ -14629,24 +17412,44 @@ declare namespace Office {
          * @beta
          */
         getInitializationContextAsync(callback?: (result: Office.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>
+         * 
+         * @beta
+         */
+        getInitializationContextAsync(): 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.
+         * **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>
+         * <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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
@@ -14659,9 +17462,10 @@ 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>Restricted</td></tr>
-         *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         * <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 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.
@@ -14670,7 +17474,7 @@ declare namespace Office {
          *   <tr>
          *     <th>Value of entityType</th>
          *     <th>Type of objects in returned array</th>
-         *     <th>Required Permission Leve</th>
+         *     <th>Required Permission Level</th>
          *   </tr>
          *   <tr>
          *     <td>Address</td>
@@ -14716,15 +17520,16 @@ declare namespace Office {
          * 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.
+         * **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>
+         * <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, 
@@ -14746,7 +17551,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
@@ -14757,9 +17562,10 @@ 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>Message Read</td></tr></table>
+         * <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;
         /**
@@ -14772,7 +17578,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
@@ -14781,9 +17587,10 @@ 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>Message Read</td></tr></table>
+         * <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.
          */
@@ -14791,15 +17598,16 @@ declare namespace Office {
         /**
          * 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.
+         * **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>
+         * <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.
          */
@@ -14818,7 +17626,7 @@ declare namespace Office {
          * 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.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.6]
          *
@@ -14829,9 +17637,10 @@ 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>Message Read</td></tr></table>
+         * <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;
         /**
@@ -14849,9 +17658,10 @@ 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>Message Read</td></tr></table>
+         * <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.
@@ -14859,6 +17669,30 @@ declare namespace Office {
          *                    This object can be accessed by the asyncResult.asyncContext property in the callback function.
          */
         loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void, userContext?: any): 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>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.
+         */
+        loadCustomPropertiesAsync(callback: (result: Office.AsyncResult<CustomProperties>) => void): void;
         /**
          * Removes the event handlers for a supported event type.
          * 
@@ -14869,13 +17703,10 @@ 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>Message Read</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;`
+         * <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 revoke the handler.
          * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -14894,15 +17725,34 @@ 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>Message Read</td></tr></table>
+         * <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 revoke the handler.
          * @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.
          */
         removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Removes the event handlers for a supported event type.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrenceChanged`. In Preview, `Office.EventType.AttachmentsChanged` is also supported.
+         * 
+         * [Api set: Mailbox 1.7]
+         *
+         * @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 revoke the handler.
+         */
+        removeHandlerAsync(eventType: Office.EventType): void;
     }
 
     /**
@@ -14912,9 +17762,10 @@ 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>Read</td></tr></table>
+     * <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>
      */
     interface LocalClientTime {
         /**
@@ -14956,9 +17807,10 @@ declare namespace Office {
      * [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</td></tr></table>
+     * <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>
      */
     interface Location {
         /**
@@ -14975,14 +17827,10 @@ declare namespace Office {
          * [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</td></tr></table>
-         * 
-         * In addition to this signature, the method also has the following signature:
-         * 
-         * `getAsync(callback: (result: Office.AsyncResult<string>) => void): void;`
-         * 
+         * <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>
          */
         getAsync(options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<string>) => void): void;
         /**
@@ -14997,11 +17845,27 @@ declare namespace Office {
          * [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</td></tr></table>
+         * <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>
          */
         getAsync(callback: (result: Office.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.
+         *
+         * [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</td></tr>
+         * </table>
+         */
+        getAsync(): void;
         /**
          * Sets the location of an appointment.
          *
@@ -15017,19 +17881,11 @@ declare namespace Office {
          * [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</td></tr>
-         *
-         * <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: Office.AsyncContextOptions): void;`
-         * 
-         * `setAsync(location: string, callback: (result: Office.AsyncResult<void>) => void): void;`
+         * <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>
+         *   <tr><td>Errors</td><td>DataExceedsMaximumSize - The location parameter is longer than 255 characters.</td></tr>
+         * </table>
          */
         setAsync(location: string, options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<void>) => void): void;
         /**
@@ -15043,33 +17899,13 @@ declare namespace Office {
          * [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</td></tr>
-         *
-         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The location parameter is longer than 255 characters.</td></tr></table>
+         * <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>
+         *   <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.
-         *
-         * @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.
-         *
-         * [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</td></tr>
-         *
-         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The location parameter is longer than 255 characters.</td></tr></table>
-         */
-        setAsync(location: string, options: Office.AsyncContextOptions): void;
         /**
          * Sets the location of an appointment.
          *
@@ -15083,11 +17919,11 @@ declare namespace Office {
          * [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</td></tr>
-         *
-         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The location parameter is longer than 255 characters.</td></tr></table>
+         * <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>
+         *   <tr><td>Errors</td><td>DataExceedsMaximumSize - The location parameter is longer than 255 characters.</td></tr>
+         * </table>
          */
         setAsync(location: string, callback: (result: Office.AsyncResult<void>) => void): void;
     }
@@ -15105,9 +17941,10 @@ declare namespace Office {
      * [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>
+     * <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 Mailbox {
         /**
@@ -15133,9 +17970,10 @@ declare namespace Office {
          * [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>
+         * <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: Diagnostics;
         /**
@@ -15150,13 +17988,14 @@ 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>Compose or read</td></tr></table>
+         * <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://docs.microsoft.com/outlook/add-ins/get-attachments-of-an-outlook-item | get attachments from the selected item}.
          *
-         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
+         * **Note**: This member is not supported in Outlook for iOS or Outlook for Android.
          */
         ewsUrl: string;
         /**
@@ -15177,9 +18016,10 @@ 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>Compose or read</td></tr></table>
+         * <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.
          */
@@ -15199,9 +18039,10 @@ 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>Compose or read</td></tr></table>
+         * <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. 
@@ -15211,21 +18052,62 @@ declare namespace Office {
          *                 type Office.AsyncResult.
          */
         addHandlerAsync(eventType: Office.EventType, handler: (type: Office.EventType) => void, options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Adds an event handler for a supported event.
+         *
+         * Currently, the only supported event type is `Office.EventType.ItemChanged`. In Preview, `Office.EventType.OfficeThemeChanged` is also supported.
+         *
+         * [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>
+         *
+         * @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 of 
+         *                 type Office.AsyncResult.
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: (type: Office.EventType) => void, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Adds an event handler for a supported event.
+         *
+         * Currently, the only supported event type is `Office.EventType.ItemChanged`. In Preview, `Office.EventType.OfficeThemeChanged` is also supported.
+         *
+         * [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>
+         *
+         * @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.
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: (type: Office.EventType) => 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.
          *
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [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 or read</td></tr></table>
+         * <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>
          *
          * @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.
@@ -15248,9 +18130,10 @@ 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>Compose or read</td></tr></table>
+         * <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 timeValue - A Date object.
          */
@@ -15258,15 +18141,16 @@ declare namespace Office {
         /**
          * Converts an item ID formatted for EWS into REST format.
          *
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * **Note**: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [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 or read</td></tr></table>
+         * <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>
          *
          * 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://docs.microsoft.com/previous-versions/office/office-365-api/api/version-2.0/mail-rest-operations | Outlook Mail API} or the {@link https://graph.microsoft.io/ | Microsoft Graph}. 
@@ -15286,9 +18170,10 @@ 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>Compose or read</td></tr></table>
+         * <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 input - The local time value to convert.
          * @returns A Date object with the time expressed in UTC.
@@ -15309,15 +18194,16 @@ declare namespace Office {
          * 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.
+         * **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>Compose or read</td></tr></table>
+         * <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 itemId - The Exchange Web Services (EWS) identifier for an existing calendar appointment.
          */
@@ -15335,15 +18221,16 @@ declare namespace Office {
          * 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.
+         * **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>Compose or read</td></tr></table>
+         * <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 itemId - The Exchange Web Services (EWS) identifier for an existing message.
          */
@@ -15364,15 +18251,16 @@ declare namespace Office {
          *
          * If any of the parameters exceed the specified size limits, or if an unknown parameter name is specified, an exception is thrown.
          *
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * **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>
+         * <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 parameters - An AppointmentForm describing the new appointment. All properties are optional.
          */
@@ -15389,9 +18277,10 @@ 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>Read</td></tr></table>
+         * <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 parameters - A dictionary containing all values to be filled in for the user in the new form. All parameters are optional.
          * 
@@ -15446,22 +18335,17 @@ declare namespace Office {
          *
          * The add-in should use the ewsUrl property to determine the correct URL to use when making EWS calls.
          *
-         * Note: It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible.
+         * **Note**: It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible.
          *
          * [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 and read</td></tr></table>
+         * <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 has the following signatures:
-         * 
-         * `getCallbackTokenAsync(callback: (result: Office.AsyncResult<string>) => void): void;`
-         * 
-         * `getCallbackTokenAsync(callback: (result: Office.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.
@@ -15489,9 +18373,10 @@ 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>Compose and read</td></tr></table>
+         * <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. 
          *                 The token is provided as a string in the `asyncResult.value` property.
@@ -15517,9 +18402,10 @@ 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>Compose and read</td></tr></table>
+         * <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. The token is provided as a string in the `asyncResult.value` property.
@@ -15536,9 +18422,10 @@ 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>Compose and read</td></tr></table>
+         * <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 getUserIdentityTokenAsync method returns a token that you can use to identify and 
          * {@link https://docs.microsoft.com/outlook/add-ins/authentication | authenticate the add-in and user with a third-party system}.
@@ -15550,6 +18437,29 @@ declare namespace Office {
          * @param userContext - Optional. Any state data that is passed to the asynchronous method.|
          */
         getUserIdentityTokenAsync(callback: (result: Office.AsyncResult<string>) => void, userContext?: any): void;
+        /**
+         * Gets a token identifying the user and the Office Add-in.
+         *
+         * The token is provided as a string in the asyncResult.value 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>Compose or Read</td></tr>
+         * </table>
+         *
+         * The getUserIdentityTokenAsync method returns a token that you can use to identify and 
+         * {@link https://docs.microsoft.com/outlook/add-ins/authentication | 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 Office.AsyncResult.
+         *                 The token is provided as a string in the `asyncResult.value` property.
+         *                 If there was an error, then the `asyncResult.error` and `asyncResult.diagnostics` properties may provide additional information.
+         */
+        getUserIdentityTokenAsync(callback: (result: Office.AsyncResult<string>) => void): void;
         /**
          * Makes an asynchronous request to an Exchange Web Services (EWS) service on the Exchange server that hosts the user's mailbox.
          *
@@ -15568,13 +18478,13 @@ declare namespace Office {
          * 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:
+         * **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 
+         * **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*
@@ -15592,9 +18502,10 @@ 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>ReadWriteMailbox</td></tr>
-         *
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose and read</td></tr></table>
+         * <table>
+         *   <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteMailbox</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 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 Office.AsyncResult.
@@ -15603,6 +18514,59 @@ declare namespace Office {
          * @param userContext - Optional. Any state data that is passed to the asynchronous method.
          */
         makeEwsRequestAsync(data: any, callback: (result: Office.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.
+         *
+         * In these cases, add-ins should use REST APIs to access the user's mailbox instead.
+         *
+         * The makeEwsRequestAsync method sends an EWS request on behalf of the add-in to Exchange.
+         *
+         * You cannot request Folder Associated Items with the makeEwsRequestAsync method.
+         *
+         * 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 {@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.
+         *
+         * **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.
+         *
+         * *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.
+         *
+         * `<?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.
+         *
+         * [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>ReadWriteMailbox</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 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 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.
+         */
+        makeEwsRequestAsync(data: any, callback: (result: Office.AsyncResult<string>) => void): void;
         /**
          * Removes the event handlers for a supported event type.
          *
@@ -15612,9 +18576,10 @@ 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>Compose or read</td></tr></table>
+         * <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 revoke the handler.
          * @param options - Optional. Provides an option for preserving context data of any type, unchanged, for use in a callback.
@@ -15622,6 +18587,42 @@ declare namespace Office {
          *                 type Office.AsyncResult.
          */
         removeHandlerAsync(eventType: Office.EventType, options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Removes the event handlers for a supported event type.
+         *
+         * Currently, the only supported event type is `Office.EventType.ItemChanged`. In Preview, `Office.EventType.OfficeThemeChanged` is also supported.
+         *
+         * [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>
+         *
+         * @param eventType - The event that should revoke the handler.
+         * @param callback - Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
+         */
+        removeHandlerAsync(eventType: Office.EventType, callback?: (result: Office.AsyncResult<void>) => void): void;
+        /**
+         * Removes the event handlers for a supported event type.
+         *
+         * Currently, the only supported event type is `Office.EventType.ItemChanged`. In Preview, `Office.EventType.OfficeThemeChanged` is also supported.
+         *
+         * [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>
+         *
+         * @param eventType - The event that should revoke the handler.
+         */
+        removeHandlerAsync(eventType: Office.EventType): void;
     }
 
     /**
@@ -15637,9 +18638,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface MeetingSuggestion {
         /**
@@ -15657,7 +18659,7 @@ declare namespace Office {
         /**
          * Gets a string that was identified as a meeting suggestion.
          */
-        meetingstring: string;
+        meetingString: string;
         /**
          * Gets the date and time that a suggested meeting is to begin.
          */
@@ -15673,9 +18675,10 @@ 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>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>
+     * <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>
      */
     interface NotificationMessageDetails {
         /**
@@ -15713,9 +18716,10 @@ 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>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>
+     * <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>
      */
     interface NotificationMessages {
         /**
@@ -15735,18 +18739,10 @@ 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>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 signatures:
-         * 
-         * `addAsync(key: string, JSONmessage: NotificationMessageDetails): void;`
-         * 
-         * `addAsync(key: string, JSONmessage: NotificationMessageDetails, options: Office.AsyncContextOptions): void;`
-         * 
-         * `addAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: Office.AsyncResult<void>) => void): void;`
-         * 
+         * <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>
          */
         addAsync(key: string, JSONmessage: NotificationMessageDetails, options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<void>) => void): void;
         /**
@@ -15762,31 +18758,12 @@ 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>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>
+         * <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>
          */
         addAsync(key: string, JSONmessage: NotificationMessageDetails): 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 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
-         * <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>
-         */
-        addAsync(key: string, JSONmessage: NotificationMessageDetails, options: Office.AsyncContextOptions): void;
         /**
          * Adds a notification to an item.
          *
@@ -15802,9 +18779,10 @@ 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>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>
+         * <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>
          */
         addAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: Office.AsyncResult<void>) => void): void;
         /**
@@ -15813,14 +18791,11 @@ 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>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>
+         * <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, this method also has the following signature:
-         * 
-         * `getAllAsync(callback: (result: Office.AsyncResult<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 Office.AsyncResult.
@@ -15833,35 +18808,39 @@ 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>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>
+         * <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 - 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: Office.AsyncResult<NotificationMessageDetails[]>) => void): void;
+        /**
+         * Returns all keys and 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>
+         */
+        getAllAsync(): void;
         /**
          * Removes a notification message 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>
+         * <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, this method also has the following signatures:
-         * 
-         * `removeAsync(key: string): void;`
-         * 
-         * `removeAsync(key: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `removeAsync(key: string, callback: (result: Office.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 Office.AsyncResult.
          */
@@ -15872,9 +18851,10 @@ 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>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>
+         * <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 key - The key for the notification message to remove.
          */
@@ -15885,24 +18865,10 @@ 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>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 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: Office.AsyncContextOptions): void;
-        /**
-         * Removes a notification message 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>
+         * <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 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 
@@ -15917,18 +18883,11 @@ 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>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>
+         * <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, this method also has the following signatures:
-         * 
-         * `replaceAsync(key: string, JSONmessage: NotificationMessageDetails): void;`
-         * 
-         * `replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options: Office.AsyncContextOptions): void;`
-         * 
-         * `replaceAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: Office.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.
@@ -15946,9 +18905,10 @@ 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>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>
+         * <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 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. 
@@ -15963,28 +18923,10 @@ 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>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 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 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: Office.AsyncContextOptions): void;
-        /**
-         * Replaces a notification message that has a given key with another message.
-         *
-         * If a notification message with the specified key doesn't exist, replaceAsync will add the notification.
-         *
-         * [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>
+         * <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 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. 
@@ -16003,9 +18945,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface PhoneNumber {
         /**
@@ -16025,9 +18968,10 @@ declare namespace Office {
      * [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</td></tr></table>
+     * <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>
      */
     interface Recipients {
         /**
@@ -16044,20 +18988,12 @@ declare namespace Office {
          * [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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
+         * <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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr>
+         * </table>
          * 
-         * In addition to this signature, this method also has the following signatures:
-         * 
-         * `addAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;`
-         * 
-         * `addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: Office.AsyncContextOptions): void;`
-         * 
-         * `addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: Office.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.
@@ -16079,11 +19015,11 @@ declare namespace Office {
          * [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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
+         * <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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr>
+         * </table>
          *
          * @param recipients - The recipients to add to the recipients list.
          */
@@ -16102,36 +19038,11 @@ declare namespace Office {
          * [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>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: Office.AsyncContextOptions): void;
-        /**
-         * Adds a recipient list to the existing recipients for an appointment or message.
-         *
-         * The recipients parameter can be an array of one of the following:
-         *
-         * - Strings containing SMTP email addresses
-         *
-         * - {@link Office.EmailUser} objects
-         *
-         * - {@link Office.EmailAddressDetails} objects
-         *
-         * [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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
+         * <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>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 
@@ -16146,14 +19057,11 @@ declare namespace Office {
          * [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</td></tr></table>
+         * <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>
          * 
-         * In addition to this signature, this method also has the following signature:
-         * 
-         * `getAsync(callback: (result: Office.AsyncResult<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 
@@ -16169,9 +19077,10 @@ declare namespace Office {
          * [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</td></tr></table>
+         * <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 callback - When the method completes, the function passed in the callback parameter is called with a single parameter of 
          *                 type Office.AsyncResult.
@@ -16194,20 +19103,12 @@ declare namespace Office {
          * [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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
+         * <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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr>
+         * </table>
          * 
-         * In addition to this signature, this method also has the following signatures:
-         * 
-         * `setAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;`
-         * 
-         * `setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: Office.AsyncContextOptions): void;`
-         * 
-         * `setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: Office.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.
@@ -16233,11 +19134,11 @@ declare namespace Office {
          * [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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
+         * <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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr>
+         * </table>
          *
          * @param recipients - The recipients to add to the recipients list.
          */
@@ -16258,38 +19159,11 @@ declare namespace Office {
          * [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>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: Office.AsyncContextOptions): void;
-        /**
-         * Sets a recipient list for an appointment or message.
-         *
-         * The setAsync method overwrites the current recipient list.
-         *
-         * The recipients parameter can be an array of one of the following:
-         *
-         * - Strings containing SMTP email addresses
-         *
-         * - {@link Office.EmailUser} objects
-         *
-         * - {@link Office.EmailAddressDetails} objects
-         *
-         * [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>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
+         * <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>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 
@@ -16310,9 +19184,10 @@ 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>Compose or read</td></tr></table>
+     * <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>
      * 
      * **States**
      * 
@@ -16362,9 +19237,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         recurrenceProperties: RecurrenceProperties;
         /**
@@ -16374,9 +19250,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         recurrenceTimeZone: RecurrenceTimeZone;
 
@@ -16387,9 +19264,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         recurrenceType: MailboxEnums.RecurrenceType;
 
@@ -16402,9 +19280,10 @@ 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>Compose or read</td></tr></table>
+         * <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>
          */
         seriesTime: SeriesTime;
 
@@ -16417,13 +19296,10 @@ 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>Compose or read</td></tr></table>
-         * 
-         * In addition to this signature, this method also has the following signature:
-         * 
-         * `getAsync(callback?: (result: Office.AsyncResult<Recurrence>) => void): void;`
+         * <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 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.
@@ -16442,9 +19318,10 @@ 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>Compose or read</td></tr></table>
+         * <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 - 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.
@@ -16453,23 +19330,35 @@ declare namespace Office {
         getAsync(callback?: (result: Office.AsyncResult<Recurrence>) => void): void;
 
         /**
-         * Sets the recurrence pattern of an appointment series.
+         * Returns the current recurrence object of an appointment series.
          * 
-         * Note: setAsync should only be available for series items and not instance items.
+         * This method returns the entire recurrence object for the appointment series.
          * 
          * [Api set: Mailbox 1.7]
          * 
          * @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>
+         * <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>
+         */
+        getAsync(): void;
+
+        /**
+         * Sets the recurrence pattern of an appointment series.
          * 
-         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         * **Note**: setAsync should only be available for series items and not instance items.
          * 
-         * <tr><td>Errors</td><td>InvalidEndTime - The appointment end time is before its start time.</td></tr></table>
+         * [Api set: Mailbox 1.7]
          * 
-         * In addition to this signature, this method also has the following signature:
+         * @remarks
          * 
-         * `setAsync(recurrencePattern: Recurrence, callback?: (result: Office.AsyncResult<void>) => void): void;`
+         * <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>InvalidEndTime - The appointment end time is before its start time.</td></tr>
+         * </table>
          * 
          * @param recurrencePattern - A recurrence object.
          * @param options - Optional. An object literal that contains one or more of the following properties.
@@ -16482,23 +19371,44 @@ declare namespace Office {
         /**
          * Sets the recurrence pattern of an appointment series.
          * 
-         * Note: setAsync should only be available for series items and not instance items.
+         * **Note**: setAsync should only be available for series items and not instance items.
          * 
          * [Api set: Mailbox 1.7]
          * 
          * @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>InvalidEndTime - The appointment end time is before its start time.</td></tr></table>
+         * <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>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 Office.AsyncResult object.
          */
         setAsync(recurrencePattern: Recurrence, callback?: (result: Office.AsyncResult<void>) => void): void;
+
+        /**
+         * Sets the recurrence pattern of an appointment series.
+         * 
+         * **Note**: setAsync should only be available for series items and not instance items.
+         * 
+         * [Api set: Mailbox 1.7]
+         * 
+         * @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>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 Office.AsyncResult object.
+         */
+        setAsync(recurrencePattern: Recurrence): void;
     }
 
     /**
@@ -16508,9 +19418,10 @@ 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>Compose or read</td></tr></table>
+     * <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>
      */
     interface RecurrenceProperties {
         /**
@@ -16551,9 +19462,10 @@ 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>Compose or read</td></tr></table>
+     * <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>
      */
     interface RecurrenceTimeZone {
         /**
@@ -16608,7 +19520,7 @@ declare namespace Office {
         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 Office.AsyncResult object.
+         * asyncResult, which is an Office.AsyncResult object.
          */
         callback?: (result: Office.AsyncResult<any>) => void;
     }
@@ -16624,7 +19536,7 @@ declare namespace Office {
      *
      * 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. 
+     * **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.
@@ -16632,9 +19544,10 @@ declare namespace Office {
      * [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>
+     * <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 RoamingSettings {
         /**
@@ -16643,9 +19556,10 @@ declare namespace Office {
          * [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>
+         * <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>
          *
          * @param name - The case-sensitive name of the setting to retrieve.
          * @returns Type: String | Number | Boolean | Object | Array
@@ -16657,9 +19571,10 @@ declare namespace Office {
          * [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>
+         * <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>
          *
          * @param name - The case-sensitive name of the setting to remove.
          */
@@ -16674,14 +19589,31 @@ declare namespace Office {
          * [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>
+         * <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>
          *
          * @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: Office.AsyncResult<void>) => void): void;
+        /**
+         * 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.
+         *
+         * [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>
+         */
+        saveAsync(): void;
         /**
          * Sets or creates the specified setting.
          *
@@ -16695,9 +19627,10 @@ declare namespace Office {
          * [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>
+         * <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>
          *
          * @param name - The case-sensitive name of the setting to set or create.
          * @param value - Specifies the value to be stored.
@@ -16712,9 +19645,10 @@ declare namespace Office {
      * [Api set: Mailbox 1.7]
      *
      * @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>
+     * <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>
      */
     interface SeriesTime {
         /**
@@ -16723,9 +19657,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>
+         * <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>
          */
         getDuration(): number;
 
@@ -16735,9 +19670,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>
+         * <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>
          */
         getEndDate(): string;
 
@@ -16749,9 +19685,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>
+         * <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>
          */
         getEndTime(): string;
 
@@ -16761,9 +19698,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>
+         * <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>
          */
         getStartDate(): string;
 
@@ -16774,9 +19712,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>
+         * <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>
          */
         getStartTime(): string;
 
@@ -16786,9 +19725,10 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>
+         * <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 minutes - The length of the appointment in minutes.
          */
@@ -16800,16 +19740,11 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>Invalid date format - The date is not in an acceptable format.</td></tr></table>
-         * 
-         * In addition to this signature, this method also has the following 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").
+         * <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>Invalid date format - The date is not in an acceptable format.</td></tr>
+         * </table>
          * 
          * @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.
@@ -16822,11 +19757,11 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>Invalid date format - The date is not in an acceptable format.</td></tr></table>
+         * <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>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".
          */
@@ -16837,16 +19772,12 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>
+         *   <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>Invalid date format - The date is not in an acceptable format.</td></tr>
+         * </table>
          * 
-         * <tr><td>Errors</td><td>Invalid date format - The date is not in an acceptable format.</td></tr></table>
-         * 
-         * In addition to this signature, this method also has the following 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.
          * @param day - The day value of the start date.
@@ -16859,11 +19790,11 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>Invalid date format - The date is not in an acceptable format.</td></tr></table>
+         * <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>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".
          */
@@ -16876,15 +19807,11 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>Invalid time format - The time is not in an acceptable format.</td></tr></table>
-         * 
-         * In addition to this signature, this method also has the following signature:
-         * 
-         * `setStartTime(time: string): void;` (Where time is the start time of all instances represented by standard datetime string format: "THH:mm:ss:mmm").
+         * <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>Invalid time format - The time is not in an acceptable format.</td></tr>
+         * </table>
          * 
          * @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.
@@ -16898,11 +19825,11 @@ declare namespace Office {
          * [Api set: Mailbox 1.7]
          *
          * @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>Invalid time format - The time is not in an acceptable format.</td></tr></table>
+         * <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>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".
          */
@@ -16915,9 +19842,10 @@ declare namespace Office {
      * [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>
+     * <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
      */
@@ -16942,9 +19870,10 @@ declare namespace Office {
      * [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</td></tr></table>
+     * <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>
      */
     interface Subject {
         /**
@@ -16955,14 +19884,11 @@ declare namespace Office {
          * [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</td></tr></table>
+         * <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>
          * 
-         * In addition to this signature, this method also has the following signature:
-         * 
-         * `getAsync(callback: (result: Office.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 
@@ -16978,9 +19904,10 @@ declare namespace Office {
          * [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</td></tr></table>
+         * <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 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.
@@ -16995,20 +19922,12 @@ declare namespace Office {
          * [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</td></tr>
-         *
-         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The subject parameter is longer than 255 characters.</td></tr></table>
+         * <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>
+         *   <tr><td>Errors</td><td>DataExceedsMaximumSize - The subject parameter is longer than 255 characters.</td></tr>
+         * </table>
          * 
-         * In addition to this signature, this method also has the following signatures:
-         * 
-         * `setAsync(subject: string): void;`
-         * 
-         * `setAsync(subject: string, options: Office.AsyncContextOptions): void;`
-         * 
-         * `setAsync(subject: string, callback: (result: Office.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.
@@ -17025,11 +19944,11 @@ declare namespace Office {
          * [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</td></tr>
-         *
-         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The subject parameter is longer than 255 characters.</td></tr></table>
+         * <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>
+         *   <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.
          */
@@ -17043,31 +19962,11 @@ declare namespace Office {
          * [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</td></tr>
-         *
-         * <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: 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.
-         *
-         * [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</td></tr>
-         *
-         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The subject parameter is longer than 255 characters.</td></tr></table>
+         * <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>
+         *   <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 
@@ -17085,9 +19984,10 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface TaskSuggestion {
         /**
@@ -17105,9 +20005,10 @@ declare namespace Office {
      * [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</td></tr></table>
+     * <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>
      */
     interface Time {
         /**
@@ -17119,14 +20020,11 @@ declare namespace Office {
          * [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</td></tr></table>
+         * <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>
          * 
-         * In addition to this signature, this method also has the following signature:
-         * 
-         * `getAsync(callback: (result: Office.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 Office.AsyncResult.
@@ -17142,9 +20040,10 @@ declare namespace Office {
          * [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</td></tr></table>
+         * <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 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 a Date object.
@@ -17161,20 +20060,12 @@ declare namespace Office {
          * [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>InvalidEndTime - The appointment end time is before the appointment start time.</td></tr></table>
+         * <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>InvalidEndTime - The appointment end time is before the appointment start time.</td></tr>
+         * </table>
          * 
-         * In addition to this signature, this method also has the following signatures:
-         * 
-         * `setAsync(dateTime: Date): void;`
-         * 
-         * `setAsync(dateTime: Date, options: Office.AsyncContextOptions): void;`
-         * 
-         * `setAsync(dateTime: Date, callback: (result: Office.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.
@@ -17194,11 +20085,11 @@ declare namespace Office {
          * [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>InvalidEndTime - The appointment end time is before the appointment start time.</td></tr></table>
+         * <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>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).
          */
@@ -17214,33 +20105,11 @@ declare namespace Office {
          * [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>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: 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.
-         *
-         * The time must be in UTC; you can get the correct UTC time by using the convertToUtcClientTime method.
-         *
-         * [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>InvalidEndTime - The appointment end time is before the appointment start time.</td></tr></table>
+         * <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>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 
@@ -17256,23 +20125,25 @@ declare namespace Office {
      * [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>
+     * <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>
      */
     interface UserProfile {
         /**
          * 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.
+         * **Note**: This member is currently only supported in Outlook 2016 for Mac, build 16.9.1212 and greater.
          *
          * [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>Compose or read</td></tr></table>
+         * <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 possible account types are listed in the following table.
          * 
@@ -17306,9 +20177,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         displayName: string;
         /**
@@ -17317,9 +20189,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         emailAddress: string;
         /**
@@ -17328,9 +20201,10 @@ declare namespace Office {
          * [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>
+         * <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>
          */
         timeZone: string;
     }
@@ -19094,7 +21968,7 @@ declare namespace Excel {
         copy(positionType?: "None" | "Before" | "After" | "Beginning" | "End", relativeTo?: Excel.Worksheet): Excel.Worksheet;
         /**
          *
-         * Deletes the worksheet from the workbook.
+         * Deletes the worksheet from the workbook. Note that if the worksheet's visibility is set to "VeryHidden", the delete operation will fail with a GeneralException.
          *
          * [Api set: ExcelApi 1.1]
          */
diff --git a/types/office-runtime/index.d.ts b/types/office-runtime/index.d.ts
index 31c3dded97..7fb265c57e 100644
--- a/types/office-runtime/index.d.ts
+++ b/types/office-runtime/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for office-runtime 1.0
+// Type definitions for non-npm package office-runtime 1.0
 // Project: https://github.com/OfficeDev/office-js
 // Definitions by: Michael Zlatskovsky <https://github.com/Zlatkovsky>, Michelle Scharlock <https://github.com/mscharlock>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/okta__okta-vue/index.d.ts b/types/okta__okta-vue/index.d.ts
index da7ec34d2e..31c2c93f3f 100644
--- a/types/okta__okta-vue/index.d.ts
+++ b/types/okta__okta-vue/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for okta-vue 1.0
-// Project: https://github.com/okta/okta-oidc-js/tree/master/packages/okta-vue
+// Project: https://github.com/okta/okta-oidc-js/tree/master/packages/okta-vue, https://github.com/okta/okta-oidc-js
 // Definitions by: Mike Dodge <https://github.com/innovation-team>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/ol/index.d.ts b/types/ol/index.d.ts
index 947423f2aa..dfdf2aa3e3 100644
--- a/types/ol/index.d.ts
+++ b/types/ol/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ol 4.6
-// Project: https://github.com/openlayers/openlayers/tree/master/package#readme
+// Project: https://github.com/openlayers/openlayers/tree/master/package#readme, https://openlayers.org
 // Definitions by: Yair Tawil <https://github.com/yairtawil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 import * as ol from 'openlayers';
diff --git a/types/onionoo/index.d.ts b/types/onionoo/index.d.ts
new file mode 100644
index 0000000000..23d19b7c92
--- /dev/null
+++ b/types/onionoo/index.d.ts
@@ -0,0 +1,820 @@
+// Type definitions for onionoo 2.0
+// Project: https://github.com/lukechilds/onionoo-node-client
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
+
+import { Cache, GotPromise } from 'got';
+
+export = Oninoo;
+
+declare const Oninoo: Onionoo;
+
+interface Onionoo {
+    new (options?: Onionoo.Options): Onionoo.Instance & Onionoo.Endpoints;
+    new (options: Onionoo.OptionsWithEndpoints): Onionoo.Instance & Partial<Onionoo.Endpoints>;
+}
+
+declare namespace Onionoo {
+    interface Instance {
+        get(endpoint: 'summary', query?: QueryParameters): GotPromise<Summary>;
+        get(endpoint: 'details', query?: QueryParameters): GotPromise<Details>;
+        get(endpoint: 'bandwidth', query?: QueryParameters): GotPromise<Bandwidth>;
+        get(endpoint: 'weights', query?: QueryParameters): GotPromise<Weights>;
+        get(endpoint: 'clients', query?: QueryParameters): GotPromise<Clients>;
+        get(endpoint: 'uptime', query?: QueryParameters): GotPromise<Uptime>;
+    }
+
+    interface Endpoints {
+        summary(query?: QueryParameters): GotPromise<Summary>;
+        details(query?: QueryParameters): GotPromise<Details>;
+        bandwidth(query?: QueryParameters): GotPromise<Bandwidth>;
+        weights(query?: QueryParameters): GotPromise<Weights>;
+        clients(query?: QueryParameters): GotPromise<Clients>;
+        uptime(query?: QueryParameters): GotPromise<Uptime>;
+    }
+
+    interface Options {
+        /**
+         * String to use as the base url for all API requests.
+         * @default 'https://onionoo.torproject.org'
+         */
+        baseUrl?: string;
+        /**
+         * Storage adapter instance for storing cached data.
+         * @default false
+         */
+        cache?: Cache | false;
+    }
+
+    interface OptionsWithEndpoints extends Options {
+        /**
+         * Array of endpoints to be returned as methods on the `Onionoo` instance.
+         * @default ['summary', 'details', 'bandwidth', 'weights', 'clients', 'uptime']
+         */
+        endpoints: Array<'summary' | 'details' | 'bandwidth' | 'weights' | 'clients' | 'uptime'>;
+    }
+
+    interface QueryParameters {
+        /**
+         * Return only `relay` or only `bridge` documents.
+         */
+        type?: 'relay' | 'bridge';
+        /**
+         * Return only running (`true`) or only non-running relays and/or bridges (`false`).
+         */
+        running?: boolean;
+        /**
+         * Return only (1) relays with the parameter value matching (part of a) nickname, (possibly $-prefixed)
+         * beginning of a hex-encoded fingerprint, any 4 hex character block of a space-separated fingerprint,
+         * beginning of a base64-encoded fingerprint without trailing equal signs, or beginning of an IP address
+         * (possibly enclosed in square brackets in case of IPv6), (2) bridges with (part of a) nickname
+         * or (possibly $-prefixed) beginning of a hashed hex-encoded fingerprint, and (3) relays and/or bridges
+         * matching a given qualified search term. Searches by relay IP address include all known addresses used
+         * for onion routing and for exiting to the Internet. Searches for beginnings of IP addresses are performed
+         * on textual representations of canonical IP address forms, so that searches using CIDR notation or
+         * non-canonical forms will return empty results. Searches are case-insensitive, except for base64-encoded
+         * fingerprints. If multiple search terms are given, separated by spaces, the intersection of all relays
+         * and bridges matching all search terms will be returned. Complete hex-encoded fingerprints should always
+         * be hashed using SHA-1, regardless of searching for a relay or a bridge, in order to not accidentally
+         * leak non-hashed bridge fingerprints in the URL. Qualified search terms have the form "key:value"
+         * (without double quotes) with "key" being one of the parameters listed here except for "search",
+         * "fingerprint", "order", "limit", "offset", and "fields", and "value" being the string that will
+         * internally be passed to that parameter. If a qualified search term for a given "key" is specified
+         * more than once, only the first "value" is considered.
+         */
+        search?: string;
+        /**
+         * Return only the relay with the parameter value matching the fingerprint or the bridge with the parameter
+         * value matching the hashed fingerprint. Fingerprints should always be hashed using SHA-1, regardless of
+         * looking up a relay or a bridge, in order to not accidentally leak non-hashed bridge fingerprints in the URL.
+         * Lookups only work for full fingerprints or hashed fingerprints consisting of 40 hex characters.
+         * Lookups are case-insensitive.
+         */
+        lookup?: string;
+        /**
+         * Return only relays which are located in the given country as identified by a two-letter country code.
+         * Filtering by country code is case-insensitive. The special country code xz can be used for relays that
+         * were not found in the GeoIP database.
+         */
+        country?: string;
+        /**
+         * Return only relays which are located in either one of the given autonomous systems (AS) as identified
+         * by AS number (with or without preceding "AS" part). Multiple AS numbers can be provided separated by commas.
+         * Filtering by AS number is case-insensitive. The special AS number 0 can be used for relays that were
+         * not found in the GeoIP database.
+         */
+        as?: string;
+        /**
+         * Return only relays with the parameter value matching (part of) the autonomous system (AS) name they are
+         * located in. If the parameter value contains spaces, only relays are returned which contain all
+         * space-separated parts in their AS name. Only printable ASCII characters are permitted in the parameter
+         * value, some of which need to be percent-encoded (# as %23, % as %25, & as %26, + as %2B, and / as %2F).
+         * Comparisons are case-insensitive.
+         */
+        as_name?: string;
+        /**
+         * Return only relays which have the given relay flag assigned by the directory authorities.
+         * Filtering by flag is case-insensitive.
+         */
+        flag?: string;
+        /**
+         * Return only relays or bridges which have first been seen during the given range of days ago. A parameter
+         * value "x-y" with x <= y returns relays or bridges that have first been seen at least x and at most y days ago.
+         * Accepted short forms are "x", "x-", and "-y" which are interpreted as "x-x", "x-infinity", and "0-y".
+         */
+        first_seen_days?: string;
+        /**
+         * Return only relays or bridges which have last been seen during the given range of days ago. A parameter
+         * value "x-y" with x <= y returns relays or bridges that have last been seen at least x and at most y days ago.
+         * Accepted short forms are "x", "x-", and "-y" which are interpreted as "x-x", "x-infinity", and "0-y".
+         * Note that relays and bridges that haven't been running in the past week are not included in results,
+         * so that setting x to 8 or higher will lead to an empty result set.
+         */
+        last_seen_days?: string;
+        /**
+         * Return only relays with the parameter value matching (part of) the contact line. If the parameter value
+         * contains spaces, only relays are returned which contain all space-separated parts in their contact line.
+         * Only printable ASCII characters are permitted in the parameter value, some of which need to be
+         * percent-encoded (# as %23, % as %25, & as %26, + as %2B, and / as %2F). Comparisons are case-insensitive.
+         */
+        contact?: string;
+        /**
+         * Return only the relay whose fingerprint matches the parameter value and all relays that this relay has
+         * listed in its family by fingerprint and that in turn have listed this relay in their family by fingerprint.
+         * If relays have listed other relays in their family by nickname, those family relationships will not be
+         * considered, regardless of whether they have the Named flag or not. The provided relay fingerprint must
+         * consist of 40 hex characters where case does not matter, and it must not be hashed using SHA-1.
+         * Bridges are not contained in the result, regardless of whether they define a family.
+         */
+        family?: string;
+        /**
+         * Return only relays or bridges running either Tor version from a list or range given in the parameter value.
+         * Tor versions must be provided without the leading "Tor" part. Multiple versions can either be provided as a
+         * comma-separated list (","), as a range separated by two dots (".."), or as a list of ranges.
+         * Provided versions are parsed and matched by parsed dotted numbers, rather than by string prefix.
+         */
+        version?: string;
+        /**
+         * Return only relays or bridges running on an operating system that starts with the parameter value.
+         * Searches are case-insensitive.
+         */
+        os?: string;
+        /**
+         * Return only relays with a domain name ending in the given (partial) host name. Searches for subdomains
+         * of a specific domain should ideally be prefixed with a period, for example: ".csail.mit.edu". Non-ASCII
+         * host name characters must be encoded as punycode. Filtering by host name is case-insensitive.
+         */
+        host_name?: string;
+        /**
+         * Return only relays and bridges running a Tor software version that is recommended (`true`) or not
+         * recommended by the directory authorities (`false`). Uses the version in the consensus or bridge network status.
+         * Relays and bridges are not contained in either result, if the version they are running is not known.
+         */
+        recommended_version?: boolean;
+        /**
+         * Response documents can be reduced in size by requesting only a subset of contained fields.
+         * Comma-separated list of fields that will be included in the result. So far, only top-level fields
+         * in relay or bridge objects of details documents can be specified, e.g., `nickname,hashed_fingerprint`.
+         * If the fields parameter is provided, all other fields which are not contained in the provided list
+         * will be removed from the result.
+         */
+        fields?: string[];
+        /**
+         * Re-order results by a comma-separated list of fields in ascending or descending order. Results are first
+         * ordered by the first list element, then by the second, and so on. Possible fields for ordering are:
+         * `consensus_weight` and `first_seen`. Ascending order is the default; descending order is selected by
+         * prepending fields with a minus sign (-). Field names can be listed at most once in either ascending or
+         * descending order. Relays or bridges which don't have any value for a field to be ordered by are always
+         * appended to the end, regardless or sorting order. The ordering is defined independent of the requested
+         * document type and does not require the ordering field to be contained in the document. If no `order`
+         * parameter is given, ordering of results is undefined.
+         */
+        order?: string;
+
+        /**
+         * Skip the given number of relays and/or bridges. Relays are skipped first, then bridges.
+         * Non-positive `offset` values are treated as zero and don't change the result.
+         */
+        offset?: number;
+        /**
+         * Limit result to the given number of relays and/or bridges. Relays are kept first, then bridges.
+         * Non-positive `limit` values are treated as zero and lead to an empty result. When used together with `offset`,
+         * the offsetting step precedes the limiting step.
+         */
+        limit?: number;
+    }
+
+    type Summary = Response<RelaySummary, BridgeSummary>;
+    type Details = Response<Relay, Bridge>;
+    type Bandwidth = Response<NodeBandwidth, NodeBandwidth>;
+    type Weights = Response<RelayWeights, undefined>;
+    type Clients = Response<undefined, BridgeClients>;
+    type Uptime = Response<RelayUptime, BridgeUptime>;
+
+    interface Response<TRelay, TBridge> {
+        /**
+         * Onionoo protocol version string.
+         */
+        version: string;
+        /**
+         * UTC date (YYYY-MM-DD) when the next major protocol version is scheduled to be deployed. Omitted if no major
+         * protocol changes are planned.
+         */
+        next_major_version_scheduled?: string;
+        /**
+         * Git revision of the Onionoo instance's software used to write this response, which will be omitted if unknown.
+         */
+        build_revision?: string;
+        /**
+         * UTC timestamp (YYYY-MM-DD hh:mm:ss) when the last known relay network status consensus started being valid.
+         * Indicates how recent the relay objects in this document are.
+         */
+        relays_published: string;
+        /**
+         * Number of skipped relays as requested by a positive "offset" parameter value. Omitted if zero.
+         */
+        relays_skipped?: number;
+        relays: TRelay[];
+        /**
+         * Number of truncated relays as requested by a positive "limit" parameter value. Omitted if zero.
+         */
+        relays_truncated?: number;
+        /**
+         * UTC timestamp (YYYY-MM-DD hh:mm:ss) when the last known bridge network status was published.
+         * Indicates how recent the bridge objects in this document are.
+         */
+        bridges_published: string;
+        /**
+         * Number of skipped bridges as requested by a positive `offset` parameter value. Omitted if zero.
+         */
+        bridges_skipped?: number;
+        bridges: TBridge[];
+        /**
+         * Number of truncated bridges as requested by a positive `limit` parameter value. Omitted if zero.
+         */
+        bridges_truncated?: number;
+    }
+
+    interface RelaySummary {
+        /**
+         * Relay nickname consisting of 1–19 alphanumerical characters.
+         */
+        n: string;
+        /**
+         * Relay fingerprint consisting of 40 upper-case hexadecimal characters.
+         */
+        f: string;
+        /**
+         * Array of IPv4 or IPv6 addresses where the relay accepts onion-routing connections or which the relay
+         * used to exit to the Internet in the past 24 hours. The first address is the primary onion-routing address
+         * that the relay used to register in the network, subsequent addresses are in arbitrary order. IPv6 hex
+         * characters are all lower-case.
+         */
+        a: string[];
+        /**
+         * Boolean field saying whether this relay was listed as running in the last relay network status consensus.
+         */
+        r: boolean;
+    }
+
+    interface Relay {
+        /**
+         * Relay nickname consisting of 1–19 alphanumerical characters.
+         */
+        nickname: string;
+        /**
+         * Relay fingerprint consisting of 40 upper-case hexadecimal characters.
+         */
+        fingerprint: string;
+        /**
+         * Array of IPv4 or IPv6 addresses and TCP ports or port lists where the relay accepts onion-routing connections.
+         * The first address is the primary onion-routing address that the relay used to register in the network,
+         * subsequent addresses are in arbitrary order. IPv6 hex characters are all lower-case.
+         */
+        or_addresses: string[];
+        /**
+         * Array of IPv4 addresses that the relay used to exit to the Internet in the past 24 hours. Omitted if
+         * array is empty. Includes all exit addresses, regardless of whether they are used as onion-routing addresses
+         * or not.
+         */
+        exit_addresses?: string[];
+        /**
+         * IPv4 address and TCP port where the relay accepts directory connections.
+         * Omitted if the relay does not accept directory connections.
+         */
+        dir_address?: string;
+        /**
+         * UTC timestamp (YYYY-MM-DD hh:mm:ss) when this relay was last seen in a network status consensus.
+         */
+        last_seen: string;
+        /**
+         * UTC timestamp (YYYY-MM-DD hh:mm:ss) when this relay last stopped announcing an IPv4 or IPv6 address or
+         * TCP port where it previously accepted onion-routing or directory connections. This timestamp can serve
+         * as indicator whether this relay would be a suitable fallback directory.
+         */
+        last_changed_address_or_port: string;
+        /**
+         * UTC timestamp (YYYY-MM-DD hh:mm:ss) when this relay was first seen in a network status consensus.
+         */
+        first_seen: string;
+        /**
+         * Boolean field saying whether this relay was listed as running in the last relay network status consensus.
+         */
+        running: boolean;
+        /**
+         * Boolean field saying whether this relay indicated that it is hibernating in its last known server descriptor.
+         * This information may be helpful to decide whether a relay that is not running anymore has reached its
+         * accounting limit and has not dropped out of the network for another, unknown reason. Omitted if either
+         * the relay is not hibernating, or if no information is available about the hibernation status of the relay.
+         */
+        hibernating?: boolean;
+        /**
+         * Array of relay flags that the directory authorities assigned to this relay. May be omitted if empty.
+         */
+        flags?: string[];
+        /**
+         * Two-letter lower-case country code as found in a GeoIP database by resolving the relay's first
+         * onion-routing IP address. Omitted if the relay IP address could not be found in the GeoIP database.
+         */
+        country?: string;
+        /**
+         * Country name as found in a GeoIP database by resolving the relay's first onion-routing IP address.
+         * Omitted if the relay IP address could not be found in the GeoIP database, or if the GeoIP database
+         * did not contain a country name.
+         */
+        country_name?: string;
+        /**
+         * Region name as found in a GeoIP database by resolving the relay's first onion-routing IP address.
+         * Omitted if the relay IP address could not be found in the GeoIP database, or if the GeoIP database
+         * did not contain a region name.
+         */
+        region_name?: string;
+        /**
+         * City name as found in a GeoIP database by resolving the relay's first onion-routing IP address.
+         * Omitted if the relay IP address could not be found in the GeoIP database, or if the GeoIP database
+         * did not contain a city name.
+         */
+        city_name?: string;
+        /**
+         * Latitude as found in a GeoIP database by resolving the relay's first onion-routing IP address.
+         * Omitted if the relay IP address could not be found in the GeoIP database.
+         */
+        latitude?: number;
+        /**
+         * Longitude as found in a GeoIP database by resolving the relay's first onion-routing IP address.
+         * Omitted if the relay IP address could not be found in the GeoIP database.
+         */
+        longitude?: number;
+        /**
+         * AS number as found in an AS database by resolving the relay's first onion-routing IP address.
+         * AS number strings start with "AS", followed directly by the AS number. Omitted if the relay IP
+         * address could not be found in the AS database.
+         */
+        as?: string;
+        /**
+         * AS name as found in an AS database by resolving the relay's first onion-routing IP address.
+         * Omitted if the relay IP address could not be found in the AS database.
+         */
+        as_name?: string;
+        /**
+         * Weight assigned to this relay by the directory authorities that clients use in their path selection algorithm.
+         * The unit is arbitrary; currently it's kilobytes per second, but that might change in the future.
+         */
+        consensus_weight: number;
+        /**
+         * Host name as found in a reverse DNS lookup of the relay's primary IP address. This field is updated at most
+         * once in 12 hours, unless the relay IP address changes. Omitted if the relay IP address was not looked up,
+         * if no lookup request was successful yet, or if no A record was found matching the PTR record.
+         * @deprecated
+         */
+        host_name?: string;
+        /**
+         * Host names as found in a reverse DNS lookup of the relay's primary IP address for which a matching A record
+         * was also found. This field is updated at most once in 12 hours, unless the relay IP address changes.
+         * Omitted if the relay IP address was not looked up, if no lookup request was successful yet, or if no
+         * A records were found matching the PTR records (i.e. it was not possible to verify the value of any
+         * of the PTR records). A DNSSEC validating resolver is used for these lookups. Failure to validate
+         * DNSSEC signatures will prevent those names from appearing in this field.
+         */
+        verified_host_names?: string[];
+        /**
+         * Host names as found in a reverse DNS lookup of the relay's primary IP address that for which a matching
+         * A record was not found. This field is updated at most once in 12 hours, unless the relay IP address changes.
+         * Omitted if the relay IP address was not looked up, if no lookup request was successful yet, or if A records
+         * were found matching all PTR records (i.e. it was possible to verify the value of each of the PTR records).
+         * A DNSSEC validating resolver is used for these lookups. Failure to validate DNSSEC signatures will prevent
+         * those names from appearing in this field.
+         */
+        unverified_host_names?: string[];
+        /**
+         * UTC timestamp (YYYY-MM-DD hh:mm:ss) when the relay was last (re-)started.
+         * Missing if router descriptor containing this information cannot be found.
+         */
+        last_restarted?: string;
+        /**
+         * Average bandwidth in bytes per second that this relay is willing to sustain over long periods.
+         * Missing if router descriptor containing this information cannot be found.
+         */
+        bandwidth_rate?: number;
+        /**
+         * Bandwidth in bytes per second that this relay is willing to sustain in very short intervals.
+         * Missing if router descriptor containing this information cannot be found.
+         */
+        bandwidth_burst?: number;
+        /**
+         * Bandwidth estimate in bytes per second of the capacity this relay can handle. The relay remembers
+         * the maximum bandwidth sustained output over any ten second period in the past day, and another
+         * sustained input. The `observed_bandwidth` value is the lesser of these two numbers. Missing if
+         * router descriptor containing this information cannot be found.
+         */
+        observed_bandwidth?: number;
+        /**
+         * Bandwidth in bytes per second that this relay is willing and capable to provide. This bandwidth
+         * value is the minimum of `bandwidth_rate`, `bandwidth_burst`, and `observed_bandwidth`.
+         * Missing if router descriptor containing this information cannot be found.
+         */
+        advertised_bandwidth?: number;
+        /**
+         * Array of exit-policy lines. Missing if router descriptor containing this information cannot be found.
+         * May contradict the `exit_policy_summary` field in a rare edge case: this happens when the relay changes
+         * its exit policy after the directory authorities summarized the previous exit policy.
+         */
+        exit_policy?: string[];
+        /**
+         * Summary version of the relay's exit policy containing a dictionary with either an `accept` or a `reject` element.
+         * If there is an `accept` (`reject`) element, the relay accepts (rejects) all TCP ports or port ranges
+         * in the given list for most IP addresses and rejects (accepts) all other ports. May contradict the
+         * `exit_policy` field in a rare edge case: this happens when the relay changes its exit policy after
+         * the directory authorities summarized the previous exit policy.
+         */
+        exit_policy_summary?: {
+            accept?: string[];
+            reject?: string[];
+        };
+        /**
+         * Summary version of the relay's IPv6 exit policy containing a dictionary with either an `accept` or a `reject`
+         * element. If there is an `accept` (`reject`) element, the relay accepts (rejects) all TCP ports or port ranges
+         * in the given list for most IP addresses and rejects (accepts) all other ports. Missing if the relay rejects
+         * all connections to IPv6 addresses. May contradict the `exit_policy_summary` field in a rare edge case:
+         * this happens when the relay changes its exit policy after the directory authorities summarized the previous
+         * exit policy.
+         */
+        exit_policy_v6_summary?: {
+            accept?: string[];
+            reject?: string[];
+        };
+        /**
+         * Contact address of the relay operator. Omitted if empty or if descriptor containing this information
+         * cannot be found.
+         */
+        contact?: string;
+        /**
+         * Platform string containing operating system and Tor version details. Omitted if empty or if descriptor
+         * containing this information cannot be found.
+         */
+        platform?: string;
+        /**
+         * Tor software version without leading "Tor" as reported by the directory authorities in the "v" line of
+         * the consensus. Omitted if either the directory authorities or the relay did not report which version
+         * the relay runs or if the relay runs an alternative Tor implementation.
+         */
+        version?: string;
+        /**
+         * Boolean field saying whether the Tor software version of this relay is recommended by the directory
+         * authorities or not. Uses the relay version in the consensus. Omitted if either the directory authorities
+         * did not recommend versions, or the relay did not report which version it runs.
+         */
+        recommended_version?: boolean;
+        /**
+         * Status of the Tor software version of this relay based on the versions recommended by the directory authorities.
+         * Possible version statuses are: `recommended` if a version is listed as recommended; `experimental` if a version
+         * is newer than every recommended version; `obsolete` if a version is older than every recommended version;
+         * `new in series` if a version has other recommended versions with the same first three components,
+         * and the version is newer than all such recommended versions, but it is not newer than every recommended version;
+         * `unrecommended` if none of the above conditions hold. Omitted if either the directory authorities did not
+         * recommend versions, or the relay did not report which version it runs.
+         */
+        version_status?:
+            | 'recommended'
+            | 'experimental'
+            | 'obsolete'
+            | 'new in series'
+            | 'unrecommended';
+        /**
+         * Array of fingerprints of relays that are in an effective, mutual family relationship with this relay.
+         * These relays are part of this relay's family and they consider this relay to be part of their family.
+         * Always contains the relay's own fingerprint. Omitted if the descriptor containing this information
+         * cannot be found.
+         */
+        effective_family?: string[];
+        /**
+         * Array of fingerprints of relays that are not in an effective, mutual family relationship with this relay.
+         * These relays are part of this relay's family but they don't consider this relay to be part of their family.
+         * Omitted if empty or if descriptor containing this information cannot be found.
+         */
+        alleged_family?: string[];
+        /**
+         * Array of fingerprints of relays that are not in an effective, mutual family relationship with this relay
+         * but that can be reached by following effective, mutual family relationships starting at this relay.
+         * Omitted if empty or if descriptor containing this information cannot be found.
+         */
+        indirect_family?: string[];
+        /**
+         * Fraction of this relay's consensus weight compared to the sum of all consensus weights in the network.
+         * This fraction is a very rough approximation of the probability of this relay to be selected by clients.
+         * Omitted if the relay is not running.
+         */
+        consensus_weight_fraction?: number;
+        /**
+         * Probability of this relay to be selected for the guard position. This probability is calculated based on
+         * consensus weights, relay flags, and bandwidth weights in the consensus. Path selection depends on more
+         * factors, so that this probability can only be an approximation. Omitted if the relay is not running,
+         * or the consensus does not contain bandwidth weights.
+         */
+        guard_probability?: number;
+        /**
+         * Probability of this relay to be selected for the middle position. This probability is calculated based on
+         * consensus weights, relay flags, and bandwidth weights in the consensus. Path selection depends on more
+         * factors, so that this probability can only be an approximation. Omitted if the relay is not running,
+         * or the consensus does not contain bandwidth weights.
+         */
+        middle_probability?: number;
+        /**
+         * Probability of this relay to be selected for the exit position. This probability is calculated based on
+         * consensus weights, relay flags, and bandwidth weights in the consensus. Path selection depends on more
+         * factors, so that this probability can only be an approximation. Omitted if the relay is not running,
+         * or the consensus does not contain bandwidth weights.
+         */
+        exit_probability?: number;
+        /**
+         * Boolean field saying whether the consensus weight of this relay is based on a threshold of 3 or more
+         * measurements by Tor bandwidth authorities. Omitted if the network status consensus containing this
+         * relay does not contain measurement information.
+         */
+        measured?: boolean;
+        /**
+         * Array of IPv4 or IPv6 addresses and TCP ports or port lists where the relay claims in its descriptor to
+         * accept onion-routing connections but that the directory authorities failed to confirm as reachable.
+         * Contains only additional addresses of a relay that are found unreachable and only as long as a minority of
+         * directory authorities performs reachability tests on these additional addresses. Relays with an unreachable
+         * primary address are not included in the network status consensus and excluded entirely. Likewise, relays
+         * with unreachable additional addresses tested by a majority of directory authorities are not included in
+         * the network status consensus and excluded here, too. If at any point network status votes will be added
+         * to the processing, relays with unreachable addresses will be included here. Addresses are in arbitrary order.
+         * IPv6 hex characters are all lower-case. Omitted if empty.
+         */
+        unreachable_or_addresses?: string[];
+    }
+
+    interface BridgeSummary {
+        /**
+         * Bridge nickname consisting of 1–19 alphanumerical characters.
+         */
+        n: string;
+        /**
+         * SHA-1 hash of the bridge fingerprint consisting of 40 upper-case hexadecimal characters.
+         */
+        h: string;
+        /**
+         * Boolean field saying whether this bridge was listed as running in the last bridge network status.
+         */
+        r: boolean;
+    }
+
+    interface Bridge {
+        /**
+         * Bridge nickname consisting of 1–19 alphanumerical characters.
+         */
+        nickname: string;
+        /**
+         * SHA-1 hash of the bridge fingerprint consisting of 40 upper-case hexadecimal characters.
+         */
+        hashed_fingerprint: string;
+        /**
+         * Array of sanitized IPv4 or IPv6 addresses and TCP ports or port lists where the bridge accepts
+         * onion-routing connections. The first address is the primary onion-routing address that the bridge used
+         * to register in the network, subsequent addresses are in arbitrary order. IPv6 hex characters are all lower-case.
+         * Sanitized IP addresses are always in `10/8` or `[fd9f:2e19:3bcf/48]` IP networks and are only useful
+         * to learn which IP version the bridge uses and to detect whether the bridge changed its address.
+         * Sanitized IP addresses always change on the 1st of every month at 00:00:00 UTC, regardless of the bridge
+         * actually changing its IP address. TCP ports are not sanitized.
+         */
+        or_addresses: string[];
+        /**
+         * UTC timestamp (YYYY-MM-DD hh:mm:ss) when this bridge was last seen in a bridge network status.
+         */
+        last_seen: string;
+        /**
+         * UTC timestamp (YYYY-MM-DD hh:mm:ss) when this bridge was first seen in a bridge network status.
+         */
+        first_seen: string;
+        /**
+         * Boolean field saying whether this bridge was listed as running in the last bridge network status.
+         */
+        running: boolean;
+        /**
+         * Array of relay flags that the bridge authority assigned to this bridge. May be omitted if empty.
+         */
+        flags?: string[];
+        /**
+         * UTC timestamp (YYYY-MM-DD hh:mm:ss) when the bridge was last (re-)started.
+         * Missing if router descriptor containing this information cannot be found.
+         */
+        last_restarted?: string;
+        /**
+         * Bandwidth in bytes per second that this bridge is willing and capable to provide. This bandwidth value
+         * is the minimum of `bandwidth_rate`, `bandwidth_burst`, and `observed_bandwidth`.
+         * Missing if router descriptor containing this information cannot be found.
+         */
+        advertised_bandwidth?: number;
+        /**
+         * Platform string containing operating system and Tor version details.
+         * Omitted if not provided by the bridge or if descriptor containing this information cannot be found.
+         */
+        platform?: string;
+        /**
+         * Tor software version without leading "Tor" as reported by the bridge in the "platform" line of its server
+         * descriptor. Omitted if not provided by the bridge, if the descriptor containing this information cannot
+         * be found, or if the bridge runs an alternative Tor implementation.
+         */
+        version?: string;
+        /**
+         * Boolean field saying whether the Tor software version of this bridge is recommended by the directory
+         * authorities or not. Uses the bridge version in the bridge network status. Omitted if either the directory
+         * authorities did not recommend versions, or the bridge did not report which version it runs.
+         */
+        recommended_version?: boolean;
+        /**
+         * Status of the Tor software version of this bridge based on the versions recommended by the directory authorities.
+         * Possible version statuses are: `recommended` if a version is listed as recommended; `experimental` if a
+         * version is newer than every recommended version; `obsolete` if a version is older than every recommended version;
+         * `new in series` if a version has other recommended versions with the same first three components, and the
+         * version is newer than all such recommended versions, but it is not newer than every recommended version;
+         * `unrecommended` if none of the above conditions hold. Omitted if either the directory authorities did not
+         * recommend versions, or the bridge did not report which version it runs.
+         */
+        version_status?:
+            | 'recommended'
+            | 'experimental'
+            | 'obsolete'
+            | 'new in series'
+            | 'unrecommended';
+        /**
+         * Array of (pluggable) transport names supported by this bridge.
+         */
+        transports?: string[];
+    }
+
+    interface NodeBandwidth {
+        /**
+         * Node fingerprint consisting of 40 upper-case hexadecimal characters.
+         */
+        fingerprint: string;
+        /**
+         * Object containing graph history objects with written bytes for different time periods. Keys are string
+         * representation of the time period covered by the graph history object. Keys are fixed strings `3_days`,
+         * `1_week`, `1_month`, `6_months`, `1_year`, and `5_years`. Keys refer to the last known bandwidth history
+         * of a node, not to the time when the bandwidth document was published. A graph history object is only
+         * ontained if the time period it covers is not already contained in another graph history object with shorter
+         * time period and higher data resolution. Similarly, a graph history object is excluded if the node did not
+         * provide bandwidth histories on the required level of detail. The unit is bytes per second. Contained
+         * graph history objects may contain null values if the node did not provide any bandwidth data or only data
+         * for less than 20% of a given time period.
+         */
+        write_history?: Partial<
+            Record<'3_days' | '1_week' | '1_month' | '6_months' | '1_year' | '5_years', Histogram>
+        >;
+        /**
+         * Object containing graph history objects with read bytes for different time periods. The specification
+         * of graph history objects is similar to those in the `write_history` field.
+         */
+        read_history?: Partial<
+            Record<'3_days' | '1_week' | '1_month' | '6_months' | '1_year' | '5_years', Histogram>
+        >;
+    }
+
+    interface RelayWeights {
+        /**
+         * Node fingerprint consisting of 40 upper-case hexadecimal characters.
+         */
+        fingerprint: string;
+        /**
+         * History object containing the fraction of this relay's consensus weight compared to the sum of all consensus
+         * weights in the network. This fraction is a very rough approximation of the probability of this relay to be
+         * selected by clients. Keys are string representation of the time period covered by the graph history object.
+         * Keys are fixed strings `1_week`, `1_month`, `6_months`, `1_year`, and `5_years`. Keys refer to the last known
+         * weights history of a relay, not to the time when the weights document was published. A graph history object is
+         * only contained if the time period it covers is not already contained in another graph history object with shorter
+         * time period and higher data resolution. The unit is path-selection probability. Contained graph history objects
+         * may contain null values if the relay was running less than 20% of a given time period.
+         */
+        consensus_weight_fraction?: Partial<
+            Record<'1_week' | '1_month' | '6_months' | '1_year' | '5_years', Histogram>
+        >;
+        /**
+         * History object containing the probability of this relay to be selected for the guard position.
+         * This probability is calculated based on consensus weights, relay flags, and bandwidth weights in the consensus.
+         * Path selection depends on more factors, so that this probability can only be an approximation.
+         * The specification of this history object is similar to that in the `consensus_weight_fraction` field above.
+         */
+        guard_probability?: Partial<
+            Record<'1_week' | '1_month' | '6_months' | '1_year' | '5_years', Histogram>
+        >;
+        /**
+         * History object containing the probability of this relay to be selected for the middle position.
+         * This probability is calculated based on consensus weights, relay flags, and bandwidth weights in the consensus.
+         * Path selection depends on more factors, so that this probability can only be an approximation.
+         * The specification of this history object is similar to that in the `consensus_weight_fraction` field above.
+         */
+        middle_probability?: Partial<
+            Record<'1_week' | '1_month' | '6_months' | '1_year' | '5_years', Histogram>
+        >;
+        /**
+         * History object containing the probability of this relay to be selected for the exit position.
+         * This probability is calculated based on consensus weights, relay flags, and bandwidth weights in the consensus.
+         * Path selection depends on more factors, so that this probability can only be an approximation.
+         * The specification of this history object is similar to that in the `consensus_weight_fraction` field above.
+         */
+        exit_probability?: Partial<
+            Record<'1_week' | '1_month' | '6_months' | '1_year' | '5_years', Histogram>
+        >;
+        /**
+         * History object containing the absolute consensus weight of this relay. The specification of this history
+         * object is similar to that in the `consensus_weight_fraction` field above.
+         */
+        consensus_weight?: Partial<
+            Record<'1_week' | '1_month' | '6_months' | '1_year' | '5_years', Histogram>
+        >;
+    }
+
+    interface BridgeClients {
+        /**
+         * SHA-1 hash of the bridge fingerprint consisting of 40 upper-case hexadecimal characters.
+         */
+        fingerprint: string;
+        /**
+         * Object containing graph history objects with the average number of clients connecting to this bridge.
+         * Keys are string representation of the time period covered by the graph history object. Keys are fixed strings
+         * `6_months`, `1_year`, and `5_years`. Keys refer to the last known clients history of a bridge, not to the time
+         * when the clients document was published. A graph history object is only contained if the time period it
+         * covers is not already contained in another clients graph object with shorter time period and higher
+         * data resolution. The unit is number of clients. Contained graph history objects may contain null values
+         * if the bridge did not report client statistics for at least 50% of a given time period.
+         */
+        average_clients?: Partial<Record<'6_months' | '1_year' | '5_years', Histogram>>;
+    }
+
+    interface RelayUptime {
+        /**
+         * Relay fingerprint consisting of 40 upper-case hexadecimal characters.
+         */
+        fingerprint: string;
+        /**
+         * Object containing graph history objects with the fractional uptime of this relay. Keys are string
+         * representation of the time period covered by the graph history object. Keys are fixed strings
+         * `1_week`, `1_month`, `6_months`, `1_year`, and `5_years`. Keys refer to the last known uptime history
+         * of a relay, not to the time when the uptime document was published. A graph history object is only
+         * contained if the time period it covers is not already contained in another graph history object with
+         * shorter time period and higher data resolution. The unit is fractional uptime from `0` to `1`.
+         * Contained graph history objects may contain null values if less than 20% of network statuses have been
+         * processed for a given time period.
+         */
+        uptime?: Partial<
+            Record<'1_week' | '1_month' | '6_months' | '1_year' | '5_years', Histogram>
+        >;
+        /**
+         * Object containing fractional times of this relay having relay flags assigned. Keys are flag names like
+         * `Running` or `Exit`, values are objects similar to the uptime field above, again with keys like
+         * `1_week` etc. If a relay never had a given relay flag assigned, no object is included for that flag.
+         */
+        flags?: {
+            [key: string]: Partial<
+                Record<'1_week' | '1_month' | '6_months' | '1_year' | '5_years', Histogram>
+            >;
+        };
+    }
+
+    interface BridgeUptime {
+        /**
+         * SHA-1 hash of the bridge fingerprint consisting of 40 upper-case hexadecimal characters.
+         */
+        fingerprint: string;
+        /**
+         * Object containing uptime history objects for different time periods. The specification of uptime history
+         * objects is similar to those in the `uptime` field of `RelayUptime`.
+         */
+        uptime?: Partial<
+            Record<'1_week' | '1_month' | '6_months' | '1_year' | '5_years', Histogram>
+        >;
+    }
+
+    interface Histogram {
+        first: string;
+        last: string;
+        interval: number;
+        factor: number;
+        count: number;
+        values: number[];
+    }
+}
diff --git a/types/onionoo/onionoo-tests.ts b/types/onionoo/onionoo-tests.ts
new file mode 100644
index 0000000000..10bf00900b
--- /dev/null
+++ b/types/onionoo/onionoo-tests.ts
@@ -0,0 +1,38 @@
+import Onionoo = require('onionoo');
+import KeyvRedis = require('@keyv/redis');
+
+const onionoo = new Onionoo();
+onionoo; // $ExpectType Instance & Endpoints
+
+const query = {
+    limit: 10,
+    running: true,
+    order: '-consensus_weight',
+};
+
+onionoo.summary(query).then(response => {
+    response.body; // $ExpectType Response<RelaySummary, BridgeSummary>
+
+    const body = response.body;
+
+    body.version; // $ExpectType string
+    body.relays_published; // $ExpectType string
+    body.relays; // $ExpectType RelaySummary[]
+    body.bridges_published; // $ExpectType string
+    body.bridges; // $ExpectType BridgeSummary[]
+});
+onionoo.details(query); // $ExpectType GotPromise<Response<Relay, Bridge>>
+onionoo.bandwidth(query); // $ExpectType GotPromise<Response<NodeBandwidth, NodeBandwidth>>
+onionoo.weights(query); // $ExpectType GotPromise<Response<RelayWeights, undefined>>
+onionoo.clients(query); // $ExpectType GotPromise<Response<undefined, BridgeClients>>
+onionoo.uptime(query); // $ExpectType GotPromise<Response<RelayUptime, BridgeUptime>>
+
+// $ExpectType Instance & Partial<Endpoints>
+new Onionoo({
+    baseUrl: 'https://onionoo.torproject.org',
+    endpoints: ['summary', 'details', 'bandwidth', 'weights', 'clients', 'uptime'],
+    cache: false,
+});
+
+new Onionoo({ cache: new Map() });
+new Onionoo({ cache: new KeyvRedis('redis://user:pass@localhost:6379') });
diff --git a/types/onionoo/tsconfig.json b/types/onionoo/tsconfig.json
new file mode 100644
index 0000000000..d2b0560222
--- /dev/null
+++ b/types/onionoo/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "paths": {
+            "@keyv/redis": [
+                "keyv__redis"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "onionoo-tests.ts"
+    ]
+}
diff --git a/types/onionoo/tslint.json b/types/onionoo/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/onionoo/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/openapi-factory/index.d.ts b/types/openapi-factory/index.d.ts
index e41958e6df..ad26ef8177 100644
--- a/types/openapi-factory/index.d.ts
+++ b/types/openapi-factory/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for openapi-factory 4.2
-// Project: https://github.com/wparad/openapi-factory.js
+// Project: https://github.com/wparad/openapi-factory.js, https://github.com/wparad/node-openapi-factory
 // Definitions by: Daan Boerlage <https://github.com/runebaas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/openfin/_v2/api/application/application.d.ts b/types/openfin/_v2/api/application/application.d.ts
index 37263a9a63..677e1cd992 100644
--- a/types/openfin/_v2/api/application/application.d.ts
+++ b/types/openfin/_v2/api/application/application.d.ts
@@ -19,6 +19,9 @@ export interface ApplicationInfo {
     parentUuid?: string;
     runtime: object;
 }
+export interface LogInfo {
+    logId: string;
+}
 export declare class NavigationRejectedReply extends Reply<'window-navigation-rejected', void> {
     sourceName: string;
     url: string;
@@ -34,6 +37,64 @@ export interface TrayInfo {
     x: number;
     y: number;
 }
+/**
+ * @typedef {object} Application~options
+ * @summary Application creation options.
+ * @desc This is the options object required by {@link Application.create Application.create}.
+ *
+ * The following options are required:
+ * * `uuid` is required in the app manifest as well as by {@link Application.create Application.create}
+ * * `name` is optional in the app manifest but required by {@link Application.create Application.create}
+ * * `url` is optional in both the app manifest {@link Application.create Application.create} and  but is usually given
+ * (defaults to `"about:blank"` when omitted).
+ *
+ * _This jsdoc typedef mirrors the `ApplicationOptions` TypeScript interface in `@types/openfin`._
+ *
+ * **IMPORTANT NOTE:**
+ * This object inherits all the properties of the window creation {@link Window~options options} object,
+ * which will take priority over those of the same name that may be provided in `mainWindowOptions`.
+ *
+ * @property {boolean} [disableIabSecureLogging=false]
+ * When set to `true` it will disable IAB secure logging for the app.
+ *
+ * @property {string} [loadErrorMessage="There was an error loading the application."]
+ * An error message to display when the application (launched via manifest) fails to load.
+ * A dialog box will be launched with the error message just before the runtime exits.
+ * Load fails such as failed DNS resolutions or aborted connections as well as cancellations, _e.g.,_ `window.stop()`,
+ * will trigger this dialog.
+ * Client response codes such as `404 Not Found` are not treated as fails as they are valid server responses.
+ *
+ * @property {Window~options} [mainWindowOptions]
+ * The options of the main window of the application.
+ * For a description of these options, click the link (in the Type column).
+ *
+ * @property {string} [name]
+ * The name of the application (and the application's main window).
+ *
+ * If provided, _must_ match `uuid`.
+ *
+ * @property {boolean} [nonPersistent=false]
+ * A flag to configure the application as non-persistent.
+ * Runtime exits when there are no persistent apps running.
+ *
+ * @property {boolean} [plugins=false]
+ * Enable Flash at the application level.
+ *
+ * @property {boolean} [spellCheck=false]
+ * Enable spell check at the application level.
+ *
+ * @property {string} [url="about:blank"]
+ * The url to the application (specifically the application's main window).
+ *
+ * @property {string} uuid
+ * The _Unique Universal Identifier_ (UUID) of the application, unique within the set of all other applications
+ *  running in the OpenFin Runtime.
+ *
+ * Note that `name` and `uuid` must match.
+ *
+ * @property {boolean} [webSecurity=true]
+ * When set to `false` it will disable the same-origin policy for the app.
+ */
 /**
  * @lends Application
  */
@@ -54,14 +115,16 @@ export default class ApplicationModule extends Base {
      * @static
      */
     wrapSync(identity: Identity): Application;
-    /**
-     * Creates a new Application.
-     * @param { ApplicationOption } appOptions
-     * @return {Promise.<Application>}
-     * @tutorial Application.create
-     * @static
-     */
+    private _create;
     create(appOptions: ApplicationOption): Promise<Application>;
+    /**
+    * Creates and starts a new Application.
+    * @param { ApplicationOption } appOptions
+    * @return {Promise.<Application>}
+    * @tutorial Application.start
+    * @static
+    */
+    start(appOptions: ApplicationOption): Promise<Application>;
     /**
      * Asynchronously returns an Application object that represents the current application
      * @return {Promise.<Application>}
@@ -77,18 +140,20 @@ export default class ApplicationModule extends Base {
      */
     getCurrentSync(): Application;
     /**
-     * Retrieves application's manifest and returns a wrapped application.
+     * Retrieves application's manifest and returns a running instance of the application.
      * @param {string} manifestUrl - The URL of app's manifest.
      * @return {Promise.<Application>}
-     * @tutorial Application.createFromManifest
+     * @tutorial Application.startFromManifest
      * @static
      */
+    startFromManifest(manifestUrl: string): Promise<Application>;
     createFromManifest(manifestUrl: string): Promise<Application>;
 }
 /**
  * @classdesc An object representing an application. Allows the developer to create,
- * execute, show/close an application as well as listen to application events.
+ * execute, show/close an application as well as listen to <a href="tutorial-Application.EventEmitter.html">application events</a>.
  * @class
+ * @hideconstructor
  */
 export declare class Application extends EmitterBase<ApplicationEvents> {
     identity: Identity;
@@ -96,6 +161,83 @@ export declare class Application extends EmitterBase<ApplicationEvents> {
     private window;
     constructor(wire: Transport, identity: Identity);
     private windowListFromIdentityList;
+    /**
+     * Adds a listener to the end of the listeners array for the specified event.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - Called whenever an event of the specified type occurs.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function addListener
+     * @memberof Application
+     * @instance
+     * @tutorial Application.EventEmitter
+     */
+    /**
+     * Adds a listener to the end of the listeners array for the specified event.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - Called whenever an event of the specified type occurs.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function on
+     * @memberof Application
+     * @instance
+     * @tutorial Application.EventEmitter
+     */
+    /**
+     * Adds a one time listener for the event. The listener is invoked only the first time the event is fired, after which it is removed.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function once
+     * @memberof Application
+     * @instance
+     * @tutorial Application.EventEmitter
+     */
+    /**
+     * Adds a listener to the beginning of the listeners array for the specified event.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function prependListener
+     * @memberof Application
+     * @instance
+     * @tutorial Application.EventEmitter
+     */
+    /**
+     * Adds a one time listener for the event. The listener is invoked only the first time the event is fired, after which it is removed.
+     * The listener is added to the beginning of the listeners array.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function prependOnceListener
+     * @memberof Application
+     * @instance
+     * @tutorial Application.EventEmitter
+     */
+    /**
+     * Remove a listener from the listener array for the specified event.
+     * Caution: Calling this method changes the array indices in the listener array behind the listener.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function removeListener
+     * @memberof Application
+     * @instance
+     * @tutorial Application.EventEmitter
+     */
+    /**
+     * Removes all listeners, or those of the specified event.
+     * @param { string | symbol } [eventType]  - The type of the event.
+     * @return {Promise.<this>}
+     * @function removeAllListeners
+     * @memberof Application
+     * @instance
+     * @tutorial Application.EventEmitter
+     */
     /**
      * Determines if the application is currently running.
      * @return {Promise.<boolean>}
@@ -104,11 +246,14 @@ export declare class Application extends EmitterBase<ApplicationEvents> {
     isRunning(): Promise<boolean>;
     /**
      * Closes the application and any child windows created by the application.
+     * Cleans the application from state so it is no longer found in getAllApplications.
      * @param { boolean } [force = false] Close will be prevented from closing when force is false and
      *  ‘close-requested’ has been subscribed to for application’s main window.
      * @return {Promise.<boolean>}
-     * @tutorial Application.close
+     * @tutorial Application.quit
      */
+    quit(force?: boolean): Promise<void>;
+    private _close;
     close(force?: boolean): Promise<void>;
     /**
      * Retrieves an array of wrapped fin.Windows for each of the application’s child windows.
@@ -175,11 +320,6 @@ export declare class Application extends EmitterBase<ApplicationEvents> {
      * @tutorial Application.restart
      */
     restart(): Promise<void>;
-    /**
-     * Runs the application. When the application is created, run must be called.
-     * @return {Promise.<void>}
-     * @tutorial Application.run
-     */
     run(): Promise<void>;
     /**
      * Instructs the RVM to schedule one restart of the application.
@@ -188,7 +328,14 @@ export declare class Application extends EmitterBase<ApplicationEvents> {
      */
     scheduleRestart(): Promise<void>;
     /**
-     * Adds a customizable icon in the system tray and notifies the application when clicked.
+     * Sends a message to the RVM to upload the application's logs. On success,
+     * an object containing logId is returned.
+     * @return {Promise.<any>}
+     * @tutorial Application.sendApplicationLog
+     */
+    sendApplicationLog(): Promise<LogInfo>;
+    /**
+     * Adds a customizable icon in the system tray.  To listen for a click on the icon use the `tray-icon-clicked` event.
      * @param { string } iconUrl Image URL to be used as the icon
      * @return {Promise.<void>}
      * @tutorial Application.setTrayIcon
@@ -196,10 +343,10 @@ export declare class Application extends EmitterBase<ApplicationEvents> {
     setTrayIcon(iconUrl: string): Promise<void>;
     /**
      * Sets new application's shortcut configuration.
-     * @param { Object } config New application's shortcut configuration.
-     * @param {Boolean} [config.desktop] - Enable/disable desktop shortcut.
-     * @param {Boolean} [config.startMenu] - Enable/disable start menu shortcut.
-     * @param {Boolean} [config.systemStartup] - Enable/disable system startup shortcut.
+     * @param { ShortCutConfig } config New application's shortcut configuration.
+     * @param { boolean } [config.desktop] - Enable/disable desktop shortcut.
+     * @param { boolean } [config.startMenu] - Enable/disable start menu shortcut.
+     * @param { boolean } [config.systemStartup] - Enable/disable system startup shortcut.
      * @return {Promise.<void>}
      * @tutorial Application.setShortcuts
      */
@@ -212,6 +359,13 @@ export declare class Application extends EmitterBase<ApplicationEvents> {
      * @tutorial Application.setZoomLevel
      */
     setZoomLevel(level: number): Promise<void>;
+    /**
+     * Sets a username to correlate with App Log Management.
+     * @param { string } username Username to correlate with App's Log.
+     * @return {Promise.<void>}
+     * @tutorial Application.setAppLogUsername
+     */
+    setAppLogUsername(username: string): Promise<void>;
     /**
      * @summary Retrieves information about the system tray.
      * @desc The only information currently returned is the position and dimensions.
diff --git a/types/openfin/_v2/api/base.d.ts b/types/openfin/_v2/api/base.d.ts
index 5cbb8658a7..4be094441a 100644
--- a/types/openfin/_v2/api/base.d.ts
+++ b/types/openfin/_v2/api/base.d.ts
@@ -4,7 +4,7 @@ import { Identity } from '../identity';
 import { EventEmitter } from 'events';
 import { EmitterAccessor } from './events/emitterMap';
 import { BaseEventMap } from './events/base';
-interface SubOptions {
+export interface SubOptions {
     timestamp?: number;
 }
 export declare class Base {
@@ -28,14 +28,14 @@ export declare class EmitterBase<EventTypes extends BaseEventMap> extends Base {
     listenerCount: (type: string | symbol) => number;
     protected registerEventListener: (eventType: string | symbol | Extract<keyof EventTypes, string>, options?: SubOptions) => Promise<EventEmitter>;
     protected deregisterEventListener: (eventType: string | symbol | Extract<keyof EventTypes, string>, options?: SubOptions) => Promise<void | EventEmitter>;
-    on<E extends Extract<keyof EventTypes, string> | string | symbol>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions): Promise<this>;
+    on: <E extends string | symbol | Extract<keyof EventTypes, string>>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions) => Promise<this>;
     addListener: <E extends string | symbol | Extract<keyof EventTypes, string>>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions) => Promise<this>;
-    once<E extends Extract<keyof EventTypes, string> | string | symbol>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions): Promise<this>;
-    prependListener<E extends Extract<keyof EventTypes, string> | string | symbol>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions): Promise<this>;
-    prependOnceListener<E extends Extract<keyof EventTypes, string> | string | symbol>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions): Promise<this>;
-    removeListener<E extends Extract<keyof EventTypes, string> | string | symbol>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions): Promise<this>;
+    once: <E extends string | symbol | Extract<keyof EventTypes, string>>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions) => Promise<this>;
+    prependListener: <E extends string | symbol | Extract<keyof EventTypes, string>>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions) => Promise<this>;
+    prependOnceListener: <E extends string | symbol | Extract<keyof EventTypes, string>>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions) => Promise<this>;
+    removeListener: <E extends string | symbol | Extract<keyof EventTypes, string>>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions) => Promise<this>;
     protected deregisterAllListeners: (eventType: string | symbol | Extract<keyof EventTypes, string>) => Promise<void | EventEmitter>;
-    removeAllListeners(eventType?: Extract<keyof EventTypes, string> | string | symbol): Promise<this>;
+    removeAllListeners: (eventType?: string | symbol | Extract<keyof EventTypes, string>) => Promise<this>;
 }
 export declare class Reply<TOPIC extends string, TYPE extends string | void> implements Identity {
     topic: TOPIC;
@@ -43,4 +43,3 @@ export declare class Reply<TOPIC extends string, TYPE extends string | void> imp
     uuid: string;
     name?: string;
 }
-export {};
diff --git a/types/openfin/_v2/api/clipboard/clipboard.d.ts b/types/openfin/_v2/api/clipboard/clipboard.d.ts
index 11b466dea0..5657984840 100644
--- a/types/openfin/_v2/api/clipboard/clipboard.d.ts
+++ b/types/openfin/_v2/api/clipboard/clipboard.d.ts
@@ -2,7 +2,7 @@ import { Base } from '../base';
 import { WriteRequestType, WriteAnyRequestType } from './write-request';
 /**
  * WriteRequestType interface
- * @typedef { Object } WriteRequestType
+ * @typedef { object } WriteRequestType
  * @property { string } name The name of the running application
  * @property { string } uuid The uuid of the running application
  */
diff --git a/types/openfin/_v2/api/events/window.d.ts b/types/openfin/_v2/api/events/window.d.ts
index 85d4d553f0..8899ae0c5a 100644
--- a/types/openfin/_v2/api/events/window.d.ts
+++ b/types/openfin/_v2/api/events/window.d.ts
@@ -113,15 +113,13 @@ export interface WindowEventMapping<Topic = string, Type = string> extends BaseE
     'closed': WindowEvent<Topic, Type>;
     'closing': WindowEvent<Topic, Type>;
     'crashed': CrashedEvent & WindowEvent<Topic, Type>;
-    'disabled-frame-bounds-changed': WindowBoundsChange<Topic, Type>;
-    'disabled-frame-bounds-changing': WindowBoundsChange<Topic, Type>;
+    'disabled-movement-bounds-changed': WindowBoundsChange<Topic, Type>;
+    'disabled-movement-bounds-changing': WindowBoundsChange<Topic, Type>;
     'embedded': WindowEvent<Topic, Type>;
     'end-user-bounds-changing': WindowBeginBoundsChangingEvent<Topic, Type>;
     'external-process-exited': WindowExternalProcessExitedEvent<Topic, Type>;
     'external-process-started': WindowExternalProcessStartedEvent<Topic, Type>;
     'focused': WindowEvent<Topic, Type>;
-    'frame-disabled': WindowEvent<Topic, Type>;
-    'frame-enabled': WindowEvent<Topic, Type>;
     'group-changed': WindowGroupChanged<Topic, Type>;
     'hidden': WindowHiddenEvent<Topic, Type>;
     'initialized': WindowEvent<Topic, Type>;
@@ -136,6 +134,8 @@ export interface WindowEventMapping<Topic = string, Type = string> extends BaseE
     'restored': WindowEvent<Topic, Type>;
     'show-requested': WindowEvent<Topic, Type>;
     'shown': WindowEvent<Topic, Type>;
+    'user-movement-disabled': WindowEvent<Topic, Type>;
+    'user-movement-enabled': WindowEvent<Topic, Type>;
 }
 export interface PropagatedWindowEventMapping<Topic = string, Type = string> extends BaseEventMap {
     'window-begin-user-bounds-changing': WindowBeginBoundsChangingEvent<Topic, Type>;
@@ -145,15 +145,13 @@ export interface PropagatedWindowEventMapping<Topic = string, Type = string> ext
     'window-closed': WindowEvent<Topic, Type>;
     'window-closing': WindowEvent<Topic, Type>;
     'window-crashed': CrashedEvent & WindowEvent<Topic, Type>;
-    'window-disabled-frame-bounds-changed': WindowBoundsChange<Topic, Type>;
-    'window-disabled-frame-bounds-changing': WindowBoundsChange<Topic, Type>;
+    'window-disabled-movement-bounds-changed': WindowBoundsChange<Topic, Type>;
+    'window-disabled-movement-bounds-changing': WindowBoundsChange<Topic, Type>;
     'window-embedded': WindowEvent<Topic, Type>;
     'window-end-user-bounds-changing': WindowBeginBoundsChangingEvent<Topic, Type>;
     'window-external-process-exited': WindowExternalProcessExitedEvent<Topic, Type>;
     'window-external-process-started': WindowExternalProcessStartedEvent<Topic, Type>;
     'window-focused': WindowEvent<Topic, Type>;
-    'window-frame-disabled': WindowEvent<Topic, Type>;
-    'window-frame-enabled': WindowEvent<Topic, Type>;
     'window-group-changed': WindowGroupChanged<Topic, Type>;
     'window-hidden': WindowHiddenEvent<Topic, Type>;
     'window-initialized': WindowEvent<Topic, Type>;
@@ -167,6 +165,8 @@ export interface PropagatedWindowEventMapping<Topic = string, Type = string> ext
     'window-reloaded': WindowReloadedEvent<Topic, Type>;
     'window-restored': WindowEvent<Topic, Type>;
     'window-shown': WindowEvent<Topic, Type>;
+    'window-user-movement-disabled': WindowEvent<Topic, Type>;
+    'window-user-movement-enabled': WindowEvent<Topic, Type>;
 }
 export declare type WindowEvents = {
     [Type in keyof WindowEventMapping]: WindowEventMapping<'window', Type>[Type];
diff --git a/types/openfin/_v2/api/external-application/external-application.d.ts b/types/openfin/_v2/api/external-application/external-application.d.ts
index a4f44851e9..1c6bc38dbf 100644
--- a/types/openfin/_v2/api/external-application/external-application.d.ts
+++ b/types/openfin/_v2/api/external-application/external-application.d.ts
@@ -29,12 +29,90 @@ export default class ExternalApplicationModule extends Base {
 /**
  * @classdesc An ExternalApplication object representing an application. Allows
  * the developer to create, execute, show and close an external application as
- * well as listen to application events.
+ * well as listen to <a href="tutorial-ExternalApplication.EventEmitter.html">application events</a>.
  * @class
+ * @hideconstructor
  */
 export declare class ExternalApplication extends EmitterBase<ExternalApplicationEvents> {
     identity: Identity;
     constructor(wire: Transport, identity: Identity);
+    /**
+     * Adds a listener to the end of the listeners array for the specified event.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - Called whenever an event of the specified type occurs.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function addListener
+     * @memberof ExternalApplication
+     * @instance
+     * @tutorial ExternalApplication.EventEmitter
+     */
+    /**
+     * Adds a listener to the end of the listeners array for the specified event.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - Called whenever an event of the specified type occurs.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function on
+     * @memberof ExternalApplication
+     * @instance
+     * @tutorial ExternalApplication.EventEmitter
+     */
+    /**
+     * Adds a one time listener for the event. The listener is invoked only the first time the event is fired, after which it is removed.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function once
+     * @memberof ExternalApplication
+     * @instance
+     * @tutorial ExternalApplication.EventEmitter
+     */
+    /**
+     * Adds a listener to the beginning of the listeners array for the specified event.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function prependListener
+     * @memberof ExternalApplication
+     * @instance
+     * @tutorial ExternalApplication.EventEmitter
+     */
+    /**
+     * Adds a one time listener for the event. The listener is invoked only the first time the event is fired, after which it is removed.
+     * The listener is added to the beginning of the listeners array.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function prependOnceListener
+     * @memberof ExternalApplication
+     * @instance
+     * @tutorial ExternalApplication.EventEmitter
+     */
+    /**
+     * Remove a listener from the listener array for the specified event.
+     * Caution: Calling this method changes the array indices in the listener array behind the listener.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function removeListener
+     * @memberof ExternalApplication
+     * @instance
+     * @tutorial ExternalApplication.EventEmitter
+     */
+    /**
+     * Removes all listeners, or those of the specified event.
+     * @param { string | symbol } [eventType]  - The type of the event.
+     * @return {Promise.<this>}
+     * @function removeAllListeners
+     * @memberof ExternalApplication
+     * @instance
+     * @tutorial ExternalApplication.EventEmitter
+     */
     /**
      * Retrieves information about the external application.
      * @return {Promise.<ExternalApplicationInfo>}
diff --git a/types/openfin/_v2/api/frame/frame.d.ts b/types/openfin/_v2/api/frame/frame.d.ts
index 8795ae190b..2a1b4aa735 100644
--- a/types/openfin/_v2/api/frame/frame.d.ts
+++ b/types/openfin/_v2/api/frame/frame.d.ts
@@ -46,13 +46,91 @@ export default class _FrameModule extends Base {
 }
 /**
  * @classdesc Represents a way to interact with `iframes`. Facilitates discovery of current context
- * (iframe or main window) as well as the ability to listen for frame-specific events.
+ * (iframe or main window) as well as the ability to listen for <a href="tutorial-Frame.EventEmitter.html">frame-specific events</a>.
  * @class
  * @alias Frame
+ * @hideconstructor
  */
 export declare class _Frame extends EmitterBase<FrameEvents> {
     identity: Identity;
     constructor(wire: Transport, identity: Identity);
+    /**
+     * Adds the listener function to the end of the listeners array for the specified event type.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - Called whenever an event of the specified type occurs.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function addListener
+     * @memberof Frame
+     * @instance
+     * @tutorial Frame.EventEmitter
+     */
+    /**
+     * Adds a listener to the end of the listeners array for the specified event.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - Called whenever an event of the specified type occurs.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function on
+     * @memberof Frame
+     * @instance
+     * @tutorial Frame.EventEmitter
+     */
+    /**
+     * Adds a one time listener for the event. The listener is invoked only the first time the event is fired, after which it is removed.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function once
+     * @memberof Frame
+     * @instance
+     * @tutorial Frame.EventEmitter
+     */
+    /**
+     * Adds a listener to the beginning of the listeners array for the specified event.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function prependListener
+     * @memberof Frame
+     * @instance
+     * @tutorial Frame.EventEmitter
+     */
+    /**
+     * Adds a one time listener for the event. The listener is invoked only the first time the event is fired, after which it is removed.
+     * The listener is added to the beginning of the listeners array.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function prependOnceListener
+     * @memberof Frame
+     * @instance
+     * @tutorial Frame.EventEmitter
+     */
+    /**
+     * Remove a listener from the listener array for the specified event.
+     * Caution: Calling this method changes the array indices in the listener array behind the listener.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function removeListener
+     * @memberof Frame
+     * @instance
+     * @tutorial Frame.EventEmitter
+     */
+    /**
+     * Removes all listeners, or those of the specified event.
+     * @param { string | symbol } [eventType]  - The type of the event.
+     * @return {Promise.<this>}
+     * @function removeAllListeners
+     * @memberof Frame
+     * @instance
+     * @tutorial Frame.EventEmitter
+     */
     /**
      * Returns a frame info object for the represented frame
      * @return {Promise.<FrameInfo>}
diff --git a/types/openfin/_v2/api/interappbus/channel/channel.d.ts b/types/openfin/_v2/api/interappbus/channel/channel.d.ts
index 1c9a502e12..bce67e9aed 100644
--- a/types/openfin/_v2/api/interappbus/channel/channel.d.ts
+++ b/types/openfin/_v2/api/interappbus/channel/channel.d.ts
@@ -12,6 +12,7 @@ export interface ChannelMessagePayload extends Identity {
     payload: any;
 }
 export declare class ChannelBase {
+    protected removeChannel: (mapKey: string) => void;
     protected subscriptions: any;
     defaultAction: (action?: string, payload?: any, senderIdentity?: ProviderIdentity) => any;
     private preAction;
@@ -20,10 +21,11 @@ export declare class ChannelBase {
     private defaultSet;
     protected send: (to: Identity, action: string, payload: any) => Promise<Message<void>>;
     protected providerIdentity: ProviderIdentity;
+    protected sendRaw: Transport['sendAction'];
     constructor(providerIdentity: ProviderIdentity, send: Transport['sendAction']);
     processAction(action: string, payload: any, senderIdentity: ProviderIdentity): Promise<any>;
     beforeAction(func: Action): void;
-    onError(func: (e: any, action: string, id: Identity) => any): void;
+    onError(func: (action: string, error: any, id: Identity) => any): void;
     afterAction(func: Action): void;
     remove(action: string): void;
     setDefaultAction(func: (action?: string, payload?: any, senderIdentity?: ProviderIdentity) => any): void;
diff --git a/types/openfin/_v2/api/interappbus/channel/client.d.ts b/types/openfin/_v2/api/interappbus/channel/client.d.ts
index d1c128a349..65b72283ad 100644
--- a/types/openfin/_v2/api/interappbus/channel/client.d.ts
+++ b/types/openfin/_v2/api/interappbus/channel/client.d.ts
@@ -1,6 +1,11 @@
 import { ChannelBase, ProviderIdentity } from './channel';
 import Transport from '../../../transport/transport';
+declare type DisconnectionListener = (providerIdentity: ProviderIdentity) => any;
 export declare class ChannelClient extends ChannelBase {
+    private disconnectListener;
     constructor(providerIdentity: ProviderIdentity, send: Transport['sendAction']);
     dispatch(action: string, payload?: any): Promise<any>;
+    onDisconnection(listener: DisconnectionListener): void;
+    disconnect(): Promise<void>;
 }
+export {};
diff --git a/types/openfin/_v2/api/interappbus/channel/index.d.ts b/types/openfin/_v2/api/interappbus/channel/index.d.ts
index 2b2d963932..5d4ce0ff8b 100644
--- a/types/openfin/_v2/api/interappbus/channel/index.d.ts
+++ b/types/openfin/_v2/api/interappbus/channel/index.d.ts
@@ -26,6 +26,7 @@ export declare class Channel extends EmitterBase<ChannelEvents> {
     onChannelDisconnect(listener: (...args: any[]) => void): Promise<void>;
     connect(channelName: string, options?: ConnectOptions): Promise<ChannelClient>;
     create(channelName: string): Promise<ChannelProvider>;
+    protected removeChannelFromMap(mapKey: string): void;
     onmessage: (msg: ChannelMessage) => boolean;
     private processChannelMessage;
     private processChannelConnection;
diff --git a/types/openfin/_v2/api/interappbus/channel/provider.d.ts b/types/openfin/_v2/api/interappbus/channel/provider.d.ts
index 4b978c2781..569f824a8d 100644
--- a/types/openfin/_v2/api/interappbus/channel/provider.d.ts
+++ b/types/openfin/_v2/api/interappbus/channel/provider.d.ts
@@ -2,6 +2,7 @@ import { ChannelBase, ProviderIdentity } from './channel';
 import Transport from '../../../transport/transport';
 import { Identity } from '../../../main';
 export declare type ConnectionListener = (identity: Identity, connectionMessage?: any) => any;
+export declare type DisconnectionListener = (identity: Identity) => any;
 export declare class ChannelProvider extends ChannelBase {
     private connectListener;
     private disconnectListener;
@@ -11,5 +12,6 @@ export declare class ChannelProvider extends ChannelBase {
     processConnection(senderId: Identity, payload: any): Promise<any>;
     publish(action: string, payload: any): Promise<any>[];
     onConnection(listener: ConnectionListener): void;
-    onDisconnection(listener: ConnectionListener): void;
+    onDisconnection(listener: DisconnectionListener): void;
+    destroy(): Promise<void>;
 }
diff --git a/types/openfin/_v2/api/interappbus/interappbus.d.ts b/types/openfin/_v2/api/interappbus/interappbus.d.ts
index 48aaf7430c..12fa146fe4 100644
--- a/types/openfin/_v2/api/interappbus/interappbus.d.ts
+++ b/types/openfin/_v2/api/interappbus/interappbus.d.ts
@@ -32,7 +32,7 @@ export default class InterApplicationBus extends Base {
     publish(topic: string, message: any): Promise<void>;
     /**
      * Sends a message to a specific application on a specific topic.
-     * @param { object } destination The uuid of the application to which the message is sent
+     * @param { Identity } destination The uuid of the application to which the message is sent
      * @param { string } topic The topic on which the message is sent
      * @param { any } message The message to be sent. Can be either a primitive data
      * type (string, number, or boolean) or composite data type (object, array) that
diff --git a/types/openfin/_v2/api/notification/notification.d.ts b/types/openfin/_v2/api/notification/notification.d.ts
index 9a6bee7076..ae4e2a3d16 100644
--- a/types/openfin/_v2/api/notification/notification.d.ts
+++ b/types/openfin/_v2/api/notification/notification.d.ts
@@ -22,6 +22,7 @@ export interface NotificationCallback {
  * are controlled by the runtime.
  * @class
  * @alias Notification
+ * @hideconstructor
  */
 export declare class _Notification extends EmitterBase<NotificationEvents> {
     private listenerList;
@@ -56,6 +57,9 @@ export declare class _Notification extends EmitterBase<NotificationEvents> {
      */
     close(): Promise<void>;
 }
+/**
+ * @lends Notification
+ */
 export default class _NotificationModule extends Base {
     private nextNoteId;
     private genNoteId;
@@ -66,5 +70,12 @@ export default class _NotificationModule extends Base {
         click: string;
         message: string;
     };
+    /**
+     * Creates a new Notification.
+     * @param { object } options
+     * @return {_Notification}
+     * @tutorial Notification.create
+     * @static
+     */
     create(options: any): _Notification;
 }
diff --git a/types/openfin/_v2/api/system/monitor.d.ts b/types/openfin/_v2/api/system/monitor.d.ts
index ea4aed799c..2ae54fdf13 100644
--- a/types/openfin/_v2/api/system/monitor.d.ts
+++ b/types/openfin/_v2/api/system/monitor.d.ts
@@ -15,7 +15,7 @@ export interface MonitorDetails {
     displayDeviceActive: boolean;
     deviceScaleFactor: number;
     monitorRect: Rect;
-    name: number;
+    name: string;
     dpi: Point;
     monitor: DipScaleRects;
 }
diff --git a/types/openfin/_v2/api/system/system.d.ts b/types/openfin/_v2/api/system/system.d.ts
index 76f244cabf..bbaabe5f43 100644
--- a/types/openfin/_v2/api/system/system.d.ts
+++ b/types/openfin/_v2/api/system/system.d.ts
@@ -22,29 +22,29 @@ import { CrashReporterOption } from './crashReporterOption';
 import { SystemEvents } from '../events/system';
 /**
  * AppAssetInfo interface
- * @typedef { Object } AppAssetInfo
+ * @typedef { object } AppAssetInfo
  * @property { string } src  The URL to a zip file containing the package files (executables, dlls, etc…)
  * @property { string } alias The name of the asset
  * @property { string } version The version of the package
  * @property { string } target Specify default executable to launch. This option can be overridden in launchExternalProcess
- * @property { args } args The default command line arguments for the aforementioned target.
+ * @property { string } args The default command line arguments for the aforementioned target.
  * @property { boolean } mandatory When set to true, the app will fail to load if the asset cannot be downloaded.
  * When set to false, the app will continue to load if the asset cannot be downloaded. (Default: true)
  */
 /**
  * AppAssetRequest interface
- * @typedef { Object } AppAssetRequest
+ * @typedef { object } AppAssetRequest
  * @property { string } alias The name of the asset
  */
 /**
  * ApplicationInfo interface
- * @typedef { Object } ApplicationInfo
+ * @typedef { object } ApplicationInfo
  * @property { boolean } isRunning  true when the application is running
  * @property { string } uuid uuid of the application
  * @property { string } parentUuid uuid of the application that launches this application
  */
 /**
- * @typedef { Object } ClearCacheOption
+ * @typedef { object } ClearCacheOption
  * @summary Clear cache options.
  * @desc These are the options required by the clearCache function.
  *
@@ -55,33 +55,45 @@ import { SystemEvents } from '../events/system';
  */
 /**
  * CookieInfo interface
- * @typedef { Object } CookieInfo
+ * @typedef { object } CookieInfo
  * @property { string } name  The name of the cookie
  * @property { string } domain The domain of the cookie
  * @property { string } path The path of the cookie
  */
 /**
  * CookieOption interface
- * @typedef { Object } CookieOption
+ * @typedef { object } CookieOption
  * @property { string } name The name of the cookie
  */
 /**
  * CpuInfo interface
- * @typedef { Object } CpuInfo
+ * @typedef { object } CpuInfo
  * @property { string } model The model of the cpu
  * @property { number } speed The number in MHz
  * @property { Time } times The numbers of milliseconds the CPU has spent in different modes.
  */
 /**
 * CrashReporterOption interface
-* @typedef { Object } CrashReporterOption
+* @typedef { object } CrashReporterOption
 * @property { boolean } diagnosticMode In diagnostic mode the crash reporter will send diagnostic logs to
 *  the OpenFin reporting service on runtime shutdown
 * @property { boolean } isRunning check if it's running
 */
+/**
+ * DipRect interface
+ * @typedef { object } DipRect
+ * @property { Rect } dipRect The DIP coordinates
+ * @property { Rect } scaledRect The scale coordinates
+ */
+/**
+ * DipScaleRects interface
+ * @typedef { object } DipScaleRects
+ * @property { Rect } dipRect The DIP coordinates
+ * @property { Rect } scaledRect The scale coordinates
+ */
 /**
  * DownloadPreloadInfo interface
- * @typedef { Object } DownloadPreloadInfo
+ * @typedef { object } DownloadPreloadInfo
  * @desc downloadPreloadScripts function return value
  * @property { string } url url to the preload script
  * @property { string } error error during preload script acquisition
@@ -89,52 +101,65 @@ import { SystemEvents } from '../events/system';
  */
 /**
  * DownloadPreloadOption interface
- * @typedef { Object } DownloadPreloadOption
+ * @typedef { object } DownloadPreloadOption
  * @desc These are the options object required by the downloadPreloadScripts function
  * @property { string } url url to the preload script
  */
 /**
  * Entity interface
- * @typedef { Object } Entity
+ * @typedef { object } Entity
  * @property { string } type The type of the entity
  * @property { string } uuid The uuid of the entity
  */
 /**
  * EntityInfo interface
- * @typedef { Object } EntityInfo
+ * @typedef { object } EntityInfo
  * @property { string } name The name of the entity
  * @property { string } uuid The uuid of the entity
  * @property { Identity } parent The parent of the entity
  * @property { string } entityType The type of the entity
  */
+/**
+ * ExternalApplicationInfo interface
+ * @typedef { object } ExternalApplicationInfo
+ * @property { Identity } parent The parent identity
+ */
 /**
  * ExternalConnection interface
- * @typedef { Object } ExternalConnection
+ * @typedef { object } ExternalConnection
  * @property { string } token The token to broker an external connection
  * @property { string } uuid The uuid of the external connection
  */
 /**
  * ExternalProcessRequestType interface
- * @typedef { Object } ExternalProcessRequestType
+ * @typedef { object } ExternalProcessRequestType
  * @property { string } path The file path to where the running application resides
  * @property { string } arguments The argument passed to the running application
- * @property { Object } listener This is described in the {LaunchExternalProcessListner} type definition
+ * @property { LaunchExternalProcessListener } listener This is described in the {LaunchExternalProcessListner} type definition
+ */
+/**
+ * FrameInfo interface
+ * @typedef { object } FrameInfo
+ * @property { string } name The name of the frame
+ * @property { string } uuid The uuid of the frame
+ * @property { entityType } entityType The entity type, could be 'window', 'iframe', 'external connection' or 'unknown'
+ * @property { Identity } parent The parent identity
  */
 /**
  * GetLogRequestType interface
- * @typedef { Object } GetLogRequestType
+ * @typedef { object } GetLogRequestType
  * @property { string } name The name of the running application
  * @property { number } endFile The file length of the log file
  * @property { number } sizeLimit The set size limit of the log file
  */
 /**
  * GpuInfo interface
- * @typedef { Object } GpuInfo
+ * @typedef { object } GpuInfo
  * @property { string } name The graphics card name
  */
 /**
  * HostSpecs interface
- * @typedef { Object } HostSpecs
+ * @typedef { object } HostSpecs
  * @property { boolean } aeroGlassEnabled Value to check if Aero Glass theme is supported on Windows platforms
  * @property { string } arch "x86" for 32-bit or "x86_64" for 64-bit
  * @property { Array<CpuInfo> } cpus The same payload as Node's os.cpus()
@@ -145,17 +170,41 @@ import { SystemEvents } from '../events/system';
  */
 /**
  * Identity interface
- * @typedef { Object } Identity
+ * @typedef { object } Identity
  * @property { string } name The name of the application
  * @property { string } uuid The uuid of the application
  */
 /**
  * LogInfo interface
- * @typedef { Object } LogInfo
+ * @typedef { object } LogInfo
  * @property { string } name The filename of the log
  * @property { number } size The size of the log in bytes
  * @property { string } date The unix time at which the log was created "Thu Jan 08 2015 14:40:30 GMT-0500 (Eastern Standard Time)""
  */
+/**
+ * MonitorDetails interface
+ * @typedef { object } MonitorDetails
+ * @property { DipScaleRects } available The available DIP scale coordinates
+ * @property { Rect } availableRect The available monitor coordinates
+ * @property { string } deviceId The device id of the display
+ * @property { boolean } displayDeviceActive true if the display is active
+ * @property { number } deviceScaleFactor The device scale factor
+ * @property { Rect } monitorRect The monitor coordinates
+ * @property { string } name The name of the display
+ * @property { Point } dpi The dots per inch
+ * @property { DipScaleRects } monitor The monitor coordinates
+ */
+/**
+ * MonitorInfo interface
+ * @typedef { object } MonitorInfo
+ * @property { number } deviceScaleFactor The device scale factor
+ * @property { Point } dpi The dots per inch
+ * @property { Array<MonitorDetails> } nonPrimaryMonitors The array of monitor details
+ * @property { MonitorDetails } primaryMonitor The monitor details
+ * @property { string } reason always "api-query"
+ * @property { TaskBar } taskBar The taskbar on monitor
+ * @property { DipRect } virtualScreen The virtual display screen coordinates
+ */
 /**
  * @typedef { verbose | info | warning | error | fatal } LogLevel
  * @summary Log verbosity levels.
@@ -169,13 +218,19 @@ import { SystemEvents } from '../events/system';
  */
 /**
  * PointTopLeft interface
- * @typedef { Object } PointTopLeft
+ * @typedef { object } PointTopLeft
  * @property { number } top The mouse top position in virtual screen coordinates
  * @property { number } left The mouse left position in virtual screen coordinates
  */
+/**
+ * Point interface
+ * @typedef { object } Point
+ * @property { number } x The mouse x position
+ * @property { number } y The mouse y position
+ */
 /**
  * ProcessInfo interface
- * @typedef { Object } ProcessInfo
+ * @typedef { object } ProcessInfo
  * @property { numder } cpuUsage The percentage of total CPU usage
  * @property { string } name The application name
  * @property { number } nonPagedPoolUsage The current nonpaged pool usage in bytes
@@ -192,28 +247,36 @@ import { SystemEvents } from '../events/system';
  */
 /**
  * ProxyConfig interface
- * @typedef { Object } ProxyConfig
+ * @typedef { object } ProxyConfig
  * @property { string } proxyAddress The configured proxy address
  * @property { numder } proxyPort The configured proxy port
  * @property { string } type The proxy Type
  */
 /**
  * ProxyInfo interface
- * @typedef { Object } ProxyInfo
+ * @typedef { object } ProxyInfo
  * @property { ProxyConfig } config The proxy config
  * @property { ProxySystemInfo } system The proxy system info
  */
 /**
  * ProxySystemInfo interface
- * @typedef { Object } ProxySystemInfo
+ * @typedef { object } ProxySystemInfo
  * @property { string } autoConfigUrl The auto configuration url
  * @property { string } bypass The proxy bypass info
  * @property { boolean } enabled Value to check if a proxy is enabled
  * @property { string } proxy The proxy info
  */
+/**
+ * Rect interface
+ * @typedef { object } Rect
+ * @property { number } bottom The bottom-most coordinate
+ * @property { nubmer } left The left-most coordinate
+ * @property { number } right The right-most coordinate
+ * @property { nubmer } top The top-most coordinate
+ */
 /**
  * RegistryInfo interface
- * @typedef { Object } RegistryInfo
+ * @typedef { object } RegistryInfo
  * @property { any } data The registry data
  * @property { string } rootKey The registry root key
  * @property { string } subkey The registry key
@@ -222,13 +285,22 @@ import { SystemEvents } from '../events/system';
  */
 /**
  * RuntimeDownloadOptions interface
- * @typedef { Object } RuntimeDownloadOptions
+ * @typedef { object } RuntimeDownloadOptions
  * @desc These are the options object required by the downloadRuntime function.
  * @property { string } version The given version to download
  */
+/**
+ * RuntimeInfo interface
+ * @typedef { object } RuntimeInfo
+ * @property { string } architecture The runtime build architecture
+ * @property { string } manifestUrl The runtime manifest URL
+ * @property { nubmer } port The runtime websocket port
+ * @property { string } securityRealm The runtime security realm
+ * @property { string } version The runtime version
+ */
 /**
  * RVMInfo interface
- * @typedef { Object } RVMInfo
+ * @typedef { object } RVMInfo
  * @property { string } action The name of action: "get-rvm-info"
  * @property { string } appLogDirectory The app log directory
  * @property { string } path The path of OpenfinRVM.exe
@@ -236,25 +308,51 @@ import { SystemEvents } from '../events/system';
  * @property { string } version The version of RVM
  * @property { string } 'working-dir' The working directory
  */
+/**
+ * ShortCutConfig interface
+ * @typedef { object } ShortCutConfig
+ * @property { boolean } desktop true if application has a shortcut on the desktop
+ * @property { boolean } startMenu true if application has shortcut in the start menu
+ * @property { boolean } systemStartup true if application will be launched on system startup
+ */
+/**
+ * SubOptions interface
+ * @typedef { Object } SubOptions
+ * @property { number } timestamp The event timestamp
+ */
+/**
+ * TaskBar interface
+ * @typedef { object } TaskBar
+ * @property { string } edge which edge of a monitor the taskbar is on
+ * @property { Rect } rect The taskbar coordinates
+ */
 /**
  * TerminateExternalRequestType interface
- * @typedef { Object } TerminateExternalRequestType
+ * @typedef { object } TerminateExternalRequestType
  * @property { string } uuid The uuid of the running application
  * @property { number } timeout Time out period before the running application terminates
  * @property { boolean } killtree Value to terminate the running application
  */
 /**
  * Time interface
- * @typedef { Object } Time
+ * @typedef { object } Time
  * @property { number } user The number of milliseconds the CPU has spent in user mode
  * @property { number } nice The number of milliseconds the CPU has spent in nice mode
  * @property { number } sys The number of milliseconds the CPU has spent in sys mode
  * @property { number } idle The number of milliseconds the CPU has spent in idle mode
  * @property { number } irq The number of milliseconds the CPU has spent in irq mode
  */
+/**
+ * TrayInfo interface
+ * @typedef { object } TrayInfo
+ * @property { Bounds } bounds The bound of tray icon in virtual screen pixels
+ * @property { MonitorInfo } monitorInfo Please see fin.System.getMonitorInfo for more information
+ * @property { number } x copy of bounds.x
+ * @property { number } y copy of bounds.y
+ */
 /**
  * WindowDetail interface
- * @typedef { Object } WindowDetail
+ * @typedef { object } WindowDetail
  * @property { number } bottom The bottom-most coordinate of the window
  * @property { number } height The height of the window
  * @property { boolean } isShowing Value to check if the window is showing
@@ -267,7 +365,7 @@ import { SystemEvents } from '../events/system';
  */
 /**
  * WindowInfo interface
- * @typedef { Object } WindowInfo
+ * @typedef { object } WindowInfo
  * @property { Array<WindowDetail> } childWindows The array of child windows details
  * @property { WindowDetail } mainWindow The main window detail
  * @property { string } uuid The uuid of the application
@@ -275,11 +373,89 @@ import { SystemEvents } from '../events/system';
 /**
  * An object representing the core of OpenFin Runtime. Allows the developer
  * to perform system-level actions, such as accessing logs, viewing processes,
- * clearing the cache and exiting the runtime.
+ * clearing the cache and exiting the runtime as well as listen to <a href="tutorial-System.EventEmitter.html">system events</a>.
  * @namespace
  */
 export default class System extends EmitterBase<SystemEvents> {
     constructor(wire: Transport);
+    private sendExternalProcessRequest;
+    /**
+     * Adds a listener to the end of the listeners array for the specified event.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - Called whenever an event of the specified type occurs.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function addListener
+     * @memberof System
+     * @instance
+     * @tutorial System.EventEmitter
+     */
+    /**
+     * Adds a listener to the end of the listeners array for the specified event.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - Called whenever an event of the specified type occurs.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function on
+     * @memberof System
+     * @instance
+     * @tutorial System.EventEmitter
+     */
+    /**
+     * Adds a one time listener for the event. The listener is invoked only the first time the event is fired, after which it is removed.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function once
+     * @memberof System
+     * @instance
+     * @tutorial System.EventEmitter
+     */
+    /**
+     * Adds a listener to the beginning of the listeners array for the specified event.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function prependListener
+     * @memberof System
+     * @instance
+     * @tutorial System.EventEmitter
+     */
+    /**
+     * Adds a one time listener for the event. The listener is invoked only the first time the event is fired, after which it is removed.
+     * The listener is added to the beginning of the listeners array.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function prependOnceListener
+     * @memberof System
+     * @instance
+     * @tutorial System.EventEmitter
+     */
+    /**
+     * Remove a listener from the listener array for the specified event.
+     * Caution: Calling this method changes the array indices in the listener array behind the listener.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function removeListener
+     * @memberof System
+     * @instance
+     * @tutorial System.EventEmitter
+     */
+    /**
+     * Removes all listeners, or those of the specified event.
+     * @param { string | symbol } [eventType]  - The type of the event.
+     * @return {Promise.<this>}
+     * @function removeAllListeners
+     * @memberof System
+     * @instance
+     * @tutorial System.EventEmitter
+     */
     /**
      * Returns the version of the runtime. The version contains the major, minor,
      * build and revision numbers.
diff --git a/types/openfin/_v2/api/window/window.d.ts b/types/openfin/_v2/api/window/window.d.ts
index fcefc4fa5d..14ac2bf320 100644
--- a/types/openfin/_v2/api/window/window.d.ts
+++ b/types/openfin/_v2/api/window/window.d.ts
@@ -7,6 +7,7 @@ import Transport from '../../transport/transport';
 import { WindowEvents } from '../events/window';
 import { AnchorType } from './anchor-type';
 import { WindowOption } from './windowOption';
+import { EntityType } from '../frame/frame';
 /**
  * @lends Window
  */
@@ -29,7 +30,7 @@ export default class _WindowModule extends Base {
     wrapSync(identity: Identity): _Window;
     /**
      * Creates a new Window.
-     * @param { WindowOption } options - Window creation options
+     * @param { Window~options } options - Window creation options
      * @return {Promise.<_Window>}
      * @tutorial Window.create
      * @static
@@ -66,7 +67,7 @@ export interface WindowInfo {
 export interface FrameInfo {
     name: string;
     uuid: string;
-    entityType: string;
+    entityType: EntityType;
     parent?: Identity;
 }
 export interface Area {
@@ -75,6 +76,203 @@ export interface Area {
     x: number;
     y: number;
 }
+/**
+ * @typedef {object} Window~options
+ * @summary Window creation options.
+ * @desc This is the options object required by {@link Window.create Window.create}.
+ *
+ * Note that `name` is the only required property — albeit the `url` property is usually provided as well
+ * (defaults to `"about:blank"` when omitted).
+ *
+ * _This jsdoc typedef mirrors the `WindowOptions` TypeScript interface in `@types/openfin`._
+ *
+ * @property {object} [accelerator]
+ * Enable keyboard shortcuts for devtools, zoom, reload, and reload ignoring cache.
+ *
+ * @property {boolean} [accelerator.devtools=false]
+ * If `true`, enables the devtools keyboard shortcut:<br>
+ * `Ctrl` + `Shift` + `I` _(Toggles Devtools)_
+ *
+ * @property {boolean} [accelerator.reload=false]
+ * If `true`, enables the reload keyboard shortcuts:<br>
+ * `Ctrl` + `R` _(Windows)_<br>
+ * `F5` _(Windows)_<br>
+ * `Command` + `R` _(Mac)_
+ *
+ * @property {boolean} [accelerator.reloadIgnoringCache=false]
+ * If `true`, enables the reload-from-source keyboard shortcuts:<br>
+ * `Ctrl` + `Shift` + `R` _(Windows)_<br>
+ * `Shift` + `F5` _(Windows)_<br>
+ * `Command` + `Shift` + `R` _(Mac)_
+ *
+ * @property {boolean} [accelerator.zoom=false]
+ * If `true`, enables the zoom keyboard shortcuts:<br>
+ * `Ctrl` + `+` _(Zoom In)_<br>
+ * `Ctrl` + `Shift` + `+` _(Zoom In)_<br>
+ * `Ctrl` + `-` _(Zoom Out)_<br>
+ * `Ctrl` + `Shift` + `-` _(Zoom Out)_<br>
+ * `Ctrl` + `Scroll` _(Zoom In & Out)_<br>
+ * `Ctrl` + `0` _(Restore to 100%)_
+ *
+ * @property {boolean} [alwaysOnTop=false] - _Updatable._
+ * A flag to always position the window at the top of the window stack.
+ *
+ * @property {object} [api]
+ * Configurations for API injection.
+ *
+ * @property {object} [api.iframe] Configure if the the API should be injected into iframes based on domain.
+ *
+ * @property {boolean} [api.iframe.crossOriginInjection=false] Controls if the `fin` API object is present for cross origin iframes.
+ * @property {boolean} [api.iframe.sameOriginInjection=true] Controls if the `fin` API object is present for same origin iframes.
+ *
+ * @property {number} [aspectRatio=0] - _Updatable._
+ * The aspect ratio of width to height to enforce for the window. If this value is equal to or less than zero,
+ * an aspect ratio will not be enforced.
+ *
+ * @property {boolean} [autoShow=true]
+ * A flag to automatically show the window when it is created.
+ *
+ * @property {string} [backgroundColor="#FFF"]
+ * The window’s _backfill_ color as a hexadecimal value. Not to be confused with the content background color
+ * (`document.body.style.backgroundColor`),
+ * this color briefly fills a window’s (a) content area before its content is loaded as well as (b) newly exposed
+ * areas when growing a window. Setting
+ * this value to the anticipated content background color can help improve user experience.
+ * Default is white.
+ *
+ * @property {object} [contentNavigation]
+ * Restrict navigation to URLs that match a whitelisted pattern. See [here](https://developer.chrome.com/extensions/match_patterns)
+ * for more details.
+ * @property {string[]} [contentNavigation.whitelist=[]] List of whitelisted URLs.
+ *
+ * @property {boolean} [contextMenu=true] - _Updatable._
+ * A flag to show the context menu when right-clicking on a window.
+ * Gives access to the devtools for the window.
+ *
+ * @property {object} [cornerRounding] - _Updatable._
+ * Defines and applies rounded corners for a frameless window. **NOTE:** On macOS corner is not ellipse but circle rounded by the
+ *  average of _height_ and _width_.
+ * @property {number} [cornerRounding.height=0] The height in pixels.
+ * @property {number} [cornerRounding.width=0] The width in pixels.
+ *
+ * @property {string} [customData=""] - _Updatable._
+ * A field that the user can attach serializable data to to be ferried around with the window options.
+ * _When omitted, the default value of this property is the empty string (`""`)._
+ *
+ * @property {customRequestHeaders[]} [customRequestHeaders]
+ * Defines list of {@link customRequestHeaders} for requests sent by the window.
+ *
+ * @property {boolean} [defaultCentered=false]
+ * Centers the window in the primary monitor. This option overrides `defaultLeft` and `defaultTop`. When `saveWindowState` is `true`,
+ * this value will be ignored for subsequent launches in favor of the cached value. **NOTE:** On macOS _defaultCenter_ is
+ * somewhat above center vertically.
+ *
+ * @property {number} [defaultHeight=500]
+ * The default height of the window. When `saveWindowState` is `true`, this value will be ignored for subsequent launches
+ * in favor of the cached value.
+ *
+ * @property {number} [defaultLeft=100]
+ * The default left position of the window. When `saveWindowState` is `true`, this value will be ignored for subsequent
+ * launches in favor of the cached value.
+ *
+ * @property {number} [defaultTop=100]
+ * The default top position of the window. When `saveWindowState` is `true`, this value will be ignored for subsequent
+ * launches in favor of the cached value.
+ *
+ * @property {number} [defaultWidth=800]
+ * The default width of the window. When `saveWindowState` is `true`, this value will be ignored for subsequent
+ * launches in favor of the cached value.
+ *
+ * @property {boolean} [frame=true] - _Updatable._
+ * A flag to show the frame.
+ *
+ * @hidden-property {boolean} [hideOnClose=false] - A flag to allow a window to be hidden when the close button is clicked.
+ *
+ * @property {string} [icon] - _Updatable. Inheritable._
+ * A URL for the icon to be shown in the window title bar and the taskbar.
+ * _When omitted, inherits from the parent application._
+ *
+ * @property {number} [maxHeight=-1] - _Updatable._
+ * The maximum height of a window. Will default to the OS defined value if set to -1.
+ *
+ * @property {boolean} [maximizable=true] - _Updatable._
+ * A flag that lets the window be maximized.
+ *
+ * @property {number} [maxWidth=-1] - _Updatable._
+ * The maximum width of a window. Will default to the OS defined value if set to -1.
+ *
+ * @property {number} [minHeight=0] - _Updatable._
+ * The minimum height of a window.
+ *
+ * @property {boolean} [minimizable=true] - _Updatable._
+ * A flag that lets the window be minimized.
+ *
+ * @property {number} [minWidth=0] - _Updatable._
+ * The minimum width of a window.
+ *
+ * @property {string} name
+ * The name of the window.
+ *
+ * @property {number} [opacity=1.0] - _Updatable._
+ * A flag that specifies how transparent the window will be.
+ * This value is clamped between `0.0` and `1.0`.
+ *
+ * @property {preloadScript[]} [preloadScripts] - _Inheritable_
+ * A list of scripts that are eval'ed before other scripts in the page. When omitted, _inherits_
+ * from the parent application.
+ *
+ * @property {boolean} [resizable=true] - _Updatable._
+ * A flag to allow the user to resize the window.
+ *
+ * @property {object} [resizeRegion] - _Updatable._
+ * Defines a region in pixels that will respond to user mouse interaction for resizing a frameless window.
+ * @property {number} [resizeRegion.bottomRightCorner=9]
+ * The size in pixels of an additional square resizable region located at the bottom right corner of a frameless window.
+ * @property {number} [resizeRegion.size=7]
+ * The size in pixels.
+ * @property {object} [resizeRegion.sides={top:true,right:true,bottom:true,left:true}]
+ * Sides that a window can be resized from.
+ *
+ * @property {boolean} [saveWindowState=true]
+ * A flag to cache the location of the window.
+ *
+ * @property {boolean} [shadow=false]
+ * A flag to display a shadow on frameless windows.
+ * `shadow` and `cornerRounding` are mutually exclusive.
+ * On Windows 7, Aero theme is required.
+ *
+ * @property {boolean} [showTaskbarIcon=true] - _Updatable._ _Windows_.
+ * A flag to show the window's icon in the taskbar.
+ *
+ * @property {boolean} [smallWindow=false]
+ * A flag to specify a frameless window that can be be created and resized to less than 41x36px (width x height).
+ * _Note: Caveats of small windows are no Aero Snap and drag to/from maximize._
+ *
+ * @property {string} [state="normal"]
+ * The visible state of the window on creation.
+ * One of:
+ * * `"maximized"`
+ * * `"minimized"`
+ * * `"normal"`
+ *
+ * @property {string} [taskbarIconGroup=<application uuid>] - _Windows_.
+ * Specify a taskbar group for the window.
+ * _If omitted, defaults to app's uuid (`fin.desktop.Application.getCurrent().uuid`)._
+ *
+ * @property {string} [url="about:blank"]
+ * The URL of the window.
+ *
+ * @property {string} [uuid=<application uuid>]
+ * The `uuid` of the application, unique within the set of all `Application`s running in OpenFin Runtime.
+ * If omitted, defaults to the `uuid` of the application spawning the window.
+ * If given, must match the `uuid` of the  application spawning the window.
+ * In other words, the application's `uuid` is the only acceptable value, but is the default, so there's
+ * really no need to provide it.
+ *
+ * @property {boolean} [waitForPageLoad=false]
+ * When set to `true`, the window will not appear until the `window` object's `load` event fires.
+ * When set to `false`, the window will appear immediately without waiting for content to be loaded.
+ */
 /**
  * @typedef { Object } Area
  * @property { number } height Area's height
@@ -117,7 +315,7 @@ this animation onto the end of the animation queue.
 /**
  * Bounds is a interface that has the properties of height,
  * width, left, top which are all numbers
- * @typedef { Object } Bounds
+ * @typedef { object } Bounds
  * @property { number } height Get the application height bound
  * @property { number } width Get the application width bound
  * @property { number } top Get the application top bound
@@ -130,337 +328,91 @@ this animation onto the end of the animation queue.
  * control over the window state such as the ability to minimize, maximize, restore, etc.
  * By default a window does not show upon instantiation; instead the window's show() method
  * must be invoked manually. The new window appears in the same process as the parent window.
+ * It has the ability to listen for <a href="tutorial-Window.EventEmitter.html">window specific events</a>.
  * @class
  * @alias Window
-*/
+ * @hideconstructor
+ */
 export declare class _Window extends EmitterBase<WindowEvents> {
     identity: Identity;
-    /**
-     * Raised when a window within this application requires credentials from the user.
-     *
-     * @event Window#auth-requested
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     * @property {object} authInfo
-     * @property {string} authInfo.host - Host server.
-     * @property {boolean} authInfo.isProxy - Indicates if the request involves a proxy.
-     * @property {number} authInfo.port - Port number.
-     * @property {string} authInfo.realm - Authentication request realm.
-     * @property {string} authInfo.scheme - Authentication scheme.
-     */
-    /**
-     * Raised when a window loses focus.
-     *
-     * @event Window#blurred
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     */
-    /**
-     * Raised after changes in a window's size and/or position.
-     *
-     * @event Window#bounds-changed
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     * @property {number} changeType - Describes what kind of change occurred.
-     0 means a change in position.
-     1 means a change in size.
-     2 means a change in position and size.
-     * @property {string} deferred - Indicated whether pending changes have been applied.
-     * @property {number} height - New height of the window.
-     * @property {number} left - New left most coordinate of the window.
-     * @property {number} top - New top most coordinate of the window.
-     * @property {number} width - New width of the window.
-     */
-    /**
-     * Raised when a window has been prevented from closing. A window will be prevented from closing by default,
-     either through the API or by a user when ‘close-requested’ has been subscribed to and the Window.close(force) flag is false.
-     *
-     * @event Window#close-requested
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     */
-    /**
-     * Raised when a window has closed.
-     *
-     * @event Window#closed
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     */
-    /**
-     * Raised when a window has crashed.
-     *
-     * @event Window#crashed
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     */
-    /**
-     * Raised when the frame is disabled after all prevent user changes in window's size and/or position have completed.
-     *
-     * @event Window#disabled-frame-bounds-changed
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     * @property {number} changeType - Describes what kind of change occurred.
-     0 means a change in position.
-     1 means a change in size.
-     2 means a change in position and size.
-     * @property {string} deferred - Indicated whether pending changes have been applied.
-     * @property {number} height - New height of the window.
-     * @property {number} left - New left most coordinate of the window.
-     * @property {number} top - New top most coordinate of the window.
-     * @property {number} width - New width of the window.
-     */
-    /**
-     * Raised when the frame is disabled during prevented user changes to a window's size and/or position.
-     *
-     * @event Window#disabled-frame-bounds-changing
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     * @property {number} changeType - Describes what kind of change occurred.
-     0 means a change in position.
-     1 means a change in size.
-     2 means a change in position and size.
-     * @property {string} deferred - Indicated whether pending changes have been applied.
-     * @property {number} height - New height of the window.
-     * @property {number} left - New left most coordinate of the window.
-     * @property {number} top - New top most coordinate of the window.
-     * @property {number} width - New width of the window.
-     */
-    /**
-     * Raised when the window has been embedded.
-     *
-     * @event Window#embedded
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     */
-    /**
-     * Raised when an external process has exited.
-     *
-     * @event Window#external-process-exited
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     * @property {string} processUuid - The process handle UUID.
-     * @property {number} exitCode - The process exit code
-     */
-    /**
-     * Raised when an external process has started.
-     *
-     * @event Window#external-process-started
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     * @property {string} processUuid - The process handle UUID.
-     */
-    /**
-     * Raised when a window's frame becomes disabled.
-     *
-     * @event Window#frame-disabled
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     */
-    /**
-     * Raised when a window's frame becomes enabled.
-     *
-     * @event Window#frame-enabled
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     */
-    /**
-     * Raised when a window joins/leaves a group and/or when the group a window is a member of changes.
-     *
-     * @event Window#group-changed
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     * @property {string} source - Which group array the window that the event listener was registered on is included in:
-     'source' The window is included in sourceGroup.
-     'target' The window is included in targetGroup.
-     'nothing' The window is not included in sourceGroup nor targetGroup.
-     * @property {string} reason - The reason this event was triggered.
-     'leave' A window has left the group due to a leave or merge with group.
-     'join' A window has joined the group.
-     'merge' Two groups have been merged together.
-     'disband' There are no other windows in the group.
-     * @property {string} name - Name of the window.
-     * @property {legacyWindowIdentity[]} sourceGroup - All the windows in the group the sourceWindow originated from.
-     * @property {string} sourceWindowAppUuid - UUID of the application the sourceWindow belongs to the
-     source window is the window in which (merge/join/leave)group(s) was called.
-     * @property {string} sourceWindowName - Name of the sourcewindow.
-     The source window is the window in which (merge/join/leave)group(s) was called.
-     * @property {legacyWindowIdentity[]} targetGroup - All the windows in the group the targetWindow orginated from.
-     * @property {string} targetWindowAppUuid - UUID of the application the targetWindow belongs to.
-     The target window is the window that was passed into (merge/join)group(s).
-     * @property {string} targetWindowName - Name of the targetWindow.
-     The target window is the window that was passed into (merge/join)group(s).
-     */
-    /**
-     * Raised when a window has been hidden.
-     *
-     * @event Window#hidden
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     * @property {string} reason - Action prompted the close The reasons are:
-     "hide"
-     "hide-on-close"
-    */
-    /**
-     * Raised when a window is initialized.
-     *
-     * @event Window#initialized
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     */
-    /**
-     * Raised when a window is maximized.
-     *
-     * @event Window#maximized
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     */
-    /**
-     * Raised when a window is minimized.
-     *
-     * @event Window#minimized
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     */
-    /**
-     * Raised when window navigation is rejected as per ContentNavigation whitelist/blacklist rules.
-     *
-     * @event Window#navigation-rejected
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     * @property {string} sourceName - source of navigation window name.
-     * @property {string} url - Blocked content url.
-     */
-    /**
-     * Raised when a window is out of memory.
-     *
-     * @event Window#out-of-memory
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     */
-    /**
-     * Raised after the execution of all of a window's preload scripts. Contains
-     information about all window's preload scripts' final states.
-     *
-     * @event Window#preload-scripts-state-changed
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     * @property {preloadScriptState[]} preloadState -  An array of all final preload scripts' states
-     */
-    /**
-     * Raised during the execution of a window's preload script. Contains information
-     about a single window's preload script's state, for which the event has been raised.
-     *
-     * @event Window#preload-scripts-state-changing
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     * @property {preloadScriptState[]} preloadState -  An array of all final preload scripts' states
-     */
-    /**
-     * Raised when an HTTP load was cancelled or failed.
-     *
-     * @event Window#resource-load-failed
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     * @property {number} errorCode - The Chromium error code.
-     * @property {string} errorDescription - The Chromium error description.
-     * @property {string} validatedURL - The url attempted.
-     * @property {boolean} isMainFrame - Was the attempt made from the main frame.
-     */
-    /**
-     * Raised when an HTTP resource request has received response details.
-     *
-     * @event Window#resource-response-received
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     * @property {boolean} status - Status of the request.
-     * @property {string} newUrl - The URL of the responded resource.
-     * @property {string} originalUrl - The requested URL.
-     * @property {number} httpResponseCode - The HTTP Response code.
-     * @property {string} requestMethod - The HTTP request method.
-     * @property {string} referrer - The HTTP referrer.
-     * @property {object} headers - The HTTP headers.
-     * @property {string} resourceType - Resource type:
-     "mainFrame", "subFrame",
-     "styleSheet", "script", "image",
-     "object", "xhr", or "other"
-    */
-    /**
-     * Raised when a window has reloaded.
-     *
-     * @event Window#reloaded
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     * @property {string} url - Url has has been reloaded.
-     */
-    /**
-     * Raised when a window is displayed after having been minimized or
-     when a window leaves the maximize state without minimizing.
-     *
-     * @event Window#restored
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     */
-    /**
-     * Raised when a window has been prevented from showing.
-     A window will be prevented from showing by default, either through the API or by a user when
-     ‘show-requested’ has been subscribed to on the window or 'window-show-requested'
-     on the parent application and the Window.show(force) flag is false.
-     *
-     * @event Window#show-requested
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     */
-    /**
-     * Raised when a window been shown.
-     *
-     * @event Window#shown
-     * @type {object}
-     * @property {string} name - Name of the window.
-     * @property {string} uuid - UUID of the application that the window belongs to.
-     */
-    /**
-     * @typedef {object} legacyWindowIdentity
-     * @summary Object summary
-     * @desc Object description
-     * @property {string} appUuid - The UUID of the application this window entry belongs to.
-     * @property {string} windowName - The name of this window entry.
-     */
-    /**
-     * @typedef {object} preloadScriptState
-     * @summary Object summary
-     * @desc Object description
-     * @property {string} url - The url of the preload script.
-     * @property {string} state - The preload script state:
-     "load-failed", "failed", "succeeded"
-     */
     constructor(wire: Transport, identity: Identity);
+    /**
+     * Adds a listener to the end of the listeners array for the specified event.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - Called whenever an event of the specified type occurs.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function addListener
+     * @memberof Window
+     * @instance
+     * @tutorial Window.EventEmitter
+     */
+    /**
+     * Adds a listener to the end of the listeners array for the specified event.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - Called whenever an event of the specified type occurs.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function on
+     * @memberof Window
+     * @instance
+     * @tutorial Window.EventEmitter
+     */
+    /**
+     * Adds a one time listener for the event. The listener is invoked only the first time the event is fired, after which it is removed.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function once
+     * @memberof Window
+     * @instance
+     * @tutorial Window.EventEmitter
+     */
+    /**
+     * Adds a listener to the beginning of the listeners array for the specified event.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function prependListener
+     * @memberof Window
+     * @instance
+     * @tutorial Window.EventEmitter
+     */
+    /**
+     * Adds a one time listener for the event. The listener is invoked only the first time the event is fired, after which it is removed.
+     * The listener is added to the beginning of the listeners array.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function prependOnceListener
+     * @memberof Window
+     * @instance
+     * @tutorial Window.EventEmitter
+     */
+    /**
+     * Remove a listener from the listener array for the specified event.
+     * Caution: Calling this method changes the array indices in the listener array behind the listener.
+     * @param { string | symbol } eventType  - The type of the event.
+     * @param { Function } listener - The callback function.
+     * @param { SubOptions } [options] - Option to support event timestamps.
+     * @return {Promise.<this>}
+     * @function removeListener
+     * @memberof Window
+     * @instance
+     * @tutorial Window.EventEmitter
+     */
+    /**
+     * Removes all listeners, or those of the specified event.
+     * @param { string | symbol } [eventType]  - The type of the event.
+     * @return {Promise.<this>}
+     * @function removeAllListeners
+     * @memberof Window
+     * @instance
+     * @tutorial Window.EventEmitter
+     */
     createWindow(options: WindowOption): Promise<_Window>;
     private windowListFromNameList;
     /**
@@ -518,23 +470,26 @@ export declare class _Window extends EmitterBase<WindowEvents> {
     */
     close(force?: boolean): Promise<void>;
     /**
-     * Returns then running applications uuid
+     * Returns the native OS level Id.
+     * In Windows, it will return the Windows [handle](https://docs.microsoft.com/en-us/windows/desktop/WinProg/windows-data-types#HWND).
      * @return {Promise.<string>}
      * @tutorial Window.getNativeId
      */
     getNativeId(): Promise<string>;
+    disableFrame(): Promise<void>;
     /**
      * Prevents a user from changing a window's size/position when using the window's frame.
      * @return {Promise.<void>}
-     * @tutorial Window.disableFrame
+     * @tutorial Window.disableUserMovement
      */
-    disableFrame(): Promise<void>;
+    disableUserMovement(): Promise<void>;
+    enableFrame(): Promise<void>;
     /**
      * Re-enables user changes to a window's size/position when using the window's frame.
      * @return {Promise.<void>}
-     * @tutorial Window.enableFrame
+     * @tutorial Window.enableUserMovement
      */
-    enableFrame(): Promise<void>;
+    enableUserMovement(): Promise<void>;
     /**
      * Executes Javascript on the window, restricted to windows you own or windows owned by
      * applications you have created.
@@ -601,6 +556,12 @@ export declare class _Window extends EmitterBase<WindowEvents> {
      * @tutorial Window.getState
      */
     getState(): Promise<string>;
+    /**
+     * Determines if the window is a main window.
+     * @return {boolean}
+     * @tutorial Window.isMainWindow
+     */
+    isMainWindow(): boolean;
     /**
      * Determines if the window is currently showing.
      * @return {Promise.<boolean>}
@@ -609,7 +570,7 @@ export declare class _Window extends EmitterBase<WindowEvents> {
     isShowing(): Promise<boolean>;
     /**
      * Joins the same window group as the specified window.
-     * @param { class } target The window whose group is to be joined
+     * @param { _Window } target The window whose group is to be joined
      * @return {Promise.<void>}
      * @tutorial Window.joinGroup
      */
@@ -634,7 +595,7 @@ export declare class _Window extends EmitterBase<WindowEvents> {
     maximize(): Promise<void>;
     /**
      * Merges the instance's window group with the same window group as the specified window
-     * @param { class } target The window whose group is to be merged with
+     * @param { _Window } target The window whose group is to be merged with
      * @return {Promise.<void>}
      * @tutorial Window.mergeGroups
      */
@@ -769,6 +730,12 @@ export declare class _Window extends EmitterBase<WindowEvents> {
      * @tutorial Window.navigateBack
      */
     navigateBack(): Promise<void>;
+    /**
+     * Navigates the window forward one page.
+     * @return {Promise.<void>}
+     * @tutorial Window.navigateForward
+     */
+    navigateForward(): Promise<void>;
     /**
      * Stops any current navigation the window is performing.
      * @return {Promise.<void>}
diff --git a/types/openfin/index.d.ts b/types/openfin/index.d.ts
index b5d04f1a27..67729653c5 100644
--- a/types/openfin/index.d.ts
+++ b/types/openfin/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for OpenFin API 37.0
+// Type definitions for non-npm package OpenFin API 39.0
 // Project: https://openfin.co/
 // Definitions by: Chris Barker <https://github.com/chrisbarker>
 //                 Ricardo de Pena <https://github.com/rdepena>
@@ -7,7 +7,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.9
 
-// based on v9.61.37.14
+// based on v10.66.39.25
 // see https://openfin.co/support/technical-faq/#what-do-the-numbers-in-the-runtime-version-mean
 
 /**
@@ -37,6 +37,7 @@ declare namespace fin {
 
     // v2 shapes
     type Identity = import('./_v2/identity').Identity;
+    type applicationLogInfo = import('./_v2/api/application/application').LogInfo;
     type LaunchInfo = import('./_v2/api/application/application').ApplicationInfo;
     type ShortCutConfig = import('./_v2/api/application/application').ShortCutConfig;
     type TrayInfo = import('./_v2/api/application/application').TrayInfo;
@@ -46,6 +47,7 @@ declare namespace fin {
     type ClearCacheOption = import('./_v2/api/system/clearCacheOption').ClearCacheOption;
     type CookieInfo = import('./_v2/api/system/cookie').CookieInfo;
     type CookieOption = import('./_v2/api/system/cookie').CookieOption;
+    type CrashReporterOption = import('./_v2/api/system/crashReporterOption').CrashReporterOption;
     type AppAssetInfo = import('./_v2/api/system/download-asset').AppAssetInfo;
     type AppAssetRequest = import('./_v2/api/system/download-asset').AppAssetRequest;
     type RuntimeDownloadOptions = import('./_v2/api/system/download-asset').RuntimeDownloadOptions;
@@ -65,12 +67,14 @@ declare namespace fin {
     type RuntimeInfo = import('./_v2/api/system/runtime-info').RuntimeInfo;
     type RVMInfo = import('./_v2/api/system/rvm').RVMInfo;
     type WindowDetail = import('./_v2/api/system/window').WindowDetail;
-    type WindowInfo = import('./_v2/api/system/window').WindowInfo;
+    type SystemWindowInfo = import('./_v2/api/system/window').WindowInfo;
     type AnchorType = import('./_v2/api/window/anchor-type').AnchorType;
     type Bounds = import('./_v2/api/window/bounds').default;
     type Transition = import('./_v2/api/window/transition').Transition;
     type TransitionOptions = import('./_v2/api/window/transition').TransitionOptions;
     type WindowOption = import('./_v2/api/window/windowOption').WindowOption;
+    type WindowInfo = import('./_v2/api/window/window').WindowInfo;
+    type FrameInfo = import('./_v2/api/window/window').FrameInfo;
 
     const desktop: OpenFinDesktop;
 
@@ -144,6 +148,10 @@ declare namespace fin {
          * Retrieves an array of active window groups for all of the application's windows. Each group is represented as an array of wrapped fin.desktop.Windows.
          */
         getGroups(callback?: (groups: OpenFinWindow[][]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves information about the application.
+         */
+        getInfo(callback?: (info: LaunchInfo) => void, errorCallback?: (reason: string) => void): void;
         /**
          * Retrieves the JSON manifest that was used to create the application. Invokes the error callback if the application was not created from a manifest.
          */
@@ -156,14 +164,14 @@ declare namespace fin {
          * Retrieves current configuration of application's shortcuts.
          */
         getShortcuts(callback?: (config: ShortCutConfig) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves information about the application.
-         */
-        getInfo(callback?: (info: LaunchInfo) => void, errorCallback?: (reason: string) => void): void;
         /**
          * Retrieves information about the system tray.
          */
         getTrayIconInfo(callback?: (trayInfo: TrayInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns the current zoom level of the application.
+         */
+        getZoomLevel(callback?: (level: number) => void, errorCallback?: (reason: string) => void): void;
         /**
          * Determines if the application is currently running.
          */
@@ -202,6 +210,14 @@ declare namespace fin {
          * Tells the rvm to relaunch the main application once upon a complete shutdown
          */
         scheduleRestart(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Sends a message to the RVM to upload the application's logs. On success, an object containing logId is returned.
+         */
+        sendApplicationLog(callback?: (logInfo: applicationLogInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Sets an associated username with that app for Application Log Management use
+         */
+        setAppLogUsername(username: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
         /**
          * Sets new shortcut configuration for current application.
          * Application has to be launched with a manifest and has to have shortcut configuration (icon url, name, etc.) in its manifest to
@@ -212,6 +228,11 @@ declare namespace fin {
          * Adds a customizable icon in the system tray and notifies the application when clicked.
          */
         setTrayIcon(iconUrl: string, listener: (clickInfo: TrayIconClickedEvent) => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Sets the zoom level of the application. The original size is 0 and each increment above or below represents zooming 20%
+         * larger or smaller to default limits of 300% and 50% of original size, respectively.
+         */
+        setZoomLevel(level: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
         /**
          * Closes the application by terminating its process.
          */
@@ -556,19 +577,23 @@ declare namespace fin {
         /**
          * Retrieves an array of data (name, ids, bounds) for all application windows.
          */
-        getAllWindows(callback?: (windowInfoList: WindowInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        getAllWindows(callback?: (windowInfoList: SystemWindowInfo[]) => void, errorCallback?: (reason: string) => void): void;
         /**
          * Returns information about the app asset.
          */
         getAppAssetInfo(options: AppAssetRequest, callback?: (appAssetInfo: AppAssetInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the command line argument string that started OpenFin Runtime.
+         */
+        getCommandLineArguments(callback?: (args: string) => void, errorCallback?: (reason: string) => void): void;
         /**
          * Get additional info of cookies.
          */
         getCookies(option: CookieOption, callback?: (info: CookieInfo[]) => void, errorCallback?: (reason: string) => void): void;
         /**
-         * Retrieves the command line argument string that started OpenFin Runtime.
+         * Get the current state of the crash reporter.
          */
-        getCommandLineArguments(callback?: (args: string) => void, errorCallback?: (reason: string) => void): void;
+        getCrashReporterState(callback?: (state: CrashReporterOption) => void, errorCallback?: (reason: string) => void): void;
         /**
          * Retrieves the configuration object that started the OpenFin Runtime.
          */
@@ -601,6 +626,10 @@ declare namespace fin {
          * Retrieves an array containing information for each log file.
          */
         getLogList(callback?: (logInfoList: LogInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns a unique identifier (UUID) provided by the machine.
+         */
+        getMachineId(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
         /**
          * Retrieves the minimum (inclusive) logging level that is currently being written to the logs.
          */
@@ -690,6 +719,12 @@ declare namespace fin {
          * Shows the Chrome Developer Tools for the specified window.
          */
         showDeveloperTools(uuid: string, name: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Start the crash reporter for the browser process if not already running.
+         * You can optionally specify `diagnosticMode` to have the logs sent to
+         * OpenFin on runtime close
+         */
+        startCrashReporter(options: CrashReporterOption, callback?: () => void, errorCallback?: (reason: string) => void): void;
         /**
          * Attempt to close an external process. The process will be terminated if it has not closed after the elapsed timeout in milliseconds.
          */
@@ -699,11 +734,6 @@ declare namespace fin {
             killTree: boolean,
             callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
             errorCallback?: (reason: string) => void): void;
-        terminateExternalProcess(
-            processUuid: string,
-            timeout: number,
-            callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
-            errorCallback?: (reason: string) => void): void;
         /**
          * Update the OpenFin Runtime Proxy settings.
          */
@@ -807,6 +837,11 @@ declare namespace fin {
          * @param Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
          */
         close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Executes Javascript on the window, restricted to windows you own or windows owned by applications you have created.
+         * @param code JavaScript code to be executed on the window.
+         */
+        executeJavaScript(code: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
         /**
          * Prevents a user from changing a window's size/position when using the window's frame.
          * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
@@ -831,6 +866,11 @@ declare namespace fin {
          * Gives focus to the window.
          */
         focus(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of frame info objects representing the main frame and any
+         * iframes that are currently on the page.
+         */
+        getAllFrames(callback?: (frames: FrameInfo[]) => void, errorCallback?: (reason: string) => void): void;
         /**
          * Gets the current bounds (top, left, width, height) of the window.
          */
@@ -840,6 +880,10 @@ declare namespace fin {
          * Please note that calling window is included in the result array.
          */
         getGroup(callback?: (group: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets an information object for the window.
+         */
+        getInfo(callback?: (info: WindowInfo) => void, errorCallback?: (reason: string) => void): void;
         /**
          * Gets the current settings of the window.
          */
@@ -892,6 +936,22 @@ declare namespace fin {
          * Moves the window to a specified location.
          */
         moveTo(left: number, top: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Navigates the window to a specified URL.
+         */
+        navigate(url: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Navigates the window back one page.
+         */
+        navigateBack(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Navigates the window forward one page.
+         */
+        navigateForward(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Reloads the window current page.
+         */
+        reload(ignoreCacheopt?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
         /**
          * Removes a previously registered event listener from the specified event.
          */
@@ -944,6 +1004,10 @@ declare namespace fin {
          * Stops the taskbar icon from flashing.
          */
         stopFlashing(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Stops any current navigation the window is performing.
+         */
+        stopNavigation(callback?: () => void, errorCallback?: (reason: string) => void): void;
         /**
          * Updates the window using the passed options
          */
diff --git a/types/openfin/openfin-tests.ts b/types/openfin/openfin-tests.ts
index 5367823dae..7fcfcef23d 100644
--- a/types/openfin/openfin-tests.ts
+++ b/types/openfin/openfin-tests.ts
@@ -56,6 +56,10 @@ function test_application() {
             ++groupCounter;
         });
     });
+    // getInfo
+    application.getInfo(info => {
+        console.log(`Launch mode: ${info.launchMode}`);
+    });
     // getManifest
     application.getManifest(manifest => {
         console.log("Application manifest:");
@@ -72,15 +76,16 @@ function test_application() {
         console.log("Start Menu shortcut is enabled: ", config.startMenu);
         console.log("System Startup shortcut is enabled: ", config.systemStartup);
     });
-    // getInfo
-    application.getInfo(info => {
-        console.log(`Launch mode: ${info.launchMode}`);
-    });
     // getTrayIconInfo
     application.getTrayIconInfo(info => {
         console.log(info.x, info.y, info.bounds.left, info.bounds.top, info.bounds.height, info.bounds.width,
                     info.monitorInfo.reason);
     });
+    // getZoomLevel
+    application.getZoomLevel(level => {
+        console.log("Application zoom level:");
+        console.log(level);
+    });
     // isRunning
     application.isRunning(running => {
         console.log("the application is", running ? "running" : "not running");
@@ -107,12 +112,29 @@ function test_application() {
     }, err => {
         console.log("failure:", err);
     });
+    // run
+    application.run(() => {
+        console.log("Application is running.");
+    }, err => {
+        console.log("failure:", err);
+    });
     // schedule restart
     application.scheduleRestart(() => {
         console.log("You will not read this.");
     }, err => {
         console.log("failure:", err);
     });
+    // sendApplicationLog
+    application.sendApplicationLog(info => {
+        console.log("Application logId:");
+        console.log(info.logId);
+    });
+    // setAppLogUsername
+    application.setAppLogUsername("username", () => {
+        console.log("Successfully set app log username");
+    }, error => {
+        console.log("Failed to set app log username. Error: ", error);
+    });
     // setShortcuts
     application.setShortcuts({
         desktop: true,
@@ -127,6 +149,12 @@ function test_application() {
     application.setTrayIcon("https://developer.openf.in/download/openfin.png", clickInfo => {
         console.log(`The mouse has clicked at (${clickInfo.x}, ${clickInfo.y})`);
     });
+    // setZoomLevel
+    application.setZoomLevel(2, () => {
+        console.log("Successfully set application zoom level");
+    }, error => {
+        console.log("Failed to set application zoom level. Error: ", error);
+    });
     // terminate
     application.terminate();
     // wait
@@ -367,6 +395,8 @@ function test_system() {
         const cookie1 = cookies[0];
         console.log(cookie1.name, cookie1.domain, cookie1.path);
     }, err => console.log(err));
+    // getCrashReporterState
+    fin.desktop.System.getCrashReporterState(state => console.log(state), err => console.error(err));
     // getDeviceId
     fin.desktop.System.getDeviceId(id => {
         console.log("The id of the device is: " + id);
@@ -401,6 +431,8 @@ function test_system() {
             console.log(`The filename of the log is ${logInfo.name}, the size is ${logInfo.size}, and the date of creation is ${logInfo.date}`);
         });
     });
+    // getMachineId
+    fin.desktop.System.getMachineId(id => console.log(id), err => console.error(err));
     // getMinLogLevel
     fin.desktop.System.getMinLogLevel(level => console.log(level), err => console.log(err));
     // getMonitorInfo
@@ -558,6 +590,12 @@ function test_system() {
     }, err => {
         console.log("failure: " + err);
     });
+    // startCrashReporter
+    fin.desktop.System.startCrashReporter({diagnosticMode: true}, () => {
+        console.log('success');
+    }, err => {
+        console.log(err);
+    });
     // terminateExternalProcess
     fin.desktop.System.launchExternalProcess({
         // notepad is in the system's PATH
@@ -571,7 +609,7 @@ function test_system() {
 
         // Attempt to close the process. Terminate after 4 seconds if it
         // has not done so.
-        fin.desktop.System.terminateExternalProcess(result.uuid, 4000, info => {
+        fin.desktop.System.terminateExternalProcess(result.uuid, 4000, true, info => {
             console.log("Termination result " + info.result);
         }, reason => {
             console.log("failure: " + reason);
@@ -708,6 +746,8 @@ function test_window() {
     finWindow.bringToFront();
     // close
     finWindow.close();
+    // executeJavaScript
+    finWindow.executeJavaScript("console.log('Hello world');");
     // disableFrame
     finWindow.disableFrame();
     // enableFrame
@@ -716,10 +756,22 @@ function test_window() {
     finWindow.flash();
     // focus
     finWindow.focus();
+    // getAllFrames
+    finWindow.getAllFrames(frames => {
+        console.log(`name: ${frames[0].name} uuid: ${frames[0].uuid}`);
+    });
     // getBounds
     finWindow.getBounds(bounds => {
         console.log(`top: ${bounds.top} left: ${bounds.left} height: ${bounds.height} width: ${bounds.width}`);
     });
+    // getGroups
+    finWindow.getGroup(windowGroup => {
+        console.log(`There are a total of ${windowGroup.length} windows in this group.`);
+    });
+    // getInfo
+    finWindow.getInfo(info => {
+        console.log(`Window title: ${info.title}`);
+    });
     // getOptions
     finWindow.getOptions(options => {
         console.log(options);
@@ -802,6 +854,14 @@ function test_window() {
     finWindow.moveBy(10, 10);
     // moveTo
     finWindow.moveTo(100, 200);
+    // navigate
+    finWindow.navigate("https://openfin.co");
+    // navigateBack
+    finWindow.navigateBack();
+    // navigateForward
+    finWindow.navigateForward();
+    // reload
+    finWindow.reload();
     // removeEventListener
     finWindow.removeEventListener("bounds-changed", event => {
 		console.log(event);
@@ -824,6 +884,8 @@ function test_window() {
     finWindow.showAt(10, 10, false);
     // stopFlashing
     finWindow.stopFlashing();
+    // stopNavigation
+    finWindow.stopNavigation();
     // updateOptions
     finWindow.updateOptions({
         frame: false,
diff --git a/types/openfin/v37/_v2/api/application/application.d.ts b/types/openfin/v37/_v2/api/application/application.d.ts
new file mode 100644
index 0000000000..37263a9a63
--- /dev/null
+++ b/types/openfin/v37/_v2/api/application/application.d.ts
@@ -0,0 +1,242 @@
+import { EmitterBase, Base, Reply } from '../base';
+import { Identity } from '../../identity';
+import { _Window } from '../window/window';
+import { Point } from '../system/point';
+import { MonitorInfo } from '../system/monitor';
+import Transport from '../../transport/transport';
+import Bounds from '../window/bounds';
+import { ApplicationEvents } from '../events/application';
+import { ApplicationOption } from './applicationOption';
+export interface TrayIconClickReply extends Point, Reply<'application', 'tray-icon-clicked'> {
+    button: number;
+    monitorInfo: MonitorInfo;
+}
+export interface ApplicationInfo {
+    initialOptions: object;
+    launchMode: string;
+    manifest: object;
+    manifestUrl: string;
+    parentUuid?: string;
+    runtime: object;
+}
+export declare class NavigationRejectedReply extends Reply<'window-navigation-rejected', void> {
+    sourceName: string;
+    url: string;
+}
+export interface ShortCutConfig {
+    desktop?: boolean;
+    startMenu?: boolean;
+    systemStartup?: boolean;
+}
+export interface TrayInfo {
+    bounds: Bounds;
+    monitorInfo: MonitorInfo;
+    x: number;
+    y: number;
+}
+/**
+ * @lends Application
+ */
+export default class ApplicationModule extends Base {
+    /**
+     * Asynchronously returns an Application object that represents an existing application.
+     * @param { Identity } identity
+     * @return {Promise.<Application>}
+     * @tutorial Application.wrap
+     * @static
+     */
+    wrap(identity: Identity): Promise<Application>;
+    /**
+     * Synchronously returns an Application object that represents an existing application.
+     * @param { Identity } identity
+     * @return {Application}
+     * @tutorial Application.wrapSync
+     * @static
+     */
+    wrapSync(identity: Identity): Application;
+    /**
+     * Creates a new Application.
+     * @param { ApplicationOption } appOptions
+     * @return {Promise.<Application>}
+     * @tutorial Application.create
+     * @static
+     */
+    create(appOptions: ApplicationOption): Promise<Application>;
+    /**
+     * Asynchronously returns an Application object that represents the current application
+     * @return {Promise.<Application>}
+     * @tutorial Application.getCurrent
+     * @static
+     */
+    getCurrent(): Promise<Application>;
+    /**
+     * Synchronously returns an Application object that represents the current application
+     * @return {Application}
+     * @tutorial Application.getCurrentSync
+     * @static
+     */
+    getCurrentSync(): Application;
+    /**
+     * Retrieves application's manifest and returns a wrapped application.
+     * @param {string} manifestUrl - The URL of app's manifest.
+     * @return {Promise.<Application>}
+     * @tutorial Application.createFromManifest
+     * @static
+     */
+    createFromManifest(manifestUrl: string): Promise<Application>;
+}
+/**
+ * @classdesc An object representing an application. Allows the developer to create,
+ * execute, show/close an application as well as listen to application events.
+ * @class
+ */
+export declare class Application extends EmitterBase<ApplicationEvents> {
+    identity: Identity;
+    _manifestUrl?: string;
+    private window;
+    constructor(wire: Transport, identity: Identity);
+    private windowListFromIdentityList;
+    /**
+     * Determines if the application is currently running.
+     * @return {Promise.<boolean>}
+     * @tutorial Application.isRunning
+     */
+    isRunning(): Promise<boolean>;
+    /**
+     * Closes the application and any child windows created by the application.
+     * @param { boolean } [force = false] Close will be prevented from closing when force is false and
+     *  ‘close-requested’ has been subscribed to for application’s main window.
+     * @return {Promise.<boolean>}
+     * @tutorial Application.close
+     */
+    close(force?: boolean): Promise<void>;
+    /**
+     * Retrieves an array of wrapped fin.Windows for each of the application’s child windows.
+     * @return {Promise.Array.<_Window>}
+     * @tutorial Application.getChildWindows
+     */
+    getChildWindows(): Promise<Array<_Window>>;
+    /**
+     * Retrieves an array of active window groups for all of the application's windows. Each group is
+     * represented as an array of wrapped fin.Windows.
+     * @return {Promise.Array.Array.<_Window>}
+     * @tutorial Application.getGroups
+     */
+    getGroups(): Promise<Array<Array<_Window>>>;
+    /**
+     * Retrieves the JSON manifest that was used to create the application. Invokes the error callback
+     * if the application was not created from a manifest.
+     * @return {Promise.<any>}
+     * @tutorial Application.getManifest
+     */
+    getManifest(): Promise<any>;
+    /**
+     * Retrieves UUID of the application that launches this application. Invokes the error callback
+     * if the application was created from a manifest.
+     * @return {Promise.<string>}
+     * @tutorial Application.getParentUuid
+     */
+    getParentUuid(): Promise<string>;
+    /**
+     * Retrieves current application's shortcut configuration.
+     * @return {Promise.<ShortCutConfig>}
+     * @tutorial Application.getShortcuts
+     */
+    getShortcuts(): Promise<ShortCutConfig>;
+    /**
+     * Returns the current zoom level of the application.
+     * @return {Promise.<number>}
+     * @tutorial Application.getZoomLevel
+     */
+    getZoomLevel(): Promise<number>;
+    /**
+     * Returns an instance of the main Window of the application
+     * @return {Promise.<_Window>}
+     * @tutorial Application.getWindow
+     */
+    getWindow(): Promise<_Window>;
+    /**
+    * Manually registers a user with the licensing service. The only data sent by this call is userName and appName.
+    * @param { string } userName - username to be passed to the RVM.
+    * @param { string } appName - app name to be passed to the RVM.
+    * @return {Promise.<void>}
+    * @tutorial Application.registerUser
+    */
+    registerUser(userName: string, appName: string): Promise<void>;
+    /**
+     * Removes the application’s icon from the tray.
+     * @return {Promise.<void>}
+     * @tutorial Application.removeTrayIcon
+     */
+    removeTrayIcon(): Promise<void>;
+    /**
+     * Restarts the application.
+     * @return {Promise.<void>}
+     * @tutorial Application.restart
+     */
+    restart(): Promise<void>;
+    /**
+     * Runs the application. When the application is created, run must be called.
+     * @return {Promise.<void>}
+     * @tutorial Application.run
+     */
+    run(): Promise<void>;
+    /**
+     * Instructs the RVM to schedule one restart of the application.
+     * @return {Promise.<void>}
+     * @tutorial Application.scheduleRestart
+     */
+    scheduleRestart(): Promise<void>;
+    /**
+     * Adds a customizable icon in the system tray and notifies the application when clicked.
+     * @param { string } iconUrl Image URL to be used as the icon
+     * @return {Promise.<void>}
+     * @tutorial Application.setTrayIcon
+     */
+    setTrayIcon(iconUrl: string): Promise<void>;
+    /**
+     * Sets new application's shortcut configuration.
+     * @param { Object } config New application's shortcut configuration.
+     * @param {Boolean} [config.desktop] - Enable/disable desktop shortcut.
+     * @param {Boolean} [config.startMenu] - Enable/disable start menu shortcut.
+     * @param {Boolean} [config.systemStartup] - Enable/disable system startup shortcut.
+     * @return {Promise.<void>}
+     * @tutorial Application.setShortcuts
+     */
+    setShortcuts(config: ShortCutConfig): Promise<void>;
+    /**
+     * Sets the zoom level of the application. The original size is 0 and each increment above or below represents zooming 20%
+     * larger or smaller to default limits of 300% and 50% of original size, respectively.
+     * @param { number } level The zoom level
+     * @return {Promise.<void>}
+     * @tutorial Application.setZoomLevel
+     */
+    setZoomLevel(level: number): Promise<void>;
+    /**
+     * @summary Retrieves information about the system tray.
+     * @desc The only information currently returned is the position and dimensions.
+     * @return {Promise.<TrayInfo>}
+     * @tutorial Application.getTrayIconInfo
+     */
+    getTrayIconInfo(): Promise<TrayInfo>;
+    /**
+     * Closes the application by terminating its process.
+     * @return {Promise.<void>}
+     * @tutorial Application.terminate
+     */
+    terminate(): Promise<void>;
+    /**
+     * Waits for a hanging application. This method can be called in response to an application
+     * "not-responding" to allow the application to continue and to generate another "not-responding"
+     * message after a certain period of time.
+     * @return {Promise.<void>}
+     * @ignore
+     */
+    wait(): Promise<void>;
+    /**
+     * Retrieves information about the application.
+     * @return {Promise.<ApplicationInfo>}
+     * @tutorial Application.getInfo
+     */
+    getInfo(): Promise<ApplicationInfo>;
+}
diff --git a/types/openfin/v37/_v2/api/application/applicationOption.d.ts b/types/openfin/v37/_v2/api/application/applicationOption.d.ts
new file mode 100644
index 0000000000..134e4482d6
--- /dev/null
+++ b/types/openfin/v37/_v2/api/application/applicationOption.d.ts
@@ -0,0 +1,50 @@
+import { WindowOption, CustomRequestHeaders } from '../window/windowOption';
+import { DownloadPreloadOption } from '../system/download-preload';
+export interface ApplicationOption {
+    disableIabSecureLogging?: boolean;
+    loadErrorMessage?: string;
+    mainWindowOptions?: WindowOption;
+    name?: string;
+    nonPersistent?: boolean;
+    plugins?: boolean;
+    spellCheck?: boolean;
+    url?: string;
+    uuid: string;
+    webSecurity?: boolean;
+    accelerator?: object;
+    alwaysOnTop?: boolean;
+    api?: object;
+    aspectRatio?: number;
+    autoShow?: boolean;
+    backgroundColor?: string;
+    contentNavigation?: object;
+    contextMenu?: boolean;
+    cornerRounding?: object;
+    customData?: string;
+    customRequestHeaders?: Array<CustomRequestHeaders>;
+    defaultCentered?: boolean;
+    defaultHeight?: number;
+    defaultLeft?: number;
+    defaultTop?: number;
+    defaultWidth?: number;
+    frame?: boolean;
+    hideOnClose?: boolean;
+    icon?: string;
+    maxHeight?: number;
+    maximizable?: boolean;
+    maxWidth?: number;
+    minHeight?: number;
+    minimizable?: boolean;
+    minWidth?: number;
+    opacity?: number;
+    preloadScripts?: Array<DownloadPreloadOption>;
+    resizable?: boolean;
+    resizeRegion?: object;
+    saveWindowState?: boolean;
+    shadow?: boolean;
+    showTaskbarIcon?: boolean;
+    smallWindow?: boolean;
+    state?: string;
+    taskbarIconGroup?: string;
+    waitForPageLoad?: boolean;
+}
diff --git a/types/openfin/v37/_v2/api/base.d.ts b/types/openfin/v37/_v2/api/base.d.ts
new file mode 100644
index 0000000000..5cbb8658a7
--- /dev/null
+++ b/types/openfin/v37/_v2/api/base.d.ts
@@ -0,0 +1,46 @@
+/// <reference types="node" />
+import Transport from '../transport/transport';
+import { Identity } from '../identity';
+import { EventEmitter } from 'events';
+import { EmitterAccessor } from './events/emitterMap';
+import { BaseEventMap } from './events/base';
+interface SubOptions {
+    timestamp?: number;
+}
+export declare class Base {
+    wire: Transport;
+    constructor(wire: Transport);
+    private _topic;
+    protected topic: string;
+    readonly me: Identity;
+    protected isNodeEnvironment: () => boolean;
+    protected isOpenFinEnvironment: () => boolean;
+}
+export declare class EmitterBase<EventTypes extends BaseEventMap> extends Base {
+    private emitterAccessor;
+    protected identity: Identity;
+    constructor(wire: Transport, emitterAccessor: EmitterAccessor);
+    eventNames: () => (string | symbol)[];
+    emit: <E extends string | symbol | Extract<keyof EventTypes, string>>(eventName: E, payload: E extends Extract<keyof EventTypes, string> ? EventTypes[E] : any, ...args: any[]) => boolean;
+    private hasEmitter;
+    private getEmitter;
+    listeners: (type: string | symbol) => Function[];
+    listenerCount: (type: string | symbol) => number;
+    protected registerEventListener: (eventType: string | symbol | Extract<keyof EventTypes, string>, options?: SubOptions) => Promise<EventEmitter>;
+    protected deregisterEventListener: (eventType: string | symbol | Extract<keyof EventTypes, string>, options?: SubOptions) => Promise<void | EventEmitter>;
+    on<E extends Extract<keyof EventTypes, string> | string | symbol>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions): Promise<this>;
+    addListener: <E extends string | symbol | Extract<keyof EventTypes, string>>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions) => Promise<this>;
+    once<E extends Extract<keyof EventTypes, string> | string | symbol>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions): Promise<this>;
+    prependListener<E extends Extract<keyof EventTypes, string> | string | symbol>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions): Promise<this>;
+    prependOnceListener<E extends Extract<keyof EventTypes, string> | string | symbol>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions): Promise<this>;
+    removeListener<E extends Extract<keyof EventTypes, string> | string | symbol>(eventType: E, listener: (payload: E extends keyof EventTypes ? EventTypes[E] : any, ...args: any[]) => void, options?: SubOptions): Promise<this>;
+    protected deregisterAllListeners: (eventType: string | symbol | Extract<keyof EventTypes, string>) => Promise<void | EventEmitter>;
+    removeAllListeners(eventType?: Extract<keyof EventTypes, string> | string | symbol): Promise<this>;
+}
+export declare class Reply<TOPIC extends string, TYPE extends string | void> implements Identity {
+    topic: TOPIC;
+    type: TYPE;
+    uuid: string;
+    name?: string;
+}
+export {};
diff --git a/types/openfin/v37/_v2/api/clipboard/clipboard.d.ts b/types/openfin/v37/_v2/api/clipboard/clipboard.d.ts
new file mode 100644
index 0000000000..11b466dea0
--- /dev/null
+++ b/types/openfin/v37/_v2/api/clipboard/clipboard.d.ts
@@ -0,0 +1,70 @@
+import { Base } from '../base';
+import { WriteRequestType, WriteAnyRequestType } from './write-request';
+/**
+ * WriteRequestType interface
+ * @typedef { Object } WriteRequestType
+ * @property { string } name The name of the running application
+ * @property { string } uuid The uuid of the running application
+ */
+/**
+ * The Clipboard API allows reading and writing to the clipboard in multiple formats.
+ * @namespace
+*/
+export default class Clipboard extends Base {
+    /**
+     * Writes data into the clipboard as plain text
+     * @param { WriteRequestType } writeObj This object is described in the WriteRequestType typeof
+     * @return {Promise.<void>}
+     * @tutorial Clipboard.writeText
+    */
+    writeText(writeObj: WriteRequestType): Promise<void>;
+    /**
+     * Read the content of the clipboard as plain text
+     * @param { string } type Clipboard Type
+     * @return {Promise.<string>}
+     * @tutorial Clipboard.readText
+    */
+    readText(type?: string): Promise<string>;
+    /**
+     * Writes data into the clipboard as Html
+     * @param { WriteRequestType } writeObj This object is described in the WriteRequestType typedef
+     * @return {Promise.<void>}
+     * @tutorial Clipboard.writeHtml
+    */
+    writeHtml(writeObj: WriteRequestType): Promise<void>;
+    /**
+     * Read the content of the clipboard as Html
+     * @param { string } type Clipboard Type
+     * @return {Promise.<string>}
+     * @tutorial Clipboard.readHtml
+    */
+    readHtml(type?: string): Promise<string>;
+    /**
+     * Writes data into the clipboard as Rtf
+     * @param { WriteRequestType } writeObj This object is described in the WriteRequestType typedef
+     * @return {Promise.<void>}
+     * @tutorial Clipboard.writeRtf
+    */
+    writeRtf(writeObj: WriteRequestType): Promise<void>;
+    /**
+     * Read the content of the clipboard as Rtf
+     * @param { string } type Clipboard Type
+     * @return {Promise.<string>}
+     * @tutorial Clipboard.readRtf
+    */
+    readRtf(type?: string): Promise<string>;
+    /**
+     * Writes data into the clipboard
+     * @param { WriteRequestType } writeObj This object is described in the WriteRequestType typedef
+     * @return {Promise.<void>}
+     * @tutorial Clipboard.write
+    */
+    write(writeObj: WriteAnyRequestType): Promise<void>;
+    /**
+     * Reads available formats for the clipboard type
+     * @param { string } type Clipboard Type
+     * @return {Promise.Array.<string>}
+     * @tutorial Clipboard.getAvailableFormats
+    */
+    getAvailableFormats(type?: string): Promise<Array<string>>;
+}
diff --git a/types/openfin/v37/_v2/api/clipboard/write-request.d.ts b/types/openfin/v37/_v2/api/clipboard/write-request.d.ts
new file mode 100644
index 0000000000..a2fc5c333e
--- /dev/null
+++ b/types/openfin/v37/_v2/api/clipboard/write-request.d.ts
@@ -0,0 +1,12 @@
+export interface WriteRequestType {
+    data: string;
+    type?: string;
+}
+export interface WriteAnyRequestType {
+    data: {
+        text?: string;
+        html?: string;
+        rtf?: string;
+    };
+    type?: string;
+}
diff --git a/types/openfin/v37/_v2/api/events/application.d.ts b/types/openfin/v37/_v2/api/events/application.d.ts
new file mode 100644
index 0000000000..444d358cbd
--- /dev/null
+++ b/types/openfin/v37/_v2/api/events/application.d.ts
@@ -0,0 +1,56 @@
+import { WindowEvent, BaseEventMap, ApplicationEvent } from './base';
+import { WindowAlertRequestedEvent, WindowAuthRequestedEvent, WindowEndLoadEvent, PropagatedWindowEvents } from './window';
+export interface CrashedEvent {
+    reason: 'normal-termination' | 'abnormal-termination' | 'killed' | 'crashed' | 'still-running' | 'launch-failed' | 'out-of-memory';
+}
+export interface RunRequestedEvent<Topic, Type> extends ApplicationEvent<Topic, Type> {
+    userAppConfigArgs: any;
+}
+export interface TrayIconClicked<Topic, Type> extends ApplicationEvent<Topic, Type> {
+    button: 0 | 1 | 2;
+    x: number;
+    y: number;
+    monitorInfo: any;
+}
+export interface ApplicationEventMapping<Topic = string, Type = string> extends BaseEventMap {
+    'closed': ApplicationEvent<Topic, Type>;
+    'connected': ApplicationEvent<Topic, Type>;
+    'crashed': CrashedEvent & ApplicationEvent<Topic, Type>;
+    'initialized': ApplicationEvent<Topic, Type>;
+    'manifest-changed': ApplicationEvent<Topic, Type>;
+    'not-responding': ApplicationEvent<Topic, Type>;
+    'responding': ApplicationEvent<Topic, Type>;
+    'run-requested': RunRequestedEvent<Topic, Type>;
+    'started': ApplicationEvent<Topic, Type>;
+    'tray-icon-clicked': TrayIconClicked<Topic, Type>;
+    'window-alert-requested': WindowAlertRequestedEvent<Topic, Type>;
+    'window-auth-requested': WindowAuthRequestedEvent<Topic, Type>;
+    'window-created': WindowEvent<Topic, Type>;
+    'window-end-load': WindowEndLoadEvent<Topic, Type>;
+    'window-not-responding': WindowEvent<Topic, Type>;
+    'window-responding': WindowEvent<Topic, Type>;
+    'window-show-requested': WindowEvent<Topic, Type>;
+    'window-start-load': WindowEvent<Topic, Type>;
+}
+export interface PropagatedApplicationEventMapping<Topic = string, Type = string> {
+    'application-closed': ApplicationEvent<Topic, Type>;
+    'application-connected': ApplicationEvent<Topic, Type>;
+    'application-crashed': CrashedEvent & ApplicationEvent<Topic, Type>;
+    'application-initialized': ApplicationEvent<Topic, Type>;
+    'application-manifest-changed': ApplicationEvent<Topic, Type>;
+    'application-not-responding': ApplicationEvent<Topic, Type>;
+    'application-responding': ApplicationEvent<Topic, Type>;
+    'application-started': ApplicationEvent<Topic, Type>;
+    'application-tray-icon-clicked': TrayIconClicked<Topic, Type>;
+    'window-created': WindowEvent<Topic, Type>;
+    'window-end-load': WindowEndLoadEvent<Topic, Type>;
+    'window-not-responding': WindowEvent<Topic, Type>;
+    'window-responding': WindowEvent<Topic, Type>;
+    'window-start-load': WindowEvent<Topic, Type>;
+}
+export declare type ApplicationEvents = PropagatedWindowEvents<'application'> & {
+    [Type in keyof ApplicationEventMapping]: ApplicationEventMapping<'application', Type>[Type];
+};
+export declare type PropagatedApplicationEvents<Topic> = {
+    [Type in keyof PropagatedApplicationEventMapping]: PropagatedApplicationEventMapping<Topic, Type>[Type];
+};
diff --git a/types/openfin/v37/_v2/api/events/base.d.ts b/types/openfin/v37/_v2/api/events/base.d.ts
new file mode 100644
index 0000000000..700f82679b
--- /dev/null
+++ b/types/openfin/v37/_v2/api/events/base.d.ts
@@ -0,0 +1,18 @@
+import { FrameEvent } from './frame';
+export declare type RuntimeEvent<Topic = string, Type = string> = Topic extends 'window' ? WindowEvent<Topic, Type> : Topic extends 'frame' ? FrameEvent<Type> : Topic extends 'application' ? ApplicationEvent<Topic, Type> : BaseEvent<Topic, Type>;
+export interface BaseEvent<Topic, Type> {
+    topic: Topic;
+    type: Type;
+}
+export interface ApplicationEvent<Topic, Type> extends BaseEvent<Topic, Type> {
+    uuid: string;
+}
+export interface WindowEvent<Topic, Type> extends ApplicationEvent<Topic, Type> {
+    name: string;
+}
+export declare function getTopic(e: RuntimeEvent<any>): string;
+export interface BaseEventMap {
+    [name: string]: any;
+    'newListener': string;
+    'listenerRemoved': string;
+}
diff --git a/types/openfin/v37/_v2/api/events/channel.d.ts b/types/openfin/v37/_v2/api/events/channel.d.ts
new file mode 100644
index 0000000000..3c448071cb
--- /dev/null
+++ b/types/openfin/v37/_v2/api/events/channel.d.ts
@@ -0,0 +1,10 @@
+import { BaseEventMap, ApplicationEvent } from './base';
+export interface ChannelEvent<Type> extends ApplicationEvent<'channel', Type> {
+    channelName: string;
+    channelId: string;
+    name?: string;
+}
+export interface ChannelEvents extends BaseEventMap {
+    'connected': ChannelEvent<'connected'>;
+    'disconnected': ChannelEvent<'disconnected'>;
+}
diff --git a/types/openfin/v37/_v2/api/events/emitterMap.d.ts b/types/openfin/v37/_v2/api/events/emitterMap.d.ts
new file mode 100644
index 0000000000..aa3fb498e8
--- /dev/null
+++ b/types/openfin/v37/_v2/api/events/emitterMap.d.ts
@@ -0,0 +1,15 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+export declare class EmitterMap {
+    private storage;
+    constructor();
+    private hashKeys;
+    get(keys: EmitterAccessor): EventEmitter;
+    has(keys: EmitterAccessor): boolean;
+    delete(keys: EmitterAccessor): boolean;
+}
+export declare type SystemEmitterAccessor = ['system'];
+export declare type ApplicationEmitterAccessor = ['application', string];
+export declare type WindowEmitterAccessor = ['window', string, string];
+export declare type HotkeyEmitterAccessor = ['global-hotkey'];
+export declare type EmitterAccessor = SystemEmitterAccessor | ApplicationEmitterAccessor | WindowEmitterAccessor | HotkeyEmitterAccessor | string[];
diff --git a/types/openfin/v37/_v2/api/events/eventAggregator.d.ts b/types/openfin/v37/_v2/api/events/eventAggregator.d.ts
new file mode 100644
index 0000000000..ac7b7ca1b2
--- /dev/null
+++ b/types/openfin/v37/_v2/api/events/eventAggregator.d.ts
@@ -0,0 +1,5 @@
+import { Message } from '../../transport/transport';
+import { EmitterMap } from './emitterMap';
+export declare class EventAggregator extends EmitterMap {
+    dispatchEvent: (message: Message<any>) => boolean;
+}
diff --git a/types/openfin/v37/_v2/api/events/externalApplication.d.ts b/types/openfin/v37/_v2/api/events/externalApplication.d.ts
new file mode 100644
index 0000000000..f7cd85f45d
--- /dev/null
+++ b/types/openfin/v37/_v2/api/events/externalApplication.d.ts
@@ -0,0 +1,5 @@
+import { RuntimeEvent, BaseEventMap } from './base';
+export interface ExternalApplicationEvents extends BaseEventMap {
+    connected: RuntimeEvent<'externalapplication', 'connected'>;
+    disconnected: RuntimeEvent<'externalapplication', 'disconnected'>;
+}
diff --git a/types/openfin/v37/_v2/api/events/frame.d.ts b/types/openfin/v37/_v2/api/events/frame.d.ts
new file mode 100644
index 0000000000..c31933e557
--- /dev/null
+++ b/types/openfin/v37/_v2/api/events/frame.d.ts
@@ -0,0 +1,9 @@
+import { BaseEventMap, WindowEvent } from './base';
+export interface FrameEvent<Type> extends WindowEvent<'frame', Type> {
+    entityType: 'iframe';
+    frameName: string;
+}
+export interface FrameEvents extends BaseEventMap {
+    connected: FrameEvent<'connected'>;
+    disconnected: FrameEvent<'disconnected'>;
+}
diff --git a/types/openfin/v37/_v2/api/events/globalHotkey.d.ts b/types/openfin/v37/_v2/api/events/globalHotkey.d.ts
new file mode 100644
index 0000000000..561baba446
--- /dev/null
+++ b/types/openfin/v37/_v2/api/events/globalHotkey.d.ts
@@ -0,0 +1,11 @@
+import { RuntimeEvent, BaseEventMap } from './base';
+import { Identity } from '../../identity';
+import { nonHotkeyEvents } from '../global-hotkey';
+export interface GlobalHotkeyEvent<Type> extends RuntimeEvent<'global-hotkey', Type> {
+    identity: Identity;
+    hotkey: string;
+}
+export interface GlobalHotkeyEvents extends BaseEventMap {
+    [nonHotkeyEvents.REGISTERED]: GlobalHotkeyEvent<nonHotkeyEvents.REGISTERED>;
+    [nonHotkeyEvents.UNREGISTERED]: GlobalHotkeyEvent<nonHotkeyEvents.UNREGISTERED>;
+}
diff --git a/types/openfin/v37/_v2/api/events/notifications.d.ts b/types/openfin/v37/_v2/api/events/notifications.d.ts
new file mode 100644
index 0000000000..a269817222
--- /dev/null
+++ b/types/openfin/v37/_v2/api/events/notifications.d.ts
@@ -0,0 +1,8 @@
+import { RuntimeEvent, BaseEventMap } from './base';
+export interface NotificationEvents extends BaseEventMap {
+    show: RuntimeEvent<'notification', 'show'>;
+    close: RuntimeEvent<'notification', 'close'>;
+    error: RuntimeEvent<'notification', 'error'>;
+    click: RuntimeEvent<'notification', 'click'>;
+    message: RuntimeEvent<'notification', 'message'>;
+}
diff --git a/types/openfin/v37/_v2/api/events/system.d.ts b/types/openfin/v37/_v2/api/events/system.d.ts
new file mode 100644
index 0000000000..20285a8862
--- /dev/null
+++ b/types/openfin/v37/_v2/api/events/system.d.ts
@@ -0,0 +1,22 @@
+import { BaseEvent, ApplicationEvent, BaseEventMap } from './base';
+import { MonitorInfo } from '../system/monitor';
+import { PropagatedWindowEvents } from './window';
+import { PropagatedApplicationEvents } from './application';
+export interface IdleEvent<Topic, Type> extends BaseEvent<Topic, Type> {
+    elapsedTime: number;
+    isIdle: boolean;
+}
+export declare type MonitorEvent<Topic, Type> = MonitorInfo & BaseEvent<Topic, Type>;
+export interface SessionChangedEvent<Topic, Type> extends BaseEvent<Topic, Type> {
+    reason: 'lock' | 'unlock' | 'remote-connect' | 'remote-disconnect' | 'unknown';
+}
+export interface SystemEventMapping<Topic = string, Type = string> extends BaseEventMap {
+    'application-created': ApplicationEvent<Topic, Type>;
+    'desktop-icon-clicked': ApplicationEvent<Topic, Type>;
+    'idle-state-changed': IdleEvent<Topic, Type>;
+    'monitor-info-changed': MonitorEvent<Topic, Type>;
+    'session-changed': SessionChangedEvent<Topic, Type>;
+}
+export declare type SystemEvents = PropagatedWindowEvents<'system'> & PropagatedApplicationEvents<'system'> & {
+    [Type in keyof SystemEventMapping]: SystemEventMapping<'system', Type>[Type];
+};
diff --git a/types/openfin/v37/_v2/api/events/window.d.ts b/types/openfin/v37/_v2/api/events/window.d.ts
new file mode 100644
index 0000000000..85d4d553f0
--- /dev/null
+++ b/types/openfin/v37/_v2/api/events/window.d.ts
@@ -0,0 +1,176 @@
+import { CrashedEvent } from './application';
+import { WindowEvent, BaseEventMap } from './base';
+export declare type SpecificWindowEvent<Type> = WindowEvent<'window', Type>;
+export interface WindowAlertRequestedEvent<Topic, Type> extends WindowEvent<Topic, Type> {
+    message: string;
+    url: string;
+}
+export interface WindowAuthRequestedEvent<Topic, Type> extends WindowEvent<Topic, Type> {
+    authInfo: {
+        host: string;
+        isProxy: boolean;
+        port: number;
+        realm: string;
+        scheme: string;
+    };
+}
+export interface WindowEndLoadEvent<Topic, Type> extends WindowEvent<Topic, Type> {
+    documentName: string;
+    isMain: boolean;
+}
+export interface WindowNavigationRejectedEvent<Topic, Type> extends WindowEvent<Topic, Type> {
+    sourceName: string;
+    url: string;
+}
+export interface WindowReloadedEvent<Topic, Type> extends WindowEvent<Topic, Type> {
+    url: string;
+}
+export interface WindowExternalProcessExitedEvent<Topic, Type> extends WindowEvent<Topic, Type> {
+    processUuid: string;
+    exitCode: number;
+}
+export interface WindowExternalProcessStartedEvent<Topic, Type> extends WindowEvent<Topic, Type> {
+    processUuid: string;
+}
+export interface WindowHiddenEvent<Topic, Type> extends WindowEvent<Topic, Type> {
+    reason: 'closing' | 'hide' | 'hide-on-close';
+}
+export interface PreloadScriptInfoRunning {
+    state: 'load-started' | // started loading preload script
+    'load-failed' | // preload script failed to load
+    'load-succeeded' | // preload script is loaded and ready to be eval'ed
+    'failed' | // preload script failed to eval
+    'succeeded';
+}
+export interface PreloadScriptInfo {
+    state: 'load-failed' | // preload script failed to load
+    'failed' | // preload script failed to eval
+    'succeeded';
+}
+export interface WindowPreloadScriptsStateChangeEvent<Topic, Type> extends WindowEvent<Topic, Type> {
+    preloadScripts: (PreloadScriptInfoRunning & any)[];
+}
+export interface WindowPreloadScriptsStateChangedEvent<Topic, Type> extends WindowEvent<Topic, Type> {
+    preloadScripts: (PreloadScriptInfoRunning & any)[];
+}
+export interface WindowPreloadScriptsStateChangedEvent<Topic, Type> extends WindowEvent<Topic, Type> {
+    preloadScripts: (PreloadScriptInfo & any)[];
+}
+export interface WindowResourceLoadFailedEvent<Topic, Type> extends WindowEvent<Topic, Type> {
+    errorCode: number;
+    errorDescription: string;
+    validatedURL: string;
+    isMainFrame: boolean;
+}
+export interface WindowResourceResponseReceivedEvent<Topic, Type> extends WindowEvent<Topic, Type> {
+    status: boolean;
+    newUrl: string;
+    originalUrl: string;
+    httpResponseCode: number;
+    requestMethod: string;
+    referrer: string;
+    headers: any;
+    resourceType: 'mainFrame' | 'subFrame' | 'styleSheet' | 'script' | 'image' | 'object' | 'xhr' | 'other';
+}
+export interface WindowBeginBoundsChangingEvent<Topic, Type> extends WindowEvent<Topic, Type> {
+    height: number;
+    left: number;
+    top: number;
+    width: number;
+    windowState: 'minimized' | 'normal' | 'maximized';
+}
+export interface WindowBoundsChange<Topic, Type> extends WindowEvent<Topic, Type> {
+    changeType: 0 | 1 | 2;
+    deferred: boolean;
+    height: number;
+    left: number;
+    top: number;
+    width: number;
+}
+export interface WindowGroupChanged<Topic, Type> extends WindowEvent<Topic, Type> {
+    memberOf: 'source' | 'target' | 'nothing';
+    reason: 'leave' | 'join' | 'merge' | 'disband';
+    sourceGroup: {
+        appUuid: string;
+        windowName: string;
+    }[];
+    sourceWindowAppUuid: string;
+    sourceWindowName: string;
+    targetGroup: {
+        appUuid: string;
+        windowName: string;
+    }[];
+    targetWindowAppUuid: string;
+    targetWindowName: string;
+}
+export interface WindowEventMapping<Topic = string, Type = string> extends BaseEventMap {
+    'auth-requested': WindowAuthRequestedEvent<Topic, Type>;
+    'begin-user-bounds-changing': WindowBeginBoundsChangingEvent<Topic, Type>;
+    'blurred': WindowEvent<Topic, Type>;
+    'bounds-changed': WindowBoundsChange<Topic, Type>;
+    'bounds-changing': WindowBoundsChange<Topic, Type>;
+    'close-requested': WindowEvent<Topic, Type>;
+    'closed': WindowEvent<Topic, Type>;
+    'closing': WindowEvent<Topic, Type>;
+    'crashed': CrashedEvent & WindowEvent<Topic, Type>;
+    'disabled-frame-bounds-changed': WindowBoundsChange<Topic, Type>;
+    'disabled-frame-bounds-changing': WindowBoundsChange<Topic, Type>;
+    'embedded': WindowEvent<Topic, Type>;
+    'end-user-bounds-changing': WindowBeginBoundsChangingEvent<Topic, Type>;
+    'external-process-exited': WindowExternalProcessExitedEvent<Topic, Type>;
+    'external-process-started': WindowExternalProcessStartedEvent<Topic, Type>;
+    'focused': WindowEvent<Topic, Type>;
+    'frame-disabled': WindowEvent<Topic, Type>;
+    'frame-enabled': WindowEvent<Topic, Type>;
+    'group-changed': WindowGroupChanged<Topic, Type>;
+    'hidden': WindowHiddenEvent<Topic, Type>;
+    'initialized': WindowEvent<Topic, Type>;
+    'maximized': WindowEvent<Topic, Type>;
+    'minimized': WindowEvent<Topic, Type>;
+    'navigation-rejected': WindowNavigationRejectedEvent<Topic, Type>;
+    'preload-scripts-state-changed': WindowPreloadScriptsStateChangeEvent<Topic, Type>;
+    'preload-scripts-state-changing': WindowPreloadScriptsStateChangeEvent<Topic, Type>;
+    'resource-load-failed': WindowResourceLoadFailedEvent<Topic, Type>;
+    'resource-response-received': WindowResourceResponseReceivedEvent<Topic, Type>;
+    'reloaded': WindowReloadedEvent<Topic, Type>;
+    'restored': WindowEvent<Topic, Type>;
+    'show-requested': WindowEvent<Topic, Type>;
+    'shown': WindowEvent<Topic, Type>;
+}
+export interface PropagatedWindowEventMapping<Topic = string, Type = string> extends BaseEventMap {
+    'window-begin-user-bounds-changing': WindowBeginBoundsChangingEvent<Topic, Type>;
+    'window-blurred': WindowEvent<Topic, Type>;
+    'window-bounds-changed': WindowBoundsChange<Topic, Type>;
+    'window-bounds-changing': WindowBoundsChange<Topic, Type>;
+    'window-closed': WindowEvent<Topic, Type>;
+    'window-closing': WindowEvent<Topic, Type>;
+    'window-crashed': CrashedEvent & WindowEvent<Topic, Type>;
+    'window-disabled-frame-bounds-changed': WindowBoundsChange<Topic, Type>;
+    'window-disabled-frame-bounds-changing': WindowBoundsChange<Topic, Type>;
+    'window-embedded': WindowEvent<Topic, Type>;
+    'window-end-user-bounds-changing': WindowBeginBoundsChangingEvent<Topic, Type>;
+    'window-external-process-exited': WindowExternalProcessExitedEvent<Topic, Type>;
+    'window-external-process-started': WindowExternalProcessStartedEvent<Topic, Type>;
+    'window-focused': WindowEvent<Topic, Type>;
+    'window-frame-disabled': WindowEvent<Topic, Type>;
+    'window-frame-enabled': WindowEvent<Topic, Type>;
+    'window-group-changed': WindowGroupChanged<Topic, Type>;
+    'window-hidden': WindowHiddenEvent<Topic, Type>;
+    'window-initialized': WindowEvent<Topic, Type>;
+    'window-maximized': WindowEvent<Topic, Type>;
+    'window-minimized': WindowEvent<Topic, Type>;
+    'window-navigation-rejected': WindowNavigationRejectedEvent<Topic, Type>;
+    'window-preload-scripts-state-changed': WindowPreloadScriptsStateChangeEvent<Topic, Type>;
+    'window-preload-scripts-state-changing': WindowPreloadScriptsStateChangedEvent<Topic, Type>;
+    'window-resource-load-failed': WindowResourceLoadFailedEvent<Topic, Type>;
+    'window-resource-response-received': WindowResourceResponseReceivedEvent<Topic, Type>;
+    'window-reloaded': WindowReloadedEvent<Topic, Type>;
+    'window-restored': WindowEvent<Topic, Type>;
+    'window-shown': WindowEvent<Topic, Type>;
+}
+export declare type WindowEvents = {
+    [Type in keyof WindowEventMapping]: WindowEventMapping<'window', Type>[Type];
+};
+export declare type PropagatedWindowEvents<Topic> = {
+    [Type in keyof PropagatedWindowEventMapping]: PropagatedWindowEventMapping<Topic, Type>[Type];
+};
diff --git a/types/openfin/v37/_v2/api/external-application/external-application.d.ts b/types/openfin/v37/_v2/api/external-application/external-application.d.ts
new file mode 100644
index 0000000000..a4f44851e9
--- /dev/null
+++ b/types/openfin/v37/_v2/api/external-application/external-application.d.ts
@@ -0,0 +1,44 @@
+import { Base, EmitterBase } from '../base';
+import { Identity } from '../../identity';
+import Transport from '../../transport/transport';
+import { ExternalApplicationEvents } from '../events/externalApplication';
+export interface ExternalApplicationInfo {
+    parent: Identity;
+}
+/**
+ * @lends ExternalApplication
+ */
+export default class ExternalApplicationModule extends Base {
+    /**
+     * Asynchronously returns an External Application object that represents an existing external application.
+     * @param {string} uuid The UUID of the external application to be wrapped
+     * @return {Promise.<ExternalApplication>}
+     * @tutorial ExternalApplication.wrap
+     * @static
+     */
+    wrap(uuid: string): Promise<ExternalApplication>;
+    /**
+     * Synchronously returns an External Application object that represents an existing external application.
+     * @param {string} uuid The UUID of the external application to be wrapped
+     * @return {ExternalApplication}
+     * @tutorial ExternalApplication.wrapSync
+     * @static
+     */
+    wrapSync(uuid: string): ExternalApplication;
+}
+/**
+ * @classdesc An ExternalApplication object representing an application. Allows
+ * the developer to create, execute, show and close an external application as
+ * well as listen to application events.
+ * @class
+ */
+export declare class ExternalApplication extends EmitterBase<ExternalApplicationEvents> {
+    identity: Identity;
+    constructor(wire: Transport, identity: Identity);
+    /**
+     * Retrieves information about the external application.
+     * @return {Promise.<ExternalApplicationInfo>}
+     * @tutorial ExternalApplication.getInfo
+     */
+    getInfo(): Promise<ExternalApplicationInfo>;
+}
diff --git a/types/openfin/v37/_v2/api/fin.d.ts b/types/openfin/v37/_v2/api/fin.d.ts
new file mode 100644
index 0000000000..1bec2ffb4f
--- /dev/null
+++ b/types/openfin/v37/_v2/api/fin.d.ts
@@ -0,0 +1,27 @@
+/// <reference types="node" />
+import Transport from '../transport/transport';
+import { EventEmitter } from 'events';
+import System from './system/system';
+import _WindowModule from './window/window';
+import Application from './application/application';
+import InterApplicationBus from './interappbus/interappbus';
+import _NotificationModule from './notification/notification';
+import Clipbpard from './clipboard/clipboard';
+import ExternalApplication from './external-application/external-application';
+import _FrameModule from './frame/frame';
+import GlobalHotkey from './global-hotkey';
+import { Identity } from '../identity';
+export default class Fin extends EventEmitter {
+    private wire;
+    System: System;
+    Window: _WindowModule;
+    Application: Application;
+    InterApplicationBus: InterApplicationBus;
+    Notification: _NotificationModule;
+    Clipboard: Clipbpard;
+    ExternalApplication: ExternalApplication;
+    Frame: _FrameModule;
+    GlobalHotkey: GlobalHotkey;
+    readonly me: Identity;
+    constructor(wire: Transport);
+}
diff --git a/types/openfin/v37/_v2/api/frame/frame.d.ts b/types/openfin/v37/_v2/api/frame/frame.d.ts
new file mode 100644
index 0000000000..8795ae190b
--- /dev/null
+++ b/types/openfin/v37/_v2/api/frame/frame.d.ts
@@ -0,0 +1,69 @@
+import { Base, EmitterBase } from '../base';
+import { Identity } from '../../identity';
+import Transport from '../../transport/transport';
+import { FrameEvents } from '../events/frame';
+export declare type EntityType = 'window' | 'iframe' | 'external connection' | 'unknown';
+export interface FrameInfo {
+    uuid: string;
+    name: string;
+    entityType: EntityType;
+    parent: Identity;
+}
+/**
+ * @lends Frame
+ */
+export default class _FrameModule extends Base {
+    /**
+     * Asynchronously returns a reference to the specified frame. The frame does not have to exist
+     * @param {Identity} identity - the identity of the frame you want to wrap
+     * @return {Promise.<_Frame>}
+     * @tutorial Frame.wrap
+     * @static
+     */
+    wrap(identity: Identity): Promise<_Frame>;
+    /**
+     * Synchronously returns a reference to the specified frame. The frame does not have to exist
+     * @param {Identity} identity - the identity of the frame you want to wrap
+     * @return {_Frame}
+     * @tutorial Frame.wrapSync
+     * @static
+     */
+    wrapSync(identity: Identity): _Frame;
+    /**
+     * Asynchronously returns a reference to the current frame
+     * @return {Promise.<_Frame>}
+     * @tutorial Frame.getCurrent
+     * @static
+     */
+    getCurrent(): Promise<_Frame>;
+    /**
+     * Synchronously returns a reference to the current frame
+     * @return {_Frame}
+     * @tutorial Frame.getCurrentSync
+     * @static
+     */
+    getCurrentSync(): _Frame;
+}
+/**
+ * @classdesc Represents a way to interact with `iframes`. Facilitates discovery of current context
+ * (iframe or main window) as well as the ability to listen for frame-specific events.
+ * @class
+ * @alias Frame
+ */
+export declare class _Frame extends EmitterBase<FrameEvents> {
+    identity: Identity;
+    constructor(wire: Transport, identity: Identity);
+    /**
+     * Returns a frame info object for the represented frame
+     * @return {Promise.<FrameInfo>}
+     * @tutorial Frame.getInfo
+     */
+    getInfo(): Promise<FrameInfo>;
+    /**
+     * Returns a frame info object representing the window that the referenced iframe is
+     * currently embedded in
+     * @return {Promise.<FrameInfo>}
+     * @tutorial Frame.getParentWindow
+     */
+    getParentWindow(): Promise<FrameInfo>;
+}
diff --git a/types/openfin/v37/_v2/api/global-hotkey/index.d.ts b/types/openfin/v37/_v2/api/global-hotkey/index.d.ts
new file mode 100644
index 0000000000..7aa08d6f20
--- /dev/null
+++ b/types/openfin/v37/_v2/api/global-hotkey/index.d.ts
@@ -0,0 +1,38 @@
+import { EmitterBase } from '../base';
+import Transport from '../../transport/transport';
+import { GlobalHotkeyEvents } from '../events/globalHotkey';
+export declare const enum nonHotkeyEvents {
+    REGISTERED = "registered",
+    UNREGISTERED = "unregistered"
+}
+/**
+ * The GlobalHotkey module can register/unregister a global hotkeys.
+ * @namespace
+ */
+export default class GlobalHotkey extends EmitterBase<GlobalHotkeyEvents> {
+    constructor(wire: Transport);
+    /**
+     * Registers a global hotkey with the operating system.
+     * @return {Promise.<void>}
+     * @tutorial GlobalHotkey.register
+     */
+    register(hotkey: string, listener: (...args: any[]) => void): Promise<void>;
+    /**
+     * Unregisters a global hotkey with the operating system.
+     * @return {Promise.<void>}
+     * @tutorial GlobalHotkey.unregister
+     */
+    unregister(hotkey: string): Promise<void>;
+    /**
+     * Unregisters all global hotkeys for the current application.
+     * @return {Promise.<void>}
+     * @tutorial GlobalHotkey.unregisterAll
+     */
+    unregisterAll(): Promise<void>;
+    /**
+     * Checks if a given hotkey has been registered
+     * @return {Promise.<bookean>}
+     * @tutorial GlobalHotkey.isRegistered
+     */
+    isRegistered(hotkey: string): Promise<boolean>;
+}
diff --git a/types/openfin/v37/_v2/api/interappbus/channel/channel.d.ts b/types/openfin/v37/_v2/api/interappbus/channel/channel.d.ts
new file mode 100644
index 0000000000..1c9a502e12
--- /dev/null
+++ b/types/openfin/v37/_v2/api/interappbus/channel/channel.d.ts
@@ -0,0 +1,31 @@
+import { Identity } from '../../../identity';
+import Transport, { Message } from '../../../transport/transport';
+export interface ProviderIdentity extends Identity {
+    channelId: string;
+    isExternal?: boolean;
+    channelName: string;
+}
+export declare type Action = (() => any) | ((payload: any) => any) | ((payload: any, id: ProviderIdentity) => any);
+export declare type Middleware = (() => any) | ((action: string) => any) | ((action: string, payload: any) => any) | ((action: string, payload: any, id: ProviderIdentity) => any);
+export interface ChannelMessagePayload extends Identity {
+    action: string;
+    payload: any;
+}
+export declare class ChannelBase {
+    protected subscriptions: any;
+    defaultAction: (action?: string, payload?: any, senderIdentity?: ProviderIdentity) => any;
+    private preAction;
+    private postAction;
+    private errorMiddleware;
+    private defaultSet;
+    protected send: (to: Identity, action: string, payload: any) => Promise<Message<void>>;
+    protected providerIdentity: ProviderIdentity;
+    constructor(providerIdentity: ProviderIdentity, send: Transport['sendAction']);
+    processAction(action: string, payload: any, senderIdentity: ProviderIdentity): Promise<any>;
+    beforeAction(func: Action): void;
+    onError(func: (e: any, action: string, id: Identity) => any): void;
+    afterAction(func: Action): void;
+    remove(action: string): void;
+    setDefaultAction(func: (action?: string, payload?: any, senderIdentity?: ProviderIdentity) => any): void;
+    register(topic: string, listener: Action): boolean;
+}
diff --git a/types/openfin/v37/_v2/api/interappbus/channel/client.d.ts b/types/openfin/v37/_v2/api/interappbus/channel/client.d.ts
new file mode 100644
index 0000000000..d1c128a349
--- /dev/null
+++ b/types/openfin/v37/_v2/api/interappbus/channel/client.d.ts
@@ -0,0 +1,6 @@
+import { ChannelBase, ProviderIdentity } from './channel';
+import Transport from '../../../transport/transport';
+export declare class ChannelClient extends ChannelBase {
+    constructor(providerIdentity: ProviderIdentity, send: Transport['sendAction']);
+    dispatch(action: string, payload?: any): Promise<any>;
+}
diff --git a/types/openfin/v37/_v2/api/interappbus/channel/index.d.ts b/types/openfin/v37/_v2/api/interappbus/channel/index.d.ts
new file mode 100644
index 0000000000..2b2d963932
--- /dev/null
+++ b/types/openfin/v37/_v2/api/interappbus/channel/index.d.ts
@@ -0,0 +1,32 @@
+import { ChannelClient } from './client';
+import { Identity } from '../../../identity';
+import { ChannelProvider } from './provider';
+import { EmitterBase } from '../../base';
+import Transport, { Message, Payload } from '../../../transport/transport';
+import { ProviderIdentity } from './channel';
+import { ChannelEvents } from '../../events/channel';
+export interface ConnectOptions {
+    wait?: boolean;
+    payload?: any;
+}
+export interface ChannelPayload {
+    payload: Payload;
+}
+export interface ChannelMessage extends Message<any> {
+    senderIdentity: Identity;
+    ackToSender: any;
+    providerIdentity: ProviderIdentity;
+    connectAction: boolean;
+}
+export declare class Channel extends EmitterBase<ChannelEvents> {
+    private channelMap;
+    constructor(wire: Transport);
+    getAllChannels(): Promise<ProviderIdentity[]>;
+    onChannelConnect(listener: (...args: any[]) => void): Promise<void>;
+    onChannelDisconnect(listener: (...args: any[]) => void): Promise<void>;
+    connect(channelName: string, options?: ConnectOptions): Promise<ChannelClient>;
+    create(channelName: string): Promise<ChannelProvider>;
+    onmessage: (msg: ChannelMessage) => boolean;
+    private processChannelMessage;
+    private processChannelConnection;
+}
diff --git a/types/openfin/v37/_v2/api/interappbus/channel/provider.d.ts b/types/openfin/v37/_v2/api/interappbus/channel/provider.d.ts
new file mode 100644
index 0000000000..4b978c2781
--- /dev/null
+++ b/types/openfin/v37/_v2/api/interappbus/channel/provider.d.ts
@@ -0,0 +1,15 @@
+import { ChannelBase, ProviderIdentity } from './channel';
+import Transport from '../../../transport/transport';
+import { Identity } from '../../../main';
+export declare type ConnectionListener = (identity: Identity, connectionMessage?: any) => any;
+export declare class ChannelProvider extends ChannelBase {
+    private connectListener;
+    private disconnectListener;
+    connections: Identity[];
+    constructor(providerIdentity: ProviderIdentity, send: Transport['sendAction']);
+    dispatch(to: Identity, action: string, payload: any): Promise<any>;
+    processConnection(senderId: Identity, payload: any): Promise<any>;
+    publish(action: string, payload: any): Promise<any>[];
+    onConnection(listener: ConnectionListener): void;
+    onDisconnection(listener: ConnectionListener): void;
+}
diff --git a/types/openfin/v37/_v2/api/interappbus/interappbus.d.ts b/types/openfin/v37/_v2/api/interappbus/interappbus.d.ts
new file mode 100644
index 0000000000..48aaf7430c
--- /dev/null
+++ b/types/openfin/v37/_v2/api/interappbus/interappbus.d.ts
@@ -0,0 +1,80 @@
+/// <reference types="node" />
+import { Base } from '../base';
+import { Identity } from '../../identity';
+import Transport, { Message } from '../../transport/transport';
+import { EventEmitter } from 'events';
+import { Channel } from './channel/index';
+/**
+ * A messaging bus that allows for pub/sub messaging between different applications.
+ * @namespace
+*/
+export default class InterApplicationBus extends Base {
+    Channel: Channel;
+    events: {
+        subscriberAdded: string;
+        subscriberRemoved: string;
+    };
+    private refCounter;
+    protected emitter: EventEmitter;
+    on: any;
+    removeAllListeners: any;
+    constructor(wire: Transport);
+    /**
+     * Publishes a message to all applications running on OpenFin Runtime that
+     * are subscribed to the specified topic.
+     * @param { string } topic The topic on which the message is sent
+     * @param { any } message The message to be published. Can be either a primitive
+     * data type (string, number, or boolean) or composite data type (object, array)
+     * that is composed of other primitive or composite data types
+     * @return {Promise.<void>}
+     * @tutorial InterApplicationBus.publish
+    */
+    publish(topic: string, message: any): Promise<void>;
+    /**
+     * Sends a message to a specific application on a specific topic.
+     * @param { object } destination The uuid of the application to which the message is sent
+     * @param { string } topic The topic on which the message is sent
+     * @param { any } message The message to be sent. Can be either a primitive data
+     * type (string, number, or boolean) or composite data type (object, array) that
+     * is composed of other primitive or composite data types
+     * @return {Promise.<void>}
+     * @tutorial InterApplicationBus.send
+    */
+    send(destination: Identity, topic: string, message: any): Promise<void>;
+    /**
+     * Subscribes to messages from the specified application on the specified topic.
+     * If the subscription is for a uuid, [name], topic combination that has already
+     * been published to upon subscription you will receive the last 20 missed messages
+     * in the order they were published.
+     * @param { Identity } source This object is described in the Identity in the typedef
+     * @param { string } topic The topic on which the message is sent
+     * @param { function } listener A function that is called when a message has
+     * been received. It is passed the message, uuid and name of the sending application.
+     * The message can be either a primitive data type (string, number, or boolean) or
+     * composite data type (object, array) that is composed of other primitive or composite
+     * data types
+     * @return {Promise.<void>}
+     * @tutorial InterApplicationBus.subcribe
+     */
+    subscribe(source: Identity, topic: string, listener: any): Promise<void>;
+    /**
+     * Unsubscribes to messages from the specified application on the specified topic.
+     * @param { Identity } source This object is described in the Identity in the typedef
+     * @param { string } topic The topic on which the message is sent
+     * @param { function } listener A callback previously registered with subscribe()
+     * @return {Promise.<void>}
+     * @tutorial InterApplicationBus.unsubscribe
+     */
+    unsubscribe(source: Identity, topic: string, listener: any): Promise<void>;
+    private processMessage;
+    private emitSubscriverEvent;
+    protected createSubscriptionKey(uuid: string, name: string, topic: string): string;
+    protected onmessage(message: Message<InterAppPayload>): boolean;
+}
+export declare class InterAppPayload {
+    sourceUuid: string;
+    sourceWindowName: string;
+    topic: string;
+    destinationUuid?: string;
+    message?: any;
+}
diff --git a/types/openfin/v37/_v2/api/notification/notification.d.ts b/types/openfin/v37/_v2/api/notification/notification.d.ts
new file mode 100644
index 0000000000..9a6bee7076
--- /dev/null
+++ b/types/openfin/v37/_v2/api/notification/notification.d.ts
@@ -0,0 +1,70 @@
+import { Base, EmitterBase } from '../base';
+import { Identity } from '../../identity';
+import Transport from '../../transport/transport';
+import { NotificationEvents } from '../events/notifications';
+export declare class NotificationOptions {
+    url: string;
+    message: string;
+    timeout: string | number;
+    notificationId: number;
+    uuidOfProxiedApp: string;
+    ignoreMouseOver: boolean;
+    constructor(options: any, identity: Identity, notificationId: number);
+}
+export interface NotificationCallback {
+    message?: any;
+}
+/**
+ * @classdesc A Notification object represents a window on OpenFin Runtime which
+ * is shown briefly to the user on the bottom-right corner of the primary monitor.
+ * A notification is typically used to alert the user of some important event which
+ * requires his or her attention. Notifications are a child or your application that
+ * are controlled by the runtime.
+ * @class
+ * @alias Notification
+ */
+export declare class _Notification extends EmitterBase<NotificationEvents> {
+    private listenerList;
+    private unhookAllListeners;
+    protected options: NotificationOptions;
+    protected generalListener: (msg: any) => void;
+    protected notificationId: number;
+    constructor(wire: Transport, options: NotificationOptions);
+    url: string;
+    timeout: number | string;
+    message: any;
+    /**
+     * Invoked when the notification is shown
+     * @return {Promise.<void>}
+     * @tutorial Notification.show
+     */
+    show(): Promise<void>;
+    /**
+     * Sends a message to the notification.
+     * @param { any } message The message to be sent to the notification.
+     * Can be either a primitive data type (string, number, or boolean)
+     * or composite data type (object, array) that is composed of other
+     * primitive or composite data types
+     * @return {Promise.<void>}
+     * @tutorial Notification.sendMessage
+     */
+    sendMessage(message: any): Promise<void>;
+    /**
+     * Closes the notification
+     * @return {Promise.<void>}
+     * @tutorial Notification.close
+     */
+    close(): Promise<void>;
+}
+export default class _NotificationModule extends Base {
+    private nextNoteId;
+    private genNoteId;
+    events: {
+        show: string;
+        close: string;
+        error: string;
+        click: string;
+        message: string;
+    };
+    create(options: any): _Notification;
+}
diff --git a/types/openfin/v37/_v2/api/system/application.d.ts b/types/openfin/v37/_v2/api/system/application.d.ts
new file mode 100644
index 0000000000..0e14602942
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/application.d.ts
@@ -0,0 +1,5 @@
+export interface ApplicationInfo {
+    isRunning: boolean;
+    uuid: string;
+    parentUuid?: string;
+}
diff --git a/types/openfin/v37/_v2/api/system/clearCacheOption.d.ts b/types/openfin/v37/_v2/api/system/clearCacheOption.d.ts
new file mode 100644
index 0000000000..6bae8116b7
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/clearCacheOption.d.ts
@@ -0,0 +1,6 @@
+export interface ClearCacheOption {
+    appcache?: boolean;
+    cache?: boolean;
+    cookies?: boolean;
+    localStorage?: boolean;
+}
diff --git a/types/openfin/v37/_v2/api/system/cookie.d.ts b/types/openfin/v37/_v2/api/system/cookie.d.ts
new file mode 100644
index 0000000000..1d229232c6
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/cookie.d.ts
@@ -0,0 +1,8 @@
+export interface CookieInfo {
+    name: string;
+    domain: string;
+    path: string;
+}
+export interface CookieOption {
+    name: string;
+}
diff --git a/types/openfin/v37/_v2/api/system/crashReporterOption.d.ts b/types/openfin/v37/_v2/api/system/crashReporterOption.d.ts
new file mode 100644
index 0000000000..7d512fdd7b
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/crashReporterOption.d.ts
@@ -0,0 +1,4 @@
+export interface CrashReporterOption {
+    diagnosticMode: boolean;
+    isRunning?: boolean;
+}
diff --git a/types/openfin/v37/_v2/api/system/download-asset.d.ts b/types/openfin/v37/_v2/api/system/download-asset.d.ts
new file mode 100644
index 0000000000..be513f5f0e
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/download-asset.d.ts
@@ -0,0 +1,18 @@
+export interface AppAssetInfo {
+    src: string;
+    alias: string;
+    version: string;
+    target?: string;
+    args?: string;
+    mandatory?: boolean;
+}
+export interface RuntimeDownloadOptions {
+    version: string;
+}
+export interface AppAssetRequest {
+    alias: string;
+}
+export interface RuntimeDownloadProgress {
+    downloadedBytes: number;
+    totalBytes: number;
+}
diff --git a/types/openfin/v37/_v2/api/system/download-preload.d.ts b/types/openfin/v37/_v2/api/system/download-preload.d.ts
new file mode 100644
index 0000000000..a7e635bcb8
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/download-preload.d.ts
@@ -0,0 +1,8 @@
+export interface DownloadPreloadOption {
+    url: string;
+}
+export interface DownloadPreloadInfo {
+    success: boolean;
+    url?: string;
+    error: string;
+}
diff --git a/types/openfin/v37/_v2/api/system/entity.d.ts b/types/openfin/v37/_v2/api/system/entity.d.ts
new file mode 100644
index 0000000000..50011a64f3
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/entity.d.ts
@@ -0,0 +1,11 @@
+import { Identity } from '../../identity';
+export interface Entity {
+    type: string;
+    uuid: string;
+}
+export interface EntityInfo {
+    name: string;
+    uuid: string;
+    parent: Identity;
+    entityType: string;
+}
diff --git a/types/openfin/v37/_v2/api/system/external-process.d.ts b/types/openfin/v37/_v2/api/system/external-process.d.ts
new file mode 100644
index 0000000000..624c93ea18
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/external-process.d.ts
@@ -0,0 +1,36 @@
+export interface ExternalProcessRequestType {
+    path?: string;
+    alias?: string;
+    arguments?: string;
+    listener?: LaunchExternalProcessListener;
+    lifetime?: string;
+    certificate?: CertificationInfo;
+}
+export interface CertificationInfo {
+    serial?: string;
+    subject?: string;
+    publickey?: string;
+    thumbprint?: string;
+    trusted?: boolean;
+}
+export interface ExitCode {
+    topic: string;
+    uuid: string;
+    exitCode: number;
+}
+export interface LaunchExternalProcessListener {
+    (code: ExitCode): void;
+}
+export interface TerminateExternalRequestType {
+    uuid: string;
+    timeout: number;
+    killTree: boolean;
+}
+export interface ExternalConnection {
+    token: string;
+    uuid: string;
+}
+export interface ExternalProcessInfo {
+    pid: number;
+    listener?: LaunchExternalProcessListener;
+}
diff --git a/types/openfin/v37/_v2/api/system/host-specs.d.ts b/types/openfin/v37/_v2/api/system/host-specs.d.ts
new file mode 100644
index 0000000000..dfd3e665fd
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/host-specs.d.ts
@@ -0,0 +1,24 @@
+export interface Time {
+    user: number;
+    nice: number;
+    sys: number;
+    idle: number;
+    irq: number;
+}
+export interface CpuInfo {
+    model: string;
+    speed: number;
+    times: Time;
+}
+export interface GpuInfo {
+    name: string;
+}
+export interface HostSpecs {
+    aeroGlassEnabled?: boolean;
+    arch: string;
+    cpus: CpuInfo[];
+    gpu: GpuInfo;
+    memory: number;
+    name: string;
+    screenSaver?: boolean;
+}
diff --git a/types/openfin/v37/_v2/api/system/log.d.ts b/types/openfin/v37/_v2/api/system/log.d.ts
new file mode 100644
index 0000000000..9b03b28c57
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/log.d.ts
@@ -0,0 +1,11 @@
+export interface GetLogRequestType {
+    name: string;
+    endFile?: string;
+    sizeLimit?: number;
+}
+export interface LogInfo {
+    name: string;
+    size: number;
+    date: string;
+}
+export declare type LogLevel = 'verbose' | 'info' | 'warning' | 'error' | 'fatal';
diff --git a/types/openfin/v37/_v2/api/system/monitor.d.ts b/types/openfin/v37/_v2/api/system/monitor.d.ts
new file mode 100644
index 0000000000..ea4aed799c
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/monitor.d.ts
@@ -0,0 +1,39 @@
+import { Point } from './point';
+export interface MonitorInfo {
+    deviceScaleFactor: number;
+    dpi: Point;
+    nonPrimaryMonitors: Array<MonitorDetails>;
+    primaryMonitor: MonitorDetails;
+    reason: string;
+    taskBar: TaskBar;
+    virtualScreen: DipRect;
+}
+export interface MonitorDetails {
+    available: DipScaleRects;
+    availableRect: Rect;
+    deviceId: string;
+    displayDeviceActive: boolean;
+    deviceScaleFactor: number;
+    monitorRect: Rect;
+    name: number;
+    dpi: Point;
+    monitor: DipScaleRects;
+}
+export interface Rect {
+    bottom: number;
+    left: number;
+    right: number;
+    top: number;
+}
+export interface DipRect extends Rect {
+    dipRect: Rect;
+    scaledRect: Rect;
+}
+export interface DipScaleRects {
+    dipRect: Rect;
+    scaledRect: Rect;
+}
+export interface TaskBar extends DipScaleRects {
+    edge: string;
+    rect: Rect;
+}
diff --git a/types/openfin/v37/_v2/api/system/point.d.ts b/types/openfin/v37/_v2/api/system/point.d.ts
new file mode 100644
index 0000000000..b9830ce514
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/point.d.ts
@@ -0,0 +1,8 @@
+export interface Point {
+    x: number;
+    y: number;
+}
+export interface PointTopLeft {
+    top: number;
+    left: number;
+}
diff --git a/types/openfin/v37/_v2/api/system/process.d.ts b/types/openfin/v37/_v2/api/system/process.d.ts
new file mode 100644
index 0000000000..98901db137
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/process.d.ts
@@ -0,0 +1,15 @@
+export interface ProcessInfo {
+    cpuUsage?: number;
+    name?: string;
+    nonPagedPoolUsage?: number;
+    pageFaultCount?: number;
+    pagedPoolUsage?: number;
+    pagefileUsage?: number;
+    peakNonPagedPoolUsage?: number;
+    peakPagedPoolUsage?: number;
+    peakPagefileUsage?: number;
+    peakWorkingSetSize?: number;
+    processId?: number;
+    uuid?: string;
+    workingSetSize?: number;
+}
diff --git a/types/openfin/v37/_v2/api/system/proxy.d.ts b/types/openfin/v37/_v2/api/system/proxy.d.ts
new file mode 100644
index 0000000000..2f8a945903
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/proxy.d.ts
@@ -0,0 +1,15 @@
+export interface ProxyInfo {
+    config: ProxyConfig;
+    system: ProxySystemInfo;
+}
+export interface ProxyConfig {
+    proxyAddress: string;
+    proxyPort: number;
+    type: string;
+}
+export interface ProxySystemInfo {
+    autoConfigUrl: string;
+    bypass: string;
+    enabled: boolean;
+    proxy: string;
+}
diff --git a/types/openfin/v37/_v2/api/system/registry-info.d.ts b/types/openfin/v37/_v2/api/system/registry-info.d.ts
new file mode 100644
index 0000000000..a48ed34959
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/registry-info.d.ts
@@ -0,0 +1,7 @@
+export interface RegistryInfo {
+    data: any;
+    rootKey: string;
+    subkey: string;
+    type: string;
+    value: string;
+}
diff --git a/types/openfin/v37/_v2/api/system/runtime-info.d.ts b/types/openfin/v37/_v2/api/system/runtime-info.d.ts
new file mode 100644
index 0000000000..1508f87ef3
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/runtime-info.d.ts
@@ -0,0 +1,7 @@
+export interface RuntimeInfo {
+    architecture: string;
+    manifestUrl: string;
+    port: number;
+    securityRealm?: string;
+    version: string;
+}
diff --git a/types/openfin/v37/_v2/api/system/rvm.d.ts b/types/openfin/v37/_v2/api/system/rvm.d.ts
new file mode 100644
index 0000000000..fb8737a081
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/rvm.d.ts
@@ -0,0 +1,8 @@
+export interface RVMInfo {
+    action: string;
+    appLogDirectory: string;
+    path: string;
+    'start-time': string;
+    version: string;
+    'working-dir': string;
+}
diff --git a/types/openfin/v37/_v2/api/system/system.d.ts b/types/openfin/v37/_v2/api/system/system.d.ts
new file mode 100644
index 0000000000..76f244cabf
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/system.d.ts
@@ -0,0 +1,588 @@
+import { EmitterBase } from '../base';
+import { ApplicationInfo } from './application';
+import { WindowInfo } from './window';
+import { Identity } from '../../identity';
+import { MonitorInfo } from './monitor';
+import { PointTopLeft } from './point';
+import { GetLogRequestType, LogInfo, LogLevel } from './log';
+import { ProxyInfo, ProxyConfig } from './proxy';
+import { ProcessInfo } from './process';
+import { AppAssetInfo, AppAssetRequest, RuntimeDownloadOptions, RuntimeDownloadProgress } from './download-asset';
+import { RVMInfo } from './rvm';
+import { RuntimeInfo } from './runtime-info';
+import { Entity, EntityInfo } from './entity';
+import { HostSpecs } from './host-specs';
+import { ExternalProcessRequestType, TerminateExternalRequestType, ExternalConnection, ExternalProcessInfo } from './external-process';
+import Transport from '../../transport/transport';
+import { CookieInfo, CookieOption } from './cookie';
+import { RegistryInfo } from './registry-info';
+import { DownloadPreloadOption, DownloadPreloadInfo } from './download-preload';
+import { ClearCacheOption } from './clearCacheOption';
+import { CrashReporterOption } from './crashReporterOption';
+import { SystemEvents } from '../events/system';
+/**
+ * AppAssetInfo interface
+ * @typedef { Object } AppAssetInfo
+ * @property { string } src  The URL to a zip file containing the package files (executables, dlls, etc…)
+ * @property { string } alias The name of the asset
+ * @property { string } version The version of the package
+ * @property { string } target Specify default executable to launch. This option can be overridden in launchExternalProcess
+ * @property { args } args The default command line arguments for the aforementioned target.
+ * @property { boolean } mandatory When set to true, the app will fail to load if the asset cannot be downloaded.
+ * When set to false, the app will continue to load if the asset cannot be downloaded. (Default: true)
+ */
+/**
+ * AppAssetRequest interface
+ * @typedef { Object } AppAssetRequest
+ * @property { string } alias The name of the asset
+ */
+/**
+ * ApplicationInfo interface
+ * @typedef { Object } ApplicationInfo
+ * @property { boolean } isRunning  true when the application is running
+ * @property { string } uuid uuid of the application
+ * @property { string } parentUuid uuid of the application that launches this application
+ */
+/**
+ * @typedef { Object } ClearCacheOption
+ * @summary Clear cache options.
+ * @desc These are the options required by the clearCache function.
+ *
+ * @property {boolean} appcache html5 application cache
+ * @property {boolean} cache browser data cache for html files and images
+ * @property {boolean} cookies browser cookies
+ * @property {boolean} localStorage browser data that can be used across sessions
+ */
+/**
+ * CookieInfo interface
+ * @typedef { Object } CookieInfo
+ * @property { string } name  The name of the cookie
+ * @property { string } domain The domain of the cookie
+ * @property { string } path The path of the cookie
+ */
+/**
+ * CookieOption interface
+ * @typedef { Object } CookieOption
+ * @property { string } name The name of the cookie
+ */
+/**
+ * CpuInfo interface
+ * @typedef { Object } CpuInfo
+ * @property { string } model The model of the cpu
+ * @property { number } speed The number in MHz
+ * @property { Time } times The numbers of milliseconds the CPU has spent in different modes.
+ */
+/**
+* CrashReporterOption interface
+* @typedef { Object } CrashReporterOption
+* @property { boolean } diagnosticMode In diagnostic mode the crash reporter will send diagnostic logs to
+*  the OpenFin reporting service on runtime shutdown
+* @property { boolean } isRunning check if it's running
+*/
+/**
+ * DownloadPreloadInfo interface
+ * @typedef { Object } DownloadPreloadInfo
+ * @desc downloadPreloadScripts function return value
+ * @property { string } url url to the preload script
+ * @property { string } error error during preload script acquisition
+ * @property { boolean } succeess download operation success
+ */
+/**
+ * DownloadPreloadOption interface
+ * @typedef { Object } DownloadPreloadOption
+ * @desc These are the options object required by the downloadPreloadScripts function
+ * @property { string } url url to the preload script
+ */
+/**
+ * Entity interface
+ * @typedef { Object } Entity
+ * @property { string } type The type of the entity
+ * @property { string } uuid The uuid of the entity
+ */
+/**
+ * EntityInfo interface
+ * @typedef { Object } EntityInfo
+ * @property { string } name The name of the entity
+ * @property { string } uuid The uuid of the entity
+ * @property { Identity } parent The parent of the entity
+ * @property { string } entityType The type of the entity
+ */
+/**
+ * ExternalConnection interface
+ * @typedef { Object } ExternalConnection
+ * @property { string } token The token to broker an external connection
+ * @property { string } uuid The uuid of the external connection
+ */
+/**
+ * ExternalProcessRequestType interface
+ * @typedef { Object } ExternalProcessRequestType
+ * @property { string } path The file path to where the running application resides
+ * @property { string } arguments The argument passed to the running application
+ * @property { Object } listener This is described in the {LaunchExternalProcessListner} type definition
+ */
+/**
+ * GetLogRequestType interface
+ * @typedef { Object } GetLogRequestType
+ * @property { string } name The name of the running application
+ * @property { number } endFile The file length of the log file
+ * @property { number } sizeLimit The set size limit of the log file
+ */
+/**
+ * GpuInfo interface
+ * @typedef { Object } GpuInfo
+ * @property { string } name The graphics card name
+ */
+/**
+ * HostSpecs interface
+ * @typedef { Object } HostSpecs
+ * @property { boolean } aeroGlassEnabled Value to check if Aero Glass theme is supported on Windows platforms
+ * @property { string } arch "x86" for 32-bit or "x86_64" for 64-bit
+ * @property { Array<CpuInfo> } cpus The same payload as Node's os.cpus()
+ * @property { GpuInfo } gpu The graphics card name
+ * @property { number } memory The same payload as Node's os.totalmem()
+ * @property { string } name The OS name and version/edition
+ * @property { boolean } screenSaver Value to check if screensaver is running. Supported on Windows only
+ */
+/**
+ * Identity interface
+ * @typedef { Object } Identity
+ * @property { string } name The name of the application
+ * @property { string } uuid The uuid of the application
+ */
+/**
+ * LogInfo interface
+ * @typedef { Object } LogInfo
+ * @property { string } name The filename of the log
+ * @property { number } size The size of the log in bytes
+ * @property { string } date The unix time at which the log was created "Thu Jan 08 2015 14:40:30 GMT-0500 (Eastern Standard Time)""
+ */
+/**
+ * @typedef { verbose | info | warning | error | fatal } LogLevel
+ * @summary Log verbosity levels.
+ * @desc Describes the minimum level (inclusive) above which logs will be written
+ *
+ * @property { string } verbose all logs written
+ * @property { string } info info and above
+ * @property { string } warning warning and above
+ * @property { string } error error and above
+ * @property { string } fatal fatal only, indicates a crash is imminent
+ */
+/**
+ * PointTopLeft interface
+ * @typedef { Object } PointTopLeft
+ * @property { number } top The mouse top position in virtual screen coordinates
+ * @property { number } left The mouse left position in virtual screen coordinates
+ */
+/**
+ * ProcessInfo interface
+ * @typedef { Object } ProcessInfo
+ * @property { numder } cpuUsage The percentage of total CPU usage
+ * @property { string } name The application name
+ * @property { number } nonPagedPoolUsage The current nonpaged pool usage in bytes
+ * @property { number } pageFaultCount The number of page faults
+ * @property { number } pagedPoolUsage The current paged pool usage in bytes
+ * @property { number } pagefileUsage The total amount of memory in bytes that the memory manager has committed
+ * @property { number } peakNonPagedPoolUsage The peak nonpaged pool usage in bytes
+ * @property { number } peakPagedPoolUsage The peak paged pool usage in bytes
+ * @property { number } peakPagefileUsage The peak value in bytes of pagefileUsage during the lifetime of this process
+ * @property { number } peakWorkingSetSize The peak working set size in bytes
+ * @property { number } processId The native process identifier
+ * @property { string } uuid The application UUID
+ * @property { nubmer } workingSetSize The current working set size (both shared and private data) in bytes
+ */
+/**
+ * ProxyConfig interface
+ * @typedef { Object } ProxyConfig
+ * @property { string } proxyAddress The configured proxy address
+ * @property { numder } proxyPort The configured proxy port
+ * @property { string } type The proxy Type
+ */
+/**
+ * ProxyInfo interface
+ * @typedef { Object } ProxyInfo
+ * @property { ProxyConfig } config The proxy config
+ * @property { ProxySystemInfo } system The proxy system info
+ */
+/**
+ * ProxySystemInfo interface
+ * @typedef { Object } ProxySystemInfo
+ * @property { string } autoConfigUrl The auto configuration url
+ * @property { string } bypass The proxy bypass info
+ * @property { boolean } enabled Value to check if a proxy is enabled
+ * @property { string } proxy The proxy info
+ */
+/**
+ * RegistryInfo interface
+ * @typedef { Object } RegistryInfo
+ * @property { any } data The registry data
+ * @property { string } rootKey The registry root key
+ * @property { string } subkey The registry key
+ * @property { string } type The registry type
+ * @property { string } value The registry value name
+ */
+/**
+ * RuntimeDownloadOptions interface
+ * @typedef { Object } RuntimeDownloadOptions
+ * @desc These are the options object required by the downloadRuntime function.
+ * @property { string } version The given version to download
+ */
+/**
+ * RVMInfo interface
+ * @typedef { Object } RVMInfo
+ * @property { string } action The name of action: "get-rvm-info"
+ * @property { string } appLogDirectory The app log directory
+ * @property { string } path The path of OpenfinRVM.exe
+ * @property { string } 'start-time' The start time of RVM
+ * @property { string } version The version of RVM
+ * @property { string } 'working-dir' The working directory
+ */
+/**
+ * TerminateExternalRequestType interface
+ * @typedef { Object } TerminateExternalRequestType
+ * @property { string } uuid The uuid of the running application
+ * @property { number } timeout Time out period before the running application terminates
+ * @property { boolean } killtree Value to terminate the running application
+ */
+/**
+ * Time interface
+ * @typedef { Object } Time
+ * @property { number } user The number of milliseconds the CPU has spent in user mode
+ * @property { number } nice The number of milliseconds the CPU has spent in nice mode
+ * @property { number } sys The number of milliseconds the CPU has spent in sys mode
+ * @property { number } idle The number of milliseconds the CPU has spent in idle mode
+ * @property { number } irq The number of milliseconds the CPU has spent in irq mode
+ */
+/**
+ * WindowDetail interface
+ * @typedef { Object } WindowDetail
+ * @property { number } bottom The bottom-most coordinate of the window
+ * @property { number } height The height of the window
+ * @property { boolean } isShowing Value to check if the window is showing
+ * @property { number } left The left-most coordinate of the window
+ * @property { string } name The name of the window
+ * @property { number } right The right-most coordinate of the window
+ * @property { string } state The window state
+ * @property { number } top The top-most coordinate of the window
+ * @property { number } width The width of the window
+ */
+/**
+ * WindowInfo interface
+ * @typedef { Object } WindowInfo
+ * @property { Array<WindowDetail> } childWindows The array of child windows details
+ * @property { WindowDetail } mainWindow The main window detail
+ * @property { string } uuid The uuid of the application
+ */
+/**
+ * An object representing the core of OpenFin Runtime. Allows the developer
+ * to perform system-level actions, such as accessing logs, viewing processes,
+ * clearing the cache and exiting the runtime.
+ * @namespace
+ */
+export default class System extends EmitterBase<SystemEvents> {
+    constructor(wire: Transport);
+    /**
+     * Returns the version of the runtime. The version contains the major, minor,
+     * build and revision numbers.
+     * @return {Promise.<string>}
+     * @tutorial System.getVersion
+     */
+    getVersion(): Promise<string>;
+    /**
+     * Clears cached data containing application resource
+     * files (images, HTML, JavaScript files), cookies, and items stored in the
+     * Local Storage.
+     * @param { ClearCacheOption } options - See tutorial for more details.
+     * @return {Promise.<void>}
+     * @tutorial System.clearCache
+     */
+    clearCache(options: ClearCacheOption): Promise<void>;
+    /**
+     * Clears all cached data when OpenFin Runtime exits.
+     * @return {Promise.<void>}
+     * @tutorial System.deleteCacheOnExit
+     */
+    deleteCacheOnExit(): Promise<void>;
+    /**
+     * Exits the Runtime.
+     * @return {Promise.<void>}
+     * @tutorial System.exit
+     */
+    exit(): Promise<void>;
+    /**
+     * Writes any unwritten cookies data to disk.
+     * @return {Promise.<void>}
+     * @tutorial System.flushCookieStore
+     */
+    flushCookieStore(): Promise<void>;
+    /**
+     * Retrieves an array of data (name, ids, bounds) for all application windows.
+     * @return {Promise.Array.<WindowInfo>}
+     * @tutorial System.getAllWindows
+     */
+    getAllWindows(): Promise<Array<WindowInfo>>;
+    /**
+     * Retrieves an array of data for all applications.
+     * @return {Promise.Array.<ApplicationInfo>}
+     * @tutorial System.getAllApplications
+     */
+    getAllApplications(): Promise<Array<ApplicationInfo>>;
+    /**
+     * Retrieves the command line argument string that started OpenFin Runtime.
+     * @return {Promise.<string>}
+     * @tutorial System.getCommandLineArguments
+     */
+    getCommandLineArguments(): Promise<string>;
+    /**
+     * Get the current state of the crash reporter.
+     * @return {Promise.<CrashReporterOption>}
+     * @tutorial System.getCrashReporterState
+     */
+    getCrashReporterState(): Promise<CrashReporterOption>;
+    getDeviceId(): Promise<string>;
+    /**
+     * Start the crash reporter for the browser process if not already running.
+     * You can optionally specify `diagnosticMode` to have the logs sent to
+     * OpenFin on runtime close
+     *
+     * @param { CrashReporterOption } options - configure crash reporter
+     * @return {Promise.<CrashReporterOption>}
+     * @tutorial System.startCrashReporter
+     */
+    startCrashReporter(options: CrashReporterOption): Promise<CrashReporterOption>;
+    /**
+     * Returns a hex encoded hash of the mac address and the currently logged in user name
+     * @return {Promise.<string>}
+     * @tutorial System.getDeviceUserId
+     */
+    getDeviceUserId(): Promise<string>;
+    /**
+     * Retrieves a frame info object for the uuid and name passed in
+     * @param { string } uuid - The UUID of the target.
+     * @param { string } name - The name of the target.
+     * @return {Promise.<EntityInfo>}
+     * @tutorial System.getEntityInfo
+     */
+    getEntityInfo(uuid: string, name: string): Promise<EntityInfo>;
+    /**
+     * Gets the value of a given environment variable on the computer on which the runtime is installed
+     * @return {Promise.<string>}
+     * @tutorial System.getEnvironmentVariable
+     */
+    getEnvironmentVariable(envName: string): Promise<string>;
+    /**
+     * Get current focused window.
+     * @return {Promise.<WindowInfo>}
+     * @tutorial System.getFocusedWindow
+     */
+    getFocusedWindow(): Promise<WindowInfo>;
+    /**
+     * Retrieves the contents of the log with the specified filename.
+     * @param { GetLogRequestType } options A object that id defined by the GetLogRequestType interface
+     * @return {Promise.<string>}
+     * @tutorial System.getLog
+     */
+    getLog(options: GetLogRequestType): Promise<string>;
+    /**
+     * Returns a unique identifier (UUID) provided by the machine.
+     * @return {Promise.<string>}
+     * @tutorial System.getMachineId
+     */
+    getMachineId(): Promise<string>;
+    /**
+     * Returns the minimum (inclusive) logging level that is currently being written to the log.
+     * @return {Promise.<LogLevel>}
+     * @tutorial System.getMinLogLevel
+     */
+    getMinLogLevel(): Promise<LogLevel>;
+    /**
+     * Retrieves an array containing information for each log file.
+     * @return {Promise.Array<LogInfo>}
+     * @tutorial System.getLogList
+     */
+    getLogList(): Promise<Array<LogInfo>>;
+    /**
+     * Retrieves an object that contains data about the monitor setup of the
+     * computer that the runtime is running on.
+     * @return {Promise.<MonitorInfo>}
+     * @tutorial System.getMonitorInfo
+     */
+    getMonitorInfo(): Promise<MonitorInfo>;
+    /**
+     * Returns the mouse in virtual screen coordinates (left, top).
+     * @return {Promise.<PointTopLeft>}
+     * @tutorial System.getMousePosition
+     */
+    getMousePosition(): Promise<PointTopLeft>;
+    /**
+     * Retrieves an array of all of the runtime processes that are currently
+     * running. Each element in the array is an object containing the uuid
+     * and the name of the application to which the process belongs.
+     * @return {Promise.Array.<ProcessInfo>}
+     * @tutorial System.getProcessList
+     */
+    getProcessList(): Promise<Array<ProcessInfo>>;
+    /**
+     * Retrieves the Proxy settings.
+     * @return {Promise.<ProxyInfo>}
+     * @tutorial System.getProxySettings
+     */
+    getProxySettings(): Promise<ProxyInfo>;
+    /**
+     * Returns information about the running Runtime in an object.
+     * @return {Promise.<RuntimeInfo>}
+     * @tutorial System.getRuntimeInfo
+     */
+    getRuntimeInfo(): Promise<RuntimeInfo>;
+    /**
+     * Returns information about the running RVM in an object.
+     * @return {Promise.<RVMInfo>}
+     * @tutorial System.getRvmInfo
+     */
+    getRvmInfo(): Promise<RVMInfo>;
+    /**
+     * Retrieves system information.
+     * @return {Promise.<HostSpecs>}
+     * @tutorial System.getHostSpecs
+     */
+    getHostSpecs(): Promise<HostSpecs>;
+    /**
+     * Runs an executable or batch file.
+     * @param { ExternalProcessRequestType } options A object that is defined in the ExternalProcessRequestType interface
+     * @return {Promise.<Identity>}
+     * @tutorial System.launchExternalProcess
+     */
+    launchExternalProcess(options: ExternalProcessRequestType): Promise<Identity>;
+    /**
+     * Monitors a running process.
+     * @param { ExternalProcessInfo } options See tutorial for more details
+     * @return {Promise.<Identity>}
+     * @tutorial System.monitorExternalProcess
+     */
+    monitorExternalProcess(options: ExternalProcessInfo): Promise<Identity>;
+    /**
+     * Writes the passed message into both the log file and the console.
+     * @param { string } level The log level for the entry. Can be either "info", "warning" or "error"
+     * @param { string } message The log message text
+     * @return {Promise.<void>}
+     * @tutorial System.log
+     */
+    log(level: string, message: string): Promise<void>;
+    /**
+     * Opens the passed URL in the default web browser.
+     * @param { string } url The URL to open
+     * @return {Promise.<void>}
+     * @tutorial System.openUrlWithBrowser
+     */
+    openUrlWithBrowser(url: string): Promise<void>;
+    /**
+     * Removes the process entry for the passed UUID obtained from a prior call
+     * of fin.System.launchExternalProcess().
+     * @param { string } uuid The UUID for a process obtained from a prior call to fin.desktop.System.launchExternalProcess()
+     * @return {Promise.<void>}
+     * @tutorial System.releaseExternalProcess
+     */
+    releaseExternalProcess(uuid: string): Promise<void>;
+    /**
+     * Shows the Chromium Developer Tools for the specified window
+     * @param { Identity } identity This is a object that is defined by the Identity interface
+     * @return {Promise.<void>}
+     * @tutorial System.showDeveloperTools
+     */
+    showDeveloperTools(identity: Identity): Promise<void>;
+    /**
+     * Attempt to close an external process. The process will be terminated if it
+     * has not closed after the elapsed timeout in milliseconds.
+     * @param { TerminateExternalRequestType } options A object defined in the TerminateExternalRequestType interface
+     * @return {Promise.<void>}
+     * @tutorial System.terminateExternalProcess
+     */
+    terminateExternalProcess(options: TerminateExternalRequestType): Promise<void>;
+    /**
+     * Update the OpenFin Runtime Proxy settings.
+     * @param { ProxyConfig } options A config object defined in the ProxyConfig interface
+     * @return {Promise.<void>}
+     * @tutorial System.updateProxySettings
+     */
+    updateProxySettings(options: ProxyConfig): Promise<void>;
+    /**
+     * Downloads the given application asset
+     * @param { AppAssetInfo } appAsset App asset object
+     * @return {Promise.<void>}
+     * @tutorial System.downloadAsset
+     */
+    downloadAsset(appAsset: AppAssetInfo, progressListener: (progress: RuntimeDownloadProgress) => void): Promise<void>;
+    /**
+    * Downloads a version of the runtime.
+    * @param { RuntimeDownloadOptions } options - Download options.
+    * @param {Function} [progressListener] - called as the runtime is downloaded with progress information.
+    * @return {Promise.<void>}
+    * @tutorial System.downloadRuntime
+    */
+    downloadRuntime(options: RuntimeDownloadOptions, progressListener: (progress: RuntimeDownloadProgress) => void): Promise<void>;
+    /**
+    * Download preload scripts from given URLs
+    * @param {DownloadPreloadOption[]} scripts - URLs of preload scripts. See tutorial for more details.
+    * @return {Promise.Array<DownloadPreloadInfo>}
+    * @tutorial System.downloadPreloadScripts
+    */
+    downloadPreloadScripts(scripts: Array<DownloadPreloadOption>): Promise<Array<DownloadPreloadInfo>>;
+    /**
+     * Retrieves an array of data (name, ids, bounds) for all application windows.
+     * @return {Promise.Array.<Identity>}
+     * @tutorial System.getAllExternalApplications
+     */
+    getAllExternalApplications(): Promise<Array<Identity>>;
+    /**
+     * Retrieves app asset information.
+     * @param { AppAssetRequest } options
+     * @return {Promise.<AppAssetInfo>}
+     * @tutorial System.getAppAssetInfo
+     */
+    getAppAssetInfo(options: AppAssetRequest): Promise<AppAssetInfo>;
+    /**
+     * Get additional info of cookies.
+     * @param { CookieOption } options - See tutorial for more details.
+     * @return {Promise.Array.<CookieInfo>}
+     * @tutorial System.getCookies
+     */
+    getCookies(options: CookieOption): Promise<Array<CookieInfo>>;
+    /**
+     * Set the minimum log level above which logs will be written to the OpenFin log
+     * @param { LogLevel } The minimum level (inclusive) above which all calls to log will be written
+     * @return {Promise.<void>}
+     * @tutorial System.setMinLogLevel
+     */
+    setMinLogLevel(level: LogLevel): Promise<void>;
+    /**
+     * Retrieves the UUID of the computer on which the runtime is installed
+     * @param { string } uuid The uuid of the running application
+     * @return {Promise.<Entity>}
+     * @tutorial System.resolveUuid
+     */
+    resolveUuid(uuid: string): Promise<Entity>;
+    /**
+     * Retrieves an array of data for all external applications
+     * @param { Identity } requestingIdentity This object is described in the Identity typedef
+     * @param { any } data Any data type to pass to the method
+     * @return {Promise.<any>}
+     * @ignore
+     */
+    executeOnRemote(requestingIdentity: Identity, data: any): Promise<any>;
+    /**
+     * Reads the specifed value from the registry.
+     * @param { string } rootKey - The registry root key.
+     * @param { string } subkey - The registry key.
+     * @param { string } value - The registry value name.
+     * @return {Promise.<RegistryInfo>}
+     * @tutorial System.readRegistryValue
+     */
+    readRegistryValue(rootKey: string, subkey: string, value: string): Promise<RegistryInfo>;
+    /**
+     * This function call will register a unique id and produce a token.
+     * The token can be used to broker an external connection.
+     * @param { string } uuid - A UUID for the remote connection.
+     * @return {Promise.<ExternalConnection>}
+     * @tutorial System.registerExternalConnection
+     */
+    registerExternalConnection(uuid: string): Promise<ExternalConnection>;
+}
diff --git a/types/openfin/v37/_v2/api/system/window.d.ts b/types/openfin/v37/_v2/api/system/window.d.ts
new file mode 100644
index 0000000000..7b2a3b858b
--- /dev/null
+++ b/types/openfin/v37/_v2/api/system/window.d.ts
@@ -0,0 +1,16 @@
+export interface WindowInfo {
+    childWindows: Array<WindowDetail>;
+    mainWindow: WindowDetail;
+    uuid: string;
+}
+export interface WindowDetail {
+    bottom: number;
+    height: number;
+    isShowing: boolean;
+    left: number;
+    name: string;
+    right: number;
+    state: string;
+    top: number;
+    width: number;
+}
diff --git a/types/openfin/v37/_v2/api/window/anchor-type.d.ts b/types/openfin/v37/_v2/api/window/anchor-type.d.ts
new file mode 100644
index 0000000000..4e09af40ab
--- /dev/null
+++ b/types/openfin/v37/_v2/api/window/anchor-type.d.ts
@@ -0,0 +1 @@
+export declare type AnchorType = 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
diff --git a/types/openfin/v37/_v2/api/window/bounds-changed.d.ts b/types/openfin/v37/_v2/api/window/bounds-changed.d.ts
new file mode 100644
index 0000000000..f7801da3fc
--- /dev/null
+++ b/types/openfin/v37/_v2/api/window/bounds-changed.d.ts
@@ -0,0 +1,14 @@
+import { Reply } from '../base';
+export default class BoundsChangedReply extends Reply<'window', 'bounds-changed'> {
+    changeType: BoundsChangeType;
+    deferred: boolean;
+    height: number;
+    width: number;
+    top: number;
+    left: number;
+}
+export declare const enum BoundsChangeType {
+    POSITION = 0,
+    SIZE = 1,
+    POSITION_AND_SIZE = 2
+}
diff --git a/types/openfin/v37/_v2/api/window/bounds.d.ts b/types/openfin/v37/_v2/api/window/bounds.d.ts
new file mode 100644
index 0000000000..40822c4aa3
--- /dev/null
+++ b/types/openfin/v37/_v2/api/window/bounds.d.ts
@@ -0,0 +1,9 @@
+interface Bounds {
+    height: number;
+    width: number;
+    top: number;
+    left: number;
+    right?: number;
+    bottom?: number;
+}
+export default Bounds;
diff --git a/types/openfin/v37/_v2/api/window/transition.d.ts b/types/openfin/v37/_v2/api/window/transition.d.ts
new file mode 100644
index 0000000000..c16440c80d
--- /dev/null
+++ b/types/openfin/v37/_v2/api/window/transition.d.ts
@@ -0,0 +1,24 @@
+export interface TransitionBase {
+    duration: number;
+    relative?: boolean;
+}
+export interface Opacity extends TransitionBase {
+    opacity: number;
+}
+export interface Position extends TransitionBase {
+    left: number;
+    top: number;
+}
+export interface Size extends TransitionBase {
+    width: number;
+    height: number;
+}
+export interface TransitionOptions {
+    interrupt: boolean;
+    tween?: string;
+}
+export interface Transition {
+    opacity?: Opacity;
+    position?: Position;
+    size?: Size;
+}
diff --git a/types/openfin/v37/_v2/api/window/window.d.ts b/types/openfin/v37/_v2/api/window/window.d.ts
new file mode 100644
index 0000000000..fcefc4fa5d
--- /dev/null
+++ b/types/openfin/v37/_v2/api/window/window.d.ts
@@ -0,0 +1,778 @@
+import { Base, EmitterBase } from '../base';
+import { Identity } from '../../identity';
+import Bounds from './bounds';
+import { Transition, TransitionOptions } from './transition';
+import { Application } from '../application/application';
+import Transport from '../../transport/transport';
+import { WindowEvents } from '../events/window';
+import { AnchorType } from './anchor-type';
+import { WindowOption } from './windowOption';
+/**
+ * @lends Window
+ */
+export default class _WindowModule extends Base {
+    /**
+     * Asynchronously returns a Window object that represents an existing window.
+     * @param { Identity } identity
+     * @return {Promise.<_Window>}
+     * @tutorial Window.wrap
+     * @static
+     */
+    wrap(identity: Identity): Promise<_Window>;
+    /**
+     * Synchronously returns a Window object that represents an existing window.
+     * @param { Identity } identity
+     * @return {_Window}
+     * @tutorial Window.wrapSync
+     * @static
+     */
+    wrapSync(identity: Identity): _Window;
+    /**
+     * Creates a new Window.
+     * @param { WindowOption } options - Window creation options
+     * @return {Promise.<_Window>}
+     * @tutorial Window.create
+     * @static
+     */
+    create(options: WindowOption): Promise<_Window>;
+    /**
+     * Asynchronously returns a Window object that represents the current window
+     * @return {Promise.<_Window>}
+     * @tutorial Window.getCurrent
+     * @static
+     */
+    getCurrent(): Promise<_Window>;
+    /**
+     * Synchronously returns a Window object that represents the current window
+     * @return {_Window}
+     * @tutorial Window.getCurrentSync
+     * @static
+     */
+    getCurrentSync(): _Window;
+}
+export interface CloseEventShape {
+    name: string;
+    uuid: string;
+    type: string;
+    topic: string;
+}
+export interface WindowInfo {
+    canNavigateBack: boolean;
+    canNavigateForward: boolean;
+    preloadScripts: Array<any>;
+    title: string;
+    url: string;
+}
+export interface FrameInfo {
+    name: string;
+    uuid: string;
+    entityType: string;
+    parent?: Identity;
+}
+export interface Area {
+    height: number;
+    width: number;
+    x: number;
+    y: number;
+}
+/**
+ * @typedef { Object } Area
+ * @property { number } height Area's height
+ * @property { number } width Area's width
+ * @property { number } x X coordinate of area's starting point
+ * @property { number } y Y coordinate of area's starting point
+ */
+/**
+ * @typedef {object} Transition
+ * @property {Opacity} opacity - The Opacity transition
+ * @property {Position} position - The Position transition
+ * @property {Size} size - The Size transition
+*/
+/**
+ * @typedef {object} TransitionOptions
+ * @property {boolean} interrupt - This option interrupts the current animation. When false it pushes
+this animation onto the end of the animation queue.
+ * @property {boolean} relative - Treat 'opacity' as absolute or as a delta. Defaults to false.
+ */
+/**
+ * @typedef {object} Size
+ * @property {number} duration - The total time in milliseconds this transition should take.
+ * @property {boolean} relative - Treat 'opacity' as absolute or as a delta. Defaults to false.
+ * @property {number} width - Optional if height is present. Defaults to the window's current width.
+ * @property {number} height - Optional if width is present. Defaults to the window's current height.
+ */
+/**
+ * @typedef {object} Position
+ * @property {number} duration - The total time in milliseconds this transition should take.
+ * @property {boolean} relative - Treat 'opacity' as absolute or as a delta. Defaults to false.
+ * @property {number} left - Defaults to the window's current left position in virtual screen coordinates.
+ * @property {number} top - Defaults to the window's current top position in virtual screen coordinates.
+ */
+/**
+ * @typedef {object} Opacity
+ * @property {number} duration - The total time in milliseconds this transition should take.
+ * @property {boolean} relative - Treat 'opacity' as absolute or as a delta. Defaults to false.
+ * @property {number} opacity - This value is clamped from 0.0 to 1.0.
+*/
+/**
+ * Bounds is a interface that has the properties of height,
+ * width, left, top which are all numbers
+ * @typedef { Object } Bounds
+ * @property { number } height Get the application height bound
+ * @property { number } width Get the application width bound
+ * @property { number } top Get the application top bound
+ * @property { number } left Get the application left bound
+ * @property { number } right Get the application right bound
+ * @property { number } bottom Get the application bottom bound
+ */
+/**
+ * @classdesc A basic window that wraps a native HTML window. Provides more fine-grained
+ * control over the window state such as the ability to minimize, maximize, restore, etc.
+ * By default a window does not show upon instantiation; instead the window's show() method
+ * must be invoked manually. The new window appears in the same process as the parent window.
+ * @class
+ * @alias Window
+*/
+export declare class _Window extends EmitterBase<WindowEvents> {
+    identity: Identity;
+    /**
+     * Raised when a window within this application requires credentials from the user.
+     *
+     * @event Window#auth-requested
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     * @property {object} authInfo
+     * @property {string} authInfo.host - Host server.
+     * @property {boolean} authInfo.isProxy - Indicates if the request involves a proxy.
+     * @property {number} authInfo.port - Port number.
+     * @property {string} authInfo.realm - Authentication request realm.
+     * @property {string} authInfo.scheme - Authentication scheme.
+     */
+    /**
+     * Raised when a window loses focus.
+     *
+     * @event Window#blurred
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     */
+    /**
+     * Raised after changes in a window's size and/or position.
+     *
+     * @event Window#bounds-changed
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     * @property {number} changeType - Describes what kind of change occurred.
+     0 means a change in position.
+     1 means a change in size.
+     2 means a change in position and size.
+     * @property {string} deferred - Indicated whether pending changes have been applied.
+     * @property {number} height - New height of the window.
+     * @property {number} left - New left most coordinate of the window.
+     * @property {number} top - New top most coordinate of the window.
+     * @property {number} width - New width of the window.
+     */
+    /**
+     * Raised when a window has been prevented from closing. A window will be prevented from closing by default,
+     either through the API or by a user when ‘close-requested’ has been subscribed to and the Window.close(force) flag is false.
+     *
+     * @event Window#close-requested
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     */
+    /**
+     * Raised when a window has closed.
+     *
+     * @event Window#closed
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     */
+    /**
+     * Raised when a window has crashed.
+     *
+     * @event Window#crashed
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     */
+    /**
+     * Raised when the frame is disabled after all prevent user changes in window's size and/or position have completed.
+     *
+     * @event Window#disabled-frame-bounds-changed
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     * @property {number} changeType - Describes what kind of change occurred.
+     0 means a change in position.
+     1 means a change in size.
+     2 means a change in position and size.
+     * @property {string} deferred - Indicated whether pending changes have been applied.
+     * @property {number} height - New height of the window.
+     * @property {number} left - New left most coordinate of the window.
+     * @property {number} top - New top most coordinate of the window.
+     * @property {number} width - New width of the window.
+     */
+    /**
+     * Raised when the frame is disabled during prevented user changes to a window's size and/or position.
+     *
+     * @event Window#disabled-frame-bounds-changing
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     * @property {number} changeType - Describes what kind of change occurred.
+     0 means a change in position.
+     1 means a change in size.
+     2 means a change in position and size.
+     * @property {string} deferred - Indicated whether pending changes have been applied.
+     * @property {number} height - New height of the window.
+     * @property {number} left - New left most coordinate of the window.
+     * @property {number} top - New top most coordinate of the window.
+     * @property {number} width - New width of the window.
+     */
+    /**
+     * Raised when the window has been embedded.
+     *
+     * @event Window#embedded
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     */
+    /**
+     * Raised when an external process has exited.
+     *
+     * @event Window#external-process-exited
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     * @property {string} processUuid - The process handle UUID.
+     * @property {number} exitCode - The process exit code
+     */
+    /**
+     * Raised when an external process has started.
+     *
+     * @event Window#external-process-started
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     * @property {string} processUuid - The process handle UUID.
+     */
+    /**
+     * Raised when a window's frame becomes disabled.
+     *
+     * @event Window#frame-disabled
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     */
+    /**
+     * Raised when a window's frame becomes enabled.
+     *
+     * @event Window#frame-enabled
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     */
+    /**
+     * Raised when a window joins/leaves a group and/or when the group a window is a member of changes.
+     *
+     * @event Window#group-changed
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     * @property {string} source - Which group array the window that the event listener was registered on is included in:
+     'source' The window is included in sourceGroup.
+     'target' The window is included in targetGroup.
+     'nothing' The window is not included in sourceGroup nor targetGroup.
+     * @property {string} reason - The reason this event was triggered.
+     'leave' A window has left the group due to a leave or merge with group.
+     'join' A window has joined the group.
+     'merge' Two groups have been merged together.
+     'disband' There are no other windows in the group.
+     * @property {string} name - Name of the window.
+     * @property {legacyWindowIdentity[]} sourceGroup - All the windows in the group the sourceWindow originated from.
+     * @property {string} sourceWindowAppUuid - UUID of the application the sourceWindow belongs to the
+     source window is the window in which (merge/join/leave)group(s) was called.
+     * @property {string} sourceWindowName - Name of the sourcewindow.
+     The source window is the window in which (merge/join/leave)group(s) was called.
+     * @property {legacyWindowIdentity[]} targetGroup - All the windows in the group the targetWindow orginated from.
+     * @property {string} targetWindowAppUuid - UUID of the application the targetWindow belongs to.
+     The target window is the window that was passed into (merge/join)group(s).
+     * @property {string} targetWindowName - Name of the targetWindow.
+     The target window is the window that was passed into (merge/join)group(s).
+     */
+    /**
+     * Raised when a window has been hidden.
+     *
+     * @event Window#hidden
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     * @property {string} reason - Action prompted the close The reasons are:
+     "hide"
+     "hide-on-close"
+    */
+    /**
+     * Raised when a window is initialized.
+     *
+     * @event Window#initialized
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     */
+    /**
+     * Raised when a window is maximized.
+     *
+     * @event Window#maximized
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     */
+    /**
+     * Raised when a window is minimized.
+     *
+     * @event Window#minimized
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     */
+    /**
+     * Raised when window navigation is rejected as per ContentNavigation whitelist/blacklist rules.
+     *
+     * @event Window#navigation-rejected
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     * @property {string} sourceName - source of navigation window name.
+     * @property {string} url - Blocked content url.
+     */
+    /**
+     * Raised when a window is out of memory.
+     *
+     * @event Window#out-of-memory
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     */
+    /**
+     * Raised after the execution of all of a window's preload scripts. Contains
+     information about all window's preload scripts' final states.
+     *
+     * @event Window#preload-scripts-state-changed
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     * @property {preloadScriptState[]} preloadState -  An array of all final preload scripts' states
+     */
+    /**
+     * Raised during the execution of a window's preload script. Contains information
+     about a single window's preload script's state, for which the event has been raised.
+     *
+     * @event Window#preload-scripts-state-changing
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     * @property {preloadScriptState[]} preloadState -  An array of all final preload scripts' states
+     */
+    /**
+     * Raised when an HTTP load was cancelled or failed.
+     *
+     * @event Window#resource-load-failed
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     * @property {number} errorCode - The Chromium error code.
+     * @property {string} errorDescription - The Chromium error description.
+     * @property {string} validatedURL - The url attempted.
+     * @property {boolean} isMainFrame - Was the attempt made from the main frame.
+     */
+    /**
+     * Raised when an HTTP resource request has received response details.
+     *
+     * @event Window#resource-response-received
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     * @property {boolean} status - Status of the request.
+     * @property {string} newUrl - The URL of the responded resource.
+     * @property {string} originalUrl - The requested URL.
+     * @property {number} httpResponseCode - The HTTP Response code.
+     * @property {string} requestMethod - The HTTP request method.
+     * @property {string} referrer - The HTTP referrer.
+     * @property {object} headers - The HTTP headers.
+     * @property {string} resourceType - Resource type:
+     "mainFrame", "subFrame",
+     "styleSheet", "script", "image",
+     "object", "xhr", or "other"
+    */
+    /**
+     * Raised when a window has reloaded.
+     *
+     * @event Window#reloaded
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     * @property {string} url - Url has has been reloaded.
+     */
+    /**
+     * Raised when a window is displayed after having been minimized or
+     when a window leaves the maximize state without minimizing.
+     *
+     * @event Window#restored
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     */
+    /**
+     * Raised when a window has been prevented from showing.
+     A window will be prevented from showing by default, either through the API or by a user when
+     ‘show-requested’ has been subscribed to on the window or 'window-show-requested'
+     on the parent application and the Window.show(force) flag is false.
+     *
+     * @event Window#show-requested
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     */
+    /**
+     * Raised when a window been shown.
+     *
+     * @event Window#shown
+     * @type {object}
+     * @property {string} name - Name of the window.
+     * @property {string} uuid - UUID of the application that the window belongs to.
+     */
+    /**
+     * @typedef {object} legacyWindowIdentity
+     * @summary Object summary
+     * @desc Object description
+     * @property {string} appUuid - The UUID of the application this window entry belongs to.
+     * @property {string} windowName - The name of this window entry.
+     */
+    /**
+     * @typedef {object} preloadScriptState
+     * @summary Object summary
+     * @desc Object description
+     * @property {string} url - The url of the preload script.
+     * @property {string} state - The preload script state:
+     "load-failed", "failed", "succeeded"
+     */
+    constructor(wire: Transport, identity: Identity);
+    createWindow(options: WindowOption): Promise<_Window>;
+    private windowListFromNameList;
+    /**
+     * Retrieves an array of frame info objects representing the main frame and any
+     * iframes that are currently on the page.
+     * @return {Promise.<Array<FrameInfo>>}
+     * @tutorial Window.getAllFrames
+     */
+    getAllFrames(): Promise<Array<FrameInfo>>;
+    /**
+     * Gets the current bounds (top, left, width, height) of the window.
+     * @return {Promise.<Bounds>}
+     * @tutorial Window.getBounds
+    */
+    getBounds(): Promise<Bounds>;
+    /**
+     * Gives focus to the window.
+     * @return {Promise.<void>}
+     * @emits _Window#focused
+     * @tutorial Window.focus
+     */
+    focus(): Promise<void>;
+    /**
+     * Removes focus from the window.
+     * @return {Promise.<void>}
+     * @tutorial Window.blur
+     */
+    blur(): Promise<void>;
+    /**
+     * Brings the window to the front of the window stack.
+     * @return {Promise.<void>}
+     * @tutorial Window.bringToFront
+     */
+    bringToFront(): Promise<void>;
+    /**
+     * Performs the specified window transitions.
+     * @param {Transition} transitions - Describes the animations to perform. See the tutorial.
+     * @param {TransitionOptions} options - Options for the animation. See the tutorial.
+     * @return {Promise.<void>}
+     * @tutorial Window.animate
+     */
+    animate(transitions: Transition, options: TransitionOptions): Promise<void>;
+    /**
+     * Hides the window.
+     * @return {Promise.<void>}
+     * @tutorial Window.hide
+     */
+    hide(): Promise<void>;
+    /**
+     * closes the window application
+     * @param { boolean } [force = false] Close will be prevented from closing when force is false and
+     *  ‘close-requested’ has been subscribed to for application’s main window.
+     * @return {Promise.<void>}
+     * @tutorial Window.close
+    */
+    close(force?: boolean): Promise<void>;
+    /**
+     * Returns then running applications uuid
+     * @return {Promise.<string>}
+     * @tutorial Window.getNativeId
+     */
+    getNativeId(): Promise<string>;
+    /**
+     * Prevents a user from changing a window's size/position when using the window's frame.
+     * @return {Promise.<void>}
+     * @tutorial Window.disableFrame
+     */
+    disableFrame(): Promise<void>;
+    /**
+     * Re-enables user changes to a window's size/position when using the window's frame.
+     * @return {Promise.<void>}
+     * @tutorial Window.enableFrame
+     */
+    enableFrame(): Promise<void>;
+    /**
+     * Executes Javascript on the window, restricted to windows you own or windows owned by
+     * applications you have created.
+     * @param { string } code JavaScript code to be executed on the window.
+     * @return {Promise.<void>}
+     * @tutorial Window.executeJavaScript
+     */
+    executeJavaScript(code: string): Promise<void>;
+    /**
+     * Flashes the window’s frame and taskbar icon until stopFlashing is called.
+     * @return {Promise.<void>}
+     * @tutorial Window.flash
+     */
+    flash(): Promise<void>;
+    /**
+     * Stops the taskbar icon from flashing.
+     * @return {Promise.<void>}
+     * @tutorial Window.stopFlashing
+     */
+    stopFlashing(): Promise<void>;
+    /**
+     * Retrieves an array containing wrapped fin.desktop.Windows that are grouped with this
+     * window. If a window is not in a group an empty array is returned. Please note that
+     * calling window is included in the result array.
+     * @return {Promise.<Array<_Window>>}
+     * @tutorial Window.getGroup
+     */
+    getGroup(): Promise<Array<_Window>>;
+    /**
+     * Gets an information object for the window.
+     * @return {Promise.<WindowInfo>}
+     * @tutorial Window.getInfo
+     */
+    getInfo(): Promise<WindowInfo>;
+    /**
+     * Gets the current settings of the window.
+     * @return {Promise.<any>}
+     * @tutorial Window.getOptions
+     */
+    getOptions(): Promise<any>;
+    /**
+     * Gets the parent application.
+     * @return {Promise.<Application>}
+     * @tutorial Window.getParentApplication
+     */
+    getParentApplication(): Promise<Application>;
+    /**
+     * Gets the parent window.
+     * @return {Promise.<_Window>}
+     * @tutorial Window.getParentWindow
+     */
+    getParentWindow(): Promise<_Window>;
+    /**
+     * Gets a base64 encoded PNG snapshot of the window or just part a of it.
+     * @param { Area } [area] The area of the window to be captured.
+     * Omitting it will capture the whole visible window.
+     * @return {Promise.<string>}
+     * @tutorial Window.getSnapshot
+     */
+    getSnapshot(area?: Area): Promise<string>;
+    /**
+     * Gets the current state ("minimized", "maximized", or "restored") of the window.
+     * @return {Promise.<string>}
+     * @tutorial Window.getState
+     */
+    getState(): Promise<string>;
+    /**
+     * Determines if the window is currently showing.
+     * @return {Promise.<boolean>}
+     * @tutorial Window.isShowing
+     */
+    isShowing(): Promise<boolean>;
+    /**
+     * Joins the same window group as the specified window.
+     * @param { class } target The window whose group is to be joined
+     * @return {Promise.<void>}
+     * @tutorial Window.joinGroup
+     */
+    joinGroup(target: _Window): Promise<void>;
+    /**
+     * Reloads the window current page
+     * @return {Promise.<void>}
+     * @tutorial Window.reload
+     */
+    reload(ignoreCache?: boolean): Promise<void>;
+    /**
+     * Leaves the current window group so that the window can be move independently of those in the group.
+     * @return {Promise.<void>}
+     * @tutorial Window.leaveGroup
+     */
+    leaveGroup(): Promise<void>;
+    /**
+     * Maximizes the window
+     * @return {Promise.<void>}
+     * @tutorial Window.maximize
+     */
+    maximize(): Promise<void>;
+    /**
+     * Merges the instance's window group with the same window group as the specified window
+     * @param { class } target The window whose group is to be merged with
+     * @return {Promise.<void>}
+     * @tutorial Window.mergeGroups
+     */
+    mergeGroups(target: _Window): Promise<void>;
+    /**
+     * Minimizes the window.
+     * @return {Promise.<void>}
+     * @tutorial Window.minimize
+     */
+    minimize(): Promise<void>;
+    /**
+     * Moves the window by a specified amount.
+     * @param { number } deltaLeft The change in the left position of the window
+     * @param { number } deltaTop The change in the top position of the window
+     * @return {Promise.<void>}
+     * @tutorial Window.moveBy
+     */
+    moveBy(deltaLeft: number, deltaTop: number): Promise<void>;
+    /**
+     * Moves the window to a specified location.
+     * @param { number } left The left position of the window
+     * @param { number } top The top position of the window
+     * @return {Promise.<void>}
+     * @tutorial Window.moveTo
+     */
+    moveTo(left: number, top: number): Promise<void>;
+    /**
+     * Resizes the window by a specified amount.
+     * @param { number } deltaWidth The change in the width of the window
+     * @param { number } deltaHeight The change in the height of the window
+     * @param { AnchorType } anchor Specifies a corner to remain fixed during the resize.
+     * Can take the values: "top-left", "top-right", "bottom-left", or "bottom-right".
+     * If undefined, the default is "top-left"
+     * @return {Promise.<void>}
+     * @tutorial Window.resizeBy
+     */
+    resizeBy(deltaWidth: number, deltaHeight: number, anchor: AnchorType): Promise<void>;
+    /**
+     * Resizes the window to the specified dimensions.
+     * @param { number } width The change in the width of the window
+     * @param { number } height The change in the height of the window
+     * @param { AnchorType } anchor Specifies a corner to remain fixed during the resize.
+     * Can take the values: "top-left", "top-right", "bottom-left", or "bottom-right".
+     * If undefined, the default is "top-left"
+     * @return {Promise.<void>}
+     * @tutorial Window.resizeTo
+     */
+    resizeTo(width: number, height: number, anchor: AnchorType): Promise<void>;
+    /**
+     * Restores the window to its normal state (i.e., unminimized, unmaximized).
+     * @return {Promise.<void>}
+     * @tutorial Window.restore
+     */
+    restore(): Promise<void>;
+    /**
+     * Will bring the window to the front of the entire stack and give it focus.
+     * @return {Promise.<void>}
+     * @tutorial Window.setAsForeground
+     */
+    setAsForeground(): Promise<void>;
+    /**
+     * Sets the window's size and position.
+     * @property { Bounds } bounds This is a * @type {string} name - name of the window.object that holds the propertys of
+     * @return {Promise.<void>}
+     * @tutorial Window.setBounds
+     */
+    setBounds(bounds: Bounds): Promise<void>;
+    /**
+     * Shows the window if it is hidden.
+     * @param { boolean } [force = false] Show will be prevented from showing when force is false and
+     *  ‘show-requested’ has been subscribed to for application’s main window.
+     * @return {Promise.<void>}
+     * @tutorial Window.show
+     */
+    show(force?: boolean): Promise<void>;
+    /**
+     * Shows the window if it is hidden at the specified location.
+     * If the toggle parameter is set to true, the window will
+     * alternate between showing and hiding.
+     * @param { number } left The left position of the window
+     * @param { number } top The right position of the window
+     * @param { boolean } force Show will be prevented from closing when force is false and
+     * ‘show-requested’ has been subscribed to for application’s main window
+     * @return {Promise.<void>}
+     * @tutorial Window.showAt
+     */
+    showAt(left: number, top: number, force?: boolean): Promise<void>;
+    /**
+     * Shows the Chromium Developer Tools
+     * @return {Promise.<void>}
+     * @tutorial Window.showDeveloperTools
+     */
+    showDeveloperTools(): Promise<void>;
+    /**
+     * Updates the window using the passed options
+     * @param {*} options Changes a window's options that were defined upon creation. See tutorial
+     * @return {Promise.<void>}
+     * @tutorial Window.updateOptions
+     */
+    updateOptions(options: any): Promise<void>;
+    /**
+     * Provides credentials to authentication requests
+     * @param { string } userName userName to provide to the authentication challange
+     * @param { string } password password to provide to the authentication challange
+     * @return {Promise.<void>}
+     * @tutorial Window.authenticate
+     */
+    authenticate(userName: string, password: string): Promise<void>;
+    /**
+     * Returns the zoom level of the window.
+     * @return {Promise.<number>}
+     * @tutorial Window.getZoomLevel
+     */
+    getZoomLevel(): Promise<number>;
+    /**
+     * Sets the zoom level of the window.
+     * @param { number } level The zoom level
+     * @return {Promise.<void>}
+     * @tutorial Window.setZoomLevel
+     */
+    setZoomLevel(level: number): Promise<void>;
+    /**
+     * Navigates the window to a specified URL.
+     * @param {string} url - The URL to navigate the window to.
+     * @return {Promise.<void>}
+     * @tutorial Window.navigate
+     */
+    navigate(url: string): Promise<void>;
+    /**
+     * Navigates the window back one page.
+     * @return {Promise.<void>}
+     * @tutorial Window.navigateBack
+     */
+    navigateBack(): Promise<void>;
+    /**
+     * Stops any current navigation the window is performing.
+     * @return {Promise.<void>}
+     * @tutorial Window.stopNavigation
+     */
+    stopNavigation(): Promise<void>;
+}
diff --git a/types/openfin/v37/_v2/api/window/windowOption.d.ts b/types/openfin/v37/_v2/api/window/windowOption.d.ts
new file mode 100644
index 0000000000..faab275187
--- /dev/null
+++ b/types/openfin/v37/_v2/api/window/windowOption.d.ts
@@ -0,0 +1,46 @@
+import { DownloadPreloadOption } from '../system/download-preload';
+export interface WindowOption {
+    accelerator?: object;
+    alwaysOnTop?: boolean;
+    api?: object;
+    aspectRatio?: number;
+    autoShow?: boolean;
+    backgroundColor?: string;
+    contentNavigation?: object;
+    contextMenu?: boolean;
+    cornerRounding?: object;
+    customData?: string;
+    customRequestHeaders?: Array<CustomRequestHeaders>;
+    defaultCentered?: boolean;
+    defaultHeight?: number;
+    defaultLeft?: number;
+    defaultTop?: number;
+    defaultWidth?: number;
+    frame?: boolean;
+    hideOnClose?: boolean;
+    icon?: string;
+    maxHeight?: number;
+    maximizable?: boolean;
+    maxWidth?: number;
+    minHeight?: number;
+    minimizable?: boolean;
+    minWidth?: number;
+    name?: string;
+    opacity?: number;
+    preloadScripts?: Array<DownloadPreloadOption>;
+    resizable?: boolean;
+    resizeRegion?: object;
+    saveWindowState?: boolean;
+    shadow?: boolean;
+    showTaskbarIcon?: boolean;
+    smallWindow?: boolean;
+    state?: string;
+    taskbarIconGroup?: string;
+    url?: string;
+    uuid?: string;
+    waitForPageLoad?: boolean;
+}
+export interface CustomRequestHeaders {
+    urlPatterns: Array<string>;
+    headers: Array<object>;
+}
diff --git a/types/openfin/v37/_v2/environment/environment.d.ts b/types/openfin/v37/_v2/environment/environment.d.ts
new file mode 100644
index 0000000000..0b0f1571f2
--- /dev/null
+++ b/types/openfin/v37/_v2/environment/environment.d.ts
@@ -0,0 +1,10 @@
+import { NewConnectConfig } from '../transport/wire';
+export interface Environment {
+    writeToken(path: string, token: string): Promise<string>;
+    retrievePort(config: NewConnectConfig): Promise<number>;
+    getNextMessageId(): any;
+    getRandomId(): string;
+    createChildWindow(options: any): Promise<any>;
+    isWindowExists(uuid: string, name: string): boolean;
+}
+export declare const notImplementedEnvErrorMsg = "Not implemented in this environment";
diff --git a/types/openfin/v37/_v2/environment/node-env.d.ts b/types/openfin/v37/_v2/environment/node-env.d.ts
new file mode 100644
index 0000000000..03e0faeede
--- /dev/null
+++ b/types/openfin/v37/_v2/environment/node-env.d.ts
@@ -0,0 +1,11 @@
+import { Environment } from './environment';
+import { NewConnectConfig } from '../transport/wire';
+export default class NodeEnvironment implements Environment {
+    private messageCounter;
+    writeToken: (path: string, token: string) => Promise<string>;
+    retrievePort: (config: NewConnectConfig) => Promise<number>;
+    getNextMessageId: () => any;
+    createChildWindow: (options: any) => Promise<any>;
+    getRandomId: () => string;
+    isWindowExists: (uuid: string, name: string) => boolean;
+}
diff --git a/types/openfin/v37/_v2/environment/openfin-env.d.ts b/types/openfin/v37/_v2/environment/openfin-env.d.ts
new file mode 100644
index 0000000000..456e2f8caf
--- /dev/null
+++ b/types/openfin/v37/_v2/environment/openfin-env.d.ts
@@ -0,0 +1,11 @@
+import { Environment } from './environment';
+import { NewConnectConfig } from '../transport/wire';
+export default class OpenFinEnvironment implements Environment {
+    writeToken: (path: string, token: string) => Promise<string>;
+    retrievePort: (config: NewConnectConfig) => Promise<number>;
+    getNextMessageId: () => any;
+    createChildWindow: (options: any) => Promise<any>;
+    getRandomId: () => string;
+    private resolveUrl;
+    isWindowExists: (uuid: string, name: string) => boolean;
+}
diff --git a/types/openfin/v37/_v2/environment/openfin-renderer-api.d.ts b/types/openfin/v37/_v2/environment/openfin-renderer-api.d.ts
new file mode 100644
index 0000000000..82822c3111
--- /dev/null
+++ b/types/openfin/v37/_v2/environment/openfin-renderer-api.d.ts
@@ -0,0 +1,6 @@
+export declare const ipc: any;
+export declare const routingId: any;
+export declare const CORE_MESSAGE_CHANNEL: any;
+export declare const outboundTopic = "of-window-message";
+export declare const inboundTopic: string;
+export declare const currentWindowIdentity: any;
diff --git a/types/openfin/v37/_v2/identity.d.ts b/types/openfin/v37/_v2/identity.d.ts
new file mode 100644
index 0000000000..f10f030248
--- /dev/null
+++ b/types/openfin/v37/_v2/identity.d.ts
@@ -0,0 +1,4 @@
+export interface Identity {
+    uuid: string;
+    name?: string;
+}
diff --git a/types/openfin/v37/_v2/launcher/launcher.d.ts b/types/openfin/v37/_v2/launcher/launcher.d.ts
new file mode 100644
index 0000000000..d0ffc16989
--- /dev/null
+++ b/types/openfin/v37/_v2/launcher/launcher.d.ts
@@ -0,0 +1,15 @@
+/// <reference types="node" />
+import { ChildProcess } from 'child_process';
+import { ConfigWithRuntime } from '../transport/wire';
+export default class Launcher {
+    private os;
+    OpenFin_Installer: string;
+    Installer_Work_Dir: string;
+    Security_Realm_Config_Key: string;
+    nixConfig?: any;
+    constructor();
+    launch(config: ConfigWithRuntime, manifestLocation: string, namedPipeName: string): Promise<ChildProcess>;
+    static IS_SUPPORTED(): boolean;
+    private macLaunch;
+    private winLaunch;
+}
diff --git a/types/openfin/v37/_v2/launcher/nix-launch.d.ts b/types/openfin/v37/_v2/launcher/nix-launch.d.ts
new file mode 100644
index 0000000000..02b0da4fbb
--- /dev/null
+++ b/types/openfin/v37/_v2/launcher/nix-launch.d.ts
@@ -0,0 +1,14 @@
+/// <reference types="node" />
+import { ChildProcess } from 'child_process';
+import { ConfigWithRuntime } from '../transport/wire';
+export declare function getUrl(version: string, urlPath: string): string;
+export declare function download(version: string, folder: string, osConfig: OsConfig): Promise<string>;
+export declare function getRuntimePath(version: string): Promise<string>;
+export declare function install(versionOrChannel: string, osConfig: OsConfig): Promise<string>;
+export interface OsConfig {
+    manifestLocation: string;
+    namedPipeName: string;
+    urlPath: string;
+    executablePath: string;
+}
+export default function launch(config: ConfigWithRuntime, osConfig: OsConfig): Promise<ChildProcess>;
diff --git a/types/openfin/v37/_v2/launcher/util.d.ts b/types/openfin/v37/_v2/launcher/util.d.ts
new file mode 100644
index 0000000000..808ad015ea
--- /dev/null
+++ b/types/openfin/v37/_v2/launcher/util.d.ts
@@ -0,0 +1,8 @@
+export declare function exists(path: string): Promise<Boolean>;
+export declare function get(url: string): Promise<any>;
+export declare function unzip(file: string, dest: string): Promise<any>;
+export declare function rmDir(dirPath: string, removeSelf?: boolean): Promise<void>;
+export declare function downloadFile(url: string, writeLocation: string): Promise<{}>;
+export declare function resolveRuntimeVersion(versionOrChannel: string): Promise<string>;
+export declare function first<T>(arr: T[], func: (x: T, i: number, r: T[]) => boolean): T | null;
+export declare function resolveDir(base: string, paths: string[]): Promise<string>;
diff --git a/types/openfin/v37/_v2/launcher/win-launch.d.ts b/types/openfin/v37/_v2/launcher/win-launch.d.ts
new file mode 100644
index 0000000000..b08fac3f8a
--- /dev/null
+++ b/types/openfin/v37/_v2/launcher/win-launch.d.ts
@@ -0,0 +1,4 @@
+/// <reference types="node" />
+import { ChildProcess } from 'child_process';
+import { ConfigWithRuntime } from '../transport/wire';
+export default function launch(config: ConfigWithRuntime, manifestLocation: string, namedPipeName: string, Installer_Work_Dir: string): Promise<ChildProcess>;
diff --git a/types/openfin/v37/_v2/main.d.ts b/types/openfin/v37/_v2/main.d.ts
new file mode 100644
index 0000000000..2f4a3d8730
--- /dev/null
+++ b/types/openfin/v37/_v2/main.d.ts
@@ -0,0 +1,11 @@
+import Fin from './api/fin';
+import { Application } from './api/application/application';
+import { _Window as Window } from './api/window/window';
+import { _Frame as Frame } from './api/frame/frame';
+import { _Notification as Notification } from './api/notification/notification';
+import System from './api/system/system';
+import { ConnectConfig } from './transport/wire';
+export declare function connect(config: ConnectConfig): Promise<Fin>;
+export declare function launch(config: ConnectConfig): Promise<number>;
+export { Identity } from './identity';
+export { Fin, Application, Window, System, Frame, Notification };
diff --git a/types/openfin/v37/_v2/of-main.d.ts b/types/openfin/v37/_v2/of-main.d.ts
new file mode 100644
index 0000000000..cb0ff5c3b5
--- /dev/null
+++ b/types/openfin/v37/_v2/of-main.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/types/openfin/v37/_v2/transport/elipc.d.ts b/types/openfin/v37/_v2/transport/elipc.d.ts
new file mode 100644
index 0000000000..94c398cba5
--- /dev/null
+++ b/types/openfin/v37/_v2/transport/elipc.d.ts
@@ -0,0 +1,13 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+import { Wire, READY_STATE } from './wire';
+export default class ElIPCTransport extends EventEmitter implements Wire {
+    protected wire: any;
+    onmessage: (data: any) => void;
+    constructor(onmessage: (data: any) => void);
+    connectSync: () => any;
+    connect: (address: string) => Promise<any>;
+    send(data: any, flags?: any): Promise<any>;
+    shutdown(): Promise<void>;
+    static READY_STATE: typeof READY_STATE;
+}
diff --git a/types/openfin/v37/_v2/transport/port-discovery.d.ts b/types/openfin/v37/_v2/transport/port-discovery.d.ts
new file mode 100644
index 0000000000..d8ea25934d
--- /dev/null
+++ b/types/openfin/v37/_v2/transport/port-discovery.d.ts
@@ -0,0 +1,17 @@
+import { PortDiscoveryConfig } from './wire';
+import { Environment } from '../environment/environment';
+export declare class PortDiscovery {
+    private savedConfig;
+    private namedPipeName;
+    private manifestLocation;
+    private namedPipeServer;
+    private pipeConnection;
+    private timeoutTimer;
+    private environment;
+    constructor(config: PortDiscoveryConfig, environment: Environment);
+    retrievePort(): Promise<number>;
+    private createDiscoveryNamedPipe;
+    private listenDiscoveryMessage;
+    private createManifest;
+    private cleanup;
+}
diff --git a/types/openfin/v37/_v2/transport/transport-errors.d.ts b/types/openfin/v37/_v2/transport/transport-errors.d.ts
new file mode 100644
index 0000000000..90f9d10f55
--- /dev/null
+++ b/types/openfin/v37/_v2/transport/transport-errors.d.ts
@@ -0,0 +1,17 @@
+export declare class DisconnectedError extends Error {
+    constructor(readyState: number);
+    readyState: number;
+}
+export declare class UnexpectedActionError extends Error {
+}
+export declare class DuplicateCorrelationError extends Error {
+}
+export declare class NoAckError extends Error {
+}
+export declare class NotImplementedError extends Error {
+}
+export declare class NotSupportedError extends Error {
+}
+export declare class RuntimeError extends Error {
+    constructor(data: any);
+}
diff --git a/types/openfin/v37/_v2/transport/transport.d.ts b/types/openfin/v37/_v2/transport/transport.d.ts
new file mode 100644
index 0000000000..519562de95
--- /dev/null
+++ b/types/openfin/v37/_v2/transport/transport.d.ts
@@ -0,0 +1,65 @@
+/// <reference types="node" />
+import { Wire, WireConstructor, READY_STATE, ExistingConnectConfig, ConnectConfig, InternalConnectConfig } from './wire';
+import { Identity } from '../identity';
+import { EventEmitter } from 'events';
+import { Environment } from '../environment/environment';
+import { RuntimeEvent } from '../api/events/base';
+import { EventAggregator } from '../api/events/eventAggregator';
+export declare type MessageHandler = (data: any) => boolean;
+declare class Transport extends EventEmitter {
+    protected wireListeners: Map<number, {
+        resolve: Function;
+        reject: Function;
+    }>;
+    protected uncorrelatedListener: Function;
+    me: Identity;
+    protected wire: Wire;
+    environment: Environment;
+    topicRefMap: Map<string, number>;
+    sendRaw: Wire['send'];
+    eventAggregator: EventAggregator;
+    protected messageHandlers: MessageHandler[];
+    constructor(wireType: WireConstructor, environment: Environment);
+    connectSync: (config: ConnectConfig) => any;
+    connect(config: InternalConnectConfig): Promise<string>;
+    connectByPort(config: ExistingConnectConfig): Promise<string>;
+    READY_STATE: typeof READY_STATE;
+    ferryAction(data: any): Promise<Message<any>>;
+    registerMessageHandler(handler: MessageHandler): void;
+    protected addWireListener(id: number, resolve: Function, reject: Function, uncorrelated: boolean): void;
+    protected onmessage(data: Message<Payload>): void;
+    protected handleMessage(data: Message<Payload>): boolean;
+}
+export default Transport;
+interface Transport {
+    sendAction(action: 'request-external-authorization', payload: {}, uncorrelated: true): Promise<Message<AuthorizationPayload>>;
+    sendAction(action: string, payload: {}, uncorrelated: boolean): Promise<Message<Payload>>;
+    topicRefMap: Map<string, number>;
+}
+export declare class Message<T> {
+    action: string;
+    payload: T;
+    correlationId?: number;
+}
+export declare class EventMessage implements Message<RuntimeEvent> {
+    action: 'process-desktop-event';
+    payload: RuntimeEvent;
+}
+export declare class NotificationEventMessage implements Message<NotificationEvent> {
+    action: 'process-notification-event';
+    payload: NotificationEvent;
+}
+export interface NotificationEvent {
+    payload: {
+        notificationId: string;
+    };
+    type: string | symbol;
+}
+export declare class Payload {
+    success: boolean;
+    data: any;
+}
+export declare class AuthorizationPayload {
+    token: string;
+    file: string;
+}
diff --git a/types/openfin/v37/_v2/transport/websocket.d.ts b/types/openfin/v37/_v2/transport/websocket.d.ts
new file mode 100644
index 0000000000..5617afa8e3
--- /dev/null
+++ b/types/openfin/v37/_v2/transport/websocket.d.ts
@@ -0,0 +1,14 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+import * as WebSocket from 'ws';
+import { Wire, READY_STATE } from './wire';
+export default class WebSocketTransport extends EventEmitter implements Wire {
+    protected wire: WebSocket;
+    onmessage: (data: any) => void;
+    constructor(onmessage: (data: any) => void);
+    connect: (address: string) => Promise<any>;
+    connectSync: () => any;
+    send(data: any, flags?: any): Promise<any>;
+    shutdown(): Promise<void>;
+    static READY_STATE: typeof READY_STATE;
+}
diff --git a/types/openfin/v37/_v2/transport/wire.d.ts b/types/openfin/v37/_v2/transport/wire.d.ts
new file mode 100644
index 0000000000..227c6d4d72
--- /dev/null
+++ b/types/openfin/v37/_v2/transport/wire.d.ts
@@ -0,0 +1,71 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+export interface Wire extends EventEmitter {
+    connect(address: string): Promise<any>;
+    connectSync(): any;
+    send(data: any): Promise<any>;
+    shutdown(): Promise<void>;
+}
+export interface WireConstructor {
+    new (onmessage: (data: any) => void): Wire;
+}
+export interface RuntimeConfig {
+    version: string;
+    fallbackVersion?: string;
+    securityRealm?: string;
+    verboseLogging?: boolean;
+    arguments?: string;
+    rvmDir?: string;
+}
+export interface BaseConfig {
+    uuid?: string;
+    address?: string;
+    name?: string;
+    nonPersistent?: boolean;
+    runtimeClient?: boolean;
+    licenseKey?: string;
+    client?: any;
+    manifestUrl?: string;
+    startupApp?: any;
+    lrsUrl?: string;
+    assetsUrl?: string;
+    devToolsPort?: number;
+    installerUI?: boolean;
+    runtime?: RuntimeConfig;
+    appAssets?: [{
+        src: string;
+        alias: string;
+        target: string;
+        version: string;
+        args: string;
+    }];
+    customItems?: [any];
+    timeout?: number;
+}
+export interface ConfigWithUuid extends BaseConfig {
+    uuid: string;
+}
+export interface ExistingConnectConfig extends ConfigWithUuid {
+    address: string;
+}
+export interface ConfigWithRuntime extends BaseConfig {
+    runtime: RuntimeConfig;
+}
+export interface ExternalConfig extends BaseConfig {
+    manifestUrl: string;
+}
+export declare type NewConnectConfig = ConfigWithUuid & ConfigWithRuntime;
+export declare type PortDiscoveryConfig = (ExternalConfig & ConfigWithRuntime) | NewConnectConfig;
+export declare type ConnectConfig = ExistingConnectConfig | NewConnectConfig | ExternalConfig;
+export declare type InternalConnectConfig = ExistingConnectConfig | NewConnectConfig;
+export declare function isExternalConfig(config: ConnectConfig): config is ExternalConfig;
+export declare function isExistingConnectConfig(config: any): config is ExistingConnectConfig;
+export declare function isNewConnectConfig(config: any): config is NewConnectConfig;
+export declare function isPortDiscoveryConfig(config: any): config is PortDiscoveryConfig;
+export declare function isInternalConnectConfig(config: any): config is InternalConnectConfig;
+export declare enum READY_STATE {
+    CONNECTING = 0,
+    OPEN = 1,
+    CLOSING = 2,
+    CLOSED = 3
+}
diff --git a/types/openfin/v37/_v2/util/normalize-config.d.ts b/types/openfin/v37/_v2/util/normalize-config.d.ts
new file mode 100644
index 0000000000..ed322d30ec
--- /dev/null
+++ b/types/openfin/v37/_v2/util/normalize-config.d.ts
@@ -0,0 +1,3 @@
+import { ConnectConfig, InternalConnectConfig, ExternalConfig } from '../transport/wire';
+export declare function normalizeConfig(config: ConnectConfig): Promise<InternalConnectConfig | ExternalConfig>;
+export declare function validateConfig(config: ConnectConfig): Promise<InternalConnectConfig>;
diff --git a/types/openfin/v37/_v2/util/promises.d.ts b/types/openfin/v37/_v2/util/promises.d.ts
new file mode 100644
index 0000000000..8e7bf9efe9
--- /dev/null
+++ b/types/openfin/v37/_v2/util/promises.d.ts
@@ -0,0 +1,5 @@
+export declare function promisify(func: Function): (...args: any[]) => Promise<any>;
+export declare function promiseMap<T, S>(arr: T[], asyncF: (x: T, i: number, r: T[]) => Promise<S>): Promise<S[]>;
+export declare type asyncF<T> = (...args: any[]) => Promise<T>;
+export declare function serial<T>(arr: asyncF<T>[]): Promise<T[]>;
+export declare function promiseMapSerial<T>(arr: any[], func: asyncF<T>): Promise<T[]>;
diff --git a/types/openfin/v37/_v2/util/ref-counter.d.ts b/types/openfin/v37/_v2/util/ref-counter.d.ts
new file mode 100644
index 0000000000..8184e09079
--- /dev/null
+++ b/types/openfin/v37/_v2/util/ref-counter.d.ts
@@ -0,0 +1,7 @@
+export default class RefCoutner {
+    topicRefMap: Map<any, any>;
+    incRefCount(key: string): number;
+    decRefCount(key: string): number;
+    actOnFirst(key: string, firstAction: () => any, nonFirstAction?: () => void): any;
+    actOnLast(key: string, lastAction: () => any, nonLastAction?: () => void): any;
+}
diff --git a/types/openfin/v37/index.d.ts b/types/openfin/v37/index.d.ts
new file mode 100644
index 0000000000..b5d04f1a27
--- /dev/null
+++ b/types/openfin/v37/index.d.ts
@@ -0,0 +1,1304 @@
+// Type definitions for OpenFin API 37.0
+// Project: https://openfin.co/
+// Definitions by: Chris Barker <https://github.com/chrisbarker>
+//                 Ricardo de Pena <https://github.com/rdepena>
+//                 Roma <https://github.com/whyn07m3>
+//                 Li Cui <https://github.com/licui3936>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.9
+
+// based on v9.61.37.14
+// see https://openfin.co/support/technical-faq/#what-do-the-numbers-in-the-runtime-version-mean
+
+/**
+ * JavaScript API
+ * The JavaScript API allows you to create an HTML/JavaScript application that has access to the native windowing environment,
+ * can communicate with other applications and has access to sandboxed system-level features.
+ *
+ * API Ready
+ * When using the OpenFin API, it is important to ensure that it has been fully loaded before making any API calls. To verify
+ * that the API is in fact ready, be sure to make any API calls either from within the fin.desktop.main() method or explicitly
+ * after it has returned. This avoids the situation of trying to access methods that are not yet fully injected.
+ *
+ * Overview
+ * When running within the OpenFin Runtime your web applications have access to the "fin" namespace and all the modules within the API
+ * without the need to include additional source files. You can treat the "fin" namespace as you would the "window", "navigator" or "documennt" objects.
+ */
+declare namespace fin {
+    var Application: import('./_v2/api/application/application').default;
+    var Clipboard: import('./_v2/api/clipboard/clipboard').default;
+    var ExternalApplication: import('./_v2/api/external-application/external-application').default
+    var Frame: import('./_v2/api/frame/frame').default;
+    var GlobalHotkey: import('./_v2/api/global-hotkey/index').default;
+    var InterApplicationBus: import('./_v2/api/interappbus/interappbus').default;
+    var Notification: import('./_v2/api/notification/notification').default;
+    var System: import('./_v2/api/system/system').default;
+    var Window: import('./_v2/api/window/window').default;
+
+    // v2 shapes
+    type Identity = import('./_v2/identity').Identity;
+    type LaunchInfo = import('./_v2/api/application/application').ApplicationInfo;
+    type ShortCutConfig = import('./_v2/api/application/application').ShortCutConfig;
+    type TrayInfo = import('./_v2/api/application/application').TrayInfo;
+    type ApplicationOption = import('./_v2/api/application/applicationOption').ApplicationOption;
+    type ExternalApplicationInfo = import('./_v2/api/external-application/external-application').ExternalApplicationInfo;
+    type ApplicationInfo = import('./_v2/api/system/application').ApplicationInfo;
+    type ClearCacheOption = import('./_v2/api/system/clearCacheOption').ClearCacheOption;
+    type CookieInfo = import('./_v2/api/system/cookie').CookieInfo;
+    type CookieOption = import('./_v2/api/system/cookie').CookieOption;
+    type AppAssetInfo = import('./_v2/api/system/download-asset').AppAssetInfo;
+    type AppAssetRequest = import('./_v2/api/system/download-asset').AppAssetRequest;
+    type RuntimeDownloadOptions = import('./_v2/api/system/download-asset').RuntimeDownloadOptions;
+    type RuntimeDownloadProgress = import('./_v2/api/system/download-asset').RuntimeDownloadProgress;
+    type DownloadPreloadInfo = import('./_v2/api/system/download-preload').DownloadPreloadInfo;
+    type DownloadPreloadOption = import('./_v2/api/system/download-preload').DownloadPreloadOption;
+    type EntityInfo = import('./_v2/api/system/entity').EntityInfo;
+    type ExternalProcessRequestType = import('./_v2/api/system/external-process').ExternalProcessRequestType;
+    type ExternalProcessInfo = import('./_v2/api/system/external-process').ExternalProcessInfo;
+    type HostSpecs = import('./_v2/api/system/host-specs').HostSpecs;
+    type LogInfo = import('./_v2/api/system/log').LogInfo;
+    type MonitorInfo = import('./_v2/api/system/monitor').MonitorInfo;
+    type PointTopLeft = import('./_v2/api/system/point').PointTopLeft;
+    type ProcessInfo = import('./_v2/api/system/process').ProcessInfo;
+    type ProxyInfo = import('./_v2/api/system/proxy').ProxyInfo;
+    type RegistryInfo = import('./_v2/api/system/registry-info').RegistryInfo;
+    type RuntimeInfo = import('./_v2/api/system/runtime-info').RuntimeInfo;
+    type RVMInfo = import('./_v2/api/system/rvm').RVMInfo;
+    type WindowDetail = import('./_v2/api/system/window').WindowDetail;
+    type WindowInfo = import('./_v2/api/system/window').WindowInfo;
+    type AnchorType = import('./_v2/api/window/anchor-type').AnchorType;
+    type Bounds = import('./_v2/api/window/bounds').default;
+    type Transition = import('./_v2/api/window/transition').Transition;
+    type TransitionOptions = import('./_v2/api/window/transition').TransitionOptions;
+    type WindowOption = import('./_v2/api/window/windowOption').WindowOption;
+
+    const desktop: OpenFinDesktop;
+
+    interface OpenFinDesktop {
+        main(f: () => any): void;
+        Application: OpenFinApplicationStatic;
+        ExternalApp: OpenFinExternalApplicationStatic;
+        GlobalHotkey: OpenFinGlobalHotkey;
+        InterApplicationBus: OpenFinInterApplicationBus;
+        Notification: OpenFinNotificationStatic;
+        System: OpenFinSystem;
+        Window: OpenFinWindowStatic;
+        Frame: OpenFinFrameStatic;
+    }
+
+    interface OpenFinApplicationStatic {
+        /**
+         * Creates a new Application.
+         * An object representing an application. Allows the developer to create, execute, show/close an application as well as listen to application events.
+         */
+        new (
+            options: ApplicationOption,
+            callback?: (successObj: { httpResponseCode: number }) => void,
+            errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinApplication;
+        /**
+         * Launches the given Application manifest.
+         */
+        createFromManifest(manifestUrl: string, callback?: (app: OpenFinApplication) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Returns an Application object that represents an existing application.
+         */
+        getCurrent(): OpenFinApplication;
+        /**
+         * Returns an Application object that represents an existing application.
+         */
+        wrap(uuid: string): OpenFinApplication;
+    }
+
+    /**
+     * Application
+     * An object representing an application.Allows the developer to create, execute, show / close an application as well as listen to application events.
+     */
+    interface OpenFinApplication {
+        /**
+         * Returns an instance of the main Window of the application
+         */
+        getWindow(): OpenFinWindow;
+        /**
+         * Registers an event listener on the specified event.
+         */
+        addEventListener(
+            type: OpenFinApplicationEventType,
+            listener: (event: ApplicationBaseEvent
+                | TrayIconClickedEvent
+                | WindowEvent
+                | WindowAlertRequestedEvent
+                | WindowAuthRequested
+                | WindowNavigationRejectedEvent
+                | WindowEndLoadEvent) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Closes the application and any child windows created by the application.
+         */
+        close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of wrapped fin.desktop.Windows for each of the application's child windows.
+         */
+        getChildWindows(callback?: (children: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of active window groups for all of the application's windows. Each group is represented as an array of wrapped fin.desktop.Windows.
+         */
+        getGroups(callback?: (groups: OpenFinWindow[][]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the JSON manifest that was used to create the application. Invokes the error callback if the application was not created from a manifest.
+         */
+        getManifest(callback?: (manifest: any) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves UUID of the application that launches this application. Invokes the error callback if the application was created from a manifest.
+         */
+        getParentUuid(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves current configuration of application's shortcuts.
+         */
+        getShortcuts(callback?: (config: ShortCutConfig) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves information about the application.
+         */
+        getInfo(callback?: (info: LaunchInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves information about the system tray.
+         */
+        getTrayIconInfo(callback?: (trayInfo: TrayInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Determines if the application is currently running.
+         */
+        isRunning(callback?: (running: boolean) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Registers a username and an app name for licensing purposes.
+         */
+        registerUser(userName: string, appName: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Removes a previously registered event listener from the specified event.
+         */
+        removeEventListener(
+            type: OpenFinApplicationEventType,
+            previouslyRegisteredListener: (event: ApplicationBaseEvent
+                | TrayIconClickedEvent
+                | WindowEvent
+                | WindowAlertRequestedEvent
+                | WindowAuthRequested
+                | WindowNavigationRejectedEvent
+                | WindowEndLoadEvent) => any,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Removes the application's icon from the tray.
+         */
+        removeTrayIcon(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Restarts the application.
+         */
+        restart(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Runs the application. When the application is created, run must be called.
+         */
+        run(callback?: (successObj: SuccessObj) => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+        /**
+         * Tells the rvm to relaunch the main application once upon a complete shutdown
+         */
+        scheduleRestart(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Sets new shortcut configuration for current application.
+         * Application has to be launched with a manifest and has to have shortcut configuration (icon url, name, etc.) in its manifest to
+         * be able to change shortcut states.
+         */
+        setShortcuts(config: ShortCutConfig, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Adds a customizable icon in the system tray and notifies the application when clicked.
+         */
+        setTrayIcon(iconUrl: string, listener: (clickInfo: TrayIconClickedEvent) => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Closes the application by terminating its process.
+         */
+        terminate(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Waits for a hanging application. This method can be called in response to an application "not-responding" to allow the application
+         * to continue and to generate another "not-responding" message after a certain period of time.
+         */
+        wait(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * The Application's uuid
+         */
+        uuid: string;
+    }
+
+    interface SuccessObj {
+        httpResponseCode: number;
+    }
+
+    interface NetworkErrorInfo extends ErrorInfo {
+        networkErrorCode: number;
+    }
+
+    interface ErrorInfo {
+        stack: string;
+        message: string;
+    }
+
+    /**
+     * Clipboard
+     * Clipboard API allows reading and writting to the clipboard in multiple formats.
+     */
+    interface OpenFinClipboard {
+        /**
+         * Reads available formats for the clipboard type
+         */
+        availableFormats(type: string | null, callback?: (formats: string[]) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Reads available formats for the clipboard type
+         */
+        readHtml(type: string | null, callback?: (html: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Read the content of the clipboard as Rtf
+         */
+        readRtf(type: string | null, callback?: (rtf: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Read the content of the clipboard as plain text
+         */
+        readText(type: string | null, callback?: (text: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Writes data into the clipboard
+         */
+        write(data: any, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Writes data into the clipboard as Html
+         */
+        writeHtml(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Writes data into the clipboard as Rtf
+         */
+        writeRtf(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Writes data into the clipboard as plain text
+         */
+        writeText(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+    }
+
+    interface OpenFinExternalApplicationStatic {
+        /**
+         * Returns an External Application object that represents an existing external application.
+         */
+        wrap(uuid: string): OpenFinExternalApplication;
+    }
+    /**
+     * ExternalApplication
+     * An object representing an application. Allows the developer to create, execute, show and close an application, as well as listen to application events.
+     */
+    interface OpenFinExternalApplication {
+        /**
+         * Retrieves information about the application.
+         */
+        getInfo(callback?: (info: ExternalApplicationInfo) => void,
+                errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Registers an event listener on the specified event.
+         */
+        addEventListener(
+            type: OpenFinExternalApplicationEventType,
+            listener: () => void,
+            callback?: () => void,
+            errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Removes a previously registered event listener from the specified event.
+         */
+        removeEventListener(
+            type: OpenFinExternalApplicationEventType,
+            listener: () => void,
+            callback?: () => void,
+            errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+    }
+
+   /**
+     * GlobalHotkey
+     * The Global Hotkey allows the registration and unregistration of given hotkeys at the OS level, meaning a Window/Application will receive the events regardless of focused state.
+     */
+    interface OpenFinGlobalHotkey {
+        /**
+         * Registers an event listener on the specified event.
+         */
+        addEventListener(
+            type: OpenFinGlobalHotkeyEventType,
+            listener: (event: GlobalHotkeyEvent) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Checks if a given hotkey has been registered
+         */
+        isRegistered(hotkey: string, callback?: (registered: boolean) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Registers a global hotkey with the operating system.
+         */
+        register(hotkey: string, listener: () => void, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Removes a previously registered event listener from the specified event.
+         */
+        removeEventListener(
+            type: OpenFinGlobalHotkeyEventType,
+            listener: (event: GlobalHotkeyEvent) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Unregisters a global hotkey with the operating system.
+         */
+        unregister(hotkey: string, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Unregisters all global hotkeys for the current application.
+         */
+        unregisterAll(callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+    }
+
+    /**
+     * InterApplicationBus
+     * A messaging bus that allows for pub/sub messaging between different applications.
+     */
+    interface OpenFinInterApplicationBus {
+        /**
+         * Adds a listener that gets called when applications subscribe to the current application's messages.
+         */
+        addSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+        /**
+         * Adds a listener that gets called when applications unsubscribe to the current application's messages.
+         */
+        addUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+        /**
+         * Removes a previously registered subscribe listener.
+         */
+        removeSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+        /**
+         * Removes a previously registered unsubscribe listener.
+         */
+        removeUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+        /**
+         * Publishes a message to all applications running on OpenFin Runtime that are subscribed to the specified topic.
+         */
+        publish(topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Sends a message to a specific application on a specific topic.
+         */
+        send(destinationUuid: string, name: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        send(destinationUuid: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Subscribes to messages from the specified application on the specified topic. If the subscription is for a uuid, [name],
+         * topic combination that has already been published to upon subscription you will receive the last 20 missed messages in the order they were published.
+         */
+        subscribe(
+            senderUuid: string,
+            name: string,
+            topic: string,
+            listener: (message: any, uuid: string, name: string) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        subscribe(
+            senderUuid: string,
+            topic: string,
+            listener: (message: any, uuid: string, name: string) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Unsubscribes to messages from the specified application on the specified topic.
+         */
+        unsubscribe(
+            senderUuid: string,
+            name: string,
+            topic: string,
+            listener: (message: any, uuid: string, name: string) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        unsubscribe(
+            senderUuid: string,
+            topic: string,
+            listener: (message: any, uuid: string, name: string) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+    }
+
+    interface OpenFinNotificationStatic {
+        /**
+         * ctor
+         */
+        new (options: NotificationOptions, callback?: () => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinNotification;
+        /**
+         * Gets an instance of the current notification. For use within a notification window to close the window or send a message back to its parent application.
+         */
+        getCurrent(): OpenFinNotification;
+    }
+
+    /**
+     * Notification
+     * Notification represents a window on OpenFin Runtime which is shown briefly to the user on the bottom-right corner of the primary monitor.
+     * A notification is typically used to alert the user of some important event which requires his or her attention.
+     * Notifications are a child or your application that are controlled by the runtime.
+     */
+    interface OpenFinNotification {
+        /**
+         * Closes the notification.
+         */
+        close(callback?: () => void): void;
+        /**
+         * Sends a message to the notification.
+         */
+        sendMessage(message: any, callback?: () => void): void;
+        /**
+         * Sends a message from the notification to the application that created the notification. The message is handled by the notification's onMessage callback.
+         */
+        sendMessageToApplication(message: any, callback?: () => void): void;
+    }
+
+    interface NotificationOptions {
+        /**
+         * A boolean that will force dismissal even if the mouse is hovering over the notification
+         */
+        ignoreMouseOver?: boolean;
+        /**
+         * A message of any primitive or composite-primitive type to be passed to the notification upon creation.
+         */
+        message?: any;
+        /**
+         * The timeout for displaying a notification.Can be in milliseconds or "never".
+         */
+        timeout?: number | "never";
+        /**
+         * The url of the notification
+         */
+        url?: string;
+        /**
+         * A function that is called when a notification is clicked.
+         */
+        onClick?(callback: () => void): void;
+        /**
+         * Invoked when the notification is closed via .close() method on the created notification instance
+         * or the by the notification itself via fin.desktop.Notification.getCurrent().close().
+         * NOTE: this is not invoked when the notification is dismissed via a swipe. For the swipe dismissal callback see onDismiss
+         */
+        onClose?(callback: () => void): void;
+        /**
+         * Invoked when a the notification is dismissed by swiping it off the screen to the right. NOTE: this is no fired on a programmatic close.
+         */
+        onDismiss?(callback: () => void): void;
+        /**
+         * A function that is called when an error occurs.The reason for the error is passed as an argument.
+         */
+        onError?(errorCallback: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+        /**
+         * The onMessage function will respond to messages sent from notification.sendMessageToApplication.
+         * The function is passed the message, which can be of any primitive or composite-primitive type.
+         */
+        onMessage?(callback: (message: any) => void): void;
+        /**
+         * A function that is called when a notification is shown.
+         */
+        onShow?(callback: (successObj: SuccessObj) => void): void;
+    }
+
+    /**
+     * System
+     * An object representing the core of OpenFin Runtime.
+     * Allows the developer to perform system-level actions, such as accessing logs, viewing processes, clearing the cache and exiting the runtime.
+     */
+    interface OpenFinSystem {
+        Clipboard: OpenFinClipboard;
+        /**
+         * Registers an event listener on the specified event.
+         */
+        addEventListener(
+            type: OpenFinSystemEventType,
+            listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Clears cached data containing window state/positions,
+         * application resource files (images, HTML, JavaScript files), cookies, and items stored in the Local Storage.
+         */
+        clearCache(options: ClearCacheOption, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Clears all cached data when OpenFin Runtime exits.
+         */
+        deleteCacheOnExit(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Downloads the given application asset
+         */
+        downloadAsset(
+            assetObj: AppAssetInfo,
+            progressListener?: (progress: { downloadedBytes: number, totalBytes: number }) => void,
+            callback?: (successObj: { path: string }) => void,
+            errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+
+        /**
+         * Download preload scripts from given URLs
+         */
+        downloadPreloadScripts(scripts: DownloadPreloadOption[], callback?: (downloadInfo: DownloadPreloadInfo[]) => void,
+                               errorCallback?: (reason: string) => void): void;
+        /**
+         * Downloads the given OpenFin Runtime.
+         */
+        downloadRuntime(options: RuntimeDownloadOptions, onProgress?: (progress: RuntimeDownloadProgress) => void, onComplete?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Exits the Runtime.
+         */
+        exit(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Writes any unwritten cookies data to disk.
+         */
+        flushCookieStore(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of data for all applications.
+         */
+        getAllApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of data for all external applications.
+         */
+        getAllExternalApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of data (name, ids, bounds) for all application windows.
+         */
+        getAllWindows(callback?: (windowInfoList: WindowInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns information about the app asset.
+         */
+        getAppAssetInfo(options: AppAssetRequest, callback?: (appAssetInfo: AppAssetInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Get additional info of cookies.
+         */
+        getCookies(option: CookieOption, callback?: (info: CookieInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the command line argument string that started OpenFin Runtime.
+         */
+        getCommandLineArguments(callback?: (args: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the configuration object that started the OpenFin Runtime.
+         */
+        getDeviceId(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns a hex encoded hash of the mac address and the currently logged in user name
+         */
+        getDeviceUserId(callback?: (id: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns an Entity info object relating to the entity specified by the uuid and name passed in. The possible types are 'window', 'iframe', 'external connection' or 'unknown'.
+         */
+        getEntityInfo(uuid: string, name: string, callback?: (info: EntityInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets the value of a given environment variable on the computer on which the runtime is installed.
+         */
+        getEnvironmentVariable(envVar: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves currently focused window identity.
+         */
+        getFocusedWindow(callback?: (focusedWindowIdentity: Identity) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves system information.
+         */
+        getHostSpecs(callback?: (info: HostSpecs) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the contents of the log with the specified filename.
+         */
+        getLog(logFileName: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array containing information for each log file.
+         */
+        getLogList(callback?: (logInfoList: LogInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the minimum (inclusive) logging level that is currently being written to the logs.
+         */
+        getMinLogLevel(callback?: (logLevel: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an object that contains data about the about the monitor setup of the computer that the runtime is running on.
+         */
+        getMonitorInfo(callback?: (monitorInfo: MonitorInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns the mouse in virtual screen coordinates (left, top).
+         */
+        getMousePosition(callback?: (mousePosition: PointTopLeft) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of all of the runtime processes that are currently running.
+         * Each element in the array is an object containing the uuid and the name of the application to which the process belongs.
+         */
+        getProcessList(callback?: (processInfoList: ProcessInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the Proxy settings.
+         */
+        getProxySettings(callback?: (proxy: ProxyInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns information about the running Runtime in an object.
+         */
+        getRuntimeInfo(callback?: (rvmInfo: RuntimeInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns information about the running RVM in an object.
+         */
+        getRvmInfo(callback?: (rvmInfo: RVMInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns the version of the runtime. The version contains the major, minor, build and revision numbers.
+         */
+        getVersion(callback?: (version: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Runs an executable or batch file.
+         */
+        launchExternalProcess(options: ExternalProcessRequestType, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Writes the passed message into both the log file and the console.
+         */
+        log(level: "debug" | "info" | "warn" | "error", message: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Monitors a running process.
+         */
+        monitorExternalProcess(options: ExternalProcessInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Opens the passed URL in the default web browser.
+         */
+        openUrlWithBrowser(url: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Opens the passed URL in the default web browser.
+         */
+        readRegistryValue(rootKey: string, subkey: string, value: string, callback?: (info: RegistryInfo) => void,
+                          errorCallback?: (reason: string) => void): void;
+        /**
+         * This function call will register a unique id and produce a token. The token can be used to broker an external connection.
+         */
+        registerExternalConnection(
+            uuid: string,
+            callback?: (detail: {
+                /**
+                 * this will be unique each time
+                 */
+                token: string;
+                /**
+                 * "remote-connection-uuid"
+                 */
+                uuid: string;
+            }) => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Removes the process entry for the passed UUID obtained from a prior call of fin.desktop.System.launchExternalProcess().
+         */
+        releaseExternalProcess(processUuid: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Removes a previously registered event listener from the specified event.
+         */
+        removeEventListener(
+            type: OpenFinSystemEventType,
+            listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
+            callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Set the minimum log level above which logs will be written to the OpenFin log
+         */
+        setMinLogLevel(logLevel: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Shows the Chrome Developer Tools for the specified window.
+         */
+        showDeveloperTools(uuid: string, name: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Attempt to close an external process. The process will be terminated if it has not closed after the elapsed timeout in milliseconds.
+         */
+        terminateExternalProcess(
+            processUuid: string,
+            timeout: number,
+            killTree: boolean,
+            callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
+            errorCallback?: (reason: string) => void): void;
+        terminateExternalProcess(
+            processUuid: string,
+            timeout: number,
+            callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Update the OpenFin Runtime Proxy settings.
+         */
+        updateProxySettings(type: string, address: string, port: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+    }
+
+    interface OpenFinWindowStatic {
+        /**
+         * Class: Window
+         *
+         * new Window(options, callbackopt, errorCallbackopt)
+         *
+         * Creates a new OpenFin Window
+         *
+         * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
+         * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
+         * The new window appears in the same process as the parent window.
+         * @param options - The options of the window
+         * @param [callback] - Called if the window creation was successful
+         * @param [callback.successObj] - httpResponseCode
+         */
+        new (
+            options: WindowOption,
+            callback?: (successObj: { httpResponseCode: number }) => void,
+            errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinWindow;
+        /**
+         * Returns an instance of the current window.
+         * @returns Current window
+         */
+        getCurrent(): OpenFinWindow;
+        /**
+         * Returns a Window object that wraps an existing window.
+         */
+        wrap(appUuid: string, windowName: string): OpenFinWindow;
+    }
+
+    /**
+     * Window
+     * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
+     * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
+     * The new window appears in the same process as the parent window.
+     */
+    interface OpenFinWindow {
+        /**
+         * uuid of the application that the window belongs to.
+         */
+        uuid: string;
+        /**
+         * Name of window
+         */
+        name: string;
+        /**
+         * Returns the native JavaScript "window" object for the window. This method can only be used by the parent application or the window itself,
+         * otherwise it will return undefined. The same Single-Origin-Policy (SOP) rules apply for child windows created by window.open(url) in that the
+         * contents of the window object are only accessible if the URL has the same origin as the invoking window. See example below.
+         * Also, will not work with fin.desktop.Window objects created with fin.desktop.Window.wrap().
+         * @returns Native window
+         */
+        getNativeWindow(): Window;
+        /**
+         * Gets the parent application.
+         * @returns Parent application
+         */
+        getParentApplication(): OpenFinApplication;
+        /**
+         * Gets the parent window.
+         */
+        getParentWindow(): OpenFinWindow;
+        /**
+         * Registers an event listener on the specified event.
+         */
+        addEventListener(
+            type: OpenFinWindowEventType,
+            listener: (event: WindowBaseEvent
+					   | WindowAuthRequestedEvent
+					   | WindowBoundsEvent
+					   | WindowExternalProcessStartedEvent
+					   | WindowExternalProcessExited
+					   | WindowGroupChangedEvent
+					   | WindowHiddenEvent
+					   | Window_NavigationRejectedEvent) => void,
+            callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Performs the specified window transitions
+         */
+        animate(transitions: Transition, options: TransitionOptions, callback?: (event: any) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Provides credentials to authentication requests
+         */
+        authenticate(userName: string, password: string, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Removes focus from the window.
+         */
+        blur(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Brings the window to the front of the OpenFin window stack.
+         */
+        bringToFront(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Closes the window.
+         * @param Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
+         */
+        close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Prevents a user from changing a window's size/position when using the window's frame.
+         * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
+         * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
+         * The events provide the bounds that would have been applied if the frame was enabled.
+         * 'frame-disabled' is generated when an enabled frame becomes disabled.
+         */
+        disableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Re-enables user changes to a window's size/position when using the window's frame.
+         * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
+         * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
+         * The events provide the bounds that would have been applied if the frame was enabled.
+         * 'frame-enabled' is generated when a disabled frame has becomes enabled.
+         */
+        enableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Flashes the window's frame and taskbar icon until the window is activated.
+         */
+        flash(options?: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gives focus to the window.
+         */
+        focus(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets the current bounds (top, left, width, height) of the window.
+         */
+        getBounds(callback?: (bounds: Bounds) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array containing wrapped fin.desktop.Windows that are grouped with this window. If a window is not in a group an empty array is returned.
+         * Please note that calling window is included in the result array.
+         */
+        getGroup(callback?: (group: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets the current settings of the window.
+         */
+        getOptions(callback?: (options: WindowOption) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets a base64 encoded PNG snapshot of the window.
+         */
+        getSnapshot(callback?: (base64Snapshot: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets the current state ("minimized", "maximized", or "normal") of the window.
+         */
+        getState(callback?: (state: "minimized" | "maximized" | "normal") => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns the zoom level of the window.
+         */
+        getZoomLevel(callback?: (level: number) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Hides the window.
+         */
+        hide(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Determines if the window is currently showing.
+         */
+        isShowing(callback?: (showing: boolean) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Joins the same window group as the specified window.
+         */
+        joinGroup(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Leaves the current window group so that the window can be move independently of those in the group.
+         */
+        leaveGroup(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Maximizes the window.
+         */
+        maximize(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Merges the instance's window group with the same window group as the specified window
+         */
+        mergeGroups(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Minimizes the window.
+         */
+        minimize(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Moves the window by a specified amount.
+         */
+        moveBy(deltaLeft: number, deltaTop: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Moves the window to a specified location.
+         */
+        moveTo(left: number, top: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Removes a previously registered event listener from the specified event.
+         */
+        removeEventListener(
+            type: OpenFinWindowEventType,
+            listener: (event: WindowBaseEvent
+					   | WindowAuthRequestedEvent
+					   | WindowBoundsEvent
+					   | WindowExternalProcessStartedEvent
+					   | WindowExternalProcessExited
+					   | WindowGroupChangedEvent
+					   | WindowHiddenEvent
+					   | Window_NavigationRejectedEvent) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Resizes the window by a specified amount.
+         */
+        resizeBy(deltaWidth: number, deltaHeight: number, anchor: AnchorType, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Resizes the window by a specified amount.
+         */
+        resizeTo(width: number, height: number, anchor: AnchorType, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Restores the window to its normal state (i.e., unminimized, unmaximized).
+         */
+        restore(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Will bring the window to the front of the entire stack and give it focus.
+         */
+        setAsForeground(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Sets the window's size and position
+         */
+        setBounds(left: number, top: number, width: number, height: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Sets the zoom level of the window.
+         */
+        setZoomLevel(level: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Shows the window if it is hidden.
+         * @param Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
+         */
+        show(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Shows the window if it is hidden at the specified location. If the toggle parameter is set to true, the window will alternate between showing and hiding.
+         */
+        showAt(left: number, top: number, force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Stops the taskbar icon from flashing.
+         */
+        stopFlashing(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Updates the window using the passed options
+         */
+        updateOptions(options: WindowOption, callback?: () => void, errorCallback?: (reason: string) => void): void;
+    }
+
+    interface OpenFinFrameStatic {
+        wrap(uuid: string, name: string): OpenFinFrame;
+
+        getCurrent(): OpenFinFrame;
+    }
+
+    interface OpenFinFrame {
+        name: string;
+        uuid: string;
+
+        addEventListener(type: string, listener: () => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
+
+        getParentWindow(callback?: (entityInfo: EntityInfo) => void, errorCallback?: (reason: string) => void): void;
+
+        getInfo(callback?: (entityInfo: EntityInfo) => void, errorCallback?: (reason: string) => void): void;
+
+        removeEventListener(type: string, listener: () => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
+    }
+
+    interface ApplicationBaseEvent {
+        topic: string;
+        type: OpenFinApplicationEventType;
+        uuid: string;
+    }
+
+    interface TrayIconClickedEvent extends ApplicationBaseEvent {
+        button: number; // 0 for left, 1 for middle, 2 for right
+        monitorInfo: MonitorInfo;
+        x: number; // the cursor x coordinate
+        y: number; // the cursor y coordinate
+    }
+
+    interface WindowEvent extends ApplicationBaseEvent {
+        name: string;
+    }
+
+    interface WindowAlertRequestedEvent extends WindowEvent {
+        message: string;
+        url: string;
+    }
+
+    interface WindowAuthRequested extends WindowEvent {
+        authInfo: {
+            host: string;
+            isProxy: boolean;
+            port: number;
+            realm: string;
+            scheme: string;
+        };
+    }
+
+    interface WindowNavigationRejectedEvent extends WindowEvent {
+        sourceName: string;
+        url: string;
+    }
+
+    interface WindowEndLoadEvent extends WindowEvent {
+        documentName: string;
+        isMain: boolean;
+    }
+
+    interface MonitorInfoChangedEvent extends MonitorInfo {
+        topic: "system";
+        type: "monitor-info-changed";
+    }
+
+    interface SystemBaseEvent {
+        topic: string;
+        type: OpenFinSystemEventType;
+        uuid: string;
+    }
+
+    interface GlobalHotkeyEvent {
+        topic: string;
+        type: OpenFinGlobalHotkeyEventType;
+        /**
+         * The Identity that has just registered the hotkey
+         */
+        identity: {
+            name: string;
+            uuid: string;
+            parentFrame: string;
+            entityType: string;
+        },
+        hotkey: string;
+    }
+
+    interface DesktopIconClickedEvent {
+        mouse: {
+            /**
+             * the left virtual screen coordinate of the mouse
+             */
+            left: number,
+            /**
+             * the top virtual screen coordinate of the mouse
+             */
+            top: number
+        };
+        /**
+         * the number of milliseconds that have elapsed since the system was started,
+         */
+        tickCount: number;
+        topic: "system";
+        type: "desktop-icon-clicked";
+    }
+
+    interface IdleStateChangedEvent {
+        /**
+         * How long in milliseconds since the user has been idle.
+         */
+        elapsedTime: number;
+        /**
+         * true when the user is idle,false when the user has returned;
+         */
+        isIdle: boolean;
+        topic: "system";
+        type: "idle-state-changed";
+    }
+
+    interface WindowBaseEvent {
+        /**
+         * the name of the window
+         */
+        name: string;
+        /**
+         * always window
+         */
+        topic: "window";
+        /**
+         * window event type
+         */
+        type: OpenFinWindowEventType;
+        /**
+         * the UUID of the application the window belongs to
+         */
+        uuid: string;
+    }
+
+    interface WindowAuthRequestedEvent extends WindowBaseEvent {
+        authInfo: {
+            host: string;
+            isProxy: boolean;
+            port: number;
+            realm: string;
+            scheme: string;
+        };
+    }
+
+    interface WindowBoundsEvent extends WindowBaseEvent {
+        /**
+         * describes what kind of change occurred.
+         * 0 means a change in position.
+         * 1 means a change in size.
+         * 2 means a change in position and size.
+         */
+        changeType: number;
+        /**
+         * true when pending changes have been applied to the window.
+         */
+        deferred: boolean;
+        /**
+         * the new height of the window.
+         */
+        height: number;
+        /**
+         * the left-most coordinate of the window.
+         */
+        left: number;
+        /**
+         * the top-most coordinate of the window.
+         */
+        top: number;
+
+        type: "bounds-changed" | "bounds-changing" | "disabled-frame-bounds-changed" | "disabled-frame-bounds-changing";
+        /**
+         * the new width of the window.
+         */
+        width: number;
+    }
+
+    interface WindowExternalProcessStartedEvent extends WindowBaseEvent {
+        /**
+         * the process handle uuid
+         */
+        processUuid: string;
+        type: "external-process-started";
+    }
+
+    interface WindowExternalProcessExited extends WindowBaseEvent {
+        /**
+         * the process exit code
+         */
+        exitCode: number;
+        /**
+         * the process handle uuid
+         */
+        processUuid: string;
+        type: "external-process-exited";
+    }
+
+    interface WindowGroupChangedEvent extends WindowBaseEvent {
+        /**
+         * Which group array the window that the event listener was registered on is included in:
+         * 'source' The window is included in sourceGroup.
+         * 'target' The window is included in targetGroup.
+         * 'nothing' The window is not included in sourceGroup nor targetGroup.
+         */
+        memberOf: "source" | "target" | "nothing";
+        /**
+         * The reason this event was triggered.
+         * 'leave' A window has left the group due to a leave or merge with group.
+         * 'join' A window has joined the group.
+         * 'merge' Two groups have been merged together.
+         * 'disband' There are no other windows in the group.
+         */
+        reason: "leave" | "join" | "merge" | "disband";
+        /**
+         * All the windows in the group the sourceWindow originated from.
+         */
+        sourceGroup: WindowOfGroupInfo[];
+        /**
+         * The UUID of the application the sourceWindow belongs to The source window is the window in which (merge/join/leave)group(s) was called.
+         */
+        sourceWindowAppUuid: string;
+        /**
+         * the name of the sourcewindow.The source window is the window in which(merge / join / leave) group(s) was called.
+         */
+        sourceWindowName: string;
+        /**
+         * All the windows in the group the targetWindow orginated from
+         */
+        targetGroup: WindowOfGroupInfo[];
+        /**
+         * The UUID of the application the targetWindow belongs to. The target window is the window that was passed into (merge/join) group(s).
+         */
+        targetWindowAppUuid: string;
+        /**
+         * The name of the targetWindow. The target window is the window that was passed into (merge/join) group(s).
+         */
+        targetWindowName: string;
+        type: "group-changed";
+    }
+
+    interface WindowOfGroupInfo {
+        /**
+         * The UUID of the application this window entry belongs to.
+         */
+        appUuid: string;
+        /**
+         * The name of this window entry.
+         */
+        windowName: string;
+    }
+
+    interface WindowHiddenEvent extends WindowBaseEvent {
+        /**
+         * What action prompted the close.
+         * The reasons are: "hide", "hide-on-close"
+         */
+        reason: "hide" | "hide-on-close";
+        type: "hidden";
+    }
+
+    interface Window_NavigationRejectedEvent {
+        name: string;
+        /**
+         * source of navigation window name
+         */
+        sourceName: string;
+        topic: "navigation-rejected";
+        /**
+         * Url that was not reached "http://blocked-content.url"
+         */
+        url: string;
+        /**
+         * the UUID of the application the window belongs to.
+         */
+        uuid: string;
+    }
+
+    interface SessionChangedEvent {
+        /**
+         * the action that triggered this event:
+         */
+        reason: "lock"
+            | "unlock"
+            | "remote-connect"
+            | "remote-disconnect"
+            | "unknown";
+        topic: "system";
+        type: "session-changed";
+    }
+
+    type OpenFinApplicationEventType = "closed"
+        | "connected"
+        | "crashed"
+        | "initialized"
+        | "manifest-changed"
+        | "not-responding"
+        | "out-of-memory"
+        | "responding"
+        | "run-requested"
+        | "started"
+        | "tray-icon-clicked"
+        | "window-alert-requested"
+        | "window-auth-requested"
+        | "window-closed"
+        | "window-created"
+        | "window-end-load"
+        | "window-navigation-rejected"
+        | "window-show-requested"
+        | "window-start-load";
+
+    type OpenFinExternalApplicationEventType = "connected"
+        | "disconnected";
+
+    type OpenFinGlobalHotkeyEventType = "registered"
+        | "unregistered";
+
+    type OpenFinSystemEventType = "application-closed"
+        | "application-crashed"
+        | "application-created"
+        | "application-started"
+        | "desktop-icon-clicked"
+        | "idle-state-changed"
+        | "monitor-info-changed"
+        | "session-changed";
+
+    type OpenFinWindowEventType = "auth-requested"
+        | "blurred"
+        | "bounds-changed"
+        | "bounds-changing"
+        | "close-requested"
+        | "closed"
+        | "disabled-frame-bounds-changed"
+        | "disabled-frame-bounds-changing"
+        | "embedded"
+        | "external-process-exited"
+        | "external-process-started"
+        | "focused"
+        | "frame-disabled"
+        | "frame-enabled"
+        | "group-changed"
+        | "hidden"
+        | "initialized"
+        | "maximized"
+        | "minimized"
+        | "navigation-rejected"
+        | "restored"
+        | "show-requested"
+        | "shown";
+}
diff --git a/types/openfin/v37/openfin-tests.ts b/types/openfin/v37/openfin-tests.ts
new file mode 100644
index 0000000000..5367823dae
--- /dev/null
+++ b/types/openfin/v37/openfin-tests.ts
@@ -0,0 +1,851 @@
+function test_application() {
+    let application: fin.OpenFinApplication;
+    // constructor
+    application = new fin.desktop.Application({
+        url: "application.html",
+        uuid: "74BED629-2D8E-4141-8582-73E364BDFA74",
+        name: "Application Name",
+        plugins: false,
+        mainWindowOptions: {
+            defaultHeight: 600,
+            defaultWidth: 800,
+            defaultTop: 300,
+            defaultLeft: 300,
+            autoShow: true
+        }
+    }, (successObj) => {
+        console.log("Application successfully created, HTTP response code:", successObj);
+        application.run();
+    }, (error) => {
+        console.log("Error creating application:", error);
+    });
+	// createFromManifest
+    fin.desktop.Application.createFromManifest("http://stuf.com/app.json", (app) => {
+        console.log(app.uuid);
+    }, err => console.log(err));
+    // getCurrent
+    application = fin.desktop.Application.getCurrent();
+    // wrap
+    application = fin.desktop.Application.wrap("454C7F31-A915-4EA2-83F2-CFA655453C52");
+    // getWindow
+    application.getWindow();
+    // addEventListener
+    application.addEventListener("closed", (event) => {
+        console.log("The application has closed");
+    }, () => {
+        console.log("The registration was successful");
+    }, reason => {
+        console.log("failure: " + reason);
+    });
+    // close
+    application.close();
+    // getChildWindows
+    application.getChildWindows(children => {
+        children.forEach(childWindow => {
+            console.log("Showing child: " + childWindow.name);
+            childWindow.show();
+        });
+    });
+    // getGroups
+    application.getGroups(allGroups => {
+        console.log(`There are a total of ${allGroups.length} groups.`);
+
+        let groupCounter = 1;
+        allGroups.forEach(windowGroup => {
+            console.log(`Group ${groupCounter} contains ${windowGroup.length} windows.`);
+            ++groupCounter;
+        });
+    });
+    // getManifest
+    application.getManifest(manifest => {
+        console.log("Application manifest:");
+        console.log(manifest);
+    });
+    // getParentUuid
+    application.getParentUuid(parentUuid => {
+        console.log("UUID of parent application:");
+        console.log(parentUuid);
+    });
+    // getShortcuts
+    application.getShortcuts(config => {
+        console.log("Desktop shortcut is enabled: ", config.desktop);
+        console.log("Start Menu shortcut is enabled: ", config.startMenu);
+        console.log("System Startup shortcut is enabled: ", config.systemStartup);
+    });
+    // getInfo
+    application.getInfo(info => {
+        console.log(`Launch mode: ${info.launchMode}`);
+    });
+    // getTrayIconInfo
+    application.getTrayIconInfo(info => {
+        console.log(info.x, info.y, info.bounds.left, info.bounds.top, info.bounds.height, info.bounds.width,
+                    info.monitorInfo.reason);
+    });
+    // isRunning
+    application.isRunning(running => {
+        console.log("the application is", running ? "running" : "not running");
+    });
+    // registerCustomData
+    application.registerUser("a", "b", () => console.log("done"), err => console.log(err));
+    // removeEventListener
+    application.removeEventListener("closed", (event: any) => {
+		console.log(event);
+	}, () => {
+        console.log("The unregistration was successful");
+    }, err => {
+        console.log("failure:", err);
+    });
+    // removeTrayIcon
+    application.removeTrayIcon(() => {
+        console.log("Removed the tray icon.");
+    }, err => {
+        console.log("failure:", err);
+    });
+    // restart
+    application.restart(() => {
+        console.log("You will not read this.");
+    }, err => {
+        console.log("failure:", err);
+    });
+    // schedule restart
+    application.scheduleRestart(() => {
+        console.log("You will not read this.");
+    }, err => {
+        console.log("failure:", err);
+    });
+    // setShortcuts
+    application.setShortcuts({
+        desktop: true,
+        startMenu: false,
+        systemStartup: true
+    }, () => {
+        console.log("Successfully set new shortcut states");
+    }, error => {
+        console.log("Failed to set new shortcut states. Error: ", error);
+    });
+    // setTrayIcon
+    application.setTrayIcon("https://developer.openf.in/download/openfin.png", clickInfo => {
+        console.log(`The mouse has clicked at (${clickInfo.x}, ${clickInfo.y})`);
+    });
+    // terminate
+    application.terminate();
+    // wait
+    application.addEventListener("not-responding", () => {
+        console.log("waiting for hung application");
+        application.wait();
+    });
+    // uuid
+    const hasUuid = application.uuid;
+}
+
+function test_external_application() {
+    let externalApp: fin.OpenFinExternalApplication;
+    // wrap
+    externalApp = fin.desktop.ExternalApp.wrap('my-uuid');
+    // addEventListener
+    externalApp.addEventListener('connected', () => {
+        console.log('external app connected');
+    }, () => {
+        console.log('The registration was successful');
+    }, (reason, err) => {
+        console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
+    });
+    // removeEventListener
+    const previousCallback = () => { };
+    externalApp.removeEventListener('connected', previousCallback, () => {
+        console.log('The unregistration was successful');
+    }, (reason, err) => {
+        console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
+    });
+
+    // getInfo
+    externalApp.getInfo(info => {
+        console.log(info.parent.uuid, info.parent.name);
+    }, err => console.log(err));
+}
+
+function test_global_hot_key() {
+    // addEventListener
+    fin.desktop.GlobalHotkey.addEventListener('registered', (event) => {
+        console.log(` window ${event.identity.name} has registered ${event.hotkey}`, event);
+    }, () => {
+        console.log('The registration was successful');
+    }, (reason, err) => {
+        console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
+    });
+    // isRegister
+    const hotkey = 'CommandOrControl+X';
+    fin.desktop.GlobalHotkey.isRegistered(hotkey, registered => {
+        console.log(`hotkey ${hotkey} is registered ? ${registered}`);
+    }, (reason, err) => {
+        console.log('Error unregistering the hotkey', err);
+    });
+    // register
+    fin.desktop.GlobalHotkey.register(hotkey, () => {
+        console.log(`${hotkey} pressed`);
+    }, () => {
+        console.log('Success');
+    }, (reason, err) => {
+        console.log('Error registering the hotkey', err);
+    });
+    // removeEventListener
+    const previousCallback = () => { };
+    fin.desktop.GlobalHotkey.removeEventListener('registered', previousCallback, () => {
+        console.log('The unregistration was successful');
+    }, (reason, err) => {
+        console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
+    });
+    // unregister
+    fin.desktop.GlobalHotkey.unregister(hotkey, () => {
+        console.log('Success');
+    }, (reason, err) => {
+        console.log('Error unregistering the hotkey', err);
+    });
+    // unregisterAll
+    fin.desktop.GlobalHotkey.unregisterAll(() => {
+        console.log('Success');
+    }, (reason, err) => {
+        console.log('Error unregistering all hotkeys for this application', err);
+    });
+}
+
+function test_inter_application_bus() {
+    // addSubscribeListener
+    fin.desktop.InterApplicationBus.addSubscribeListener((uuid, topic, name) => {
+        console.log(`The application ${uuid} has subscribed to ${topic}`);
+    });
+    // addUnsubscribeListener
+    fin.desktop.InterApplicationBus.addUnsubscribeListener((uuid, topic, name) => {
+        console.log(`The application ${uuid} has unsubscribed to ${topic}`);
+    });
+    // removeSubscribeListener
+    const aRegisteredListener = (uuid: string, topic: string, name: string) => { };
+    fin.desktop.InterApplicationBus.removeSubscribeListener(aRegisteredListener);
+    // removeUnsubscribeListener
+    fin.desktop.InterApplicationBus.removeUnsubscribeListener(aRegisteredListener);
+    // publish
+    fin.desktop.InterApplicationBus.publish("a topic", {
+        field1: "value1",
+        field2: "value2"
+    });
+    // send
+    fin.desktop.InterApplicationBus.send("an application's uuid", "a topic", {
+        field1: "value1",
+        field2: "value2"
+    });
+    // subscribe
+    fin.desktop.InterApplicationBus.subscribe("*", "a topic", (message, uuid, name) => {
+        console.log(`The application ${uuid} sent this message: ${message}`);
+    });
+    // unsubscribe
+    const aRegisteredMessageListener = (message: any, senderUuid: string) => {
+        console.log(message, senderUuid);
+    };
+    fin.desktop.InterApplicationBus.unsubscribe("*", "a topic", aRegisteredMessageListener);
+}
+
+function test_notification() {
+    let notification: fin.OpenFinNotification;
+    // getCurrent
+    notification = fin.desktop.Notification.getCurrent();
+    // close
+    notification.close();
+    // sendMessage
+    notification = new fin.desktop.Notification({
+        timeout: 10,
+        url: "http://localhost:5000/Account/Register",
+        message: "Hello",
+        onShow: () => { },
+        // onClose: () => { },
+        onDismiss: () => { },
+        // onClick: () => { },
+        onMessage: () => { },
+        onError: () => { }
+    });
+    // sendMessageToApplication
+    notification.sendMessageToApplication("some message");
+}
+
+function test_system() {
+    // addEventListener
+    fin.desktop.System.addEventListener('monitor-info-changed', event => {
+        console.log("The monitor information has changed to: ", event);
+    }, () => {
+        console.log("The registration was successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    // clearCache
+    fin.desktop.System.clearCache({
+        cache: true,
+        cookies: true,
+        localStorage: true,
+        appcache: true
+    });
+    // deleteCacheOnExit
+    fin.desktop.System.deleteCacheOnExit(() => {
+        console.log("successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    // downloadAsset
+    const dirAppAsset = {
+        src: 'http://local:8000/dir.zip',
+        alias: 'dirApp',
+        version: '1.23.24',
+        target: 'dir.bat',
+        args: ''
+    };
+    fin.desktop.System.downloadAsset(dirAppAsset, progress => {
+        const downloadedPercent = Math.floor((progress.downloadedBytes / progress.totalBytes) * 100);
+        console.log(`Downloaded ${downloadedPercent}%`);
+    }, p => {
+        console.log(`Downlod complete, can be found on ${p.path}`);
+        // lets launch our application asset.
+        // launchDirApp();
+    }, (reason, err) => {
+        console.log(reason, err);
+    });
+    // downloadRuntime
+    fin.desktop.System.downloadRuntime({ version: '9.61.31.56' }, progress => {
+        console.log(progress.downloadedBytes, progress.downloadedBytes);
+    }, () => console.log('download complete'), err => console.error(err));
+    // downloadPreloadScript
+    const preloadScripts = [
+        { url: 'http://whatever.com/script.js' }
+    ];
+    fin.desktop.System.downloadPreloadScripts(preloadScripts, info => {
+        const downloadInfo = info[0];
+        console.log(downloadInfo.success, downloadInfo.url, downloadInfo.error);
+    }, err => {
+        console.log(err);
+    });
+    // exit
+    fin.desktop.System.exit(() => {
+        console.log("successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    // flushCookieStore
+    fin.desktop.System.flushCookieStore(() => {
+        console.log('successful');
+    }, err => {
+        console.log('failure', err);
+    });
+    // getAllApplications
+    fin.desktop.System.getAllApplications(applicationInfoList => {
+        applicationInfoList.forEach(applicationInfo => {
+            console.log("Showing information for application with uuid: "
+                + applicationInfo.uuid);
+            console.log("isRunning: ", applicationInfo.isRunning);
+        });
+    });
+    // getAllExternalApplications
+    fin.desktop.System.getAllExternalApplications(externalAppsInfoList => {
+        externalAppsInfoList.forEach(appInfo => {
+            console.log(`External app connected to the runtime with UUID ${appInfo.uuid}`);
+        });
+    });
+    // getAllWindows
+    fin.desktop.System.getAllWindows(windowInfoList => {
+        windowInfoList.forEach(windowInfo => {
+            console.log("Showing information for application with uuid: ", windowInfo.uuid);
+            console.log("Main window: ", windowInfo.mainWindow);
+            console.log("Child windows: ", windowInfo.childWindows);
+        });
+    });
+    // getAppAssetInfo
+    fin.desktop.System.getAppAssetInfo({ alias: 'myAppAsset' }, info => {
+        console.log(info.alias, info.args, info.mandatory, info.src, info.target, info.version);
+    }, err => console.log(err));
+    // getCommandLineArguments
+    fin.desktop.System.getCommandLineArguments(args => {
+        console.log("The command line arguments are " + args);
+    });
+    // getCookieInfo
+    fin.desktop.System.getCookies({ name: 'myCookie1'}, cookies => {
+        const cookie1 = cookies[0];
+        console.log(cookie1.name, cookie1.domain, cookie1.path);
+    }, err => console.log(err));
+    // getDeviceId
+    fin.desktop.System.getDeviceId(id => {
+        console.log("The id of the device is: " + id);
+    });
+    // getDeviceUserId
+    fin.desktop.System.getDeviceUserId(id => console.log(id), err => console.error(err));
+    // getEntityInfo
+    fin.desktop.System.getEntityInfo('uuid', 'name', info => {
+        console.log(info.entityType, info.name, info.uuid, info.parent.name, info.parent.uuid);
+    }, err => console.log(err));
+    // getEnvironmentVariable
+    fin.desktop.System.getEnvironmentVariable("APPDATA", variable => {
+        console.log("this is the APPDATA value", variable);
+    });
+    // getFocusedWindow
+    fin.desktop.System.getFocusedWindow(win => {
+        console.log(win.uuid, win.name);
+    }, err => console.log(err));
+    // getHostSpecs
+    fin.desktop.System.getHostSpecs(info => {
+        console.log(info);
+    }, error => {
+        console.log('There was an error:', error);
+    });
+    // getLog
+    fin.desktop.System.getLog('debug-2015-01-08-22-27-53.log', log => {
+        console.log(log);
+    });
+    // getLogList
+    fin.desktop.System.getLogList(logList => {
+        logList.forEach(logInfo => {
+            console.log(`The filename of the log is ${logInfo.name}, the size is ${logInfo.size}, and the date of creation is ${logInfo.date}`);
+        });
+    });
+    // getMinLogLevel
+    fin.desktop.System.getMinLogLevel(level => console.log(level), err => console.log(err));
+    // getMonitorInfo
+    fin.desktop.System.getMonitorInfo(monitorInfo => {
+        console.log("This object contains information about all monitors: ", monitorInfo);
+    });
+    // getMousePosition
+    fin.desktop.System.getMousePosition(mousePosition => {
+        console.log(`The mouse is located at left: ${mousePosition.left}, top: ${mousePosition.top}`);
+    });
+    // getProcessList
+    fin.desktop.System.getProcessList(list => {
+        list.forEach(process => {
+            console.log(`UUID: ${process.uuid}, Application Name: ${process.name}`);
+        });
+    });
+    // getProxySettings
+    fin.desktop.System.getProxySettings(proxy => {
+        console.log(proxy);
+    });
+    // getRuntimeInfo
+    fin.desktop.System.getRuntimeInfo(runtimeInfoObject => {
+        console.log("Runtime version:", runtimeInfoObject.version);
+        console.log("Runtime architecture:", runtimeInfoObject["architecture"]);
+    }, err => {
+        console.log("Failed to get runtime info, error message:", err);
+    });
+    // getRvmInfo
+    fin.desktop.System.getRvmInfo(rvmInfoObject => {
+        console.log("RVM version:", rvmInfoObject.version);
+        console.log("RVM has been running since:", rvmInfoObject["start-time"]);
+    }, err => {
+        console.log("Failed to get rvm info, error message:", err);
+    });
+    // getVersion
+    fin.desktop.System.getVersion(version => {
+        console.log("The version is " + version);
+    });
+    // launchExternalProcess
+    fin.desktop.System.launchExternalProcess({
+        path: "notepad",
+        arguments: "",
+        listener(result) {
+            console.log('the exit code', result.exitCode);
+        }
+    }, payload => {
+        console.log('Success:', payload.uuid);
+    }, error => {
+        console.log('Error:', error);
+    });
+    // launch external process with an alias
+    fin.desktop.System.launchExternalProcess({
+        // Additionally note that the executable found in the zip file specified in appAssets
+        // will default to the one mentioned by appAssets.target
+        // If the the path below refers to a specific path it will override this default
+        alias: "myApp",
+        listener(result) {
+            console.log('the exit code', result.exitCode);
+        }
+    }, payload => {
+        console.log('Success:', payload.uuid);
+    }, error => {
+        console.log('Error:', error);
+    });
+    //
+    fin.desktop.System.launchExternalProcess({
+        alias: "myApp",
+        arguments: "e f g",
+        listener(result) {
+            console.log('the exit code', result.exitCode);
+        }
+    }, payload => {
+        console.log('Success:', payload.uuid);
+    }, error => {
+        console.log('Error:', error);
+    });
+    //
+    fin.desktop.System.launchExternalProcess({
+        path: "C:\Users\ExampleUser\AppData\Local\OpenFin\OpenFinRVM.exe",
+        arguments: "--version",
+        certificate: {
+            trusted: true,
+            subject: 'O=OpenFin INC., L=New York, S=NY, C=US',
+            thumbprint: '3c a5 28 19 83 05 fe 69 88 e6 8f 4b 3a af c5 c5 1b 07 80 5b'
+        },
+        listener(result) {
+            console.log('the exit code', result.exitCode);
+        }
+    }, payload => {
+        console.log('Success:', payload.uuid);
+    }, error => {
+        console.log('Error:', error);
+    });
+    // log
+    fin.desktop.System.log("info", "An example log message", () => {
+        console.log("message successfully logged");
+    }, err => {
+        console.log(err);
+    });
+    // monitorExternalProcess
+    fin.desktop.System.monitorExternalProcess({
+        pid: 2508,
+        listener(result) {
+            console.log('the exit code', result.exitCode);
+        }
+    }, payload => {
+        console.log("The process is now being monitored: ", payload.uuid);
+    }, error => {
+        console.log("Error:", error);
+    });
+    // openUrlWithBrowser
+    fin.desktop.System.openUrlWithBrowser("https://developer.openf.in/", () => {
+        console.log("successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    // readRegistryValue
+    fin.desktop.System.readRegistryValue('HKEY_SOMETHING', 'HARDWARE\\SOMETHING', 'BootSomething', info => {
+        console.log(info.data, info.rootKey, info.subkey, info.type, info.value);
+    }, err => console.log(err));
+    // registerExternalConnection
+    fin.desktop.System.registerExternalConnection("remote-connection-uuid", (...args: any[]) => {
+        console.log(args);
+    });
+    // releaseExternalProcess
+    fin.desktop.System.launchExternalProcess({
+        path: "notepad",
+        arguments: "",
+        listener(result) {
+            console.log("The exit code", result.exitCode);
+        }
+    }, result => {
+        console.log("Result UUID is " + result.uuid);
+
+        // release it.
+        fin.desktop.System.releaseExternalProcess(result.uuid, () => {
+            console.log("Process has been unmapped!");
+        }, reason => {
+            console.log("failure: " + reason);
+        });
+    });
+    // removeEventListener
+    fin.desktop.System.removeEventListener("monitor-info-changed", (event) => {
+		console.log(event);
+	}, () => {
+        console.log("successful");
+    }, (err: any) => {
+        console.log("failure: " + err);
+    });
+    // setMinLogLevel
+    fin.desktop.System.setMinLogLevel("log level", () => console.log('Success'), (err: any) => console.error(err));
+    // showDeveloperTools
+    fin.desktop.System.showDeveloperTools("uuid", "name", () => {
+        console.log("successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    // terminateExternalProcess
+    fin.desktop.System.launchExternalProcess({
+        // notepad is in the system's PATH
+        path: "notepad",
+        arguments: "",
+        listener(result) {
+            console.log("The exit code", result.exitCode);
+        }
+    }, result => {
+        console.log("Result UUID is " + result.uuid);
+
+        // Attempt to close the process. Terminate after 4 seconds if it
+        // has not done so.
+        fin.desktop.System.terminateExternalProcess(result.uuid, 4000, info => {
+            console.log("Termination result " + info.result);
+        }, reason => {
+            console.log("failure: " + reason);
+        });
+    });
+    // updateProxySettings
+    fin.desktop.System.updateProxySettings("type", "proxyAddress", 8080, () => {
+        console.log('success');
+    }, err => {
+        console.log(err);
+    });
+}
+
+function test_system_clipboard() {
+    // availableFormats
+    fin.desktop.System.Clipboard.availableFormats(null, formats => {
+        formats.forEach(format => console.log(`The format ${format} is available to read`));
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // readHtml
+    fin.desktop.System.Clipboard.readHtml(null, html => {
+        console.log(`This is the html from the clipboard: ${html}`);
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // readRtf
+    fin.desktop.System.Clipboard.readRtf(null, rtf => {
+        console.log(`This is the rtf from the clipboard: ${rtf}`);
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // readText
+    fin.desktop.System.Clipboard.readText(null, text => {
+        console.log(`This is the text from the clipboard: ${text}`);
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // write
+    fin.desktop.System.Clipboard.write({
+        text: 'Hello Text!',
+        html: '<h1>Hello Html</h1>',
+        rtf: 'Hello Rtf'
+    }, null, () => {
+        console.log('Success!!');
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // writeHtml
+    fin.desktop.System.Clipboard.writeHtml('<h1>Hello World</h1>', null, () => {
+        console.log('Success!!');
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // writeRtf
+    fin.desktop.System.Clipboard.writeRtf('Hello World!', null, () => {
+        console.log('Success!!');
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // writeText
+    fin.desktop.System.Clipboard.writeText('Hello World', null, () => {
+        console.log('Success!!');
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+}
+
+function test_window() {
+    let finWindow: fin.OpenFinWindow;
+    // constructor
+    finWindow = new fin.desktop.Window({
+        name: "childWindow",
+        url: "child.html",
+        defaultWidth: 320,
+        defaultHeight: 320,
+        defaultTop: 10,
+        defaultLeft: 300,
+        frame: false,
+        resizable: false,
+        state: "normal"
+    }, () => {
+        const _win = finWindow.getNativeWindow();
+        _win.addEventListener("DOMContentLoaded", () => { finWindow.show(); });
+    }, error => {
+        console.log("Error creating window:", error);
+    });
+    // getCurrent
+    finWindow = fin.desktop.Window.getCurrent();
+    // getNativeWindow
+    let nativeWindow: Window;
+    nativeWindow = finWindow.getNativeWindow();
+    // getParentApplication
+    let parentApp: fin.OpenFinApplication;
+    parentApp = finWindow.getParentApplication();
+    // getParentWindow
+    let parentFinWindow: fin.OpenFinWindow;
+    parentFinWindow = finWindow.getParentWindow();
+    // wrap
+    finWindow = fin.desktop.Window.wrap("uuid", "name");
+    // addEventListener
+    finWindow.addEventListener("bounds-changed", event => {
+        console.log("The window has been moved or resized");
+    }, () => {
+        console.log("The registration was successful");
+    }, reason => {
+        console.log("failure:" + reason);
+    });
+    // animate
+    finWindow.animate({
+        opacity: {
+            opacity: 0.15,
+            duration: 1000
+        },
+        position: {
+            left: 10,
+            top: 10,
+            duration: 3000
+        }
+    }, {
+            interrupt: false
+        }, evt => {
+            // Callback will only fire after both "opacity" and "position" have finished animating.
+        });
+    // authenticate
+    finWindow.addEventListener('auth-requested', evt => {
+        finWindow.authenticate('userName', 'P@assw0rd', () => { }, (reason, err) => {
+            console.log("failure:", err);
+        });
+    });
+    // blur
+    finWindow.blur();
+    // bringToFront
+    finWindow.bringToFront();
+    // close
+    finWindow.close();
+    // disableFrame
+    finWindow.disableFrame();
+    // enableFrame
+    finWindow.enableFrame();
+    // flash
+    finWindow.flash();
+    // focus
+    finWindow.focus();
+    // getBounds
+    finWindow.getBounds(bounds => {
+        console.log(`top: ${bounds.top} left: ${bounds.left} height: ${bounds.height} width: ${bounds.width}`);
+    });
+    // getOptions
+    finWindow.getOptions(options => {
+        console.log(options);
+    });
+    // getSnapshot
+    finWindow.getSnapshot(base64Snapshot => {
+        console.log("data:image/png;base64," + base64Snapshot);
+    });
+    // getState
+    finWindow.getState(state => {
+        console.log("state: " + state);
+    });
+    // getZoomLevel
+    finWindow.getZoomLevel(level => {
+        console.log("zoom level: " + level);
+    }, error => {
+        console.log('error:', error);
+    });
+    // hide
+    finWindow.hide();
+    // isShowing
+    finWindow.isShowing(showing => {
+        console.log("the window is " + (showing ? "showing" : "hidden"));
+    });
+    // joinGroup
+    let secondWindow = new fin.desktop.Window({
+        url: "http://www.openfin.co",
+        name: "secondWindow",
+        autoShow: true
+    }, () => {
+        // When mainWindow moves or is moved, secondWindow moves by the same amount
+        secondWindow.joinGroup(finWindow);
+    });
+    // leaveGroup
+    secondWindow = new fin.desktop.Window({
+        url: "http://www.openfin.co",
+        name: "secondWindow",
+        autoShow: true
+    }, () => {
+        // When finWindow moves or is moved, secondWindow moves by the same amount
+        secondWindow.joinGroup(finWindow, () => {
+            // once we are in the group, lets leave it.
+            secondWindow.leaveGroup();
+        });
+    });
+    // maximize
+    finWindow.maximize();
+    // mergeGroups
+    {
+        const finWindowOne = new fin.desktop.Window({
+            url: "http://www.openfin.co",
+            name: "finWindowOne",
+            autoShow: true
+        });
+        const finWindowTwo = new fin.desktop.Window({
+            url: "http://www.openfin.co",
+            name: "finWindowTwo",
+            autoShow: true
+        });
+        const finWindowThree = new fin.desktop.Window({
+            url: "http://www.openfin.co",
+            name: "finWindowThree",
+            autoShow: true
+        });
+        const finWindowFour = new fin.desktop.Window({
+            url: "http://www.openfin.co",
+            name: "finWindowFour",
+            autoShow: true
+        });
+        // When finWindowOne moves or is moved, finWindowTwo moves by the same amount
+        finWindowOne.joinGroup(finWindowTwo);
+        // When finWindowThree moves or is moved, finWindowFour moves by the same amount
+        finWindowThree.joinGroup(finWindowFour);
+        // finWindowOne, finWindowTwo, finWindowThree, and finWindowFour now move together in the same group
+        finWindowOne.mergeGroups(finWindowThree);
+    }
+    // minimize
+    finWindow.minimize();
+    // moveBy
+    finWindow.moveBy(10, 10);
+    // moveTo
+    finWindow.moveTo(100, 200);
+    // removeEventListener
+    finWindow.removeEventListener("bounds-changed", event => {
+		console.log(event);
+	});
+    // resizeBy
+    finWindow.resizeBy(10, 10, "top-right");
+    // resizeTo
+    finWindow.resizeTo(10, 10, "top-right");
+    // restore
+    finWindow.restore();
+    // setAsForeground
+    finWindow.setAsForeground();
+    // setBounds
+    finWindow.setBounds(100, 200, 400, 400);
+    // setZoomLevel
+    finWindow.setZoomLevel(10);
+    // show
+    finWindow.show();
+    // showAt
+    finWindow.showAt(10, 10, false);
+    // stopFlashing
+    finWindow.stopFlashing();
+    // updateOptions
+    finWindow.updateOptions({
+        frame: false,
+        maxWidth: 500
+    });
+}
+
+function test_frame() {
+    // wrap
+    const frame = fin.desktop.Frame.wrap('uuid', 'name');
+    // getCurrent
+    const currentFrame = fin.desktop.Frame.getCurrent();
+    // addEventlistener
+    frame.addEventListener('event', () => console.log('on event'), () => console.log('success'), err => console.error(err));
+    // removeEventListener
+    frame.removeEventListener('event', () => console.log('on event'), () => console.log('success'), err => console.error(err));
+    // getInfo
+    frame.getInfo(info => {
+        console.log(info.uuid, info.name, info.entityType, info.parent.uuid, info.parent.name);
+    }, err => console.error(err));
+    // getParentWindow
+    frame.getParentWindow(parent => {
+        console.log(parent.uuid, parent.name, parent.entityType, parent.parent.uuid, parent.parent.name);
+    }, err => console.error(err));
+}
diff --git a/types/openfin/v37/tsconfig.json b/types/openfin/v37/tsconfig.json
new file mode 100644
index 0000000000..b054254a07
--- /dev/null
+++ b/types/openfin/v37/tsconfig.json
@@ -0,0 +1,89 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "openfin": [
+                "openfin/v37"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "openfin-tests.ts",
+        "_v2/api/application/application.d.ts",
+        "_v2/api/application/applicationOption.d.ts",
+        "_v2/api/base.d.ts",
+        "_v2/api/clipboard/clipboard.d.ts",
+        "_v2/api/clipboard/write-request.d.ts",
+        "_v2/api/external-application/external-application.d.ts",
+        "_v2/api/fin.d.ts",
+        "_v2/api/frame/frame.d.ts",
+        "_v2/api/global-hotkey/index.d.ts",
+        "_v2/api/interappbus/channel/channel.d.ts",
+        "_v2/api/interappbus/channel/client.d.ts",
+        "_v2/api/interappbus/channel/index.d.ts",
+        "_v2/api/interappbus/channel/provider.d.ts",
+        "_v2/api/interappbus/interappbus.d.ts",
+        "_v2/api/notification/notification.d.ts",
+        "_v2/api/system/application.d.ts",
+        "_v2/api/system/clearCacheOption.d.ts",
+        "_v2/api/system/cookie.d.ts",
+        "_v2/api/system/crashReporterOption.d.ts",
+        "_v2/api/system/download-asset.d.ts",
+        "_v2/api/system/download-preload.d.ts",
+        "_v2/api/system/entity.d.ts",
+        "_v2/api/system/external-process.d.ts",
+        "_v2/api/system/host-specs.d.ts",
+        "_v2/api/system/log.d.ts",
+        "_v2/api/system/monitor.d.ts",
+        "_v2/api/system/point.d.ts",
+        "_v2/api/system/process.d.ts",
+        "_v2/api/system/proxy.d.ts",
+        "_v2/api/system/registry-info.d.ts",
+        "_v2/api/system/runtime-info.d.ts",
+        "_v2/api/system/rvm.d.ts",
+        "_v2/api/system/system.d.ts",
+        "_v2/api/system/window.d.ts",
+        "_v2/api/window/anchor-type.d.ts",
+        "_v2/api/window/bounds-changed.d.ts",
+        "_v2/api/window/bounds.d.ts",
+        "_v2/api/window/transition.d.ts",
+        "_v2/api/window/window.d.ts",
+        "_v2/api/window/windowOption.d.ts",
+        "_v2/environment/environment.d.ts",
+        "_v2/environment/node-env.d.ts",
+        "_v2/environment/openfin-env.d.ts",
+        "_v2/environment/openfin-renderer-api.d.ts",
+        "_v2/identity.d.ts",
+        "_v2/launcher/launcher.d.ts",
+        "_v2/launcher/nix-launch.d.ts",
+        "_v2/launcher/util.d.ts",
+        "_v2/launcher/win-launch.d.ts",
+        "_v2/main.d.ts",
+        "_v2/of-main.d.ts",
+        "_v2/transport/elipc.d.ts",
+        "_v2/transport/port-discovery.d.ts",
+        "_v2/transport/transport-errors.d.ts",
+        "_v2/transport/transport.d.ts",
+        "_v2/transport/websocket.d.ts",
+        "_v2/transport/wire.d.ts",
+        "_v2/util/normalize-config.d.ts",
+        "_v2/util/promises.d.ts",
+        "_v2/util/ref-counter.d.ts"
+    ]
+}
diff --git a/types/openfin/v37/tslint.json b/types/openfin/v37/tslint.json
new file mode 100644
index 0000000000..f95a4974aa
--- /dev/null
+++ b/types/openfin/v37/tslint.json
@@ -0,0 +1,18 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "max-line-length": false,
+        "no-redundant-jsdoc-2": false,
+        "jsdoc-format": false,
+        "no-var-keyword": false,
+        "whitespace": false,
+        "semicolon": false,
+        "strict-export-declare-modifiers": false,
+        "array-type": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "ban-types": false,
+        "callable-types": false,
+        "no-const-enum": false
+    }
+}
diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 729b368d12..819d196df7 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for OpenLayers 4.6
-// Project: http://openlayers.org/
+// Project: https://openlayers.org
 // Definitions by: Olivier Sechet <https://github.com/osechet>
 //                 Bin Wang <https://github.com/wb14123>
 //                 Junyoung Clare Jang <https://github.com/ailrun>
diff --git a/types/openstack-wrapper/index.d.ts b/types/openstack-wrapper/index.d.ts
index 8c92747d21..f0058e06df 100644
--- a/types/openstack-wrapper/index.d.ts
+++ b/types/openstack-wrapper/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for openstack-wrapper 2.1
-// Project: https://www.npmjs.com/package/openstack-wrapper
+// Project: http://github.com/godaddy/node-openstack-wrapper
 // Definitions by: Sanjay Madane <https://github.com/sanjaymadane>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/opentype.js/index.d.ts b/types/opentype.js/index.d.ts
index 5fdc257362..9ec3e22958 100644
--- a/types/opentype.js/index.d.ts
+++ b/types/opentype.js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for opentype.js 0.7
-// Project: https://github.com/nodebox/opentype.js
+// Project: https://github.com/opentypejs/opentype.js
 // Definitions by: Dan Marshall <https://github.com/danmarshall>
 //                 Edgar Simson <https://github.com/edzis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/opossum/index.d.ts b/types/opossum/index.d.ts
index b17a1dd0be..612615ad86 100644
--- a/types/opossum/index.d.ts
+++ b/types/opossum/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for opossum 1.9
+// Type definitions for opossum 1.10
 // Project: https://github.com/nodeshift/opossum
 // Definitions by: Quinn Langille <https://github.com/quinnlangille>
 //                 Willy Zhang <https://github.com/merufm>
@@ -23,6 +23,7 @@ export class CircuitBreaker extends EventEmitter {
     readonly closed: boolean;
     readonly opened: boolean;
     readonly halfOpen: boolean;
+    readonly isShutdown: boolean;
     readonly status: Status;
     readonly stats: Stats;
     readonly hystrixStats: HystrixStats;
@@ -40,6 +41,7 @@ export class CircuitBreaker extends EventEmitter {
         func: (...args: any[]) => Promise<any>,
         interval?: number
     ): void;
+    shutdown(): void;
 }
 
 export enum Event {
diff --git a/types/opossum/opossum-tests.ts b/types/opossum/opossum-tests.ts
index ebbf0bea47..69d64497f0 100644
--- a/types/opossum/opossum-tests.ts
+++ b/types/opossum/opossum-tests.ts
@@ -39,6 +39,7 @@ breaker.closed; // $ExpectType boolean
 breaker.opened; // $ExpectType boolean
 breaker.halfOpen; // $ExpectType boolean
 breaker.warmUp; // $ExpectType boolean
+breaker.isShutdown; // $ExpectType boolean
 breaker.volumeThreshold; // $ExpectType number
 breaker.status.stats.latencyMean; // $ExpectType number
 breaker.stats.latencyTimes; // $ExpectType number[]
@@ -49,6 +50,7 @@ breaker.open(); // $ExpectType void
 breaker.close(); // $ExpectType void
 breaker.disable(); // $ExpectType void
 breaker.enable(); // $ExpectType void
+breaker.shutdown(); // $ExpectType void
 
 // The following are examples are from the libs README and official documentation
 // https://nodeshift.github.io/opossum/index.html.
diff --git a/types/optimize-css-assets-webpack-plugin/index.d.ts b/types/optimize-css-assets-webpack-plugin/index.d.ts
index 79a510a12b..d79c14e809 100644
--- a/types/optimize-css-assets-webpack-plugin/index.d.ts
+++ b/types/optimize-css-assets-webpack-plugin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for optimize-css-assets-webpack-plugin 1.3
-// Project: https://github.com/NMFR/optimize-css-assets-webpack-plugin
+// Project: http://github.com/nmfr/optimize-css-assets-webpack-plugin
 // Definitions by: Armando Meziat <https://github.com/odnamrataizem>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/p-retry/index.d.ts b/types/p-retry/index.d.ts
index c1791fcc63..b2c9100b68 100644
--- a/types/p-retry/index.d.ts
+++ b/types/p-retry/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for p-retry 2.0
+// Type definitions for p-retry 3.0
 // Project: https://github.com/sindresorhus/p-retry#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -19,7 +19,7 @@ declare namespace pRetry {
 
     interface FailedAttemptError extends Error {
         attemptNumber: number;
-        attemptsLeft: number;
+        retriesLeft: number;
     }
 
     interface Options extends OperationOptions {
diff --git a/types/p-retry/p-retry-tests.ts b/types/p-retry/p-retry-tests.ts
index 1b58960e95..19d3fbbfef 100644
--- a/types/p-retry/p-retry-tests.ts
+++ b/types/p-retry/p-retry-tests.ts
@@ -7,14 +7,13 @@ const run = () => fetch('https://sindresorhus.com/unicorn')
         if (response.status === 404) {
             throw new pRetry.AbortError(response.statusText);
         }
-
         return response.text();
     });
 
 pRetry(run, {
     retries: 5,
     onFailedAttempt: error => {
-        console.log(`Attempt ${error.attemptNumber} failed. There are ${error.attemptsLeft} attempts left.`);
+        console.log(`Attempt ${error.attemptNumber} failed. There are ${error.retriesLeft} attempts left.`);
     }
 }).then(result => {
     const str: string = result;
diff --git a/types/p-throttle/index.d.ts b/types/p-throttle/index.d.ts
deleted file mode 100644
index ae331e1ca2..0000000000
--- a/types/p-throttle/index.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-// Type definitions for p-throttle 1.1
-// Project: https://github.com/sindresorhus/p-throttle#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = pThrottle;
-
-declare function pThrottle<R>(fn: () => PromiseLike<R> | R, limit: number, interval: number): (() => Promise<R>) & { abort(): void; };
-declare function pThrottle<R, T1>(fn: (arg1: T1) => PromiseLike<R> | R, limit: number, interval: number): ((arg1: T1) => Promise<R>) & { abort(): void; };
-declare function pThrottle<R, T1, T2>(fn: (arg1: T1, arg2: T2) => PromiseLike<R> | R, limit: number, interval: number): ((arg1: T1, arg2: T2) => Promise<R>) & { abort(): void; };
-declare function pThrottle<R, T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3) => PromiseLike<R> | R,
-                                          limit: number,
-                                          interval: number): ((arg1: T1, arg2: T2, arg3: T3) => Promise<R>) & { abort(): void; };
-declare function pThrottle<R, T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => PromiseLike<R> | R,
-                                              limit: number,
-                                              interval: number): ((arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<R>) & { abort(): void; };
-declare function pThrottle<R, T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => PromiseLike<R> | R,
-                                                  limit: number,
-                                                  interval: number): ((arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<R>) & { abort(): void; };
-declare function pThrottle<R, T1, T2, T3, T4, T5, T6>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => PromiseLike<R> | R,
-                                                      limit: number,
-                                                      interval: number): ((arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<R>) & { abort(): void; };
-declare function pThrottle<R, T1, T2, T3, T4, T5, T6, T7>(
-    fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7) => PromiseLike<R> | R,
-    limit: number,
-    interval: number): ((arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7) => Promise<R>) & { abort(): void; };
-declare function pThrottle<R, T1, T2, T3, T4, T5, T6, T7, T8>(
-    fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7, arg8: T8) => PromiseLike<R> | R,
-    limit: number,
-    interval: number): ((arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7, arg8: T8) => Promise<R>) & { abort(): void; };
-declare function pThrottle<R, T1, T2, T3, T4, T5, T6, T7, T8, T9>(
-    fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7, arg8: T8, arg9: T9) => PromiseLike<R> | R,
-    limit: number,
-    interval: number): ((arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7, arg8: T8, arg9: T9) => Promise<R>) & { abort(): void; };
-declare function pThrottle<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
-    fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7, arg8: T8, arg9: T9, arg10: T10) => PromiseLike<R> | R,
-    limit: number,
-    interval: number): ((arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7, arg8: T8, arg9: T9, arg10: T10) => Promise<R>) & { abort(): void; };
-declare function pThrottle<R>(fn: (...args: any[]) => PromiseLike<R> | R, limit: number, interval: number): ((...args: any[]) => Promise<R>) & { abort(): void; };
-
-declare namespace pThrottle {
-    class AbortError extends Error {
-        readonly name: 'AbortError';
-
-        constructor();
-    }
-}
diff --git a/types/p-throttle/p-throttle-tests.ts b/types/p-throttle/p-throttle-tests.ts
deleted file mode 100644
index 713d445e6b..0000000000
--- a/types/p-throttle/p-throttle-tests.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import pThrottle = require('p-throttle');
-
-const now = Date.now();
-
-const throttled = pThrottle((i: number) => {
-    const secDiff = ((Date.now() - now) / 1000).toFixed();
-    return Promise.resolve(`${i}: ${secDiff}s`);
-}, 2, 1000);
-
-for (let i = 1; i <= 6; i++) {
-    throttled(i).then(res => {
-        const str: string = res;
-    });
-}
-
-throttled.abort();
-
-pThrottle(() => true, 2, 3).abort();
-pThrottle(() => true, 2, 3)();
-pThrottle((n: number, s: string) => true, 2, 3).abort();
-pThrottle((n: number, s: string) => true, 2, 3)(1, 's');
-pThrottle((n: number, s: string, b: boolean) => true, 2, 3).abort();
-pThrottle((n: number, s: string, b: boolean) => true, 2, 3)(1, 's', true);
-pThrottle((n: number, s: string, b: boolean, n2: number) => true, 2, 3).abort();
-pThrottle((n: number, s: string, b: boolean, n2: number) => true, 2, 3)(1, 's', true, 1);
-pThrottle((n: number, s: string, b: boolean, n2: number, s2: string) => true, 2, 3).abort();
-pThrottle((n: number, s: string, b: boolean, n2: number, s2: string) => true, 2, 3)(1, 's', true, 1, 's');
-pThrottle((n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean) => true, 2, 3).abort();
-pThrottle((n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean) => true, 2, 3)(1, 's', true, 1, 's', false);
-pThrottle((n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean, n3: number) => true, 2, 3).abort();
-pThrottle((n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean, n3: number) => true, 2, 3)(1, 's', true, 1, 's', false, 1);
-pThrottle((n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean, n3: number, n4: number) => true, 2, 3).abort();
-pThrottle((n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean, n3: number, n4: number) => true, 2, 3)(1, 's', true, 1, 's', false, 1, 2);
-pThrottle((n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean, n3: number, n4: number, n5: number) => true, 2, 3).abort();
-pThrottle((n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean, n3: number, n4: number, n5: number) => true, 2, 3)(1, 's', true, 1, 's', false, 1, 2, 3);
-pThrottle((n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean, n3: number, n4: number, n5: number, n6: number) => true, 2, 3).abort();
-pThrottle((n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean, n3: number, n4: number, n5: number, n6: number) => true, 2, 3)(1, 's', true, 1, 's', false, 1, 2, 3, 4);
-pThrottle(
-    (n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean, n3: number, n4: number, n5: number, n6: number, s3: string) => true,
-    2,
-    3).abort();
-pThrottle(
-    (n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean, n3: number, n4: number, n5: number, n6: number, s3: string) => true,
-    2,
-    3)(1, 's', true, 1, 's', false, 1, 2, 3, 4, 'as');
-
-throw new pThrottle.AbortError();
diff --git a/types/p-throttle/tsconfig.json b/types/p-throttle/tsconfig.json
deleted file mode 100644
index 81852e4d18..0000000000
--- a/types/p-throttle/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-throttle-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p2/index.d.ts b/types/p2/index.d.ts
index 88dde55025..8bde6c1a3b 100644
--- a/types/p2/index.d.ts
+++ b/types/p2/index.d.ts
@@ -1,24 +1,32 @@
 // Type definitions for p2.js v0.7.1
 // Project: https://github.com/schteppe/p2.js/
-// Definitions by: Clark Stevenson <https://github.com/clark-stevenson>
+// Definitions by: Clark Stevenson <https://github.com/clark-stevenson>, Janne Ramstedt <https://github.com/jramstedt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = p2;
 export as namespace p2;
 
 declare namespace p2 {
+    export interface AABBOptions {
+
+        upperBound?: [number, number];
+        lowerBound?: [number, number];
+
+    }
 
     export class AABB {
 
-        constructor(options?: {
-            upperBound?: number[];
-            lowerBound?: number[];
-        });
+        constructor(options?: AABBOptions);
 
-        setFromPoints(points: number[][], position: number[], angle: number, skinSize: number): void;
+        lowerBound: [number, number];
+        upperBound: [number, number];
+
+        setFromPoints(points: [number, number][], position: [number, number], angle?: number, skinSize?: number): void;
         copy(aabb: AABB): void;
         extend(aabb: AABB): void;
         overlaps(aabb: AABB): boolean;
+        containsPoint(point: [number, number]): boolean;
+        overlapsRay(ray: Ray): number;
 
     }
 
@@ -43,34 +51,15 @@ declare namespace p2 {
 
         setWorld(world: World): void;
         getCollisionPairs(world: World): Body[];
+        boundingRadiusCheck(bodyA: Body, bodyB: Body): boolean;
         boundingVolumeCheck(bodyA: Body, bodyB: Body): boolean;
+        aabbCheck(bodyA: Body, bodyB: Body): boolean;
+        canCollide(bodyA: Body, bodyB: Body): boolean;
+        aabbQuery(world?: World, aabb?: AABB, result?: Body[]): Body[];
 
     }
 
-    export class GridBroadphase extends Broadphase {
-
-        constructor(options?: {
-            xmin?: number;
-            xmax?: number;
-            ymin?: number;
-            ymax?: number;
-            nx?: number;
-            ny?: number;
-        });
-
-        xmin: number;
-        xmax: number;
-        ymin: number;
-        ymax: number;
-        nx: number;
-        ny: number;
-        binsizeX: number;
-        binsizeY: number;
-
-    }
-
-    export class NativeBroadphase extends Broadphase {
-
+    export class NaiveBroadphase extends Broadphase {
     }
 
     export class Narrowphase {
@@ -78,70 +67,104 @@ declare namespace p2 {
         contactEquations: ContactEquation[];
         frictionEquations: FrictionEquation[];
         enableFriction: boolean;
-        enableEquations: boolean;
+        enabledEquations: boolean;
         slipForce: number;
-        frictionCoefficient: number;
-        surfaceVelocity: number;
-        reuseObjects: boolean;
-        resuableContactEquations: any[];
-        reusableFrictionEquations: any[];
-        restitution: number;
-        stiffness: number;
-        relaxation: number;
-        frictionStiffness: number;
-        frictionRelaxation: number;
+        contactEquationPool: ContactEquationPool;
+        frictionEquationPool: FrictionEquationPool;
         enableFrictionReduction: boolean;
-        contactSkinSize: number;
+        collidingBodiesLastStep: TupleDictionary;
+        currentContactMaterial: ContactMaterial;
 
+        bodiesOverlap(bodyA: Body, bodyB: Body, checkCollisionMasks?: boolean): boolean;
         collidedLastStep(bodyA: Body, bodyB: Body): boolean;
         reset(): void;
         createContactEquation(bodyA: Body, bodyB: Body, shapeA: Shape, shapeB: Shape): ContactEquation;
+        createFrictionEquation(bodyA: Body, bodyB: Body, shapeA: Shape, shapeB: Shape): FrictionEquation;
         createFrictionFromContact(c: ContactEquation): FrictionEquation;
 
     }
 
+    export interface RayOptions {
+
+        from: [number, number],
+        to: [number, number],
+        checkCollisionResponse?: boolean;
+        skipBackfaces?: boolean;
+        collisionMask?: number;
+        collisionGroup?: number;
+        mode?: number;
+        callback?: (result: RaycastResult) => void;
+
+    }
+
+    export class Ray {
+
+        static CLOSEST: number;
+        static ANY: number;
+        static ALL: number;
+
+        constructor(options?: RayOptions);
+
+        from: [number, number];
+        to: [number, number];
+        checkCollisionResponse: boolean;
+        skipBackfaces: boolean;
+        collisionMask: number;
+        collisionGroup: number;
+        mode: number;
+        callback: (result: RaycastResult) => void;
+        direction: [number, number];
+        length: number;
+
+        update(): void;
+        intersectBodies(result: RaycastResult, bodies: Body[]): void;
+        getAABB(): AABB;
+
+    }
+
+    export class RaycastResult {
+
+        normal: [number, number];
+        shape: Shape;
+        body: Body;
+        faceIndex: number;
+        fraction: number;
+        isStopped: boolean;
+
+        reset(): void;
+        getHitDistance(ray: Ray): number;
+        hasHit(): boolean;
+        getHitPoint(out: [number, number], ray: Ray): void;
+        stop(): void;
+        shouldStop(ray: Ray): boolean;
+        set(normal: [number, number], shape: Shape, body: Body, friction: number, faceIndex: number): void;
+
+    }
+
     export class SAPBroadphase extends Broadphase {
 
         axisList: Body[];
         axisIndex: number;
 
+        setWorld(world: World): void;
+
     }
 
-    export class Constraint {
+    export interface DistanceConstraintOptions extends ConstraintOptions {
 
-        static DISTANCE: number;
-        static GEAR: number;
-        static LOCK: number;
-        static PRISMATIC: number;
-        static REVOLUTE: number;
-
-        constructor(bodyA: Body, bodyB: Body, type: number, options?: {
-            collideConnected?: boolean;
-        });
-
-        type: number;
-        equeations: Equation[];
-        bodyA: Body;
-        bodyB: Body;
-        collideConnected: boolean;
-
-        update(): void;
-        setStiffness(stiffness: number): void;
-        setRelaxation(relaxation: number): void;
+        distance?: number;
+        localAnchorA?: [number, number];
+        localAnchorB?: [number, number];
+        maxForce?: number;
 
     }
 
     export class DistanceConstraint extends Constraint {
 
-        constructor(bodyA: Body, bodyB: Body, options?: {
-            distance?: number;
-            localAnchorA?: number[];
-            localAnchorB?: number[];
-            maxForce?: number;
-        });
+        constructor(bodyA: Body, bodyB: Body, type: number, options?: DistanceConstraintOptions);
 
-        localAnchorA: number[];
-        localAnchorB: number[];
+        localAnchorA: [number, number];
+        localAnchorB: [number, number];
         distance: number;
         maxForce: number;
         upperLimitEnabled: boolean;
@@ -150,55 +173,70 @@ declare namespace p2 {
         lowerLimit: number;
         position: number;
 
-        setMaxForce(f: number): void;
+        setMaxForce(maxForce: number): void;
         getMaxForce(): number;
+        update(): void;
+
+    }
+
+    export interface GearConstraintOptions extends ConstraintOptions {
+
+        angle?: number;
+        ratio?: number;
+        maxTorque?: number;
 
     }
 
     export class GearConstraint extends Constraint {
 
-        constructor(bodyA: Body, bodyB: Body, options?: {
-            angle?: number;
-            ratio?: number;
-            maxTorque?: number;
-        });
+        constructor(bodyA: Body, bodyB: Body, options?: GearConstraintOptions);
 
         ratio: number;
         angle: number;
 
         setMaxTorque(torque: number): void;
         getMaxTorque(): number;
+        update(): void;
+
+    }
+
+    export interface LockConstraintOptions extends ConstraintOptions {
+
+        localOffsetB?: [number, number];
+        localAngleB?: number;
+        maxForce?: number;
 
     }
 
     export class LockConstraint extends Constraint {
 
-        constructor(bodyA: Body, bodyB: Body, options?: {
-            localOffsetB?: number[];
-            localAngleB?: number;
-            maxForce?: number;
-        });
+        constructor(bodyA: Body, bodyB: Body, type: number, options?: LockConstraintOptions);
 
         setMaxForce(force: number): void;
         getMaxForce(): number;
+        update(): void;
+
+    }
+
+    export interface PrismaticConstraintOptions extends ConstraintOptions {
+
+        maxForce?: number;
+        localAnchorA?: [number, number];
+        localAnchorB?: [number, number];
+        localAxisA?: [number, number];
+        disableRotationalLock?: boolean;
+        upperLimit?: number;
+        lowerLimit?: number;
 
     }
 
     export class PrismaticConstraint extends Constraint {
 
-        constructor(bodyA: Body, bodyB: Body, options?: {
-            maxForce?: number;
-            localAnchorA?: number[];
-            localAnchorB?: number[];
-            localAxisA?: number[];
-            disableRotationalLock?: boolean;
-            upperLimit?: number;
-            lowerLimit?: number;
-        });
+        constructor(bodyA: Body, bodyB: Body, options?: PrismaticConstraintOptions);
 
-        localAnchorA: number[];
-        localAnchorB: number[];
-        localAxisA: number[];
+        localAnchorA: [number, number];
+        localAnchorB: [number, number];
+        localAxisA: [number, number];
         position: number;
         velocity: number;
         lowerLimitEnabled: boolean;
@@ -214,49 +252,89 @@ declare namespace p2 {
         enableMotor(): void;
         disableMotor(): void;
         setLimits(lower: number, upper: number): void;
+        update(): void;
+
+    }
+
+    export interface RevoluteConstraintOptions extends ConstraintOptions {
+
+        worldPivot?: [number, number];
+        localPivotA?: [number, number];
+        localPivotB?: [number, number];
+        maxForce?: number;
 
     }
 
     export class RevoluteConstraint extends Constraint {
 
-        constructor(bodyA: Body, bodyB: Body, options?: {
-            worldPivot?: number[];
-            localPivotA?: number[];
-            localPivotB?: number[];
-            maxForce?: number;
-        });
+        constructor(bodyA: Body, bodyB: Body, type: number, options?: RevoluteConstraintOptions);
 
-        pivotA: number[];
-        pivotB: number[];
-        motorEquation: RotationalVelocityEquation;
-        motorEnabled: boolean;
         angle: number;
         lowerLimitEnabled: boolean;
         upperLimitEnabled: boolean;
         lowerLimit: number;
         upperLimit: number;
-        upperLimitEquation: ContactEquation;
-        lowerLimitEquation: ContactEquation;
+
+        setLimits(lower: number, upper: number): void;
+        update(): void;
+
+        motorEnabled: boolean;
+        motorSpeed: number;
+        motorMaxForce: number;
 
         enableMotor(): void;
         disableMotor(): void;
         motorIsEnabled(): boolean;
-        setLimits(lower: number, upper: number): void;
         setMotorSpeed(speed: number): void;
         getMotorSpeed(): number;
 
     }
 
+    export interface ConstraintOptions {
+
+        collideConnected?: boolean;
+        wakeUpBodies?: boolean;
+
+    }
+
+    export class Constraint {
+
+        static DISTANCE: number;
+        static GEAR: number;
+        static LOCK: number;
+        static PRISMATIC: number;
+        static REVOLUTE: number;
+
+        constructor(bodyA: Body, bodyB: Body, type: number, options?: ConstraintOptions);
+
+        type: number;
+        equeations: Equation[];
+        bodyA: Body;
+        bodyB: Body;
+        collideConnected: boolean;
+
+        update(): void;
+        setStiffness(stiffness: number): void;
+        setRelaxation(relaxation: number): void;
+
+    }
+
+    export interface AngleLockEquationOptions {
+
+        angle?: number;
+        ratio?: number;
+
+    }
+
     export class AngleLockEquation extends Equation {
 
-        constructor(bodyA: Body, bodyB: Body, options?: {
-            angle?: number;
-            ratio?: number;
-        });
+        constructor(bodyA: Body, bodyB: Body, options?: AngleLockEquationOptions);
+
+        angle: number;
+        ratio: number;
 
-        computeGq(): number;
         setRatio(ratio: number): number;
-        setMaxTorque(torque: number): number;
+        setMaxTorque(torque: number): void;
 
     }
 
@@ -264,16 +342,17 @@ declare namespace p2 {
 
         constructor(bodyA: Body, bodyB: Body);
 
-        contactPointA: number[];
-        penetrationVec: number[];
-        contactPointB: number[];
-        normalA: number[];
+        contactPointA: [number, number];
+        penetrationVec: [number, number];
+        contactPointB: [number, number];
+        normalA: [number, number];
         restitution: number;
         firstImpact: boolean;
         shapeA: Shape;
         shapeB: Shape;
 
         computeB(a: number, b: number, h: number): number;
+        getVelocityAlongNormal(): number;
 
     }
 
@@ -290,10 +369,7 @@ declare namespace p2 {
         bodyB: Body;
         stiffness: number;
         relaxation: number;
-        G: number[];
-        offset: number;
-        a: number;
-        b: number;
+        G: [number, number];
         epsilon: number;
         timeStep: number;
         needsUpdate: boolean;
@@ -301,7 +377,7 @@ declare namespace p2 {
         relativeVelocity: number;
         enabled: boolean;
 
-        gmult(G: number[], vi: number[], wi: number[], vj: number[], wj: number[]): number;
+        gmult(G: [number, number], vi: [number, number], wi: [number, number], vj: [number, number], wj: [number, number]): number;
         computeB(a: number, b: number, h: number): number;
         computeGq(): number;
         computeGW(): number;
@@ -310,6 +386,7 @@ declare namespace p2 {
         computeGiMGt(): number;
         addToWlambda(deltalambda: number): number;
         computeInvC(eps: number): number;
+        update(): void;
 
     }
 
@@ -317,29 +394,31 @@ declare namespace p2 {
 
         constructor(bodyA: Body, bodyB: Body, slipForce: number);
 
-        contactPointA: number[];
-        contactPointB: number[];
-        t: number[];
+        contactPointA: [number, number];
+        contactPointB: [number, number];
+        t: [number, number];
+        contactEquations: ContactEquation[];
         shapeA: Shape;
         shapeB: Shape;
         frictionCoefficient: number;
 
-        setSlipForce(slipForce: number): number;
+        setSlipForce(slipForce: number): void;
         getSlipForce(): number;
-        computeB(a: number, b: number, h: number): number;
+
+    }
+
+    export interface RotationalLockEquationOptions {
+
+        angle?: number;
 
     }
 
     export class RotationalLockEquation extends Equation {
 
-        constructor(bodyA: Body, bodyB: Body, options?: {
-            angle?: number;
-        });
+        constructor(bodyA: Body, bodyB: Body, options?: RotationalLockEquationOptions);
 
         angle: number;
 
-        computeGq(): number;
-
     }
 
     export class RotationalVelocityEquation extends Equation {
@@ -352,14 +431,14 @@ declare namespace p2 {
 
     export class EventEmitter {
 
-        on(type: string, listener: Function, context: any): EventEmitter;
+        on(type: string, listener: Function, context?: any): EventEmitter;
         has(type: string, listener: Function): boolean;
         off(type: string, listener: Function): EventEmitter;
         emit(event: any): EventEmitter;
 
     }
 
-    export class ContactMaterialOptions {
+    export interface ContactMaterialOptions {
 
         friction?: number;
         restitution?: number;
@@ -384,7 +463,7 @@ declare namespace p2 {
         restitution: number;
         stiffness: number;
         relaxation: number;
-        frictionStiffness: number;
+        frictionStuffness: number;
         frictionRelaxation: number;
         surfaceVelocity: number;
         contactSkinSize: number;
@@ -395,7 +474,7 @@ declare namespace p2 {
 
         static idCounter: number;
 
-        constructor(id: number);
+        constructor(id?: number);
 
         id: number;
 
@@ -403,52 +482,67 @@ declare namespace p2 {
 
     export class vec2 {
 
-        static crossLength(a: number[], b: number[]): number;
-        static crossVZ(out: number[], vec: number[], zcomp: number): number;
-        static crossZV(out: number[], zcomp: number, vec: number[]): number;
-        static rotate(out: number[], a: number[], angle: number): void;
-        static rotate90cw(out: number[], a: number[]): number;
-        static centroid(out: number[], a: number[], b: number[], c: number[]): number[];
-        static create(): number[];
-        static clone(a: number[]): number[];
-        static fromValues(x: number, y: number): number[];
-        static copy(out: number[], a: number[]): number[];
-        static set(out: number[], x: number, y: number): number[];
-        static toLocalFrame(out: number[], worldPoint: number[], framePosition: number[], frameAngle: number): void;
-        static toGlobalFrame(out: number[], localPoint: number[], framePosition: number[], frameAngle: number): void;
-        static add(out: number[], a: number[], b: number[]): number[];
-        static subtract(out: number[], a: number[], b: number[]): number[];
-        static sub(out: number[], a: number[], b: number[]): number[];
-        static multiply(out: number[], a: number[], b: number[]): number[];
-        static mul(out: number[], a: number[], b: number[]): number[];
-        static divide(out: number[], a: number[], b: number[]): number[];
-        static div(out: number[], a: number[], b: number[]): number[];
-        static scale(out: number[], a: number[], b: number): number[];
-        static distance(a: number[], b: number[]): number;
-        static dist(a: number[], b: number[]): number;
-        static squaredDistance(a: number[], b: number[]): number;
-        static sqrDist(a: number[], b: number[]): number;
-        static length(a: number[]): number;
-        static len(a: number[]): number;
-        static squaredLength(a: number[]): number;
-        static sqrLen(a: number[]): number;
-        static negate(out: number[], a: number[]): number[];
-        static normalize(out: number[], a: number[]): number[];
-        static dot(a: number[], b: number[]): number;
-        static str(a: number[]): string;
+        static crossLength(a: [number, number], b: [number, number]): number;
+        static crossVZ(out: [number, number], vec: [number, number], zcomp: number): [number, number];
+        static crossZV(out: [number, number], zcomp: number, vec: [number, number]): [number, number];
+        static rotate(out: [number, number], a: [number, number], angle: number): void;
+        static rotate90cw(out: [number, number], a: [number, number]): void;
+        static toLocalFrame(out: [number, number], worldPoint: [number, number], framePosition: [number, number], frameAngle: number): void;
+        static toGlobalFrame(out: [number, number], localPoint: [number, number], framePosition: [number, number], frameAngle: number): void;
+        static vectorToLocalFrame(out: [number, number], worldVector: [number, number], frameAngle: number): void;
+        static centroid(out: [number, number], a: [number, number], b: [number, number], c: [number, number]): [number, number];
+        static create(): [number, number];
+        static clone(a: [number, number]): [number, number];
+        static fromValues(x: number, y: number): [number, number];
+        static copy(out: [number, number], a: [number, number]): [number, number];
+        static set(out: [number, number], x: number, y: number): [number, number];
+        static add(out: [number, number], a: [number, number], b: [number, number]): [number, number];
+        static subtract(out: [number, number], a: [number, number], b: [number, number]): [number, number];
+        static sub(out: [number, number], a: [number, number], b: [number, number]): [number, number];
+        static multiply(out: [number, number], a: [number, number], b: [number, number]): [number, number];
+        static mul(out: [number, number], a: [number, number], b: [number, number]): [number, number];
+        static divide(out: [number, number], a: [number, number], b: [number, number]): [number, number];
+        static div(out: [number, number], a: [number, number], b: [number, number]): [number, number];
+        static scale(out: [number, number], a: [number, number], b: number): [number, number];
+        static distance(a: [number, number], b: [number, number]): number;
+        static dist(a: [number, number], b: [number, number]): number;
+        static squaredDistance(a: [number, number], b: [number, number]): number;
+        static sqrDist(a: [number, number], b: [number, number]): number;
+        static length(a: [number, number]): number;
+        static len(a: [number, number]): number;
+        static squaredLength(a: [number, number]): number;
+        static sqrLen(a: [number, number]): number;
+        static negate(out: [number, number], a: [number, number]): [number, number];
+        static normalize(out: [number, number], a: [number, number]): [number, number];
+        static dot(a: [number, number], b: [number, number]): number;
+        static str(a: [number, number]): string;
+        static lerp(out: [number, number], a: [number, number], b: [number, number], t: number): [number, number];
+        static reflect(out: [number, number], vector: [number, number], normal: [number, number]): void;
+        static getLineSegmentsIntersection(out: [number, number], p1: [number, number], p2: [number, number], p3: [number, number], p4: [number, number]): boolean;
+        static getLineSegmentsIntersectionFraction(p1: [number, number], p2: [number, number], p3: [number, number], p4: [number, number]): number;
 
     }
 
     export interface BodyOptions {
 
-        mass?: number;
-        position?: number[];
-        velocity?: number[];
+        force?: [number, number];
+        position?: [number, number];
+        velocity?: [number, number];
+        allowSleep?: boolean;
+        collisionResponse?: boolean;
         angle?: number;
-        angularVelocity?: number;
-        force?: number[];
         angularForce?: number;
+        angularVelocity?: number;
+        ccdIterations?: number;
+        ccdSpeedThreshold?: number;
         fixedRotation?: boolean;
+        gravityScale?: number;
+        id?: number;
+        mass?: number;
+        sleepSpeedLimit?: number;
+        sleepTimeLimit?: number;
+        fixedX?: boolean;
+        fixedY?: boolean;
 
     }
 
@@ -484,18 +578,20 @@ declare namespace p2 {
         invInertia: number;
         invMassSolve: number;
         invInertiaSolve: number;
-        fixedRotation: number;
-        position: number[];
-        interpolatedPosition: number[];
-        interpolatedAngle: number;
-        previousPosition: number[];
-        previousAngle: number;
-        velocity: number[];
-        vlambda: number[];
-        wlambda: number[];
+        fixedRotation: boolean;
+        fixedX: boolean;
+        fixedY: boolean;
+        position: [number, number];
+        interpolatedPosition: [number, number];
+        previousPosition: [number, number];
+        velocity: [number, number];
+        vlambda: [number, number];
+        wlambda: [number, number];
         angle: number;
+        previousAngle: number;
+        interpolatedAngle: number;
         angularVelocity: number;
-        force: number[];
+        force: [number, number];
         angularForce: number;
         damping: number;
         angularDamping: number;
@@ -504,12 +600,14 @@ declare namespace p2 {
         aabb: AABB;
         aabbNeedsUpdate: boolean;
         allowSleep: boolean;
-        wantsToSleep: boolean;
         sleepState: number;
         sleepSpeedLimit: number;
         sleepTimeLimit: number;
         gravityScale: number;
         collisionResponse: boolean;
+        idleTime: number;
+        ccdSpeedThreshold: number;
+        ccdIterations: number;
 
         updateSolveMassProperties(): void;
         setDensity(density: number): void;
@@ -517,45 +615,84 @@ declare namespace p2 {
         getAABB(): AABB;
         updateAABB(): void;
         updateBoundingRadius(): void;
-        addShape(shape: Shape, offset?: number[], angle?: number): void;
+        addShape(shape: Shape, offset?: [number, number], angle?: number): void;
         removeShape(shape: Shape): boolean;
         updateMassProperties(): void;
-        applyForce(force: number[], relativePoint?: number[]): void;
-        applyForceLocal(localforce: number[], localPoint?: number[]): void;
-        applyImpulse(impulse: number[], relativePoint?: number[]): void;
-        applyImpulseLocal(impulse: number[], localPoint?: number[]): void;
-        toLocalFrame(out: number[], worldPoint: number[]): void;
-        toWorldFrame(out: number[], localPoint: number[]): void;
-        fromPolygon(path: number[][], options?: {
+        applyForce(force: [number, number], relativePoint?: [number, number]): void;
+        applyForceLocal(localForce: [number, number], localPoint?: [number, number]): void;
+        applyImpulse(impulseVector: [number, number], relativePoint?: [number, number]): void;
+        applyImpulseLocal(localImpulse: [number, number], localPoint?: [number, number]): void;
+        toLocalFrame(out: [number, number], worldPoint: [number, number]): void;
+        toWorldFrame(out: [number, number], localPoint: [number, number]): void;
+        vectorToLocalFrame(out: [number, number], worldVector: [number, number]): void;
+        vectorToWorldFrame(out: [number, number], localVector: [number, number]): void;
+        fromPolygon(path: [number, number][], options?: {
             optimalDecomp?: boolean;
             skipSimpleCheck?: boolean;
-            removeCollinearPoints?: any; //boolean | number
+            removeCollinearPoints?: boolean | number;
         }): boolean;
         adjustCenterOfMass(): void;
         setZeroForce(): void;
-        resetConstraintVelocity(): void;
-        applyDamping(dy: number): void;
+        applyDamping(dt: number): void;
         wakeUp(): void;
         sleep(): void;
         sleepTick(time: number, dontSleep: boolean, dt: number): void;
-        getVelocityFromPosition(story: number[], dt: number): number[];
-        getAngularVelocityFromPosition(timeStep: number): number;
         overlaps(body: Body): boolean;
+        integrate(dy: number): void;
+        getVelocityAtPoint(result: [number, number], relativePoint: [number, number]): [number, number];
+
+    }
+
+    export interface LinearSpringOptions extends SpringOptions {
+
+        restLength?: number;
+
+    }
+
+    export class LinearSpring extends Spring {
+
+        constructor(bodyA: Body, bodyB: Body, options?: LinearSpringOptions);
+
+        localAnchorA: [number, number];
+        localAnchorB: [number, number];
+        restLength: number;
+
+        setWorldAnchorA(worldAnchorA: [number, number]): void;
+        setWorldAnchorB(worldAnchorB: [number, number]): void;
+        getWorldAnchorA(result: [number, number]): [number, number];
+        getWorldAnchorB(result: [number, number]): [number, number];
+        applyForce(): void;
+
+    }
+
+    export interface RotationalSpringOptions extends SpringOptions {
+
+        restAngle?: number
+
+    }
+
+    export class RotationalSpring extends Spring {
+
+        constructor(bodyA: Body, bodyB: Body, options?: RotationalSpringOptions);
+
+        restAngle: number;
+
+    }
+
+    export interface SpringOptions {
+
+        stiffness?: number;
+        damping?: number;
+        localAnchorA?: [number, number];
+        localAnchorB?: [number, number];
+        worldAnchorA?: [number, number];
+        worldAnchorB?: [number, number];
 
     }
 
     export class Spring {
 
-        constructor(bodyA: Body, bodyB: Body, options?: {
-
-            stiffness?: number;
-            damping?: number;
-            localAnchorA?: number[];
-            localAnchorB?: number[];
-            worldAnchorA?: number[];
-            worldAnchorB?: number[];
-
-        });
+        constructor(bodyA: Body, bodyB: Body, options?: SpringOptions);
 
         stiffness: number;
         damping: number;
@@ -566,36 +703,78 @@ declare namespace p2 {
 
     }
 
-    export class LinearSpring extends Spring {
+    export interface WheelConstraintOptions {
 
-        localAnchorA: number[];
-        localAnchorB: number[];
-        restLength: number;
-
-        setWorldAnchorA(worldAnchorA: number[]): void;
-        setWorldAnchorB(worldAnchorB: number[]): void;
-        getWorldAnchorA(result: number[]): number[];
-        getWorldAnchorB(result: number[]): number[];
-        applyForce(): void;
+        localForwardVector?: [number, number];
+        localPosition?: [number, number];
+        sideFriction?: number;
 
     }
 
-    export class RotationalSpring extends Spring {
+    export class WheelConstraint extends Constraint {
 
-        constructor(bodyA: Body, bodyB: Body, options?: {
-            restAngle?: number;
-            stiffness?: number;
-            damping?: number;
-        });
+        constructor(vehicle: TopDownVehicle, options?: WheelConstraintOptions);
 
-        restAngle: number;
+        protected vehicle: TopDownVehicle;
+        protected forwardEquation: FrictionEquation;
+        protected sideEquation: FrictionEquation;
+
+        steerValue: number;
+        engineForce: number;
+        localForwardVector: [number, number];
+        localPosition: [number, number];
+
+        setBrakeForce(force: number): void;
+        setSideFriction(force: number): void;
+
+        getSpeed(): number;
+
+        update(): void;
+
+    }
+
+    export interface TopDownVehicleOptions {
+    }
+
+    export class TopDownVehicle {
+
+        constructor(chasisBody: Body, options?: TopDownVehicleOptions);
+
+        chasisBody: Body;
+        wheels: WheelConstraint[];
+        world: World;
+
+        addToWorld(world: World): void;
+        removeFromWorld(): void;
+        addWheel(wheelOptions?: WheelConstraintOptions): WheelConstraint;
+
+        update(): void;
+
+    }
+
+    export interface BoxOptions {
+
+        width?: number;
+        height?: number;
+
+    }
+
+    export class Box extends Shape {
+
+        constructor(options?: BoxOptions);
+
+        width: number;
+        height: number;
+
+        computeMomentOfInertia(mass: number): number;
+        updateArea(): void;
 
     }
 
     export interface CapsuleOptions extends SharedShapeOptions {
 
-      length?: number;
-      radius?: number;
+        length?: number;
+        radius?: number;
 
     }
 
@@ -606,11 +785,14 @@ declare namespace p2 {
         length: number;
         radius: number;
 
+        computeMomentOfInertia(mass: number): number;
+        updateArea(): void;
+
     }
 
     export interface CircleOptions extends SharedShapeOptions {
 
-      radius?: number;
+        radius?: number;
 
     }
 
@@ -619,13 +801,17 @@ declare namespace p2 {
         constructor(options?: CircleOptions);
 
         radius: number;
+        computeMomentOfInertia(mass: number): number;
+        updateArea(): void;
+        computeAABB(out: AABB, position: [number, number]): void;
+        raycast(result: RaycastResult, ray: Ray, position: [number, number]): void;
 
     }
 
     export interface ConvexOptions extends SharedShapeOptions {
 
-        vertices?: ArrayLike<number>[];
-        axes?: ArrayLike<number>[];
+        vertices?: [number, number]|ArrayLike<number>[];
+        axes?: [number, number]|ArrayLike<number>[];
 
     }
 
@@ -635,16 +821,21 @@ declare namespace p2 {
 
         constructor(options?: ConvexOptions);
 
-        vertices: number[][];
-        axes: number[][];
-        centerOfMass: number[];
-        triangles: number[];
+        vertices: [number, number][];
+        axes: [number, number][];
+        centerOfMass: [number, number];
+        triangles: [[number, number], [number, number], [number, number]];
         boundingRadius: number;
 
         projectOntoLocalAxis(localAxis: number[], result: number[]): void;
         projectOntoWorldAxis(localAxis: number[], shapeOffset: number[], shapeAngle: number, result: number[]): void;
 
         updateCenterOfMass(): void;
+        updateNormals(): void;
+        updateTriangles(): void;
+        computeMomentOfInertia(mass: number): number;
+        updateArea(): void;
+        computeAABB(out: AABB, position: [number, number], angle: number): void;
 
     }
 
@@ -661,21 +852,60 @@ declare namespace p2 {
 
         constructor(options?: HeightfieldOptions);
 
-        data: number[];
+        heights: number[];
         maxValue: number;
         minValue: number;
         elementWidth: number;
 
+        updateMaxMinValues(): void;
+        computeMomentOfInertia(): number;
+        updateArea(): void;
+        computeAABB(out: AABB, position: [number, number], angle: number): void;
+
+    }
+
+    export interface LineOptions extends SharedShapeOptions {
+
+        length?: number;
+
+    }
+
+    export class Line extends Shape {
+
+        constructor(options?: LineOptions);
+
+        length: number;
+
+        computeMomentOfInertia(mass: number): number;
+        computeAABB(out: AABB, position: [number, number], angle: number): void;
+
+    }
+
+    export class Particle extends Shape {
+
+        constructor(options?: SharedShapeOptions);
+
+        computeMomentOfInertia(): number;
+        computeAABB(out: AABB, position: [number, number]): void;
+
+    }
+
+    export class Plane extends Shape {
+
+        constructor(options?: SharedShapeOptions);
+
+        updateArea(): void;
+
     }
 
     export interface SharedShapeOptions {
 
-        position?: number[];
+        position?: [number, number];
         angle?: number;
         collisionGroup?: number;
-        collisionResponse?: boolean;
         collisionMask?: number;
         sensor?: boolean;
+        collisionResponse?: boolean;
 
     }
 
@@ -699,10 +929,11 @@ declare namespace p2 {
 
         constructor(options?: ShapeOptions);
 
+        body: Body;
+        position: [number, number];
+        angle: number;
         type: number;
         id: number;
-        position: number[];
-        angle: number;
         boundingRadius: number;
         collisionGroup: number;
         collisionResponse: boolean;
@@ -711,52 +942,30 @@ declare namespace p2 {
         area: number;
         sensor: boolean;
 
-        computeMomentOfInertia(mass: number): number;
+        computeMomentOfInertia(mass?: number): number;
         updateBoundingRadius(): number;
         updateArea(): void;
-        computeAABB(out: AABB, position: number[], angle: number): void;
+        computeAABB(out?: AABB, position?: [number, number], angle?: number): void;
+        raycast(result?: RaycastResult, ray?: Ray, position?: [number, number], angle?: number): void;
+    }
+
+    export interface GSSolverOptions {
+
+        iterations?: number;
+        tolerance?: number;
 
     }
 
-    export interface LineOptions extends SharedShapeOptions {
+    export class GSSolver extends Solver {
 
-      length?: number;
+        constructor(options?: GSSolverOptions);
 
-    }
+        iterations: number;
+        tolerance: number;
+        frictionIterations: number;
+        usedIterations: number;
 
-    export class Line extends Shape {
-
-        constructor(options?: LineOptions);
-
-        length: number;
-
-    }
-
-    export class Particle extends Shape {
-
-        constructor(options?: SharedShapeOptions);
-
-    }
-
-    export class Plane extends Shape {
-
-        constructor(options?: SharedShapeOptions);
-
-    }
-
-    export interface BoxOptions {
-
-      width?: number;
-      height?: number;
-
-    }
-
-    export class Box extends Shape {
-
-        constructor(options?: BoxOptions);
-
-        width: number;
-        height: number;
+        solve(h: number, world: World): void;
 
     }
 
@@ -769,10 +978,10 @@ declare namespace p2 {
 
         type: number;
         equations: Equation[];
-        equationSortFunction: Equation; //Equation | boolean
+        equationSortFunction: Equation | boolean
 
-        solve(dy: number, world: World): void;
-        solveIsland(dy: number, island: Island): void;
+        solve(dt: number, world: World): void;
+        solveIsland(dt: number, island: Island): void;
         sortEquations(): void;
         addEquation(eq: Equation): void;
         addEquations(eqs: Equation[]): void;
@@ -781,26 +990,43 @@ declare namespace p2 {
 
     }
 
-    export class GSSolver extends Solver {
+    export class ContactEquationPool extends Pool {
 
-        constructor(options?: {
-            iterations?: number;
-            tolerance?: number;
-        });
+        create(): ContactEquation;
+        destroy(equation: ContactEquation): ContactEquationPool;
 
-        iterations: number;
-        tolerance: number;
-        useZeroRHS: boolean;
-        frictionIterations: number;
-        usedIterations: number;
+    }
 
-        solve(h: number, world: World): void;
+    export class FrictionEquationPool extends Pool {
+
+        create(): FrictionEquation;
+        destroy(equation: FrictionEquation): FrictionEquationPool;
+
+    }
+
+    export class IslandNodePool extends Pool {
+
+        create(): IslandNode;
+        destroy(node: IslandNode): IslandNodePool;
+
+    }
+
+    export class IslandPool extends Pool {
+
+        create(): Island;
+        destroy(island: Island): IslandPool;
 
     }
 
     export class OverlapKeeper {
 
-        constructor(bodyA: Body, shapeA: Shape, bodyB: Body, shapeB: Shape);
+        constructor();
+
+        overlappingShapesLastState: TupleDictionary;
+        overlappingShapesCurrentState: TupleDictionary;
+        OverlapKeeperRecordPool: OverlapKeeperRecordPool;
+        tmpDict: TupleDictionary;
+        tmpArray1: any[];
 
         shapeA: Shape;
         shapeB: Shape;
@@ -810,17 +1036,51 @@ declare namespace p2 {
         tick(): void;
         setOverlapping(bodyA: Body, shapeA: Shape, bodyB: Body, shapeB: Body): void;
         bodiesAreOverlapping(bodyA: Body, bodyB: Body): boolean;
+    }
+
+    export class OverlapKeeperRecord {
+
+        shapeA: Shape;
+        shapeB: Shape;
+        bodyA: Body;
+        bodyB: Body;
+
+        constructor(bodyA: Body, shapeA: Shape, bodyB: Body, shapeB: Shape);
+
         set(bodyA: Body, shapeA: Shape, bodyB: Body, shapeB: Shape): void;
 
     }
 
+    export class OverlapKeeperRecordPool extends Pool {
+
+        create(): OverlapKeeperRecord;
+        destroy(record: OverlapKeeperRecord): OverlapKeeperRecordPool;
+
+    }
+
+    export interface PoolOptions {
+        size?: number;
+    }
+
+    export class Pool {
+
+        objects: any[];
+
+        constructor(options?: PoolOptions);
+
+        resize(size: number): Pool;
+        get(): any;
+        release(object: any): Pool;
+
+    }
+
     export class TupleDictionary {
 
-        data: number[];
+        data: any;
         keys: number[];
 
         getKey(id1: number, id2: number): string;
-        getByKey(key: number): number;
+        getByKey(key: number): any;
         get(i: number, j: number): number;
         set(i: number, j: number, value: number): number;
         reset(): void;
@@ -832,8 +1092,10 @@ declare namespace p2 {
 
         static appendArray<T>(a: Array<T>, b: Array<T>): Array<T>;
         static splice<T>(array: Array<T>, index: number, howMany: number): void;
+        static arrayRemove<T>(array: Array<T>, element: number): void;
         static extend(a: any, b: any): void;
         static defaults(options: any, defaults: any): any;
+        static shallowClone<T>(obj: T): T;
 
     }
 
@@ -843,15 +1105,20 @@ declare namespace p2 {
         bodies: Body[];
 
         reset(): void;
-        getBodies(result: any): Body[];
+        getBodies(result: any[]): Body[];
         wantsToSleep(): boolean;
         sleep(): boolean;
 
     }
 
+    export interface IslandManagerOptions {
+    }
+
     export class IslandManager extends Solver {
 
-        static getUnvisitedNode(nodes: IslandNode[]): IslandNode; // IslandNode | boolean
+        static getUnvisitedNode(nodes: IslandNode[]): IslandNode | Boolean;
+
+        constructor(options?: IslandManagerOptions);
 
         equations: Equation[];
         islands: Island[];
@@ -876,6 +1143,13 @@ declare namespace p2 {
 
     }
 
+    export interface WorldOptions {
+        solver?: Solver;
+        gravity?: [number, number];
+        broadphase?: Broadphase;
+        islandSplit?: boolean;
+    }
+
     export class World extends EventEmitter {
 
         postStepEvent: {
@@ -884,14 +1158,17 @@ declare namespace p2 {
 
         addBodyEvent: {
             type: string;
+            body: Body;
         };
 
         removeBodyEvent: {
             type: string;
+            body: Body;
         };
 
         addSpringEvent: {
             type: string;
+            spring: Spring;
         };
 
         impactEvent: {
@@ -935,22 +1212,16 @@ declare namespace p2 {
         static BODY_SLEEPING: number;
         static ISLAND_SLEEPING: number;
 
-        static integrateBody(body: Body, dy: number): void;
+        //static integrateBody(body: Body, dy: number): void;
 
-        constructor(options?: {
-            solver?: Solver;
-            gravity?: number[];
-            broadphase?: Broadphase;
-            islandSplit?: boolean;
-            doProfiling?: boolean;
-        });
+        constructor(options?: WorldOptions);
 
         springs: Spring[];
         bodies: Body[];
         solver: Solver;
         narrowphase: Narrowphase;
         islandManager: IslandManager;
-        gravity: number[];
+        gravity: [number, number];
         frictionGravity: number;
         useWorldGravityAsFrictionGravity: boolean;
         useFrictionGravityOnZeroGravity: boolean;
@@ -967,6 +1238,7 @@ declare namespace p2 {
         solveConstraints: boolean;
         contactMaterials: ContactMaterial[];
         time: number;
+        accumulator: number;
         stepping: boolean;
         islandSplit: boolean;
         emitImpactEvent: boolean;
@@ -974,13 +1246,12 @@ declare namespace p2 {
 
         addConstraint(c: Constraint): void;
         addContactMaterial(contactMaterial: ContactMaterial): void;
-        removeContactMaterial(cm: ContactMaterial): void;
         getContactMaterial(materialA: Material, materialB: Material): ContactMaterial; // ContactMaterial | boolean
-        removeConstraint(c: Constraint): void;
-        step(dy: number, timeSinceLastCalled?: number, maxSubSteps?: number): void;
-        runNarrowphase(np: Narrowphase, bi: Body, si: Shape, xi: any[], ai: number, bj: Body, sj: Shape, xj: any[], aj: number, cm: number, glen: number): void;
-        addSpring(s: Spring): void;
-        removeSpring(s: Spring): void;
+        removeConstraint(constraint: Constraint): void;
+        removeContactMaterial(cm: ContactMaterial): void;
+        step(dt: number, timeSinceLastCalled?: number, maxSubSteps?: number): void;
+        addSpring(spring: Spring): void;
+        removeSpring(spring: Spring): void;
         addBody(body: Body): void;
         removeBody(body: Body): void;
         getBodyByID(id: number): Body; //Body | boolean
@@ -988,13 +1259,15 @@ declare namespace p2 {
         enableBodyCollision(bodyA: Body, bodyB: Body): void;
         clear(): void;
         clone(): World;
-        hitTest(worldPoint: number[], bodies: Body[], precision: number): Body[];
+        hitTest(worldPoint: [number, number], bodies: Body[], precision: number): Body[];
         setGlobalEquationParameters(parameters: {
             relaxation?: number;
             stiffness?: number;
         }): void;
         setGlobalStiffness(stiffness: number): void;
         setGlobalRelaxation(relaxation: number): void;
+        raycast(result: RaycastResult, ray: Ray): boolean;
+
     }
 
 }
diff --git a/types/p2/p2-tests.ts b/types/p2/p2-tests.ts
index c796cf8f79..6817ac4016 100644
--- a/types/p2/p2-tests.ts
+++ b/types/p2/p2-tests.ts
@@ -44,7 +44,7 @@ const convex = new p2.Convex({
         new Int32Array([0, -1]),
         [1, 1]
     ]
-})
+});
 
 // To get the trajectories of the bodies,
 // we must step the world forward in time.
diff --git a/types/p5/constants.d.ts b/types/p5/constants.d.ts
index 808e55b72e..df2bc6d3c7 100644
--- a/types/p5/constants.d.ts
+++ b/types/p5/constants.d.ts
@@ -46,8 +46,7 @@ declare module "./index" {
     | CROSS
     | HAND
     | MOVE
-    | TEXT
-    | WAIT;
+    | TEXT;
 
   type DEBUG_MODE =
     | GRID
@@ -110,10 +109,15 @@ declare module "./index" {
     | BEVEL
     | ROUND;
 
+  type TEXTURE_MODE =
+    | IMAGE
+    | NORMAL;
+
   type THE_STYLE =
     | NORMAL
     | ITALIC
-    | BOLD;
+    | BOLD
+    | BOLDITALIC;
 
   type TYPE =
     | VIDEO
diff --git a/types/p5/global.d.ts b/types/p5/global.d.ts
index 6dd593e282..13bcd8acc4 100644
--- a/types/p5/global.d.ts
+++ b/types/p5/global.d.ts
@@ -307,7 +307,7 @@ declare global {
   /**
    *   The background() function sets the color used for
    *   the background of the p5.js canvas. The default
-   *   background is light gray. This function is
+   *   background is transparent. This function is
    *   typically used within draw() to clear the display
    *   window at the beginning of each frame, but it can
    *   be used inside setup() to set the background on
@@ -344,7 +344,7 @@ declare global {
   /**
    *   The background() function sets the color used for
    *   the background of the p5.js canvas. The default
-   *   background is light gray. This function is
+   *   background is transparent. This function is
    *   typically used within draw() to clear the display
    *   window at the beginning of each frame, but it can
    *   be used inside setup() to set the background on
@@ -385,7 +385,7 @@ declare global {
   /**
    *   The background() function sets the color used for
    *   the background of the p5.js canvas. The default
-   *   background is light gray. This function is
+   *   background is transparent. This function is
    *   typically used within draw() to clear the display
    *   window at the beginning of each frame, but it can
    *   be used inside setup() to set the background on
@@ -425,7 +425,7 @@ declare global {
   /**
    *   The background() function sets the color used for
    *   the background of the p5.js canvas. The default
-   *   background is light gray. This function is
+   *   background is transparent. This function is
    *   typically used within draw() to clear the display
    *   window at the beginning of each frame, but it can
    *   be used inside setup() to set the background on
@@ -471,7 +471,7 @@ declare global {
   /**
    *   The background() function sets the color used for
    *   the background of the p5.js canvas. The default
-   *   background is light gray. This function is
+   *   background is transparent. This function is
    *   typically used within draw() to clear the display
    *   window at the beginning of each frame, but it can
    *   be used inside setup() to set the background on
@@ -508,7 +508,7 @@ declare global {
   /**
    *   The background() function sets the color used for
    *   the background of the p5.js canvas. The default
-   *   background is light gray. This function is
+   *   background is transparent. This function is
    *   typically used within draw() to clear the display
    *   window at the beginning of each frame, but it can
    *   be used inside setup() to set the background on
@@ -969,6 +969,7 @@ declare global {
    *   @param w width of the ellipse.
    *   @param h height of the ellipse.
    *   @param detail number of radial sectors to draw
+   *   (for WebGL mode)
    */
   function ellipse(
     x: number,
@@ -978,6 +979,28 @@ declare global {
     detail: number
   ): void;
 
+  /**
+   *   Draws a circle to the screen. A circle is a simple
+   *   closed shape. It is the set of all points in a
+   *   plane that are at a given distance from a given
+   *   point, the centre. This function is a special case
+   *   of the ellipse() function, where the width and
+   *   height of the ellipse are the same. Height and
+   *   width of the ellipse is equal to twice the radius
+   *   of the circle.. By default, the first two
+   *   parameters set the location of the centre of the
+   *   circle, the third sets the radius of the circle.
+   *   @param x x-coordinate of the centre of the circle.
+   *   @param y y-coordinate of the centre of the circle.
+   *   @param r radius of the circle.
+   *   @chainable
+   */
+  function circle(
+    x: number,
+    y: number,
+    r: number
+  ): p5;
+
   /**
    *   Draws a line (a direct path between two points) to
    *   the screen. The version of line() with four
@@ -1034,7 +1057,7 @@ declare global {
    *   the point is determined by the current stroke.
    *   @param x the x-coordinate
    *   @param y the y-coordinate
-   *   @param [z] the z-coordinate (for WEBGL mode)
+   *   @param [z] the z-coordinate (for WebGL mode)
    *   @chainable
    */
   function point(
@@ -1164,9 +1187,9 @@ declare global {
    *   @param w width of the rectangle.
    *   @param h height of the rectangle.
    *   @param [detailX] number of segments in the
-   *   x-direction
+   *   x-direction (for WebGL mode)
    *   @param [detailY] number of segments in the
-   *   y-direction
+   *   y-direction (for WebGL mode)
    *   @chainable
    */
   function rect(
@@ -1178,6 +1201,44 @@ declare global {
     detailY?: number
   ): p5;
 
+  /**
+   *   Draws a square to the screen. A square is a
+   *   four-sided shape with every angle at ninety
+   *   degrees, and equal side size. This function is a
+   *   special case of the rect() function, where the
+   *   width and height are the same, and the parameter
+   *   is called "s" for side size. By default, the first
+   *   two parameters set the location of the upper-left
+   *   corner, the third sets the side size of the
+   *   square. The way these parameters are interpreted,
+   *   however, may be changed with the rectMode()
+   *   function.  The fourth, fifth, sixth and seventh
+   *   parameters, if specified, determine corner radius
+   *   for the top-left, top-right, lower-right and
+   *   lower-left corners, respectively. An omitted
+   *   corner radius parameter is set to the value of the
+   *   previously specified radius value in the parameter
+   *   list.
+   *   @param x x-coordinate of the square.
+   *   @param y y-coordinate of the square.
+   *   @param s side size of the square.
+   *   @param [tl] optional radius of top-left corner.
+   *   @param [tr] optional radius of top-right corner.
+   *   @param [br] optional radius of bottom-right
+   *   corner.
+   *   @param [bl] optional radius of bottom-left corner.
+   *   @chainable
+   */
+  function square(
+    x: number,
+    y: number,
+    s: number,
+    tl?: number,
+    tr?: number,
+    br?: number,
+    bl?: number
+  ): p5;
+
   /**
    *   A triangle is a plane created by connecting three
    *   points. The first two arguments specify the first
@@ -2085,6 +2146,7 @@ declare global {
   const NORMAL: p5.NORMAL;
   const ITALIC: p5.ITALIC;
   const BOLD: p5.BOLD;
+  const BOLDITALIC: p5.BOLDITALIC;
   const LANDSCAPE: p5.LANDSCAPE;
   const PORTRAIT: p5.PORTRAIT;
   const GRID: p5.GRID;
@@ -2116,11 +2178,17 @@ declare global {
    *   recommended size is 16x16 or 32x32 pixels. The
    *   values for parameters x and y must be less than
    *   the dimensions of the image.
-   *   @param type either ARROW, CROSS, HAND, MOVE, TEXT,
-   *   or WAIT, or path for image
+   *   @param type Built-In: either ARROW, CROSS, HAND,
+   *   MOVE, TEXT and WAIT Native CSS properties: 'grab',
+   *   'progress', 'cell' etc. External: path for
+   *   cursor's images (Allowed File extensions: .cur,
+   *   .gif, .jpg, .jpeg, .png) For more information on
+   *   Native CSS cursors and url visit:
+   *   https://developer.mozilla.org/en-US/docs/Web/CSS/cursor
    *   @param [x] the horizontal active spot of the
-   *   cursor
+   *   cursor (must be less than 32)
    *   @param [y] the vertical active spot of the cursor
+   *   (must be less than 32)
    */
   function cursor(
     type:
@@ -2872,7 +2940,8 @@ declare global {
    *   The deviceMoved() function is called when the
    *   device is moved by more than the threshold value
    *   along X, Y or Z axis. The default threshold is set
-   *   to 0.5.
+   *   to 0.5. The threshold value can be changed using
+   *   setMoveThreshold().
    */
   function deviceMoved(): void;
 
@@ -2892,7 +2961,8 @@ declare global {
    *   device total acceleration changes of accelerationX
    *   and accelerationY values is more than the
    *   threshold value. The default threshold is set to
-   *   30.
+   *   30. The threshold value can be changed using
+   *   setShakeThreshold().
    */
   function deviceShaken(): void;
 
@@ -3014,6 +3084,13 @@ declare global {
    *   rotate direction of the device along the Z-axis.
    */
   let pRotationZ: number;
+
+  /**
+   *   When a device is rotated, the axis that triggers
+   *   the deviceTurned() method is stored in the
+   *   turnAxis variable. The turnAxis variable is only
+   *   defined within the scope of deviceTurned().
+   */
   let turnAxis: string;
 
   /**
@@ -3027,12 +3104,12 @@ declare global {
    *   LEFT_ARROW, RIGHT_ARROW.
    *
    *
-   *   For ASCII keys that was pressed is stored in the
-   *   key variable. However, it does not distinguish
-   *   between uppercase and lowercase. For this reason,
-   *   it is recommended to use keyTyped() to read the
-   *   key variable, in which the case of the variable
-   *   will be distinguished.
+   *   For ASCII keys, the key that was pressed is stored
+   *   in the key variable. However, it does not
+   *   distinguish between uppercase and lowercase. For
+   *   this reason, it is recommended to use keyTyped()
+   *   to read the key variable, in which the case of the
+   *   variable will be distinguished.
    *
    *
    *   Because of how operating systems handle key
@@ -3984,12 +4061,16 @@ declare global {
    *   is easy, but not as fast as grabbing the data
    *   directly from pixels[]. The equivalent statement
    *   to get(x, y) using pixels[] with pixel density d
-   *   is  var x, y, d; // set these to the coordinates
-   *   var off = (y  width + x)  d * 4; var components =
-   *   [ pixels[off], pixels[off + 1], pixels[off + 2],
+   *   is
+   *
+   *   let x, y, d; // set these to the coordinates let
+   *   off = (y * width + x) * d * 4; let components = [
+   *   pixels[off], pixels[off + 1], pixels[off + 2],
    *   pixels[off + 3] ]; print(components);
    *
    *
+   *
+   *
    *   See the reference for pixels[] for more
    *   information.
    *
@@ -4105,11 +4186,11 @@ declare global {
    *   pixel at (1, 0). More generally, to set values for
    *   a pixel at (x, y):
    *
-   *   var d = pixelDensity(); for (var i = 0; i < d;
-   *   i++) { for (var j = 0; j < d; j++) { // loop over
-   *   idx = 4 * ((y * d + j) * width * d + (x * d + i));
-   *   pixels[idx] = r; pixels[idx+1] = g; pixels[idx+2]
-   *   = b; pixels[idx+3] = a; } }
+   *   let d = pixelDensity(); for (let i = 0; i < d;
+   *   i++) { for (let j = 0; j < d; j++) { // loop over
+   *   index = 4 * ((y * d + j) * width * d + (x * d +
+   *   i)); pixels[index] = r; pixels[index+1] = g;
+   *   pixels[index+2] = b; pixels[index+3] = a; } }
    *
    *   While the above method is complex, it is flexible
    *   enough to work with any pixelDensity. Note that
@@ -4294,6 +4375,8 @@ declare global {
    *   - tsv - parse the table as tab-separated values
    *   - header - this table has a header (title) row
    *
+   *
+   *
    *   When passing in multiple options, pass them in as
    *   separate parameters, seperated by commas. For
    *   example:
@@ -4352,6 +4435,8 @@ declare global {
    *   - tsv - parse the table as tab-separated values
    *   - header - this table has a header (title) row
    *
+   *
+   *
    *   When passing in multiple options, pass them in as
    *   separate parameters, seperated by commas. For
    *   example:
@@ -4749,22 +4834,22 @@ declare global {
    *
    *
    *   // Saves canvas as an image save('myCanvas.jpg');
-   *   // Saves pImage as a png image var img =
+   *   // Saves pImage as a png image let img =
    *   createImage(10, 10); save(img, 'my.png'); // Saves
-   *   canvas as an image var cnv = createCanvas(100,
+   *   canvas as an image let cnv = createCanvas(100,
    *   100); save(cnv, 'myCanvas.jpg'); // Saves
-   *   p5.Renderer object as an image var gb =
+   *   p5.Renderer object as an image let gb =
    *   createGraphics(100, 100); save(gb,
-   *   'myGraphics.jpg'); var myTable = new p5.Table();
+   *   'myGraphics.jpg'); let myTable = new p5.Table();
    *   // Saves table as html file save(myTable,
    *   'myTable.html'); // Comma Separated Values
    *   save(myTable, 'myTable.csv'); // Tab Separated
-   *   Values save(myTable, 'myTable.tsv'); var myJSON =
+   *   Values save(myTable, 'myTable.tsv'); let myJSON =
    *   { a: 1, b: true }; // Saves pretty JSON
    *   save(myJSON, 'my.json'); // Optimizes JSON
    *   filesize save(myJSON, 'my.json', true); // Saves
    *   array of strings to a text file with line breaks
-   *   after each item var arrayOfStrings = ['a', 'b'];
+   *   after each item let arrayOfStrings = ['a', 'b'];
    *   save(arrayOfStrings, 'my.txt');
    *   @param [objectOrFilename] If filename is provided,
    *   will save canvas as an image with either png or
@@ -4938,13 +5023,16 @@ declare global {
    *   specific increment. The amt parameter is the
    *   amount to interpolate between the two values where
    *   0.0 equal to the first point, 0.1 is very near the
-   *   first point, 0.5 is half-way in between, etc. The
-   *   lerp function is convenient for creating motion
-   *   along a straight path and for drawing dotted
-   *   lines.
+   *   first point, 0.5 is half-way in between, and 1.0
+   *   is equal to the second point. If the value of amt
+   *   is more than 1.0 or less than 0.0, the number will
+   *   be calculated accordingly in the ratio of the two
+   *   given numbers. The lerp function is convenient for
+   *   creating motion along a straight path and for
+   *   drawing dotted lines.
    *   @param start first value
    *   @param stop second value
-   *   @param amt number between 0.0 and 1.0
+   *   @param amt number
    *   @return lerped value
    */
   function lerp(
@@ -5549,12 +5637,12 @@ declare global {
 
   /**
    *   Sets/gets the style of the text for system fonts
-   *   to NORMAL, ITALIC, or BOLD. Note: this may be is
-   *   overridden by CSS styling. For non-system fonts
-   *   (opentype, truetype, etc.) please load styled
-   *   fonts instead.
+   *   to NORMAL, ITALIC, BOLD or BOLDITALIC. Note: this
+   *   may be is overridden by CSS styling. For
+   *   non-system fonts (opentype, truetype, etc.) please
+   *   load styled fonts instead.
    *   @param theStyle styling for text, either NORMAL,
-   *   ITALIC, or BOLD
+   *   ITALIC, BOLD or BOLDITALIC
    *   @chainable
    */
   function textStyle(
@@ -5563,10 +5651,10 @@ declare global {
 
   /**
    *   Sets/gets the style of the text for system fonts
-   *   to NORMAL, ITALIC, or BOLD. Note: this may be is
-   *   overridden by CSS styling. For non-system fonts
-   *   (opentype, truetype, etc.) please load styled
-   *   fonts instead.
+   *   to NORMAL, ITALIC, BOLD or BOLDITALIC. Note: this
+   *   may be is overridden by CSS styling. For
+   *   non-system fonts (opentype, truetype, etc.) please
+   *   load styled fonts instead.
    */
   function textStyle(): string;
 
@@ -5601,7 +5689,7 @@ declare global {
    *   method is asynchronous, meaning it may not finish
    *   before the next line in your sketch is executed.
    *   The path to the font should be relative to the
-   *   HTML file that links in your sketch. Loading an
+   *   HTML file that links in your sketch. Loading fonts
    *   from a URL or other remote location may be blocked
    *   due to your browser's built-in security.
    *   @param path name of the file or url to load
@@ -6207,6 +6295,14 @@ declare global {
    *   formatting floats, and one for formatting ints.
    *   The values for the digits, left, and right
    *   parameters should always be positive integers.
+   *   (NOTE): Be cautious when using left and right
+   *   parameters as it prepends numbers of 0's if the
+   *   parameter if greater than the current length of
+   *   the number. For example if number is 123.2 and
+   *   left parameter passed is 4 which is greater than
+   *   length of 123 (integer part) i.e 3 than result
+   *   will be 0123.2. Same case for right parameter i.e.
+   *   if right is 3 than the result will be 123.200.
    *   @param num the Number to format
    *   @param [left] number of digits to the left of the
    *   decimal point
@@ -6232,6 +6328,14 @@ declare global {
    *   formatting floats, and one for formatting ints.
    *   The values for the digits, left, and right
    *   parameters should always be positive integers.
+   *   (NOTE): Be cautious when using left and right
+   *   parameters as it prepends numbers of 0's if the
+   *   parameter if greater than the current length of
+   *   the number. For example if number is 123.2 and
+   *   left parameter passed is 4 which is greater than
+   *   length of 123 (integer part) i.e 3 than result
+   *   will be 0123.2. Same case for right parameter i.e.
+   *   if right is 3 than the result will be 123.200.
    *   @param nums the Numbers to format
    *   @param [left] number of digits to the left of the
    *   decimal point
@@ -6333,12 +6437,27 @@ declare global {
 
   /**
    *   Utility function for formatting numbers into
-   *   strings. Similar to nf() but puts a " " (space) in
-   *   front of positive numbers and a "-" in front of
-   *   negative numbers. There are two versions: one for
-   *   formatting floats, and one for formatting ints.
-   *   The values for the digits, left, and right
-   *   parameters should always be positive integers.
+   *   strings. Similar to nf() but puts an additional
+   *   "_" (space) in front of positive numbers just in
+   *   case to align it with negative numbers which
+   *   includes "-" (minus) sign. The main usecase of
+   *   nfs() can be seen when one wants to align the
+   *   digits (place values) of a positive number with
+   *   some negative number (See the example to get a
+   *   clear picture). There are two versions: one for
+   *   formatting float, and one for formatting int. The
+   *   values for the digits, left, and right parameters
+   *   should always be positive integers. (IMP): The
+   *   result on the canvas basically the expected
+   *   alignment can vary based on the typeface you are
+   *   using. (NOTE): Be cautious when using left and
+   *   right parameters as it prepends numbers of 0's if
+   *   the parameter if greater than the current length
+   *   of the number. For example if number is 123.2 and
+   *   left parameter passed is 4 which is greater than
+   *   length of 123 (integer part) i.e 3 than result
+   *   will be 0123.2. Same case for right parameter i.e.
+   *   if right is 3 than the result will be 123.200.
    *   @param num the Number to format
    *   @param [left] number of digits to the left of the
    *   decimal point
@@ -6354,12 +6473,27 @@ declare global {
 
   /**
    *   Utility function for formatting numbers into
-   *   strings. Similar to nf() but puts a " " (space) in
-   *   front of positive numbers and a "-" in front of
-   *   negative numbers. There are two versions: one for
-   *   formatting floats, and one for formatting ints.
-   *   The values for the digits, left, and right
-   *   parameters should always be positive integers.
+   *   strings. Similar to nf() but puts an additional
+   *   "_" (space) in front of positive numbers just in
+   *   case to align it with negative numbers which
+   *   includes "-" (minus) sign. The main usecase of
+   *   nfs() can be seen when one wants to align the
+   *   digits (place values) of a positive number with
+   *   some negative number (See the example to get a
+   *   clear picture). There are two versions: one for
+   *   formatting float, and one for formatting int. The
+   *   values for the digits, left, and right parameters
+   *   should always be positive integers. (IMP): The
+   *   result on the canvas basically the expected
+   *   alignment can vary based on the typeface you are
+   *   using. (NOTE): Be cautious when using left and
+   *   right parameters as it prepends numbers of 0's if
+   *   the parameter if greater than the current length
+   *   of the number. For example if number is 123.2 and
+   *   left parameter passed is 4 which is greater than
+   *   length of 123 (integer part) i.e 3 than result
+   *   will be 0123.2. Same case for right parameter i.e.
+   *   if right is 3 than the result will be 123.200.
    *   @param nums the Numbers to format
    *   @param [left] number of digits to the left of the
    *   decimal point
@@ -7158,6 +7292,23 @@ declare global {
       | p5.Graphics
   ): p5;
 
+  /**
+   *   Sets the coordinate space for texture mapping. The
+   *   default mode is IMAGE which refers to the actual
+   *   coordinates of the image. NORMAL refers to a
+   *   normalized space of values ranging from 0 to 1.
+   *   This function only works in WEBGL mode. With
+   *   IMAGE, if an image is 100 x 200 pixels, mapping
+   *   the image onto the entire size of a quad would
+   *   require the points (0,0) (100, 0) (100,200)
+   *   (0,200). The same mapping in NORMAL is (0,0) (1,0)
+   *   (1,1) (0,1).
+   *   @param mode either IMAGE or NORMAL
+   */
+  function textureMode(
+    mode: p5.TEXTURE_MODE
+  ): void;
+
   /**
    *   Ambient material for geometry with a given color.
    *   You can view all possible materials in this
@@ -7477,6 +7628,45 @@ declare global {
    */
   function removeElements(): void;
 
+  /**
+   *   The .changed() function is called when the value
+   *   of an element changes. This can be used to attach
+   *   an element specific event listener.
+   *   @param fxn function to be fired when the value of
+   *   an element changes. if false is passed instead,
+   *   the previously firing function will no longer
+   *   fire.
+   *   @chainable
+   */
+  function changed(
+    fxn:
+      | ((
+          ...args: any[]
+        ) => any)
+      | boolean
+  ): p5;
+
+  /**
+   *   The .input() function is called when any user
+   *   input is detected with an element. The input event
+   *   is often used to detect keystrokes in a input
+   *   element, or changes on a slider element. This can
+   *   be used to attach an element specific event
+   *   listener.
+   *   @param fxn function to be fired when any user
+   *   input is detected within the element. if false is
+   *   passed instead, the previously firing function
+   *   will no longer fire.
+   *   @chainable
+   */
+  function input(
+    fxn:
+      | ((
+          ...args: any[]
+        ) => any)
+      | boolean
+  ): p5;
+
   /**
    *   Creates a <div></div> element in the DOM with
    *   given inner HTML. Appends to the container node if
diff --git a/types/p5/index.d.ts b/types/p5/index.d.ts
index f87978d993..47ec26df31 100644
--- a/types/p5/index.d.ts
+++ b/types/p5/index.d.ts
@@ -2,10 +2,11 @@
 // Project: https://github.com/processing/p5.js
 // Definitions by: p5-types <https://github.com/p5-types>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.9
 
 // This file was auto-generated. Please do not edit it.
 
+/// <reference path="./lib/addons/p5.dom.d.ts" />
 /// <reference path="./src/color/creating_reading.d.ts" />
 /// <reference path="./src/color/setting.d.ts" />
 /// <reference path="./src/core/shape/2d_primitives.d.ts" />
diff --git a/types/p5/lib/addons/p5.dom.d.ts b/types/p5/lib/addons/p5.dom.d.ts
index 7a4f2e096b..8566cf1cf3 100644
--- a/types/p5/lib/addons/p5.dom.d.ts
+++ b/types/p5/lib/addons/p5.dom.d.ts
@@ -336,6 +336,45 @@ declare module "../../index" {
      */
     removeElements(): void;
 
+    /**
+     *   The .changed() function is called when the value
+     *   of an element changes. This can be used to attach
+     *   an element specific event listener.
+     *   @param fxn function to be fired when the value of
+     *   an element changes. if false is passed instead,
+     *   the previously firing function will no longer
+     *   fire.
+     *   @chainable
+     */
+    changed(
+      fxn:
+        | ((
+            ...args: any[]
+          ) => any)
+        | boolean
+    ): p5;
+
+    /**
+     *   The .input() function is called when any user
+     *   input is detected with an element. The input event
+     *   is often used to detect keystrokes in a input
+     *   element, or changes on a slider element. This can
+     *   be used to attach an element specific event
+     *   listener.
+     *   @param fxn function to be fired when any user
+     *   input is detected within the element. if false is
+     *   passed instead, the previously firing function
+     *   will no longer fire.
+     *   @chainable
+     */
+    input(
+      fxn:
+        | ((
+            ...args: any[]
+          ) => any)
+        | boolean
+    ): p5;
+
     /**
      *   Creates a <div></div> element in the DOM with
      *   given inner HTML. Appends to the container node if
diff --git a/types/p5/lib/addons/p5.sound.d.ts b/types/p5/lib/addons/p5.sound.d.ts
index faa16f7e1b..b6eb3c5e87 100644
--- a/types/p5/lib/addons/p5.sound.d.ts
+++ b/types/p5/lib/addons/p5.sound.d.ts
@@ -1990,7 +1990,7 @@ declare module "../../index" {
      *   Reverb adds depth to a sound through a large
      *   number of decaying echoes. It creates the
      *   perception that sound is occurring in a physical
-     *   space. The p5.Reverb has parameters for Time (how
+     *   space. The p5.Reverb has paramters for Time (how
      *   long does the reverb last) and decayRate (how much
      *   the sound decays with each echo) that can be set
      *   with the .set() or .process() methods. The
@@ -2270,12 +2270,13 @@ declare module "../../index" {
     /**
      *   A p5.Part plays back one or more p5.Phrases.
      *   Instantiate a part with steps and tatums. By
-     *   default, each step represents 1/16th note. See
+     *   default, each step represents a 1/16th note. See
      *   p5.Phrase for more about musical timing.
      *
      *   @param [steps] Steps in the part
-     *   @param [tatums] Divisions of a beat (default is
-     *   1/16, a quarter note)
+     *   @param [tatums] Divisions of a beat, e.g. use 1/4,
+     *   or 0.25 for a quater note (default is 1/16, a
+     *   sixteenth note)
      */
     constructor(
       steps?: number,
@@ -2293,7 +2294,7 @@ declare module "../../index" {
     ): void;
 
     /**
-     *   Returns the Beats Per Minute of this currently
+     *   Returns the tempo, in Beats Per Minute, of this
      *   part.
      */
     getBPM(): number;
@@ -2324,7 +2325,9 @@ declare module "../../index" {
     noLoop(): void;
 
     /**
-     *   Stop the part and cue it to step 0.
+     *   Stop the part and cue it to step 0. Playback will
+     *   resume from the begining of the Part when it is
+     *   played again.
      *   @param [time] seconds from now
      */
     stop(
@@ -2366,9 +2369,8 @@ declare module "../../index" {
     ): void;
 
     /**
-     *   Get a phrase from this part, based on the name it
-     *   was given when it was created. Now you can modify
-     *   its array.
+     *   Find all sequences with the specified name, and
+     *   replace their patterns with the specified array.
      *   @param sequence Array of values to pass into the
      *   callback at each step of the phrase.
      */
@@ -2378,7 +2380,8 @@ declare module "../../index" {
     ): void;
 
     /**
-     *   Fire a callback function at every step.
+     *   Set the function that will be called at every
+     *   step. This will clear the previous function.
      *   @param callback The name of the callback you want
      *   to fire on every beat/tatum.
      */
@@ -2511,7 +2514,7 @@ declare module "../../index" {
     maxIterations: number;
 
     /**
-     *   Getters and Setters, setting any parameter will
+     *   Getters and Setters, setting any paramter will
      *   result in a change in the clock's frequency, that
      *   will be reflected after the next callback beats
      *   per minute (defaults to 60)
@@ -2588,7 +2591,7 @@ declare module "../../index" {
     ): void;
 
     /**
-     *   Set the parameters of a compressor.
+     *   Set the paramters of a compressor.
      *   @param attack The amount of time (in seconds) to
      *   reduce the gain by 10dB, default = .003, range 0 -
      *   1
diff --git a/types/p5/literals.d.ts b/types/p5/literals.d.ts
index 0dc8f8b65a..d1e6aed943 100644
--- a/types/p5/literals.d.ts
+++ b/types/p5/literals.d.ts
@@ -11,6 +11,7 @@ declare module "./index" {
   type BLEND = "source-over";
   type BLUR = "blur";
   type BOLD = "bold";
+  type BOLDITALIC = "bolditalic";
   type BOTTOM = "bottom";
   type BURN = "color-burn";
   type CENTER = "center";
@@ -32,6 +33,7 @@ declare module "./index" {
   type HARD_LIGHT = "hard-light";
   type HSB = "hsb";
   type HSL = "hsl";
+  type IMAGE = "image";
   type INVERT = "invert";
   type ITALIC = "italic";
   type LANDSCAPE = "landscape";
diff --git a/types/p5/src/color/setting.d.ts b/types/p5/src/color/setting.d.ts
index c02a705a1e..9a9d01fc2c 100644
--- a/types/p5/src/color/setting.d.ts
+++ b/types/p5/src/color/setting.d.ts
@@ -7,7 +7,7 @@ declare module "../../index" {
     /**
      *   The background() function sets the color used for
      *   the background of the p5.js canvas. The default
-     *   background is light gray. This function is
+     *   background is transparent. This function is
      *   typically used within draw() to clear the display
      *   window at the beginning of each frame, but it can
      *   be used inside setup() to set the background on
@@ -44,7 +44,7 @@ declare module "../../index" {
     /**
      *   The background() function sets the color used for
      *   the background of the p5.js canvas. The default
-     *   background is light gray. This function is
+     *   background is transparent. This function is
      *   typically used within draw() to clear the display
      *   window at the beginning of each frame, but it can
      *   be used inside setup() to set the background on
@@ -85,7 +85,7 @@ declare module "../../index" {
     /**
      *   The background() function sets the color used for
      *   the background of the p5.js canvas. The default
-     *   background is light gray. This function is
+     *   background is transparent. This function is
      *   typically used within draw() to clear the display
      *   window at the beginning of each frame, but it can
      *   be used inside setup() to set the background on
@@ -125,7 +125,7 @@ declare module "../../index" {
     /**
      *   The background() function sets the color used for
      *   the background of the p5.js canvas. The default
-     *   background is light gray. This function is
+     *   background is transparent. This function is
      *   typically used within draw() to clear the display
      *   window at the beginning of each frame, but it can
      *   be used inside setup() to set the background on
@@ -171,7 +171,7 @@ declare module "../../index" {
     /**
      *   The background() function sets the color used for
      *   the background of the p5.js canvas. The default
-     *   background is light gray. This function is
+     *   background is transparent. This function is
      *   typically used within draw() to clear the display
      *   window at the beginning of each frame, but it can
      *   be used inside setup() to set the background on
@@ -208,7 +208,7 @@ declare module "../../index" {
     /**
      *   The background() function sets the color used for
      *   the background of the p5.js canvas. The default
-     *   background is light gray. This function is
+     *   background is transparent. This function is
      *   typically used within draw() to clear the display
      *   window at the beginning of each frame, but it can
      *   be used inside setup() to set the background on
diff --git a/types/p5/src/core/constants.d.ts b/types/p5/src/core/constants.d.ts
index 4daaadfca5..6bed1232f5 100644
--- a/types/p5/src/core/constants.d.ts
+++ b/types/p5/src/core/constants.d.ts
@@ -128,6 +128,7 @@ declare module "../../index" {
     readonly NORMAL: NORMAL;
     readonly ITALIC: ITALIC;
     readonly BOLD: BOLD;
+    readonly BOLDITALIC: BOLDITALIC;
     readonly LANDSCAPE: LANDSCAPE;
     readonly PORTRAIT: PORTRAIT;
     readonly GRID: GRID;
diff --git a/types/p5/src/core/environment.d.ts b/types/p5/src/core/environment.d.ts
index e226544030..be0346f244 100644
--- a/types/p5/src/core/environment.d.ts
+++ b/types/p5/src/core/environment.d.ts
@@ -30,11 +30,17 @@ declare module "../../index" {
      *   recommended size is 16x16 or 32x32 pixels. The
      *   values for parameters x and y must be less than
      *   the dimensions of the image.
-     *   @param type either ARROW, CROSS, HAND, MOVE, TEXT,
-     *   or WAIT, or path for image
+     *   @param type Built-In: either ARROW, CROSS, HAND,
+     *   MOVE, TEXT and WAIT Native CSS properties: 'grab',
+     *   'progress', 'cell' etc. External: path for
+     *   cursor's images (Allowed File extensions: .cur,
+     *   .gif, .jpg, .jpeg, .png) For more information on
+     *   Native CSS cursors and url visit:
+     *   https://developer.mozilla.org/en-US/docs/Web/CSS/cursor
      *   @param [x] the horizontal active spot of the
-     *   cursor
+     *   cursor (must be less than 32)
      *   @param [y] the vertical active spot of the cursor
+     *   (must be less than 32)
      */
     cursor(
       type:
diff --git a/types/p5/src/core/p5.Element.d.ts b/types/p5/src/core/p5.Element.d.ts
index dbd32afdb6..43fda2ced9 100644
--- a/types/p5/src/core/p5.Element.d.ts
+++ b/types/p5/src/core/p5.Element.d.ts
@@ -10,7 +10,11 @@ declare module "../../index" {
      *   Accepts either a string ID, DOM node, or
      *   p5.Element. If no arguments given, parent node is
      *   returned. For more ways to position the canvas,
-     *   see the  positioning the canvas wiki page.
+     *   see the  positioning the canvas wiki page. All
+     *   above examples except for the first one require
+     *   the inclusion of the p5.dom library in your
+     *   index.html. See the using a library section for
+     *   information on how to include this library.
      *   @param parent the ID, DOM node, or p5.Element of
      *   desired parent element
      *   @chainable
@@ -28,7 +32,11 @@ declare module "../../index" {
      *   Accepts either a string ID, DOM node, or
      *   p5.Element. If no arguments given, parent node is
      *   returned. For more ways to position the canvas,
-     *   see the  positioning the canvas wiki page.
+     *   see the  positioning the canvas wiki page. All
+     *   above examples except for the first one require
+     *   the inclusion of the p5.dom library in your
+     *   index.html. See the using a library section for
+     *   information on how to include this library.
      */
     parent(): Element;
 
@@ -218,45 +226,6 @@ declare module "../../index" {
         | boolean
     ): Element;
 
-    /**
-     *   The .changed() function is called when the value
-     *   of an element changes. This can be used to attach
-     *   an element specific event listener.
-     *   @param fxn function to be fired when the value of
-     *   an element changes. if false is passed instead,
-     *   the previously firing function will no longer
-     *   fire.
-     *   @chainable
-     */
-    changed(
-      fxn:
-        | ((
-            ...args: any[]
-          ) => any)
-        | boolean
-    ): Element;
-
-    /**
-     *   The .input() function is called when any user
-     *   input is detected with an element. The input event
-     *   is often used to detect keystrokes in a input
-     *   element, or changes on a slider element. This can
-     *   be used to attach an element specific event
-     *   listener.
-     *   @param fxn function to be fired when any user
-     *   input is detected within the element. if false is
-     *   passed instead, the previously firing function
-     *   will no longer fire.
-     *   @chainable
-     */
-    input(
-      fxn:
-        | ((
-            ...args: any[]
-          ) => any)
-        | boolean
-    ): Element;
-
     /**
      *   The .mouseOut() function is called once after
      *   every time a mouse moves off the element. This can
diff --git a/types/p5/src/core/shape/2d_primitives.d.ts b/types/p5/src/core/shape/2d_primitives.d.ts
index 4cced6ef5c..aa8ab3c8e9 100644
--- a/types/p5/src/core/shape/2d_primitives.d.ts
+++ b/types/p5/src/core/shape/2d_primitives.d.ts
@@ -84,6 +84,7 @@ declare module "../../../index" {
      *   @param w width of the ellipse.
      *   @param h height of the ellipse.
      *   @param detail number of radial sectors to draw
+     *   (for WebGL mode)
      */
     ellipse(
       x: number,
@@ -93,6 +94,28 @@ declare module "../../../index" {
       detail: number
     ): void;
 
+    /**
+     *   Draws a circle to the screen. A circle is a simple
+     *   closed shape. It is the set of all points in a
+     *   plane that are at a given distance from a given
+     *   point, the centre. This function is a special case
+     *   of the ellipse() function, where the width and
+     *   height of the ellipse are the same. Height and
+     *   width of the ellipse is equal to twice the radius
+     *   of the circle.. By default, the first two
+     *   parameters set the location of the centre of the
+     *   circle, the third sets the radius of the circle.
+     *   @param x x-coordinate of the centre of the circle.
+     *   @param y y-coordinate of the centre of the circle.
+     *   @param r radius of the circle.
+     *   @chainable
+     */
+    circle(
+      x: number,
+      y: number,
+      r: number
+    ): p5;
+
     /**
      *   Draws a line (a direct path between two points) to
      *   the screen. The version of line() with four
@@ -149,7 +172,7 @@ declare module "../../../index" {
      *   the point is determined by the current stroke.
      *   @param x the x-coordinate
      *   @param y the y-coordinate
-     *   @param [z] the z-coordinate (for WEBGL mode)
+     *   @param [z] the z-coordinate (for WebGL mode)
      *   @chainable
      */
     point(
@@ -279,9 +302,9 @@ declare module "../../../index" {
      *   @param w width of the rectangle.
      *   @param h height of the rectangle.
      *   @param [detailX] number of segments in the
-     *   x-direction
+     *   x-direction (for WebGL mode)
      *   @param [detailY] number of segments in the
-     *   y-direction
+     *   y-direction (for WebGL mode)
      *   @chainable
      */
     rect(
@@ -293,6 +316,44 @@ declare module "../../../index" {
       detailY?: number
     ): p5;
 
+    /**
+     *   Draws a square to the screen. A square is a
+     *   four-sided shape with every angle at ninety
+     *   degrees, and equal side size. This function is a
+     *   special case of the rect() function, where the
+     *   width and height are the same, and the parameter
+     *   is called "s" for side size. By default, the first
+     *   two parameters set the location of the upper-left
+     *   corner, the third sets the side size of the
+     *   square. The way these parameters are interpreted,
+     *   however, may be changed with the rectMode()
+     *   function.  The fourth, fifth, sixth and seventh
+     *   parameters, if specified, determine corner radius
+     *   for the top-left, top-right, lower-right and
+     *   lower-left corners, respectively. An omitted
+     *   corner radius parameter is set to the value of the
+     *   previously specified radius value in the parameter
+     *   list.
+     *   @param x x-coordinate of the square.
+     *   @param y y-coordinate of the square.
+     *   @param s side size of the square.
+     *   @param [tl] optional radius of top-left corner.
+     *   @param [tr] optional radius of top-right corner.
+     *   @param [br] optional radius of bottom-right
+     *   corner.
+     *   @param [bl] optional radius of bottom-left corner.
+     *   @chainable
+     */
+    square(
+      x: number,
+      y: number,
+      s: number,
+      tl?: number,
+      tr?: number,
+      br?: number,
+      bl?: number
+    ): p5;
+
     /**
      *   A triangle is a plane created by connecting three
      *   points. The first two arguments specify the first
diff --git a/types/p5/src/events/acceleration.d.ts b/types/p5/src/events/acceleration.d.ts
index 7c9ea98e2f..1c6f43c7ce 100644
--- a/types/p5/src/events/acceleration.d.ts
+++ b/types/p5/src/events/acceleration.d.ts
@@ -28,7 +28,8 @@ declare module "../../index" {
      *   The deviceMoved() function is called when the
      *   device is moved by more than the threshold value
      *   along X, Y or Z axis. The default threshold is set
-     *   to 0.5.
+     *   to 0.5. The threshold value can be changed using
+     *   setMoveThreshold().
      */
     deviceMoved(): void;
 
@@ -48,7 +49,8 @@ declare module "../../index" {
      *   device total acceleration changes of accelerationX
      *   and accelerationY values is more than the
      *   threshold value. The default threshold is set to
-     *   30.
+     *   30. The threshold value can be changed using
+     *   setShakeThreshold().
      */
     deviceShaken(): void;
 
@@ -170,6 +172,13 @@ declare module "../../index" {
      *   rotate direction of the device along the Z-axis.
      */
     pRotationZ: number;
+
+    /**
+     *   When a device is rotated, the axis that triggers
+     *   the deviceTurned() method is stored in the
+     *   turnAxis variable. The turnAxis variable is only
+     *   defined within the scope of deviceTurned().
+     */
     turnAxis: string;
   }
 }
diff --git a/types/p5/src/events/keyboard.d.ts b/types/p5/src/events/keyboard.d.ts
index 3226d6e741..d7d5fa2d40 100644
--- a/types/p5/src/events/keyboard.d.ts
+++ b/types/p5/src/events/keyboard.d.ts
@@ -15,12 +15,12 @@ declare module "../../index" {
      *   LEFT_ARROW, RIGHT_ARROW.
      *
      *
-     *   For ASCII keys that was pressed is stored in the
-     *   key variable. However, it does not distinguish
-     *   between uppercase and lowercase. For this reason,
-     *   it is recommended to use keyTyped() to read the
-     *   key variable, in which the case of the variable
-     *   will be distinguished.
+     *   For ASCII keys, the key that was pressed is stored
+     *   in the key variable. However, it does not
+     *   distinguish between uppercase and lowercase. For
+     *   this reason, it is recommended to use keyTyped()
+     *   to read the key variable, in which the case of the
+     *   variable will be distinguished.
      *
      *
      *   Because of how operating systems handle key
diff --git a/types/p5/src/image/p5.Image.d.ts b/types/p5/src/image/p5.Image.d.ts
index 08278f9b54..98df046fe0 100644
--- a/types/p5/src/image/p5.Image.d.ts
+++ b/types/p5/src/image/p5.Image.d.ts
@@ -308,11 +308,11 @@ declare module "../../index" {
      *   second four values (indices 4-7) will contain the
      *   R, G, B, A values of the pixel at (1, 0). More
      *   generally, to set values for a pixel at (x, y):
-     *   var d = pixelDensity(); for (var i = 0; i < d;
-     *   i++) { for (var j = 0; j < d; j++) { // loop over
-     *   idx = 4 * ((y * d + j) * width * d + (x * d + i));
-     *   pixels[idx] = r; pixels[idx+1] = g; pixels[idx+2]
-     *   = b; pixels[idx+3] = a; } }
+     *   let d = pixelDensity(); for (let i = 0; i < d;
+     *   i++) { for (let j = 0; j < d; j++) { // loop over
+     *   index = 4 * ((y * d + j) * width * d + (x * d +
+     *   i)); pixels[index] = r; pixels[index+1] = g;
+     *   pixels[index+2] = b; pixels[index+3] = a; } }
      *
      *
      *
diff --git a/types/p5/src/image/pixels.d.ts b/types/p5/src/image/pixels.d.ts
index 85164e4447..dfdc6b9cfb 100644
--- a/types/p5/src/image/pixels.d.ts
+++ b/types/p5/src/image/pixels.d.ts
@@ -225,12 +225,16 @@ declare module "../../index" {
      *   is easy, but not as fast as grabbing the data
      *   directly from pixels[]. The equivalent statement
      *   to get(x, y) using pixels[] with pixel density d
-     *   is  var x, y, d; // set these to the coordinates
-     *   var off = (y  width + x)  d * 4; var components =
-     *   [ pixels[off], pixels[off + 1], pixels[off + 2],
+     *   is
+     *
+     *   let x, y, d; // set these to the coordinates let
+     *   off = (y * width + x) * d * 4; let components = [
+     *   pixels[off], pixels[off + 1], pixels[off + 2],
      *   pixels[off + 3] ]; print(components);
      *
      *
+     *
+     *
      *   See the reference for pixels[] for more
      *   information.
      *
@@ -346,11 +350,11 @@ declare module "../../index" {
      *   pixel at (1, 0). More generally, to set values for
      *   a pixel at (x, y):
      *
-     *   var d = pixelDensity(); for (var i = 0; i < d;
-     *   i++) { for (var j = 0; j < d; j++) { // loop over
-     *   idx = 4 * ((y * d + j) * width * d + (x * d + i));
-     *   pixels[idx] = r; pixels[idx+1] = g; pixels[idx+2]
-     *   = b; pixels[idx+3] = a; } }
+     *   let d = pixelDensity(); for (let i = 0; i < d;
+     *   i++) { for (let j = 0; j < d; j++) { // loop over
+     *   index = 4 * ((y * d + j) * width * d + (x * d +
+     *   i)); pixels[index] = r; pixels[index+1] = g;
+     *   pixels[index+2] = b; pixels[index+3] = a; } }
      *
      *   While the above method is complex, it is flexible
      *   enough to work with any pixelDensity. Note that
diff --git a/types/p5/src/io/files.d.ts b/types/p5/src/io/files.d.ts
index 75b7eb9a41..5f8c9e059d 100644
--- a/types/p5/src/io/files.d.ts
+++ b/types/p5/src/io/files.d.ts
@@ -197,6 +197,8 @@ declare module "../../index" {
      *   - tsv - parse the table as tab-separated values
      *   - header - this table has a header (title) row
      *
+     *
+     *
      *   When passing in multiple options, pass them in as
      *   separate parameters, seperated by commas. For
      *   example:
@@ -255,6 +257,8 @@ declare module "../../index" {
      *   - tsv - parse the table as tab-separated values
      *   - header - this table has a header (title) row
      *
+     *
+     *
      *   When passing in multiple options, pass them in as
      *   separate parameters, seperated by commas. For
      *   example:
@@ -652,22 +656,22 @@ declare module "../../index" {
      *
      *
      *   // Saves canvas as an image save('myCanvas.jpg');
-     *   // Saves pImage as a png image var img =
+     *   // Saves pImage as a png image let img =
      *   createImage(10, 10); save(img, 'my.png'); // Saves
-     *   canvas as an image var cnv = createCanvas(100,
+     *   canvas as an image let cnv = createCanvas(100,
      *   100); save(cnv, 'myCanvas.jpg'); // Saves
-     *   p5.Renderer object as an image var gb =
+     *   p5.Renderer object as an image let gb =
      *   createGraphics(100, 100); save(gb,
-     *   'myGraphics.jpg'); var myTable = new p5.Table();
+     *   'myGraphics.jpg'); let myTable = new p5.Table();
      *   // Saves table as html file save(myTable,
      *   'myTable.html'); // Comma Separated Values
      *   save(myTable, 'myTable.csv'); // Tab Separated
-     *   Values save(myTable, 'myTable.tsv'); var myJSON =
+     *   Values save(myTable, 'myTable.tsv'); let myJSON =
      *   { a: 1, b: true }; // Saves pretty JSON
      *   save(myJSON, 'my.json'); // Optimizes JSON
      *   filesize save(myJSON, 'my.json', true); // Saves
      *   array of strings to a text file with line breaks
-     *   after each item var arrayOfStrings = ['a', 'b'];
+     *   after each item let arrayOfStrings = ['a', 'b'];
      *   save(arrayOfStrings, 'my.txt');
      *   @param [objectOrFilename] If filename is provided,
      *   will save canvas as an image with either png or
diff --git a/types/p5/src/io/p5.XML.d.ts b/types/p5/src/io/p5.XML.d.ts
index fe5220e61f..731f63a423 100644
--- a/types/p5/src/io/p5.XML.d.ts
+++ b/types/p5/src/io/p5.XML.d.ts
@@ -189,5 +189,13 @@ declare module "../../index" {
     setContent(
       text: string
     ): void;
+
+    /**
+     *   Serializes the element into a string. This
+     *   function is useful for preparing the content to be
+     *   sent over a http request or saved to file.
+     *   @return Serialized string of the element
+     */
+    serialize(): string;
   }
 }
diff --git a/types/p5/src/math/calculation.d.ts b/types/p5/src/math/calculation.d.ts
index 82698236c5..cc57b50823 100644
--- a/types/p5/src/math/calculation.d.ts
+++ b/types/p5/src/math/calculation.d.ts
@@ -101,13 +101,16 @@ declare module "../../index" {
      *   specific increment. The amt parameter is the
      *   amount to interpolate between the two values where
      *   0.0 equal to the first point, 0.1 is very near the
-     *   first point, 0.5 is half-way in between, etc. The
-     *   lerp function is convenient for creating motion
-     *   along a straight path and for drawing dotted
-     *   lines.
+     *   first point, 0.5 is half-way in between, and 1.0
+     *   is equal to the second point. If the value of amt
+     *   is more than 1.0 or less than 0.0, the number will
+     *   be calculated accordingly in the ratio of the two
+     *   given numbers. The lerp function is convenient for
+     *   creating motion along a straight path and for
+     *   drawing dotted lines.
      *   @param start first value
      *   @param stop second value
-     *   @param amt number between 0.0 and 1.0
+     *   @param amt number
      *   @return lerped value
      */
     lerp(
diff --git a/types/p5/src/typography/attributes.d.ts b/types/p5/src/typography/attributes.d.ts
index 06cb7f9571..cf8a2f651c 100644
--- a/types/p5/src/typography/attributes.d.ts
+++ b/types/p5/src/typography/attributes.d.ts
@@ -88,12 +88,12 @@ declare module "../../index" {
 
     /**
      *   Sets/gets the style of the text for system fonts
-     *   to NORMAL, ITALIC, or BOLD. Note: this may be is
-     *   overridden by CSS styling. For non-system fonts
-     *   (opentype, truetype, etc.) please load styled
-     *   fonts instead.
+     *   to NORMAL, ITALIC, BOLD or BOLDITALIC. Note: this
+     *   may be is overridden by CSS styling. For
+     *   non-system fonts (opentype, truetype, etc.) please
+     *   load styled fonts instead.
      *   @param theStyle styling for text, either NORMAL,
-     *   ITALIC, or BOLD
+     *   ITALIC, BOLD or BOLDITALIC
      *   @chainable
      */
     textStyle(
@@ -102,10 +102,10 @@ declare module "../../index" {
 
     /**
      *   Sets/gets the style of the text for system fonts
-     *   to NORMAL, ITALIC, or BOLD. Note: this may be is
-     *   overridden by CSS styling. For non-system fonts
-     *   (opentype, truetype, etc.) please load styled
-     *   fonts instead.
+     *   to NORMAL, ITALIC, BOLD or BOLDITALIC. Note: this
+     *   may be is overridden by CSS styling. For
+     *   non-system fonts (opentype, truetype, etc.) please
+     *   load styled fonts instead.
      */
     textStyle(): string;
 
diff --git a/types/p5/src/typography/loading_displaying.d.ts b/types/p5/src/typography/loading_displaying.d.ts
index c02a5d9a4e..35e72263f1 100644
--- a/types/p5/src/typography/loading_displaying.d.ts
+++ b/types/p5/src/typography/loading_displaying.d.ts
@@ -10,7 +10,7 @@ declare module "../../index" {
      *   method is asynchronous, meaning it may not finish
      *   before the next line in your sketch is executed.
      *   The path to the font should be relative to the
-     *   HTML file that links in your sketch. Loading an
+     *   HTML file that links in your sketch. Loading fonts
      *   from a URL or other remote location may be blocked
      *   due to your browser's built-in security.
      *   @param path name of the file or url to load
diff --git a/types/p5/src/typography/p5.Font.d.ts b/types/p5/src/typography/p5.Font.d.ts
index 7b6803393e..001540a17a 100644
--- a/types/p5/src/typography/p5.Font.d.ts
+++ b/types/p5/src/typography/p5.Font.d.ts
@@ -12,7 +12,10 @@ declare module "../../index" {
      *   @param x x-position
      *   @param y y-position
      *   @param [fontSize] font size to use (optional)
+     *   Default is 12.
      *   @param [options] opentype options (optional)
+     *   opentype fonts contains alignment and baseline
+     *   options. Default is 'LEFT' and 'alphabetic'
      *   @return a rectangle object with properties: x, y,
      *   w, h
      */
diff --git a/types/p5/src/utilities/string_functions.d.ts b/types/p5/src/utilities/string_functions.d.ts
index da531a0303..4a46731d7d 100644
--- a/types/p5/src/utilities/string_functions.d.ts
+++ b/types/p5/src/utilities/string_functions.d.ts
@@ -90,6 +90,14 @@ declare module "../../index" {
      *   formatting floats, and one for formatting ints.
      *   The values for the digits, left, and right
      *   parameters should always be positive integers.
+     *   (NOTE): Be cautious when using left and right
+     *   parameters as it prepends numbers of 0's if the
+     *   parameter if greater than the current length of
+     *   the number. For example if number is 123.2 and
+     *   left parameter passed is 4 which is greater than
+     *   length of 123 (integer part) i.e 3 than result
+     *   will be 0123.2. Same case for right parameter i.e.
+     *   if right is 3 than the result will be 123.200.
      *   @param num the Number to format
      *   @param [left] number of digits to the left of the
      *   decimal point
@@ -115,6 +123,14 @@ declare module "../../index" {
      *   formatting floats, and one for formatting ints.
      *   The values for the digits, left, and right
      *   parameters should always be positive integers.
+     *   (NOTE): Be cautious when using left and right
+     *   parameters as it prepends numbers of 0's if the
+     *   parameter if greater than the current length of
+     *   the number. For example if number is 123.2 and
+     *   left parameter passed is 4 which is greater than
+     *   length of 123 (integer part) i.e 3 than result
+     *   will be 0123.2. Same case for right parameter i.e.
+     *   if right is 3 than the result will be 123.200.
      *   @param nums the Numbers to format
      *   @param [left] number of digits to the left of the
      *   decimal point
@@ -216,12 +232,27 @@ declare module "../../index" {
 
     /**
      *   Utility function for formatting numbers into
-     *   strings. Similar to nf() but puts a " " (space) in
-     *   front of positive numbers and a "-" in front of
-     *   negative numbers. There are two versions: one for
-     *   formatting floats, and one for formatting ints.
-     *   The values for the digits, left, and right
-     *   parameters should always be positive integers.
+     *   strings. Similar to nf() but puts an additional
+     *   "_" (space) in front of positive numbers just in
+     *   case to align it with negative numbers which
+     *   includes "-" (minus) sign. The main usecase of
+     *   nfs() can be seen when one wants to align the
+     *   digits (place values) of a positive number with
+     *   some negative number (See the example to get a
+     *   clear picture). There are two versions: one for
+     *   formatting float, and one for formatting int. The
+     *   values for the digits, left, and right parameters
+     *   should always be positive integers. (IMP): The
+     *   result on the canvas basically the expected
+     *   alignment can vary based on the typeface you are
+     *   using. (NOTE): Be cautious when using left and
+     *   right parameters as it prepends numbers of 0's if
+     *   the parameter if greater than the current length
+     *   of the number. For example if number is 123.2 and
+     *   left parameter passed is 4 which is greater than
+     *   length of 123 (integer part) i.e 3 than result
+     *   will be 0123.2. Same case for right parameter i.e.
+     *   if right is 3 than the result will be 123.200.
      *   @param num the Number to format
      *   @param [left] number of digits to the left of the
      *   decimal point
@@ -237,12 +268,27 @@ declare module "../../index" {
 
     /**
      *   Utility function for formatting numbers into
-     *   strings. Similar to nf() but puts a " " (space) in
-     *   front of positive numbers and a "-" in front of
-     *   negative numbers. There are two versions: one for
-     *   formatting floats, and one for formatting ints.
-     *   The values for the digits, left, and right
-     *   parameters should always be positive integers.
+     *   strings. Similar to nf() but puts an additional
+     *   "_" (space) in front of positive numbers just in
+     *   case to align it with negative numbers which
+     *   includes "-" (minus) sign. The main usecase of
+     *   nfs() can be seen when one wants to align the
+     *   digits (place values) of a positive number with
+     *   some negative number (See the example to get a
+     *   clear picture). There are two versions: one for
+     *   formatting float, and one for formatting int. The
+     *   values for the digits, left, and right parameters
+     *   should always be positive integers. (IMP): The
+     *   result on the canvas basically the expected
+     *   alignment can vary based on the typeface you are
+     *   using. (NOTE): Be cautious when using left and
+     *   right parameters as it prepends numbers of 0's if
+     *   the parameter if greater than the current length
+     *   of the number. For example if number is 123.2 and
+     *   left parameter passed is 4 which is greater than
+     *   length of 123 (integer part) i.e 3 than result
+     *   will be 0123.2. Same case for right parameter i.e.
+     *   if right is 3 than the result will be 123.200.
      *   @param nums the Numbers to format
      *   @param [left] number of digits to the left of the
      *   decimal point
diff --git a/types/p5/src/webgl/material.d.ts b/types/p5/src/webgl/material.d.ts
index 09f392d7e8..ecdf389ee7 100644
--- a/types/p5/src/webgl/material.d.ts
+++ b/types/p5/src/webgl/material.d.ts
@@ -63,6 +63,23 @@ declare module "../../index" {
         | Graphics
     ): p5;
 
+    /**
+     *   Sets the coordinate space for texture mapping. The
+     *   default mode is IMAGE which refers to the actual
+     *   coordinates of the image. NORMAL refers to a
+     *   normalized space of values ranging from 0 to 1.
+     *   This function only works in WEBGL mode. With
+     *   IMAGE, if an image is 100 x 200 pixels, mapping
+     *   the image onto the entire size of a quad would
+     *   require the points (0,0) (100, 0) (100,200)
+     *   (0,200). The same mapping in NORMAL is (0,0) (1,0)
+     *   (1,1) (0,1).
+     *   @param mode either IMAGE or NORMAL
+     */
+    textureMode(
+      mode: TEXTURE_MODE
+    ): void;
+
     /**
      *   Ambient material for geometry with a given color.
      *   You can view all possible materials in this
diff --git a/types/pad/index.d.ts b/types/pad/index.d.ts
index 9bf8a32dad..83968b1e92 100644
--- a/types/pad/index.d.ts
+++ b/types/pad/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pad 1.0
-// Project: https://github.com/wdavidw/node-pad#readme
+// Project: https://github.com/adaltas/node-pad
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/papaparse/index.d.ts b/types/papaparse/index.d.ts
index fc97ef210c..300e33b4a5 100644
--- a/types/papaparse/index.d.ts
+++ b/types/papaparse/index.d.ts
@@ -97,7 +97,7 @@ export interface ParseConfig {
     quoteChar?: string;            // default: '"'
     header?: boolean;              // default: false
     trimHeaders?: boolean;         // default: false
-    dynamicTyping?: boolean;       // default: false
+    dynamicTyping?: boolean | { [headerName: string]: boolean; [columnNumber: number]: boolean;} | ((field: string | number) => boolean); // default: false
     preview?: number;              // default: 0
     encoding?: string;             // default: ""
     worker?: boolean;              // default: false
diff --git a/types/papaparse/papaparse-tests.ts b/types/papaparse/papaparse-tests.ts
index 50929ff512..a22ea5b14d 100644
--- a/types/papaparse/papaparse-tests.ts
+++ b/types/papaparse/papaparse-tests.ts
@@ -2,12 +2,12 @@
 
 import Papa = require("papaparse");
 import {
-	ParseConfig,
-	UnparseConfig,
-	UnparseObject,
-	ParseError,
-	ParseMeta,
-	ParseResult
+    ParseConfig,
+    UnparseConfig,
+    UnparseObject,
+    ParseError,
+    ParseMeta,
+    ParseResult
 } from "papaparse";
 import { Readable } from "stream";
 
@@ -19,14 +19,26 @@ var res = Papa.parse("3,3,3");
 res.errors[0].code;
 
 Papa.parse("3,3,3", {
-	delimiter: ';',
-	comments: false,
+    delimiter: ';',
+    comments: false,
     trimHeaders: false,
+    step: function (results, p) {
+        p.abort();
+        results.data.length;
+    },
+    dynamicTyping: true
+});
 
-	step: function (results, p) {
-		p.abort();
-		results.data.length;
-	}
+Papa.parse("3,3,3", {
+    dynamicTyping: (field: string | number): boolean => /headerName/i.test(field.toString())
+});
+
+Papa.parse("3,3,3", {
+    dynamicTyping: {'headerName': true}
+});
+
+Papa.parse("3,3,3", {
+    dynamicTyping: {5: true}
 });
 
 var file = new File(null, null, null);
@@ -35,20 +47,20 @@ Papa.parse(file, {
     transform: function(value, field) {
 
     },
-	complete: function (a, b) {
-		a.meta.fields;
-		b.name;
-	}
+    complete: function (a, b) {
+        a.meta.fields;
+        b.name;
+    }
 });
 
 const readable = new Readable()
 const rows = [
-	"1,2,3",
-	"4,5,6"
+    "1,2,3",
+    "4,5,6"
 ]
 
 rows.forEach(r => {
-	readable.push(r);
+    readable.push(r);
 });
 
 const papaStream: NodeJS.ReadWriteStream = Papa.parse(Papa.NODE_STREAM_INPUT);
@@ -61,16 +73,16 @@ readable.pipe(papaStream);
 Papa.unparse([{ a: 1, b: 1, c: 1 }]);
 Papa.unparse([[1, 2, 3], [4, 5, 6]]);
 Papa.unparse({
-	fields: ["3"],
-	data: []
+    fields: ["3"],
+    data: []
 });
 
 Papa.unparse([{ a: 1, b: 1, c: 1 }], { quotes: false });
 Papa.unparse([{ a: 1, b: 1, c: 1 }], { quotes: [false, true, true] });
 Papa.unparse([[1, 2, 3], [4, 5, 6]], { delimiter: "," });
 Papa.unparse({
-	fields: ["3"],
-	data: []
+    fields: ["3"],
+    data: []
 }, { newline: "\n" });
 
 
diff --git a/types/paper/index.d.ts b/types/paper/index.d.ts
index 6c1f2979fb..409366488f 100644
--- a/types/paper/index.d.ts
+++ b/types/paper/index.d.ts
@@ -21,26 +21,7 @@ declare module paper {
     /**
     * Gives access to paper's configurable settings.
     */
-    export var settings: {
-        
-        /**
-         * controls whether newly created items are automatically inserted into the scene graph, by adding them to project.activeLayer — default: true
-         */
-        insertItems: boolean;
-        /**
-         * controls what value newly created items have their item.applyMatrix property set to (Note that not all items can set this to false) — default: true
-         */
-        applyMatrix: boolean;
-        /**
-         * the size of the curve handles when drawing selections — default: 4
-         */
-        handleSize: number;
-        /*
-         * the default tolerance for hit- tests, when no value is specified — default: 0
-         */
-        hitTolerance: number;
-
-    };
+    export var settings: Settings;
 
     /**
      * The currently active project.
@@ -1128,6 +1109,37 @@ declare module paper {
         modulo(size: number[]): Size;
         modulo(size: number): Size;
 
+		/**
+		 * Sets the size with the given width and height values.
+         * @param width - the width
+         * @param height - the height
+		 */
+		set(width: number, height: number): Size;
+
+		/**
+		 * Sets the size using the numbers in the given array as dimensions.
+         * @param array - an array of numbers
+		 */
+		set(array: number[]): Size;
+		
+		/**
+		 * Sets the size using the properties in the given object.
+         * @param object - the object literal containing properies (width:10, height:10 etc)
+		 */
+		set(object: any): Size;
+		
+		/**
+		 * Sets the size using the coordinates of the given Size object.
+         * @param size - the size to duplicate from
+         */
+		set(size: Size): Size;
+		
+		/**
+         * Sets the size using the point.x and point.y values of the given Point object.
+         * @param point - the point from which to create a size
+         */
+        set(point: Point): Size;
+
     }
     export interface IFrameEvent {
 
@@ -1163,13 +1175,7 @@ declare module paper {
         /**
         * Gives access to paper's configurable settings.
         */
-        settings: {
-
-            applyMatrix: boolean;
-            handleSize: number;
-            hitTolerance: number;
-
-        };
+        settings: Settings;
 
         /**
          * The currently active project.
@@ -5481,6 +5487,25 @@ declare module paper {
         type: 'mousedown' | 'mouseup' | 'mousedrag' | 'click' | 'doubleclick' | 'mousemove' | 'mouseenter' | 'mouseleave';
 
     }
+	
+	export interface Settings {
+        /**
+         * controls whether newly created items are automatically inserted into the scene graph, by adding them to project.activeLayer — default: true
+         */
+        insertItems: boolean;
+        /**
+         * controls what value newly created items have their item.applyMatrix property set to (Note that not all items can set this to false) — default: true
+         */
+        applyMatrix: boolean;
+        /**
+         * the size of the curve handles when drawing selections — default: 4
+         */
+        handleSize: number;
+        /*
+         * the default tolerance for hit- tests, when no value is specified — default: 0
+         */
+        hitTolerance: number;
+    }
 }
 
 declare module 'paper'
diff --git a/types/paper/paper-tests.ts b/types/paper/paper-tests.ts
index 1d1bc32abe..280b68c0e9 100644
--- a/types/paper/paper-tests.ts
+++ b/types/paper/paper-tests.ts
@@ -81,6 +81,10 @@ hitTestResults = paper.project.hitTestAll(hitTestPoint, hitOptionsInterfaceFull)
 
 paper.view.scaling = new paper.Point(1, 1);
 
+paper.settings.insertItems = true
+const paperScope = new paper.PaperScope();
+paperScope.settings.insertItems = false;
+
 function Examples() {
     function BooleanOperations(){
         let text = new paper.PointText({
diff --git a/types/parent-package-json/index.d.ts b/types/parent-package-json/index.d.ts
index b0ab9ec3ce..00ec17f302 100644
--- a/types/parent-package-json/index.d.ts
+++ b/types/parent-package-json/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for parent-package-json 2.0
-// Project: https://github.com/maxrimue/parent-package-json
+// Project: https://github.com/maxrimue/parent-package-json, https://github.com/maxrimue/parentpackagejson
 // Definitions by: Simon McClive <https://github.com/sgmccli>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/parse-torrent-file/index.d.ts b/types/parse-torrent-file/index.d.ts
index 85cdf13700..c3ee63ba9a 100644
--- a/types/parse-torrent-file/index.d.ts
+++ b/types/parse-torrent-file/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for parse-torrent-file 4.0
-// Project: https://github.com/feross/parse-torrent-file
+// Project: https://github.com/webtorrent/parse-torrent-file
 // Definitions by: Tomasz Łaziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/parse-torrent/index.d.ts b/types/parse-torrent/index.d.ts
index 9b410759a3..acfd6dcf48 100644
--- a/types/parse-torrent/index.d.ts
+++ b/types/parse-torrent/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for parse-torrent 5.8
-// Project: https://github.com/feross/parse-torrent
+// Project: https://github.com/webtorrent/parse-torrent
 // Definitions by: Bazyli Brzóska <https://github.com/niieani>, Tomasz Łaziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/parse-unit/index.d.ts b/types/parse-unit/index.d.ts
index 238f3cfc06..7b37d0e64b 100644
--- a/types/parse-unit/index.d.ts
+++ b/types/parse-unit/index.d.ts
@@ -3,5 +3,5 @@
 // Definitions by: Jack Works <https://github.com/Jack-Works>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare function parse(value: string): [number, string];
+declare function parse(value: string | number): [number, string];
 export = parse;
diff --git a/types/parse-unit/parse-unit-tests.ts b/types/parse-unit/parse-unit-tests.ts
index dd5dcb7e9f..5cd4b180b8 100644
--- a/types/parse-unit/parse-unit-tests.ts
+++ b/types/parse-unit/parse-unit-tests.ts
@@ -2,3 +2,7 @@ import parse = require('parse-unit');
 const [number, length] = parse('10px');
 number === 50;
 length === 'px';
+
+parse(10).length === 2;
+parse(10)[0] === 10;
+parse(10)[1] === '';
diff --git a/types/parse5-html-rewriting-stream/index.d.ts b/types/parse5-html-rewriting-stream/index.d.ts
index 42e0ef9734..cb905c3162 100644
--- a/types/parse5-html-rewriting-stream/index.d.ts
+++ b/types/parse5-html-rewriting-stream/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for parse5-html-rewriting-stream 5.1
-// Project: https://github.com/inikulin/parse5/tree/master/packages/parse5-html-rewriting-stream
+// Project: https://github.com/inikulin/parse5/tree/master/packages/parse5-html-rewriting-stream, https://github.com/inikulin/parse5
 // Definitions by: Sam Li <https://github.com/samuelli>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/passport-github2/index.d.ts b/types/passport-github2/index.d.ts
index 4ca8e93124..0048cfd901 100644
--- a/types/passport-github2/index.d.ts
+++ b/types/passport-github2/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for passport-github2 1.2
-// Project: https://github.com/jaredhanson/passport-github
+// Project: https://github.com/cfsghost/passport-github
 // Definitions by: Yasunori Ohoka <https://github.com/yasupeke>
 //                 Maarten Mulders <https://github.com/mthmulders>
 //                 Christoph Werner <https://github.com/codepunkt>
diff --git a/types/pathjs/index.d.ts b/types/pathjs/index.d.ts
index fa652d0245..2ab8198c59 100644
--- a/types/pathjs/index.d.ts
+++ b/types/pathjs/index.d.ts
@@ -3,6 +3,10 @@
 // Definitions by: Lokesh Peta <https://github.com/lokeshpeta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+export interface IDictionary<T> {
+    [id: string]: T;
+}
+
 interface IPathHistory{
 	initial: any;
 	pushState(state: any, title: string, path: string):void;
@@ -19,11 +23,11 @@ interface IPathRoute{
 }
 
 interface IPathRoutes{
-	current: IPathRoute,
-    root: IPathRoute,
-	rescue: Function,
-	previous: IPathRoute,
-	defined: {}
+	current?: string,
+    root?: string,
+	rescue?: Function,
+	previous?: string,
+	defined: IDictionary<IPathRoute>
 }
 
 interface IPathCore{
@@ -43,7 +47,7 @@ interface IPath {
 	
 	history: IPathHistory;
 	
-	match(path: string, parameterize: boolean): IPathRoute;
+	match(path: string, parameterize: boolean): IPathRoute | null;
 	
 	dispatch(passed_route: string): void;
 	
diff --git a/types/pathjs/pathjs-tests.ts b/types/pathjs/pathjs-tests.ts
index f64fa2a15b..e71dcc7dbb 100644
--- a/types/pathjs/pathjs-tests.ts
+++ b/types/pathjs/pathjs-tests.ts
@@ -1,4 +1,4 @@
-
+import {Path} from "./index";
 
 Path.map("/test/:id")
 .to(()=>{ });
@@ -30,4 +30,4 @@ var funs = new Array<Function>();
 funs.push(test1);
 funs.push(test2);
 
-route.enter(funs);
\ No newline at end of file
+route.enter(funs);
diff --git a/types/pathwatcher/index.d.ts b/types/pathwatcher/index.d.ts
index 4e5476bd80..045e1ede40 100644
--- a/types/pathwatcher/index.d.ts
+++ b/types/pathwatcher/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pathwatcher 8.x
-// Project: https://github.com/atom/node-pathwatcher
+// Project: https://github.com/atom/node-pathwatcher, http://atom.github.io/node-pathwatcher
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pem/index.d.ts b/types/pem/index.d.ts
index bdfa3e1196..b4fa793128 100644
--- a/types/pem/index.d.ts
+++ b/types/pem/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for PEM 1.9
-// Project: https://github.com/andris9/pem
+// Project: https://github.com/dexus/pem
 // Definitions by: Anthony Trinh <https://github.com/tony19>, Ruslan Arkhipau <https://github.com/DethAriel>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference types="node" />
diff --git a/types/petit-dom/index.d.ts b/types/petit-dom/index.d.ts
index 937fbfa0e7..52e507f980 100644
--- a/types/petit-dom/index.d.ts
+++ b/types/petit-dom/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Petit-Dom 0.2
-// Project: // https://github.com/yelouafi/petit-dom
+// Project: https://github.com/yelouafi/petit-dom
 // Definitions by: James Messinger <https://github.com/JamesMessinger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.0
diff --git a/types/pg/index.d.ts b/types/pg/index.d.ts
index 44863aee0b..35ef7801b4 100644
--- a/types/pg/index.d.ts
+++ b/types/pg/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pg 7.4
-// Project: https://github.com/brianc/node-postgres
+// Project: http://github.com/brianc/node-postgres
 // Definitions by: Phips Peter <https://github.com/pspeter3>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
@@ -206,7 +206,9 @@ export interface PoolClient extends ClientBase {
     release(err?: Error): void;
 }
 
-export class Query extends events.EventEmitter {
+export class Query extends events.EventEmitter implements Submittable {
+    constructor(queryTextOrConfig?: string | QueryConfig, values?: any[]);
+    submit: (connection: Connection) => void;
     on(event: "row", listener: (row: any, result?: ResultBuilder) => void): this;
     on(event: "error", listener: (err: Error) => void): this;
     on(event: "end", listener: (result: ResultBuilder) => void): this;
diff --git a/types/phoenix/index.d.ts b/types/phoenix/index.d.ts
index 5f8956bee5..8b0e6574d8 100644
--- a/types/phoenix/index.d.ts
+++ b/types/phoenix/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for phoenix
 // Project: https://github.com/phoenixframework/phoenix
-// Definitions by: Mirosław Ciastek <https://github.com/mciastek>
+// Definitions by: Mirosław Ciastek <https://github.com/mciastek>, John Goff <https://github.com/John-Goff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module "phoenix" {
@@ -123,21 +123,23 @@ declare module "phoenix" {
     appendParams(url: string, params: any): string;
   }
 
-  export var Presence: {
-    syncState(
+  export class Presence {
+    constructor(channel: Channel, opts?: Object);
+
+    static syncState(
       currentState: any,
       newState: any,
       onJoin?: (key?: string, currentPresence?: any, newPresence?: any) => void,
       onLeave?: (key?: string, currentPresence?: any, newPresence?: any) => void
     ): any;
 
-    syncDiff(
+    static syncDiff(
       currentState: any,
       newState: any,
       onJoin?: (key?: string, currentPresence?: any, newPresence?: any) => void,
       onLeave?: (key?: string, currentPresence?: any, newPresence?: any) => void
     ): any;
 
-    list(presences: any, chooser?: Function): any;
+    static list(presences: Object, chooser?: Function): any;
   }
 }
diff --git a/types/phoenix/phoenix-tests.ts b/types/phoenix/phoenix-tests.ts
index a086e1c27d..1e7641fc91 100644
--- a/types/phoenix/phoenix-tests.ts
+++ b/types/phoenix/phoenix-tests.ts
@@ -38,33 +38,28 @@ function test_hooks() {
 }
 
 function test_presence() {
-    let state = {};
-    const stateFromServer = {};
+  const socket = new Socket("/ws", {params: {userToken: "123"}});
 
-    const onJoin = (id: string, current: any, newPres: any) => {
-      if(!current){
-        console.log("user has entered for the first time", newPres)
-      } else {
-        console.log("user additional presence", newPres)
-      }
-    };
+  const channel = socket.channel("room:123", {token: '123'});
+  const presence = new Presence(channel);
 
-    const onLeave = (id: string, current: any, leftPres: any) => {
-      if(current.metas.length === 0){
-        console.log("user has left from all devices", leftPres)
-      } else {
-        console.log("user left from a device", leftPres)
-      }
-    };
+  let presenceState = {};
 
-    state = Presence.syncState(state, stateFromServer, onJoin, onLeave);
+  const logState = (state: Object) => {
+    Presence.list(state, (id: string) => id).forEach(console.log);
+  };
 
-    const listBy = (id: string, {metas: [first, ...rest]} : {metas: any[]}) => {
-      first.count = rest.length + 1;
-      first.id = id;
+  channel.on("presence_state", (state) => {
+    presenceState = Presence.syncState(presenceState, state);
+    logState(presenceState);
+  });
 
-      return first;
-    };
+  channel.on("presence_diff", (diff) => {
+    presenceState = Presence.syncState(presenceState, diff);
+    logState(presenceState);
+  });
 
-    const onlineUsers = Presence.list(state, listBy);
+  socket.connect();
+
+  channel.join();
 }
diff --git a/types/pigpio/index.d.ts b/types/pigpio/index.d.ts
index 8eaa6491bb..b62528b17c 100644
--- a/types/pigpio/index.d.ts
+++ b/types/pigpio/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for pigpio 1.2
 // Project: https://github.com/fivdi/pigpio
-// Definitions by: ManerFan <https://github.com/manerfan>, erikma <https://github.com/erikma>
+// Definitions by: ManerFan <https://github.com/manerfan>
+//                 erikma <https://github.com/erikma>
+//                 park012241 <https://github.com/park012241>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -72,9 +74,9 @@ export class Gpio extends NodeJS.EventEmitter {
 
     /**
      * Sets the GPIO level to 0 or 1. If PWM or servo pulses are active on the GPIO they are switched off.
-     * @param levle     0 or 1
+     * @param level     0 or 1
      */
-    digitalWrite(levle: number): Gpio;
+    digitalWrite(level: number): Gpio;
 
     /**
      * Sends a trigger pulse to the GPIO. The GPIO is set to level for pulseLen microseconds and then reset to not level.
diff --git a/types/pikaday-time/index.d.ts b/types/pikaday-time/index.d.ts
index 33a312801d..c9a62488f2 100644
--- a/types/pikaday-time/index.d.ts
+++ b/types/pikaday-time/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pikaday-time 1.4
-// Project: https://github.com/owenmead/Pikaday
+// Project: https://github.com/owenmead/Pikaday, http://dbushell.github.io/pikaday
 // Definitions by: Sayan Pal <https://github.com/Sayan751>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pikaday/index.d.ts b/types/pikaday/index.d.ts
index 63967d3169..2233fa9b4c 100644
--- a/types/pikaday/index.d.ts
+++ b/types/pikaday/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pikaday 1.7
-// Project: https://github.com/dbushell/Pikaday
+// Project: https://github.com/dbushell/Pikaday, https://pikaday.com
 // Definitions by: Rudolph Gottesheim <https://github.com/MidnightDesign>
 //                 Åke Wivänge <https://github.com/wake42>
 //                 Istvan Mezo <https://github.com/mezoistvan>
@@ -44,7 +44,7 @@ declare class Pikaday {
      * can optionally be passed as the second parameter to prevent triggering
      * of the onSelect callback, allowing the date to be set silently.
      */
-    setDate(date: string | Date, triggerOnSelect?: boolean): void;
+    setDate(date: string | Date | null, preventOnSelect?: boolean): void;
 
     /**
      * Returns a Moment.js object for the selected date (Moment must be
@@ -90,24 +90,24 @@ declare class Pikaday {
     /**
      * Update the minimum/earliest date that can be selected.
      */
-    setMinDate(date: Date): void;
+    setMinDate(date: Date | null): void;
 
     /**
      * Update the maximum/latest date that can be selected.
      */
-    setMaxDate(date: Date): void;
+    setMaxDate(date: Date | null): void;
 
     /**
      * Update the range start date. For using two Pikaday instances to
      * select a date range.
      */
-    setStartRange(date: Date): void;
+    setStartRange(date: Date | null): void;
 
     /**
      * Update the range end date. For using two Pikaday instances to select
      * a date range.
      */
-    setEndRange(date: Date): void;
+    setEndRange(date: Date | null): void;
 
     /**
      * Update the HTML.
@@ -138,6 +138,11 @@ declare class Pikaday {
      * Hide the picker and remove all event listeners - no going back!
      */
     destroy(): void;
+
+    /**
+     * Clear and reset the date
+     */
+    clear(): void;
 }
 
 // merge the Pikaday class declaration with a module
diff --git a/types/pikaday/pikaday-tests.ts b/types/pikaday/pikaday-tests.ts
index 14250d0df3..230104daf7 100644
--- a/types/pikaday/pikaday-tests.ts
+++ b/types/pikaday/pikaday-tests.ts
@@ -30,6 +30,9 @@ new Pikaday({field: $('#datepicker')[0]});
     picker.toString('YYYY-MM-DD');
     picker.getDate();
     picker.setDate('2015-01-01');
+    picker.setDate('2015-01-01', true);
+    picker.setDate(null);
+    picker.setDate(null, true);
     picker.getMoment();
     picker.setMoment(moment('14th February 2014', 'DDo MMMM YYYY'));
     picker.setMoment(moment('14th February 2014', 'DDo MMMM YYYY'), true);
@@ -41,12 +44,17 @@ new Pikaday({field: $('#datepicker')[0]});
     picker.gotoYear(2015);
     picker.setMinDate(new Date());
     picker.setMaxDate(new Date());
+    picker.setMinDate(null);
+    picker.setMaxDate(null);
     picker.setStartRange(new Date());
+    picker.setStartRange(null);
     picker.setEndRange(new Date());
+    picker.setEndRange(null);
     picker.isVisible();
     picker.show();
     picker.adjustPosition();
     picker.hide();
+    picker.clear();
     picker.destroy();
 })();
 
diff --git a/types/pino/index.d.ts b/types/pino/index.d.ts
index 28a385cb35..610ae076ee 100644
--- a/types/pino/index.d.ts
+++ b/types/pino/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pino 5.8
-// Project: https://github.com/pinojs/pino.git
+// Project: https://github.com/pinojs/pino.git, http://getpino.io
 // Definitions by: Peter Snider <https://github.com/psnider>
 //                 BendingBender <https://github.com/BendingBender>
 //                 Christian Rackerseder <https://github.com/screendriver>
diff --git a/types/pinyin/index.d.ts b/types/pinyin/index.d.ts
index 059adead21..68c8aa2dba 100644
--- a/types/pinyin/index.d.ts
+++ b/types/pinyin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pinyin 2.8
-// Project: https://github.com/hotoo/pinyin
+// Project: https://github.com/hotoo/pinyin, http://pinyin.hotoo.me
 // Definitions by: AnJun Wang <https://github.com/wanganjun>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/pkgcloud/README.md b/types/pkgcloud/README.md
new file mode 100644
index 0000000000..20815adfb4
--- /dev/null
+++ b/types/pkgcloud/README.md
@@ -0,0 +1,7 @@
+This file exists for reminding contributors that this definition is **WIP**.
+
+### Note
+
+pkgcloud has a large number of client types and providers. Only some clients and providers have types defined.
+
+You are welcome to contribute definitions for other clients and providers and add provider specific properties.
diff --git a/types/pkgcloud/index.d.ts b/types/pkgcloud/index.d.ts
new file mode 100644
index 0000000000..7a0a55a773
--- /dev/null
+++ b/types/pkgcloud/index.d.ts
@@ -0,0 +1,131 @@
+// Type definitions for pkgcloud 1.7
+// Project: https://github.com/pkgcloud/pkgcloud#readme
+// Definitions by: Daniel Friesen <https://github.com/dantman>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+export const version: string;
+
+export interface ClientError extends Error {
+    provider?: Providers;
+    method?: string;
+    failCode?: string;
+    statusCode?: number;
+    href?: string;
+    headers?: { [headerName: string]: string };
+    result?: any;
+}
+
+export type Providers =
+    | 'amazon'
+    | 'azure'
+    | 'digitalocean'
+    | 'google'
+    | 'hp'
+    | 'iriscouch'
+    | 'joyent'
+    | 'mongohq'
+    | 'mongolab'
+    | 'oneandone'
+    | 'openstack'
+    | 'rackspace'
+    | 'redistogo'
+    | 'telefonic';
+
+export interface BaseProviderOptions {
+    provider: Providers;
+}
+
+export interface AmazonProviderOptions {
+    provider: 'amazon';
+    keyId: string;
+    key: string;
+    region?: string;
+}
+
+export interface AzureProviderOptions {
+    provider: 'azure';
+    storageAccount: string;
+    storageAccessKey: string;
+    location?: string;
+}
+
+export type ProviderOptions = BaseProviderOptions & Partial<
+    | AmazonProviderOptions
+    | AzureProviderOptions
+>;
+
+/**
+ * Storage
+ */
+
+export namespace storage {
+    interface StorageUploadOptions {
+        container: string;
+        remote: string;
+    }
+
+    interface StorageDownloadOptions {
+        container: string;
+        remote: string;
+    }
+
+    interface Client {
+        provider: string;
+        config: ProviderOptions;
+        protocol: string;
+
+        getContainers(
+            callback: (err: ClientError, containers: Container[]) => any,
+        ): void;
+        createContainer(
+            options: any,
+            callback: (err: ClientError, container: Container) => any,
+        ): void;
+        destroyContainer(
+            containerName: string,
+            callback: (err: ClientError) => any,
+        ): void;
+        getContainer(
+            containerName: string,
+            callback: (err: ClientError, container: Container) => any,
+        ): void;
+        upload(options: StorageUploadOptions): NodeJS.WriteStream;
+        download(options: StorageDownloadOptions): NodeJS.ReadStream;
+        getFiles(
+            containerName: string,
+            callback: (err: ClientError, files: File[]) => any,
+        ): void;
+        getFile(
+            containerName: string,
+            file: string,
+            callback: (err: ClientError, file: File) => any,
+        ): void;
+        removeFile(
+            containerName: string,
+            file: string,
+            callback: (err: ClientError) => any,
+        ): void;
+        // Logs
+        on(
+            eventName: string,
+            callback: (message: string, object?: any) => any,
+        ): void;
+    }
+
+    interface Container {
+        // files: ?
+        client: Client;
+    }
+
+    interface File {
+        container: string;
+        name: string;
+        size: number;
+        client: Client;
+    }
+
+    function createClient(options: ProviderOptions): Client;
+}
diff --git a/types/pkgcloud/pkgcloud-tests.ts b/types/pkgcloud/pkgcloud-tests.ts
new file mode 100644
index 0000000000..62846b6b55
--- /dev/null
+++ b/types/pkgcloud/pkgcloud-tests.ts
@@ -0,0 +1,64 @@
+import { createReadStream, createWriteStream } from "fs";
+import * as pkgcloud from "pkgcloud";
+
+/**
+ * Storage
+ */
+
+// Amazon
+pkgcloud.storage.createClient({
+	provider: 'amazon',
+	keyId: 'ABDEFGHI',
+	key: 'AABDEF==',
+});
+
+// Azure
+pkgcloud.storage.createClient({
+	provider: 'azure',
+	storageAccount: 'abcdefg',
+	storageAccessKey: 'AABDEF==',
+});
+
+// Upload a File
+{
+	const client = pkgcloud.storage.createClient({
+		provider: 'amazon'
+	});
+
+	const readStream = createReadStream('a-file.txt');
+	const writeStream = client.upload({
+		container: 'a-container',
+		remote: 'remote-file-name.txt'
+	});
+
+	writeStream.on('error', (err: pkgcloud.ClientError) => {});
+	writeStream.on('success', (file: pkgcloud.storage.File) => {});
+	readStream.pipe(writeStream);
+}
+
+// Download a File
+{
+	const client = pkgcloud.storage.createClient({
+		provider: 'amazon'
+	});
+
+	const readStream = client.download({
+		container: 'a-container',
+		remote: 'remote-file-name.txt'
+	});
+	readStream.pipe(createWriteStream('a-file.txt'));
+}
+
+// Logs
+{
+	const client = pkgcloud.storage.createClient({
+		provider: 'amazon'
+	});
+
+	client.on('log::*', (message, object) => {
+		console.log(message);
+		if (object) {
+			console.dir(object);
+		}
+	});
+}
diff --git a/types/pkgcloud/tsconfig.json b/types/pkgcloud/tsconfig.json
new file mode 100644
index 0000000000..f36ed5e952
--- /dev/null
+++ b/types/pkgcloud/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "pkgcloud-tests.ts"
+    ]
+}
diff --git a/types/pkgcloud/tslint.json b/types/pkgcloud/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pkgcloud/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/platform/index.d.ts b/types/platform/index.d.ts
index b0f640d522..c1db7431f3 100644
--- a/types/platform/index.d.ts
+++ b/types/platform/index.d.ts
@@ -18,8 +18,8 @@ declare interface Platform {
         version?: string;
         toString(): string;
     };
-    parse?(ua: string): Platform;
-    toString?(): string;
+    parse(ua: string): Platform;
+    toString(): string;
 }
 
 declare var platform: Platform;
diff --git a/types/platform/platform-tests.ts b/types/platform/platform-tests.ts
index 65433ffb13..ce8648e876 100644
--- a/types/platform/platform-tests.ts
+++ b/types/platform/platform-tests.ts
@@ -16,7 +16,8 @@ var tests: TestContainer = {
         prerelease: null,
         product: null,
         ua: "Mozilla/5.0 (Linux; U; Android 4.0.3; zh-cn; HTC Sensation XE with Beats Audio Build/IML74K) AppleWebKit/535.7 (KHTML, like Gecko) CrMo/16.0.912.77 Mobile Safari/535.7",
-        version: "16.0.912.77"
+        version: "16.0.912.77",
+        parse: function () {throw new Error()}
     },
     'WebKit Nightly 528.4 (like Safari 4.x) on Mac OS X 10.4.11': {
         description: "WebKit Nightly 528.4 (like Safari 4.x) on Mac OS X 10.4.11",
@@ -31,7 +32,8 @@ var tests: TestContainer = {
         prerelease: "alpha",
         product: null,
         ua: "Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_4_11; tr) AppleWebKit/528.4+ (KHTML, like Gecko) Version/4.0dp1 Safari/526.11.2",
-        version: "528.4"
+        version: "528.4",
+        parse: function () {throw new Error()}
     }
 };
 
diff --git a/types/pleasejs/index.d.ts b/types/pleasejs/index.d.ts
index ad3c3a7972..df696d47b0 100644
--- a/types/pleasejs/index.d.ts
+++ b/types/pleasejs/index.d.ts
@@ -12,32 +12,28 @@ declare namespace PleaseJS{
          * @param {MakeColorOption} options
          * @returns {Array}
          */
-        make_color(options?: MakeColorOption): Array<string>;
-        make_color(options?: MakeColorOption): Array<RGB>;
-        make_color(options?: MakeColorOption): Array<HSV>;
+        make_color(options?: MakeColorOption): Array<string | RGB | HSV>;
 
         /***
          * make a color scheme
          * @param {MakeSchemeOption} options
          * @returns {Array}
          */
-        make_scheme(base_color: HSV, options?: MakeSchemeOption): Array<string>;
-        make_scheme(base_color: HSV, options?: MakeSchemeOption): Array<RGB>;
-        make_scheme(base_color: HSV, options?: MakeSchemeOption): Array<HSV>;
+        make_scheme(base_color: HSV, options?: MakeSchemeOption): Array<string | RGB | HSV>;
 
         /***
          * convert color name into hex string
          * @param {string} name
          * @returns {string}
          */
-        NAME_to_HEX(name: string): string;
+        NAME_to_HEX(name: string): string | undefined;
 
         /***
          * convert color name into RGB
          * @param {string} name
          * @returns {RGB}
          */
-        NAME_to_RGB(name: string): RGB;
+        NAME_to_RGB(name: string): RGB | null;
 
         /***
          * convert color name into RGB
@@ -51,7 +47,7 @@ declare namespace PleaseJS{
          * @param {string} hex
          * @returns {RGB}
          */
-        HEX_to_RGB(hex: string): RGB;
+        HEX_to_RGB(hex: string): RGB | null;
 
         /***
          * convert RGB into HEX
diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index 31a7bfac0e..af90a6f6a0 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for plotly.js 1.43
-// Project: https://plot.ly/javascript/
+// Project: https://plot.ly/javascript/, https://github.com/plotly/plotly.js
 // Definitions by: Chris Gervang <https://github.com/chrisgervang>
 //                 Martin Duparc <https://github.com/martinduparc>
 //                 Frederik Aalund <https://github.com/frederikaalund>
diff --git a/types/plugapi/index.d.ts b/types/plugapi/index.d.ts
index 7f6b24ecd9..7559b2d555 100644
--- a/types/plugapi/index.d.ts
+++ b/types/plugapi/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for plugapi 4.2
-// Project: https://www.npmjs.com/package/plugapi
+// Project: https://github.com/plugcubed/plugapi
 // Definitions by: Brice Theurillat <https://github.com/BNedry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 declare namespace PlugAPI {
diff --git a/types/plugin-error/index.d.ts b/types/plugin-error/index.d.ts
index 800f0932ba..6b38734f70 100644
--- a/types/plugin-error/index.d.ts
+++ b/types/plugin-error/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for plugin-error 0.1
-// Project: https://github.com/jonschlinkert/plugin-error
+// Project: https://github.com/gulpjs/plugin-error
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/pollyjs__adapter-fetch/index.d.ts b/types/pollyjs__adapter-fetch/index.d.ts
index d38313db9d..30fe9f1cab 100644
--- a/types/pollyjs__adapter-fetch/index.d.ts
+++ b/types/pollyjs__adapter-fetch/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @pollyjs/adapter-fetch 1.3
+// Type definitions for @pollyjs/adapter-fetch 2.0
 // Project: https://github.com/netflix/pollyjs/tree/master/packages/@pollyjs/adapter-fetch
 // Definitions by: feinoujc <https://github.com/feinoujc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/pollyjs__adapter-node-http/index.d.ts b/types/pollyjs__adapter-node-http/index.d.ts
index 1ffab20c7e..55a096c242 100644
--- a/types/pollyjs__adapter-node-http/index.d.ts
+++ b/types/pollyjs__adapter-node-http/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @pollyjs/adapter-node-http 1.4
+// Type definitions for @pollyjs/adapter-node-http 2.0
 // Project: https://github.com/netflix/pollyjs/tree/master/packages/@pollyjs/adapter-node-http
 // Definitions by: jlmessenger <https://github.com/jlmessenger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/pollyjs__adapter/index.d.ts b/types/pollyjs__adapter/index.d.ts
index 0bc49fd73b..8060595a6f 100644
--- a/types/pollyjs__adapter/index.d.ts
+++ b/types/pollyjs__adapter/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @pollyjs/adapter 1.3
+// Type definitions for @pollyjs/adapter 2.0
 // Project: https://github.com/netflix/pollyjs/tree/master/packages/@pollyjs/adapter
 // Definitions by: feinoujc <https://github.com/feinoujc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/pollyjs__core/index.d.ts b/types/pollyjs__core/index.d.ts
index 4f6d308d0d..8ffe642497 100644
--- a/types/pollyjs__core/index.d.ts
+++ b/types/pollyjs__core/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @pollyjs/core 1.3
+// Type definitions for @pollyjs/core 2.0
 // Project: https://github.com/netflix/pollyjs/tree/master/packages/@pollyjs/core
 // Definitions by: feinoujc <https://github.com/feinoujc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -70,7 +70,7 @@ export interface Request {
 	port: string;
 	pathname: string;
 	hash: string;
-	headers: Record<string, string>;
+	headers: Record<string, string | string[]>;
 	body: any;
 	query: any;
 	params: any;
@@ -79,7 +79,7 @@ export interface Request {
 }
 export interface Response {
 	statusCode?: number;
-	headers: Record<string, string>;
+	headers: Record<string, string | string[]>;
 	body: any;
 	status(status: number): Response;
 	getHeader(name: string): string | null;
diff --git a/types/pollyjs__persister-fs/index.d.ts b/types/pollyjs__persister-fs/index.d.ts
index fc7f9ad656..40c3d4a3a4 100644
--- a/types/pollyjs__persister-fs/index.d.ts
+++ b/types/pollyjs__persister-fs/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @pollyjs/persister-fs 1.3
+// Type definitions for @pollyjs/persister-fs 2.0
 // Project: https://github.com/netflix/pollyjs/tree/master/packages/@pollyjs/persister-fs
 // Definitions by: feinoujc <https://github.com/feinoujc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/pollyjs__persister/index.d.ts b/types/pollyjs__persister/index.d.ts
index 87e1c27f5b..b46d10ed83 100644
--- a/types/pollyjs__persister/index.d.ts
+++ b/types/pollyjs__persister/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @pollyjs/persister 1.3
+// Type definitions for @pollyjs/persister 2.0
 // Project: https://github.com/netflix/pollyjs/tree/master/packages/@pollyjs/persister
 // Definitions by: feinoujc <https://github.com/feinoujc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/pollyjs__utils/index.d.ts b/types/pollyjs__utils/index.d.ts
index ca3e7735ef..bf5d4d0c68 100644
--- a/types/pollyjs__utils/index.d.ts
+++ b/types/pollyjs__utils/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @pollyjs/utils 1.3
+// Type definitions for @pollyjs/utils 2.0
 // Project: https://github.com/netflix/pollyjs/tree/master/packages/@pollyjs/utils
 // Definitions by: feinoujc <https://github.com/feinoujc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/polymer/index.d.ts b/types/polymer/index.d.ts
index 0691c8506f..eccf02fbca 100644
--- a/types/polymer/index.d.ts
+++ b/types/polymer/index.d.ts
@@ -218,6 +218,10 @@ declare global {
       detached?(): void;
 
       attributeChanged?(name: string, oldValue: any, newValue: any): void;
+        
+      getEffectiveChildren?(): Node[];
+
+      getEffectiveChildNodes?(): Node[];
     }
 
     // This is the type of a Polymer element after it has gone through the
@@ -278,6 +282,8 @@ declare global {
 
       unobserveNodes(observer: {}): void;
 
+      getEffectiveChildNodes(): Node[];
+
       childNodes:Node[];
 
       children:Element[];
diff --git a/types/postman-collection/index.d.ts b/types/postman-collection/index.d.ts
index 7a05c39128..0b32209b4f 100644
--- a/types/postman-collection/index.d.ts
+++ b/types/postman-collection/index.d.ts
@@ -154,7 +154,7 @@ export interface ItemGroupDefinition extends PropertyDefinition {
 
 export class ItemGroup<TItem> extends Property<ItemGroupDefinition> {
     auth?: RequestAuth;
-    items: PropertyList<TItem>;
+    items: PropertyList<TItem | ItemGroup<TItem>>;
     events: EventList;
 
     constructor(definition?: ItemGroupDefinition);
diff --git a/types/postman-collection/postman-collection-tests.ts b/types/postman-collection/postman-collection-tests.ts
index d203ed68f0..6b00083e74 100644
--- a/types/postman-collection/postman-collection-tests.ts
+++ b/types/postman-collection/postman-collection-tests.ts
@@ -137,7 +137,7 @@ igDef.event; // $ExpectType EventDefinition[] | undefined
 // ItemGroup Tests
 const ig = new pmCollection.ItemGroup<pmCollection.Certificate>();
 ig.auth; // $ExpectType RequestAuth | undefined
-ig.items; // $ExpectType PropertyList<Certificate>
+ig.items; // $ExpectType PropertyList<Certificate | ItemGroup<Certificate>>
 ig.events; // $ExpectType EventList
 
 ig.authorizeRequestsUsing("string"); // $ExpectType void
diff --git a/types/postmate/index.d.ts b/types/postmate/index.d.ts
new file mode 100644
index 0000000000..5a68ef27e7
--- /dev/null
+++ b/types/postmate/index.d.ts
@@ -0,0 +1,126 @@
+// Type definitions for postmate 1.5
+// Project: https://github.com/dollarshaveclub/postmate
+// Definitions by: Wayne Carson <https://github.com/wcarson>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * This is written in the parent page. Creates an iFrame at the specified url. Initiates a connection with the
+ * child. Returns a Promise that signals when the handshake is complete and communication is ready to begin.
+ */
+declare class Postmate extends Promise<Postmate.ParentAPI> {
+    /**
+     * Set to true to enable logging of additional information. Default: false
+     */
+    static debug: boolean;
+
+    /**
+     * Replace the Promise API that Postmate uses. Default: window.Promise
+     */
+    static Promise: Promise<any>;
+
+    /**
+     * Initializes a new instance of Postmate
+     *
+     * @param options configuration options
+     */
+    constructor(options: Postmate.PostmateOptions);
+}
+
+declare namespace Postmate {
+    /**
+     * Options passed to the Postmate constructor
+     */
+    interface PostmateOptions {
+        /**
+         * An element to append the iFrame to. Default: document.body
+         */
+        container?: HTMLElement|null;
+
+        /**
+         * An object literal to represent the default values of the child's model
+         */
+        model?: any;
+
+        /**
+         * A URL to load in the iFrame. The origin of this URL will also be used for securing message transport
+         */
+        url: string;
+
+        /**
+         * An Array to add classes to the iFrame. Useful for styling
+         */
+        classListArray?: string[];
+    }
+
+    /**
+     * Composes an API to be used by the parent
+     */
+    interface ParentAPI {
+        /**
+         * The iFrame Element that the parent is communicating with
+         */
+        frame: HTMLIFrameElement;
+
+        /**
+         * Retrieves a value by property name from the child's model object.
+         *
+         * @param key The string property to lookup in the child's model
+         * @returns child model property value
+         */
+        get(key: string): Promise<any>;
+
+        /**
+         * Calls a function on the child's model
+         *
+         * @param key The string property to lookup in the child's model
+         * @param data The optional data to send to the child function
+         */
+        call(key: string, data?: any): void;
+
+        /**
+         * Listen to a particular event from the child
+         *
+         * @param eventName the name of the event
+         * @param callback the event handler function
+         */
+        on(eventName: string, callback: (data?: any) => void): void;
+
+        /**
+         * Removes the iFrame element and destroys any message event listeners
+         */
+        destroy(): void;
+    }
+
+    /**
+     * Composes an API to be used by the child
+     */
+    interface ChildAPI {
+        /**
+         * Emits an event to the parent
+         *
+         * @param name the name of the event
+         * @param data event data
+         */
+        emit(name: string, data?: any): void;
+    }
+
+    /**
+     * This is written in the child page. Calling Postmate.Model initiates a handshake request listener from the
+     * Child. Once the handshake is complete, an event listener is bound to receive requests from the Parent. The
+     * Child model is extended from the model provided by the Parent.
+     */
+    class Model extends Promise<ChildAPI> {
+        /**
+         * Initializes a new instance of Model
+         *
+         * @param model An object of gettable properties to expose to the parent. Value types may be anything
+         * accepted in postMessage. Promises may also be set as values or returned from functions. Default: {}
+         */
+        constructor(model: any);
+    }
+}
+
+/**
+ * Module export
+ */
+export = Postmate;
diff --git a/types/postmate/postmate-tests.ts b/types/postmate/postmate-tests.ts
new file mode 100644
index 0000000000..ef85372ff4
--- /dev/null
+++ b/types/postmate/postmate-tests.ts
@@ -0,0 +1,38 @@
+import Postmate = require('postmate');
+
+//
+// Tests are based on code samples on https://github.com/dollarshaveclub/postmate#usage
+//
+
+///////////////////////////
+// parent.com
+
+// Kick off the handshake with the iFrame
+const parentHandshake = new Postmate({
+  container: document.getElementById('some-div'),
+  url: 'http://child.com/page.html',
+  classListArray: ["myClass"]
+});
+
+// When parent <-> child handshake is complete, data may be requested from the child
+parentHandshake.then(child => {
+  // Fetch the height property in child.html and set it to the iFrames height
+  child.get('height')
+    .then(height => child.frame.style.height = `${height}px`);
+
+  // Listen to a particular event from the child
+  child.on('some-event', data => console.log(data)); // Logs "Hello, World!"
+});
+
+///////////////////////////
+// child.com/page.html
+
+const childHandshake = new Postmate.Model({
+  // Expose your model to the Parent. Property values may be functions, promises, or regular values
+  height: () => (document as any).height || document.body.offsetHeight
+});
+
+// When parent <-> child handshake is complete, events may be emitted to the parent
+childHandshake.then(parent => {
+  parent.emit('some-event', 'Hello, World!');
+});
diff --git a/types/postmate/tsconfig.json b/types/postmate/tsconfig.json
new file mode 100644
index 0000000000..4a70b478e7
--- /dev/null
+++ b/types/postmate/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",
+        "postmate-tests.ts"
+    ]
+}
diff --git a/types/postmate/tslint.json b/types/postmate/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/postmate/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-adapter-fruitdown/index.d.ts b/types/pouchdb-adapter-fruitdown/index.d.ts
index 1cf2b78952..2a0857445f 100644
--- a/types/pouchdb-adapter-fruitdown/index.d.ts
+++ b/types/pouchdb-adapter-fruitdown/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-adapter-fruitdown 6.1
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/pouchdb/pouchdb
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pouchdb-adapter-http/index.d.ts b/types/pouchdb-adapter-http/index.d.ts
index 74ea96fd5b..4f0b9eefbf 100644
--- a/types/pouchdb-adapter-http/index.d.ts
+++ b/types/pouchdb-adapter-http/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-http 6.1
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/pouchdb/pouchdb
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pouchdb-adapter-idb/index.d.ts b/types/pouchdb-adapter-idb/index.d.ts
index 4de6491c64..939f68a908 100644
--- a/types/pouchdb-adapter-idb/index.d.ts
+++ b/types/pouchdb-adapter-idb/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-adapter-idb 6.1
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/pouchdb/pouchdb
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pouchdb-adapter-leveldb/index.d.ts b/types/pouchdb-adapter-leveldb/index.d.ts
index 087cc4170a..cab35c83c6 100644
--- a/types/pouchdb-adapter-leveldb/index.d.ts
+++ b/types/pouchdb-adapter-leveldb/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-adapter-leveldb 6.1
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/pouchdb/pouchdb
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pouchdb-adapter-localstorage/index.d.ts b/types/pouchdb-adapter-localstorage/index.d.ts
index 5f4da8b599..f7f90b5f94 100644
--- a/types/pouchdb-adapter-localstorage/index.d.ts
+++ b/types/pouchdb-adapter-localstorage/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-adapter-localstorage 6.1
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/pouchdb/pouchdb
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pouchdb-adapter-memory/index.d.ts b/types/pouchdb-adapter-memory/index.d.ts
index 41149a2dc6..658a55e471 100644
--- a/types/pouchdb-adapter-memory/index.d.ts
+++ b/types/pouchdb-adapter-memory/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-adapter-memory 6.1
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/pouchdb/pouchdb
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pouchdb-adapter-node-websql/index.d.ts b/types/pouchdb-adapter-node-websql/index.d.ts
index 442a5326a2..021c6c93ae 100644
--- a/types/pouchdb-adapter-node-websql/index.d.ts
+++ b/types/pouchdb-adapter-node-websql/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-adapter-node-websql 6.1
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/pouchdb/pouchdb
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pouchdb-adapter-websql/index.d.ts b/types/pouchdb-adapter-websql/index.d.ts
index 2b0e2b6178..a083f4a23a 100644
--- a/types/pouchdb-adapter-websql/index.d.ts
+++ b/types/pouchdb-adapter-websql/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-adapter-websql 6.1
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/pouchdb/pouchdb
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pouchdb-browser/index.d.ts b/types/pouchdb-browser/index.d.ts
index d41a41b341..add9abe992 100644
--- a/types/pouchdb-browser/index.d.ts
+++ b/types/pouchdb-browser/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-browser 6.1
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/pouchdb/pouchdb
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pouchdb-core/index.d.ts b/types/pouchdb-core/index.d.ts
index 5bed38348b..a61471ae4b 100644
--- a/types/pouchdb-core/index.d.ts
+++ b/types/pouchdb-core/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-core 7.0
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/pouchdb/pouchdb
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Jakub Navratil <https://github.com/trubit>,
 //                 Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>,
 //                 Tobias Bales <https://github.com/TobiasBales>, Sebastián Ramírez <https://github.com/tiangolo>,
diff --git a/types/pouchdb-find/index.d.ts b/types/pouchdb-find/index.d.ts
index 1ccd3d4c14..47ebf6e3e5 100644
--- a/types/pouchdb-find/index.d.ts
+++ b/types/pouchdb-find/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-find 6.3
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/pouchdb/pouchdb
 // Definitions by: Jakub Navratil <https://github.com/trubit>
 //                 Sebastian Ramirez <https://github.com/tiangolo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/pouchdb-http/index.d.ts b/types/pouchdb-http/index.d.ts
index cccf52a21f..c35c94a46d 100644
--- a/types/pouchdb-http/index.d.ts
+++ b/types/pouchdb-http/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-http 6.1
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/nolanlawson/pouchdb-http
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pouchdb-mapreduce/index.d.ts b/types/pouchdb-mapreduce/index.d.ts
index cb8b1caf2a..bb9287f852 100644
--- a/types/pouchdb-mapreduce/index.d.ts
+++ b/types/pouchdb-mapreduce/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-mapreduce 6.1
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/pouchdb/pouchdb
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pouchdb-node/index.d.ts b/types/pouchdb-node/index.d.ts
index 7df750b742..19196628a8 100644
--- a/types/pouchdb-node/index.d.ts
+++ b/types/pouchdb-node/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-node 6.1
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/pouchdb/pouchdb
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pouchdb-replication/index.d.ts b/types/pouchdb-replication/index.d.ts
index 653a93685d..acb9336d0a 100644
--- a/types/pouchdb-replication/index.d.ts
+++ b/types/pouchdb-replication/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-replication 6.4
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/pouchdb/pouchdb
 // Definitions by: Jakub Navratil <https://github.com/trubit>, Sebastián Ramírez <https://github.com/tiangolo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pouchdb-upsert/index.d.ts b/types/pouchdb-upsert/index.d.ts
index 7646f55f01..d91ba810ae 100644
--- a/types/pouchdb-upsert/index.d.ts
+++ b/types/pouchdb-upsert/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb-upsert 2.2
-// Project: https://github.com/pouchdb/upsert
+// Project: https://github.com/pouchdb/upsert, https://github.com/nolanlawson/pouchdb-upsert
 // Definitions by: Keith D. Moore <https://github.com/keithdmoore>
 //                 Andrew Mitchell <https://github.com/hotforfeature>
 //                 Eddie Hsu <https://github.com/apolkingg8>
diff --git a/types/pouchdb/index.d.ts b/types/pouchdb/index.d.ts
index cdc34a44df..012c3059e3 100644
--- a/types/pouchdb/index.d.ts
+++ b/types/pouchdb/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pouchdb 6.3
-// Project: https://pouchdb.com/
+// Project: https://pouchdb.com/, https://github.com/pouchdb/pouchdb
 // Definitions by: Andy Brown <https://github.com/AGBrown>, Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/prettier/index.d.ts b/types/prettier/index.d.ts
index 6cef2ef27a..97e60d4837 100644
--- a/types/prettier/index.d.ts
+++ b/types/prettier/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for prettier 1.15
-// Project: https://github.com/prettier/prettier
+// Type definitions for prettier 1.16
+// Project: https://github.com/prettier/prettier, https://prettier.io
 // Definitions by: Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
@@ -21,7 +21,9 @@ export interface FastPath<T = any> {
 
 export type BuiltInParser = (text: string, options?: any) => AST;
 export type BuiltInParserName =
-    | 'babylon'
+    | 'babylon' // deprecated
+    | 'babel'
+    | 'babel-flow'
     | 'flow'
     | 'typescript'
     | 'postcss' // deprecated
diff --git a/types/pretty-format/index.d.ts b/types/pretty-format/index.d.ts
index c4f3484e76..8b458ffbdf 100644
--- a/types/pretty-format/index.d.ts
+++ b/types/pretty-format/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for pretty-format 20.0
-// Project: https://github.com/facebook/jest/tree/master/packages/pretty-format
+// Project: https://github.com/facebook/jest/tree/master/packages/pretty-format, https://github.com/facebook/jest
 // Definitions by: Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/printf/index.d.ts b/types/printf/index.d.ts
index e136eed929..58964b039d 100644
--- a/types/printf/index.d.ts
+++ b/types/printf/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for printf 0.2
-// Project: https://github.com/adaltas/node-printf
+// Project: https://github.com/adaltas/node-printf, http://www.adaltas.com/projects/node-printf
 // Definitions by: Aluísio Augusto Silva Gonçalves <https://github.com/AluisioASG>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/prismjs/index.d.ts b/types/prismjs/index.d.ts
index 86f2c55d95..20c36c1815 100644
--- a/types/prismjs/index.d.ts
+++ b/types/prismjs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for prism 1.9
-// Project: http://prismjs.com/
+// Project: http://prismjs.com/, https://github.com/leaverou/prism
 // Definitions by: Erik Lieben <https://github.com/eriklieben>
 //                 Andre Wiggins <https://github.com/andrewiggins>
 //                 Michał Miszczyszyn <https://github.com/mmiszy>
diff --git a/types/promise-polyfill/index.d.ts b/types/promise-polyfill/index.d.ts
index 83036cf4ff..5708cd05c4 100644
--- a/types/promise-polyfill/index.d.ts
+++ b/types/promise-polyfill/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for promise-polyfill 6.0
-// Project: https://www.npmjs.com/package/promise-polyfill
+// Project: https://github.com/taylorhakes/promise-polyfill
 // Definitions by: Steve Jenkins <https://github.com/skysteve>
 //                 Daniel Cassidy <https://github.com/djcsdy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/promise.prototype.finally/index.d.ts b/types/promise.prototype.finally/index.d.ts
index a2db2ef22a..d5bc1fdd1b 100644
--- a/types/promise.prototype.finally/index.d.ts
+++ b/types/promise.prototype.finally/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for promise.prototype.finally 2.0
-// Project: https://github.com/matthew-andrews/Promise.prototype.finally
+// Project: https://github.com/es-shims/promise.prototype.finally
 // Definitions by: Slava Shpitalny <https://github.com/slavik57>
 //                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/prop-types/index.d.ts b/types/prop-types/index.d.ts
index 5f95d354dd..75461dc372 100644
--- a/types/prop-types/index.d.ts
+++ b/types/prop-types/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for prop-types 15.5
-// Project: https://github.com/reactjs/prop-types
+// Project: https://github.com/reactjs/prop-types, https://facebook.github.io/react
 // Definitions by: DovydasNavickas <https://github.com/DovydasNavickas>
 //                 Ferdy Budhidharma <https://github.com/ferdaber>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/prop-types/prop-types-tests.ts b/types/prop-types/prop-types-tests.ts
index baf210fdeb..5973e6a7ca 100644
--- a/types/prop-types/prop-types-tests.ts
+++ b/types/prop-types/prop-types-tests.ts
@@ -9,7 +9,7 @@ interface Props {
     any?: any;
     array: string[];
     bool: boolean;
-    element: ReactElement<any>;
+    element: ReactElement;
     func(foo: string): void;
     node?: ReactNode;
     requiredNode: NonNullable<ReactNode>;
diff --git a/types/prosemirror-model/index.d.ts b/types/prosemirror-model/index.d.ts
index a86037d0f8..d2d9670584 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.5
+// Type definitions for prosemirror-model 1.7
 // Project: https://github.com/ProseMirror/prosemirror-model
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
@@ -1240,6 +1240,11 @@ export interface NodeSpec {
    * parsing rules in your schema.
    */
   parseDOM?: ParseRule[] | null;
+  /**
+   * Defines the default way a node of this type should be serialized
+   * to a string representation for debugging (e.g. in error messages).
+   */
+  toDebugString?: ((node: ProsemirrorNode) => string) | null;
 }
 export interface MarkSpec {
   /**
@@ -1272,6 +1277,11 @@ export interface MarkSpec {
    * The group or space-separated groups to which this mark belongs.
    */
   group?: string | null;
+  /**
+   * Determines whether marks of this type can span multiple adjacent
+   * nodes when serialized to DOM/HTML. Defaults to true.
+   */
+  spanning?: boolean | null;
   /**
    * Defines the default way marks of this type should be serialized
    * to DOM/HTML.
diff --git a/types/prosemirror-state/index.d.ts b/types/prosemirror-state/index.d.ts
index 235665983c..a0c2b6ae69 100644
--- a/types/prosemirror-state/index.d.ts
+++ b/types/prosemirror-state/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for prosemirror-state 1.2
-// Project: https://github.com/ProseMirror/prosemirror-state
+// Project: https://github.com/ProseMirror/prosemirror-state, https://github.com/prosemirror/prosemirror
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
 //                 Tim Baumann <https://github.com/timjb>
diff --git a/types/prosemirror-test-builder/index.d.ts b/types/prosemirror-test-builder/index.d.ts
new file mode 100644
index 0000000000..f6c01420c4
--- /dev/null
+++ b/types/prosemirror-test-builder/index.d.ts
@@ -0,0 +1,126 @@
+// Type definitions for prosemirror-test-builder 1.0
+// Project: https://github.com/prosemirror/prosemirror-test-builder#readme
+// Definitions by: Ifiok Jr. <https://github.com/ifiokjr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { Node as ProsemirrorNode, Schema } from 'prosemirror-model';
+
+export interface NodeTypeAttributes extends Record<string, any> {
+    nodeType: string;
+}
+
+export interface MarkTypeAttributes extends Record<string, any> {
+    markType: string;
+}
+
+export interface TaggedFlatObject<S extends Schema = any> {
+    tag: Record<string, number>;
+    flat: Array<TaggedProsemirrorNode<S> | TaggedFlatObject<S>>;
+}
+
+export interface TaggedProsemirrorNode<S extends Schema = any>
+    extends TaggedFlatObject<S>,
+        ProsemirrorNode {}
+
+type TestNodesUnion =
+    | 'p'
+    | 'pre'
+    | 'h1'
+    | 'h2'
+    | 'h3'
+    | 'li'
+    | 'ul'
+    | 'ol'
+    | 'br'
+    | 'img'
+    | 'hr'
+    | 'ordered_list'
+    | 'bullet_list'
+    | 'list_item'
+    | 'doc'
+    | 'paragraph'
+    | 'blockquote'
+    | 'horizontal_rule'
+    | 'heading'
+    | 'code_block'
+    | 'text'
+    | 'image'
+    | 'hard_break';
+type TestMarksUnion = 'a' | 'link' | 'em' | 'strong' | 'code';
+
+export type TestSchema = Schema<TestNodesUnion, TestMarksUnion>;
+
+type Args = Array<string | TaggedProsemirrorNode | TaggedFlatObject>;
+
+type NodeBuilderMethod<S extends Schema = any> = (
+    ...args: Args
+) => TaggedProsemirrorNode<S>;
+
+type MarkBuilderMethod<S extends Schema = any> = (
+    ...args: Args
+) => TaggedFlatObject<S>;
+
+export interface EqMethod {
+    eq(param: EqMethod): boolean;
+}
+
+export type Builder = <
+    Obj extends Record<
+        string,
+        NodeTypeAttributes | MarkTypeAttributes
+    > = Record<string, NodeTypeAttributes | MarkTypeAttributes>,
+    N extends string = string,
+    M extends string = string
+>(
+    testSchema: Schema<N, M>,
+    names: Obj,
+) => Record<N, NodeBuilderMethod<Schema<N, M>>> &
+    Record<M, MarkBuilderMethod<Schema<N, M>>> &
+    {
+        [P in keyof Obj]: Obj[P] extends NodeTypeAttributes
+            ? NodeBuilderMethod<Schema<N, M>>
+            : MarkBuilderMethod<Schema<N, M>>
+    };
+
+export interface ProsemirrorTestBuilder {
+    schema: TestSchema;
+    builders: Builder;
+    eq(a: EqMethod, b: EqMethod): boolean;
+    p: NodeBuilderMethod<TestSchema>;
+    pre: NodeBuilderMethod<TestSchema>;
+    h1: NodeBuilderMethod<TestSchema>;
+    h2: NodeBuilderMethod<TestSchema>;
+    h3: NodeBuilderMethod<TestSchema>;
+    li: NodeBuilderMethod<TestSchema>;
+    ul: NodeBuilderMethod<TestSchema>;
+    ol: NodeBuilderMethod<TestSchema>;
+    br: NodeBuilderMethod<TestSchema>;
+    img: NodeBuilderMethod<TestSchema>;
+    hr: NodeBuilderMethod<TestSchema>;
+    a: MarkBuilderMethod<TestSchema>;
+
+    // From schema list
+    ordered_list: NodeBuilderMethod<TestSchema>;
+    bullet_list: NodeBuilderMethod<TestSchema>;
+    list_item: NodeBuilderMethod<TestSchema>;
+    doc: NodeBuilderMethod<TestSchema>;
+
+    // From schema basic
+    paragraph: NodeBuilderMethod<TestSchema>;
+    blockquote: NodeBuilderMethod<TestSchema>;
+    horizontal_rule: NodeBuilderMethod<TestSchema>;
+    heading: NodeBuilderMethod<TestSchema>;
+    code_block: NodeBuilderMethod<TestSchema>;
+    text: NodeBuilderMethod<TestSchema>;
+    image: NodeBuilderMethod<TestSchema>;
+    hard_break: NodeBuilderMethod<TestSchema>;
+    link: MarkBuilderMethod<TestSchema>;
+    em: MarkBuilderMethod<TestSchema>;
+    strong: MarkBuilderMethod<TestSchema>;
+    code: MarkBuilderMethod<TestSchema>;
+}
+
+declare const prosemirrorTestBuilder: ProsemirrorTestBuilder;
+
+export default prosemirrorTestBuilder;
diff --git a/types/prosemirror-test-builder/prosemirror-test-builder-tests.ts b/types/prosemirror-test-builder/prosemirror-test-builder-tests.ts
new file mode 100644
index 0000000000..dd5aa0c345
--- /dev/null
+++ b/types/prosemirror-test-builder/prosemirror-test-builder-tests.ts
@@ -0,0 +1,123 @@
+import { Schema } from 'prosemirror-model';
+import {
+    EditorState,
+    NodeSelection,
+    Selection,
+    TextSelection,
+    Transaction,
+} from 'prosemirror-state';
+import pm, { TaggedProsemirrorNode } from 'prosemirror-test-builder';
+
+export type DispatchFunction = (tr: Transaction) => void;
+export type CommandFunction = (
+    state: EditorState,
+    dispatch?: DispatchFunction,
+) => boolean;
+
+function selectionFor(docNode: TaggedProsemirrorNode) {
+    const aTag = docNode.tag.a;
+    if (aTag != null) {
+        const $aTag = docNode.resolve(aTag);
+        if ($aTag.parent.inlineContent) {
+            return new TextSelection(
+                $aTag,
+                docNode.tag.b != null
+                    ? docNode.resolve(docNode.tag.b)
+                    : undefined,
+            );
+        } else {
+            return new NodeSelection($aTag);
+        }
+    }
+    return Selection.atStart(docNode);
+}
+
+function createState(d: TaggedProsemirrorNode) {
+    return EditorState.create({ doc: d, selection: selectionFor(d) });
+}
+
+export function apply(
+    docNode: TaggedProsemirrorNode,
+    command: CommandFunction,
+    result?: TaggedProsemirrorNode,
+): [boolean, TaggedProsemirrorNode] {
+    let state = createState(docNode);
+    command(state, tr => (state = state.apply(tr)));
+
+    if (!pm.eq(state.doc, result || docNode)) {
+        return [false, state.doc as TaggedProsemirrorNode];
+    }
+
+    if (result && result.tag.a != null) {
+        return [
+            pm.eq(state.selection, selectionFor(result)),
+            result || docNode,
+        ];
+    }
+    return [true, state.doc as TaggedProsemirrorNode];
+}
+
+const { p, doc, builders } = pm;
+
+apply(doc(p('hi'), p('<a>there')), () => true, doc(p('hi there')));
+
+export const schema = new Schema<'doc' | 'paragraph' | 'blockquote', 'em'>({
+    nodes: {
+        doc: {
+            content: 'block+',
+        },
+
+        paragraph: {
+            group: 'block',
+            parseDOM: [{ tag: 'p' }],
+            toDOM() {
+                return ['p', 0];
+            },
+        },
+
+        blockquote: {
+            content: 'block+',
+            group: 'block',
+            parseDOM: [{ tag: 'blockquote' }],
+            toDOM() {
+                return ['blockquote', 0];
+            },
+        },
+    },
+
+    marks: {
+        em: {
+            parseDOM: [
+                { tag: 'i' },
+                { tag: 'em' },
+                {
+                    style: 'font-style',
+                    getAttrs: value => value === 'italic' && null,
+                },
+            ],
+            toDOM() {
+                return ['em'];
+            },
+        },
+    },
+});
+
+const { h1, a } = builders(schema, {
+    p: { nodeType: 'paragraph' },
+    h1: { nodeType: 'heading', level: 1 },
+    h2: { nodeType: 'heading', level: 2 },
+    hr: { nodeType: 'horizontal_rule' },
+    li: { nodeType: 'list_item' },
+    ol: { nodeType: 'ordered_list' },
+    ul: { nodeType: 'bullet_list' },
+    pre: { nodeType: 'code_block' },
+    a: { markType: 'link', href: 'foo' },
+    br: { nodeType: 'hard_break' },
+    img: { nodeType: 'image', src: 'img.png', alt: 'x' },
+});
+
+const TEST1 = h1; // $ExpectType NodeBuilderMethod<Schema<"doc" | "paragraph" | "blockquote", "em">>
+const TEST2 = a; // $ExpectType MarkBuilderMethod<Schema<"doc" | "paragraph" | "blockquote", "em">>
+
+h1(''); // $ExpectType TaggedProsemirrorNode<Schema<"doc" | "paragraph" | "blockquote", "em">>
+a(''); // $ExpectType TaggedFlatObject<Schema<"doc" | "paragraph" | "blockquote", "em">>
diff --git a/types/prosemirror-test-builder/tsconfig.json b/types/prosemirror-test-builder/tsconfig.json
new file mode 100644
index 0000000000..3869b95fde
--- /dev/null
+++ b/types/prosemirror-test-builder/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "noEmit": true,
+        "lib": ["es6", "dom"],
+        "noUnusedLocals": false,
+        "noUnusedParameters": false,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "prosemirror-test-builder-tests.ts"]
+}
diff --git a/types/prosemirror-test-builder/tslint.json b/types/prosemirror-test-builder/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/prosemirror-test-builder/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/proton-native/index.d.ts b/types/proton-native/index.d.ts
index 0177d00542..6101577818 100644
--- a/types/proton-native/index.d.ts
+++ b/types/proton-native/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for proton-native 1.1
-// Project: https://github.com/kusti8/proton-native
+// Project: https://github.com/kusti8/proton-native, https://proton-native.js.org
 // Definitions by: Nguyen Xuan Khanh <https://github.com/khanhas>
 //                 Lukas Tetzlaff <https://github.com/ltetzlaff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/protractor-browser-logs/index.d.ts b/types/protractor-browser-logs/index.d.ts
index 8968e24cb1..a75b3eb0ec 100644
--- a/types/protractor-browser-logs/index.d.ts
+++ b/types/protractor-browser-logs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for protractor-browser-logs 1.0
-// Project: https://www.npmjs.com/package/protractor-browser-logs, https://github.com/wix/protractor-browser-logs
+// Project: https://github.com/wix/protractor-browser-logs
 // Definitions by: Saqib Rokadia <https://github.com/rokadias>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/pubnub/index.d.ts b/types/pubnub/index.d.ts
index c10cd506b9..4a8b497506 100644
--- a/types/pubnub/index.d.ts
+++ b/types/pubnub/index.d.ts
@@ -4,7 +4,8 @@
 //                  rollymaduk <https://github.com/rollymaduk>,
 //                  vitosamson <https://github.com/vitosamson>,
 //                  FlorianDr <https://github.com/FlorianDr>,
-//                  danduh <https://github.com/danduh>
+//                  danduh <https://github.com/danduh>,
+//                  ChristianBoehlke <https://github.com/ChristianBoehlke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // @see https://www.pubnub.com/docs/web-javascript/api-reference-configuration
 // TypeScript Version: 2.2
@@ -99,6 +100,15 @@ declare class Pubnub {
     params: Pubnub.SetStateParameters
   ): Promise<Pubnub.SetStateResponse>;
 
+  grant(
+    params: Pubnub.GrantParameters,
+    callback: (status: Pubnub.GrantStatus, response: {}) => void
+  ): void;
+
+  grant(
+    params: Pubnub.GrantParameters
+  ): Promise<{}>;
+
   encrypt(
     data: string,
     customCipherKey?: string,
@@ -348,6 +358,23 @@ declare namespace Pubnub {
     };
   }
 
+  // grant
+  interface GrantParameters {
+    channels?: string[];
+    channelGroups?: string[];
+    authKeys?: string[];
+    ttl?: number;
+    read?: boolean;
+    write?: boolean;
+    manage?: boolean;
+  }
+
+  interface GrantStatus {
+    error: boolean;
+    operation: string;
+    statusCode: number;
+  }
+
   // encrypt & decrypt
   interface CryptoParameters {
     encryptKey?: boolean;
diff --git a/types/pubnub/pubnub-tests.ts b/types/pubnub/pubnub-tests.ts
index 96dd4202ba..8750919e59 100644
--- a/types/pubnub/pubnub-tests.ts
+++ b/types/pubnub/pubnub-tests.ts
@@ -87,6 +87,17 @@ pubnub.setState({ channels: [] }).then(res => {
   console.log(res.state);
 });
 
+const grantOptions = {
+  channels: ['channel-1'],
+  authKeys: ['auth-key'],
+  read: true,
+  write: false,
+  manage: false
+};
+pubnub.grant(grantOptions).then(status => {
+  console.log(status);
+});
+
 pubnub.history({channel: 'channel-1', count: 2}, (status, res) => {
   console.log(status);
   console.log(res);
diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index bd65a70455..1b9428392a 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for puppeteer 1.11
+// Type definitions for puppeteer 1.12
 // Project: https://github.com/GoogleChrome/puppeteer#readme
 // Definitions by: Marvin Hagemeister <https://github.com/marvinhagemeister>
 //                 Christopher Deutsch <https://github.com/cdeutsch>
@@ -18,6 +18,19 @@ 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;
 
+export type Serializable =
+  | number
+  | string
+  | boolean
+  | null
+  | JSONArray
+  | JSONObject;
+export interface JSONArray extends Array<Serializable> { }
+export interface JSONObject {
+  [key: string]: Serializable;
+}
+export type SerializableOrJSHandle = Serializable | JSHandle;
+
 /** Defines `$eval` and `$$eval` for Page, Frame and ElementHandle. */
 export interface Evalable {
   /**
@@ -106,7 +119,7 @@ export interface Evalable {
   $eval<R>(
     selector: string,
     pageFunction: (element: Element, ...args: any[]) => R | Promise<R>,
-    ...args: any[],
+    ...args: SerializableOrJSHandle[],
   ): Promise<WrapElementHandle<R>>;
 
   /**
@@ -195,7 +208,7 @@ export interface Evalable {
   $$eval<R>(
     selector: string,
     pageFunction: (elements: Element[], ...args: any[]) => R | Promise<R>,
-    ...args: any[]
+    ...args: SerializableOrJSHandle[]
   ): Promise<WrapElementHandle<R>>;
 }
 
@@ -333,10 +346,27 @@ export type ConsoleMessageType = "log"
   | "count"
   | "timeEnd";
 
+export interface ConsoleMessageLocation {
+  /**
+   * URL of the resource if known.
+   */
+  url?: string;
+  /**
+   * Line number in the resource if known
+   */
+  lineNumber?: number;
+  /**
+   * Column number in the resource if known.
+   */
+  columnNumber?: number;
+}
+
 /** ConsoleMessage objects are dispatched by page via the 'console' event. */
 export interface ConsoleMessage {
   /** The message arguments. */
   args(): JSHandle[];
+  /** The location the message originated from */
+  location(): ConsoleMessageLocation;
   /** The message text. */
   text(): string;
   type(): ConsoleMessageType;
@@ -477,6 +507,7 @@ export interface EmulateOptions {
 }
 
 export type EvaluateFn = string | ((...args: any[]) => any);
+export type EvaluateFnReturnType<T extends EvaluateFn> = T extends ((...args: any[]) => infer R) ? R : any;
 
 export type LoadEvent =
   | "load"
@@ -716,10 +747,10 @@ export interface Worker {
    * 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>;
+  evaluate<T extends EvaluateFn>(
+    pageFunction: T,
+    ...args: SerializableOrJSHandle[],
+  ): Promise<EvaluateFnReturnType<T>>;
 
   /**
    * The only difference between `worker.evaluate` and `worker.evaluateHandle` is
@@ -727,7 +758,7 @@ export interface Worker {
    */
   evaluateHandle<T>(
     pageFunction: (...args: any[]) => T | Promise<T>,
-    ...args: any[],
+    ...args: SerializableOrJSHandle[],
   ): Promise<T>;
 
   executionContext(): Promise<ExecutionContext>;
@@ -828,13 +859,13 @@ export interface ElementHandle<E extends Element = Element> extends JSHandle, Ev
 
 /** The class represents a context for JavaScript execution. */
 export interface ExecutionContext {
-  evaluate(
-    fn: EvaluateFn,
-    ...args: any[]
-  ): Promise<any>;
+  evaluate<F extends EvaluateFn>(
+    fn: F,
+    ...args: SerializableOrJSHandle[]
+  ): Promise<EvaluateFnReturnType<F>>;
   evaluateHandle(
     fn: EvaluateFn,
-    ...args: any[]
+    ...args: SerializableOrJSHandle[]
   ): Promise<JSHandle>;
   queryObjects(prototypeHandle: JSHandle): JSHandle;
 }
@@ -1074,18 +1105,22 @@ export interface Response {
 }
 
 export interface WaitForSelectorOptions extends Timeoutable {
-    /**
-     * Wait for element to be present in DOM and to be visible,
-     * i.e. to not have display: none or visibility: hidden CSS properties.
-     * @default false
-     */
-    visible?: boolean;
-    /**
-     * Wait for element to not be found in the DOM or to be hidden,
-     * i.e. have display: none or visibility: hidden CSS properties.
-     * @default false
-     */
-    hidden?: boolean;
+  /**
+   * Wait for element to be present in DOM and to be visible,
+   * i.e. to not have display: none or visibility: hidden CSS properties.
+   * @default false
+   */
+  visible?: boolean;
+  /**
+   * Wait for element to not be found in the DOM or to be hidden,
+   * i.e. have display: none or visibility: hidden CSS properties.
+   * @default false
+   */
+  hidden?: boolean;
+}
+
+export interface WaitForSelectorOptionsHidden extends WaitForSelectorOptions {
+  hidden: true;
 }
 
 export interface FrameBase extends Evalable {
@@ -1139,10 +1174,10 @@ export interface FrameBase extends Evalable {
    * @param fn Function to be evaluated in browser context
    * @param args Arguments to pass to `fn`
    */
-  evaluate(
-    fn: EvaluateFn,
-    ...args: any[]
-  ): Promise<any>;
+  evaluate<F extends EvaluateFn>(
+    fn: F,
+    ...args: SerializableOrJSHandle[]
+  ): Promise<EvaluateFnReturnType<F>>;
 
   /**
    * Evaluates a function in the page context.
@@ -1154,7 +1189,7 @@ export interface FrameBase extends Evalable {
    */
   evaluateHandle(
     fn: EvaluateFn,
-    ...args: any[]
+    ...args: SerializableOrJSHandle[]
   ): Promise<JSHandle>;
 
   /** This method fetches an element with selector and focuses it. */
@@ -1214,21 +1249,26 @@ export interface FrameBase extends Evalable {
   /**
    * Shortcut for waitForSelector and waitForXPath
    */
+  waitFor(selector: string, options: WaitForSelectorOptionsHidden): Promise<ElementHandle | null>;
   waitFor(selector: string, options?: WaitForSelectorOptions): Promise<ElementHandle>;
 
   /**
    * Shortcut for waitForFunction.
    */
-  waitFor(selector: ((...args: any[]) => any) | string, options?: WaitForSelectorOptions, ...args: any[]): Promise<any>;
+  waitFor(
+    selector: EvaluateFn,
+    options?: WaitForSelectorOptions,
+    ...args: SerializableOrJSHandle[]
+  ): Promise<JSHandle>;
 
   /**
    * Allows waiting for various conditions.
    */
   waitForFunction(
-    fn: string | ((...args: any[]) => any),
+    fn: EvaluateFn,
     options?: PageFnOptions,
-    ...args: any[]
-  ): Promise<any>;
+    ...args: SerializableOrJSHandle[]
+  ): Promise<JSHandle>;
 
   /**
    * Wait for the page navigation occur.
@@ -1240,6 +1280,10 @@ export interface FrameBase extends Evalable {
     selector: string,
     options?: WaitForSelectorOptions,
   ): Promise<ElementHandle>;
+  waitForSelector(
+      selector: string,
+      options?: WaitForSelectorOptionsHidden,
+  ): Promise<ElementHandle | null>;
 
   waitForXPath(
     xpath: string,
@@ -1294,6 +1338,8 @@ export interface PageEventObj {
   metrics: { title: string, metrics: Metrics };
   /** Emitted when an uncaught exception happens within the page. */
   pageerror: Error;
+  /** Emitted when the page opens a new tab or window. */
+  popup: Page;
   /**
    * Emitted when a page issues a request. The request object is read-only.
    * In order to intercept and mutate requests, see page.setRequestInterceptionEnabled.
@@ -1506,6 +1552,9 @@ export interface Page extends EventEmitter, FrameBase {
   /** Get the browser the page belongs to. */
   browser(): Browser;
 
+  /** Get the browser context that the page belongs to. */
+  browserContext(): BrowserContext;
+
   /** Closes the current page. */
   close(options?: PageCloseOptions): Promise<void>;
 
@@ -1539,7 +1588,7 @@ export interface Page extends EventEmitter, FrameBase {
    */
   evaluateHandle(
     fn: EvaluateFn,
-    ...args: any[]
+    ...args: SerializableOrJSHandle[]
   ): Promise<JSHandle>;
 
   /**
@@ -1550,7 +1599,7 @@ export interface Page extends EventEmitter, FrameBase {
    */
   evaluateOnNewDocument(
     fn: EvaluateFn,
-    ...args: any[]
+    ...args: SerializableOrJSHandle[]
   ): Promise<void>;
 
   /**
@@ -1649,6 +1698,25 @@ export interface Page extends EventEmitter, FrameBase {
    */
   setDefaultNavigationTimeout(timeout: number): void;
 
+  /**
+   * This setting will change the default maximum time for the following methods and related shortcuts:
+   * - `page.goBack`
+   * - `page.goForward`
+   * - `page.goto`
+   * - `page.reload`
+   * - `page.setContent`
+   * - `page.waitFor`
+   * - `page.waitForFunction`
+   * - `page.waitForNavigation`
+   * - `page.waitForRequest`
+   * - `page.waitForResponse`
+   * - `page.waitForSelector`
+   * - `page.waitForXPath`
+   *
+   * NOTE page.setDefaultNavigationTimeout takes priority over page.setDefaultTimeout
+   */
+  setDefaultTimeout(timeout: number): void;
+
   /**
    * The extra HTTP headers will be sent with every request the page initiates.
    * @param headers An object containing additional http headers to be sent with every request. All header values must be strings.
@@ -2058,8 +2126,15 @@ export interface BrowserOptions {
 }
 
 export interface ConnectOptions extends BrowserOptions {
+  /**
+   * A browser url to connect to, in format `http://${host}:${port}`.
+   * Use interchangeably with browserWSEndpoint to let Puppeteer fetch it from metadata endpoint.
+   */
+  browserURL?: string;
+
   /** A browser websocket endpoint to connect to. */
   browserWSEndpoint?: string;
+
   /**
    * **Experimental** Specify a custom transport object for Puppeteer to use.
    */
diff --git a/types/puppeteer/puppeteer-tests.ts b/types/puppeteer/puppeteer-tests.ts
index 6c74a780c2..e5c287b6ee 100644
--- a/types/puppeteer/puppeteer-tests.ts
+++ b/types/puppeteer/puppeteer-tests.ts
@@ -30,6 +30,7 @@ import * as Devices from "puppeteer/DeviceDescriptors";
 (async () => {
   const browser = await puppeteer.launch();
   const page = await browser.newPage();
+  page.setDefaultTimeout(100000);
   await page.goto("https://news.ycombinator.com", { waitUntil: "networkidle0" });
   await page.pdf({ path: "hn.pdf", format: "A4" });
 
@@ -129,7 +130,11 @@ puppeteer.launch().then(async browser => {
       interceptedRequest.url().endsWith(".jpg")
     )
       interceptedRequest.abort();
-    else interceptedRequest.continue();
+    else interceptedRequest.continue({
+      headers: {
+        dope: 'yes',
+      }
+    });
   });
 
   page.keyboard.type("Hello"); // Types instantly
@@ -237,13 +242,13 @@ puppeteer.launch().then(async browser => {
   page.type("#myInput", "Hello World!");
 
   page.on("console", (event: puppeteer.ConsoleMessage, ...args: any[]) => {
-    console.log(event.text, event.type);
+    console.log(event.text(), event.type(), event.location());
     for (let i = 0; i < args.length; ++i) console.log(`${i}: ${args[i]}`);
   });
 
   await button.focus();
   await button.press("Enter");
-  await button.screenshot({
+  const screenshotOpts: puppeteer.BinaryScreenShotOptions = {
     type: "jpeg",
     omitBackground: true,
     clip: {
@@ -252,7 +257,8 @@ puppeteer.launch().then(async browser => {
       width: 200,
       height: 100
     }
-  });
+  };
+  await button.screenshot(screenshotOpts);
   console.log(button.toString());
   input.type("Hello World", { delay: 10 });
 
@@ -262,11 +268,15 @@ puppeteer.launch().then(async browser => {
 
   const metrics = await page.metrics();
   console.log(metrics.Documents, metrics.Frames, metrics.JSEventListeners);
+  page.on('metrics', data => {
+    const title: string = data.title;
+    const metrics: puppeteer.Metrics = data.metrics;
+  });
 
   const navResponse = await page.waitForNavigation({
     timeout: 1000
   });
-  console.log(navResponse.ok, navResponse.status, navResponse.url, navResponse.headers);
+  console.log(navResponse.ok(), navResponse.status(), navResponse.url(), navResponse.headers()['Content-Type']);
 
   // evaluate example
   const bodyHandle = (await page.$('body'))!;
@@ -309,7 +319,7 @@ puppeteer.launch().then(async browser => {
   const elementText = await page.$eval(
     '#someElement',
     (
-      element,  // $ExpectType Element
+      element, // $ExpectType Element
     ) => {
       element.innerHTML; // $ExpectType string
       return element.innerHTML;
@@ -340,15 +350,19 @@ puppeteer.launch().then(async browser => {
 (async () => {
   const browser = await puppeteer.launch();
   const page = await browser.newPage();
-  const handler = (r: puppeteer.Request) => {
+  const handler = async (r: puppeteer.Request) => {
     const failure = r.failure();
 
+    console.log(r.headers().Test);
+
     const response = r.response();
     if (!response) {
       return;
     }
     const text: string = response.statusText();
     const ip: string = response.remoteAddress().ip;
+    const data = (await response.json()) as string;
+    const randomHeader = response.headers().Test;
 
     if (failure == null) {
       console.error("Request completed successfully");
@@ -454,13 +468,16 @@ puppeteer.launch().then(async browser => {
 (async () => {
   const browser = await puppeteer.launch();
   const page = await browser.newPage();
-  await page.waitFor(1000);
-  await page.waitFor('selector');
-  await page.waitFor('selector', {
+  await page.waitFor(1000); // $ExpectType void
+  const el: puppeteer.ElementHandle = await page.waitFor('selector');
+  const nullableEl: puppeteer.ElementHandle | null = await page.waitFor('selector', {
+    hidden: true,
+  });
+  const el2: puppeteer.ElementHandle = await page.waitFor('selector', {
       timeout: 123,
   });
   await page.waitFor(() => !!document.querySelector('.foo'), {
-      hidden: true,
+    hidden: true,
   });
   await page.waitFor((stuff: string) => !!document.querySelector(stuff), {
     hidden: true,
@@ -496,11 +513,11 @@ puppeteer.launch().then(async browser => {
 (async () => {
   const browser = await puppeteer.launch();
   const page = await browser.newPage();
-    try {
-        await page.waitFor('test');
-    } catch (err) {
-        console.log(err instanceof TimeoutError);
-    }
+  try {
+    await page.waitFor('test');
+  } catch (err) {
+    console.log(err instanceof TimeoutError);
+  }
 });
 
 // domcontentloaded page event test
@@ -513,3 +530,91 @@ puppeteer.launch().then(async browser => {
     });
   });
 });
+
+// evaluates return type of inner function
+(async () => {
+  const browser = await puppeteer.launch();
+  const page = await browser.newPage();
+  const s = await page.evaluate(() => document.body.innerHTML);
+  console.log('body html has length', s.length);
+});
+
+// even through a double promise.
+(async () => {
+  const browser = await puppeteer.launch();
+  const page = await browser.newPage();
+  const s = await page.evaluate(() => Promise.resolve(document.body.innerHTML));
+  console.log('body html has length', s.length);
+});
+
+// JSHandle.jsonValue produces compatible type
+(async () => {
+  const browser = await puppeteer.launch();
+  const page = await browser.newPage();
+  const s = await page
+    .waitForFunction(
+      (searchStrs: string[]) => searchStrs.find(v => document.body.innerText.includes(v)),
+      { timeout: 2000 },
+      ['once', 'upon', 'a', 'midnight', 'dreary'])
+    .then(j => j.jsonValue());
+  console.log('found in page', s.toLowerCase());
+});
+
+// Element access
+(async () => {
+  const browser = await puppeteer.launch();
+  const page = await browser.newPage();
+  const el = await page.$('input');
+  const val: string = await (await el!.getProperty('type')).jsonValue();
+});
+
+// Request manipualtion
+(async () => {
+  const browser = await puppeteer.launch();
+  const page = await browser.newPage();
+  await page.setExtraHTTPHeaders({
+    a: '1'
+  });
+});
+
+// ElementHandles are well-typed
+(async () => {
+  const browser = await puppeteer.launch();
+  const page = await browser.newPage();
+  const link: puppeteer.JSHandle = await page.evaluateHandle(
+    () => document.body.querySelector('a')
+  );
+  const linkEl: puppeteer.ElementHandle | null = link.asElement();
+  if (linkEl !== null) {
+    const href = await page.evaluate(
+      (el: HTMLElement): string | null => el.getAttribute('href'),
+      linkEl);
+    console.log('href is', href);
+  }
+});
+
+// test $$eval return type
+(async () => {
+  const browser = await puppeteer.launch();
+  const page = await browser.newPage();
+
+  const paragraphContents: string[] = await page.$$eval(
+    'p', (ps: Element[]): string[] => ps.map(p => p.textContent || ''));
+  console.log('pgraph contents', paragraphContents);
+});
+
+// JSHandle of non-serializable works
+(async () => {
+  const browser = await puppeteer.launch();
+  const page = await browser.newPage();
+
+  const reHandle: puppeteer.JSHandle = await page.evaluateHandle(
+    () => /\s*bananas?\s*/i,
+  );
+  const numMatchingEls: number = await page.$$eval(
+    'p', (els: Element[], re: RegExp) =>
+      els.filter(el => el.textContent && re.test(el.textContent)).length,
+      reHandle
+  );
+  console.log('there are', numMatchingEls, 'banana paragaphs');
+});
diff --git a/types/python-shell/index.d.ts b/types/python-shell/index.d.ts
index e0b2898b66..4157df83db 100644
--- a/types/python-shell/index.d.ts
+++ b/types/python-shell/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for python-shell 0.4
-// Project: https://github.com/extrabacon/python-shell
+// Project: http://github.com/extrabacon/python-shell
 // Definitions by: Dolan Miu <https://github.com/dolanmiu>, Colin Richardson <https://github.com/WORMSS>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/qhistory/index.d.ts b/types/qhistory/index.d.ts
index 6269c25e82..bf278de47d 100644
--- a/types/qhistory/index.d.ts
+++ b/types/qhistory/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for qhistory 1.0
 // Project: https://github.com/pshrmn/qhistory#readme
-// Definitions by: Jessica Franco <https://github.com/Kovensky>
+// Definitions by: Jessica Franco <https://github.com/Jessidhia>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/qlik-engineapi/index.d.ts b/types/qlik-engineapi/index.d.ts
index 2c2823c2dd..ddfe9dd618 100644
--- a/types/qlik-engineapi/index.d.ts
+++ b/types/qlik-engineapi/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for qlik-engineapi 12.67
+// Type definitions for non-npm package qlik-engineapi 12.67
 // Project: http://help.qlik.com/en-US/sense-developer/November2017/Subsystems/EngineAPI/Content/introducing-engine-API.htm
 // Definitions by: Konrad Mattheis <https://github.com/konne>
 //                 Richard Ison <https://github.com/richardison>
@@ -392,6 +392,11 @@ declare namespace EngineAPI {
          * Array of dimension labels.
          */
         qFieldLabels: string[];
+
+        /**
+         * no docu
+         */
+        qLabelExpression: string;
     }
 
     /**
@@ -4812,6 +4817,11 @@ declare namespace EngineAPI {
          * Information about the selections.
          */
         qSelectionInfo: INxSelectionInfo;
+
+        /**
+         * 	Name of the alternate state. Default is current selections $ .
+         */
+        qStateName: string;
     }
 
     /**
@@ -7084,7 +7094,7 @@ declare namespace EngineAPI {
          * Note: If no app is opened, an error message is returned:
          * For example code: 1007 and No active document and App invalid
          */
-        getActiveDoc(): Promise<IApp | string>; // ?Result
+        getActiveDoc(): Promise<IApp>; // ?Result
 
         /**
          * Retrieves the meta data of an app.
@@ -7230,7 +7240,7 @@ declare namespace EngineAPI {
          * >> Default is all groups.
          * @returns A Promise <Function> or undefined
          */
-        getFunctions(qGroup?: FunctionGroupType): Promise<IFunction | undefined>;
+        getFunctions(qGroup?: FunctionGroupType): Promise<IFunction[]>;
 
         /**
          * Retrieves information on the user interaction that is requested by the engine.
diff --git a/types/qlik-visualizationextensions/index.d.ts b/types/qlik-visualizationextensions/index.d.ts
index 6baee98c1b..0cdae348b6 100644
--- a/types/qlik-visualizationextensions/index.d.ts
+++ b/types/qlik-visualizationextensions/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for qlik-visualizationextensions 4.0
+// Type definitions for non-npm package qlik-visualizationextensions 4.0
 // Project: http://help.qlik.com/en-US/sense-developer/June2017/Subsystems/Extensions/Content/extensions-introduction.htm
 // Definitions by: Konrad Mattheis <https://github.com/konne>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -1043,6 +1043,18 @@ declare namespace RootAPI {
          */
         openApp(appId: string, config?: any): any;
 
+        /**
+         * promise object
+         * Promise utility that can be used for asynchronous operations.
+         * Very useful for the paint method to indicate when the rendering is completed.
+         * executor
+         * Type: Function
+         * The executing function with two parameters:
+         * resolve
+         * reject
+         */
+        Promise: PromiseConstructor;
+
         /**
          * Registers an extension for use in this mashup. The extension is not installed on the
          * Qlik Sense server and only available in the session where it is created.
diff --git a/types/qlik/index.d.ts b/types/qlik/index.d.ts
index 6d9eeb0148..9f2db44745 100644
--- a/types/qlik/index.d.ts
+++ b/types/qlik/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Qlik Sense 3.1
+// Type definitions for non-npm package Qlik Sense 3.1
 // Project: https://help.qlik.com/en-US/sense-developer/3.1/Content/APIs-and-SDKs.htm
 // Definitions by: Ruben Slabbert <https://github.com/RubenSlabbert>, AginicX <https://github.com/AginicX>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/qrcode.react/index.d.ts b/types/qrcode.react/index.d.ts
index 01e8ef18af..e9a33e6771 100644
--- a/types/qrcode.react/index.d.ts
+++ b/types/qrcode.react/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for qrcode.react 0.8
-// Project: https://github.com/zpao/qrcode.react
+// Project: https://github.com/zpao/qrcode.react, http://zpao.github.io/qrcode.react
 // Definitions by: Mleko <https://github.com/mleko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/qrcode/index.d.ts b/types/qrcode/index.d.ts
index eb42fe1a90..54d53e7b1c 100644
--- a/types/qrcode/index.d.ts
+++ b/types/qrcode/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for qrcode 1.3
-// Project: https://github.com/soldair/node-qrcode
+// Project: http://github.com/soldair/node-qrcode
 // Definitions by: York Yao <https://github.com/plantain-00>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/qs-middleware/index.d.ts b/types/qs-middleware/index.d.ts
new file mode 100644
index 0000000000..9817c7bd79
--- /dev/null
+++ b/types/qs-middleware/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for qs-middleware 1.0
+// Project: https://github.com/springernature/qs-middleware
+// Definitions by: Dave Cardwell <https://github.com/davecardwell>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import express = require("express");
+import qs = require("qs");
+
+declare function qsMiddleware(
+    options?: qs.IParseOptions
+): express.RequestHandler;
+
+export = qsMiddleware;
diff --git a/types/qs-middleware/qs-middleware-tests.ts b/types/qs-middleware/qs-middleware-tests.ts
new file mode 100644
index 0000000000..b77d265756
--- /dev/null
+++ b/types/qs-middleware/qs-middleware-tests.ts
@@ -0,0 +1,23 @@
+import express = require("express");
+import query = require("qs-middleware");
+
+const app = express();
+
+app.use(query());
+app.use(query({}));
+app.use(
+    query({
+        delimiter: "string",
+        depth: 123,
+        decoder: str => str.toLowerCase(),
+        arrayLimit: 123,
+        parseArrays: true,
+        allowDots: true,
+        plainObjects: true,
+        allowPrototypes: true,
+        parameterLimit: 123,
+        strictNullHandling: true,
+        ignoreQueryPrefix: true
+    })
+);
+app.use(query({ delimiter: /regexp/ }));
diff --git a/types/qs-middleware/tsconfig.json b/types/qs-middleware/tsconfig.json
new file mode 100644
index 0000000000..b984b327ed
--- /dev/null
+++ b/types/qs-middleware/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", "qs-middleware-tests.ts"]
+}
diff --git a/types/qs-middleware/tslint.json b/types/qs-middleware/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/qs-middleware/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/quill/index.d.ts b/types/quill/index.d.ts
index 0b4de9932b..3c2c4440ba 100644
--- a/types/quill/index.d.ts
+++ b/types/quill/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Quill 2.0
-// Project: https://github.com/quilljs/quill/
+// Project: https://github.com/quilljs/quill/, http://quilljs.com
 // Definitions by: Sumit <https://github.com/sumitkm>
 //                 Guillaume <https://github.com/guillaume-ro-fr>
 //                 James Garbutt <https://github.com/43081j>
diff --git a/types/r-script/index.d.ts b/types/r-script/index.d.ts
index 0aa4ca1d7d..6ab4e03f08 100644
--- a/types/r-script/index.d.ts
+++ b/types/r-script/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for r-script 0.0
-// Project: https://github.com/joshkatz/r-script
+// Project: http://github.com/joshkatz/r-script
 // Definitions by: Adrian Leonhard <https://github.com/NaridaL>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/ramda/es/move.d.ts b/types/ramda/es/move.d.ts
new file mode 100644
index 0000000000..3df4ee626e
--- /dev/null
+++ b/types/ramda/es/move.d.ts
@@ -0,0 +1,2 @@
+import { move } from '../index';
+export default move;
diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index d84c148d96..2c21363b1a 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ramda 0.25
-// Project: https://github.com/donnut/typescript-ramda
+// Project: https://github.com/donnut/typescript-ramda, https://ramdajs.com
 // Definitions by: Erwin Poeze <https://github.com/donnut>
 //                 Tycho Grouwstra <https://github.com/tycho01>
 //                 Matt DeKrey <https://github.com/mdekrey>
@@ -26,6 +26,7 @@
 //                 Drew Wyatt <https://github.com/drewwyatt>
 //                 John Ottenlips <https://github.com/jottenlips>
 //                 Nitesh Phadatare <https://github.com/minitesh>
+//                 Krantisinh Deshmukh <https://github.com/krantisinh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -163,6 +164,7 @@
 /// <reference path="./es/minBy.d.ts" />
 /// <reference path="./es/min.d.ts" />
 /// <reference path="./es/modulo.d.ts" />
+/// <reference path="./es/move.d.ts" />
 /// <reference path="./es/multiply.d.ts" />
 /// <reference path="./es/nAry.d.ts" />
 /// <reference path="./es/negate.d.ts" />
@@ -1575,6 +1577,17 @@ declare namespace R {
         multiply(a: number, b: number): number;
         multiply(a: number): (b: number) => number;
 
+        /**
+         * Moves an item, at index `from`, to index `to`, in a `list` of elements.
+         * A new list will be created containing the new elements order.
+         */
+        move<T>(from: number, to: number, list: ReadonlyArray<T>): T[];
+        move(from: number, to: number): <T>(list: ReadonlyArray<T>) => T[];
+        move(from: number): {
+            <T>(to: number, list: ReadonlyArray<T>): T[];
+            (to: number): <T>(list: ReadonlyArray<T>) => T[];
+        };
+
         /**
          * Wraps a function of any arity (including nullary) in a function that accepts exactly n parameters.
          * Any extraneous parameters will not be passed to the supplied function.
@@ -2244,9 +2257,9 @@ declare namespace R {
         /**
          * Replace a substring or regex match in a string with a replacement.
          */
-        replace(pattern: RegExp | string, replacement: string, str: string): string;
-        replace(pattern: RegExp | string, replacement: string): (str: string) => string;
-        replace(pattern: RegExp | string): (replacement: string) => (str: string) => string;
+        replace(pattern: RegExp | string, replacement: string | ((match: string, ...args: any[]) => string), str: string): string;
+        replace(pattern: RegExp | string, replacement: string | ((match: string, ...args: any[]) => string)): (str: string) => string;
+        replace(pattern: RegExp | string): (replacement: string | ((match: string, ...args: any[]) => string)) => (str: string) => string;
 
         /**
          * Returns a new list with the same elements as the original list, just in the reverse order.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index c67ef3944d..6a03cbc3f0 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -1115,6 +1115,23 @@ interface Obj {
     R.addIndex(R.map)(squareEnds)([8, 5, 3, 0, 9]); // => [64, 5, 3, 0, 81]
 };
 
+() => {
+    const sampleList = ['a', 'b', 'c', 'd', 'e', 'f'];
+
+    R.move<string>(0, 2, sampleList); // => ['b', 'c', 'a', 'd', 'e', 'f']
+    R.move<string>(-1, 0, sampleList); // => ['f', 'a', 'b', 'c', 'd', 'e'] list rotation
+
+    const moveCurried1 = R.move(0, 2);
+    moveCurried1<string>(sampleList); // => ['b', 'c', 'a', 'd', 'e', 'f']
+
+    const moveCurried2 = R.move(0);
+    moveCurried2<string>(2, sampleList); // => ['b', 'c', 'a', 'd', 'e', 'f']
+
+    const moveCurried3 = R.move(0);
+    const moveCurried4 = moveCurried3(2);
+    moveCurried4<string>(sampleList); // => ['b', 'c', 'a', 'd', 'e', 'f']
+};
+
 () => {
     R.none(R.isNaN, [1, 2, 3]); // => true
     R.none(R.isNaN, [1, 2, 3, NaN]); // => false
@@ -2552,6 +2569,11 @@ class Rectangle {
     R.replace(/foo/g, "bar", "foo foo foo"); // => 'bar bar bar'
     R.replace(/foo/g, "bar")("foo foo foo"); // => 'bar bar bar'
     R.replace(/foo/g)("bar")("foo foo foo"); // => 'bar bar bar'
+
+    // Using a function as the replacement value
+    R.replace(/([cfk])oo/g, (match, p1, offset) => `${p1}-${offset}`, "coo foo koo"); // => 'c0oo f4oo k8oo'
+    R.replace(/([cfk])oo/g, (match, p1, offset) => `${p1}-${offset}`)("coo foo koo"); // => 'c0oo f4oo k8oo'
+    R.replace(/([cfk])oo/g)((match, p1, offset) => `${p1}-${offset}`) ("coo foo koo"); // => 'c0oo f4oo k8oo'
 };
 
 /*****************************************************************
diff --git a/types/rappid/index.d.ts b/types/rappid/index.d.ts
index a43871bdcb..b9c729e191 100644
--- a/types/rappid/index.d.ts
+++ b/types/rappid/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Rappid 1.5
+// Type definitions for non-npm package Rappid 1.5
 // Project: http://jointjs.com/about-rappid
 // Definitions by: Ewout Van Gossum <https://github.com/DenEwout>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/raspi-soft-pwm/index.d.ts b/types/raspi-soft-pwm/index.d.ts
index 3e3296d979..48981188ec 100644
--- a/types/raspi-soft-pwm/index.d.ts
+++ b/types/raspi-soft-pwm/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for raspi-soft-pwm 5.0
-// Project: https://github.com/nebrius/raspi-soft-pwm
+// Project: https://github.com/nebrius/raspi-soft-pwm, https://github.com/tralves/raspi-soft-pwm
 // Definitions by: Bryan Hughes <https://github.com/nebrius>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/raven/index.d.ts b/types/raven/index.d.ts
index 2768e8297c..7e9272705a 100644
--- a/types/raven/index.d.ts
+++ b/types/raven/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for raven 2.5
-// Project: https://github.com/getsentry/raven-node
+// Project: https://github.com/getsentry/raven-js
 // Definitions by: Scott Cooper <https://github.com/scttcper>
 //                 Dmitrii Sorin <https://github.com/1999>
 //                 Shrey Jain <https://github.com/shreyjain1994>
diff --git a/types/rc-progress/index.d.ts b/types/rc-progress/index.d.ts
index 11385813fa..e0318078c9 100644
--- a/types/rc-progress/index.d.ts
+++ b/types/rc-progress/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for rc-progress 2.2
-// Project: https://github.com/react-component/progress
+// Project: http://github.com/react-component/progress
 // Definitions by: Jussi Kinnula <https://github.com/jussikinnula>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/rc-select/index.d.ts b/types/rc-select/index.d.ts
index 30fc16507f..c5cfd17a75 100644
--- a/types/rc-select/index.d.ts
+++ b/types/rc-select/index.d.ts
@@ -74,7 +74,7 @@ declare namespace RcSelect {
     export class Option extends React.Component<OptionProps> { }
 
     interface OptGroupProps {
-        label?: string | React.ReactElement<any>;
+        label?: string | React.ReactElement;
         key?: string;
         value?: string;
     }
diff --git a/types/rc-slider/index.d.ts b/types/rc-slider/index.d.ts
index 420d836034..ba40bc0d7d 100644
--- a/types/rc-slider/index.d.ts
+++ b/types/rc-slider/index.d.ts
@@ -1,21 +1,22 @@
 // Type definitions for rc-slider 8.6
-// Project: https://github.com/react-component/slider
+// Project: http://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>
+//                 Nick Maddren <https://github.com/nicholasmaddren>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 import * as React from "react";
-import { RCTooltip } from 'rc-tooltip';
+import { RCTooltip } from "rc-tooltip";
 
 export interface Marks {
     [number: number]:
-    | JSX.Element
-    | string
-    | { style: any; label: string | JSX.Element };
+        | JSX.Element
+        | string
+        | { style: any; label: string | JSX.Element };
 }
 
 export interface CommonApiProps {
@@ -135,6 +136,11 @@ export interface SliderProps extends CommonApiProps {
      * Set current value of slider.
      */
     value?: number;
+    /**
+     * Set the tabIndex of the slider handle.
+     * @default 0
+     */
+    tabIndex?: number;
 }
 
 export interface RangeProps extends CommonApiProps {
@@ -162,6 +168,11 @@ export interface RangeProps extends CommonApiProps {
      * Set current positions of handles.
      */
     value?: number[];
+    /**
+     * Set the tabIndex of each handle.
+     * @default [0,0]
+     */
+    tabIndex?: number[];
     /**
      * Determine how many ranges to render, and multiple handles will be rendered (number + 1).
      *  @default 1
@@ -200,9 +211,13 @@ export interface WithTooltipProps {
     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 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() => React.Component<WithTooltipProps & SliderProps>;
-export function createSliderWithTooltip(range: typeof Range): new() => React.Component<WithTooltipProps & RangeProps>;
+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-tooltip/index.d.ts b/types/rc-tooltip/index.d.ts
index 78a1fb63fb..578e5cd5ee 100644
--- a/types/rc-tooltip/index.d.ts
+++ b/types/rc-tooltip/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for rc-tooltip 3.7
-// Project: https://github.com/react-component/tooltip
+// Project: http://github.com/react-component/tooltip
 // Definitions by: rhysd <https://github.com/rhysd>
 //                 ahstro <https://github.com/ahstro>
 //                 vsaarinen <https://github.com/vsaarinen>
diff --git a/types/rc-tree/index.d.ts b/types/rc-tree/index.d.ts
index e2ac50d20d..b28218d52c 100644
--- a/types/rc-tree/index.d.ts
+++ b/types/rc-tree/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for rc-tree 1.11
-// Project: https://github.com/react-component/tree
+// Project: http://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.8
diff --git a/types/rdflib/index.d.ts b/types/rdflib/index.d.ts
index f6e1c82ba7..07020cf797 100644
--- a/types/rdflib/index.d.ts
+++ b/types/rdflib/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for rdflib 0.17
-// Project: https://github.com/linkeddata/rdflib.js
+// Project: http://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
diff --git a/types/react-addons-test-utils/index.d.ts b/types/react-addons-test-utils/index.d.ts
index 19df32f3dc..01300f874f 100644
--- a/types/react-addons-test-utils/index.d.ts
+++ b/types/react-addons-test-utils/index.d.ts
@@ -70,9 +70,9 @@ declare namespace TestUtils {
     }
 
     export interface ShallowRenderer {
-        getRenderOutput<E extends ReactElement<any>>(): E;
-        getRenderOutput(): ReactElement<any>;
-        render(element: ReactElement<any>, context?: any): void;
+        getRenderOutput<E extends ReactElement>(): E;
+        getRenderOutput(): ReactElement;
+        render(element: ReactElement, context?: any): void;
         unmount(): void;
     }
 
@@ -129,13 +129,13 @@ declare namespace TestUtils {
         mocked: MockedComponentClass, mockTagName?: string): typeof TestUtils;
 
     export function isElementOfType<T extends HTMLElement>(
-        element: ReactElement<any>, type: string): element is ReactHTMLElement<T>;
+        element: ReactElement, type: string): element is ReactHTMLElement<T>;
     export function isElementOfType<P extends DOMAttributes<{}>, T extends Element>(
-        element: ReactElement<any>, type: string): element is DOMElement<P, T>;
+        element: ReactElement, type: string): element is DOMElement<P, T>;
     export function isElementOfType<P>(
-        element: ReactElement<any>, type: SFC<P>): element is SFCElement<P>;
+        element: ReactElement, type: SFC<P>): element is SFCElement<P>;
     export function isElementOfType<P, T extends Component<P>, C extends ComponentClass<P>>(
-        element: ReactElement<any>, type: ClassType<P, T, C>): element is CElement<P, T>;
+        element: ReactElement, type: ClassType<P, T, C>): element is CElement<P, T>;
 
     export function isDOMComponent(instance: ReactInstance): instance is Element;
     export function isCompositeComponent(instance: ReactInstance): instance is Component<any>;
diff --git a/types/react-addons-transition-group/index.d.ts b/types/react-addons-transition-group/index.d.ts
index 79f76bf84e..273f652c19 100644
--- a/types/react-addons-transition-group/index.d.ts
+++ b/types/react-addons-transition-group/index.d.ts
@@ -9,7 +9,7 @@ import { ComponentClass, TransitionGroupProps } from 'react';
 declare module 'react' {
     export interface HTMLTransitionGroupProps<T> extends HTMLAttributes<T> {
         component?: ReactType;
-        childFactory?: (child: ReactElement<any>) => ReactElement<any>;
+        childFactory?: (child: ReactElement) => ReactElement;
     }
 
     export interface TransitionGroupProps extends HTMLTransitionGroupProps<ReactTransitionGroup> {
diff --git a/types/react-animate-on-scroll/index.d.ts b/types/react-animate-on-scroll/index.d.ts
index 6750cd8200..43bb21c289 100644
--- a/types/react-animate-on-scroll/index.d.ts
+++ b/types/react-animate-on-scroll/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-animate-on-scroll 2.1
-// Project: https://github.com/dbramwell/react-animate-on-scroll
+// Project: https://github.com/dbramwell/react-animate-on-scroll, http://dbramwell.github.io/react-animate-on-scroll
 // Definitions by: Ricardo Albuquerque <https://github.com/ralbuque>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-aria-menubutton/index.d.ts b/types/react-aria-menubutton/index.d.ts
index 157fdff642..dc3d975d64 100644
--- a/types/react-aria-menubutton/index.d.ts
+++ b/types/react-aria-menubutton/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-aria-menubutton 6.1
+// Type definitions for react-aria-menubutton 6.2
 // Project: https://github.com/davidtheclark/react-aria-menubutton
 // Definitions by: Muhammad Fawwaz Orabi <https://github.com/forabi>
 //                 Chris Rohlfs <https://github.com/crohlfs>
@@ -100,7 +100,7 @@ export interface MenuItemProps<T extends HTMLElement>
 	 * If value has a value, it will be passed to the onSelection handler
 	 * when the `MenuItem` is selected
 	 */
-	value?: string | boolean | number;
+	value?: any;
 
 	/**
 	 * If `text` has a value, its first letter will be the letter a user can
diff --git a/types/react-aria-menubutton/react-aria-menubutton-tests.tsx b/types/react-aria-menubutton/react-aria-menubutton-tests.tsx
index f284e932a4..e3b543103a 100644
--- a/types/react-aria-menubutton/react-aria-menubutton-tests.tsx
+++ b/types/react-aria-menubutton/react-aria-menubutton-tests.tsx
@@ -121,3 +121,18 @@ closeMenu("", { focusMenu: true });
 
 openMenu("");
 openMenu("", { focusMenu: true });
+
+class ObjectMenuItem extends React.Component {
+	render() {
+		const itemValue = { name: "Test name", label: "Only item to select" };
+		return (
+			<Wrapper onSelection={(value) => console.log(value.name)}>
+				<li>
+					<MenuItem value={itemValue} >{itemValue.label}</MenuItem>
+				</li>
+			</Wrapper>
+		);
+	}
+}
+
+ReactDOM.render(<ObjectMenuItem />, document.body);
diff --git a/types/react-autosuggest/index.d.ts b/types/react-autosuggest/index.d.ts
index bc026dc0b7..d03d40c7e5 100644
--- a/types/react-autosuggest/index.d.ts
+++ b/types/react-autosuggest/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-autosuggest 9.3
-// Project: http://react-autosuggest.js.org/
+// Project: http://react-autosuggest.js.org/, https://github.com/moroshko/react-autosuggest
 // Definitions by: Nicolas Schmitt <https://github.com/nicolas-schmitt>
 //                 Philip Ottesen <https://github.com/pjo256>
 //                 Robert Essig <https://github.com/robessog>
diff --git a/types/react-avatar-editor/index.d.ts b/types/react-avatar-editor/index.d.ts
index c2aebc5e63..3d4135120c 100644
--- a/types/react-avatar-editor/index.d.ts
+++ b/types/react-avatar-editor/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mosch/react-avatar-editor
 // Definitions by: Diogo Corrêa <https://github.com/diogocorrea>
 //                 Gabriel Prates <https://github.com/gabsprates>
+//                 Laurent Senta <https://github.com/lsenta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -23,6 +24,7 @@ export interface CroppedRect {
 }
 
 export interface AvatarEditorProps {
+    className?: string;
     image: string | File;
     width?: number;
     height?: number;
diff --git a/types/react-avatar-editor/react-avatar-editor-tests.tsx b/types/react-avatar-editor/react-avatar-editor-tests.tsx
index 3abf24aae3..bee4ff6a56 100644
--- a/types/react-avatar-editor/react-avatar-editor-tests.tsx
+++ b/types/react-avatar-editor/react-avatar-editor-tests.tsx
@@ -25,6 +25,7 @@ class AvatarEditorTest extends React.Component {
             <div>
                 <AvatarEditor image="" />
                 <AvatarEditor image={file} />
+                <AvatarEditor image="" className="helloworld" />
                 <AvatarEditor image="" width={1} />
                 <AvatarEditor image="" height={1} />
                 <AvatarEditor image="" border={1} />
diff --git a/types/react-beautiful-dnd/index.d.ts b/types/react-beautiful-dnd/index.d.ts
index f917fc1a2d..a743ce6f78 100644
--- a/types/react-beautiful-dnd/index.d.ts
+++ b/types/react-beautiful-dnd/index.d.ts
@@ -104,12 +104,13 @@ export interface DroppableProvidedProps {
 }
 export interface DroppableProvided {
     innerRef(element: HTMLElement | null): any;
-    placeholder?: React.ReactElement<any> | null;
+    placeholder?: React.ReactElement | null;
     droppableProps: DroppableProvidedProps;
 }
 
 export interface DroppableStateSnapshot {
     isDraggingOver: boolean;
+    draggingOverWith?: DraggableId;
 }
 
 export interface DroppableProps {
@@ -119,7 +120,7 @@ export interface DroppableProps {
     isDropDisabled?: boolean;
     isCombineEnabled?: boolean;
     direction?: 'vertical' | 'horizontal';
-    children(provided: DroppableProvided, snapshot: DroppableStateSnapshot): React.ReactElement<any>;
+    children(provided: DroppableProvided, snapshot: DroppableStateSnapshot): React.ReactElement;
 }
 
 export class Droppable extends React.Component<DroppableProps> { }
@@ -173,7 +174,7 @@ export interface DraggableProvided {
 
     // will be removed after move to react 16
     innerRef(element?: HTMLElement | null): any;
-    placeholder?: React.ReactElement<any> | null;
+    placeholder?: React.ReactElement | null;
 }
 
 export interface DraggableStateSnapshot {
@@ -202,7 +203,7 @@ export interface DraggableProps {
     index: number;
     isDragDisabled?: boolean;
     disableInteractiveElementBlocking?: boolean;
-    children(provided: DraggableProvided, snapshot: DraggableStateSnapshot): React.ReactElement<any>;
+    children(provided: DraggableProvided, snapshot: DraggableStateSnapshot): React.ReactElement;
     type?: TypeId;
 }
 
diff --git a/types/react-better-password/index.d.ts b/types/react-better-password/index.d.ts
index b07a4e840e..2b5278bbb5 100644
--- a/types/react-better-password/index.d.ts
+++ b/types/react-better-password/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-better-password 1.0
-// Project: https://github.com/karaggeorge/react-better-password
+// Project: https://github.com/karaggeorge/react-better-password, https://karaggeorge.github.io/react-better-password
 // Definitions by: Mary Huynh <https://github.com/mhuynh1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-big-calendar/index.d.ts b/types/react-big-calendar/index.d.ts
index 89e6f0eead..7a6bebe1c2 100644
--- a/types/react-big-calendar/index.d.ts
+++ b/types/react-big-calendar/index.d.ts
@@ -6,6 +6,7 @@
 //                 Sebastian Silbermann <https://github.com/eps1lon>
 //                 Paul Potsides <https://github.com/strongpauly>
 //                 janb87 <https://github.com/janb87>
+//                 Daniel Thorne <https://github.com/ldthorne>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 import { Validator } from 'prop-types';
@@ -113,14 +114,13 @@ export interface HeaderProps {
 }
 
 export interface Components {
-    event?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+    event?: React.ComponentType<EventProps>;
     eventWrapper?: React.ComponentType<EventWrapperProps>;
+    eventContainerWrapper?: 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>;
+    timeSlotWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+    timeGutterWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
     toolbar?: React.ComponentType<ToolbarProps>;
     agenda?: {
         date?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
@@ -140,6 +140,10 @@ export interface Components {
         dateHeader?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
         event?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
     };
+    /**
+     * component used as a header for each column in the TimeGridHeader
+     */
+    header?: React.ComponentType<HeaderProps>;
 }
 
 export interface ToolbarProps {
@@ -153,6 +157,11 @@ export interface ToolbarProps {
     children?: React.ReactNode;
 }
 
+export interface EventProps<T extends Event = Event> {
+    event: T;
+    title: string;
+}
+
 export interface EventWrapperProps<T extends Event = Event> {
     // https://github.com/intljusticemission/react-big-calendar/blob/27a2656b40ac8729634d24376dff8ea781a66d50/src/TimeGridEvent.js#L28
     style?: React.CSSProperties & { xOffset: number };
@@ -220,7 +229,7 @@ export interface BigCalendarProps<TEvent extends Event = Event, TResource extend
     localizer: DateLocalizer;
 
     date?: stringOrDate;
-    now?: Date;
+    getNow?: () => Date;
     view?: View;
     events?: TEvent[];
     onNavigate?: (newDate: Date, view: View, action: Navigate) => void;
@@ -230,6 +239,7 @@ export interface BigCalendarProps<TEvent extends Event = Event, TResource extend
     onDoubleClickEvent?: (event: TEvent, e: React.SyntheticEvent<HTMLElement>) => void;
     onSelectEvent?: (event: TEvent, e: React.SyntheticEvent<HTMLElement>) => void;
     onSelecting?: (range: { start: stringOrDate, end: stringOrDate }) => boolean | undefined | null;
+    onRangeChange?: (range: { start: stringOrDate, end: stringOrDate }) => void;
     selected?: any;
     views?: Views;
     drilldownView?: View | null;
diff --git a/types/react-big-calendar/react-big-calendar-tests.tsx b/types/react-big-calendar/react-big-calendar-tests.tsx
index fd1e70f929..4bb6f23943 100644
--- a/types/react-big-calendar/react-big-calendar-tests.tsx
+++ b/types/react-big-calendar/react-big-calendar-tests.tsx
@@ -70,6 +70,7 @@ class CalendarResource {
             return (
               <MyCalendar  {...this.props}
               date={new Date()}
+              getNow={() => new Date()}
               view={'day'}
               events={getEvents()}
               onNavigate={(newDate: Date, view: View, action: Navigate) => { }}
diff --git a/types/react-body-classname/index.d.ts b/types/react-body-classname/index.d.ts
index 11dd7febeb..c456209c39 100644
--- a/types/react-body-classname/index.d.ts
+++ b/types/react-body-classname/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-body-classname 1.1
-// Project: https://github.com/PactCoffee/react-body-classname
+// Project: https://github.com/iest/react-body-classname
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-bootstrap-table/index.d.ts b/types/react-bootstrap-table/index.d.ts
index 226bdf1606..5f2341746f 100644
--- a/types/react-bootstrap-table/index.d.ts
+++ b/types/react-bootstrap-table/index.d.ts
@@ -328,7 +328,7 @@ export interface BootstrapTableProps extends Props<BootstrapTable> {
 	 * expandComponent is always used with expandableRow, both of props are enable
 	 * the expand row functionality on table.
 	 */
-	expandComponent?(row: any): string | ReactElement<any>;
+	expandComponent?(row: any): string | ReactElement;
 	/**
 	 * Assign some alternative options for expand row feature, expandColumnOptions
 	 * only have four available property currently.
@@ -430,7 +430,7 @@ export interface FooterData {
 	 * The output value from the formatter function will be used instead of the label if the formatter function is
 	 * defined.
 	 */
-	formatter?(tableData: any[]): string | number | ReactElement<any>;
+	formatter?(tableData: any[]): string | number | ReactElement;
 }
 
 export interface SelectRow<TRow extends object = any> {
@@ -510,7 +510,7 @@ export interface SelectRow<TRow extends object = any> {
 	/**
 	 * Function that returns a component to customize the display of the selection checkbox or radio button with.
 	 */
-	customComponent?(props: CustomSelectProps): string | ReactElement<any>;
+	customComponent?(props: CustomSelectProps): string | ReactElement;
 	/**
 	 * Only unselect visible rows.
 	 */
@@ -620,7 +620,7 @@ export interface Options<TRow extends object = any> {
 	/**
 	 * Change the text displayed on the table if data is empty.
 	 */
-	noDataText?: string | ReactElement<any>;
+	noDataText?: string | ReactElement;
 	/**
 	 * If true, this hides the noDataText on the table when the tableis empty. Default is false.
 	 */
@@ -812,7 +812,7 @@ export interface Options<TRow extends object = any> {
 	 *  `to`: Current end index
 	 *  `total`: The total data volume.
 	 */
-	paginationShowsTotal?: boolean | ((start: number, to: number, total: number) => string | ReactElement<any>);
+	paginationShowsTotal?: boolean | ((start: number, to: number, total: number) => string | ReactElement);
 	/**
 	 * Allows you to modify where to start counting the pages, e.g. to set the first page number to 0.
 	 * Default is 1.
@@ -887,14 +887,14 @@ export interface Options<TRow extends object = any> {
 	 * After v3.0.0, you can custom all the components in the ToolBar also itself too.
 	 * Give a toolBar in options props and toolBar only accept a function and a JSX returned value is necessary.
 	 */
-	toolBar?(props: ToolBarProps): ReactElement<any>;
+	toolBar?(props: ToolBarProps): ReactElement;
 	/**
 	 * Button group which contain the insert, drop, show only select and export CSV buttons, these button all
 	 * grouped as btn-group class in bootstrap. This is a chance that you can custom this button group.
 	 * Give a btnGroup in options props and btnGroup only accept a function and a JSX returned value is necessary.
 	 * This lets you customize just the left-hand-side of the toolbar if desired.
 	 */
-	btnGroup?(props: ButtonGroupProps): ReactElement<any>;
+	btnGroup?(props: ButtonGroupProps): ReactElement;
 	/**
 	 * It's available to customize the insert button by configuring insertBtn in options props, insertBtn only
 	 * accept a function and a JSX returned value is necessary. This function will take one argument: onClick.
@@ -902,7 +902,7 @@ export interface Options<TRow extends object = any> {
 	 * The default `InsertButton` component is also exported as a component, so that you can use it as the base
 	 * for your custom component.
 	 */
-	insertBtn?(onClick: (e: React.MouseEvent<any>) => void): ReactElement<any>;
+	insertBtn?(onClick: (e: React.MouseEvent<any>) => void): ReactElement;
 	/**
 	 * It's available to customize delete button by configuring deleteBtn in options props, deleteBtn onl<y
 	 * accept a function and a JSX returned value is necessary. This function will take one argument: onClick.
@@ -910,7 +910,7 @@ export interface Options<TRow extends object = any> {
 	 * The default `DeleteButton` component is also exported as a component, so that you can use it as the base
 	 * for your custom component.
 	 */
-	deleteBtn?(onClick: (e: React.MouseEvent<any>) => void): ReactElement<any>;
+	deleteBtn?(onClick: (e: React.MouseEvent<any>) => void): ReactElement;
 	/**
 	 * It's available to customize the export csv button by configuring exportCSVBtn in options props, exportCSVBtn only
 	 * accept a function and a JSX returned value is necessary. This function will take one argument: onClick.
@@ -918,7 +918,7 @@ export interface Options<TRow extends object = any> {
 	 * The default `ExportCSVButton` component is also exported as a component, so that you can use it as the base
 	 * for your custom component.
 	 */
-	exportCSVBtn?(onClick: (e: React.MouseEvent<any>) => void): ReactElement<any>;
+	exportCSVBtn?(onClick: (e: React.MouseEvent<any>) => void): ReactElement;
 	/**
 	 * It's available to custom select only toggle button by configuring showSelectedOnlyBtn in options props.
 	 * showSelectedOnlyBtn only accept a function and a JSX returned value is necessary.
@@ -927,7 +927,7 @@ export interface Options<TRow extends object = any> {
 	 * The default `ShowSelectedOnlyButton` component is also exported as a component, so that you can use it as
 	 * the base for your custom component.
 	 */
-	showSelectedOnlyBtn?(onClick: (e: React.MouseEvent<any>) => void, showSelected: boolean): ReactElement<any>;
+	showSelectedOnlyBtn?(onClick: (e: React.MouseEvent<any>) => void, showSelected: boolean): ReactElement;
 	/**
 	 * You can custom the whole search panel(right side) by searchPanel in options props. searchPanel only accept
 	 * a function and a JSX returned value is necessary. This function will take one argument: props, that contains:
@@ -938,7 +938,7 @@ export interface Options<TRow extends object = any> {
 	 *   `clearBtnClick`: the callback function to use when the clear search button is clicked
 	 *   `search`: the callback function for triggering the search, which takes the search text as an input.
 	 */
-	searchPanel?(props: SearchPanelProps): ReactElement<any>;
+	searchPanel?(props: SearchPanelProps): ReactElement;
 	/**
 	 * You can custom the search input field only by searchField in options props. searchField only accept a
 	 * function and a JSX returned value is necessary.
@@ -954,7 +954,7 @@ export interface Options<TRow extends object = any> {
 	 * The default `ClearSearchButton` component is also exported as a component, so that you can use it as the
 	 * base for your own custom component.
 	 */
-	clearSearchBtn?(onClick: (e: React.MouseEvent<any>) => void): ReactElement<any>;
+	clearSearchBtn?(onClick: (e: React.MouseEvent<any>) => void): ReactElement;
 	/**
 	 * You can customize everything in the insert modal via options.insertModal and we give you the event
 	 * callback, props and some informations: onModalClose, onSave, columns, validateState, ignoreEditable
@@ -966,7 +966,7 @@ export interface Options<TRow extends object = any> {
 		columns: ReadonlyArray<InsertModalColumnDescription<TRow>>,
 		validateState: { [dataField: string]: string },
 		ignoreEditable: boolean
-	): ReactElement<any>;
+	): ReactElement;
 	/**
 	 * You can customize the body of the insert modal via options.insertModalBody and we give you the following
 	 * arguments: columns, validateState {[fieldname]: errorMsg}, ignoreEditable
@@ -989,7 +989,7 @@ export interface Options<TRow extends object = any> {
 	 * The default `InsertModalHeader` component is also exported as a component, so that you can use it as the base
 	 * for your own custom component.
 	 */
-	insertModalHeader?(closeModal: () => void, save: () => void): ReactElement<any>;
+	insertModalHeader?(closeModal: () => void, save: () => void): ReactElement;
 	/**
 	 * It's available to custom the footer of insert modal by configuring options.insertModalFooter. It only accepts
 	 * a function and a JSX returned value is necessary. This function will take two arguments: closeModal and save.
@@ -999,16 +999,16 @@ export interface Options<TRow extends object = any> {
 	 * The default `InsertModalFooter` component is also exported as a component, so that you can use it as the base
 	 * for your own custom component.
 	 */
-	insertModalFooter?(closeModal: () => void, save: () => void): ReactElement<any>;
+	insertModalFooter?(closeModal: () => void, save: () => void): ReactElement;
 	/**
 	 * Function to customize all of components for pagination, including the sizePerPage dropdown and the
 	 * pagination list.
 	 */
-	paginationPanel?(props: PaginationPanelProps): ReactElement<any>;
+	paginationPanel?(props: PaginationPanelProps): ReactElement;
 	/**
 	 * Function to customize the sizePerPage dropdown.
 	 */
-	sizePerPageDropDown?(props: SizePerPageFunctionProps): ReactElement<any>;
+	sizePerPageDropDown?(props: SizePerPageFunctionProps): ReactElement;
 	/**
 	 * Location for the pagination panel to be displayed. Options are 'top' (above the table), 'bottom'
 	 * (below the table) and 'both' (above and below the table).
@@ -1206,13 +1206,13 @@ export interface TableHeaderColumnProps extends Props<TableHeaderColumn> {
 	 *   `direction`: the current sort order.
 	 *   `fieldName`: the dataField name of the field currently being sorted.
 	 */
-	caretRender?(direction: SortOrder | null, fieldName: string): string | ReactElement<any>;
+	caretRender?(direction: SortOrder | null, fieldName: string): string | ReactElement;
 	/**
 	 * To customize the column. This callback function should return a String or a React Component.
 	 * In addition, this function taking four argument: cell, row, formatExtraData, rowIdx.
 	 * The formatExtraData will be the value which you assign it on <TableHeaderColumn>
 	 */
-	dataFormat?(cell: any, row: any, formatExtraData: any, rowIndex: number): string | ReactElement<any>;
+	dataFormat?(cell: any, row: any, formatExtraData: any, rowIndex: number): string | ReactElement;
 	/**
 	 * It's useful with dataFormat, you can give any data you want to be passed to the formatter.
 	 */
@@ -1412,7 +1412,7 @@ export interface TableHeaderColumnProps extends Props<TableHeaderColumn> {
 			editorClass: string,
 			ignoreEditable: boolean,
 			defaultValue: any
-		): ReactElement<any> | boolean;
+		): ReactElement | boolean;
 	};
 	/**
 	 * Support specifying that the column should start sorting with the 'asc' option.
@@ -1912,7 +1912,7 @@ export interface ExpandColumnOptions {
 	/**
 	 * a callback function to customize the appearance of the indicator column.
 	 */
-	expandColumnComponent?(props: ExpandColumnComponentProps): string | ReactElement<any>;
+	expandColumnComponent?(props: ExpandColumnComponentProps): string | ReactElement;
 	/**
 	 * set the width of indicator column.
 	 */
@@ -1925,7 +1925,7 @@ export interface ExpandColumnOptions {
 	/**
 	 * a callback function to customise the header column
 	 */
-	expandedColumnHeaderComponent?(props: ExpandedColumnHeaderProps): string | ReactElement<any>;
+	expandedColumnHeaderComponent?(props: ExpandedColumnHeaderProps): string | ReactElement;
 }
 
 /**
@@ -1990,7 +1990,7 @@ export interface ColumnDescription<TRow extends object = any> {
 	 * Column data format function.
 	 * Comes from TableHeader.dataFormat property.
 	 */
-	format(cell: any, row: TRow, formatExtraData: any, rowIndex: number): string | ReactElement<any>;
+	format(cell: any, row: TRow, formatExtraData: any, rowIndex: number): string | ReactElement;
 	/**
 	 * The formatExtraData setting for the column.
 	 * Comes from TableHeader.formatExtraData property.
@@ -2060,7 +2060,7 @@ export interface ColumnDescription<TRow extends object = any> {
 	 * Custom header value/component/children to use for this column.
 	 * Comes from TableHeader.headerText || TableHeader.children properties.
 	 */
-	text: string | number | boolean | ReactElement<any>;
+	text: string | number | boolean | ReactElement;
 	/**
 	 * Custom sort function to use for this column.
 	 * Comes from TableHeader.sortFunc property.
@@ -2109,19 +2109,19 @@ export interface ToolBarProps {
 		/**
 		 * Search panel component.
 		 */
-		searchPanel: ReactElement<any>;
+		searchPanel: ReactElement;
 		/**
 		 * Button group components.
 		 */
-		btnGroup: ReactElement<any>; // button groups JSX
+		btnGroup: ReactElement; // button groups JSX
 		/**
 		 * The individual search field.
 		 */
-		searchField: ReactElement<any>; // search field JSX
+		searchField: ReactElement; // search field JSX
 		/**
 		 * The button to clear the search field.
 		 */
-		clearBtn: ReactElement<any>; // clear search field JSX
+		clearBtn: ReactElement; // clear search field JSX
 	};
 	/**
 	 * Event callbacks to use with a custom toolbar.
@@ -2161,19 +2161,19 @@ export interface ButtonGroupProps {
 	/**
 	 * Export to CSV button.
 	 */
-	exportCSVBtn: ReactElement<any>;
+	exportCSVBtn: ReactElement;
 	/**
 	 * Insert button (to add a row).
 	 */
-	insertBtn: ReactElement<any>;
+	insertBtn: ReactElement;
 	/**
 	 * Delete button.
 	 */
-	deleteBtn: ReactElement<any>;
+	deleteBtn: ReactElement;
 	/**
 	 * Toggle button to switch between showing all rows and showing selected rows only.
 	 */
-	showSelectedOnlyBtn: ReactElement<any>;
+	showSelectedOnlyBtn: ReactElement;
 }
 
 /**
@@ -2183,11 +2183,11 @@ export interface SearchPanelProps {
 	/**
 	 * Default search field component.
 	 */
-	searchField: ReactElement<any>;
+	searchField: ReactElement;
 	/**
 	 * Default clear search field button component.
 	 */
-	clearBtn: ReactElement<any>;
+	clearBtn: ReactElement;
 	/**
 	 * The default search text.
 	 */
@@ -2247,7 +2247,7 @@ export interface PaginationPanelProps {
 		/**
 		 * Text/element to display when displaying the total number of rows.
 		 */
-		totalText: string | ReactElement<any>;
+		totalText: string | ReactElement;
 		/**
 		 * Default sizePerPageDropdown component.
 		 */
@@ -2318,7 +2318,7 @@ export interface CustomEditor<TRow extends object, K extends keyof TRow> {
 	 *   `onUpdate`: callback function to call to update the value inside the cell.
 	 *   `props`:
 	 */
-	getElement(onUpdate: (updatedCell: TRow[K]) => void, props: CustomEditorProps<TRow, K>): ReactElement<any>;
+	getElement(onUpdate: (updatedCell: TRow[K]) => void, props: CustomEditorProps<TRow, K>): ReactElement;
 	/**
 	 * Additional parameters to pass to the getElement function inside the props argument.
 	 */
@@ -2459,7 +2459,7 @@ export interface InsertModalColumnDescription<TRow extends object = any> {
 	 * Header text/element for the column.
 	 * Comes from TableHeader.headerText or TableHeader.children.
 	 */
-	name: string | ReactElement<any>;
+	name: string | ReactElement;
 	/**
 	 * Field name for the column data.
 	 * Comes from TableHeader.dataField.
@@ -2480,7 +2480,7 @@ export interface InsertModalColumnDescription<TRow extends object = any> {
 		editorClass: string,
 		ignoreEditable: boolean,
 		defaultValue: TRow[keyof TRow]
-	): ReactElement<any> | boolean;
+	): ReactElement | boolean;
 	/**
 	 * Flag to indicate whether this column should be hidden on the Insert Modal page.
 	 * Comes from TableHeader.hiddenOnInsert.
diff --git a/types/react-bootstrap-table/v2/index.d.ts b/types/react-bootstrap-table/v2/index.d.ts
index 07d7da53d9..8ea1091e16 100644
--- a/types/react-bootstrap-table/v2/index.d.ts
+++ b/types/react-bootstrap-table/v2/index.d.ts
@@ -291,7 +291,7 @@ export interface Options {
 	/**
 	 * Change the displaying text on table if data is empty.
 	 */
-	noDataText?: string | ReactElement<any>;
+	noDataText?: string | ReactElement;
 	/**
 	 * A delay for trigger search after a keyup (millisecond)
 	 */
@@ -433,7 +433,7 @@ export interface Options {
 	 * `rowKeys` is the row keys which been deleted, you can call next function to apply this deletion.
 	 */
 	handleConfirmDeleteRow?: (next: Function, rowKeys: any[]) => void;
-	paginationShowsTotal?: boolean | ((start: number, to: number, total: number) => string | ReactElement<any>);
+	paginationShowsTotal?: boolean | ((start: number, to: number, total: number) => string | ReactElement);
 	onSearchChange?: Function;
 	onAddRow?: Function;
 	onExportToCSV?: Function;
@@ -557,12 +557,12 @@ export interface TableHeaderColumnProps extends Props<TableHeaderColumn> {
 	 * 		getElement(REQUIRED): Accept a callback function and take two arguments: onUpdate and props.
 	 * 		customEditorParameters: Another extra data for custom cell edit component.
 	 */
-	customEditor?: { getElement: (onUpdate: any, props: any) => ReactElement<any>, customEditorParameters?: object };
+	customEditor?: { getElement: (onUpdate: any, props: any) => ReactElement, customEditorParameters?: object };
 	/**
 	 * To customize the column. This callback function should return a String or a React Component.
 	 * In addition, this function taking two argument: cell and row.
 	 */
-	dataFormat?: (cell: any, row: any, formatExtraData?: any) => string | ReactElement<any>;
+	dataFormat?: (cell: any, row: any, formatExtraData?: any) => string | ReactElement;
 	/**
 	 * To to enable search or filter data on formatting. Default is false
 	 */
diff --git a/types/react-bootstrap-typeahead/index.d.ts b/types/react-bootstrap-typeahead/index.d.ts
index 52f99825d5..93fa2c9c6a 100644
--- a/types/react-bootstrap-typeahead/index.d.ts
+++ b/types/react-bootstrap-typeahead/index.d.ts
@@ -4,37 +4,123 @@
 //                 Rajab Shakirov <https://github.com/radziksh>
 //                 Paito Anderson <https://github.com/PaitoAnderson>
 //                 Andreas Richter <https://github.com/arichter83>
+//                 Dale Fenton <https://github.com/dalevfenton>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
-// TODO: <Token> components
+// TypeScript Version: 2.9
 
 import * as React from 'react';
-import * as CSS from 'csstype';
+export type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
+export type StringPropertyNames<T extends object> = { [K in keyof T]: T[K] extends string ? K : never }[keyof T];
 
-export interface TypeaheadFilterbyProps {
-    filterBy: string[];
-    labelKey: (string | (() => void));
-    multiple: boolean;
-    selected: any[];
-    caseSensitive: boolean;
-    ignoreDiacritics: boolean;
+/* ---------------------------------------------------------------------------
+                       Constants and Enumerated Types
+--------------------------------------------------------------------------- */
+export type TypeaheadModel = string|object;
+export type TypeaheadBsSizes = 'large' | 'lg' | 'small' | 'sm';
+export type TypeaheadAlign = 'justify' | 'left' | 'right';
+// if options is an object, only let labelKey be a key of that object, whose value is a string
+// or a custom label function that takes a single option and returns a string for the label
+export type TypeaheadLabelKey<T extends TypeaheadModel> = T extends object ? (StringPropertyNames<T> | ((option: T) => string)) : never;
+// don't allow onBlur, onChange, onFocus or onKeyDown as members of inputProps
+// those props should be supplied directly to <Typeahead /> or <AsyncTypeahead />
+export interface InputProps extends Omit<React.InputHTMLAttributes<'input'>, 'onBlur'|'onChange'|'onFocus'|'onKeyDown'> { }
+
+/* ---------------------------------------------------------------------------
+                            Typeahead Contexts
+--------------------------------------------------------------------------- */
+export interface TypeaheadContext<T extends TypeaheadModel> {
+    activeIndex?: number;
+    hintText?: string;
+    initialItem?: T;
+    isOnlyResult?: boolean;
+    onActiveItemChange?: (options: T) => void;
+    onAdd?: (option: T) => void;
+    onInitialItemChange?: (option: T) => void;
+    onMenuItemClick?: (option: T, e: Event) => void;
+    selectHintOnEnter?: boolean;
+}
+
+export interface TypeaheadState<T extends TypeaheadModel> {
+    activeIndex: number|null;
+    activeItem: T|null;
+    initialItem: T|null;
+    isFocused: boolean;
+    selected: T[];
+    showMenu: boolean;
+    shownResults: number;
     text: string;
 }
 
-export interface TypeaheadMenuProps<T> {
+export interface InputContainerPropsSingle<T extends TypeaheadModel> {
+    'aria-activedescendant': string;
+    'aria-autocomplete': 'list' | 'both';
+    'aria-expanded': boolean | 'true' | 'false';
+    'aria-haspopup': 'listbox';
+    'aria-owns': string;
+    autoComplete: string;
+    disabled: boolean;
+    inputRef: React.LegacyRef<HTMLInputElement>;
+    onBlur: (e: Event) => void;
+    onChange: (selected: T[]) => void;
+    onClick: (e: Event) => void;
+    onFocus: (e: Event) => void;
+    onKeyDown: (e: Event) => void;
+    placeholder: string|null;
+    role: 'combobox';
+    value: string;
+}
+
+export interface InputContainerPropsMultiple<T extends TypeaheadModel> extends Omit<InputContainerPropsSingle<T>, 'role'> {
+    inputClassName: string;
+    labelKey: TypeaheadLabelKey<T>;
+    onRemove: (e: Event) => void;
+    renderToken: (selectedItem: T, props: TypeaheadMenuProps<T>, index: number) => React.ReactNode;
+    role: '';
+    selected: T[];
+}
+
+export type HintedInputContextKeys = 'hintText' | 'initialItem' | 'onAdd' | 'selectHintOnEnter';
+export interface HintedInputContext<T extends TypeaheadModel> extends Pick<TypeaheadContext<T>, HintedInputContextKeys> {}
+
+export type MenuItemContextKeys = 'activeIndex' | 'isOnlyResult' | 'onActiveItemChange' | 'onInitialItemChange' | 'onMenuItemClick';
+export interface MenuItemContext<T extends TypeaheadModel> extends Pick<TypeaheadContext<T>, MenuItemContextKeys> {}
+
+export interface TokenContext {
+    active: boolean;
+    onBlur: (e: any) => void;
+    onClick: (e: any) => void;
+    onFocus: (e: any) => void;
+    onKeyDown: (e: any) => void;
+}
+
+/* ---------------------------------------------------------------------------
+                       Typeahead Props and Component
+--------------------------------------------------------------------------- */
+export interface TypeaheadContainerProps<T extends TypeaheadModel> {
+    activeIndex: number | null;
+    activeItem: T | null;
+    initialItem: T | null;
+    isFocused: boolean;
+    selected: T[];
+    showMenu: boolean;
+    shownResults: number;
     text: string;
 }
 
-export interface TypeaheadProps<T> {
-    /* For localized accessibility: Should return a string indicating the number of results for screen readers. Receives the current results. */
+export type TypeaheadResult<T extends TypeaheadModel> = T & { customOption: boolean };
+
+export interface TypeaheadProps<T extends TypeaheadModel> {
+    /* For localized accessibility: Should return a string indicating the number of results for screen readers.
+    Receives the current results. */
     a11yNumResults?: () => void;
 
-    /* For localized accessibility: Should return a string indicating the number of selections for screen readers. Receives the current selections. */
+    /* For localized accessibility: Should return a string indicating the number of selections for screen readers.
+    Receives the current selections. */
     a11yNumSelected?: () => void;
 
     /* Specify menu alignment. The default value is justify, which makes the menu as wide as the input and truncates long values.
        Specifying left or right will align the menu to that side and the width will be determined by the length of menu item values. */
-    align?: 'justify' | 'left' | 'right';
+    align?: TypeaheadAlign;
 
     /* Allows the creation of new selections on the fly. Any new items will be added to the list of selections,
        but not the list of original options unless handled as such by Typeahead's parent.
@@ -49,7 +135,7 @@ export interface TypeaheadProps<T> {
     bodyContainer?: boolean;
 
     /* Specify the size of the input. */
-    bsSize?: 'large' | 'lg' | 'small' | 'sm';
+    bsSize?: TypeaheadBsSizes;
 
     /* Whether or not filtering should be case-sensitive. */
     caseSensitive?: boolean;
@@ -60,6 +146,9 @@ export interface TypeaheadProps<T> {
     /* The initial value displayed in the text input. */
     defaultInputValue?: string;
 
+     /* Whether or not the menu is displayed upon initial render. */
+    defaultOpen?: boolean;
+
     /* Specify any pre-selected options. Use only if you want the component to be uncontrolled. */
     defaultSelected?: T[];
 
@@ -74,7 +163,10 @@ export interface TypeaheadProps<T> {
     emptyLabel?: string;
 
     /* Either an array of fields in option to search, or a custom filtering callback. */
-    filterBy?: (string[] | ((option: T | string, props: TypeaheadFilterbyProps) => boolean));
+    filterBy?: (string[] | ((option: T, props: AllTypeaheadOwnAndInjectedProps<T>) => boolean));
+
+    /* Whether or not to automatically adjust the position of the menu when it reaches the viewport boundaries. */
+    flip?: boolean;
 
     /* Highlights the menu item if there is only one result and allows selecting that item by hitting enter.
        Does not work with allowNew. */
@@ -84,7 +176,7 @@ export interface TypeaheadProps<T> {
     ignoreDiacritics?: boolean;
 
     /* Props to be applied directly to the input. onBlur, onChange, onFocus, and onKeyDown are ignored. */
-    inputProps?: object;
+    inputProps?: InputProps;
 
     /* Bootstrap 4 only. Adds the `is-invalid` classname to the `form-control`. */
     isInvalid?: boolean;
@@ -95,8 +187,9 @@ export interface TypeaheadProps<T> {
     /* 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);
+    /* Specify which option key to use for display or a render function.
+       By default, the selector will use the label key. */
+    labelKey?: TypeaheadLabelKey<T>;
 
     /* Maximum height of the dropdown menu. */
     maxHeight?: string;
@@ -105,6 +198,9 @@ export interface TypeaheadProps<T> {
        so as not to render too many DOM nodes in the case of large data sets. */
     maxResults?: number;
 
+    /* Id applied to the top-level menu element. Required for accessibility. */
+    menuId?: string;
+
     /* Number of input characters that must be entered before showing results. */
     minLength?: number;
 
@@ -115,28 +211,35 @@ export interface TypeaheadProps<T> {
     newSelectionPrefix?: string;
 
     /* Invoked when the input is blurred. Receives an event. */
-    onBlur?: (e: Event) => any;
+    onBlur?: (e: Event) => void;
 
     /* Invoked whenever items are added or removed. Receives an array of the selected options. */
-    onChange?: (selected: T[]) => any;
+    onChange?: (selected: T[]) => void;
 
     /* Invoked when the input is focused. Receives an event. */
-    onFocus?: (e: Event) => any;
+    onFocus?: (e: Event) => void;
 
     /* Invoked when the input value changes. Receives the string value of the input, as well as the original event. */
-    onInputChange?: (input: string, e: Event) => any;
+    onInputChange?: (input: string, e: Event) => void;
 
     /* Invoked when a key is pressed. Receives an event. */
-    onKeyDown?: (e: Event) => any;
+    onKeyDown?: (e: Event) => void;
 
-    /* Invoked when the menu is hidden. */
-    onMenuHide?: (e: Event) => any;
+    /* DEPRECATED: Invoked when the menu is hidden. */
+    onMenuHide?: () => void;
 
-    /* Invoked when the menu is shown. */
-    onMenuShow?: (e: Event) => any;
+    /* DEPRECATED: Invoked when the menu is shown. */
+    onMenuShow?: () => void;
+
+    /* 	Invoked when menu visibility changes. */
+    onMenuToggle?: (show: boolean) => void;
 
     /* Invoked when the pagination menu item is clicked. */
-    onPaginate?: (e: Event) => any;
+    onPaginate?: (e: Event, numResults: number) => void;
+
+    /* Whether or not the menu should be displayed. undefined allows the component to control visibility,
+    while true and false show and hide the menu, respectively. */
+    open?: boolean;
 
     /* Full set of options, including any pre-selected options. */
     options: T[];
@@ -151,13 +254,13 @@ export interface TypeaheadProps<T> {
     placeholder?: string;
 
     /* Callback for custom menu rendering. */
-    renderMenu?: (results: Array<T | string>, menuProps: any) => any;
+    renderMenu?: (results: Array<TypeaheadResult<T>>, menuProps: any) => React.ReactNode;
 
     /* Provides a hook for customized rendering of menu item contents. */
-    renderMenuItemChildren?: (option: T, props: TypeaheadMenuProps<T>, index: number) => any;
+    renderMenuItemChildren?: (option: TypeaheadResult<T>, props: TypeaheadMenuProps<T>, index: number) => React.ReactNode;
 
     /* Provides a hook for customized rendering of tokens when multiple selections are enabled. */
-    renderToken?: (selectedItem: T | string, onRemove: () => void) => any;
+    renderToken?: (selectedItem: T, props: TypeaheadMenuProps<T>, index: number) => React.ReactNode;
 
     /* The selected option(s) displayed in the input. Use this prop if you want to control the component via its parent. */
     selected?: T[];
@@ -166,9 +269,13 @@ export interface TypeaheadProps<T> {
     selectHintOnEnter?: boolean;
 }
 
-export const Typeahead: React.ClassicComponentClass<TypeaheadProps<any>>;
+export type AllTypeaheadOwnAndInjectedProps<T extends TypeaheadModel> = TypeaheadProps<T> & TypeaheadContainerProps<T>;
+export class Typeahead<T extends TypeaheadModel> extends React.Component<TypeaheadProps<T>> { }
 
-export interface AsyncTypeaheadProps<T> extends TypeaheadProps<T> {
+/* ---------------------------------------------------------------------------
+                       AsyncTypeahead Props and Component
+--------------------------------------------------------------------------- */
+export interface AsyncTypeaheadProps<T extends TypeaheadModel> extends TypeaheadProps<T> {
     /* 	Delay, in milliseconds, before performing search. */
     delay?: number;
 
@@ -179,45 +286,148 @@ export interface AsyncTypeaheadProps<T> extends TypeaheadProps<T> {
     onSearch: (query: string) => void;
 
     /* Message displayed in the menu when there is no user input. */
-    promptText?: string;
+    promptText?: React.ReactNode;
 
     /* Message to display in the menu while the request is pending. */
-    searchText?: string;
+    searchText?: React.ReactNode;
 
     /* Whether or not the component should cache query results. */
     useCache?: boolean;
 }
 
-export const AsyncTypeahead: React.ClassicComponentClass<AsyncTypeaheadProps<any>>;
+export class AsyncTypeahead<T extends TypeaheadModel> extends React.Component<AsyncTypeaheadProps<T>> { }
 
-export interface HighligherProps<T> {
-    key?: string;
-    search: string;
-    optionId?: any;
+/* ---------------------------------------------------------------------------
+        TypeaheadInputSingle & TypeaheadInputMulti Props and Component
+--------------------------------------------------------------------------- */
+export interface BaseTypeaheadInputProps extends React.InputHTMLAttributes<'input'> {
+    type: 'text';
 }
 
-export const Highlighter: React.ClassicComponentClass<HighligherProps<any>>;
+export interface TypeaheadSingleInputWithHocProps<T extends TypeaheadModel> extends
+    Omit<BaseTypeaheadInputProps, keyof InputContainerPropsSingle<T>>,
+    InputContainerPropsSingle<T> {}
 
-export interface MenuProps<T> {
+export interface TypeaheadMulitInputWithHocProps<T extends TypeaheadModel> extends
+    Omit<BaseTypeaheadInputProps, keyof InputContainerPropsMultiple<T>>,
+    HintedInputContext<T>,
+    InputContainerPropsMultiple<T> {}
+
+export type TypeaheadInputPropKeys = 'bsSize'|'disabled'|'inputProps'|'labelKey'|'multiple'|
+                                     'onBlur'|'onChange'|'onFocus'|'onKeyDown'|'placeholder'|'renderToken'|'selected';
+
+export type TypeaheadInputProps<T extends TypeaheadModel> = Pick<TypeaheadProps<T>, TypeaheadInputPropKeys>;
+
+export class TypeaheadInputSingle<T extends TypeaheadModel> extends React.Component<TypeaheadSingleInputWithHocProps<T>> { }
+export class TypeaheadInputMulti<T extends TypeaheadModel> extends React.Component<TypeaheadMulitInputWithHocProps<T>> { }
+
+/* ---------------------------------------------------------------------------
+                       Highlighter Props and Component
+--------------------------------------------------------------------------- */
+export interface HighligherProps {
+    children: React.ReactNode;
+    search: string;
+}
+
+export class Highlighter extends React.PureComponent<HighligherProps> { }
+
+/* ---------------------------------------------------------------------------
+                       ClearButton Props and Component
+--------------------------------------------------------------------------- */
+export interface ClearButtonProps extends React.HTMLAttributes<'button'> {
+    bsSize?: TypeaheadBsSizes;
+    label?: string;
+    onClick: React.HTMLAttributes<'button'>['onClick']; // make onClick requried
+}
+
+export const ClearButton: React.FunctionComponent<ClearButtonProps>;
+
+/* ---------------------------------------------------------------------------
+                       Loader Props and Component
+--------------------------------------------------------------------------- */
+export interface LoaderProps {
+    bsSize: TypeaheadBsSizes;
+}
+
+export const Loader: React.FunctionComponent<LoaderProps>;
+
+/* ---------------------------------------------------------------------------
+                       AutosizeInput Props and Component
+--------------------------------------------------------------------------- */
+export interface AutosizeInputProps extends Pick<React.InputHTMLAttributes<'input'>, 'className' | 'style'> {
+    inputClassName?: string;
+    inputRef?: React.LegacyRef<HTMLInputElement>;
+    inputStyle?: Pick<React.CSSProperties, 'boxSizing' | 'width'>;
+    style: React.CSSProperties;
+}
+
+export class AutosizeInput extends React.Component<AutosizeInputProps> { }
+
+/* ---------------------------------------------------------------------------
+                       Menu Props and Component
+--------------------------------------------------------------------------- */
+export interface MenuProps {
     id: string;
     className?: string;
     emptyLabel?: string;
-    innerRef?: string;
+    innerRef?: React.LegacyRef<HTMLUListElement>;
     maxHeight?: string;
-    style?: CSS.Properties;
+    style?: React.CSSProperties;
+    text?: string;
 }
 
-export const Menu: React.ClassicComponentClass<MenuProps<any>>;
+export type MenuHeaderProps = Omit<React.HTMLProps<'li'>, 'className'>;
 
-export interface MenuItemProps<T> {
+export class Menu extends React.Component<MenuProps> {
+    static Divider: React.FunctionComponent;
+    static Header: React.FunctionComponent<MenuHeaderProps>;
+}
+
+/* ---------------------------------------------------------------------------
+                       TypeaheadMenu Props and Component
+--------------------------------------------------------------------------- */
+// prop names that Typeahead provides to TypeaheadMenu
+export type TypeaheadMenuPropsPick = 'labelKey' | 'newSelectionPrefix'| 'options' | 'renderMenuItemChildren';
+export interface TypeaheadMenuProps<T extends TypeaheadModel> extends MenuProps, Pick<AllTypeaheadOwnAndInjectedProps<T>, TypeaheadMenuPropsPick> {}
+export class TypeaheadMenu<T extends TypeaheadModel> extends React.Component<TypeaheadMenuProps<T>> { }
+
+/* ---------------------------------------------------------------------------
+                       Menu Item Props and Component
+--------------------------------------------------------------------------- */
+export interface BaseMenuItemProps extends React.HTMLProps<'li'> {
+    active?: boolean;
+}
+export class BaseMenuItem extends React.Component<BaseMenuItemProps> { }
+
+export interface MenuItemProps<T extends TypeaheadModel> extends BaseMenuItemProps {
     option: T;
     position: number;
     label?: string;
-    active?: boolean;
-    className?: string;
-    disabled?: boolean;
-    onClick?: (e: Event) => any;
-    onMouseDown?: (e: Event) => any;
 }
 
-export const MenuItem: React.ClassicComponentClass<MenuItemProps<any>>;
+export class MenuItem<T extends TypeaheadModel> extends React.Component<MenuItemProps<T>> { }
+
+/* ---------------------------------------------------------------------------
+                       Overlay Props and Component
+--------------------------------------------------------------------------- */
+export type OverlayTypeaheadProps = Pick<TypeaheadProps<any>, 'align' | 'dropup' | 'flip' | 'onMenuHide' | 'onMenuShow' | 'onMenuToggle'>;
+
+export interface OverlayProps extends OverlayTypeaheadProps {
+    children?: React.ReactNode;
+    className?: string;
+    container: HTMLElement;
+    referenceElement?: HTMLElement;
+    show?: boolean;
+}
+
+export class Overlay extends React.Component<OverlayProps> { }
+
+/* ---------------------------------------------------------------------------
+                       Token Props and Component
+--------------------------------------------------------------------------- */
+export interface TokenProps extends React.HTMLProps<'div'> {
+    active?: boolean;
+    onRemove?: () => void; // Token does not invoke onRemove with any parameters
+}
+
+export class Token extends React.Component<TokenProps> { }
diff --git a/types/react-bootstrap-typeahead/package.json b/types/react-bootstrap-typeahead/package.json
deleted file mode 100644
index e6696d08e7..0000000000
--- a/types/react-bootstrap-typeahead/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "private": true,
-  "dependencies": {
-    "csstype": "^2.2.0"
-  }
-}
diff --git a/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx b/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
index c77052a3c6..f331752cbb 100644
--- a/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
+++ b/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
@@ -1,25 +1,78 @@
 import * as React from 'react';
-import { Typeahead, Highlighter, Menu, MenuItem } from 'react-bootstrap-typeahead';
+import { ClearButton, Typeahead, Highlighter, Menu, MenuItem, Token } from 'react-bootstrap-typeahead';
 
-const options = [
-    { name: 'Alabama', population: 4780127, capital: 'Montgomery', region: 'South' },
-    { name: 'Alaska', population: 710249, capital: 'Juneau', region: 'West' },
-    { name: 'Arizona', population: 6392307, capital: 'Phoenix', region: 'West' },
-    { name: 'Arkansas', population: 2915958, capital: 'Little Rock', region: 'South' },
-    { name: 'California', population: 37254503, capital: 'Sacramento', region: 'West' },
-    { name: 'Colorado', population: 5029324, capital: 'Denver', region: 'West' },
+interface State {
+    capital: string;
+    name: string;
+    population: number;
+    region: string;
+    setValue: (value: State) => void;
+}
+interface GroupedStates {
+    [key: string]: State[];
+}
+type StringPropertyNames<T> = { [K in keyof T]: T[K] extends string ? K : never }[keyof T];
+type StateKeysValid = StringPropertyNames<State>;
+const options: State[] = [
+    { name: 'Alabama', population: 4780127, capital: 'Montgomery', region: 'South', setValue: () => {} },
+    { name: 'Alaska', population: 710249, capital: 'Juneau', region: 'West', setValue: () => {} },
+    { name: 'Arizona', population: 6392307, capital: 'Phoenix', region: 'West', setValue: () => {} },
+    { name: 'Arkansas', population: 2915958, capital: 'Little Rock', region: 'South', setValue: () => {} },
+    { name: 'California', population: 37254503, capital: 'Sacramento', region: 'West', setValue: () => {} },
+    { name: 'Colorado', population: 5029324, capital: 'Denver', region: 'West', setValue: () => {} },
 ];
 
+const stateNames = options.map(o => o.name);
+
+const groups: GroupedStates = options.reduce((accum: GroupedStates, option: State) => {
+    const optKey = option.name.slice(0, 1).toLowerCase();
+    if (accum[optKey] !== undefined) {
+        accum[optKey].push(option);
+    } else {
+        accum[optKey] = [option];
+    }
+    return accum;
+}, {});
+
 class BasicExample extends React.Component {
     state = {
         multiple: false,
     };
 
+    genCustomMenu = () => {
+        const menuItems = Object.keys(groups).reduce((accum, letter) => {
+            const header = [
+                <Menu.Divider key={`${letter}-start`} />,
+                <Menu.Header key={`${letter}-header`}>
+                    {`States starting with: ${letter.toUpperCase()}`}
+                    <ClearButton onClick={() => {}} />
+                </Menu.Header>,
+                <Menu.Divider key={`${letter}-end`} />,
+            ];
+            const states = groups[letter].map((state: State, index: number) => {
+                return (<MenuItem key={state.name} position={index} option={state}>{state.name}</MenuItem>);
+            });
+            return [...accum, ...header, ...states];
+        }, [] as JSX.Element[]);
+
+        return menuItems;
+    }
+
     render() {
         const { multiple } = this.state;
 
         return (
             <div>
+                <Typeahead
+                    options={stateNames}
+                    placeholder="Choose a name"
+                />
+                <Typeahead
+                    options={stateNames}
+                    placeholder="Choose a name"
+                    multiple
+                    filterBy={(option, props) => (props.text.indexOf(option) !== -1)}
+                />
                 <Typeahead
                     labelKey="name"
                     multiple={multiple}
@@ -33,7 +86,7 @@ class BasicExample extends React.Component {
                     multiple={multiple}
                     options={options}
                     maxHeight='300px'
-                    filterBy={(option, props) => (props.text.indexOf(option) !== -1) }
+                    filterBy={(option, props) => (props.text.indexOf(option.name) !== -1) }
                     placeholder="Choose a state..."
                 />
                 <Typeahead
@@ -41,7 +94,7 @@ class BasicExample extends React.Component {
                     multiple={multiple}
                     options={options}
                     maxHeight='300px'
-                    filterBy={(option, {text}) => (text.indexOf(option) !== -1) }
+                    filterBy={(option, {text}) => (text.indexOf(option.name) !== -1) }
                     placeholder="Choose a state..."
                 />
                 <Typeahead
@@ -49,11 +102,26 @@ class BasicExample extends React.Component {
                     options={options}
                     placeholder="Choose a state..."
                     renderMenuItemChildren={ (option, props, index) =>
-                        <Highlighter key="name" search={props.text}>
+                        <Highlighter key="name" search={props.text || ""}>
                             {option.name} {index}
                         </Highlighter>
                     }
                 />
+                <Typeahead
+                    labelKey="name"
+                    options={options}
+                    placeholder="Choose a state..."
+                    renderMenu={(results, menuProps) => (
+                      <Menu {...menuProps}>
+                        { results.map((result, index) => (
+                          <MenuItem option={result} position={index} key={index}>
+                            { result.customOption && 'New: ' }
+                            <Highlighter search={menuProps.text}>{result.name}</Highlighter>
+                          </MenuItem>
+                        )) }
+                      </Menu>
+                    )}
+                />
                 <Typeahead
                     labelKey="name"
                     options={options}
@@ -69,6 +137,23 @@ class BasicExample extends React.Component {
                     ))}
                   </Menu>
                 </Typeahead>
+                <Typeahead
+                    labelKey="name"
+                    options={options}
+                    placeholder="Choose a state..."
+                    renderToken={(selectedItem, props, index) => {
+                        return <Token
+                            active
+                            disabled={false}
+                            tabIndex={5}
+                            href="https://test.com"
+                            onRemove={() => console.log(props.text)}>
+                            {selectedItem.name}<ClearButton onClick={() => {}} />
+                            </Token>;
+                    }}
+                >
+                    <Menu id="menu-id">{...this.genCustomMenu()}</Menu>
+                </Typeahead>
             </div>
         );
     }
diff --git a/types/react-bootstrap/README.md b/types/react-bootstrap/README.md
new file mode 100644
index 0000000000..ec1bfc027f
--- /dev/null
+++ b/types/react-bootstrap/README.md
@@ -0,0 +1,13 @@
+# react-bootstrap
+
+## Intended compatibilty
+This library is intended for releases of react-bootstrap prior to `v1.0.0`, e.g. `v0.32.4`.
+
+The reason is that react-bootstrap `v1.0.0` targets Bootstrap v4, and includes its own
+typings. react-bootstrap prior to `v1.0.0` targets Bootstrap v3 and does not include any
+typings.
+
+It does not make sense for everyone to upgrade to Bootstrap v4, therefore these typings
+are useful for everyone that wants to stay on Bootstrap v3 and react-bootstrap prior to `v1.0.0`.
+
+The typings for `v1.0.0` were merged in [this pull request](https://github.com/react-bootstrap/react-bootstrap/commit/2079b2292afb835d036fcceef47e8938c4a8d86a).
diff --git a/types/react-bootstrap/index.d.ts b/types/react-bootstrap/index.d.ts
index 83f5f8db61..f026974a7b 100644
--- a/types/react-bootstrap/index.d.ts
+++ b/types/react-bootstrap/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-bootstrap 0.32
-// Project: https://github.com/react-bootstrap/react-bootstrap
+// Project: https://github.com/react-bootstrap/react-bootstrap, https://react-bootstrap.github.io
 // Definitions by: Walker Burgin <https://github.com/walkerburgin>,
 //                 Vincent Siao <https://github.com/vsiao>,
 //                 Danilo Barros <https://github.com/danilojrr>,
@@ -14,6 +14,7 @@
 //                 Johann Rakotoharisoa <https://github.com/jrakotoharisoa>
 //                 Andrew Makarov <https://github.com/r3nya>
 //                 Duong Tran <https://github.com/t49tran>
+//                 Erik Zivkovic <https://github.com/bes>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
diff --git a/types/react-bootstrap/lib/Alert.d.ts b/types/react-bootstrap/lib/Alert.d.ts
index 913619101f..eb6888d956 100644
--- a/types/react-bootstrap/lib/Alert.d.ts
+++ b/types/react-bootstrap/lib/Alert.d.ts
@@ -5,6 +5,7 @@ declare namespace Alert {
     export interface AlertProps extends React.HTMLProps<Alert> {
         bsSize?: Sizes;
         bsStyle?: string;
+        bsClass?: string;
         closeLabel?: string;
         /** @deprecated since v0.29.0 */dismissAfter?: number;
         // TODO: Add more specific type
diff --git a/types/react-bootstrap/lib/ButtonGroup.d.ts b/types/react-bootstrap/lib/ButtonGroup.d.ts
index 681be17aef..3008e616c4 100644
--- a/types/react-bootstrap/lib/ButtonGroup.d.ts
+++ b/types/react-bootstrap/lib/ButtonGroup.d.ts
@@ -6,6 +6,7 @@ declare namespace ButtonGroup {
         block?: boolean;
         bsSize?: Sizes;
         bsStyle?: string;
+        bsClass?: string;
         justified?: boolean;
         vertical?: boolean;
     }
diff --git a/types/react-bootstrap/lib/ButtonToolbar.d.ts b/types/react-bootstrap/lib/ButtonToolbar.d.ts
index 554f9d5583..d2a54d5b89 100644
--- a/types/react-bootstrap/lib/ButtonToolbar.d.ts
+++ b/types/react-bootstrap/lib/ButtonToolbar.d.ts
@@ -6,6 +6,7 @@ declare namespace ButtonToolbar {
         block?: boolean;
         bsSize?: Sizes;
         bsStyle?: string;
+        bsClass?: string;
         justified?: boolean;
         vertical?: boolean;
     }
diff --git a/types/react-bootstrap/lib/Clearfix.d.ts b/types/react-bootstrap/lib/Clearfix.d.ts
index c248dde7c9..76303b3aff 100644
--- a/types/react-bootstrap/lib/Clearfix.d.ts
+++ b/types/react-bootstrap/lib/Clearfix.d.ts
@@ -7,6 +7,7 @@ declare namespace Clearfix {
         visibleSmBlock?: boolean;
         visibleMdBlock?: boolean;
         visibleLgBlock?: boolean;
+        bsClass?: string;
     }
 }
 declare class Clearfix extends React.Component<Clearfix.ClearfixProps> { }
diff --git a/types/react-bootstrap/lib/Collapse.d.ts b/types/react-bootstrap/lib/Collapse.d.ts
index 5bc69f5489..64c7e27d88 100644
--- a/types/react-bootstrap/lib/Collapse.d.ts
+++ b/types/react-bootstrap/lib/Collapse.d.ts
@@ -4,7 +4,7 @@ import { TransitionCallbacks } from 'react-bootstrap';
 declare namespace Collapse {
     export interface CollapseProps extends TransitionCallbacks, React.ClassAttributes<Collapse> {
         dimension?: 'height' | 'width' | { ( ):string };
-        getDimensionValue?: ( dimension:number, element:React.ReactElement<any> ) => number;
+        getDimensionValue?: ( dimension:number, element:React.ReactElement ) => number;
         in?: boolean;
         timeout?: number;
         transitionAppear?: boolean;
diff --git a/types/react-bootstrap/lib/FormControlFeedback.d.ts b/types/react-bootstrap/lib/FormControlFeedback.d.ts
index a81939becc..cdfc3aa4f6 100644
--- a/types/react-bootstrap/lib/FormControlFeedback.d.ts
+++ b/types/react-bootstrap/lib/FormControlFeedback.d.ts
@@ -1,7 +1,9 @@
 import * as React from 'react';
 
 declare namespace FormControlFeedback {
-    export type FormControlFeedbackProps = React.HTMLProps<FormControlFeedback>;
+    export interface FormControlFeedbackProps extends React.HTMLProps<FormControlFeedback> {
+        bsClass?: string;
+    }
 }
 declare class FormControlFeedback extends React.Component<FormControlFeedback.FormControlFeedbackProps> { }
 export = FormControlFeedback;
diff --git a/types/react-bootstrap/lib/InputGroupAddon.d.ts b/types/react-bootstrap/lib/InputGroupAddon.d.ts
index 720fecc704..40194d5b5d 100644
--- a/types/react-bootstrap/lib/InputGroupAddon.d.ts
+++ b/types/react-bootstrap/lib/InputGroupAddon.d.ts
@@ -1,7 +1,9 @@
 import * as React from 'react';
 
 declare namespace InputGroupAddon {
-    type InputGroupAddonProps = React.HTMLProps<InputGroupAddon>;
+    interface InputGroupAddonProps extends React.HTMLProps<InputGroupAddon> {
+        bsClass?: string;
+    }
 }
 declare class InputGroupAddon extends React.Component<InputGroupAddon.InputGroupAddonProps> { }
 export = InputGroupAddon;
diff --git a/types/react-bootstrap/lib/InputGroupButton.d.ts b/types/react-bootstrap/lib/InputGroupButton.d.ts
index b050c9a2ec..a62ffc9d47 100644
--- a/types/react-bootstrap/lib/InputGroupButton.d.ts
+++ b/types/react-bootstrap/lib/InputGroupButton.d.ts
@@ -1,7 +1,9 @@
 import * as React from 'react';
 
 declare namespace InputGroupButton {
-    export type InputGroupButtonProps = React.HTMLProps<InputGroupButton>;
+    export interface InputGroupButtonProps extends React.HTMLProps<InputGroupButton> {
+        bsClass?: string;
+    }
 }
 declare class InputGroupButton extends React.Component<InputGroupButton.InputGroupButtonProps> { }
 export = InputGroupButton;
diff --git a/types/react-bootstrap/lib/Modal.d.ts b/types/react-bootstrap/lib/Modal.d.ts
index 9b5ada2cdc..edbea990d9 100644
--- a/types/react-bootstrap/lib/Modal.d.ts
+++ b/types/react-bootstrap/lib/Modal.d.ts
@@ -19,6 +19,7 @@ declare namespace Modal {
         backdropStyle?: any;
         backdropTransitionTimeout?: number;
         bsSize?: Sizes;
+        bsClass?: string;
         container?: any; // TODO: Add more specific type
         containerClassName?: string;
         dialogClassName?: string;
@@ -30,7 +31,7 @@ declare namespace Modal {
         onEscapeKeyUp?: (node: HTMLElement) => any;
         onShow?: (node: HTMLElement) => any;
         show?: boolean;
-        transition?: React.ReactElement<any>;
+        transition?: React.ReactElement;
     }
 }
 declare class Modal extends React.Component<Modal.ModalProps> {
diff --git a/types/react-bootstrap/lib/ModalDialog.d.ts b/types/react-bootstrap/lib/ModalDialog.d.ts
index 4fb2568ab6..b5493998b9 100644
--- a/types/react-bootstrap/lib/ModalDialog.d.ts
+++ b/types/react-bootstrap/lib/ModalDialog.d.ts
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
 
 declare namespace ModalDialog {
     export interface ModalDialogProps extends React.HTMLProps<ModalDialog> {
@@ -10,6 +11,8 @@ declare namespace ModalDialog {
         onExit?: Function;
         onExited?: Function;
         onExiting?: Function;
+        bsSize?: Sizes;
+        bsClass?: string;
     }
 }
 declare class ModalDialog extends React.Component<ModalDialog.ModalDialogProps> { }
diff --git a/types/react-bootstrap/lib/ModalFooter.d.ts b/types/react-bootstrap/lib/ModalFooter.d.ts
index e70b15e688..2f9f902a85 100644
--- a/types/react-bootstrap/lib/ModalFooter.d.ts
+++ b/types/react-bootstrap/lib/ModalFooter.d.ts
@@ -3,6 +3,7 @@ import * as React from 'react';
 declare namespace ModalFooter {
     export interface ModalFooterProps extends React.HTMLProps<ModalFooter> {
         componentClass?: React.ReactType;
+        bsClass?: string;
     }
 }
 declare class ModalFooter extends React.Component<ModalFooter.ModalFooterProps> { }
diff --git a/types/react-bootstrap/lib/ModalTitle.d.ts b/types/react-bootstrap/lib/ModalTitle.d.ts
index b1fd0b386e..a98e7fe3d3 100644
--- a/types/react-bootstrap/lib/ModalTitle.d.ts
+++ b/types/react-bootstrap/lib/ModalTitle.d.ts
@@ -3,6 +3,7 @@ import * as React from 'react';
 declare namespace ModalTitle {
     export interface ModalTitleProps extends React.HTMLProps<ModalTitle> {
         componentClass?: React.ReactType;
+        bsClass?: string;
     }
 }
 declare class ModalTitle extends React.Component<ModalTitle.ModalTitleProps> { }
diff --git a/types/react-bootstrap/lib/Nav.d.ts b/types/react-bootstrap/lib/Nav.d.ts
index 19afb12a7e..2e190662dc 100644
--- a/types/react-bootstrap/lib/Nav.d.ts
+++ b/types/react-bootstrap/lib/Nav.d.ts
@@ -8,6 +8,7 @@ declare namespace Nav {
         activeKey?: any;
         bsSize?: Sizes;
         bsStyle?: string;
+        bsClass?: string;
         collapsible?: boolean;
         eventKey?: any;
         expanded?: boolean;
diff --git a/types/react-bootstrap/lib/PageHeader.d.ts b/types/react-bootstrap/lib/PageHeader.d.ts
index 2212463789..cbc25c3483 100644
--- a/types/react-bootstrap/lib/PageHeader.d.ts
+++ b/types/react-bootstrap/lib/PageHeader.d.ts
@@ -1,7 +1,9 @@
 import * as React from 'react';
 
 declare namespace PageHeader {
-    export type PageHeaderProps = React.HTMLProps<PageHeader>;
+    export interface PageHeaderProps extends React.HTMLProps<PageHeader> {
+        bsClass?: string;
+    }
 }
 declare class PageHeader extends React.Component<PageHeader.PageHeaderProps> { }
 export = PageHeader;
diff --git a/types/react-bootstrap/lib/Pager.d.ts b/types/react-bootstrap/lib/Pager.d.ts
index 076d30a0af..432d1d3ec4 100644
--- a/types/react-bootstrap/lib/Pager.d.ts
+++ b/types/react-bootstrap/lib/Pager.d.ts
@@ -5,6 +5,7 @@ import PagerItem = require('./PagerItem');
 declare namespace Pager {
     export interface PagerProps extends React.HTMLProps<Pager> {
         onSelect?: SelectCallback;
+        bsClass?: string;
     }
 }
 declare class Pager extends React.Component<Pager.PagerProps> {
diff --git a/types/react-bootstrap/lib/Popover.d.ts b/types/react-bootstrap/lib/Popover.d.ts
index 95abc38854..b018b585d7 100644
--- a/types/react-bootstrap/lib/Popover.d.ts
+++ b/types/react-bootstrap/lib/Popover.d.ts
@@ -8,6 +8,7 @@ declare namespace Popover {
         arrowOffsetTop?: number | string;
         bsSize?: Sizes;
         bsStyle?: string;
+        bsClass?: string;
         placement?: string;
         positionLeft?: number | string; // String support added since v0.30.0
         positionTop?: number | string; // String support added since v0.30.0
diff --git a/types/react-bootstrap/lib/ProgressBar.d.ts b/types/react-bootstrap/lib/ProgressBar.d.ts
index 8fc408ac65..add9b48529 100644
--- a/types/react-bootstrap/lib/ProgressBar.d.ts
+++ b/types/react-bootstrap/lib/ProgressBar.d.ts
@@ -7,6 +7,7 @@ declare namespace ProgressBar {
         active?: boolean;
         bsSize?: Sizes;
         bsStyle?: string;
+        bsClass?: string;
         interpolatedClass?: any; // TODO: Add more specific type
         max?: number;
         min?: number;
diff --git a/types/react-bootstrap/lib/TabContent.d.ts b/types/react-bootstrap/lib/TabContent.d.ts
index 133727263c..61acf34c2e 100644
--- a/types/react-bootstrap/lib/TabContent.d.ts
+++ b/types/react-bootstrap/lib/TabContent.d.ts
@@ -6,6 +6,7 @@ declare namespace TabContent {
         animation?: boolean | React.ReactType;
         mountOnEnter?: boolean;
         unmountOnExit?: boolean;
+        bsClass?: string;
     }
 }
 declare class TabContent extends React.Component<TabContent.TabContentProps> { }
diff --git a/types/react-bootstrap/lib/Tooltip.d.ts b/types/react-bootstrap/lib/Tooltip.d.ts
index 8363747293..c08e1a2f70 100644
--- a/types/react-bootstrap/lib/Tooltip.d.ts
+++ b/types/react-bootstrap/lib/Tooltip.d.ts
@@ -8,6 +8,7 @@ declare namespace Tooltip {
         arrowOffsetTop?: number | string;
         bsSize?: Sizes;
         bsStyle?: string;
+        bsClass?: string;
         placement?: string;
         positionLeft?: number;
         positionTop?: number;
diff --git a/types/react-bootstrap/lib/Well.d.ts b/types/react-bootstrap/lib/Well.d.ts
index 07656cc71b..026b66794d 100644
--- a/types/react-bootstrap/lib/Well.d.ts
+++ b/types/react-bootstrap/lib/Well.d.ts
@@ -5,6 +5,7 @@ declare namespace Well {
     export interface WellProps extends React.HTMLProps<Well> {
         bsSize?: Sizes;
         bsStyle?: string;
+        bsClass?: string;
     }
 }
 declare class Well extends React.Component<Well.WellProps> { }
diff --git a/types/react-cache/index.d.ts b/types/react-cache/index.d.ts
index 13adb3621b..441197d472 100644
--- a/types/react-cache/index.d.ts
+++ b/types/react-cache/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-cache 2.0
-// Project: https://github.com/facebook/react/tree/master/packages/react-cache
+// Project: https://github.com/facebook/react/tree/master/packages/react-cache, https://github.com/facebook/react
 // Definitions by: Spencer Miskoviak <https://github.com/skovy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/react-color/index.d.ts b/types/react-color/index.d.ts
index 3e9b9a9445..25664870c8 100644
--- a/types/react-color/index.d.ts
+++ b/types/react-color/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-color 2.14
-// Project: https://github.com/casesandberg/react-color/
+// Project: https://github.com/casesandberg/react-color/, http://casesandberg.github.io/react-color
 // Definitions by: Karol Janyst <https://github.com/LKay>, Marks Polakovs <https://github.com/markspolakovs>, Matthieu Montaudouin <https://github.com/mntdn>, Nokogiri <https://github.com/nkgrnkgr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-confirm/index.d.ts b/types/react-confirm/index.d.ts
index e66faaaa63..58ffe3b5d9 100644
--- a/types/react-confirm/index.d.ts
+++ b/types/react-confirm/index.d.ts
@@ -11,7 +11,7 @@ export function confirmable<P>(component: React.ComponentType<ReactConfirmProps
 export function createConfirmation(component: React.ComponentType<any>, unmountDelay?: number): (props: any) => Promise<string>;
 
 export interface ReactConfirmProps {
-    confirmation: string | React.ReactElement<any>;
+    confirmation: string | React.ReactElement;
     dismiss: () => void;
     proceed: (value?: string) => void;
     cancel: (value?: string) => void;
diff --git a/types/react-countup/index.d.ts b/types/react-countup/index.d.ts
index cae8139054..cfbb37650c 100644
--- a/types/react-countup/index.d.ts
+++ b/types/react-countup/index.d.ts
@@ -58,7 +58,7 @@ declare namespace ReactCountUp {
             start(): void;
         }): void;
         style?: React.CSSProperties;
-        children?(data: RenderProps): React.ReactElement<any>;
+        children?(data: RenderProps): React.ReactElement;
     }
 }
 
diff --git a/types/react-cropper/index.d.ts b/types/react-cropper/index.d.ts
index 843cd50683..dcaae3549d 100644
--- a/types/react-cropper/index.d.ts
+++ b/types/react-cropper/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-cropper 0.10
-// Project: https://github.com/roadmanfong/react-cropper
+// Project: https://github.com/roadmanfong/react-cropper, http://roadmanfong.github.io/react-cropper
 // Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-currency-formatter/index.d.ts b/types/react-currency-formatter/index.d.ts
index d0f8e217ad..76e3a4dddd 100644
--- a/types/react-currency-formatter/index.d.ts
+++ b/types/react-currency-formatter/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-currency-formatter 1.1
-// Project: https://github.com/xDae/react-currency-formatter;
+// Project: https://github.com/xdae/react-currency-formatter
 // Definitions by: Yury Pastushenko <https://github.com/pastushenkoy>
 //                 Evgeniy Vasiliev <https://github.com/Jeka-Vasiliev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/react-data-grid/index.d.ts b/types/react-data-grid/index.d.ts
index 94d8af72d9..440c4dec5c 100644
--- a/types/react-data-grid/index.d.ts
+++ b/types/react-data-grid/index.d.ts
@@ -81,17 +81,17 @@ declare namespace AdazzleReactDataGrid {
          * A toolbar to display above the grid.
          * Consider using the toolbar included in "react-data-grid/addons".
          */
-        toolbar?: React.ReactElement<any>
+        toolbar?: React.ReactElement
         /**
          * A context menu to disiplay when the user right-clicks a cell.
          * Consider using "react-contextmenu", included in "react-data-grid/addons".
          */
-        contextMenu?: React.ReactElement<any>
+        contextMenu?: React.ReactElement
         /**
          * A react component to customize how rows are rendered.
          * If you want to define your own, consider extending ReactDataGrid.Row.
          */
-        rowRenderer?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>
+        rowRenderer?: React.ReactElement | React.ComponentClass<any> | React.StatelessComponent<any>
         /**
          * A component to display when there are no rows to render.
          */
@@ -328,7 +328,7 @@ declare namespace AdazzleReactDataGrid {
         /**
          * A custom formatter for this column's filter.
          */
-        filterRenderer?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>;
+        filterRenderer?: React.ReactElement | React.ComponentClass<any> | React.StatelessComponent<any>;
         /**
          * The editor for this column. Several editors are available in "react-data-grid/addons".
          * @default A simple text editor
@@ -340,11 +340,11 @@ declare namespace AdazzleReactDataGrid {
         /**
          * A custom read-only formatter for this column. An image formatter is available in "react-data-grid/addons".
          */
-        formatter?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>
+        formatter?: React.ReactElement | React.ComponentClass<any> | React.StatelessComponent<any>
         /**
          * A custom formatter for this column's header.
          */
-        headerRenderer?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>
+        headerRenderer?: React.ReactElement | React.ComponentClass<any> | React.StatelessComponent<any>
         /**
          * Events to be bound to the cells in this specific column.
          * Each event must respect this standard in order to work correctly:
diff --git a/types/react-data-grid/v1/index.d.ts b/types/react-data-grid/v1/index.d.ts
index 4db1f4042a..a48ee39fdd 100644
--- a/types/react-data-grid/v1/index.d.ts
+++ b/types/react-data-grid/v1/index.d.ts
@@ -62,17 +62,17 @@ declare namespace AdazzleReactDataGrid {
          * A toolbar to display above the grid.
          * Consider using the toolbar included in "react-data-grid/addons".
          */
-        toolbar?: React.ReactElement<any>
+        toolbar?: React.ReactElement
         /**
          * A context menu to disiplay when the user right-clicks a cell.
          * Consider using "react-contextmenu", included in "react-data-grid/addons".
          */
-        contextMenu?: React.ReactElement<any>
+        contextMenu?: React.ReactElement
         /**
          * A react component to customize how rows are rendered.
          * If you want to define your own, consider extending ReactDataGrid.Row.
          */
-        rowRenderer?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>
+        rowRenderer?: React.ReactElement | React.ComponentClass<any> | React.StatelessComponent<any>
         /**
          * A component to display when there are no rows to render.
          */
@@ -240,15 +240,15 @@ declare namespace AdazzleReactDataGrid {
          * The editor for this column. Several editors are available in "react-data-grid/addons".
          * @default A simple text editor
          */
-        editor?: React.ReactElement<any>
+        editor?: React.ReactElement
         /**
          * A custom read-only formatter for this column. An image formatter is available in "react-data-grid/addons".
          */
-        formatter?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>
+        formatter?: React.ReactElement | React.ComponentClass<any> | React.StatelessComponent<any>
         /**
          * A custom formatter for this column's header.
          */
-        headerRenderer?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>
+        headerRenderer?: React.ReactElement | React.ComponentClass<any> | React.StatelessComponent<any>
         /**
          * Events to be bound to the cells in this specific column.
          * Each event must respect this standard in order to work correctly:
diff --git a/types/react-data-grid/v2/index.d.ts b/types/react-data-grid/v2/index.d.ts
index bfa4ea979f..95b0fc9dbd 100644
--- a/types/react-data-grid/v2/index.d.ts
+++ b/types/react-data-grid/v2/index.d.ts
@@ -62,17 +62,17 @@ declare namespace AdazzleReactDataGrid {
          * A toolbar to display above the grid.
          * Consider using the toolbar included in "react-data-grid/addons".
          */
-        toolbar?: React.ReactElement<any>
+        toolbar?: React.ReactElement
         /**
          * A context menu to disiplay when the user right-clicks a cell.
          * Consider using "react-contextmenu", included in "react-data-grid/addons".
          */
-        contextMenu?: React.ReactElement<any>
+        contextMenu?: React.ReactElement
         /**
          * A react component to customize how rows are rendered.
          * If you want to define your own, consider extending ReactDataGrid.Row.
          */
-        rowRenderer?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>
+        rowRenderer?: React.ReactElement | React.ComponentClass<any> | React.StatelessComponent<any>
         /**
          * A component to display when there are no rows to render.
          */
@@ -309,20 +309,20 @@ declare namespace AdazzleReactDataGrid {
         /**
          * A custom formatter for this column's filter.
          */
-        filterRenderer?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>;
+        filterRenderer?: React.ReactElement | React.ComponentClass<any> | React.StatelessComponent<any>;
         /**
          * The editor for this column. Several editors are available in "react-data-grid/addons".
          * @default A simple text editor
          */
-        editor?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>
+        editor?: React.ReactElement | React.ComponentClass<any> | React.StatelessComponent<any>
         /**
          * A custom read-only formatter for this column. An image formatter is available in "react-data-grid/addons".
          */
-        formatter?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>
+        formatter?: React.ReactElement | React.ComponentClass<any> | React.StatelessComponent<any>
         /**
          * A custom formatter for this column's header.
          */
-        headerRenderer?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>
+        headerRenderer?: React.ReactElement | React.ComponentClass<any> | React.StatelessComponent<any>
         /**
          * Events to be bound to the cells in this specific column.
          * Each event must respect this standard in order to work correctly:
diff --git a/types/react-datagrid/index.d.ts b/types/react-datagrid/index.d.ts
index 032a640daf..d194c8bf09 100644
--- a/types/react-datagrid/index.d.ts
+++ b/types/react-datagrid/index.d.ts
@@ -184,7 +184,7 @@ declare namespace ReactDataGrid {
           * or anything that React can render, so you can customize it as you
           * please.
           */
-        title?: string | React.ReactElement<any>;
+        title?: string | React.ReactElement;
 
         /**
           * Function - if you want custom rendering, specify this property.
diff --git a/types/react-datagrid/react-datagrid-tests.tsx b/types/react-datagrid/react-datagrid-tests.tsx
index 1505961d81..0c30475978 100644
--- a/types/react-datagrid/react-datagrid-tests.tsx
+++ b/types/react-datagrid/react-datagrid-tests.tsx
@@ -15,7 +15,7 @@ var sortInfo = [ { name: 'country', dir: 'asc'}]
 
 export module X {
 export class ExampleBasic extends React.Component {
-  render(): React.ReactElement<any> {
+  render(): React.ReactElement {
       return (
           <ReactDataGrid
             key={0}
@@ -30,7 +30,7 @@ export class ExampleBasic extends React.Component {
 
 class ExampleFull extends React.Component {
 
-    render(): React.ReactElement<any> {
+    render(): React.ReactElement {
 		    return (
             <ReactDataGrid
               key={1}
diff --git a/types/react-datepicker/index.d.ts b/types/react-datepicker/index.d.ts
index e2870092dc..ce7ebcfab9 100644
--- a/types/react-datepicker/index.d.ts
+++ b/types/react-datepicker/index.d.ts
@@ -127,5 +127,12 @@ export interface ReactDatePickerProps {
 	withPortal?: boolean;
 	yearDropdownItemNumber?: number;
 }
-declare const ReactDatePicker: React.ClassicComponentClass<ReactDatePickerProps>;
+
+declare class ReactDatePicker extends React.Component<ReactDatePickerProps> {
+    readonly setBlur: () => void;
+    readonly setFocus: () => void;
+    readonly setOpen: (open: boolean, skipSetBlur?: boolean) => void;
+    readonly isCalendarOpen: () => boolean;
+}
+
 export default ReactDatePicker;
diff --git a/types/react-datepicker/react-datepicker-tests.tsx b/types/react-datepicker/react-datepicker-tests.tsx
index 5e913be496..9486d043eb 100644
--- a/types/react-datepicker/react-datepicker-tests.tsx
+++ b/types/react-datepicker/react-datepicker-tests.tsx
@@ -76,7 +76,8 @@ const defaultLocale = getDefaultLocale();
 	popperProps={{}}
 	preventOpenOnFocus
 	previousMonthButtonLabel=""
-	readOnly
+    readOnly
+    ref={handleRef}
 	renderCustomHeader={({
 		date,
 		changeYear,
@@ -119,3 +120,13 @@ const defaultLocale = getDefaultLocale();
 	<div />
 	<span />
 </DatePicker>;
+
+function handleRef(ref: DatePicker | null) {
+    if (ref) {
+        ref.setBlur();
+        ref.setFocus();
+        if (ref.isCalendarOpen()) {
+            ref.setOpen(false);
+        }
+    }
+}
diff --git a/types/react-dev-utils/FileSizeReporter.d.ts b/types/react-dev-utils/FileSizeReporter.d.ts
new file mode 100644
index 0000000000..8b95d43db5
--- /dev/null
+++ b/types/react-dev-utils/FileSizeReporter.d.ts
@@ -0,0 +1,27 @@
+import webpack = require('webpack');
+
+export interface OpaqueFileSizes {
+    root: string;
+    sizes: Record<string, number>;
+}
+
+/**
+ * Captures JS and CSS asset sizes inside the passed `buildFolder`. Save the
+ * result value to compare it after the build.
+ */
+export function measureFileSizesBeforeBuild(buildFolder: string): Promise<OpaqueFileSizes>;
+
+/**
+ * Prints the JS and CSS asset sizes after the build, and includes a size
+ * comparison with `previousFileSizes` that were captured earlier using
+ * `measureFileSizesBeforeBuild()`. `maxBundleGzipSize` and
+ * `maxChunkGzipSizemay` may optionally be specified to display a warning when
+ * the main bundle or a chunk exceeds the specified size (in bytes).
+ */
+export function printFileSizesAfterBuild(
+    webpackStats: webpack.Stats,
+    previousFileSizes: OpaqueFileSizes,
+    buildFolder: string,
+    maxBundleGzipSize?: number,
+    maxChunkGzipSize?: number,
+): void;
diff --git a/types/react-dev-utils/InlineChunkHtmlPlugin.d.ts b/types/react-dev-utils/InlineChunkHtmlPlugin.d.ts
new file mode 100644
index 0000000000..41f35faef6
--- /dev/null
+++ b/types/react-dev-utils/InlineChunkHtmlPlugin.d.ts
@@ -0,0 +1,11 @@
+import webpack = require('webpack');
+import HtmlWebpackPlugin = require('html-webpack-plugin');
+
+/**
+ * This Webpack plugin inlines script chunks into `index.html`.
+ */
+declare class InlineChunkHtmlPlugin extends webpack.Plugin {
+    constructor(htmlWebpackPlugin: HtmlWebpackPlugin, tests: ReadonlyArray<RegExp>);
+}
+
+export = InlineChunkHtmlPlugin;
diff --git a/types/react-dev-utils/InterpolateHtmlPlugin.d.ts b/types/react-dev-utils/InterpolateHtmlPlugin.d.ts
new file mode 100644
index 0000000000..61357879c4
--- /dev/null
+++ b/types/react-dev-utils/InterpolateHtmlPlugin.d.ts
@@ -0,0 +1,11 @@
+import webpack = require('webpack');
+import HtmlWebpackPlugin = require('html-webpack-plugin');
+
+/**
+ * This Webpack plugin lets us interpolate custom variables into `index.html`.
+ */
+declare class InterpolateHtmlPlugin extends webpack.Plugin {
+    constructor(htmlWebpackPlugin: HtmlWebpackPlugin, replacements: { [key: string]: string });
+}
+
+export = InterpolateHtmlPlugin;
diff --git a/types/react-dev-utils/ModuleScopePlugin.d.ts b/types/react-dev-utils/ModuleScopePlugin.d.ts
new file mode 100644
index 0000000000..61d234d712
--- /dev/null
+++ b/types/react-dev-utils/ModuleScopePlugin.d.ts
@@ -0,0 +1,11 @@
+import webpack = require('webpack');
+
+/**
+ * This Webpack plugin ensures that relative imports from app's source
+ * directories don't reach outside of it.
+ */
+declare class ModuleScopePlugin extends webpack.Plugin {
+    constructor(appSrc: string | ReadonlyArray<string>, allowedFiles?: ReadonlyArray<string>);
+}
+
+export = ModuleScopePlugin;
diff --git a/types/react-dev-utils/WatchMissingNodeModulesPlugin.d.ts b/types/react-dev-utils/WatchMissingNodeModulesPlugin.d.ts
new file mode 100644
index 0000000000..1ab7cc30be
--- /dev/null
+++ b/types/react-dev-utils/WatchMissingNodeModulesPlugin.d.ts
@@ -0,0 +1,10 @@
+import webpack = require('webpack');
+
+/**
+ * This Webpack plugin ensures `npm install <library>` forces a project rebuild.
+ */
+declare class WatchMissingNodeModulesPlugin extends webpack.Plugin {
+    constructor(nodeModulesPath: string);
+}
+
+export = WatchMissingNodeModulesPlugin;
diff --git a/types/react-dev-utils/WebpackDevServerUtils.d.ts b/types/react-dev-utils/WebpackDevServerUtils.d.ts
new file mode 100644
index 0000000000..08d2ae0ebe
--- /dev/null
+++ b/types/react-dev-utils/WebpackDevServerUtils.d.ts
@@ -0,0 +1,46 @@
+import webpack = require('webpack');
+import WebpackDevServer = require('webpack-dev-server');
+
+export interface Urls {
+    lanUrlForConfig?: string;
+    lanUrlForTerminal?: string;
+    localUrlForTerminal: string;
+    localUrlForBrowser: string;
+}
+
+/**
+ * Returns a Promise resolving to either `defaultPort` or next available port
+ * if the user confirms it is okay to do. If the port is taken and the user has
+ * refused to use another port, or if the terminal is not interactive and can’t
+ * present user with the choice, resolves to `null`.
+ */
+export function choosePort(host: string, defaultPort: number): Promise<number | null>;
+
+/**
+ * Creates a Webpack compiler instance for WebpackDevServer with built-in
+ * helpful messages. Takes the `require('webpack')` entry point as the first
+ * argument. To provide the `urls` argument, use `prepareUrls()` described
+ * below.
+ */
+export function createCompiler(
+    _webpack: typeof webpack,
+    config: webpack.Configuration,
+    appName: string,
+    urls: Urls,
+    useYarn: boolean,
+): webpack.Compiler;
+
+/**
+ * Creates a WebpackDevServer `proxy` configuration object from the `proxy`
+ * setting in `package.json`.
+ */
+export function prepareProxy(
+    proxySetting: any,
+    appPublicFolder: string,
+): WebpackDevServer.Configuration;
+
+/**
+ * Returns an object with local and remote URLs for the development server.
+ * Pass this object to `createCompiler()` described above.
+ */
+export function prepareUrls(protocol: string, host: string, port: number): Urls;
diff --git a/types/react-dev-utils/checkRequiredFiles.d.ts b/types/react-dev-utils/checkRequiredFiles.d.ts
new file mode 100644
index 0000000000..40a8e45c88
--- /dev/null
+++ b/types/react-dev-utils/checkRequiredFiles.d.ts
@@ -0,0 +1,9 @@
+/**
+ * Makes sure that all passed files exist.
+ *
+ * Filenames are expected to be absolute.
+ *
+ * If a file is not found, prints a warning message and returns `false`.
+ */
+declare function checkRequiredFiles(files: ReadonlyArray<string>): boolean;
+export = checkRequiredFiles;
diff --git a/types/react-dev-utils/clearConsole.d.ts b/types/react-dev-utils/clearConsole.d.ts
new file mode 100644
index 0000000000..d3ae28c991
--- /dev/null
+++ b/types/react-dev-utils/clearConsole.d.ts
@@ -0,0 +1,5 @@
+/**
+ * Clears the console, hopefully in a cross-platform way.
+ */
+declare function clearConsole(): void;
+export = clearConsole;
diff --git a/types/react-dev-utils/eslintFormatter.d.ts b/types/react-dev-utils/eslintFormatter.d.ts
new file mode 100644
index 0000000000..b5a10718d2
--- /dev/null
+++ b/types/react-dev-utils/eslintFormatter.d.ts
@@ -0,0 +1,9 @@
+import { CLIEngine } from 'eslint';
+
+/**
+ * This is our custom ESLint formatter that integrates well with
+ * Create React App console output.
+ */
+declare function eslintFormatter(results: ReadonlyArray<CLIEngine.LintResult>): string;
+
+export = eslintFormatter;
diff --git a/types/react-dev-utils/formatWebpackMessages.d.ts b/types/react-dev-utils/formatWebpackMessages.d.ts
new file mode 100644
index 0000000000..8e1994feea
--- /dev/null
+++ b/types/react-dev-utils/formatWebpackMessages.d.ts
@@ -0,0 +1,16 @@
+declare namespace formatWebpackMessages {
+    interface WebpackMessages {
+        errors: string[];
+        warnings: string[];
+    }
+}
+
+/**
+ * Extracts and prettifies warning and error messages from webpack
+ * [stats](https://github.com/webpack/docs/wiki/node.js-api#stats) object.
+ */
+declare function formatWebpackMessages(
+    json: formatWebpackMessages.WebpackMessages,
+): formatWebpackMessages.WebpackMessages;
+
+export = formatWebpackMessages;
diff --git a/types/react-dev-utils/getCSSModuleLocalIdent.d.ts b/types/react-dev-utils/getCSSModuleLocalIdent.d.ts
new file mode 100644
index 0000000000..a443355f8b
--- /dev/null
+++ b/types/react-dev-utils/getCSSModuleLocalIdent.d.ts
@@ -0,0 +1,18 @@
+import webpack = require('webpack');
+
+/**
+ * Creates a class name for CSS Modules that uses either the filename or folder
+ * name if named `index.module.css`.
+ *
+ * For `MyFolder/MyComponent.module.css` and class `MyClass` the output will be
+ * `MyComponent.module_MyClass__[hash]`. For `MyFolder/index.module.css` and
+ * class `MyClass` the output will be `MyFolder_MyClass__[hash]`
+ */
+declare function getCSSModuleLocalIdent(
+    context: webpack.loader.LoaderContext,
+    localIdentName: string,
+    localName: string,
+    options: object,
+): string;
+
+export = getCSSModuleLocalIdent;
diff --git a/types/react-dev-utils/getCacheIdentifier.d.ts b/types/react-dev-utils/getCacheIdentifier.d.ts
new file mode 100644
index 0000000000..86cbb093e3
--- /dev/null
+++ b/types/react-dev-utils/getCacheIdentifier.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Returns a cache identifier (string) consisting of the specified environment
+ * and related package versions.
+ */
+declare function getCacheIdentifier(environment: string, packages: ReadonlyArray<string>): string;
+export = getCacheIdentifier;
diff --git a/types/react-dev-utils/getProcessForPort.d.ts b/types/react-dev-utils/getProcessForPort.d.ts
new file mode 100644
index 0000000000..5c2c9aac62
--- /dev/null
+++ b/types/react-dev-utils/getProcessForPort.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Finds the currently running process on `port`.
+ * Returns a string containing the name and directory.
+ */
+declare function getProcessForPort(port: number): string | null;
+export = getProcessForPort;
diff --git a/types/react-dev-utils/index.d.ts b/types/react-dev-utils/index.d.ts
new file mode 100644
index 0000000000..49bf463b73
--- /dev/null
+++ b/types/react-dev-utils/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for react-dev-utils 7.0
+// Project: https://github.com/facebook/create-react-app#readme
+// Definitions by: ark120202 <https://github.com/ark120202>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+export {};
diff --git a/types/react-dev-utils/launchEditor.d.ts b/types/react-dev-utils/launchEditor.d.ts
new file mode 100644
index 0000000000..5132d488ba
--- /dev/null
+++ b/types/react-dev-utils/launchEditor.d.ts
@@ -0,0 +1,8 @@
+/**
+ * On macOS, tries to find a known running editor process and opens the file in
+ * it. It can also be explicitly configured by `REACT_EDITOR`, `VISUAL`, or
+ * `EDITOR` environment variables. For example, you can put `REACT_EDITOR=atom`
+ * in your `.env.local` file, and Create React App will respect that.
+ */
+declare function launchEditor(fileName: string, lineNumber: number, colNumber?: number): void;
+export = launchEditor;
diff --git a/types/react-dev-utils/noopServiceWorkerMiddleware.d.ts b/types/react-dev-utils/noopServiceWorkerMiddleware.d.ts
new file mode 100644
index 0000000000..8f52455324
--- /dev/null
+++ b/types/react-dev-utils/noopServiceWorkerMiddleware.d.ts
@@ -0,0 +1,9 @@
+import express = require('express');
+
+/**
+ * Returns Express middleware that serves a `/service-worker.js` that resets
+ * any previously set service worker configuration. Useful for development.
+ */
+declare function noopServiceWorkerMiddleware(): express.Handler;
+
+export = noopServiceWorkerMiddleware;
diff --git a/types/react-dev-utils/openBrowser.d.ts b/types/react-dev-utils/openBrowser.d.ts
new file mode 100644
index 0000000000..1c87eee617
--- /dev/null
+++ b/types/react-dev-utils/openBrowser.d.ts
@@ -0,0 +1,9 @@
+/**
+ * Attempts to open the browser with a given URL.
+ *
+ * On Mac OS X, attempts to reuse an existing Chrome tab via AppleScript.
+ *
+ * Otherwise, falls back to [opn](https://github.com/sindresorhus/opn) behavior.
+ */
+declare function openBrowser(url: string): boolean;
+export = openBrowser;
diff --git a/types/react-dev-utils/printBuildError.d.ts b/types/react-dev-utils/printBuildError.d.ts
new file mode 100644
index 0000000000..c145e32d8c
--- /dev/null
+++ b/types/react-dev-utils/printBuildError.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Prettify some known build errors.
+ * Pass an Error object to log a prettified error message in the console.
+ */
+declare function printBuildError(error: Error): void;
+export = printBuildError;
diff --git a/types/react-dev-utils/printHostingInstructions.d.ts b/types/react-dev-utils/printHostingInstructions.d.ts
new file mode 100644
index 0000000000..946b3118cb
--- /dev/null
+++ b/types/react-dev-utils/printHostingInstructions.d.ts
@@ -0,0 +1,12 @@
+/**
+ * Prints hosting instructions after the project is built.
+ */
+declare function printHostingInstructions(
+    appPackage: object,
+    publicUrl: string,
+    publicPath: string,
+    buildFolder: string,
+    useYarn: boolean,
+): void;
+
+export = printHostingInstructions;
diff --git a/types/react-dev-utils/test/eslintFormatter.ts b/types/react-dev-utils/test/eslintFormatter.ts
new file mode 100644
index 0000000000..d6fae121cc
--- /dev/null
+++ b/types/react-dev-utils/test/eslintFormatter.ts
@@ -0,0 +1,13 @@
+import { CLIEngine } from 'eslint';
+import eslintFormatter = require('react-dev-utils/eslintFormatter');
+
+const { results } = new CLIEngine({}).executeOnText('');
+
+// $ExpectError
+eslintFormatter(['error']);
+
+// $ExpectError
+eslintFormatter([results]);
+
+// $ExpectType string
+eslintFormatter(results);
diff --git a/types/react-dev-utils/test/noopServiceWorkerMiddleware.ts b/types/react-dev-utils/test/noopServiceWorkerMiddleware.ts
new file mode 100644
index 0000000000..37f5b85f04
--- /dev/null
+++ b/types/react-dev-utils/test/noopServiceWorkerMiddleware.ts
@@ -0,0 +1,6 @@
+import express = require('express');
+import noopServiceWorkerMiddleware = require('react-dev-utils/noopServiceWorkerMiddleware');
+
+const app = express();
+app.use(noopServiceWorkerMiddleware());
+app.listen(8080);
diff --git a/types/react-dev-utils/test/utils.ts b/types/react-dev-utils/test/utils.ts
new file mode 100644
index 0000000000..6bb535ba2a
--- /dev/null
+++ b/types/react-dev-utils/test/utils.ts
@@ -0,0 +1,31 @@
+import webpack = require('webpack');
+import checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
+import clearConsole = require('react-dev-utils/clearConsole');
+import getProcessForPort = require('react-dev-utils/getProcessForPort');
+import launchEditor = require('react-dev-utils/launchEditor');
+import openBrowser = require('react-dev-utils/openBrowser');
+import printHostingInstructions = require('react-dev-utils/printHostingInstructions');
+import getCacheIdentifier = require('react-dev-utils/getCacheIdentifier');
+
+// $ExpectType boolean
+checkRequiredFiles(['public/index.html', 'src/index.js']);
+
+// $ExpectType void
+clearConsole();
+
+// $ExpectType string | null
+getProcessForPort(3000);
+
+// $ExpectType void
+launchEditor(__filename, 2);
+// $ExpectType void
+launchEditor(__filename, 2, 10);
+
+// $ExpectType boolean
+openBrowser('http://localhost:3000');
+
+// $ExpectType void
+printHostingInstructions({}, '', '', 'build', true);
+
+// $ExpectType string
+getCacheIdentifier('prod', ['react-dev-utils', 'chalk']);
diff --git a/types/react-dev-utils/test/webpack-plugins.ts b/types/react-dev-utils/test/webpack-plugins.ts
new file mode 100644
index 0000000000..a72c6b823f
--- /dev/null
+++ b/types/react-dev-utils/test/webpack-plugins.ts
@@ -0,0 +1,22 @@
+import webpack = require('webpack');
+import HtmlWebpackPlugin = require('html-webpack-plugin');
+import InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
+import InlineChunkHtmlPlugin  = require('react-dev-utils/InlineChunkHtmlPlugin');
+import ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
+import WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
+
+// $ExpectError
+new InterpolateHtmlPlugin(HtmlWebpackPlugin, { PUBLIC_URL: 0 });
+const plugin1 = new InterpolateHtmlPlugin(HtmlWebpackPlugin, { PUBLIC_URL: '' });
+
+// $ExpectError
+new InlineChunkHtmlPlugin({}, [/runtime/]);
+const plugin2 = new InlineChunkHtmlPlugin(HtmlWebpackPlugin, [/runtime/]);
+
+const plugin3 = new ModuleScopePlugin('src', ['package.json']);
+
+const plugin4 = new WatchMissingNodeModulesPlugin('node_modules');
+
+const configWithPlugins: webpack.Configuration = {
+    plugins: [plugin1, plugin2, plugin3, plugin4]
+};
diff --git a/types/react-dev-utils/test/webpack-utils.ts b/types/react-dev-utils/test/webpack-utils.ts
new file mode 100644
index 0000000000..d68483c0a2
--- /dev/null
+++ b/types/react-dev-utils/test/webpack-utils.ts
@@ -0,0 +1,52 @@
+import webpack = require('webpack');
+import FileSizeReporter = require('react-dev-utils/FileSizeReporter');
+import formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
+import printBuildError = require('react-dev-utils/printBuildError');
+import WebpackDevServerUtils = require('react-dev-utils/WebpackDevServerUtils');
+import getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
+
+FileSizeReporter.measureFileSizesBeforeBuild('src').then(previousFileSizes => {
+    webpack().run((err, webpackStats) => {
+        FileSizeReporter.printFileSizesAfterBuild(webpackStats, previousFileSizes, 'src');
+    });
+});
+
+webpack().run((err, stats) => {
+    const rawMessages = stats.toJson();
+    const messages = formatWebpackMessages(rawMessages);
+    if (!messages.errors.length && !messages.warnings.length) {
+        console.log('Compiled successfully!');
+    }
+    if (messages.errors.length) {
+        console.log('Failed to compile.');
+        messages.errors.forEach(e => console.log(e));
+        return;
+    }
+    if (messages.warnings.length) {
+        console.log('Compiled with warnings.');
+        messages.warnings.forEach(w => console.log(w));
+    }
+});
+
+webpack().run((err) => {
+    if (err) printBuildError(err);
+});
+
+// $ExpectType Promise<number | null>
+WebpackDevServerUtils.choosePort('localhost', 3000);
+
+// $ExpectType Urls
+const urls = WebpackDevServerUtils.prepareUrls('http', 'localhost', 3000);
+
+// $ExpectType Compiler
+WebpackDevServerUtils.createCompiler(webpack, {}, 'app', urls, true);
+
+// $ExpectType Configuration
+WebpackDevServerUtils.prepareProxy(undefined, 'build');
+
+const loaderContext: webpack.loader.LoaderContext = null!;
+// $ExpectType string
+getCSSModuleLocalIdent(loaderContext, '', '', {});
+
+// $ExpectError
+getCSSModuleLocalIdent({}, '', '', {});
diff --git a/types/react-dev-utils/tsconfig.json b/types/react-dev-utils/tsconfig.json
new file mode 100644
index 0000000000..dc5c861101
--- /dev/null
+++ b/types/react-dev-utils/tsconfig.json
@@ -0,0 +1,45 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "checkRequiredFiles.d.ts",
+        "clearConsole.d.ts",
+        "eslintFormatter.d.ts",
+        "FileSizeReporter.d.ts",
+        "formatWebpackMessages.d.ts",
+        "getCacheIdentifier.d.ts",
+        "getCSSModuleLocalIdent.d.ts",
+        "getProcessForPort.d.ts",
+        "InlineChunkHtmlPlugin.d.ts",
+        "InterpolateHtmlPlugin.d.ts",
+        "launchEditor.d.ts",
+        "ModuleScopePlugin.d.ts",
+        "noopServiceWorkerMiddleware.d.ts",
+        "openBrowser.d.ts",
+        "printBuildError.d.ts",
+        "printHostingInstructions.d.ts",
+        "WatchMissingNodeModulesPlugin.d.ts",
+        "WebpackDevServerUtils.d.ts",
+        "test/eslintFormatter.ts",
+        "test/noopServiceWorkerMiddleware.ts",
+        "test/utils.ts",
+        "test/webpack-plugins.ts",
+        "test/webpack-utils.ts"
+    ]
+}
diff --git a/types/react-dev-utils/tslint.json b/types/react-dev-utils/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-dev-utils/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-dnd-multi-backend/index.d.ts b/types/react-dnd-multi-backend/index.d.ts
index 0fcfbf256e..36c161beb0 100644
--- a/types/react-dnd-multi-backend/index.d.ts
+++ b/types/react-dnd-multi-backend/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-dnd-multi-backend 3.0
-// Project: https://github.com/LouisBrunner/react-dnd-multi-backend
+// Project: https://github.com/LouisBrunner/react-dnd-multi-backend, https://louisbrunner.github.io/dnd-multi-backend/packages/react-dnd-multi-backend
 // Definitions by: Janeene Beeforth <https://github.com/dawnmist>
 //                 Adam Haglund <https://github.com/beeequeue>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/react-dom/index.d.ts b/types/react-dom/index.d.ts
index 518c0c617c..19c842f5a2 100644
--- a/types/react-dom/index.d.ts
+++ b/types/react-dom/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for React (react-dom) 16.0
+// Type definitions for React (react-dom) 16.8
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>
 //                 AssureSign <http://www.assuresign.com>
 //                 Microsoft <https://microsoft.com>
 //                 MartynasZilinskas <https://github.com/MartynasZilinskas>
 //                 Josh Rutherford <https://github.com/theruther4d>
+//                 Jessica Franco <https://github.com/Jessidhia>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -16,7 +17,7 @@ import {
     DOMAttributes, DOMElement, ReactNode, ReactPortal
 } from 'react';
 
-export function findDOMNode(instance: ReactInstance): Element | null | Text;
+export function findDOMNode(instance: ReactInstance | null | undefined): Element | null | Text;
 export function unmountComponentAtNode(container: Element): boolean;
 
 export function createPortal(children: ReactNode, container: Element, key?: null | string): ReactPortal;
@@ -86,7 +87,7 @@ export interface Renderer {
     ): Component<P, ComponentState> | Element | void;
 
     (
-        element: Array<ReactElement<any>>,
+        element: ReactElement[],
         container: Element | null,
         callback?: () => void
     ): Component<any, ComponentState> | Element | void;
diff --git a/types/react-dom/node-stream/index.d.ts b/types/react-dom/node-stream/index.d.ts
index ff24c8a939..480392aaa4 100644
--- a/types/react-dom/node-stream/index.d.ts
+++ b/types/react-dom/node-stream/index.d.ts
@@ -5,14 +5,14 @@ import { ReactElement } from 'react';
  * server.
  * See https://facebook.github.io/react/docs/react-dom-stream.html#rendertostream
  */
-export function renderToStream(element: ReactElement<any>): any;
+export function renderToStream(element: ReactElement): any;
 
 /**
  * Similar to renderToStream, except this doesn't create extra DOM attributes
  * such as data-react-id that React uses internally.
  * See https://facebook.github.io/react/docs/react-dom-stream.html#rendertostaticstream
  */
-export function renderToStaticStream(element: ReactElement<any>): any;
+export function renderToStaticStream(element: ReactElement): any;
 export const version: string;
 
 export as namespace ReactDOMNodeStream;
diff --git a/types/react-dom/react-dom-tests.tsx b/types/react-dom/react-dom-tests.tsx
index c7ccb0052d..20bfda53ea 100644
--- a/types/react-dom/react-dom-tests.tsx
+++ b/types/react-dom/react-dom-tests.tsx
@@ -30,6 +30,8 @@ describe('ReactDOM', () => {
         const rootElement = document.createElement('div');
         ReactDOM.render(React.createElement('div'), rootElement);
         ReactDOM.findDOMNode(rootElement);
+        ReactDOM.findDOMNode(null);
+        ReactDOM.findDOMNode(undefined);
     });
 
     it('createPortal', () => {
@@ -178,4 +180,23 @@ describe('React dom test utils', () => {
             shallowRenderer.getRenderOutput();
         });
     });
+
+    describe('act', () => {
+        it('accepts a sync callback that is void', () => {
+            ReactTestUtils.act(() => {});
+        });
+        it('rejects an async callback even if void', () => {
+            // $ExpectError
+            ReactTestUtils.act(async () => {});
+        });
+        it('rejects a callback that returns null', () => {
+            // $ExpectError
+            ReactTestUtils.act(() => null);
+        });
+        it('returns a Promise-like that errors out on use', () => {
+            const result = ReactTestUtils.act(() => {});
+            // $ExpectError
+            Promise.resolve(result);
+        });
+    });
 });
diff --git a/types/react-dom/server/index.d.ts b/types/react-dom/server/index.d.ts
index ef42606717..da257248b9 100644
--- a/types/react-dom/server/index.d.ts
+++ b/types/react-dom/server/index.d.ts
@@ -18,14 +18,14 @@ import { ReactElement } from 'react';
  * React will preserve it and only attach event handlers, allowing you
  * to have a very performant first-load experience.
  */
-export function renderToString(element: ReactElement<any>): string;
+export function renderToString(element: ReactElement): string;
 
 /**
  * Render a React element to its initial HTML. Returns a Readable stream that outputs
  * an HTML string. The HTML output by this stream is exactly equal to what
  * `ReactDOMServer.renderToString()` would return.
  */
-export function renderToNodeStream(element: ReactElement<any>): NodeJS.ReadableStream;
+export function renderToNodeStream(element: ReactElement): NodeJS.ReadableStream;
 
 /**
  * Similar to `renderToString`, except this doesn't create extra DOM attributes
@@ -33,14 +33,14 @@ export function renderToNodeStream(element: ReactElement<any>): NodeJS.ReadableS
  * to use React as a simple static page generator, as stripping away the extra
  * attributes can save lots of bytes.
  */
-export function renderToStaticMarkup(element: ReactElement<any>): string;
+export function renderToStaticMarkup(element: ReactElement): string;
 
 /**
  * Similar to `renderToNodeStream`, except this doesn't create extra DOM attributes
  * such as `data-reactid`, that React uses internally. The HTML output by this stream
  * is exactly equal to what `ReactDOMServer.renderToStaticMarkup()` would return.
  */
-export function renderToStaticNodeStream(element: ReactElement<any>): NodeJS.ReadableStream;
+export function renderToStaticNodeStream(element: ReactElement): NodeJS.ReadableStream;
 
 export const version: string;
 
diff --git a/types/react-dom/test-utils/index.d.ts b/types/react-dom/test-utils/index.d.ts
index f60d088515..c6f46edd36 100644
--- a/types/react-dom/test-utils/index.d.ts
+++ b/types/react-dom/test-utils/index.d.ts
@@ -66,15 +66,15 @@ export interface ShallowRenderer {
     /**
      * After `shallowRenderer.render()` has been called, returns shallowly rendered output.
      */
-    getRenderOutput<E extends ReactElement<any>>(): E;
+    getRenderOutput<E extends ReactElement>(): E;
     /**
      * After `shallowRenderer.render()` has been called, returns shallowly rendered output.
      */
-    getRenderOutput(): ReactElement<any>;
+    getRenderOutput(): ReactElement;
     /**
      * Similar to `ReactDOM.render` but it doesn't require DOM and only renders a single level deep.
      */
-    render(element: ReactElement<any>, context?: any): void;
+    render(element: ReactElement, context?: any): void;
     unmount(): void;
 }
 
@@ -186,22 +186,22 @@ export function isElement(element: any): boolean;
  * Returns `true` if `element` is a React element whose type is of a React `componentClass`.
  */
 export function isElementOfType<T extends HTMLElement>(
-    element: ReactElement<any>, type: string): element is ReactHTMLElement<T>;
+    element: ReactElement, type: string): element is ReactHTMLElement<T>;
 /**
  * Returns `true` if `element` is a React element whose type is of a React `componentClass`.
  */
 export function isElementOfType<P extends DOMAttributes<{}>, T extends Element>(
-    element: ReactElement<any>, type: string): element is DOMElement<P, T>;
+    element: ReactElement, type: string): element is DOMElement<P, T>;
 /**
  * Returns `true` if `element` is a React element whose type is of a React `componentClass`.
  */
 export function isElementOfType<P>(
-    element: ReactElement<any>, type: SFC<P>): element is SFCElement<P>;
+    element: ReactElement, type: SFC<P>): element is SFCElement<P>;
 /**
  * Returns `true` if `element` is a React element whose type is of a React `componentClass`.
  */
 export function isElementOfType<P, T extends Component<P>, C extends ComponentClass<P>>(
-    element: ReactElement<any>, type: ClassType<P, T, C>): element is CElement<P, T>;
+    element: ReactElement, type: ClassType<P, T, C>): element is CElement<P, T>;
 
 /**
  * Returns `true` if `instance` is a DOM component (such as a `<div>` or `<span>`).
@@ -278,3 +278,26 @@ export function findRenderedComponentWithType<T extends Component<any>, C extend
  * Call this in your tests to create a shallow renderer.
  */
 export function createRenderer(): ShallowRenderer;
+
+/**
+ * Wrap any code rendering and triggering updates to your components into `act()` calls.
+ *
+ * Ensures that the behavior in your tests matches what happens in the browser
+ * more closely by executing pending `useEffect`s before returning. This also
+ * reduces the amount of re-renders done.
+ *
+ * @param callback A synchronous, void callback that will execute as a single, complete React commit.
+ *
+ * @see https://reactjs.org/blog/2019/02/06/react-v16.8.0.html#testing-hooks
+ */
+// the "void | undefined" is here to forbid any sneaky "Promise" returns.
+// the actual return value is always a "DebugPromiseLike",
+// but having an "| {}" makes it harder to accidentally use.
+export function act(callback: () => void | undefined): DebugPromiseLike | {};
+
+// Intentionally doesn't extend PromiseLike<never>.
+// Ideally this should be as hard to accidentally use as possible.
+export interface DebugPromiseLike {
+    // the actual then() in here is 0-ary, but that doesn't count as a PromiseLike.
+    then(onfulfilled: (value: never) => never, onrejected: (reason: never) => never): never;
+}
diff --git a/types/react-dom/tsconfig.json b/types/react-dom/tsconfig.json
index f63325026f..6d7d943c8b 100644
--- a/types/react-dom/tsconfig.json
+++ b/types/react-dom/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/react-dom/v15/index.d.ts b/types/react-dom/v15/index.d.ts
index 8a22fd9bc2..653469b277 100644
--- a/types/react-dom/v15/index.d.ts
+++ b/types/react-dom/v15/index.d.ts
@@ -15,7 +15,7 @@ import {
     DOMAttributes, DOMElement
 } from 'react';
 
-export function findDOMNode<E extends Element>(instance: ReactInstance): E;
+export function findDOMNode<E extends Element>(instance: ReactInstance | null | undefined): E;
 export function findDOMNode(instance: ReactInstance): Element;
 
 export function render<P extends DOMAttributes<T>, T extends Element>(
diff --git a/types/react-dom/v15/node-stream/index.d.ts b/types/react-dom/v15/node-stream/index.d.ts
index ff24c8a939..480392aaa4 100644
--- a/types/react-dom/v15/node-stream/index.d.ts
+++ b/types/react-dom/v15/node-stream/index.d.ts
@@ -5,14 +5,14 @@ import { ReactElement } from 'react';
  * server.
  * See https://facebook.github.io/react/docs/react-dom-stream.html#rendertostream
  */
-export function renderToStream(element: ReactElement<any>): any;
+export function renderToStream(element: ReactElement): any;
 
 /**
  * Similar to renderToStream, except this doesn't create extra DOM attributes
  * such as data-react-id that React uses internally.
  * See https://facebook.github.io/react/docs/react-dom-stream.html#rendertostaticstream
  */
-export function renderToStaticStream(element: ReactElement<any>): any;
+export function renderToStaticStream(element: ReactElement): any;
 export const version: string;
 
 export as namespace ReactDOMNodeStream;
diff --git a/types/react-dom/v15/react-dom-tests.ts b/types/react-dom/v15/react-dom-tests.ts
index 865d74e386..5f5b149594 100644
--- a/types/react-dom/v15/react-dom-tests.ts
+++ b/types/react-dom/v15/react-dom-tests.ts
@@ -25,6 +25,8 @@ describe('ReactDOM', () => {
         const rootElement = document.createElement('div');
         ReactDOM.render(React.createElement('div'), rootElement);
         ReactDOM.findDOMNode(rootElement);
+        ReactDOM.findDOMNode(null);
+        ReactDOM.findDOMNode(undefined);
     });
 });
 
diff --git a/types/react-dom/v15/server/index.d.ts b/types/react-dom/v15/server/index.d.ts
index 7d45ecbeee..59186f9174 100644
--- a/types/react-dom/v15/server/index.d.ts
+++ b/types/react-dom/v15/server/index.d.ts
@@ -10,7 +10,7 @@ import { ReactElement } from 'react';
  * React will preserve it and only attach event handlers, allowing you
  * to have a very performant first-load experience.
  */
-export function renderToString(element: ReactElement<any>): string;
+export function renderToString(element: ReactElement): string;
 
 /**
  * Similar to `renderToString`, except this doesn't create extra DOM attributes
@@ -18,7 +18,7 @@ export function renderToString(element: ReactElement<any>): string;
  * to use React as a simple static page generator, as stripping away the extra
  * attributes can save lots of bytes.
  */
-export function renderToStaticMarkup(element: ReactElement<any>): string;
+export function renderToStaticMarkup(element: ReactElement): string;
 export const version: string;
 
 export as namespace ReactDOMServer;
diff --git a/types/react-dom/v15/test-utils/index.d.ts b/types/react-dom/v15/test-utils/index.d.ts
index 05362460d4..3daa6325ae 100644
--- a/types/react-dom/v15/test-utils/index.d.ts
+++ b/types/react-dom/v15/test-utils/index.d.ts
@@ -66,15 +66,15 @@ export interface ShallowRenderer {
     /**
      * After `shallowRenderer.render()` has been called, returns shallowly rendered output.
      */
-    getRenderOutput<E extends ReactElement<any>>(): E;
+    getRenderOutput<E extends ReactElement>(): E;
     /**
      * After `shallowRenderer.render()` has been called, returns shallowly rendered output.
      */
-    getRenderOutput(): ReactElement<any>;
+    getRenderOutput(): ReactElement;
     /**
      * Similar to `ReactDOM.render` but it doesn't require DOM and only renders a single level deep.
      */
-    render(element: ReactElement<any>, context?: any): void;
+    render(element: ReactElement, context?: any): void;
     unmount(): void;
 }
 
@@ -182,22 +182,22 @@ export function isElement(element: any): boolean;
  * Returns `true` if `element` is a React element whose type is of a React `componentClass`.
  */
 export function isElementOfType<T extends HTMLElement>(
-    element: ReactElement<any>, type: string): element is ReactHTMLElement<T>;
+    element: ReactElement, type: string): element is ReactHTMLElement<T>;
 /**
  * Returns `true` if `element` is a React element whose type is of a React `componentClass`.
  */
 export function isElementOfType<P extends DOMAttributes<{}>, T extends Element>(
-    element: ReactElement<any>, type: string): element is DOMElement<P, T>;
+    element: ReactElement, type: string): element is DOMElement<P, T>;
 /**
  * Returns `true` if `element` is a React element whose type is of a React `componentClass`.
  */
 export function isElementOfType<P>(
-    element: ReactElement<any>, type: SFC<P>): element is SFCElement<P>;
+    element: ReactElement, type: SFC<P>): element is SFCElement<P>;
 /**
  * Returns `true` if `element` is a React element whose type is of a React `componentClass`.
  */
 export function isElementOfType<P, T extends Component<P>, C extends ComponentClass<P>>(
-    element: ReactElement<any>, type: ClassType<P, T, C>): element is CElement<P, T>;
+    element: ReactElement, type: ClassType<P, T, C>): element is CElement<P, T>;
 
 /**
  * Returns `true` if `instance` is a DOM component (such as a `<div>` or `<span>`).
diff --git a/types/react-draft-wysiwyg/index.d.ts b/types/react-draft-wysiwyg/index.d.ts
index 7b9b3577d8..46fab16511 100644
--- a/types/react-draft-wysiwyg/index.d.ts
+++ b/types/react-draft-wysiwyg/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jpuri/react-draft-wysiwyg#readme
 // Definitions by: imechZhangLY <https://github.com/imechZhangLY>
 //                 brunoMaurice <https://github.com/brunoMaurice>
+//                 ldanet <https://github.com/ldanet>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -18,9 +19,9 @@ export class ContentBlock extends Draft.ContentBlock {}
 export class SelectionState extends Draft.SelectionState {}
 
 export interface EditorProps {
-    onChange?(contentState: ContentState): RawDraftContentState;
+    onChange?(contentState: RawDraftContentState): void;
     onEditorStateChange?(editorState: EditorState): void;
-    onContentStateChange?(contentState: ContentState): RawDraftContentState;
+    onContentStateChange?(contentState: RawDraftContentState): void;
     initialContentState?: RawDraftContentState;
     defaultContentState?: RawDraftContentState;
     contentState?: RawDraftContentState;
diff --git a/types/react-draft-wysiwyg/test/uncontrolled-raw-draft-content-state.tsx b/types/react-draft-wysiwyg/test/uncontrolled-raw-draft-content-state.tsx
new file mode 100644
index 0000000000..4118ce2d09
--- /dev/null
+++ b/types/react-draft-wysiwyg/test/uncontrolled-raw-draft-content-state.tsx
@@ -0,0 +1,48 @@
+// From https://github.com/jpuri/react-draft-wysiwyg/blob/master/docs/src/components/Docs/Props/EditorStateProp/index.js#L125
+
+import * as React from "react";
+import * as ReactDOM from "react-dom";
+import { Editor, RawDraftContentState } from "react-draft-wysiwyg";
+
+class UncontrolledEditor extends React.Component<
+    {},
+    { contentState: RawDraftContentState }
+> {
+    constructor(props: any) {
+        super(props);
+        this.state = {
+            contentState: JSON.parse(`{
+                "entityMap":{},
+                "blocks":[{
+                    "key":"1ljs",
+                    "text":"Initializing from content state",
+                    "type":"unstyled",
+                    "depth":0,
+                    "inlineStyleRanges":[],
+                    "entityRanges":[],
+                    "data":{}
+                }]
+            }`)
+        };
+    }
+
+    onContentStateChange = (contentState: RawDraftContentState) => {
+        this.setState({
+            contentState
+        });
+    }
+
+    render() {
+        const { contentState } = this.state;
+        return (
+            <Editor
+                initialContentState={contentState}
+                wrapperClassName="demo-wrapper"
+                editorClassName="demo-editor"
+                onContentStateChange={this.onContentStateChange}
+            />
+        );
+    }
+}
+
+ReactDOM.render(<UncontrolledEditor />, document.getElementById("target"));
diff --git a/types/react-draft-wysiwyg/tsconfig.json b/types/react-draft-wysiwyg/tsconfig.json
index 35720c1979..0218edab95 100644
--- a/types/react-draft-wysiwyg/tsconfig.json
+++ b/types/react-draft-wysiwyg/tsconfig.json
@@ -24,6 +24,7 @@
         "test/basic-controlled-tests.tsx",
         "test/basic-tests.tsx",
         "test/custom-toolbar-tests.tsx",
-        "test/focus-blur-callbacks-tests.tsx"
+        "test/focus-blur-callbacks-tests.tsx",
+        "test/uncontrolled-raw-draft-content-state.tsx"
     ]
 }
diff --git a/types/react-event-listener/index.d.ts b/types/react-event-listener/index.d.ts
index b37566af5c..c264735c08 100644
--- a/types/react-event-listener/index.d.ts
+++ b/types/react-event-listener/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import * as React from "react";
+import React = require("react");
 
 export interface EventOptions {
     /**
@@ -193,6 +193,8 @@ export interface EventListenerProps {
     onSeekingCapture?(ev: Event): any;
     onSelect?(ev: UIEvent): any;
     onSelectCapture?(ev: UIEvent): any;
+    onSelectionChange?(ev: Event): any;
+    onSelectionChangeCapture?(ev: Event): any;
     onStalled?(ev: Event): any;
     onStalledCapture?(ev: Event): any;
     onStorage?(ev: StorageEvent): any;
diff --git a/types/react-event-listener/package.json b/types/react-event-listener/package.json
new file mode 100644
index 0000000000..24c89a85ed
--- /dev/null
+++ b/types/react-event-listener/package.json
@@ -0,0 +1,7 @@
+{
+  "private": true,
+  "types": "index",
+  "typesVersions": {
+      ">=3.1.0-0": { "*": ["ts3.1/*"] }
+  }
+}
\ No newline at end of file
diff --git a/types/react-event-listener/react-event-listener-tests.tsx b/types/react-event-listener/react-event-listener-tests.tsx
index 91c48b1047..e9a00dcc5f 100644
--- a/types/react-event-listener/react-event-listener-tests.tsx
+++ b/types/react-event-listener/react-event-listener-tests.tsx
@@ -1,6 +1,7 @@
-import * as React from "react";
+import React = require("react");
 import EventListener, { withOptions } from "react-event-listener";
 
 <EventListener target={document} onBeforeUnload={ev => { }} />;
 <EventListener target={window} onResize={withOptions((ev: UIEvent) => { }, { passive: true, capture: true })} />;
 <EventListener target="window" onResize={() => { }}/>;
+<EventListener target={document} onSelectionChange={ev => { }} />;
diff --git a/types/react-event-listener/ts3.1/index.d.ts b/types/react-event-listener/ts3.1/index.d.ts
new file mode 100644
index 0000000000..b6e11bed31
--- /dev/null
+++ b/types/react-event-listener/ts3.1/index.d.ts
@@ -0,0 +1,220 @@
+import React = require("react");
+
+export interface EventOptions extends Pick<AddEventListenerOptions, 'capture' | 'passive'> { }
+
+export function withOptions<T, TThis = any>(handler: (this: TThis, ev: T) => any, options: EventOptions): (this: TThis, ev: T) => any;
+
+export type EventListenerThisType<T extends EventTarget | WindowEventTargets> = T extends keyof Window ? Window[T] : T;
+
+export type OnErrorEventHandlerArgs = OnErrorEventHandlerNonNull extends (...args: infer A) => any ? A : [];
+
+export interface EventListenerProps<T extends EventTarget | WindowEventTargets> {
+    // Global events
+    onPointerCancel?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onPointerCancelCapture?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onPointerDown?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onPointerDownCapture?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onPointerEnter?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onPointerEnterCapture?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onPointerLeave?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onPointerLeaveCapture?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onPointerMove?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onPointerMoveCapture?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onPointerOut?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onPointerOutCapture?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onPointerOver?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onPointerOverCapture?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onPointerUp?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onPointerUpCapture?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onWheel?(this: EventListenerThisType<T>, ev: WheelEvent): any;
+    onWheelCapture?(this: EventListenerThisType<T>, ev: WheelEvent): any;
+    onAbort?(this: EventListenerThisType<T>, ev: Event): any;
+    onAbortCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onAfterPrint?(this: EventListenerThisType<T>, ev: Event): any;
+    onAfterPrintCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onBeforePrint?(this: EventListenerThisType<T>, ev: Event): any;
+    onBeforePrintCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onBeforeUnload?(this: EventListenerThisType<T>, ev: BeforeUnloadEvent): any;
+    onBeforeUnloadCapture?(this: EventListenerThisType<T>, ev: BeforeUnloadEvent): any;
+    onBlur?(this: EventListenerThisType<T>, ev: FocusEvent): any;
+    onBlurCapture?(this: EventListenerThisType<T>, ev: FocusEvent): any;
+    onCanPlay?(this: EventListenerThisType<T>, ev: Event): any;
+    onCanPlayCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onCanPlayThrough?(this: EventListenerThisType<T>, ev: Event): any;
+    onCanPlayThroughCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onChange?(this: EventListenerThisType<T>, ev: Event): any;
+    onChangeCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onClick?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onClickCapture?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onCompassNeedsCalibration?(this: EventListenerThisType<T>, ev: Event): any;
+    onCompassNeedsCalibrationCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onContextMenu?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onContextMenuCapture?(this: EventListenerThisType<T>, ev: PointerEvent): any;
+    onDblClick?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onDblClickCapture?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onDeviceMotion?(this: EventListenerThisType<T>, ev: DeviceMotionEvent): any;
+    onDeviceMotionCapture?(this: EventListenerThisType<T>, ev: DeviceMotionEvent): any;
+    onDeviceOrientation?(this: EventListenerThisType<T>, ev: DeviceOrientationEvent): any;
+    onDeviceOrientationCapture?(this: EventListenerThisType<T>, ev: DeviceOrientationEvent): any;
+    onDrag?(this: EventListenerThisType<T>, ev: DragEvent): any;
+    onDragCapture?(this: EventListenerThisType<T>, ev: DragEvent): any;
+    onDragEnd?(this: EventListenerThisType<T>, ev: DragEvent): any;
+    onDragEndCapture?(this: EventListenerThisType<T>, ev: DragEvent): any;
+    onDragEnter?(this: EventListenerThisType<T>, ev: DragEvent): any;
+    onDragEnterCapture?(this: EventListenerThisType<T>, ev: DragEvent): any;
+    onDragLeave?(this: EventListenerThisType<T>, ev: DragEvent): any;
+    onDragLeaveCapture?(this: EventListenerThisType<T>, ev: DragEvent): any;
+    onDragOver?(this: EventListenerThisType<T>, ev: DragEvent): any;
+    onDragOverCapture?(this: EventListenerThisType<T>, ev: DragEvent): any;
+    onDragStart?(this: EventListenerThisType<T>, ev: DragEvent): any;
+    onDragStartCapture?(this: EventListenerThisType<T>, ev: DragEvent): any;
+    onDrop?(this: EventListenerThisType<T>, ev: DragEvent): any;
+    onDropCapture?(this: EventListenerThisType<T>, ev: DragEvent): any;
+    onDurationChange?(this: EventListenerThisType<T>, ev: Event): any;
+    onDurationChangeCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onEmptied?(this: EventListenerThisType<T>, ev: Event): any;
+    onEmptiedCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onEnded?(this: EventListenerThisType<T>, ev: Event): any;
+    onEndedCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onError?(this: EventListenerThisType<T>, ...args: OnErrorEventHandlerArgs): any;
+    onErrorCapture?(this: EventListenerThisType<T>, ...args: OnErrorEventHandlerArgs): any;
+    onFocus?(this: EventListenerThisType<T>, ev: FocusEvent): any;
+    onFocusCapture?(this: EventListenerThisType<T>, ev: FocusEvent): any;
+    onHashChange?(this: EventListenerThisType<T>, ev: HashChangeEvent): any;
+    onHashChangeCapture?(this: EventListenerThisType<T>, ev: HashChangeEvent): any;
+    onInput?(this: EventListenerThisType<T>, ev: Event): any;
+    onInputCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onKeyDown?(this: EventListenerThisType<T>, ev: KeyboardEvent): any;
+    onKeyDownCapture?(this: EventListenerThisType<T>, ev: KeyboardEvent): any;
+    onKeyPress?(this: EventListenerThisType<T>, ev: KeyboardEvent): any;
+    onKeyPressCapture?(this: EventListenerThisType<T>, ev: KeyboardEvent): any;
+    onKeyUp?(this: EventListenerThisType<T>, ev: KeyboardEvent): any;
+    onKeyUpCapture?(this: EventListenerThisType<T>, ev: KeyboardEvent): any;
+    onLoad?(this: EventListenerThisType<T>, ev: Event): any;
+    onLoadCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onLoadedData?(this: EventListenerThisType<T>, ev: Event): any;
+    onLoadedDataCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onLoadedMetadata?(this: EventListenerThisType<T>, ev: Event): any;
+    onLoadedMetadataCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onLoadStart?(this: EventListenerThisType<T>, ev: Event): any;
+    onLoadStartCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onMessage?(this: EventListenerThisType<T>, ev: MessageEvent): any;
+    onMessageCapture?(this: EventListenerThisType<T>, ev: MessageEvent): any;
+    onMouseDown?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onMouseDownCapture?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onMouseEnter?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onMouseEnterCapture?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onMouseLeave?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onMouseLeaveCapture?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onMouseMove?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onMouseMoveCapture?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onMouseOut?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onMouseOutCapture?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onMouseOver?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onMouseOverCapture?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onMouseUp?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onMouseUpCapture?(this: EventListenerThisType<T>, ev: MouseEvent): any;
+    onMouseWheel?(this: EventListenerThisType<T>, ev: WheelEvent): any;
+    onMouseWheelCapture?(this: EventListenerThisType<T>, ev: WheelEvent): any;
+    onMsGestureChange?(this: EventListenerThisType<T>, ev: MSGestureEvent): any;
+    onMsGestureChangeCapture?(this: EventListenerThisType<T>, ev: MSGestureEvent): any;
+    onMsGestureDoubleTap?(this: EventListenerThisType<T>, ev: MSGestureEvent): any;
+    onMsGestureDoubleTapCapture?(this: EventListenerThisType<T>, ev: MSGestureEvent): any;
+    onMsGestureEnd?(this: EventListenerThisType<T>, ev: MSGestureEvent): any;
+    onMsGestureEndCapture?(this: EventListenerThisType<T>, ev: MSGestureEvent): any;
+    onMsGestureHold?(this: EventListenerThisType<T>, ev: MSGestureEvent): any;
+    onMsGestureHoldCapture?(this: EventListenerThisType<T>, ev: MSGestureEvent): any;
+    onMsGestureStart?(this: EventListenerThisType<T>, ev: MSGestureEvent): any;
+    onMsGestureStartCapture?(this: EventListenerThisType<T>, ev: MSGestureEvent): any;
+    onMsGestureTap?(this: EventListenerThisType<T>, ev: MSGestureEvent): any;
+    onMsGestureTapCapture?(this: EventListenerThisType<T>, ev: MSGestureEvent): any;
+    onMsInertiaStart?(this: EventListenerThisType<T>, ev: MSGestureEvent): any;
+    onMsInertiaStartCapture?(this: EventListenerThisType<T>, ev: MSGestureEvent): any;
+    onMsPointerCancel?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    onMsPointerCancelCapture?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    onMsPointerDown?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    onMsPointerDownCapture?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    onMsPointerEnter?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    onMsPointerEnterCapture?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    onMsPointerLeave?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    onMsPointerLeaveCapture?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    onMsPointerMove?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    onMsPointerMoveCapture?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    onMsPointerOut?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    onMsPointerOutCapture?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    onMsPointerOver?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    onMsPointerOverCapture?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    oNmsPointerUp?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    oNmsPointerUpCapture?(this: EventListenerThisType<T>, ev: MSPointerEvent): any;
+    onOffline?(this: EventListenerThisType<T>, ev: Event): any;
+    onOfflineCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onOnline?(this: EventListenerThisType<T>, ev: Event): any;
+    onOnlineCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onOrientationChange?(this: EventListenerThisType<T>, ev: Event): any;
+    onOrientationChangeCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onPageHide?(this: EventListenerThisType<T>, ev: PageTransitionEvent): any;
+    onPageHideCapture?(this: EventListenerThisType<T>, ev: PageTransitionEvent): any;
+    onPageShow?(this: EventListenerThisType<T>, ev: PageTransitionEvent): any;
+    onPageShowCapture?(this: EventListenerThisType<T>, ev: PageTransitionEvent): any;
+    onPause?(this: EventListenerThisType<T>, ev: Event): any;
+    onPauseCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onPlay?(this: EventListenerThisType<T>, ev: Event): any;
+    onPlayCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onPlaying?(this: EventListenerThisType<T>, ev: Event): any;
+    onPlayingCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onPopState?(this: EventListenerThisType<T>, ev: PopStateEvent): any;
+    onPopStateCapture?(this: EventListenerThisType<T>, ev: PopStateEvent): any;
+    onProgress?(this: EventListenerThisType<T>, ev: ProgressEvent): any;
+    onProgressCapture?(this: EventListenerThisType<T>, ev: ProgressEvent): any;
+    onRateChange?(this: EventListenerThisType<T>, ev: Event): any;
+    onRateChangeCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onReadyStateChange?(this: EventListenerThisType<T>, ev: ProgressEvent): any;
+    onReadyStateChangeCapture?(this: EventListenerThisType<T>, ev: ProgressEvent): any;
+    onReset?(this: EventListenerThisType<T>, ev: Event): any;
+    onResetCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onResize?(this: EventListenerThisType<T>, ev: UIEvent): any;
+    onResizeCapture?(this: EventListenerThisType<T>, ev: UIEvent): any;
+    onScroll?(this: EventListenerThisType<T>, ev: UIEvent): any;
+    onScrollCapture?(this: EventListenerThisType<T>, ev: UIEvent): any;
+    onSeeked?(this: EventListenerThisType<T>, ev: Event): any;
+    onSeekedCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onSeeking?(this: EventListenerThisType<T>, ev: Event): any;
+    onSeekingCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onSelect?(this: EventListenerThisType<T>, ev: UIEvent): any;
+    onSelectCapture?(this: EventListenerThisType<T>, ev: UIEvent): any;
+    onSelectionChange?(this: EventListenerThisType<T>, ev: Event): any;
+    onSelectionChangeCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onStalled?(this: EventListenerThisType<T>, ev: Event): any;
+    onStalledCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onStorage?(this: EventListenerThisType<T>, ev: StorageEvent): any;
+    onStorageCapture?(this: EventListenerThisType<T>, ev: StorageEvent): any;
+    onSubmit?(this: EventListenerThisType<T>, ev: Event): any;
+    onSubmitCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onSuspend?(this: EventListenerThisType<T>, ev: Event): any;
+    onSuspendCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onTimeUpdate?(this: EventListenerThisType<T>, ev: Event): any;
+    onTimeUpdateCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onTouchCancel?(this: EventListenerThisType<T>, ev: TouchEvent): any;
+    onTouchCancelCapture?(this: EventListenerThisType<T>, ev: TouchEvent): any;
+    onTouchEnd?(this: EventListenerThisType<T>, ev: TouchEvent): any;
+    onTouchEndCapture?(this: EventListenerThisType<T>, ev: TouchEvent): any;
+    onTouchMove?(this: EventListenerThisType<T>, ev: TouchEvent): any;
+    onTouchMoveCapture?(this: EventListenerThisType<T>, ev: TouchEvent): any;
+    onTouchStart?(this: EventListenerThisType<T>, ev: TouchEvent): any;
+    onTouchStartCapture?(this: EventListenerThisType<T>, ev: TouchEvent): any;
+    onUnload?(this: EventListenerThisType<T>, ev: Event): any;
+    onUnloadCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onVolumeChange?(this: EventListenerThisType<T>, ev: Event): any;
+    onVolumeChangeCapture?(this: EventListenerThisType<T>, ev: Event): any;
+    onWaiting?(this: EventListenerThisType<T>, ev: Event): any;
+    onWaitingCapture?(this: EventListenerThisType<T>, ev: Event): any;
+
+    /**
+     * Target (window or document)
+     */
+    target: T;
+}
+
+export type WindowEventTargets = {[K in keyof Window]: Window[K] extends EventTarget ? K : never}[keyof Window];
+
+export default class EventListener<T extends EventTarget | WindowEventTargets> extends React.PureComponent<EventListenerProps<T>> { }
diff --git a/types/react-event-listener/ts3.1/react-event-listener-tests.tsx b/types/react-event-listener/ts3.1/react-event-listener-tests.tsx
new file mode 100644
index 0000000000..238b05237b
--- /dev/null
+++ b/types/react-event-listener/ts3.1/react-event-listener-tests.tsx
@@ -0,0 +1,9 @@
+import React = require("react");
+import EventListener, { withOptions } from "react-event-listener";
+
+<EventListener target={document} onBeforeUnload={ev => { }} />;
+<EventListener target={window} onResize={withOptions((ev: UIEvent) => { }, { passive: true, capture: true })} />;
+<EventListener target="window" onResize={() => { }}/>;
+<EventListener target={document} onSelectionChange={ev => { }} />;
+<EventListener target="document" onError={function() { this.documentElement; }} />;
+<EventListener target={window} onBlurCapture={function() { this.pageXOffset; }} />;
diff --git a/types/react-event-listener/ts3.1/tsconfig.json b/types/react-event-listener/ts3.1/tsconfig.json
new file mode 100644
index 0000000000..8b6f2935ea
--- /dev/null
+++ b/types/react-event-listener/ts3.1/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-event-listener-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-event-listener/ts3.1/tslint.json b/types/react-event-listener/ts3.1/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-event-listener/ts3.1/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-fa/index.d.ts b/types/react-fa/index.d.ts
index b5641439af..c8c47939a9 100644
--- a/types/react-fa/index.d.ts
+++ b/types/react-fa/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-fa 4.1
-// Project: https://github.com/andreypopp/react-fa
+// Project: https://github.com/andreypopp/react-fa, http://andreypopp.github.io/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.8
diff --git a/types/react-faux-dom/index.d.ts b/types/react-faux-dom/index.d.ts
index 5c68b4ad39..eb3c52851b 100644
--- a/types/react-faux-dom/index.d.ts
+++ b/types/react-faux-dom/index.d.ts
@@ -14,7 +14,7 @@ export class Element extends HTMLElement {
 
     constructor(nodeName: string, parentNode?: Element);
 
-    toReact(): React.ReactElement<any>;
+    toReact(): React.ReactElement;
 }
 
 export const defaultView: {
diff --git a/types/react-file-reader-input/index.d.ts b/types/react-file-reader-input/index.d.ts
index 5dcb94ad66..fae97ca49e 100644
--- a/types/react-file-reader-input/index.d.ts
+++ b/types/react-file-reader-input/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-file-reader-input 1.1
-// Project: https://www.npmjs.com/package/react-file-reader-input
+// Project: https://github.com/ngokevin/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.8
diff --git a/types/react-filepond/index.d.ts b/types/react-filepond/index.d.ts
index ba29cc9d1d..98992c45b4 100644
--- a/types/react-filepond/index.d.ts
+++ b/types/react-filepond/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-filepond 5.0
-// Project: https://github.com/pqina/react-filepond
+// Project: https://github.com/pqina/react-filepond, https://pqina.nl/filepond
 // Definitions by: Zach Posten <https://github.com/zposten>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-flatpickr/index.d.ts b/types/react-flatpickr/index.d.ts
index c867527b06..0ec95e5159 100644
--- a/types/react-flatpickr/index.d.ts
+++ b/types/react-flatpickr/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-flatpickr 3.6
+// Type definitions for react-flatpickr 3.7
 // Project: https://github.com/coderhaoxin/react-flatpickr
 // Definitions by: begincalendar <https://github.com/begincalendar>
 //                 snaveevans <https://github.com/snaveevans>
@@ -20,6 +20,7 @@ export interface DateTimePickerProps {
     onValueUpdate?: flatpickr.Options.Hook;
     onDayCreate?: flatpickr.Options.Hook;
     value?: string | Date | number | ReadonlyArray<string | Date | number>;
+    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 7a1c64c266..b80fd83888 100644
--- a/types/react-flatpickr/react-flatpickr-tests.tsx
+++ b/types/react-flatpickr/react-flatpickr-tests.tsx
@@ -4,6 +4,8 @@ import DatePicker from "react-flatpickr";
 
 const noParamsElement = <DatePicker />;
 
+const classNameElement = <DatePicker className={"test"} />;
+
 const defaultValueElement = <DatePicker defaultValue={"Default value"} />;
 
 const options = {
diff --git a/types/react-form/index.d.ts b/types/react-form/index.d.ts
index b0f14afd2e..0a0b09e531 100644
--- a/types/react-form/index.d.ts
+++ b/types/react-form/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-form 2.16
-// Project: https://github.com/tannerlinsley/react-form#readme
+// Project: https://github.com/react-tools/react-form
 // Definitions by: Cameron McAteer <https://github.com/cameron-mcateer>
 //                 Mathieu Masy <https://github.com/TiuSh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/react-form/v1/index.d.ts b/types/react-form/v1/index.d.ts
index 0d4bdc6300..77a58834a1 100644
--- a/types/react-form/v1/index.d.ts
+++ b/types/react-form/v1/index.d.ts
@@ -121,7 +121,7 @@ export interface FormFieldApi {
 
 export interface FormFieldPropsWithField {
     field?: string;
-    children(api: FormFieldApi): React.ReactElement<any> | null;
+    children(api: FormFieldApi): React.ReactElement | null;
 }
 export interface FormFieldPropsWithoutField {
     children(api: FormApi): RenderReturn;
@@ -147,7 +147,7 @@ export interface FormInputProps {
 }
 
 export interface FormInputPropsWithChildren extends FormInputProps {
-    children(api: FormFieldApi): React.ReactElement<any> | null;
+    children(api: FormFieldApi): React.ReactElement | null;
 }
 export const FormInput: React.SFC<FormInputPropsWithChildren>;
 
diff --git a/types/react-foundation/index.d.ts b/types/react-foundation/index.d.ts
index 51433b1fd9..9b7f29d0a0 100644
--- a/types/react-foundation/index.d.ts
+++ b/types/react-foundation/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for https://github.com/digiaonline/react-foundation 0.9
-// Project: https://github.com/digiaonline/react-foundation
+// Project: https://github.com/digiaonline/react-foundation, https://github.com/nordsoftware/react-foundation
 // Definitions by: Daniel Earwicker <https://github.com/danielearwicker>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-google-places-suggest/index.d.ts b/types/react-google-places-suggest/index.d.ts
index 5e7276974f..678dc29cd0 100644
--- a/types/react-google-places-suggest/index.d.ts
+++ b/types/react-google-places-suggest/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-google-places-suggest 3.4
-// Project: https://xuopled.github.io/react-google-places-suggest
+// Project: https://xuopled.github.io/react-google-places-suggest, https://github.com/xuopled/react-google-places-suggest
 // Definitions by: Vasily Nesterov <https://github.com/vasilysn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-gravatar/index.d.ts b/types/react-gravatar/index.d.ts
index 56e48b3b9b..2ce23d98d9 100644
--- a/types/react-gravatar/index.d.ts
+++ b/types/react-gravatar/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-gravatar 2.6
-// Project: http://kyleamathews.github.io/react-gravatar/
+// Project: http://kyleamathews.github.io/react-gravatar/, https://github.com/kyleamathews/react-gravatar
 // Definitions by: invliD <https://github.com/invliD>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-grid-layout/index.d.ts b/types/react-grid-layout/index.d.ts
index 91c8ad1f9c..9f7ee359f0 100644
--- a/types/react-grid-layout/index.d.ts
+++ b/types/react-grid-layout/index.d.ts
@@ -4,6 +4,7 @@
 //                 Ali Taheri <https://github.com/alitaheri>,
 //                 Zheyang Song <https://github.com/ZheyangSong>,
 //                 Andrew Hathaway <https://github.com/andrewhathaway>
+//                 Manav Mishra <https://github.com/manav-m>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -12,11 +13,11 @@ import * as React from "react";
 export as namespace ReactGridLayout;
 export = ReactGridLayout;
 
-declare class ReactGridLayout extends React.Component<ReactGridLayout.ReactGridLayoutProps> { }
+declare class ReactGridLayout extends React.Component<
+    ReactGridLayout.ReactGridLayoutProps
+> {}
 
 declare namespace ReactGridLayout {
-    type Breakpoints = 'lg' | 'md' | 'sm' | 'xs' | 'xxs';
-
     interface Layout {
         /**
          * A string corresponding to the component key.
@@ -85,9 +86,9 @@ declare namespace ReactGridLayout {
         isResizable?: boolean;
     }
 
-    type Layouts = {
-        [P in Breakpoints]?: Layout[];
-    };
+    interface Layouts {
+        [P: string]: Layout[];
+    }
 
     type ItemCallback = (
         layout: Layout[],
@@ -263,12 +264,12 @@ declare namespace ReactGridLayout {
          *
          * Breakpoint names are arbitrary but must match in the cols and layouts objects.
          */
-        breakpoints?: {[P in Breakpoints]: number };
+        breakpoints?: { [P: string]: number };
 
         /**
          * Number of cols. This is a breakpoint -> cols map, e.g. `{lg: 12, md: 10, ...}`.
          */
-        cols?: {[P in Breakpoints]: number };
+        cols?: { [P: string]: number };
 
         /**
          * layouts is an object mapping breakpoints to layouts.
@@ -285,7 +286,7 @@ declare namespace ReactGridLayout {
         /**
          * Callback so you can save the layout.
          */
-        onLayoutChange?(currentLayout: Layout, allLayouts: Layouts): void;
+        onLayoutChange?(currentLayout: Layout[], allLayouts: Layouts): void;
 
         /**
          * Callback when the width changes, so you can modify the layout as needed.
@@ -298,7 +299,7 @@ declare namespace ReactGridLayout {
         ): void;
     }
 
-    class Responsive extends React.Component<ResponsiveProps> { }
+    class Responsive extends React.Component<ResponsiveProps> {}
 
     interface WidthProviderProps {
         /**
diff --git a/types/react-grid-layout/react-grid-layout-tests.tsx b/types/react-grid-layout/react-grid-layout-tests.tsx
index 78ecf594ef..70c88bae0d 100644
--- a/types/react-grid-layout/react-grid-layout-tests.tsx
+++ b/types/react-grid-layout/react-grid-layout-tests.tsx
@@ -54,6 +54,31 @@ class ResponsiveGridTest extends React.Component {
   }
 }
 
+class ResponsiveGridTestWithCustomBreakpoints extends React.Component {
+  render() {
+    const layouts = {
+      lg: [
+        { i: '1', x: 0, y: 0, w: 1, h: 2, static: true },
+        { i: '2', x: 1, y: 0, w: 3, h: 2, minW: 2, maxW: 4 },
+        { i: '3', x: 4, y: 0, w: 1, h: 2 }
+      ]
+    };
+
+    return (
+      <Responsive
+        layouts={layouts}
+        width={800}
+        breakpoints={{ lg: 468, sm: 0 }}
+        cols={{ lg: 12, sm: 6 }}
+      >
+        <div key="1">a</div>
+        <div key="2">b</div>
+        <div key="3">c</div>
+      </Responsive>
+    );
+  }
+}
+
 class ResponsiveGridWidthProviderTest extends React.Component {
   render() {
     return (
diff --git a/types/react-headroom/index.d.ts b/types/react-headroom/index.d.ts
index a69b16211d..229bc3dcf0 100644
--- a/types/react-headroom/index.d.ts
+++ b/types/react-headroom/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-headroom 2.2
-// Project: https://kyleamathews.github.io/react-headroom/
+// Project: https://kyleamathews.github.io/react-headroom/, https://github.com/kyleamathews/react-headroom
 // Definitions by: Zero Cho <https://github.com/zerocho>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-helmet-async/index.d.ts b/types/react-helmet-async/index.d.ts
index 086ee1fcf0..507872533f 100644
--- a/types/react-helmet-async/index.d.ts
+++ b/types/react-helmet-async/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-helmet-async 0.0
-// Project: https://github.com/staylor/react-helmet-async#readme
+// Project: https://github.com/staylor/react-helmet-async#readme, https://github.com/nytimes/react-helmet-async
 // Definitions by: forabi <https://github.com/forabi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-highlight-words/index.d.ts b/types/react-highlight-words/index.d.ts
index 9cd72ec411..9dc19130a7 100644
--- a/types/react-highlight-words/index.d.ts
+++ b/types/react-highlight-words/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-highlight-words 0.12
+// Type definitions for react-highlight-words 0.16
 // Project: https://github.com/bvaughn/react-highlight-words#readme
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 //                 Diogo Corrêa <https://github.com/diogodca>
@@ -25,7 +25,7 @@ interface HighlighterProps {
     /** 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;
+    activeIndex?: number;
     /** 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 */
@@ -48,7 +48,7 @@ interface HighlighterProps {
      * Type of tag to wrap around highlighted matches; defaults to mark but can also be a React element
      * (class or functional)
      */
-    highlightTag?: string;
+    highlightTag?: string | React.ComponentType<any>;
     /**
      * Process each search word and text to highlight before comparing (eg remove accents); signature
      * (text: string): string
diff --git a/types/react-highlight-words/react-highlight-words-tests.tsx b/types/react-highlight-words/react-highlight-words-tests.tsx
index de63c6d9ec..de1100e0de 100644
--- a/types/react-highlight-words/react-highlight-words-tests.tsx
+++ b/types/react-highlight-words/react-highlight-words-tests.tsx
@@ -6,17 +6,20 @@ const findChunks = ({
     textToHighlight
 }: FindChunks) => [];
 
+const CustomHighlight: React.FC = ({children}) => (<span>{children}</span>);
+
 class HighlighterTest extends React.Component {
     render() {
         return (
             <div>
                 <Highlighter
+                    highlightTag="span"
                     searchWords={["el", "or"]}
                     textToHighlight="Hello World"
                 />
                 <Highlighter
                     activeClassName="activeClassName"
-                    activeIndex="activeIndex"
+                    activeIndex={1}
                     activeStyle={{ color: "red" }}
                     autoEscape={true}
                     className="className"
@@ -24,7 +27,7 @@ class HighlighterTest extends React.Component {
                     findChunks={findChunks}
                     highlightClassName="highlightClassName"
                     highlightStyle={{ color: "red" }}
-                    highlightTag="span"
+                    highlightTag={CustomHighlight}
                     sanitize={(text: string) => text}
                     searchWords={["el", "or"]}
                     textToHighlight="Hello World"
diff --git a/types/react-howler/index.d.ts b/types/react-howler/index.d.ts
new file mode 100644
index 0000000000..51722f9079
--- /dev/null
+++ b/types/react-howler/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for react-howler 3.7
+// Project: https://github.com/thangngoc89/react-howler
+// Definitions by: Danijel Maksimovic <https://github.com/maksimovicdanijel>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.2
+
+/// <reference types="../react"/>
+/// <reference types="../howler"/>
+
+import * as React from 'react';
+import { Howl } from 'howler';
+
+declare enum HOWLER_STATE {
+    UNLOADED = 'unloaded',
+    LOADING = 'loading',
+    LOADED = 'loaded'
+}
+
+interface Props {
+    src: string | string[];
+    format?: string[];
+    playing?: boolean;
+    mute?: boolean;
+    loop?: boolean;
+    preload?: boolean;
+    volume?: number;
+    onEnd?: () => void;
+    onPause?: () => void;
+    onPlay?: (id: number) => void;
+    onVolume?: (id: number) => void;
+    onStop?: (id: number) => void;
+    onLoad?: () => void;
+    onLoadError?: (id: number) => void;
+    html5?: boolean;
+}
+
+declare class ReactHowler extends React.Component<Props> {
+    stop(id?: number): void;
+
+    duration(id?: number): number;
+
+    seek(time: number): number;
+
+    howlerState(): HOWLER_STATE;
+
+    howler: Howl;
+}
+
+export default ReactHowler;
diff --git a/types/react-howler/react-howler-tests.tsx b/types/react-howler/react-howler-tests.tsx
new file mode 100644
index 0000000000..e840da7dde
--- /dev/null
+++ b/types/react-howler/react-howler-tests.tsx
@@ -0,0 +1,39 @@
+import * as React from 'react';
+import ReactHowler from 'react-howler';
+
+export class ReactHowlerTest extends React.Component {
+    private readonly player = React.createRef<ReactHowler>();
+
+    render() {
+        const player = this.player.current;
+
+        if (player) {
+            player.howler.duration();
+        }
+
+        return (
+            <div>
+                <ReactHowler
+                    src={'some-source-url.mp3'}
+                    playing={false}
+                    mute={true}
+                    onPlay={id => console.log('playing sound with id ', id)}
+                    onLoad={() => console.log('sound loaded')}
+                    onLoadError={id =>
+                        console.log('error loading sound with id ', id)
+                    }
+                    onEnd={() => console.log('sound ended')}
+                    onPause={() => console.log('sound paused')}
+                    onStop={id => console.log('sound with id paused', id)}
+                    volume={0.5}
+                    onVolume={id => console.log('volume changed', id)}
+                    loop={true}
+                    html5={true}
+                    format={['mp3']}
+                    preload={false}
+                    ref={this.player}
+                />
+            </div>
+        );
+    }
+}
diff --git a/types/react-howler/tsconfig.json b/types/react-howler/tsconfig.json
new file mode 100644
index 0000000000..fe1b001df3
--- /dev/null
+++ b/types/react-howler/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6", "dom"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "jsx": "react",
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": false
+    },
+    "files": ["index.d.ts", "react-howler-tests.tsx"]
+}
diff --git a/types/react-howler/tslint.json b/types/react-howler/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-howler/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-hyperscript/index.d.ts b/types/react-hyperscript/index.d.ts
index ee953d3892..c5fb5ae4e1 100644
--- a/types/react-hyperscript/index.d.ts
+++ b/types/react-hyperscript/index.d.ts
@@ -8,12 +8,12 @@ import { ComponentClass, StatelessComponent, ReactElement } from 'react';
 
 declare namespace h {}
 
-type Element = ReactElement<any> | string | number | null;
+type Element = ReactElement | string | number | null;
 
 declare function h(
     componentOrTag: ComponentClass | StatelessComponent | string,
     children?: ReadonlyArray<Element> | Element
-): ReactElement<any>;
+): ReactElement;
 
 declare function h<P extends {[attr: string]: any}>(
     componentOrTag: ComponentClass<P> | StatelessComponent<P> | string,
diff --git a/types/react-icons/fa/500px.d.ts b/types/react-icons/fa/500px.d.ts
deleted file mode 100644
index 29c3f639f8..0000000000
--- a/types/react-icons/fa/500px.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class Fa500px extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/adjust.d.ts b/types/react-icons/fa/adjust.d.ts
deleted file mode 100644
index 7ca3d2cf03..0000000000
--- a/types/react-icons/fa/adjust.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAdjust extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/adn.d.ts b/types/react-icons/fa/adn.d.ts
deleted file mode 100644
index c2c5676047..0000000000
--- a/types/react-icons/fa/adn.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAdn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/align-center.d.ts b/types/react-icons/fa/align-center.d.ts
deleted file mode 100644
index 718d401bcc..0000000000
--- a/types/react-icons/fa/align-center.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAlignCenter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/align-justify.d.ts b/types/react-icons/fa/align-justify.d.ts
deleted file mode 100644
index 87df2f26fc..0000000000
--- a/types/react-icons/fa/align-justify.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAlignJustify extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/align-left.d.ts b/types/react-icons/fa/align-left.d.ts
deleted file mode 100644
index 7a1c956b3f..0000000000
--- a/types/react-icons/fa/align-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAlignLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/align-right.d.ts b/types/react-icons/fa/align-right.d.ts
deleted file mode 100644
index 0ec0226c13..0000000000
--- a/types/react-icons/fa/align-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAlignRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/amazon.d.ts b/types/react-icons/fa/amazon.d.ts
deleted file mode 100644
index d514c69672..0000000000
--- a/types/react-icons/fa/amazon.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAmazon extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/ambulance.d.ts b/types/react-icons/fa/ambulance.d.ts
deleted file mode 100644
index fbaa0eec3b..0000000000
--- a/types/react-icons/fa/ambulance.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAmbulance extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/american-sign-language-interpreting.d.ts b/types/react-icons/fa/american-sign-language-interpreting.d.ts
deleted file mode 100644
index 06925c79e5..0000000000
--- a/types/react-icons/fa/american-sign-language-interpreting.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAmericanSignLanguageInterpreting extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/anchor.d.ts b/types/react-icons/fa/anchor.d.ts
deleted file mode 100644
index 8812734dc4..0000000000
--- a/types/react-icons/fa/anchor.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAnchor extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/android.d.ts b/types/react-icons/fa/android.d.ts
deleted file mode 100644
index 2ee9f5fb18..0000000000
--- a/types/react-icons/fa/android.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAndroid extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/angellist.d.ts b/types/react-icons/fa/angellist.d.ts
deleted file mode 100644
index ce8afe7eda..0000000000
--- a/types/react-icons/fa/angellist.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAngellist extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/angle-double-down.d.ts b/types/react-icons/fa/angle-double-down.d.ts
deleted file mode 100644
index 93ce66d6b4..0000000000
--- a/types/react-icons/fa/angle-double-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleDoubleDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/angle-double-left.d.ts b/types/react-icons/fa/angle-double-left.d.ts
deleted file mode 100644
index ff9d38e1ad..0000000000
--- a/types/react-icons/fa/angle-double-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleDoubleLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/angle-double-right.d.ts b/types/react-icons/fa/angle-double-right.d.ts
deleted file mode 100644
index 2642210681..0000000000
--- a/types/react-icons/fa/angle-double-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleDoubleRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/angle-double-up.d.ts b/types/react-icons/fa/angle-double-up.d.ts
deleted file mode 100644
index 9a3af8e4bf..0000000000
--- a/types/react-icons/fa/angle-double-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleDoubleUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/angle-down.d.ts b/types/react-icons/fa/angle-down.d.ts
deleted file mode 100644
index d9e5083f2a..0000000000
--- a/types/react-icons/fa/angle-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/angle-left.d.ts b/types/react-icons/fa/angle-left.d.ts
deleted file mode 100644
index bea87f2edd..0000000000
--- a/types/react-icons/fa/angle-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/angle-right.d.ts b/types/react-icons/fa/angle-right.d.ts
deleted file mode 100644
index c5ecf220c6..0000000000
--- a/types/react-icons/fa/angle-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/angle-up.d.ts b/types/react-icons/fa/angle-up.d.ts
deleted file mode 100644
index cdbc2fd506..0000000000
--- a/types/react-icons/fa/angle-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/apple.d.ts b/types/react-icons/fa/apple.d.ts
deleted file mode 100644
index 81a903285f..0000000000
--- a/types/react-icons/fa/apple.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaApple extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/archive.d.ts b/types/react-icons/fa/archive.d.ts
deleted file mode 100644
index a86eaae4d2..0000000000
--- a/types/react-icons/fa/archive.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArchive extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/area-chart.d.ts b/types/react-icons/fa/area-chart.d.ts
deleted file mode 100644
index 989eaa3b5d..0000000000
--- a/types/react-icons/fa/area-chart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAreaChart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrow-circle-down.d.ts b/types/react-icons/fa/arrow-circle-down.d.ts
deleted file mode 100644
index e5551c84a8..0000000000
--- a/types/react-icons/fa/arrow-circle-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrow-circle-left.d.ts b/types/react-icons/fa/arrow-circle-left.d.ts
deleted file mode 100644
index af722a058d..0000000000
--- a/types/react-icons/fa/arrow-circle-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrow-circle-o-down.d.ts b/types/react-icons/fa/arrow-circle-o-down.d.ts
deleted file mode 100644
index 3e06f22917..0000000000
--- a/types/react-icons/fa/arrow-circle-o-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleODown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrow-circle-o-left.d.ts b/types/react-icons/fa/arrow-circle-o-left.d.ts
deleted file mode 100644
index 687373f29c..0000000000
--- a/types/react-icons/fa/arrow-circle-o-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleOLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrow-circle-o-right.d.ts b/types/react-icons/fa/arrow-circle-o-right.d.ts
deleted file mode 100644
index c1378c89b6..0000000000
--- a/types/react-icons/fa/arrow-circle-o-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleORight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrow-circle-o-up.d.ts b/types/react-icons/fa/arrow-circle-o-up.d.ts
deleted file mode 100644
index 6d67c2f160..0000000000
--- a/types/react-icons/fa/arrow-circle-o-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleOUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrow-circle-right.d.ts b/types/react-icons/fa/arrow-circle-right.d.ts
deleted file mode 100644
index 0916b5328d..0000000000
--- a/types/react-icons/fa/arrow-circle-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrow-circle-up.d.ts b/types/react-icons/fa/arrow-circle-up.d.ts
deleted file mode 100644
index 1d4af5320c..0000000000
--- a/types/react-icons/fa/arrow-circle-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrow-down.d.ts b/types/react-icons/fa/arrow-down.d.ts
deleted file mode 100644
index 845ae5bda7..0000000000
--- a/types/react-icons/fa/arrow-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrow-left.d.ts b/types/react-icons/fa/arrow-left.d.ts
deleted file mode 100644
index b5333dd62c..0000000000
--- a/types/react-icons/fa/arrow-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrow-right.d.ts b/types/react-icons/fa/arrow-right.d.ts
deleted file mode 100644
index 7cad9380d5..0000000000
--- a/types/react-icons/fa/arrow-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrow-up.d.ts b/types/react-icons/fa/arrow-up.d.ts
deleted file mode 100644
index eb96f4b47d..0000000000
--- a/types/react-icons/fa/arrow-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrows-alt.d.ts b/types/react-icons/fa/arrows-alt.d.ts
deleted file mode 100644
index 0497e59469..0000000000
--- a/types/react-icons/fa/arrows-alt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowsAlt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrows-h.d.ts b/types/react-icons/fa/arrows-h.d.ts
deleted file mode 100644
index 53e31e5671..0000000000
--- a/types/react-icons/fa/arrows-h.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowsH extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrows-v.d.ts b/types/react-icons/fa/arrows-v.d.ts
deleted file mode 100644
index 6b4cb60249..0000000000
--- a/types/react-icons/fa/arrows-v.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowsV extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/arrows.d.ts b/types/react-icons/fa/arrows.d.ts
deleted file mode 100644
index 16175f7688..0000000000
--- a/types/react-icons/fa/arrows.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaArrows extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/assistive-listening-systems.d.ts b/types/react-icons/fa/assistive-listening-systems.d.ts
deleted file mode 100644
index f6e1649de6..0000000000
--- a/types/react-icons/fa/assistive-listening-systems.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAssistiveListeningSystems extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/asterisk.d.ts b/types/react-icons/fa/asterisk.d.ts
deleted file mode 100644
index 89fc42ca05..0000000000
--- a/types/react-icons/fa/asterisk.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAsterisk extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/at.d.ts b/types/react-icons/fa/at.d.ts
deleted file mode 100644
index a871055990..0000000000
--- a/types/react-icons/fa/at.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/audio-description.d.ts b/types/react-icons/fa/audio-description.d.ts
deleted file mode 100644
index 476ef84b6a..0000000000
--- a/types/react-icons/fa/audio-description.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAudioDescription extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/automobile.d.ts b/types/react-icons/fa/automobile.d.ts
deleted file mode 100644
index 4a6a259ff3..0000000000
--- a/types/react-icons/fa/automobile.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaAutomobile extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/backward.d.ts b/types/react-icons/fa/backward.d.ts
deleted file mode 100644
index ac9bc7b820..0000000000
--- a/types/react-icons/fa/backward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBackward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/balance-scale.d.ts b/types/react-icons/fa/balance-scale.d.ts
deleted file mode 100644
index ae8446ed1b..0000000000
--- a/types/react-icons/fa/balance-scale.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBalanceScale extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/ban.d.ts b/types/react-icons/fa/ban.d.ts
deleted file mode 100644
index b2f668bcef..0000000000
--- a/types/react-icons/fa/ban.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBan extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bank.d.ts b/types/react-icons/fa/bank.d.ts
deleted file mode 100644
index 0d3a14ebf8..0000000000
--- a/types/react-icons/fa/bank.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBank extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bar-chart.d.ts b/types/react-icons/fa/bar-chart.d.ts
deleted file mode 100644
index b184edbda5..0000000000
--- a/types/react-icons/fa/bar-chart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBarChart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/barcode.d.ts b/types/react-icons/fa/barcode.d.ts
deleted file mode 100644
index 4f764358a7..0000000000
--- a/types/react-icons/fa/barcode.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBarcode extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bars.d.ts b/types/react-icons/fa/bars.d.ts
deleted file mode 100644
index 5a3272c896..0000000000
--- a/types/react-icons/fa/bars.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBars extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/battery-0.d.ts b/types/react-icons/fa/battery-0.d.ts
deleted file mode 100644
index c7ad0b12b1..0000000000
--- a/types/react-icons/fa/battery-0.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBattery0 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/battery-1.d.ts b/types/react-icons/fa/battery-1.d.ts
deleted file mode 100644
index a7db7a950f..0000000000
--- a/types/react-icons/fa/battery-1.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBattery1 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/battery-2.d.ts b/types/react-icons/fa/battery-2.d.ts
deleted file mode 100644
index 345d261889..0000000000
--- a/types/react-icons/fa/battery-2.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBattery2 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/battery-3.d.ts b/types/react-icons/fa/battery-3.d.ts
deleted file mode 100644
index bc2a62de56..0000000000
--- a/types/react-icons/fa/battery-3.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBattery3 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/battery-4.d.ts b/types/react-icons/fa/battery-4.d.ts
deleted file mode 100644
index 0541fd5f79..0000000000
--- a/types/react-icons/fa/battery-4.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBattery4 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bed.d.ts b/types/react-icons/fa/bed.d.ts
deleted file mode 100644
index 5eab8918d4..0000000000
--- a/types/react-icons/fa/bed.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBed extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/beer.d.ts b/types/react-icons/fa/beer.d.ts
deleted file mode 100644
index 79bbeb09d2..0000000000
--- a/types/react-icons/fa/beer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBeer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/behance-square.d.ts b/types/react-icons/fa/behance-square.d.ts
deleted file mode 100644
index 550cb6b841..0000000000
--- a/types/react-icons/fa/behance-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBehanceSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/behance.d.ts b/types/react-icons/fa/behance.d.ts
deleted file mode 100644
index e51df4de64..0000000000
--- a/types/react-icons/fa/behance.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBehance extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bell-o.d.ts b/types/react-icons/fa/bell-o.d.ts
deleted file mode 100644
index 13f162cd71..0000000000
--- a/types/react-icons/fa/bell-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBellO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bell-slash-o.d.ts b/types/react-icons/fa/bell-slash-o.d.ts
deleted file mode 100644
index 49ae89d8d4..0000000000
--- a/types/react-icons/fa/bell-slash-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBellSlashO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bell-slash.d.ts b/types/react-icons/fa/bell-slash.d.ts
deleted file mode 100644
index 305b77912b..0000000000
--- a/types/react-icons/fa/bell-slash.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBellSlash extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bell.d.ts b/types/react-icons/fa/bell.d.ts
deleted file mode 100644
index 4ec0031ae6..0000000000
--- a/types/react-icons/fa/bell.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBell extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bicycle.d.ts b/types/react-icons/fa/bicycle.d.ts
deleted file mode 100644
index e0017c15ca..0000000000
--- a/types/react-icons/fa/bicycle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBicycle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/binoculars.d.ts b/types/react-icons/fa/binoculars.d.ts
deleted file mode 100644
index 5dd06d8ed4..0000000000
--- a/types/react-icons/fa/binoculars.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBinoculars extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/birthday-cake.d.ts b/types/react-icons/fa/birthday-cake.d.ts
deleted file mode 100644
index 24af4a13f7..0000000000
--- a/types/react-icons/fa/birthday-cake.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBirthdayCake extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bitbucket-square.d.ts b/types/react-icons/fa/bitbucket-square.d.ts
deleted file mode 100644
index e9c80979f9..0000000000
--- a/types/react-icons/fa/bitbucket-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBitbucketSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bitbucket.d.ts b/types/react-icons/fa/bitbucket.d.ts
deleted file mode 100644
index 3e46e9e0a9..0000000000
--- a/types/react-icons/fa/bitbucket.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBitbucket extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bitcoin.d.ts b/types/react-icons/fa/bitcoin.d.ts
deleted file mode 100644
index 34e0ee64b3..0000000000
--- a/types/react-icons/fa/bitcoin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBitcoin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/black-tie.d.ts b/types/react-icons/fa/black-tie.d.ts
deleted file mode 100644
index 4586a07039..0000000000
--- a/types/react-icons/fa/black-tie.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBlackTie extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/blind.d.ts b/types/react-icons/fa/blind.d.ts
deleted file mode 100644
index eb3606ac4c..0000000000
--- a/types/react-icons/fa/blind.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBlind extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bluetooth-b.d.ts b/types/react-icons/fa/bluetooth-b.d.ts
deleted file mode 100644
index 4ca6448c1a..0000000000
--- a/types/react-icons/fa/bluetooth-b.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBluetoothB extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bluetooth.d.ts b/types/react-icons/fa/bluetooth.d.ts
deleted file mode 100644
index 0aba8d08f5..0000000000
--- a/types/react-icons/fa/bluetooth.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBluetooth extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bold.d.ts b/types/react-icons/fa/bold.d.ts
deleted file mode 100644
index 65c28daedc..0000000000
--- a/types/react-icons/fa/bold.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBold extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bolt.d.ts b/types/react-icons/fa/bolt.d.ts
deleted file mode 100644
index f4ecb5e36e..0000000000
--- a/types/react-icons/fa/bolt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBolt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bomb.d.ts b/types/react-icons/fa/bomb.d.ts
deleted file mode 100644
index 7d8f3fff70..0000000000
--- a/types/react-icons/fa/bomb.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBomb extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/book.d.ts b/types/react-icons/fa/book.d.ts
deleted file mode 100644
index 2925f2f925..0000000000
--- a/types/react-icons/fa/book.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBook extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bookmark-o.d.ts b/types/react-icons/fa/bookmark-o.d.ts
deleted file mode 100644
index 07b10ae683..0000000000
--- a/types/react-icons/fa/bookmark-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBookmarkO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bookmark.d.ts b/types/react-icons/fa/bookmark.d.ts
deleted file mode 100644
index 60f758e9ae..0000000000
--- a/types/react-icons/fa/bookmark.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBookmark extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/braille.d.ts b/types/react-icons/fa/braille.d.ts
deleted file mode 100644
index 4619546218..0000000000
--- a/types/react-icons/fa/braille.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBraille extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/briefcase.d.ts b/types/react-icons/fa/briefcase.d.ts
deleted file mode 100644
index ef7d7a3e67..0000000000
--- a/types/react-icons/fa/briefcase.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBriefcase extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bug.d.ts b/types/react-icons/fa/bug.d.ts
deleted file mode 100644
index 3a386909a9..0000000000
--- a/types/react-icons/fa/bug.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBug extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/building-o.d.ts b/types/react-icons/fa/building-o.d.ts
deleted file mode 100644
index 1dab73f883..0000000000
--- a/types/react-icons/fa/building-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBuildingO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/building.d.ts b/types/react-icons/fa/building.d.ts
deleted file mode 100644
index 1094d0547b..0000000000
--- a/types/react-icons/fa/building.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBuilding extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bullhorn.d.ts b/types/react-icons/fa/bullhorn.d.ts
deleted file mode 100644
index 83424c5116..0000000000
--- a/types/react-icons/fa/bullhorn.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBullhorn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bullseye.d.ts b/types/react-icons/fa/bullseye.d.ts
deleted file mode 100644
index eaa9ba66fe..0000000000
--- a/types/react-icons/fa/bullseye.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBullseye extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/bus.d.ts b/types/react-icons/fa/bus.d.ts
deleted file mode 100644
index 7fc2f7bfc5..0000000000
--- a/types/react-icons/fa/bus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/buysellads.d.ts b/types/react-icons/fa/buysellads.d.ts
deleted file mode 100644
index 304c070cce..0000000000
--- a/types/react-icons/fa/buysellads.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaBuysellads extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cab.d.ts b/types/react-icons/fa/cab.d.ts
deleted file mode 100644
index cd6af6ddd4..0000000000
--- a/types/react-icons/fa/cab.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCab extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/calculator.d.ts b/types/react-icons/fa/calculator.d.ts
deleted file mode 100644
index ed26af229f..0000000000
--- a/types/react-icons/fa/calculator.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCalculator extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/calendar-check-o.d.ts b/types/react-icons/fa/calendar-check-o.d.ts
deleted file mode 100644
index 9829dc60c3..0000000000
--- a/types/react-icons/fa/calendar-check-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendarCheckO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/calendar-minus-o.d.ts b/types/react-icons/fa/calendar-minus-o.d.ts
deleted file mode 100644
index 64a2d3a3e3..0000000000
--- a/types/react-icons/fa/calendar-minus-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendarMinusO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/calendar-o.d.ts b/types/react-icons/fa/calendar-o.d.ts
deleted file mode 100644
index 8a70d1c368..0000000000
--- a/types/react-icons/fa/calendar-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendarO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/calendar-plus-o.d.ts b/types/react-icons/fa/calendar-plus-o.d.ts
deleted file mode 100644
index 0ff42b4d29..0000000000
--- a/types/react-icons/fa/calendar-plus-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendarPlusO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/calendar-times-o.d.ts b/types/react-icons/fa/calendar-times-o.d.ts
deleted file mode 100644
index 2a81539d66..0000000000
--- a/types/react-icons/fa/calendar-times-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendarTimesO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/calendar.d.ts b/types/react-icons/fa/calendar.d.ts
deleted file mode 100644
index deec1eaeb4..0000000000
--- a/types/react-icons/fa/calendar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/camera-retro.d.ts b/types/react-icons/fa/camera-retro.d.ts
deleted file mode 100644
index 64821f1f67..0000000000
--- a/types/react-icons/fa/camera-retro.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCameraRetro extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/camera.d.ts b/types/react-icons/fa/camera.d.ts
deleted file mode 100644
index 4928697191..0000000000
--- a/types/react-icons/fa/camera.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCamera extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/caret-down.d.ts b/types/react-icons/fa/caret-down.d.ts
deleted file mode 100644
index dbc43f0466..0000000000
--- a/types/react-icons/fa/caret-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/caret-left.d.ts b/types/react-icons/fa/caret-left.d.ts
deleted file mode 100644
index 420ce16ba3..0000000000
--- a/types/react-icons/fa/caret-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/caret-right.d.ts b/types/react-icons/fa/caret-right.d.ts
deleted file mode 100644
index 44e7429916..0000000000
--- a/types/react-icons/fa/caret-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/caret-square-o-down.d.ts b/types/react-icons/fa/caret-square-o-down.d.ts
deleted file mode 100644
index dd6d132183..0000000000
--- a/types/react-icons/fa/caret-square-o-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretSquareODown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/caret-square-o-left.d.ts b/types/react-icons/fa/caret-square-o-left.d.ts
deleted file mode 100644
index 042ada389c..0000000000
--- a/types/react-icons/fa/caret-square-o-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretSquareOLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/caret-square-o-right.d.ts b/types/react-icons/fa/caret-square-o-right.d.ts
deleted file mode 100644
index 12cee8faf7..0000000000
--- a/types/react-icons/fa/caret-square-o-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretSquareORight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/caret-square-o-up.d.ts b/types/react-icons/fa/caret-square-o-up.d.ts
deleted file mode 100644
index 36e0c7bee6..0000000000
--- a/types/react-icons/fa/caret-square-o-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretSquareOUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/caret-up.d.ts b/types/react-icons/fa/caret-up.d.ts
deleted file mode 100644
index 4eaad4bb41..0000000000
--- a/types/react-icons/fa/caret-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cart-arrow-down.d.ts b/types/react-icons/fa/cart-arrow-down.d.ts
deleted file mode 100644
index 539933f702..0000000000
--- a/types/react-icons/fa/cart-arrow-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCartArrowDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cart-plus.d.ts b/types/react-icons/fa/cart-plus.d.ts
deleted file mode 100644
index 00e645e840..0000000000
--- a/types/react-icons/fa/cart-plus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCartPlus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cc-amex.d.ts b/types/react-icons/fa/cc-amex.d.ts
deleted file mode 100644
index daede8980e..0000000000
--- a/types/react-icons/fa/cc-amex.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCcAmex extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cc-diners-club.d.ts b/types/react-icons/fa/cc-diners-club.d.ts
deleted file mode 100644
index 5263120cb0..0000000000
--- a/types/react-icons/fa/cc-diners-club.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCcDinersClub extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cc-discover.d.ts b/types/react-icons/fa/cc-discover.d.ts
deleted file mode 100644
index 0d5e5d6daa..0000000000
--- a/types/react-icons/fa/cc-discover.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCcDiscover extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cc-jcb.d.ts b/types/react-icons/fa/cc-jcb.d.ts
deleted file mode 100644
index 3aeb4c483f..0000000000
--- a/types/react-icons/fa/cc-jcb.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCcJcb extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cc-mastercard.d.ts b/types/react-icons/fa/cc-mastercard.d.ts
deleted file mode 100644
index 58e0e375c0..0000000000
--- a/types/react-icons/fa/cc-mastercard.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCcMastercard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cc-paypal.d.ts b/types/react-icons/fa/cc-paypal.d.ts
deleted file mode 100644
index 4fb116f8ab..0000000000
--- a/types/react-icons/fa/cc-paypal.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCcPaypal extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cc-stripe.d.ts b/types/react-icons/fa/cc-stripe.d.ts
deleted file mode 100644
index afb2d4cac8..0000000000
--- a/types/react-icons/fa/cc-stripe.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCcStripe extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cc-visa.d.ts b/types/react-icons/fa/cc-visa.d.ts
deleted file mode 100644
index 4e5b06b45f..0000000000
--- a/types/react-icons/fa/cc-visa.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCcVisa extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cc.d.ts b/types/react-icons/fa/cc.d.ts
deleted file mode 100644
index e2c4036439..0000000000
--- a/types/react-icons/fa/cc.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCc extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/certificate.d.ts b/types/react-icons/fa/certificate.d.ts
deleted file mode 100644
index c8845fb117..0000000000
--- a/types/react-icons/fa/certificate.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCertificate extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/chain-broken.d.ts b/types/react-icons/fa/chain-broken.d.ts
deleted file mode 100644
index 87a8310d0a..0000000000
--- a/types/react-icons/fa/chain-broken.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaChainBroken extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/chain.d.ts b/types/react-icons/fa/chain.d.ts
deleted file mode 100644
index 8359a5f773..0000000000
--- a/types/react-icons/fa/chain.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaChain extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/check-circle-o.d.ts b/types/react-icons/fa/check-circle-o.d.ts
deleted file mode 100644
index 32390d5c4c..0000000000
--- a/types/react-icons/fa/check-circle-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCheckCircleO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/check-circle.d.ts b/types/react-icons/fa/check-circle.d.ts
deleted file mode 100644
index c30263a3be..0000000000
--- a/types/react-icons/fa/check-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCheckCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/check-square-o.d.ts b/types/react-icons/fa/check-square-o.d.ts
deleted file mode 100644
index b4aef21d8c..0000000000
--- a/types/react-icons/fa/check-square-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCheckSquareO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/check-square.d.ts b/types/react-icons/fa/check-square.d.ts
deleted file mode 100644
index f6ba4ce0bd..0000000000
--- a/types/react-icons/fa/check-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCheckSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/check.d.ts b/types/react-icons/fa/check.d.ts
deleted file mode 100644
index b30727c61c..0000000000
--- a/types/react-icons/fa/check.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCheck extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/chevron-circle-down.d.ts b/types/react-icons/fa/chevron-circle-down.d.ts
deleted file mode 100644
index 35eb978aec..0000000000
--- a/types/react-icons/fa/chevron-circle-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronCircleDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/chevron-circle-left.d.ts b/types/react-icons/fa/chevron-circle-left.d.ts
deleted file mode 100644
index e84cdd9146..0000000000
--- a/types/react-icons/fa/chevron-circle-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronCircleLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/chevron-circle-right.d.ts b/types/react-icons/fa/chevron-circle-right.d.ts
deleted file mode 100644
index d5e4d2429c..0000000000
--- a/types/react-icons/fa/chevron-circle-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronCircleRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/chevron-circle-up.d.ts b/types/react-icons/fa/chevron-circle-up.d.ts
deleted file mode 100644
index bedcb877d6..0000000000
--- a/types/react-icons/fa/chevron-circle-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronCircleUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/chevron-down.d.ts b/types/react-icons/fa/chevron-down.d.ts
deleted file mode 100644
index 5c9ae23cf8..0000000000
--- a/types/react-icons/fa/chevron-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/chevron-left.d.ts b/types/react-icons/fa/chevron-left.d.ts
deleted file mode 100644
index b07fae8a5e..0000000000
--- a/types/react-icons/fa/chevron-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/chevron-right.d.ts b/types/react-icons/fa/chevron-right.d.ts
deleted file mode 100644
index 27f6264560..0000000000
--- a/types/react-icons/fa/chevron-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/chevron-up.d.ts b/types/react-icons/fa/chevron-up.d.ts
deleted file mode 100644
index 3847054d06..0000000000
--- a/types/react-icons/fa/chevron-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/child.d.ts b/types/react-icons/fa/child.d.ts
deleted file mode 100644
index 08209ee585..0000000000
--- a/types/react-icons/fa/child.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaChild extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/chrome.d.ts b/types/react-icons/fa/chrome.d.ts
deleted file mode 100644
index 703caadb19..0000000000
--- a/types/react-icons/fa/chrome.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaChrome extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/circle-o-notch.d.ts b/types/react-icons/fa/circle-o-notch.d.ts
deleted file mode 100644
index ed18a9f78d..0000000000
--- a/types/react-icons/fa/circle-o-notch.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCircleONotch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/circle-o.d.ts b/types/react-icons/fa/circle-o.d.ts
deleted file mode 100644
index 05001b7669..0000000000
--- a/types/react-icons/fa/circle-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCircleO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/circle-thin.d.ts b/types/react-icons/fa/circle-thin.d.ts
deleted file mode 100644
index 017b8a0e4d..0000000000
--- a/types/react-icons/fa/circle-thin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCircleThin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/circle.d.ts b/types/react-icons/fa/circle.d.ts
deleted file mode 100644
index 14b042ae0b..0000000000
--- a/types/react-icons/fa/circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/clipboard.d.ts b/types/react-icons/fa/clipboard.d.ts
deleted file mode 100644
index 6a15d300fb..0000000000
--- a/types/react-icons/fa/clipboard.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaClipboard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/clock-o.d.ts b/types/react-icons/fa/clock-o.d.ts
deleted file mode 100644
index 021deeb65e..0000000000
--- a/types/react-icons/fa/clock-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaClockO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/clone.d.ts b/types/react-icons/fa/clone.d.ts
deleted file mode 100644
index 60b8d9d0b9..0000000000
--- a/types/react-icons/fa/clone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaClone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/close.d.ts b/types/react-icons/fa/close.d.ts
deleted file mode 100644
index 81b3c24102..0000000000
--- a/types/react-icons/fa/close.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaClose extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cloud-download.d.ts b/types/react-icons/fa/cloud-download.d.ts
deleted file mode 100644
index 76834995ef..0000000000
--- a/types/react-icons/fa/cloud-download.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCloudDownload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cloud-upload.d.ts b/types/react-icons/fa/cloud-upload.d.ts
deleted file mode 100644
index 68e7a59934..0000000000
--- a/types/react-icons/fa/cloud-upload.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCloudUpload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cloud.d.ts b/types/react-icons/fa/cloud.d.ts
deleted file mode 100644
index 555b3f5a09..0000000000
--- a/types/react-icons/fa/cloud.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCloud extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cny.d.ts b/types/react-icons/fa/cny.d.ts
deleted file mode 100644
index 816523c44e..0000000000
--- a/types/react-icons/fa/cny.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCny extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/code-fork.d.ts b/types/react-icons/fa/code-fork.d.ts
deleted file mode 100644
index 520f347006..0000000000
--- a/types/react-icons/fa/code-fork.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCodeFork extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/code.d.ts b/types/react-icons/fa/code.d.ts
deleted file mode 100644
index 5a9b025804..0000000000
--- a/types/react-icons/fa/code.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCode extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/codepen.d.ts b/types/react-icons/fa/codepen.d.ts
deleted file mode 100644
index e317fd7e6e..0000000000
--- a/types/react-icons/fa/codepen.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCodepen extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/codiepie.d.ts b/types/react-icons/fa/codiepie.d.ts
deleted file mode 100644
index 74deac600a..0000000000
--- a/types/react-icons/fa/codiepie.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCodiepie extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/coffee.d.ts b/types/react-icons/fa/coffee.d.ts
deleted file mode 100644
index defdc05087..0000000000
--- a/types/react-icons/fa/coffee.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCoffee extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cog.d.ts b/types/react-icons/fa/cog.d.ts
deleted file mode 100644
index 1fe2c08345..0000000000
--- a/types/react-icons/fa/cog.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCog extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cogs.d.ts b/types/react-icons/fa/cogs.d.ts
deleted file mode 100644
index daf4b449d3..0000000000
--- a/types/react-icons/fa/cogs.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCogs extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/columns.d.ts b/types/react-icons/fa/columns.d.ts
deleted file mode 100644
index 8e88628b63..0000000000
--- a/types/react-icons/fa/columns.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaColumns extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/comment-o.d.ts b/types/react-icons/fa/comment-o.d.ts
deleted file mode 100644
index e627ec6248..0000000000
--- a/types/react-icons/fa/comment-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCommentO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/comment.d.ts b/types/react-icons/fa/comment.d.ts
deleted file mode 100644
index 82043adb6a..0000000000
--- a/types/react-icons/fa/comment.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaComment extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/commenting-o.d.ts b/types/react-icons/fa/commenting-o.d.ts
deleted file mode 100644
index 40a4c3f058..0000000000
--- a/types/react-icons/fa/commenting-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCommentingO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/commenting.d.ts b/types/react-icons/fa/commenting.d.ts
deleted file mode 100644
index 1031cc0ad6..0000000000
--- a/types/react-icons/fa/commenting.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCommenting extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/comments-o.d.ts b/types/react-icons/fa/comments-o.d.ts
deleted file mode 100644
index 191de8b6a3..0000000000
--- a/types/react-icons/fa/comments-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCommentsO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/comments.d.ts b/types/react-icons/fa/comments.d.ts
deleted file mode 100644
index e77e9f4b42..0000000000
--- a/types/react-icons/fa/comments.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaComments extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/compass.d.ts b/types/react-icons/fa/compass.d.ts
deleted file mode 100644
index 36d4843b21..0000000000
--- a/types/react-icons/fa/compass.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCompass extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/compress.d.ts b/types/react-icons/fa/compress.d.ts
deleted file mode 100644
index 7f2f48ca22..0000000000
--- a/types/react-icons/fa/compress.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCompress extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/connectdevelop.d.ts b/types/react-icons/fa/connectdevelop.d.ts
deleted file mode 100644
index aae5bfa48c..0000000000
--- a/types/react-icons/fa/connectdevelop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaConnectdevelop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/contao.d.ts b/types/react-icons/fa/contao.d.ts
deleted file mode 100644
index c99ab675b4..0000000000
--- a/types/react-icons/fa/contao.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaContao extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/copy.d.ts b/types/react-icons/fa/copy.d.ts
deleted file mode 100644
index 3e6e11bf31..0000000000
--- a/types/react-icons/fa/copy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCopy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/copyright.d.ts b/types/react-icons/fa/copyright.d.ts
deleted file mode 100644
index 630383979f..0000000000
--- a/types/react-icons/fa/copyright.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCopyright extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/creative-commons.d.ts b/types/react-icons/fa/creative-commons.d.ts
deleted file mode 100644
index eecacfd23c..0000000000
--- a/types/react-icons/fa/creative-commons.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCreativeCommons extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/credit-card-alt.d.ts b/types/react-icons/fa/credit-card-alt.d.ts
deleted file mode 100644
index c9d2f20993..0000000000
--- a/types/react-icons/fa/credit-card-alt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCreditCardAlt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/credit-card.d.ts b/types/react-icons/fa/credit-card.d.ts
deleted file mode 100644
index 374f9efdda..0000000000
--- a/types/react-icons/fa/credit-card.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCreditCard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/crop.d.ts b/types/react-icons/fa/crop.d.ts
deleted file mode 100644
index aa47690da9..0000000000
--- a/types/react-icons/fa/crop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCrop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/crosshairs.d.ts b/types/react-icons/fa/crosshairs.d.ts
deleted file mode 100644
index c54203bb33..0000000000
--- a/types/react-icons/fa/crosshairs.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCrosshairs extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/css3.d.ts b/types/react-icons/fa/css3.d.ts
deleted file mode 100644
index 361b20e295..0000000000
--- a/types/react-icons/fa/css3.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCss3 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cube.d.ts b/types/react-icons/fa/cube.d.ts
deleted file mode 100644
index ad9dc6b033..0000000000
--- a/types/react-icons/fa/cube.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCube extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cubes.d.ts b/types/react-icons/fa/cubes.d.ts
deleted file mode 100644
index a2cdf49c8c..0000000000
--- a/types/react-icons/fa/cubes.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCubes extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cut.d.ts b/types/react-icons/fa/cut.d.ts
deleted file mode 100644
index 0c93d3cbc2..0000000000
--- a/types/react-icons/fa/cut.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCut extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/cutlery.d.ts b/types/react-icons/fa/cutlery.d.ts
deleted file mode 100644
index f4496c61e3..0000000000
--- a/types/react-icons/fa/cutlery.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaCutlery extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/dashboard.d.ts b/types/react-icons/fa/dashboard.d.ts
deleted file mode 100644
index d763edb50d..0000000000
--- a/types/react-icons/fa/dashboard.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDashboard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/dashcube.d.ts b/types/react-icons/fa/dashcube.d.ts
deleted file mode 100644
index ed15f887b2..0000000000
--- a/types/react-icons/fa/dashcube.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDashcube extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/database.d.ts b/types/react-icons/fa/database.d.ts
deleted file mode 100644
index cfb7bcbedd..0000000000
--- a/types/react-icons/fa/database.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDatabase extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/deaf.d.ts b/types/react-icons/fa/deaf.d.ts
deleted file mode 100644
index a53c48b057..0000000000
--- a/types/react-icons/fa/deaf.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDeaf extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/dedent.d.ts b/types/react-icons/fa/dedent.d.ts
deleted file mode 100644
index 30db3c96d4..0000000000
--- a/types/react-icons/fa/dedent.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDedent extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/delicious.d.ts b/types/react-icons/fa/delicious.d.ts
deleted file mode 100644
index 7a069105b3..0000000000
--- a/types/react-icons/fa/delicious.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDelicious extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/desktop.d.ts b/types/react-icons/fa/desktop.d.ts
deleted file mode 100644
index 7ada5afec8..0000000000
--- a/types/react-icons/fa/desktop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDesktop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/deviantart.d.ts b/types/react-icons/fa/deviantart.d.ts
deleted file mode 100644
index d3d8521e04..0000000000
--- a/types/react-icons/fa/deviantart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDeviantart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/diamond.d.ts b/types/react-icons/fa/diamond.d.ts
deleted file mode 100644
index 1d54c78101..0000000000
--- a/types/react-icons/fa/diamond.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDiamond extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/digg.d.ts b/types/react-icons/fa/digg.d.ts
deleted file mode 100644
index 7ba32cbe41..0000000000
--- a/types/react-icons/fa/digg.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDigg extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/dollar.d.ts b/types/react-icons/fa/dollar.d.ts
deleted file mode 100644
index 339fc41f86..0000000000
--- a/types/react-icons/fa/dollar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDollar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/dot-circle-o.d.ts b/types/react-icons/fa/dot-circle-o.d.ts
deleted file mode 100644
index 8479c5a1c1..0000000000
--- a/types/react-icons/fa/dot-circle-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDotCircleO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/download.d.ts b/types/react-icons/fa/download.d.ts
deleted file mode 100644
index bd458b4c21..0000000000
--- a/types/react-icons/fa/download.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDownload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/dribbble.d.ts b/types/react-icons/fa/dribbble.d.ts
deleted file mode 100644
index 97c095c7f0..0000000000
--- a/types/react-icons/fa/dribbble.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDribbble extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/dropbox.d.ts b/types/react-icons/fa/dropbox.d.ts
deleted file mode 100644
index 1534075582..0000000000
--- a/types/react-icons/fa/dropbox.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDropbox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/drupal.d.ts b/types/react-icons/fa/drupal.d.ts
deleted file mode 100644
index c4318c69ed..0000000000
--- a/types/react-icons/fa/drupal.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaDrupal extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/edge.d.ts b/types/react-icons/fa/edge.d.ts
deleted file mode 100644
index bfe0ccba18..0000000000
--- a/types/react-icons/fa/edge.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaEdge extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/edit.d.ts b/types/react-icons/fa/edit.d.ts
deleted file mode 100644
index e207eca02c..0000000000
--- a/types/react-icons/fa/edit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaEdit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/eject.d.ts b/types/react-icons/fa/eject.d.ts
deleted file mode 100644
index 6a8ba89e5b..0000000000
--- a/types/react-icons/fa/eject.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaEject extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/ellipsis-h.d.ts b/types/react-icons/fa/ellipsis-h.d.ts
deleted file mode 100644
index 6c97cce7ac..0000000000
--- a/types/react-icons/fa/ellipsis-h.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaEllipsisH extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/ellipsis-v.d.ts b/types/react-icons/fa/ellipsis-v.d.ts
deleted file mode 100644
index a6a862fcc0..0000000000
--- a/types/react-icons/fa/ellipsis-v.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaEllipsisV extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/empire.d.ts b/types/react-icons/fa/empire.d.ts
deleted file mode 100644
index c898a570aa..0000000000
--- a/types/react-icons/fa/empire.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaEmpire extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/envelope-o.d.ts b/types/react-icons/fa/envelope-o.d.ts
deleted file mode 100644
index 91552afcb2..0000000000
--- a/types/react-icons/fa/envelope-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaEnvelopeO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/envelope-square.d.ts b/types/react-icons/fa/envelope-square.d.ts
deleted file mode 100644
index c984bceac4..0000000000
--- a/types/react-icons/fa/envelope-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaEnvelopeSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/envelope.d.ts b/types/react-icons/fa/envelope.d.ts
deleted file mode 100644
index c93f0c144b..0000000000
--- a/types/react-icons/fa/envelope.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaEnvelope extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/envira.d.ts b/types/react-icons/fa/envira.d.ts
deleted file mode 100644
index 8ccf1e8183..0000000000
--- a/types/react-icons/fa/envira.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaEnvira extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/eraser.d.ts b/types/react-icons/fa/eraser.d.ts
deleted file mode 100644
index 1751f58630..0000000000
--- a/types/react-icons/fa/eraser.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaEraser extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/eur.d.ts b/types/react-icons/fa/eur.d.ts
deleted file mode 100644
index 466c340a42..0000000000
--- a/types/react-icons/fa/eur.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaEur extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/exchange.d.ts b/types/react-icons/fa/exchange.d.ts
deleted file mode 100644
index 61f666fcc6..0000000000
--- a/types/react-icons/fa/exchange.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaExchange extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/exclamation-circle.d.ts b/types/react-icons/fa/exclamation-circle.d.ts
deleted file mode 100644
index 074285abc3..0000000000
--- a/types/react-icons/fa/exclamation-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaExclamationCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/exclamation-triangle.d.ts b/types/react-icons/fa/exclamation-triangle.d.ts
deleted file mode 100644
index 0e6a2039ef..0000000000
--- a/types/react-icons/fa/exclamation-triangle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaExclamationTriangle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/exclamation.d.ts b/types/react-icons/fa/exclamation.d.ts
deleted file mode 100644
index 822c50b207..0000000000
--- a/types/react-icons/fa/exclamation.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaExclamation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/expand.d.ts b/types/react-icons/fa/expand.d.ts
deleted file mode 100644
index 4648b519b9..0000000000
--- a/types/react-icons/fa/expand.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaExpand extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/expeditedssl.d.ts b/types/react-icons/fa/expeditedssl.d.ts
deleted file mode 100644
index e30594333e..0000000000
--- a/types/react-icons/fa/expeditedssl.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaExpeditedssl extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/external-link-square.d.ts b/types/react-icons/fa/external-link-square.d.ts
deleted file mode 100644
index f49858db95..0000000000
--- a/types/react-icons/fa/external-link-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaExternalLinkSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/external-link.d.ts b/types/react-icons/fa/external-link.d.ts
deleted file mode 100644
index 69b539a542..0000000000
--- a/types/react-icons/fa/external-link.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaExternalLink extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/eye-slash.d.ts b/types/react-icons/fa/eye-slash.d.ts
deleted file mode 100644
index cbf60ac206..0000000000
--- a/types/react-icons/fa/eye-slash.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaEyeSlash extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/eye.d.ts b/types/react-icons/fa/eye.d.ts
deleted file mode 100644
index bec2d41708..0000000000
--- a/types/react-icons/fa/eye.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaEye extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/eyedropper.d.ts b/types/react-icons/fa/eyedropper.d.ts
deleted file mode 100644
index 87b2d74f41..0000000000
--- a/types/react-icons/fa/eyedropper.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaEyedropper extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/facebook-official.d.ts b/types/react-icons/fa/facebook-official.d.ts
deleted file mode 100644
index 3424fb90dd..0000000000
--- a/types/react-icons/fa/facebook-official.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFacebookOfficial extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/facebook-square.d.ts b/types/react-icons/fa/facebook-square.d.ts
deleted file mode 100644
index fb5c101a6b..0000000000
--- a/types/react-icons/fa/facebook-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFacebookSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/facebook.d.ts b/types/react-icons/fa/facebook.d.ts
deleted file mode 100644
index d837e533dd..0000000000
--- a/types/react-icons/fa/facebook.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFacebook extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/fast-backward.d.ts b/types/react-icons/fa/fast-backward.d.ts
deleted file mode 100644
index 73f95fd419..0000000000
--- a/types/react-icons/fa/fast-backward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFastBackward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/fast-forward.d.ts b/types/react-icons/fa/fast-forward.d.ts
deleted file mode 100644
index c28ea39eb7..0000000000
--- a/types/react-icons/fa/fast-forward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFastForward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/fax.d.ts b/types/react-icons/fa/fax.d.ts
deleted file mode 100644
index 9ca411f7f9..0000000000
--- a/types/react-icons/fa/fax.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFax extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/feed.d.ts b/types/react-icons/fa/feed.d.ts
deleted file mode 100644
index 448c3a2e24..0000000000
--- a/types/react-icons/fa/feed.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFeed extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/female.d.ts b/types/react-icons/fa/female.d.ts
deleted file mode 100644
index d18a20d305..0000000000
--- a/types/react-icons/fa/female.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFemale extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/fighter-jet.d.ts b/types/react-icons/fa/fighter-jet.d.ts
deleted file mode 100644
index 124b4d63e3..0000000000
--- a/types/react-icons/fa/fighter-jet.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFighterJet extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/file-archive-o.d.ts b/types/react-icons/fa/file-archive-o.d.ts
deleted file mode 100644
index 6a3390c936..0000000000
--- a/types/react-icons/fa/file-archive-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFileArchiveO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/file-audio-o.d.ts b/types/react-icons/fa/file-audio-o.d.ts
deleted file mode 100644
index a360a79960..0000000000
--- a/types/react-icons/fa/file-audio-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFileAudioO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/file-code-o.d.ts b/types/react-icons/fa/file-code-o.d.ts
deleted file mode 100644
index 754fcb2d04..0000000000
--- a/types/react-icons/fa/file-code-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFileCodeO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/file-excel-o.d.ts b/types/react-icons/fa/file-excel-o.d.ts
deleted file mode 100644
index dd41811e82..0000000000
--- a/types/react-icons/fa/file-excel-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFileExcelO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/file-image-o.d.ts b/types/react-icons/fa/file-image-o.d.ts
deleted file mode 100644
index 7c6b77a296..0000000000
--- a/types/react-icons/fa/file-image-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFileImageO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/file-movie-o.d.ts b/types/react-icons/fa/file-movie-o.d.ts
deleted file mode 100644
index ec9a9e0e0d..0000000000
--- a/types/react-icons/fa/file-movie-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFileMovieO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/file-o.d.ts b/types/react-icons/fa/file-o.d.ts
deleted file mode 100644
index 726de80769..0000000000
--- a/types/react-icons/fa/file-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFileO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/file-pdf-o.d.ts b/types/react-icons/fa/file-pdf-o.d.ts
deleted file mode 100644
index 79ae492b23..0000000000
--- a/types/react-icons/fa/file-pdf-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFilePdfO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/file-powerpoint-o.d.ts b/types/react-icons/fa/file-powerpoint-o.d.ts
deleted file mode 100644
index fd4016615c..0000000000
--- a/types/react-icons/fa/file-powerpoint-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFilePowerpointO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/file-text-o.d.ts b/types/react-icons/fa/file-text-o.d.ts
deleted file mode 100644
index 5bf9475839..0000000000
--- a/types/react-icons/fa/file-text-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFileTextO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/file-text.d.ts b/types/react-icons/fa/file-text.d.ts
deleted file mode 100644
index 287aa5d5e9..0000000000
--- a/types/react-icons/fa/file-text.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFileText extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/file-word-o.d.ts b/types/react-icons/fa/file-word-o.d.ts
deleted file mode 100644
index e8790d5988..0000000000
--- a/types/react-icons/fa/file-word-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFileWordO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/file.d.ts b/types/react-icons/fa/file.d.ts
deleted file mode 100644
index 92fb6d073a..0000000000
--- a/types/react-icons/fa/file.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFile extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/film.d.ts b/types/react-icons/fa/film.d.ts
deleted file mode 100644
index 639ec938b8..0000000000
--- a/types/react-icons/fa/film.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFilm extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/filter.d.ts b/types/react-icons/fa/filter.d.ts
deleted file mode 100644
index 971ec8a2ab..0000000000
--- a/types/react-icons/fa/filter.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFilter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/fire-extinguisher.d.ts b/types/react-icons/fa/fire-extinguisher.d.ts
deleted file mode 100644
index 347abc3091..0000000000
--- a/types/react-icons/fa/fire-extinguisher.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFireExtinguisher extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/fire.d.ts b/types/react-icons/fa/fire.d.ts
deleted file mode 100644
index 361e6b3f2a..0000000000
--- a/types/react-icons/fa/fire.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFire extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/firefox.d.ts b/types/react-icons/fa/firefox.d.ts
deleted file mode 100644
index fb5b6faf5b..0000000000
--- a/types/react-icons/fa/firefox.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFirefox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/flag-checkered.d.ts b/types/react-icons/fa/flag-checkered.d.ts
deleted file mode 100644
index ad9439fe74..0000000000
--- a/types/react-icons/fa/flag-checkered.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFlagCheckered extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/flag-o.d.ts b/types/react-icons/fa/flag-o.d.ts
deleted file mode 100644
index 4af124ebe3..0000000000
--- a/types/react-icons/fa/flag-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFlagO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/flag.d.ts b/types/react-icons/fa/flag.d.ts
deleted file mode 100644
index 05b3a41500..0000000000
--- a/types/react-icons/fa/flag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFlag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/flask.d.ts b/types/react-icons/fa/flask.d.ts
deleted file mode 100644
index 53edd95b1c..0000000000
--- a/types/react-icons/fa/flask.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFlask extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/flickr.d.ts b/types/react-icons/fa/flickr.d.ts
deleted file mode 100644
index 0642e63424..0000000000
--- a/types/react-icons/fa/flickr.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFlickr extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/floppy-o.d.ts b/types/react-icons/fa/floppy-o.d.ts
deleted file mode 100644
index a36898567d..0000000000
--- a/types/react-icons/fa/floppy-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFloppyO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/folder-o.d.ts b/types/react-icons/fa/folder-o.d.ts
deleted file mode 100644
index 86c2f0853c..0000000000
--- a/types/react-icons/fa/folder-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFolderO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/folder-open-o.d.ts b/types/react-icons/fa/folder-open-o.d.ts
deleted file mode 100644
index 13c270457c..0000000000
--- a/types/react-icons/fa/folder-open-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFolderOpenO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/folder-open.d.ts b/types/react-icons/fa/folder-open.d.ts
deleted file mode 100644
index 27eefcf390..0000000000
--- a/types/react-icons/fa/folder-open.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFolderOpen extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/folder.d.ts b/types/react-icons/fa/folder.d.ts
deleted file mode 100644
index 348ac25522..0000000000
--- a/types/react-icons/fa/folder.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFolder extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/font.d.ts b/types/react-icons/fa/font.d.ts
deleted file mode 100644
index 70459022df..0000000000
--- a/types/react-icons/fa/font.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFont extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/fonticons.d.ts b/types/react-icons/fa/fonticons.d.ts
deleted file mode 100644
index a124cfb0c2..0000000000
--- a/types/react-icons/fa/fonticons.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFonticons extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/fort-awesome.d.ts b/types/react-icons/fa/fort-awesome.d.ts
deleted file mode 100644
index a88e6a0118..0000000000
--- a/types/react-icons/fa/fort-awesome.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFortAwesome extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/forumbee.d.ts b/types/react-icons/fa/forumbee.d.ts
deleted file mode 100644
index 58b96a9d83..0000000000
--- a/types/react-icons/fa/forumbee.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaForumbee extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/forward.d.ts b/types/react-icons/fa/forward.d.ts
deleted file mode 100644
index 12eacceb4b..0000000000
--- a/types/react-icons/fa/forward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaForward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/foursquare.d.ts b/types/react-icons/fa/foursquare.d.ts
deleted file mode 100644
index 8c2bf2cbf5..0000000000
--- a/types/react-icons/fa/foursquare.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFoursquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/frown-o.d.ts b/types/react-icons/fa/frown-o.d.ts
deleted file mode 100644
index 06ebd02274..0000000000
--- a/types/react-icons/fa/frown-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFrownO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/futbol-o.d.ts b/types/react-icons/fa/futbol-o.d.ts
deleted file mode 100644
index eaa4922a85..0000000000
--- a/types/react-icons/fa/futbol-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaFutbolO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/gamepad.d.ts b/types/react-icons/fa/gamepad.d.ts
deleted file mode 100644
index 9acea2828f..0000000000
--- a/types/react-icons/fa/gamepad.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGamepad extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/gavel.d.ts b/types/react-icons/fa/gavel.d.ts
deleted file mode 100644
index 66e5593ffa..0000000000
--- a/types/react-icons/fa/gavel.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGavel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/gbp.d.ts b/types/react-icons/fa/gbp.d.ts
deleted file mode 100644
index 1fb48290e3..0000000000
--- a/types/react-icons/fa/gbp.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGbp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/genderless.d.ts b/types/react-icons/fa/genderless.d.ts
deleted file mode 100644
index 5ad672ddb3..0000000000
--- a/types/react-icons/fa/genderless.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGenderless extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/get-pocket.d.ts b/types/react-icons/fa/get-pocket.d.ts
deleted file mode 100644
index 1f04b2974b..0000000000
--- a/types/react-icons/fa/get-pocket.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGetPocket extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/gg-circle.d.ts b/types/react-icons/fa/gg-circle.d.ts
deleted file mode 100644
index 580b37668c..0000000000
--- a/types/react-icons/fa/gg-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGgCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/gg.d.ts b/types/react-icons/fa/gg.d.ts
deleted file mode 100644
index 2aaf1c7b23..0000000000
--- a/types/react-icons/fa/gg.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGg extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/gift.d.ts b/types/react-icons/fa/gift.d.ts
deleted file mode 100644
index 79b22324f5..0000000000
--- a/types/react-icons/fa/gift.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGift extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/git-square.d.ts b/types/react-icons/fa/git-square.d.ts
deleted file mode 100644
index 28cf85a92a..0000000000
--- a/types/react-icons/fa/git-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGitSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/git.d.ts b/types/react-icons/fa/git.d.ts
deleted file mode 100644
index 427ad2a4b8..0000000000
--- a/types/react-icons/fa/git.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/github-alt.d.ts b/types/react-icons/fa/github-alt.d.ts
deleted file mode 100644
index 8f3b4c4175..0000000000
--- a/types/react-icons/fa/github-alt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGithubAlt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/github-square.d.ts b/types/react-icons/fa/github-square.d.ts
deleted file mode 100644
index 8feea6aea6..0000000000
--- a/types/react-icons/fa/github-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGithubSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/github.d.ts b/types/react-icons/fa/github.d.ts
deleted file mode 100644
index 6e5ff98328..0000000000
--- a/types/react-icons/fa/github.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGithub extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/gitlab.d.ts b/types/react-icons/fa/gitlab.d.ts
deleted file mode 100644
index 1d185afb32..0000000000
--- a/types/react-icons/fa/gitlab.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGitlab extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/gittip.d.ts b/types/react-icons/fa/gittip.d.ts
deleted file mode 100644
index c96eaa0026..0000000000
--- a/types/react-icons/fa/gittip.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGittip extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/glass.d.ts b/types/react-icons/fa/glass.d.ts
deleted file mode 100644
index 7f0fa030d9..0000000000
--- a/types/react-icons/fa/glass.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGlass extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/glide-g.d.ts b/types/react-icons/fa/glide-g.d.ts
deleted file mode 100644
index c5601a2e6f..0000000000
--- a/types/react-icons/fa/glide-g.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGlideG extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/glide.d.ts b/types/react-icons/fa/glide.d.ts
deleted file mode 100644
index 7a7e2300f7..0000000000
--- a/types/react-icons/fa/glide.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGlide extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/globe.d.ts b/types/react-icons/fa/globe.d.ts
deleted file mode 100644
index e71a1f6bd9..0000000000
--- a/types/react-icons/fa/globe.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGlobe extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/google-plus-square.d.ts b/types/react-icons/fa/google-plus-square.d.ts
deleted file mode 100644
index 9d3428ec25..0000000000
--- a/types/react-icons/fa/google-plus-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGooglePlusSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/google-plus.d.ts b/types/react-icons/fa/google-plus.d.ts
deleted file mode 100644
index 3c1eba715e..0000000000
--- a/types/react-icons/fa/google-plus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGooglePlus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/google-wallet.d.ts b/types/react-icons/fa/google-wallet.d.ts
deleted file mode 100644
index 8ab0d78a56..0000000000
--- a/types/react-icons/fa/google-wallet.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGoogleWallet extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/google.d.ts b/types/react-icons/fa/google.d.ts
deleted file mode 100644
index 3879f1c233..0000000000
--- a/types/react-icons/fa/google.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGoogle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/graduation-cap.d.ts b/types/react-icons/fa/graduation-cap.d.ts
deleted file mode 100644
index 5c489d1118..0000000000
--- a/types/react-icons/fa/graduation-cap.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGraduationCap extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/group.d.ts b/types/react-icons/fa/group.d.ts
deleted file mode 100644
index 554bfb5fe6..0000000000
--- a/types/react-icons/fa/group.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaGroup extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/h-square.d.ts b/types/react-icons/fa/h-square.d.ts
deleted file mode 100644
index 0269ea9ebf..0000000000
--- a/types/react-icons/fa/h-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hacker-news.d.ts b/types/react-icons/fa/hacker-news.d.ts
deleted file mode 100644
index 70ce441a26..0000000000
--- a/types/react-icons/fa/hacker-news.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHackerNews extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hand-grab-o.d.ts b/types/react-icons/fa/hand-grab-o.d.ts
deleted file mode 100644
index 44d508b041..0000000000
--- a/types/react-icons/fa/hand-grab-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHandGrabO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hand-lizard-o.d.ts b/types/react-icons/fa/hand-lizard-o.d.ts
deleted file mode 100644
index 633375b976..0000000000
--- a/types/react-icons/fa/hand-lizard-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHandLizardO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hand-o-down.d.ts b/types/react-icons/fa/hand-o-down.d.ts
deleted file mode 100644
index d2a8580c81..0000000000
--- a/types/react-icons/fa/hand-o-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHandODown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hand-o-left.d.ts b/types/react-icons/fa/hand-o-left.d.ts
deleted file mode 100644
index ffce9da58b..0000000000
--- a/types/react-icons/fa/hand-o-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHandOLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hand-o-right.d.ts b/types/react-icons/fa/hand-o-right.d.ts
deleted file mode 100644
index 4cc734bfe4..0000000000
--- a/types/react-icons/fa/hand-o-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHandORight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hand-o-up.d.ts b/types/react-icons/fa/hand-o-up.d.ts
deleted file mode 100644
index 4c108e1765..0000000000
--- a/types/react-icons/fa/hand-o-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHandOUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hand-paper-o.d.ts b/types/react-icons/fa/hand-paper-o.d.ts
deleted file mode 100644
index 634685b3ba..0000000000
--- a/types/react-icons/fa/hand-paper-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHandPaperO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hand-peace-o.d.ts b/types/react-icons/fa/hand-peace-o.d.ts
deleted file mode 100644
index f5f4c083e0..0000000000
--- a/types/react-icons/fa/hand-peace-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHandPeaceO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hand-pointer-o.d.ts b/types/react-icons/fa/hand-pointer-o.d.ts
deleted file mode 100644
index 98d03e1641..0000000000
--- a/types/react-icons/fa/hand-pointer-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHandPointerO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hand-scissors-o.d.ts b/types/react-icons/fa/hand-scissors-o.d.ts
deleted file mode 100644
index 8f95ce7463..0000000000
--- a/types/react-icons/fa/hand-scissors-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHandScissorsO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hand-spock-o.d.ts b/types/react-icons/fa/hand-spock-o.d.ts
deleted file mode 100644
index e1ae444a79..0000000000
--- a/types/react-icons/fa/hand-spock-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHandSpockO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hashtag.d.ts b/types/react-icons/fa/hashtag.d.ts
deleted file mode 100644
index c7c9be99a9..0000000000
--- a/types/react-icons/fa/hashtag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHashtag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hdd-o.d.ts b/types/react-icons/fa/hdd-o.d.ts
deleted file mode 100644
index 1a04908493..0000000000
--- a/types/react-icons/fa/hdd-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHddO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/header.d.ts b/types/react-icons/fa/header.d.ts
deleted file mode 100644
index 6f2e5d9137..0000000000
--- a/types/react-icons/fa/header.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHeader extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/headphones.d.ts b/types/react-icons/fa/headphones.d.ts
deleted file mode 100644
index 9e6b4dc42a..0000000000
--- a/types/react-icons/fa/headphones.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHeadphones extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/heart-o.d.ts b/types/react-icons/fa/heart-o.d.ts
deleted file mode 100644
index e965f0636c..0000000000
--- a/types/react-icons/fa/heart-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHeartO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/heart.d.ts b/types/react-icons/fa/heart.d.ts
deleted file mode 100644
index 495c26a5b3..0000000000
--- a/types/react-icons/fa/heart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHeart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/heartbeat.d.ts b/types/react-icons/fa/heartbeat.d.ts
deleted file mode 100644
index 74d47f94b1..0000000000
--- a/types/react-icons/fa/heartbeat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHeartbeat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/history.d.ts b/types/react-icons/fa/history.d.ts
deleted file mode 100644
index 8af7a784c9..0000000000
--- a/types/react-icons/fa/history.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHistory extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/home.d.ts b/types/react-icons/fa/home.d.ts
deleted file mode 100644
index 404898ad6c..0000000000
--- a/types/react-icons/fa/home.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHome extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hospital-o.d.ts b/types/react-icons/fa/hospital-o.d.ts
deleted file mode 100644
index 1016140f7a..0000000000
--- a/types/react-icons/fa/hospital-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHospitalO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hourglass-1.d.ts b/types/react-icons/fa/hourglass-1.d.ts
deleted file mode 100644
index 8ec87f4877..0000000000
--- a/types/react-icons/fa/hourglass-1.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHourglass1 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hourglass-2.d.ts b/types/react-icons/fa/hourglass-2.d.ts
deleted file mode 100644
index 600933c5e6..0000000000
--- a/types/react-icons/fa/hourglass-2.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHourglass2 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hourglass-3.d.ts b/types/react-icons/fa/hourglass-3.d.ts
deleted file mode 100644
index 31e8de7b99..0000000000
--- a/types/react-icons/fa/hourglass-3.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHourglass3 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hourglass-o.d.ts b/types/react-icons/fa/hourglass-o.d.ts
deleted file mode 100644
index 5f2962e102..0000000000
--- a/types/react-icons/fa/hourglass-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHourglassO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/hourglass.d.ts b/types/react-icons/fa/hourglass.d.ts
deleted file mode 100644
index 8bdcd7c8db..0000000000
--- a/types/react-icons/fa/hourglass.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHourglass extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/houzz.d.ts b/types/react-icons/fa/houzz.d.ts
deleted file mode 100644
index ec4c55aecb..0000000000
--- a/types/react-icons/fa/houzz.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHouzz extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/html5.d.ts b/types/react-icons/fa/html5.d.ts
deleted file mode 100644
index 3b8bfcacbe..0000000000
--- a/types/react-icons/fa/html5.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaHtml5 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/i-cursor.d.ts b/types/react-icons/fa/i-cursor.d.ts
deleted file mode 100644
index 77e0964814..0000000000
--- a/types/react-icons/fa/i-cursor.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaICursor extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/ils.d.ts b/types/react-icons/fa/ils.d.ts
deleted file mode 100644
index 966e8bb384..0000000000
--- a/types/react-icons/fa/ils.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaIls extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/image.d.ts b/types/react-icons/fa/image.d.ts
deleted file mode 100644
index 69e435b56a..0000000000
--- a/types/react-icons/fa/image.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaImage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/inbox.d.ts b/types/react-icons/fa/inbox.d.ts
deleted file mode 100644
index 401aba5577..0000000000
--- a/types/react-icons/fa/inbox.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaInbox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/indent.d.ts b/types/react-icons/fa/indent.d.ts
deleted file mode 100644
index c3022d3fc3..0000000000
--- a/types/react-icons/fa/indent.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaIndent extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/index.d.ts b/types/react-icons/fa/index.d.ts
deleted file mode 100644
index 04750fc303..0000000000
--- a/types/react-icons/fa/index.d.ts
+++ /dev/null
@@ -1,628 +0,0 @@
-export { default as Fa500px } from "./500px";
-export { default as FaAdjust } from "./adjust";
-export { default as FaAdn } from "./adn";
-export { default as FaAlignCenter } from "./align-center";
-export { default as FaAlignJustify } from "./align-justify";
-export { default as FaAlignLeft } from "./align-left";
-export { default as FaAlignRight } from "./align-right";
-export { default as FaAmazon } from "./amazon";
-export { default as FaAmbulance } from "./ambulance";
-export { default as FaAmericanSignLanguageInterpreting } from "./american-sign-language-interpreting";
-export { default as FaAnchor } from "./anchor";
-export { default as FaAndroid } from "./android";
-export { default as FaAngellist } from "./angellist";
-export { default as FaAngleDoubleDown } from "./angle-double-down";
-export { default as FaAngleDoubleLeft } from "./angle-double-left";
-export { default as FaAngleDoubleRight } from "./angle-double-right";
-export { default as FaAngleDoubleUp } from "./angle-double-up";
-export { default as FaAngleDown } from "./angle-down";
-export { default as FaAngleLeft } from "./angle-left";
-export { default as FaAngleRight } from "./angle-right";
-export { default as FaAngleUp } from "./angle-up";
-export { default as FaApple } from "./apple";
-export { default as FaArchive } from "./archive";
-export { default as FaAreaChart } from "./area-chart";
-export { default as FaArrowCircleDown } from "./arrow-circle-down";
-export { default as FaArrowCircleLeft } from "./arrow-circle-left";
-export { default as FaArrowCircleODown } from "./arrow-circle-o-down";
-export { default as FaArrowCircleOLeft } from "./arrow-circle-o-left";
-export { default as FaArrowCircleORight } from "./arrow-circle-o-right";
-export { default as FaArrowCircleOUp } from "./arrow-circle-o-up";
-export { default as FaArrowCircleRight } from "./arrow-circle-right";
-export { default as FaArrowCircleUp } from "./arrow-circle-up";
-export { default as FaArrowDown } from "./arrow-down";
-export { default as FaArrowLeft } from "./arrow-left";
-export { default as FaArrowRight } from "./arrow-right";
-export { default as FaArrowUp } from "./arrow-up";
-export { default as FaArrowsAlt } from "./arrows-alt";
-export { default as FaArrowsH } from "./arrows-h";
-export { default as FaArrowsV } from "./arrows-v";
-export { default as FaArrows } from "./arrows";
-export { default as FaAssistiveListeningSystems } from "./assistive-listening-systems";
-export { default as FaAsterisk } from "./asterisk";
-export { default as FaAt } from "./at";
-export { default as FaAudioDescription } from "./audio-description";
-export { default as FaAutomobile } from "./automobile";
-export { default as FaBackward } from "./backward";
-export { default as FaBalanceScale } from "./balance-scale";
-export { default as FaBan } from "./ban";
-export { default as FaBank } from "./bank";
-export { default as FaBarChart } from "./bar-chart";
-export { default as FaBarcode } from "./barcode";
-export { default as FaBars } from "./bars";
-export { default as FaBattery0 } from "./battery-0";
-export { default as FaBattery1 } from "./battery-1";
-export { default as FaBattery2 } from "./battery-2";
-export { default as FaBattery3 } from "./battery-3";
-export { default as FaBattery4 } from "./battery-4";
-export { default as FaBed } from "./bed";
-export { default as FaBeer } from "./beer";
-export { default as FaBehanceSquare } from "./behance-square";
-export { default as FaBehance } from "./behance";
-export { default as FaBellO } from "./bell-o";
-export { default as FaBellSlashO } from "./bell-slash-o";
-export { default as FaBellSlash } from "./bell-slash";
-export { default as FaBell } from "./bell";
-export { default as FaBicycle } from "./bicycle";
-export { default as FaBinoculars } from "./binoculars";
-export { default as FaBirthdayCake } from "./birthday-cake";
-export { default as FaBitbucketSquare } from "./bitbucket-square";
-export { default as FaBitbucket } from "./bitbucket";
-export { default as FaBitcoin } from "./bitcoin";
-export { default as FaBlackTie } from "./black-tie";
-export { default as FaBlind } from "./blind";
-export { default as FaBluetoothB } from "./bluetooth-b";
-export { default as FaBluetooth } from "./bluetooth";
-export { default as FaBold } from "./bold";
-export { default as FaBolt } from "./bolt";
-export { default as FaBomb } from "./bomb";
-export { default as FaBook } from "./book";
-export { default as FaBookmarkO } from "./bookmark-o";
-export { default as FaBookmark } from "./bookmark";
-export { default as FaBraille } from "./braille";
-export { default as FaBriefcase } from "./briefcase";
-export { default as FaBug } from "./bug";
-export { default as FaBuildingO } from "./building-o";
-export { default as FaBuilding } from "./building";
-export { default as FaBullhorn } from "./bullhorn";
-export { default as FaBullseye } from "./bullseye";
-export { default as FaBus } from "./bus";
-export { default as FaBuysellads } from "./buysellads";
-export { default as FaCab } from "./cab";
-export { default as FaCalculator } from "./calculator";
-export { default as FaCalendarCheckO } from "./calendar-check-o";
-export { default as FaCalendarMinusO } from "./calendar-minus-o";
-export { default as FaCalendarO } from "./calendar-o";
-export { default as FaCalendarPlusO } from "./calendar-plus-o";
-export { default as FaCalendarTimesO } from "./calendar-times-o";
-export { default as FaCalendar } from "./calendar";
-export { default as FaCameraRetro } from "./camera-retro";
-export { default as FaCamera } from "./camera";
-export { default as FaCaretDown } from "./caret-down";
-export { default as FaCaretLeft } from "./caret-left";
-export { default as FaCaretRight } from "./caret-right";
-export { default as FaCaretSquareODown } from "./caret-square-o-down";
-export { default as FaCaretSquareOLeft } from "./caret-square-o-left";
-export { default as FaCaretSquareORight } from "./caret-square-o-right";
-export { default as FaCaretSquareOUp } from "./caret-square-o-up";
-export { default as FaCaretUp } from "./caret-up";
-export { default as FaCartArrowDown } from "./cart-arrow-down";
-export { default as FaCartPlus } from "./cart-plus";
-export { default as FaCcAmex } from "./cc-amex";
-export { default as FaCcDinersClub } from "./cc-diners-club";
-export { default as FaCcDiscover } from "./cc-discover";
-export { default as FaCcJcb } from "./cc-jcb";
-export { default as FaCcMastercard } from "./cc-mastercard";
-export { default as FaCcPaypal } from "./cc-paypal";
-export { default as FaCcStripe } from "./cc-stripe";
-export { default as FaCcVisa } from "./cc-visa";
-export { default as FaCc } from "./cc";
-export { default as FaCertificate } from "./certificate";
-export { default as FaChainBroken } from "./chain-broken";
-export { default as FaChain } from "./chain";
-export { default as FaCheckCircleO } from "./check-circle-o";
-export { default as FaCheckCircle } from "./check-circle";
-export { default as FaCheckSquareO } from "./check-square-o";
-export { default as FaCheckSquare } from "./check-square";
-export { default as FaCheck } from "./check";
-export { default as FaChevronCircleDown } from "./chevron-circle-down";
-export { default as FaChevronCircleLeft } from "./chevron-circle-left";
-export { default as FaChevronCircleRight } from "./chevron-circle-right";
-export { default as FaChevronCircleUp } from "./chevron-circle-up";
-export { default as FaChevronDown } from "./chevron-down";
-export { default as FaChevronLeft } from "./chevron-left";
-export { default as FaChevronRight } from "./chevron-right";
-export { default as FaChevronUp } from "./chevron-up";
-export { default as FaChild } from "./child";
-export { default as FaChrome } from "./chrome";
-export { default as FaCircleONotch } from "./circle-o-notch";
-export { default as FaCircleO } from "./circle-o";
-export { default as FaCircleThin } from "./circle-thin";
-export { default as FaCircle } from "./circle";
-export { default as FaClipboard } from "./clipboard";
-export { default as FaClockO } from "./clock-o";
-export { default as FaClone } from "./clone";
-export { default as FaClose } from "./close";
-export { default as FaCloudDownload } from "./cloud-download";
-export { default as FaCloudUpload } from "./cloud-upload";
-export { default as FaCloud } from "./cloud";
-export { default as FaCny } from "./cny";
-export { default as FaCodeFork } from "./code-fork";
-export { default as FaCode } from "./code";
-export { default as FaCodepen } from "./codepen";
-export { default as FaCodiepie } from "./codiepie";
-export { default as FaCoffee } from "./coffee";
-export { default as FaCog } from "./cog";
-export { default as FaCogs } from "./cogs";
-export { default as FaColumns } from "./columns";
-export { default as FaCommentO } from "./comment-o";
-export { default as FaComment } from "./comment";
-export { default as FaCommentingO } from "./commenting-o";
-export { default as FaCommenting } from "./commenting";
-export { default as FaCommentsO } from "./comments-o";
-export { default as FaComments } from "./comments";
-export { default as FaCompass } from "./compass";
-export { default as FaCompress } from "./compress";
-export { default as FaConnectdevelop } from "./connectdevelop";
-export { default as FaContao } from "./contao";
-export { default as FaCopy } from "./copy";
-export { default as FaCopyright } from "./copyright";
-export { default as FaCreativeCommons } from "./creative-commons";
-export { default as FaCreditCardAlt } from "./credit-card-alt";
-export { default as FaCreditCard } from "./credit-card";
-export { default as FaCrop } from "./crop";
-export { default as FaCrosshairs } from "./crosshairs";
-export { default as FaCss3 } from "./css3";
-export { default as FaCube } from "./cube";
-export { default as FaCubes } from "./cubes";
-export { default as FaCut } from "./cut";
-export { default as FaCutlery } from "./cutlery";
-export { default as FaDashboard } from "./dashboard";
-export { default as FaDashcube } from "./dashcube";
-export { default as FaDatabase } from "./database";
-export { default as FaDeaf } from "./deaf";
-export { default as FaDedent } from "./dedent";
-export { default as FaDelicious } from "./delicious";
-export { default as FaDesktop } from "./desktop";
-export { default as FaDeviantart } from "./deviantart";
-export { default as FaDiamond } from "./diamond";
-export { default as FaDigg } from "./digg";
-export { default as FaDollar } from "./dollar";
-export { default as FaDotCircleO } from "./dot-circle-o";
-export { default as FaDownload } from "./download";
-export { default as FaDribbble } from "./dribbble";
-export { default as FaDropbox } from "./dropbox";
-export { default as FaDrupal } from "./drupal";
-export { default as FaEdge } from "./edge";
-export { default as FaEdit } from "./edit";
-export { default as FaEject } from "./eject";
-export { default as FaEllipsisH } from "./ellipsis-h";
-export { default as FaEllipsisV } from "./ellipsis-v";
-export { default as FaEmpire } from "./empire";
-export { default as FaEnvelopeO } from "./envelope-o";
-export { default as FaEnvelopeSquare } from "./envelope-square";
-export { default as FaEnvelope } from "./envelope";
-export { default as FaEnvira } from "./envira";
-export { default as FaEraser } from "./eraser";
-export { default as FaEur } from "./eur";
-export { default as FaExchange } from "./exchange";
-export { default as FaExclamationCircle } from "./exclamation-circle";
-export { default as FaExclamationTriangle } from "./exclamation-triangle";
-export { default as FaExclamation } from "./exclamation";
-export { default as FaExpand } from "./expand";
-export { default as FaExpeditedssl } from "./expeditedssl";
-export { default as FaExternalLinkSquare } from "./external-link-square";
-export { default as FaExternalLink } from "./external-link";
-export { default as FaEyeSlash } from "./eye-slash";
-export { default as FaEye } from "./eye";
-export { default as FaEyedropper } from "./eyedropper";
-export { default as FaFacebookOfficial } from "./facebook-official";
-export { default as FaFacebookSquare } from "./facebook-square";
-export { default as FaFacebook } from "./facebook";
-export { default as FaFastBackward } from "./fast-backward";
-export { default as FaFastForward } from "./fast-forward";
-export { default as FaFax } from "./fax";
-export { default as FaFeed } from "./feed";
-export { default as FaFemale } from "./female";
-export { default as FaFighterJet } from "./fighter-jet";
-export { default as FaFileArchiveO } from "./file-archive-o";
-export { default as FaFileAudioO } from "./file-audio-o";
-export { default as FaFileCodeO } from "./file-code-o";
-export { default as FaFileExcelO } from "./file-excel-o";
-export { default as FaFileImageO } from "./file-image-o";
-export { default as FaFileMovieO } from "./file-movie-o";
-export { default as FaFileO } from "./file-o";
-export { default as FaFilePdfO } from "./file-pdf-o";
-export { default as FaFilePowerpointO } from "./file-powerpoint-o";
-export { default as FaFileTextO } from "./file-text-o";
-export { default as FaFileText } from "./file-text";
-export { default as FaFileWordO } from "./file-word-o";
-export { default as FaFile } from "./file";
-export { default as FaFilm } from "./film";
-export { default as FaFilter } from "./filter";
-export { default as FaFireExtinguisher } from "./fire-extinguisher";
-export { default as FaFire } from "./fire";
-export { default as FaFirefox } from "./firefox";
-export { default as FaFlagCheckered } from "./flag-checkered";
-export { default as FaFlagO } from "./flag-o";
-export { default as FaFlag } from "./flag";
-export { default as FaFlask } from "./flask";
-export { default as FaFlickr } from "./flickr";
-export { default as FaFloppyO } from "./floppy-o";
-export { default as FaFolderO } from "./folder-o";
-export { default as FaFolderOpenO } from "./folder-open-o";
-export { default as FaFolderOpen } from "./folder-open";
-export { default as FaFolder } from "./folder";
-export { default as FaFont } from "./font";
-export { default as FaFonticons } from "./fonticons";
-export { default as FaFortAwesome } from "./fort-awesome";
-export { default as FaForumbee } from "./forumbee";
-export { default as FaForward } from "./forward";
-export { default as FaFoursquare } from "./foursquare";
-export { default as FaFrownO } from "./frown-o";
-export { default as FaFutbolO } from "./futbol-o";
-export { default as FaGamepad } from "./gamepad";
-export { default as FaGavel } from "./gavel";
-export { default as FaGbp } from "./gbp";
-export { default as FaGenderless } from "./genderless";
-export { default as FaGetPocket } from "./get-pocket";
-export { default as FaGgCircle } from "./gg-circle";
-export { default as FaGg } from "./gg";
-export { default as FaGift } from "./gift";
-export { default as FaGitSquare } from "./git-square";
-export { default as FaGit } from "./git";
-export { default as FaGithubAlt } from "./github-alt";
-export { default as FaGithubSquare } from "./github-square";
-export { default as FaGithub } from "./github";
-export { default as FaGitlab } from "./gitlab";
-export { default as FaGittip } from "./gittip";
-export { default as FaGlass } from "./glass";
-export { default as FaGlideG } from "./glide-g";
-export { default as FaGlide } from "./glide";
-export { default as FaGlobe } from "./globe";
-export { default as FaGooglePlusSquare } from "./google-plus-square";
-export { default as FaGooglePlus } from "./google-plus";
-export { default as FaGoogleWallet } from "./google-wallet";
-export { default as FaGoogle } from "./google";
-export { default as FaGraduationCap } from "./graduation-cap";
-export { default as FaGroup } from "./group";
-export { default as FaHSquare } from "./h-square";
-export { default as FaHackerNews } from "./hacker-news";
-export { default as FaHandGrabO } from "./hand-grab-o";
-export { default as FaHandLizardO } from "./hand-lizard-o";
-export { default as FaHandODown } from "./hand-o-down";
-export { default as FaHandOLeft } from "./hand-o-left";
-export { default as FaHandORight } from "./hand-o-right";
-export { default as FaHandOUp } from "./hand-o-up";
-export { default as FaHandPaperO } from "./hand-paper-o";
-export { default as FaHandPeaceO } from "./hand-peace-o";
-export { default as FaHandPointerO } from "./hand-pointer-o";
-export { default as FaHandScissorsO } from "./hand-scissors-o";
-export { default as FaHandSpockO } from "./hand-spock-o";
-export { default as FaHashtag } from "./hashtag";
-export { default as FaHddO } from "./hdd-o";
-export { default as FaHeader } from "./header";
-export { default as FaHeadphones } from "./headphones";
-export { default as FaHeartO } from "./heart-o";
-export { default as FaHeart } from "./heart";
-export { default as FaHeartbeat } from "./heartbeat";
-export { default as FaHistory } from "./history";
-export { default as FaHome } from "./home";
-export { default as FaHospitalO } from "./hospital-o";
-export { default as FaHourglass1 } from "./hourglass-1";
-export { default as FaHourglass2 } from "./hourglass-2";
-export { default as FaHourglass3 } from "./hourglass-3";
-export { default as FaHourglassO } from "./hourglass-o";
-export { default as FaHourglass } from "./hourglass";
-export { default as FaHouzz } from "./houzz";
-export { default as FaHtml5 } from "./html5";
-export { default as FaICursor } from "./i-cursor";
-export { default as FaIls } from "./ils";
-export { default as FaImage } from "./image";
-export { default as FaInbox } from "./inbox";
-export { default as FaIndent } from "./indent";
-export { default as FaIndustry } from "./industry";
-export { default as FaInfoCircle } from "./info-circle";
-export { default as FaInfo } from "./info";
-export { default as FaInr } from "./inr";
-export { default as FaInstagram } from "./instagram";
-export { default as FaInternetExplorer } from "./internet-explorer";
-export { default as FaIntersex } from "./intersex";
-export { default as FaIoxhost } from "./ioxhost";
-export { default as FaItalic } from "./italic";
-export { default as FaJoomla } from "./joomla";
-export { default as FaJsfiddle } from "./jsfiddle";
-export { default as FaKey } from "./key";
-export { default as FaKeyboardO } from "./keyboard-o";
-export { default as FaKrw } from "./krw";
-export { default as FaLanguage } from "./language";
-export { default as FaLaptop } from "./laptop";
-export { default as FaLastfmSquare } from "./lastfm-square";
-export { default as FaLastfm } from "./lastfm";
-export { default as FaLeaf } from "./leaf";
-export { default as FaLeanpub } from "./leanpub";
-export { default as FaLemonO } from "./lemon-o";
-export { default as FaLevelDown } from "./level-down";
-export { default as FaLevelUp } from "./level-up";
-export { default as FaLifeBouy } from "./life-bouy";
-export { default as FaLightbulbO } from "./lightbulb-o";
-export { default as FaLineChart } from "./line-chart";
-export { default as FaLinkedinSquare } from "./linkedin-square";
-export { default as FaLinkedin } from "./linkedin";
-export { default as FaLinux } from "./linux";
-export { default as FaListAlt } from "./list-alt";
-export { default as FaListOl } from "./list-ol";
-export { default as FaListUl } from "./list-ul";
-export { default as FaList } from "./list";
-export { default as FaLocationArrow } from "./location-arrow";
-export { default as FaLock } from "./lock";
-export { default as FaLongArrowDown } from "./long-arrow-down";
-export { default as FaLongArrowLeft } from "./long-arrow-left";
-export { default as FaLongArrowRight } from "./long-arrow-right";
-export { default as FaLongArrowUp } from "./long-arrow-up";
-export { default as FaLowVision } from "./low-vision";
-export { default as FaMagic } from "./magic";
-export { default as FaMagnet } from "./magnet";
-export { default as FaMailForward } from "./mail-forward";
-export { default as FaMailReplyAll } from "./mail-reply-all";
-export { default as FaMailReply } from "./mail-reply";
-export { default as FaMale } from "./male";
-export { default as FaMapMarker } from "./map-marker";
-export { default as FaMapO } from "./map-o";
-export { default as FaMapPin } from "./map-pin";
-export { default as FaMapSigns } from "./map-signs";
-export { default as FaMap } from "./map";
-export { default as FaMarsDouble } from "./mars-double";
-export { default as FaMarsStrokeH } from "./mars-stroke-h";
-export { default as FaMarsStrokeV } from "./mars-stroke-v";
-export { default as FaMarsStroke } from "./mars-stroke";
-export { default as FaMars } from "./mars";
-export { default as FaMaxcdn } from "./maxcdn";
-export { default as FaMeanpath } from "./meanpath";
-export { default as FaMedium } from "./medium";
-export { default as FaMedkit } from "./medkit";
-export { default as FaMehO } from "./meh-o";
-export { default as FaMercury } from "./mercury";
-export { default as FaMicrophoneSlash } from "./microphone-slash";
-export { default as FaMicrophone } from "./microphone";
-export { default as FaMinusCircle } from "./minus-circle";
-export { default as FaMinusSquareO } from "./minus-square-o";
-export { default as FaMinusSquare } from "./minus-square";
-export { default as FaMinus } from "./minus";
-export { default as FaMixcloud } from "./mixcloud";
-export { default as FaMobile } from "./mobile";
-export { default as FaModx } from "./modx";
-export { default as FaMoney } from "./money";
-export { default as FaMoonO } from "./moon-o";
-export { default as FaMotorcycle } from "./motorcycle";
-export { default as FaMousePointer } from "./mouse-pointer";
-export { default as FaMusic } from "./music";
-export { default as FaNeuter } from "./neuter";
-export { default as FaNewspaperO } from "./newspaper-o";
-export { default as FaObjectGroup } from "./object-group";
-export { default as FaObjectUngroup } from "./object-ungroup";
-export { default as FaOdnoklassnikiSquare } from "./odnoklassniki-square";
-export { default as FaOdnoklassniki } from "./odnoklassniki";
-export { default as FaOpencart } from "./opencart";
-export { default as FaOpenid } from "./openid";
-export { default as FaOpera } from "./opera";
-export { default as FaOptinMonster } from "./optin-monster";
-export { default as FaPagelines } from "./pagelines";
-export { default as FaPaintBrush } from "./paint-brush";
-export { default as FaPaperPlaneO } from "./paper-plane-o";
-export { default as FaPaperPlane } from "./paper-plane";
-export { default as FaPaperclip } from "./paperclip";
-export { default as FaParagraph } from "./paragraph";
-export { default as FaPauseCircleO } from "./pause-circle-o";
-export { default as FaPauseCircle } from "./pause-circle";
-export { default as FaPause } from "./pause";
-export { default as FaPaw } from "./paw";
-export { default as FaPaypal } from "./paypal";
-export { default as FaPencilSquare } from "./pencil-square";
-export { default as FaPencil } from "./pencil";
-export { default as FaPercent } from "./percent";
-export { default as FaPhoneSquare } from "./phone-square";
-export { default as FaPhone } from "./phone";
-export { default as FaPieChart } from "./pie-chart";
-export { default as FaPiedPiperAlt } from "./pied-piper-alt";
-export { default as FaPiedPiper } from "./pied-piper";
-export { default as FaPinterestP } from "./pinterest-p";
-export { default as FaPinterestSquare } from "./pinterest-square";
-export { default as FaPinterest } from "./pinterest";
-export { default as FaPlane } from "./plane";
-export { default as FaPlayCircleO } from "./play-circle-o";
-export { default as FaPlayCircle } from "./play-circle";
-export { default as FaPlay } from "./play";
-export { default as FaPlug } from "./plug";
-export { default as FaPlusCircle } from "./plus-circle";
-export { default as FaPlusSquareO } from "./plus-square-o";
-export { default as FaPlusSquare } from "./plus-square";
-export { default as FaPlus } from "./plus";
-export { default as FaPowerOff } from "./power-off";
-export { default as FaPrint } from "./print";
-export { default as FaProductHunt } from "./product-hunt";
-export { default as FaPuzzlePiece } from "./puzzle-piece";
-export { default as FaQq } from "./qq";
-export { default as FaQrcode } from "./qrcode";
-export { default as FaQuestionCircleO } from "./question-circle-o";
-export { default as FaQuestionCircle } from "./question-circle";
-export { default as FaQuestion } from "./question";
-export { default as FaQuoteLeft } from "./quote-left";
-export { default as FaQuoteRight } from "./quote-right";
-export { default as FaRa } from "./ra";
-export { default as FaRandom } from "./random";
-export { default as FaRecycle } from "./recycle";
-export { default as FaRedditAlien } from "./reddit-alien";
-export { default as FaRedditSquare } from "./reddit-square";
-export { default as FaReddit } from "./reddit";
-export { default as FaRefresh } from "./refresh";
-export { default as FaRegistered } from "./registered";
-export { default as FaRenren } from "./renren";
-export { default as FaRepeat } from "./repeat";
-export { default as FaRetweet } from "./retweet";
-export { default as FaRoad } from "./road";
-export { default as FaRocket } from "./rocket";
-export { default as FaRotateLeft } from "./rotate-left";
-export { default as FaRouble } from "./rouble";
-export { default as FaRssSquare } from "./rss-square";
-export { default as FaSafari } from "./safari";
-export { default as FaScribd } from "./scribd";
-export { default as FaSearchMinus } from "./search-minus";
-export { default as FaSearchPlus } from "./search-plus";
-export { default as FaSearch } from "./search";
-export { default as FaSellsy } from "./sellsy";
-export { default as FaServer } from "./server";
-export { default as FaShareAltSquare } from "./share-alt-square";
-export { default as FaShareAlt } from "./share-alt";
-export { default as FaShareSquareO } from "./share-square-o";
-export { default as FaShareSquare } from "./share-square";
-export { default as FaShield } from "./shield";
-export { default as FaShip } from "./ship";
-export { default as FaShirtsinbulk } from "./shirtsinbulk";
-export { default as FaShoppingBag } from "./shopping-bag";
-export { default as FaShoppingBasket } from "./shopping-basket";
-export { default as FaShoppingCart } from "./shopping-cart";
-export { default as FaSignIn } from "./sign-in";
-export { default as FaSignLanguage } from "./sign-language";
-export { default as FaSignOut } from "./sign-out";
-export { default as FaSignal } from "./signal";
-export { default as FaSimplybuilt } from "./simplybuilt";
-export { default as FaSitemap } from "./sitemap";
-export { default as FaSkyatlas } from "./skyatlas";
-export { default as FaSkype } from "./skype";
-export { default as FaSlack } from "./slack";
-export { default as FaSliders } from "./sliders";
-export { default as FaSlideshare } from "./slideshare";
-export { default as FaSmileO } from "./smile-o";
-export { default as FaSnapchatGhost } from "./snapchat-ghost";
-export { default as FaSnapchatSquare } from "./snapchat-square";
-export { default as FaSnapchat } from "./snapchat";
-export { default as FaSortAlphaAsc } from "./sort-alpha-asc";
-export { default as FaSortAlphaDesc } from "./sort-alpha-desc";
-export { default as FaSortAmountAsc } from "./sort-amount-asc";
-export { default as FaSortAmountDesc } from "./sort-amount-desc";
-export { default as FaSortAsc } from "./sort-asc";
-export { default as FaSortDesc } from "./sort-desc";
-export { default as FaSortNumericAsc } from "./sort-numeric-asc";
-export { default as FaSortNumericDesc } from "./sort-numeric-desc";
-export { default as FaSort } from "./sort";
-export { default as FaSoundcloud } from "./soundcloud";
-export { default as FaSpaceShuttle } from "./space-shuttle";
-export { default as FaSpinner } from "./spinner";
-export { default as FaSpoon } from "./spoon";
-export { default as FaSpotify } from "./spotify";
-export { default as FaSquareO } from "./square-o";
-export { default as FaSquare } from "./square";
-export { default as FaStackExchange } from "./stack-exchange";
-export { default as FaStackOverflow } from "./stack-overflow";
-export { default as FaStarHalfEmpty } from "./star-half-empty";
-export { default as FaStarHalf } from "./star-half";
-export { default as FaStarO } from "./star-o";
-export { default as FaStar } from "./star";
-export { default as FaSteamSquare } from "./steam-square";
-export { default as FaSteam } from "./steam";
-export { default as FaStepBackward } from "./step-backward";
-export { default as FaStepForward } from "./step-forward";
-export { default as FaStethoscope } from "./stethoscope";
-export { default as FaStickyNoteO } from "./sticky-note-o";
-export { default as FaStickyNote } from "./sticky-note";
-export { default as FaStopCircleO } from "./stop-circle-o";
-export { default as FaStopCircle } from "./stop-circle";
-export { default as FaStop } from "./stop";
-export { default as FaStreetView } from "./street-view";
-export { default as FaStrikethrough } from "./strikethrough";
-export { default as FaStumbleuponCircle } from "./stumbleupon-circle";
-export { default as FaStumbleupon } from "./stumbleupon";
-export { default as FaSubscript } from "./subscript";
-export { default as FaSubway } from "./subway";
-export { default as FaSuitcase } from "./suitcase";
-export { default as FaSunO } from "./sun-o";
-export { default as FaSuperscript } from "./superscript";
-export { default as FaTable } from "./table";
-export { default as FaTablet } from "./tablet";
-export { default as FaTag } from "./tag";
-export { default as FaTags } from "./tags";
-export { default as FaTasks } from "./tasks";
-export { default as FaTelevision } from "./television";
-export { default as FaTencentWeibo } from "./tencent-weibo";
-export { default as FaTerminal } from "./terminal";
-export { default as FaTextHeight } from "./text-height";
-export { default as FaTextWidth } from "./text-width";
-export { default as FaThLarge } from "./th-large";
-export { default as FaThList } from "./th-list";
-export { default as FaTh } from "./th";
-export { default as FaThumbTack } from "./thumb-tack";
-export { default as FaThumbsDown } from "./thumbs-down";
-export { default as FaThumbsODown } from "./thumbs-o-down";
-export { default as FaThumbsOUp } from "./thumbs-o-up";
-export { default as FaThumbsUp } from "./thumbs-up";
-export { default as FaTicket } from "./ticket";
-export { default as FaTimesCircleO } from "./times-circle-o";
-export { default as FaTimesCircle } from "./times-circle";
-export { default as FaTint } from "./tint";
-export { default as FaToggleOff } from "./toggle-off";
-export { default as FaToggleOn } from "./toggle-on";
-export { default as FaTrademark } from "./trademark";
-export { default as FaTrain } from "./train";
-export { default as FaTransgenderAlt } from "./transgender-alt";
-export { default as FaTrashO } from "./trash-o";
-export { default as FaTrash } from "./trash";
-export { default as FaTree } from "./tree";
-export { default as FaTrello } from "./trello";
-export { default as FaTripadvisor } from "./tripadvisor";
-export { default as FaTrophy } from "./trophy";
-export { default as FaTruck } from "./truck";
-export { default as FaTry } from "./try";
-export { default as FaTty } from "./tty";
-export { default as FaTumblrSquare } from "./tumblr-square";
-export { default as FaTumblr } from "./tumblr";
-export { default as FaTwitch } from "./twitch";
-export { default as FaTwitterSquare } from "./twitter-square";
-export { default as FaTwitter } from "./twitter";
-export { default as FaUmbrella } from "./umbrella";
-export { default as FaUnderline } from "./underline";
-export { default as FaUniversalAccess } from "./universal-access";
-export { default as FaUnlockAlt } from "./unlock-alt";
-export { default as FaUnlock } from "./unlock";
-export { default as FaUpload } from "./upload";
-export { default as FaUsb } from "./usb";
-export { default as FaUserMd } from "./user-md";
-export { default as FaUserPlus } from "./user-plus";
-export { default as FaUserSecret } from "./user-secret";
-export { default as FaUserTimes } from "./user-times";
-export { default as FaUser } from "./user";
-export { default as FaVenusDouble } from "./venus-double";
-export { default as FaVenusMars } from "./venus-mars";
-export { default as FaVenus } from "./venus";
-export { default as FaViacoin } from "./viacoin";
-export { default as FaViadeoSquare } from "./viadeo-square";
-export { default as FaViadeo } from "./viadeo";
-export { default as FaVideoCamera } from "./video-camera";
-export { default as FaVimeoSquare } from "./vimeo-square";
-export { default as FaVimeo } from "./vimeo";
-export { default as FaVine } from "./vine";
-export { default as FaVk } from "./vk";
-export { default as FaVolumeControlPhone } from "./volume-control-phone";
-export { default as FaVolumeDown } from "./volume-down";
-export { default as FaVolumeOff } from "./volume-off";
-export { default as FaVolumeUp } from "./volume-up";
-export { default as FaWechat } from "./wechat";
-export { default as FaWeibo } from "./weibo";
-export { default as FaWhatsapp } from "./whatsapp";
-export { default as FaWheelchairAlt } from "./wheelchair-alt";
-export { default as FaWheelchair } from "./wheelchair";
-export { default as FaWifi } from "./wifi";
-export { default as FaWikipediaW } from "./wikipedia-w";
-export { default as FaWindows } from "./windows";
-export { default as FaWordpress } from "./wordpress";
-export { default as FaWpbeginner } from "./wpbeginner";
-export { default as FaWpforms } from "./wpforms";
-export { default as FaWrench } from "./wrench";
-export { default as FaXingSquare } from "./xing-square";
-export { default as FaXing } from "./xing";
-export { default as FaYCombinator } from "./y-combinator";
-export { default as FaYahoo } from "./yahoo";
-export { default as FaYelp } from "./yelp";
-export { default as FaYoutubePlay } from "./youtube-play";
-export { default as FaYoutubeSquare } from "./youtube-square";
-export { default as FaYoutube } from "./youtube";
diff --git a/types/react-icons/fa/industry.d.ts b/types/react-icons/fa/industry.d.ts
deleted file mode 100644
index 70d7057743..0000000000
--- a/types/react-icons/fa/industry.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaIndustry extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/info-circle.d.ts b/types/react-icons/fa/info-circle.d.ts
deleted file mode 100644
index 7ed29e6eec..0000000000
--- a/types/react-icons/fa/info-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaInfoCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/info.d.ts b/types/react-icons/fa/info.d.ts
deleted file mode 100644
index c67b3190a9..0000000000
--- a/types/react-icons/fa/info.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaInfo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/inr.d.ts b/types/react-icons/fa/inr.d.ts
deleted file mode 100644
index b47cb31531..0000000000
--- a/types/react-icons/fa/inr.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaInr extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/instagram.d.ts b/types/react-icons/fa/instagram.d.ts
deleted file mode 100644
index 7770e19043..0000000000
--- a/types/react-icons/fa/instagram.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaInstagram extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/internet-explorer.d.ts b/types/react-icons/fa/internet-explorer.d.ts
deleted file mode 100644
index 924654fee2..0000000000
--- a/types/react-icons/fa/internet-explorer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaInternetExplorer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/intersex.d.ts b/types/react-icons/fa/intersex.d.ts
deleted file mode 100644
index 77580bbb2d..0000000000
--- a/types/react-icons/fa/intersex.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaIntersex extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/ioxhost.d.ts b/types/react-icons/fa/ioxhost.d.ts
deleted file mode 100644
index b713d2c54a..0000000000
--- a/types/react-icons/fa/ioxhost.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaIoxhost extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/italic.d.ts b/types/react-icons/fa/italic.d.ts
deleted file mode 100644
index 57572f5dbc..0000000000
--- a/types/react-icons/fa/italic.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaItalic extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/joomla.d.ts b/types/react-icons/fa/joomla.d.ts
deleted file mode 100644
index cdf3539275..0000000000
--- a/types/react-icons/fa/joomla.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaJoomla extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/jsfiddle.d.ts b/types/react-icons/fa/jsfiddle.d.ts
deleted file mode 100644
index e17414bd20..0000000000
--- a/types/react-icons/fa/jsfiddle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaJsfiddle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/key.d.ts b/types/react-icons/fa/key.d.ts
deleted file mode 100644
index b1fc11d702..0000000000
--- a/types/react-icons/fa/key.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaKey extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/keyboard-o.d.ts b/types/react-icons/fa/keyboard-o.d.ts
deleted file mode 100644
index d8676809fd..0000000000
--- a/types/react-icons/fa/keyboard-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaKeyboardO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/krw.d.ts b/types/react-icons/fa/krw.d.ts
deleted file mode 100644
index a23710bcfd..0000000000
--- a/types/react-icons/fa/krw.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaKrw extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/language.d.ts b/types/react-icons/fa/language.d.ts
deleted file mode 100644
index a04950506c..0000000000
--- a/types/react-icons/fa/language.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLanguage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/laptop.d.ts b/types/react-icons/fa/laptop.d.ts
deleted file mode 100644
index d13d583fb7..0000000000
--- a/types/react-icons/fa/laptop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLaptop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/lastfm-square.d.ts b/types/react-icons/fa/lastfm-square.d.ts
deleted file mode 100644
index 057f801895..0000000000
--- a/types/react-icons/fa/lastfm-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLastfmSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/lastfm.d.ts b/types/react-icons/fa/lastfm.d.ts
deleted file mode 100644
index c8124c95ce..0000000000
--- a/types/react-icons/fa/lastfm.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLastfm extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/leaf.d.ts b/types/react-icons/fa/leaf.d.ts
deleted file mode 100644
index 9c4514a54f..0000000000
--- a/types/react-icons/fa/leaf.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLeaf extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/leanpub.d.ts b/types/react-icons/fa/leanpub.d.ts
deleted file mode 100644
index de2024c7a8..0000000000
--- a/types/react-icons/fa/leanpub.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLeanpub extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/lemon-o.d.ts b/types/react-icons/fa/lemon-o.d.ts
deleted file mode 100644
index 74886cb79c..0000000000
--- a/types/react-icons/fa/lemon-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLemonO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/level-down.d.ts b/types/react-icons/fa/level-down.d.ts
deleted file mode 100644
index caba9cef44..0000000000
--- a/types/react-icons/fa/level-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLevelDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/level-up.d.ts b/types/react-icons/fa/level-up.d.ts
deleted file mode 100644
index 977a2d2c97..0000000000
--- a/types/react-icons/fa/level-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLevelUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/life-bouy.d.ts b/types/react-icons/fa/life-bouy.d.ts
deleted file mode 100644
index 85205b3e62..0000000000
--- a/types/react-icons/fa/life-bouy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLifeBouy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/lightbulb-o.d.ts b/types/react-icons/fa/lightbulb-o.d.ts
deleted file mode 100644
index 48646e6261..0000000000
--- a/types/react-icons/fa/lightbulb-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLightbulbO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/line-chart.d.ts b/types/react-icons/fa/line-chart.d.ts
deleted file mode 100644
index f0109467e2..0000000000
--- a/types/react-icons/fa/line-chart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLineChart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/linkedin-square.d.ts b/types/react-icons/fa/linkedin-square.d.ts
deleted file mode 100644
index 2c538f5349..0000000000
--- a/types/react-icons/fa/linkedin-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLinkedinSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/linkedin.d.ts b/types/react-icons/fa/linkedin.d.ts
deleted file mode 100644
index 7e011b8f8f..0000000000
--- a/types/react-icons/fa/linkedin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLinkedin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/linux.d.ts b/types/react-icons/fa/linux.d.ts
deleted file mode 100644
index 55eb44cddb..0000000000
--- a/types/react-icons/fa/linux.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLinux extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/list-alt.d.ts b/types/react-icons/fa/list-alt.d.ts
deleted file mode 100644
index 4987907f75..0000000000
--- a/types/react-icons/fa/list-alt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaListAlt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/list-ol.d.ts b/types/react-icons/fa/list-ol.d.ts
deleted file mode 100644
index 25c4509dd8..0000000000
--- a/types/react-icons/fa/list-ol.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaListOl extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/list-ul.d.ts b/types/react-icons/fa/list-ul.d.ts
deleted file mode 100644
index be0d49470c..0000000000
--- a/types/react-icons/fa/list-ul.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaListUl extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/list.d.ts b/types/react-icons/fa/list.d.ts
deleted file mode 100644
index 9b98e5d332..0000000000
--- a/types/react-icons/fa/list.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaList extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/location-arrow.d.ts b/types/react-icons/fa/location-arrow.d.ts
deleted file mode 100644
index 67e69c5917..0000000000
--- a/types/react-icons/fa/location-arrow.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLocationArrow extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/lock.d.ts b/types/react-icons/fa/lock.d.ts
deleted file mode 100644
index 751ba49fd6..0000000000
--- a/types/react-icons/fa/lock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/long-arrow-down.d.ts b/types/react-icons/fa/long-arrow-down.d.ts
deleted file mode 100644
index 81282ef698..0000000000
--- a/types/react-icons/fa/long-arrow-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLongArrowDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/long-arrow-left.d.ts b/types/react-icons/fa/long-arrow-left.d.ts
deleted file mode 100644
index 673d2e6a36..0000000000
--- a/types/react-icons/fa/long-arrow-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLongArrowLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/long-arrow-right.d.ts b/types/react-icons/fa/long-arrow-right.d.ts
deleted file mode 100644
index 1fafea7de3..0000000000
--- a/types/react-icons/fa/long-arrow-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLongArrowRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/long-arrow-up.d.ts b/types/react-icons/fa/long-arrow-up.d.ts
deleted file mode 100644
index 6982118eef..0000000000
--- a/types/react-icons/fa/long-arrow-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLongArrowUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/low-vision.d.ts b/types/react-icons/fa/low-vision.d.ts
deleted file mode 100644
index 60f19827fa..0000000000
--- a/types/react-icons/fa/low-vision.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaLowVision extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/magic.d.ts b/types/react-icons/fa/magic.d.ts
deleted file mode 100644
index 7dca91beb2..0000000000
--- a/types/react-icons/fa/magic.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMagic extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/magnet.d.ts b/types/react-icons/fa/magnet.d.ts
deleted file mode 100644
index 11cc56ef42..0000000000
--- a/types/react-icons/fa/magnet.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMagnet extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/mail-forward.d.ts b/types/react-icons/fa/mail-forward.d.ts
deleted file mode 100644
index 84585713b8..0000000000
--- a/types/react-icons/fa/mail-forward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMailForward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/mail-reply-all.d.ts b/types/react-icons/fa/mail-reply-all.d.ts
deleted file mode 100644
index 7c8c4ed7eb..0000000000
--- a/types/react-icons/fa/mail-reply-all.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMailReplyAll extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/mail-reply.d.ts b/types/react-icons/fa/mail-reply.d.ts
deleted file mode 100644
index 571aa76b4f..0000000000
--- a/types/react-icons/fa/mail-reply.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMailReply extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/male.d.ts b/types/react-icons/fa/male.d.ts
deleted file mode 100644
index 9bb9f216af..0000000000
--- a/types/react-icons/fa/male.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMale extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/map-marker.d.ts b/types/react-icons/fa/map-marker.d.ts
deleted file mode 100644
index 116680b4b7..0000000000
--- a/types/react-icons/fa/map-marker.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMapMarker extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/map-o.d.ts b/types/react-icons/fa/map-o.d.ts
deleted file mode 100644
index 366c05d45b..0000000000
--- a/types/react-icons/fa/map-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMapO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/map-pin.d.ts b/types/react-icons/fa/map-pin.d.ts
deleted file mode 100644
index e46a8ca0e3..0000000000
--- a/types/react-icons/fa/map-pin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMapPin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/map-signs.d.ts b/types/react-icons/fa/map-signs.d.ts
deleted file mode 100644
index 4c4a9c2f69..0000000000
--- a/types/react-icons/fa/map-signs.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMapSigns extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/map.d.ts b/types/react-icons/fa/map.d.ts
deleted file mode 100644
index 52c55baf7f..0000000000
--- a/types/react-icons/fa/map.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMap extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/mars-double.d.ts b/types/react-icons/fa/mars-double.d.ts
deleted file mode 100644
index c6f7f4aa5d..0000000000
--- a/types/react-icons/fa/mars-double.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMarsDouble extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/mars-stroke-h.d.ts b/types/react-icons/fa/mars-stroke-h.d.ts
deleted file mode 100644
index e6d9f035d0..0000000000
--- a/types/react-icons/fa/mars-stroke-h.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMarsStrokeH extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/mars-stroke-v.d.ts b/types/react-icons/fa/mars-stroke-v.d.ts
deleted file mode 100644
index cc1a01a592..0000000000
--- a/types/react-icons/fa/mars-stroke-v.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMarsStrokeV extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/mars-stroke.d.ts b/types/react-icons/fa/mars-stroke.d.ts
deleted file mode 100644
index 69e9aec8b5..0000000000
--- a/types/react-icons/fa/mars-stroke.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMarsStroke extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/mars.d.ts b/types/react-icons/fa/mars.d.ts
deleted file mode 100644
index 7e21f481b4..0000000000
--- a/types/react-icons/fa/mars.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMars extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/maxcdn.d.ts b/types/react-icons/fa/maxcdn.d.ts
deleted file mode 100644
index ee9c0b0546..0000000000
--- a/types/react-icons/fa/maxcdn.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMaxcdn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/meanpath.d.ts b/types/react-icons/fa/meanpath.d.ts
deleted file mode 100644
index f479c77a85..0000000000
--- a/types/react-icons/fa/meanpath.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMeanpath extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/medium.d.ts b/types/react-icons/fa/medium.d.ts
deleted file mode 100644
index a272177d20..0000000000
--- a/types/react-icons/fa/medium.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMedium extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/medkit.d.ts b/types/react-icons/fa/medkit.d.ts
deleted file mode 100644
index 4de9fc61f9..0000000000
--- a/types/react-icons/fa/medkit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMedkit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/meh-o.d.ts b/types/react-icons/fa/meh-o.d.ts
deleted file mode 100644
index 2a07cde429..0000000000
--- a/types/react-icons/fa/meh-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMehO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/mercury.d.ts b/types/react-icons/fa/mercury.d.ts
deleted file mode 100644
index 616714b2fb..0000000000
--- a/types/react-icons/fa/mercury.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMercury extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/microphone-slash.d.ts b/types/react-icons/fa/microphone-slash.d.ts
deleted file mode 100644
index 39ddcefe4b..0000000000
--- a/types/react-icons/fa/microphone-slash.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMicrophoneSlash extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/microphone.d.ts b/types/react-icons/fa/microphone.d.ts
deleted file mode 100644
index b12fcd389c..0000000000
--- a/types/react-icons/fa/microphone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMicrophone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/minus-circle.d.ts b/types/react-icons/fa/minus-circle.d.ts
deleted file mode 100644
index 839cee0dbe..0000000000
--- a/types/react-icons/fa/minus-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMinusCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/minus-square-o.d.ts b/types/react-icons/fa/minus-square-o.d.ts
deleted file mode 100644
index d2bfd3dbba..0000000000
--- a/types/react-icons/fa/minus-square-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMinusSquareO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/minus-square.d.ts b/types/react-icons/fa/minus-square.d.ts
deleted file mode 100644
index 8946d33f30..0000000000
--- a/types/react-icons/fa/minus-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMinusSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/minus.d.ts b/types/react-icons/fa/minus.d.ts
deleted file mode 100644
index e7ae38ca8e..0000000000
--- a/types/react-icons/fa/minus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMinus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/mixcloud.d.ts b/types/react-icons/fa/mixcloud.d.ts
deleted file mode 100644
index 51b4f23bf2..0000000000
--- a/types/react-icons/fa/mixcloud.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMixcloud extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/mobile.d.ts b/types/react-icons/fa/mobile.d.ts
deleted file mode 100644
index e15d976418..0000000000
--- a/types/react-icons/fa/mobile.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMobile extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/modx.d.ts b/types/react-icons/fa/modx.d.ts
deleted file mode 100644
index c08b2d39fa..0000000000
--- a/types/react-icons/fa/modx.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaModx extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/money.d.ts b/types/react-icons/fa/money.d.ts
deleted file mode 100644
index 4e14ce5956..0000000000
--- a/types/react-icons/fa/money.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMoney extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/moon-o.d.ts b/types/react-icons/fa/moon-o.d.ts
deleted file mode 100644
index c1c2371ed0..0000000000
--- a/types/react-icons/fa/moon-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMoonO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/motorcycle.d.ts b/types/react-icons/fa/motorcycle.d.ts
deleted file mode 100644
index 2fd0d87361..0000000000
--- a/types/react-icons/fa/motorcycle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMotorcycle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/mouse-pointer.d.ts b/types/react-icons/fa/mouse-pointer.d.ts
deleted file mode 100644
index 8c220aa32b..0000000000
--- a/types/react-icons/fa/mouse-pointer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMousePointer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/music.d.ts b/types/react-icons/fa/music.d.ts
deleted file mode 100644
index 711455b587..0000000000
--- a/types/react-icons/fa/music.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaMusic extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/neuter.d.ts b/types/react-icons/fa/neuter.d.ts
deleted file mode 100644
index a5ce0a9c93..0000000000
--- a/types/react-icons/fa/neuter.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaNeuter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/newspaper-o.d.ts b/types/react-icons/fa/newspaper-o.d.ts
deleted file mode 100644
index 6f7f62737e..0000000000
--- a/types/react-icons/fa/newspaper-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaNewspaperO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/object-group.d.ts b/types/react-icons/fa/object-group.d.ts
deleted file mode 100644
index 5454030a44..0000000000
--- a/types/react-icons/fa/object-group.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaObjectGroup extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/object-ungroup.d.ts b/types/react-icons/fa/object-ungroup.d.ts
deleted file mode 100644
index 705abb0623..0000000000
--- a/types/react-icons/fa/object-ungroup.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaObjectUngroup extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/odnoklassniki-square.d.ts b/types/react-icons/fa/odnoklassniki-square.d.ts
deleted file mode 100644
index d6d1c3fb5e..0000000000
--- a/types/react-icons/fa/odnoklassniki-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaOdnoklassnikiSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/odnoklassniki.d.ts b/types/react-icons/fa/odnoklassniki.d.ts
deleted file mode 100644
index c9cdfc3f99..0000000000
--- a/types/react-icons/fa/odnoklassniki.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaOdnoklassniki extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/opencart.d.ts b/types/react-icons/fa/opencart.d.ts
deleted file mode 100644
index dde7963cd7..0000000000
--- a/types/react-icons/fa/opencart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaOpencart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/openid.d.ts b/types/react-icons/fa/openid.d.ts
deleted file mode 100644
index 763d13e24d..0000000000
--- a/types/react-icons/fa/openid.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaOpenid extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/opera.d.ts b/types/react-icons/fa/opera.d.ts
deleted file mode 100644
index c66bee6dca..0000000000
--- a/types/react-icons/fa/opera.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaOpera extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/optin-monster.d.ts b/types/react-icons/fa/optin-monster.d.ts
deleted file mode 100644
index 3a4973ca67..0000000000
--- a/types/react-icons/fa/optin-monster.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaOptinMonster extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/pagelines.d.ts b/types/react-icons/fa/pagelines.d.ts
deleted file mode 100644
index b9db5fd4ab..0000000000
--- a/types/react-icons/fa/pagelines.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPagelines extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/paint-brush.d.ts b/types/react-icons/fa/paint-brush.d.ts
deleted file mode 100644
index 4d56d06006..0000000000
--- a/types/react-icons/fa/paint-brush.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPaintBrush extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/paper-plane-o.d.ts b/types/react-icons/fa/paper-plane-o.d.ts
deleted file mode 100644
index 5fa53c13f7..0000000000
--- a/types/react-icons/fa/paper-plane-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPaperPlaneO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/paper-plane.d.ts b/types/react-icons/fa/paper-plane.d.ts
deleted file mode 100644
index 18d0a9fada..0000000000
--- a/types/react-icons/fa/paper-plane.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPaperPlane extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/paperclip.d.ts b/types/react-icons/fa/paperclip.d.ts
deleted file mode 100644
index e037d9d2a9..0000000000
--- a/types/react-icons/fa/paperclip.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPaperclip extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/paragraph.d.ts b/types/react-icons/fa/paragraph.d.ts
deleted file mode 100644
index 2895b28ecb..0000000000
--- a/types/react-icons/fa/paragraph.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaParagraph extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/pause-circle-o.d.ts b/types/react-icons/fa/pause-circle-o.d.ts
deleted file mode 100644
index 4b02099cf7..0000000000
--- a/types/react-icons/fa/pause-circle-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPauseCircleO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/pause-circle.d.ts b/types/react-icons/fa/pause-circle.d.ts
deleted file mode 100644
index 96fcbf12d2..0000000000
--- a/types/react-icons/fa/pause-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPauseCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/pause.d.ts b/types/react-icons/fa/pause.d.ts
deleted file mode 100644
index 87af546f21..0000000000
--- a/types/react-icons/fa/pause.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPause extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/paw.d.ts b/types/react-icons/fa/paw.d.ts
deleted file mode 100644
index 6f88ab466f..0000000000
--- a/types/react-icons/fa/paw.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPaw extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/paypal.d.ts b/types/react-icons/fa/paypal.d.ts
deleted file mode 100644
index d2878fe144..0000000000
--- a/types/react-icons/fa/paypal.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPaypal extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/pencil-square.d.ts b/types/react-icons/fa/pencil-square.d.ts
deleted file mode 100644
index ae8d368315..0000000000
--- a/types/react-icons/fa/pencil-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPencilSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/pencil.d.ts b/types/react-icons/fa/pencil.d.ts
deleted file mode 100644
index bae947d1d9..0000000000
--- a/types/react-icons/fa/pencil.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPencil extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/percent.d.ts b/types/react-icons/fa/percent.d.ts
deleted file mode 100644
index 447838a4d4..0000000000
--- a/types/react-icons/fa/percent.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPercent extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/phone-square.d.ts b/types/react-icons/fa/phone-square.d.ts
deleted file mode 100644
index 8595e9338b..0000000000
--- a/types/react-icons/fa/phone-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPhoneSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/phone.d.ts b/types/react-icons/fa/phone.d.ts
deleted file mode 100644
index 985d9a8867..0000000000
--- a/types/react-icons/fa/phone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPhone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/pie-chart.d.ts b/types/react-icons/fa/pie-chart.d.ts
deleted file mode 100644
index b5bd5b2c5c..0000000000
--- a/types/react-icons/fa/pie-chart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPieChart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/pied-piper-alt.d.ts b/types/react-icons/fa/pied-piper-alt.d.ts
deleted file mode 100644
index 8a23255cad..0000000000
--- a/types/react-icons/fa/pied-piper-alt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPiedPiperAlt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/pied-piper.d.ts b/types/react-icons/fa/pied-piper.d.ts
deleted file mode 100644
index e925634cd2..0000000000
--- a/types/react-icons/fa/pied-piper.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPiedPiper extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/pinterest-p.d.ts b/types/react-icons/fa/pinterest-p.d.ts
deleted file mode 100644
index c53adc8749..0000000000
--- a/types/react-icons/fa/pinterest-p.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPinterestP extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/pinterest-square.d.ts b/types/react-icons/fa/pinterest-square.d.ts
deleted file mode 100644
index a90c930b91..0000000000
--- a/types/react-icons/fa/pinterest-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPinterestSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/pinterest.d.ts b/types/react-icons/fa/pinterest.d.ts
deleted file mode 100644
index c380cf2092..0000000000
--- a/types/react-icons/fa/pinterest.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPinterest extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/plane.d.ts b/types/react-icons/fa/plane.d.ts
deleted file mode 100644
index 13373d06d7..0000000000
--- a/types/react-icons/fa/plane.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPlane extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/play-circle-o.d.ts b/types/react-icons/fa/play-circle-o.d.ts
deleted file mode 100644
index 7fa9627c4c..0000000000
--- a/types/react-icons/fa/play-circle-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPlayCircleO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/play-circle.d.ts b/types/react-icons/fa/play-circle.d.ts
deleted file mode 100644
index ea4f568b34..0000000000
--- a/types/react-icons/fa/play-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPlayCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/play.d.ts b/types/react-icons/fa/play.d.ts
deleted file mode 100644
index f6c6dafb12..0000000000
--- a/types/react-icons/fa/play.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPlay extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/plug.d.ts b/types/react-icons/fa/plug.d.ts
deleted file mode 100644
index e88fc8c2ae..0000000000
--- a/types/react-icons/fa/plug.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPlug extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/plus-circle.d.ts b/types/react-icons/fa/plus-circle.d.ts
deleted file mode 100644
index 9bf8af4e8d..0000000000
--- a/types/react-icons/fa/plus-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPlusCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/plus-square-o.d.ts b/types/react-icons/fa/plus-square-o.d.ts
deleted file mode 100644
index e9b582ec2d..0000000000
--- a/types/react-icons/fa/plus-square-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPlusSquareO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/plus-square.d.ts b/types/react-icons/fa/plus-square.d.ts
deleted file mode 100644
index b69d337311..0000000000
--- a/types/react-icons/fa/plus-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPlusSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/plus.d.ts b/types/react-icons/fa/plus.d.ts
deleted file mode 100644
index f6649123fb..0000000000
--- a/types/react-icons/fa/plus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPlus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/power-off.d.ts b/types/react-icons/fa/power-off.d.ts
deleted file mode 100644
index 538e8c9886..0000000000
--- a/types/react-icons/fa/power-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPowerOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/print.d.ts b/types/react-icons/fa/print.d.ts
deleted file mode 100644
index 5e49c43315..0000000000
--- a/types/react-icons/fa/print.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPrint extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/product-hunt.d.ts b/types/react-icons/fa/product-hunt.d.ts
deleted file mode 100644
index 2d790f199c..0000000000
--- a/types/react-icons/fa/product-hunt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaProductHunt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/puzzle-piece.d.ts b/types/react-icons/fa/puzzle-piece.d.ts
deleted file mode 100644
index f25059cc09..0000000000
--- a/types/react-icons/fa/puzzle-piece.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaPuzzlePiece extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/qq.d.ts b/types/react-icons/fa/qq.d.ts
deleted file mode 100644
index ff62c8cf78..0000000000
--- a/types/react-icons/fa/qq.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaQq extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/qrcode.d.ts b/types/react-icons/fa/qrcode.d.ts
deleted file mode 100644
index 23c52561db..0000000000
--- a/types/react-icons/fa/qrcode.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaQrcode extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/question-circle-o.d.ts b/types/react-icons/fa/question-circle-o.d.ts
deleted file mode 100644
index e3176c764b..0000000000
--- a/types/react-icons/fa/question-circle-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaQuestionCircleO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/question-circle.d.ts b/types/react-icons/fa/question-circle.d.ts
deleted file mode 100644
index a3474eab77..0000000000
--- a/types/react-icons/fa/question-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaQuestionCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/question.d.ts b/types/react-icons/fa/question.d.ts
deleted file mode 100644
index c825b26b4f..0000000000
--- a/types/react-icons/fa/question.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaQuestion extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/quote-left.d.ts b/types/react-icons/fa/quote-left.d.ts
deleted file mode 100644
index 904a81703f..0000000000
--- a/types/react-icons/fa/quote-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaQuoteLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/quote-right.d.ts b/types/react-icons/fa/quote-right.d.ts
deleted file mode 100644
index 3a4e38743d..0000000000
--- a/types/react-icons/fa/quote-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaQuoteRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/ra.d.ts b/types/react-icons/fa/ra.d.ts
deleted file mode 100644
index da2bd43b87..0000000000
--- a/types/react-icons/fa/ra.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaRa extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/random.d.ts b/types/react-icons/fa/random.d.ts
deleted file mode 100644
index 02c7c7465e..0000000000
--- a/types/react-icons/fa/random.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaRandom extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/recycle.d.ts b/types/react-icons/fa/recycle.d.ts
deleted file mode 100644
index 3f2c35bb45..0000000000
--- a/types/react-icons/fa/recycle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaRecycle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/reddit-alien.d.ts b/types/react-icons/fa/reddit-alien.d.ts
deleted file mode 100644
index 0c6152a524..0000000000
--- a/types/react-icons/fa/reddit-alien.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaRedditAlien extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/reddit-square.d.ts b/types/react-icons/fa/reddit-square.d.ts
deleted file mode 100644
index 2fe217fd2f..0000000000
--- a/types/react-icons/fa/reddit-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaRedditSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/reddit.d.ts b/types/react-icons/fa/reddit.d.ts
deleted file mode 100644
index 485e46b5b0..0000000000
--- a/types/react-icons/fa/reddit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaReddit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/refresh.d.ts b/types/react-icons/fa/refresh.d.ts
deleted file mode 100644
index ebf74b1515..0000000000
--- a/types/react-icons/fa/refresh.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaRefresh extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/registered.d.ts b/types/react-icons/fa/registered.d.ts
deleted file mode 100644
index 801dc66200..0000000000
--- a/types/react-icons/fa/registered.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaRegistered extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/renren.d.ts b/types/react-icons/fa/renren.d.ts
deleted file mode 100644
index 25055289d9..0000000000
--- a/types/react-icons/fa/renren.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaRenren extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/repeat.d.ts b/types/react-icons/fa/repeat.d.ts
deleted file mode 100644
index c3f51ad288..0000000000
--- a/types/react-icons/fa/repeat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaRepeat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/retweet.d.ts b/types/react-icons/fa/retweet.d.ts
deleted file mode 100644
index f18d4bda7b..0000000000
--- a/types/react-icons/fa/retweet.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaRetweet extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/road.d.ts b/types/react-icons/fa/road.d.ts
deleted file mode 100644
index 0715ec2e7e..0000000000
--- a/types/react-icons/fa/road.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaRoad extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/rocket.d.ts b/types/react-icons/fa/rocket.d.ts
deleted file mode 100644
index 2f1c2dc834..0000000000
--- a/types/react-icons/fa/rocket.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaRocket extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/rotate-left.d.ts b/types/react-icons/fa/rotate-left.d.ts
deleted file mode 100644
index 2a93784c4e..0000000000
--- a/types/react-icons/fa/rotate-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaRotateLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/rouble.d.ts b/types/react-icons/fa/rouble.d.ts
deleted file mode 100644
index 9e61df412e..0000000000
--- a/types/react-icons/fa/rouble.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaRouble extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/rss-square.d.ts b/types/react-icons/fa/rss-square.d.ts
deleted file mode 100644
index c840ec5513..0000000000
--- a/types/react-icons/fa/rss-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaRssSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/safari.d.ts b/types/react-icons/fa/safari.d.ts
deleted file mode 100644
index 6bb95a70f0..0000000000
--- a/types/react-icons/fa/safari.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSafari extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/scribd.d.ts b/types/react-icons/fa/scribd.d.ts
deleted file mode 100644
index 39fc8c40a6..0000000000
--- a/types/react-icons/fa/scribd.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaScribd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/search-minus.d.ts b/types/react-icons/fa/search-minus.d.ts
deleted file mode 100644
index b0045c94f4..0000000000
--- a/types/react-icons/fa/search-minus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSearchMinus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/search-plus.d.ts b/types/react-icons/fa/search-plus.d.ts
deleted file mode 100644
index 3aaacffaea..0000000000
--- a/types/react-icons/fa/search-plus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSearchPlus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/search.d.ts b/types/react-icons/fa/search.d.ts
deleted file mode 100644
index 14c1b8eb87..0000000000
--- a/types/react-icons/fa/search.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSearch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sellsy.d.ts b/types/react-icons/fa/sellsy.d.ts
deleted file mode 100644
index 9eb86d3b41..0000000000
--- a/types/react-icons/fa/sellsy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSellsy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/server.d.ts b/types/react-icons/fa/server.d.ts
deleted file mode 100644
index f34b2bef92..0000000000
--- a/types/react-icons/fa/server.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaServer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/share-alt-square.d.ts b/types/react-icons/fa/share-alt-square.d.ts
deleted file mode 100644
index 31dc918f6c..0000000000
--- a/types/react-icons/fa/share-alt-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaShareAltSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/share-alt.d.ts b/types/react-icons/fa/share-alt.d.ts
deleted file mode 100644
index e95e1b249e..0000000000
--- a/types/react-icons/fa/share-alt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaShareAlt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/share-square-o.d.ts b/types/react-icons/fa/share-square-o.d.ts
deleted file mode 100644
index fbe2893547..0000000000
--- a/types/react-icons/fa/share-square-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaShareSquareO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/share-square.d.ts b/types/react-icons/fa/share-square.d.ts
deleted file mode 100644
index 553b8b7d88..0000000000
--- a/types/react-icons/fa/share-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaShareSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/shield.d.ts b/types/react-icons/fa/shield.d.ts
deleted file mode 100644
index 0358946bb0..0000000000
--- a/types/react-icons/fa/shield.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaShield extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/ship.d.ts b/types/react-icons/fa/ship.d.ts
deleted file mode 100644
index bbac7fa963..0000000000
--- a/types/react-icons/fa/ship.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaShip extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/shirtsinbulk.d.ts b/types/react-icons/fa/shirtsinbulk.d.ts
deleted file mode 100644
index 1cdac4b3b2..0000000000
--- a/types/react-icons/fa/shirtsinbulk.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaShirtsinbulk extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/shopping-bag.d.ts b/types/react-icons/fa/shopping-bag.d.ts
deleted file mode 100644
index 0e9ec2fd0d..0000000000
--- a/types/react-icons/fa/shopping-bag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaShoppingBag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/shopping-basket.d.ts b/types/react-icons/fa/shopping-basket.d.ts
deleted file mode 100644
index 05b7d1417d..0000000000
--- a/types/react-icons/fa/shopping-basket.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaShoppingBasket extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/shopping-cart.d.ts b/types/react-icons/fa/shopping-cart.d.ts
deleted file mode 100644
index 17d623f44d..0000000000
--- a/types/react-icons/fa/shopping-cart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaShoppingCart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sign-in.d.ts b/types/react-icons/fa/sign-in.d.ts
deleted file mode 100644
index 6122e57cab..0000000000
--- a/types/react-icons/fa/sign-in.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSignIn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sign-language.d.ts b/types/react-icons/fa/sign-language.d.ts
deleted file mode 100644
index 92f5afb348..0000000000
--- a/types/react-icons/fa/sign-language.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSignLanguage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sign-out.d.ts b/types/react-icons/fa/sign-out.d.ts
deleted file mode 100644
index 0432e2a806..0000000000
--- a/types/react-icons/fa/sign-out.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSignOut extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/signal.d.ts b/types/react-icons/fa/signal.d.ts
deleted file mode 100644
index ff8c9215db..0000000000
--- a/types/react-icons/fa/signal.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSignal extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/simplybuilt.d.ts b/types/react-icons/fa/simplybuilt.d.ts
deleted file mode 100644
index 2f6a53cab7..0000000000
--- a/types/react-icons/fa/simplybuilt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSimplybuilt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sitemap.d.ts b/types/react-icons/fa/sitemap.d.ts
deleted file mode 100644
index e6a3891028..0000000000
--- a/types/react-icons/fa/sitemap.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSitemap extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/skyatlas.d.ts b/types/react-icons/fa/skyatlas.d.ts
deleted file mode 100644
index 58a376bec4..0000000000
--- a/types/react-icons/fa/skyatlas.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSkyatlas extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/skype.d.ts b/types/react-icons/fa/skype.d.ts
deleted file mode 100644
index 3e4b8465ce..0000000000
--- a/types/react-icons/fa/skype.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSkype extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/slack.d.ts b/types/react-icons/fa/slack.d.ts
deleted file mode 100644
index 05ae812154..0000000000
--- a/types/react-icons/fa/slack.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSlack extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sliders.d.ts b/types/react-icons/fa/sliders.d.ts
deleted file mode 100644
index 5b77a2c246..0000000000
--- a/types/react-icons/fa/sliders.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSliders extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/slideshare.d.ts b/types/react-icons/fa/slideshare.d.ts
deleted file mode 100644
index 678418e560..0000000000
--- a/types/react-icons/fa/slideshare.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSlideshare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/smile-o.d.ts b/types/react-icons/fa/smile-o.d.ts
deleted file mode 100644
index 8db866e669..0000000000
--- a/types/react-icons/fa/smile-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSmileO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/snapchat-ghost.d.ts b/types/react-icons/fa/snapchat-ghost.d.ts
deleted file mode 100644
index 83ca65e891..0000000000
--- a/types/react-icons/fa/snapchat-ghost.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSnapchatGhost extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/snapchat-square.d.ts b/types/react-icons/fa/snapchat-square.d.ts
deleted file mode 100644
index 7c1ac2dbc4..0000000000
--- a/types/react-icons/fa/snapchat-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSnapchatSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/snapchat.d.ts b/types/react-icons/fa/snapchat.d.ts
deleted file mode 100644
index bbc8bb62e3..0000000000
--- a/types/react-icons/fa/snapchat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSnapchat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sort-alpha-asc.d.ts b/types/react-icons/fa/sort-alpha-asc.d.ts
deleted file mode 100644
index 6b44132473..0000000000
--- a/types/react-icons/fa/sort-alpha-asc.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSortAlphaAsc extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sort-alpha-desc.d.ts b/types/react-icons/fa/sort-alpha-desc.d.ts
deleted file mode 100644
index 2830f1986e..0000000000
--- a/types/react-icons/fa/sort-alpha-desc.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSortAlphaDesc extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sort-amount-asc.d.ts b/types/react-icons/fa/sort-amount-asc.d.ts
deleted file mode 100644
index 05da03032c..0000000000
--- a/types/react-icons/fa/sort-amount-asc.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSortAmountAsc extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sort-amount-desc.d.ts b/types/react-icons/fa/sort-amount-desc.d.ts
deleted file mode 100644
index c7e7242565..0000000000
--- a/types/react-icons/fa/sort-amount-desc.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSortAmountDesc extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sort-asc.d.ts b/types/react-icons/fa/sort-asc.d.ts
deleted file mode 100644
index ce2c9fe0a2..0000000000
--- a/types/react-icons/fa/sort-asc.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSortAsc extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sort-desc.d.ts b/types/react-icons/fa/sort-desc.d.ts
deleted file mode 100644
index 0b4842a8f9..0000000000
--- a/types/react-icons/fa/sort-desc.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSortDesc extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sort-numeric-asc.d.ts b/types/react-icons/fa/sort-numeric-asc.d.ts
deleted file mode 100644
index b7fa62fe1c..0000000000
--- a/types/react-icons/fa/sort-numeric-asc.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSortNumericAsc extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sort-numeric-desc.d.ts b/types/react-icons/fa/sort-numeric-desc.d.ts
deleted file mode 100644
index 2c124abd75..0000000000
--- a/types/react-icons/fa/sort-numeric-desc.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSortNumericDesc extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sort.d.ts b/types/react-icons/fa/sort.d.ts
deleted file mode 100644
index ad64fd0c52..0000000000
--- a/types/react-icons/fa/sort.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSort extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/soundcloud.d.ts b/types/react-icons/fa/soundcloud.d.ts
deleted file mode 100644
index c357e174b0..0000000000
--- a/types/react-icons/fa/soundcloud.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSoundcloud extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/space-shuttle.d.ts b/types/react-icons/fa/space-shuttle.d.ts
deleted file mode 100644
index 0ce2f24916..0000000000
--- a/types/react-icons/fa/space-shuttle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSpaceShuttle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/spinner.d.ts b/types/react-icons/fa/spinner.d.ts
deleted file mode 100644
index 36e2dd9285..0000000000
--- a/types/react-icons/fa/spinner.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSpinner extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/spoon.d.ts b/types/react-icons/fa/spoon.d.ts
deleted file mode 100644
index 1112916912..0000000000
--- a/types/react-icons/fa/spoon.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSpoon extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/spotify.d.ts b/types/react-icons/fa/spotify.d.ts
deleted file mode 100644
index 94c862a866..0000000000
--- a/types/react-icons/fa/spotify.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSpotify extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/square-o.d.ts b/types/react-icons/fa/square-o.d.ts
deleted file mode 100644
index 0d49bd6c23..0000000000
--- a/types/react-icons/fa/square-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSquareO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/square.d.ts b/types/react-icons/fa/square.d.ts
deleted file mode 100644
index d95485831d..0000000000
--- a/types/react-icons/fa/square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/stack-exchange.d.ts b/types/react-icons/fa/stack-exchange.d.ts
deleted file mode 100644
index a1f2d0e265..0000000000
--- a/types/react-icons/fa/stack-exchange.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStackExchange extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/stack-overflow.d.ts b/types/react-icons/fa/stack-overflow.d.ts
deleted file mode 100644
index fd71beea7f..0000000000
--- a/types/react-icons/fa/stack-overflow.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStackOverflow extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/star-half-empty.d.ts b/types/react-icons/fa/star-half-empty.d.ts
deleted file mode 100644
index 6e4b26ad53..0000000000
--- a/types/react-icons/fa/star-half-empty.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStarHalfEmpty extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/star-half.d.ts b/types/react-icons/fa/star-half.d.ts
deleted file mode 100644
index d373ba6a07..0000000000
--- a/types/react-icons/fa/star-half.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStarHalf extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/star-o.d.ts b/types/react-icons/fa/star-o.d.ts
deleted file mode 100644
index cf950d4867..0000000000
--- a/types/react-icons/fa/star-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStarO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/star.d.ts b/types/react-icons/fa/star.d.ts
deleted file mode 100644
index 3113155a96..0000000000
--- a/types/react-icons/fa/star.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/steam-square.d.ts b/types/react-icons/fa/steam-square.d.ts
deleted file mode 100644
index 3ac2c21b30..0000000000
--- a/types/react-icons/fa/steam-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSteamSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/steam.d.ts b/types/react-icons/fa/steam.d.ts
deleted file mode 100644
index e1aa2f3313..0000000000
--- a/types/react-icons/fa/steam.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSteam extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/step-backward.d.ts b/types/react-icons/fa/step-backward.d.ts
deleted file mode 100644
index fe571ab271..0000000000
--- a/types/react-icons/fa/step-backward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStepBackward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/step-forward.d.ts b/types/react-icons/fa/step-forward.d.ts
deleted file mode 100644
index b8b01f06a8..0000000000
--- a/types/react-icons/fa/step-forward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStepForward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/stethoscope.d.ts b/types/react-icons/fa/stethoscope.d.ts
deleted file mode 100644
index 3f8cdcba2e..0000000000
--- a/types/react-icons/fa/stethoscope.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStethoscope extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sticky-note-o.d.ts b/types/react-icons/fa/sticky-note-o.d.ts
deleted file mode 100644
index 5d54ced4ec..0000000000
--- a/types/react-icons/fa/sticky-note-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStickyNoteO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sticky-note.d.ts b/types/react-icons/fa/sticky-note.d.ts
deleted file mode 100644
index d30fedcdd7..0000000000
--- a/types/react-icons/fa/sticky-note.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStickyNote extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/stop-circle-o.d.ts b/types/react-icons/fa/stop-circle-o.d.ts
deleted file mode 100644
index 244ffeb6cc..0000000000
--- a/types/react-icons/fa/stop-circle-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStopCircleO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/stop-circle.d.ts b/types/react-icons/fa/stop-circle.d.ts
deleted file mode 100644
index ef7a92d310..0000000000
--- a/types/react-icons/fa/stop-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStopCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/stop.d.ts b/types/react-icons/fa/stop.d.ts
deleted file mode 100644
index fd4356c3df..0000000000
--- a/types/react-icons/fa/stop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/street-view.d.ts b/types/react-icons/fa/street-view.d.ts
deleted file mode 100644
index d989035bde..0000000000
--- a/types/react-icons/fa/street-view.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStreetView extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/strikethrough.d.ts b/types/react-icons/fa/strikethrough.d.ts
deleted file mode 100644
index f472c0fd77..0000000000
--- a/types/react-icons/fa/strikethrough.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStrikethrough extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/stumbleupon-circle.d.ts b/types/react-icons/fa/stumbleupon-circle.d.ts
deleted file mode 100644
index ecc4d2122e..0000000000
--- a/types/react-icons/fa/stumbleupon-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStumbleuponCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/stumbleupon.d.ts b/types/react-icons/fa/stumbleupon.d.ts
deleted file mode 100644
index 64185df0f3..0000000000
--- a/types/react-icons/fa/stumbleupon.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaStumbleupon extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/subscript.d.ts b/types/react-icons/fa/subscript.d.ts
deleted file mode 100644
index ac03fe6b89..0000000000
--- a/types/react-icons/fa/subscript.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSubscript extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/subway.d.ts b/types/react-icons/fa/subway.d.ts
deleted file mode 100644
index ce4b09edbf..0000000000
--- a/types/react-icons/fa/subway.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSubway extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/suitcase.d.ts b/types/react-icons/fa/suitcase.d.ts
deleted file mode 100644
index 0bf3807780..0000000000
--- a/types/react-icons/fa/suitcase.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSuitcase extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/sun-o.d.ts b/types/react-icons/fa/sun-o.d.ts
deleted file mode 100644
index 3ac6bfbdd3..0000000000
--- a/types/react-icons/fa/sun-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSunO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/superscript.d.ts b/types/react-icons/fa/superscript.d.ts
deleted file mode 100644
index 07a901912e..0000000000
--- a/types/react-icons/fa/superscript.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaSuperscript extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/table.d.ts b/types/react-icons/fa/table.d.ts
deleted file mode 100644
index a8ff4e9bf5..0000000000
--- a/types/react-icons/fa/table.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTable extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/tablet.d.ts b/types/react-icons/fa/tablet.d.ts
deleted file mode 100644
index 37ea453d17..0000000000
--- a/types/react-icons/fa/tablet.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTablet extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/tag.d.ts b/types/react-icons/fa/tag.d.ts
deleted file mode 100644
index 247756142e..0000000000
--- a/types/react-icons/fa/tag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/tags.d.ts b/types/react-icons/fa/tags.d.ts
deleted file mode 100644
index 3518af839a..0000000000
--- a/types/react-icons/fa/tags.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTags extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/tasks.d.ts b/types/react-icons/fa/tasks.d.ts
deleted file mode 100644
index f0b59f374e..0000000000
--- a/types/react-icons/fa/tasks.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTasks extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/television.d.ts b/types/react-icons/fa/television.d.ts
deleted file mode 100644
index 88b8693a6a..0000000000
--- a/types/react-icons/fa/television.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTelevision extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/tencent-weibo.d.ts b/types/react-icons/fa/tencent-weibo.d.ts
deleted file mode 100644
index ce9a04848c..0000000000
--- a/types/react-icons/fa/tencent-weibo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTencentWeibo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/terminal.d.ts b/types/react-icons/fa/terminal.d.ts
deleted file mode 100644
index 75daa58c87..0000000000
--- a/types/react-icons/fa/terminal.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTerminal extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/text-height.d.ts b/types/react-icons/fa/text-height.d.ts
deleted file mode 100644
index 69271e359f..0000000000
--- a/types/react-icons/fa/text-height.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTextHeight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/text-width.d.ts b/types/react-icons/fa/text-width.d.ts
deleted file mode 100644
index 820357df60..0000000000
--- a/types/react-icons/fa/text-width.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTextWidth extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/th-large.d.ts b/types/react-icons/fa/th-large.d.ts
deleted file mode 100644
index f059da9990..0000000000
--- a/types/react-icons/fa/th-large.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaThLarge extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/th-list.d.ts b/types/react-icons/fa/th-list.d.ts
deleted file mode 100644
index 09ef167885..0000000000
--- a/types/react-icons/fa/th-list.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaThList extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/th.d.ts b/types/react-icons/fa/th.d.ts
deleted file mode 100644
index 9d6674b5d3..0000000000
--- a/types/react-icons/fa/th.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTh extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/thumb-tack.d.ts b/types/react-icons/fa/thumb-tack.d.ts
deleted file mode 100644
index b84e262f77..0000000000
--- a/types/react-icons/fa/thumb-tack.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaThumbTack extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/thumbs-down.d.ts b/types/react-icons/fa/thumbs-down.d.ts
deleted file mode 100644
index c684e7ad5c..0000000000
--- a/types/react-icons/fa/thumbs-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaThumbsDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/thumbs-o-down.d.ts b/types/react-icons/fa/thumbs-o-down.d.ts
deleted file mode 100644
index 0c9f640d18..0000000000
--- a/types/react-icons/fa/thumbs-o-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaThumbsODown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/thumbs-o-up.d.ts b/types/react-icons/fa/thumbs-o-up.d.ts
deleted file mode 100644
index 9d5a487ae1..0000000000
--- a/types/react-icons/fa/thumbs-o-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaThumbsOUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/thumbs-up.d.ts b/types/react-icons/fa/thumbs-up.d.ts
deleted file mode 100644
index 84348d3ac2..0000000000
--- a/types/react-icons/fa/thumbs-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaThumbsUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/ticket.d.ts b/types/react-icons/fa/ticket.d.ts
deleted file mode 100644
index 275a38e4dd..0000000000
--- a/types/react-icons/fa/ticket.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTicket extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/times-circle-o.d.ts b/types/react-icons/fa/times-circle-o.d.ts
deleted file mode 100644
index 5a96466de6..0000000000
--- a/types/react-icons/fa/times-circle-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTimesCircleO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/times-circle.d.ts b/types/react-icons/fa/times-circle.d.ts
deleted file mode 100644
index d73596cfb8..0000000000
--- a/types/react-icons/fa/times-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTimesCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/tint.d.ts b/types/react-icons/fa/tint.d.ts
deleted file mode 100644
index b4155f948c..0000000000
--- a/types/react-icons/fa/tint.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTint extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/toggle-off.d.ts b/types/react-icons/fa/toggle-off.d.ts
deleted file mode 100644
index e4bd987307..0000000000
--- a/types/react-icons/fa/toggle-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaToggleOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/toggle-on.d.ts b/types/react-icons/fa/toggle-on.d.ts
deleted file mode 100644
index 69324fdd13..0000000000
--- a/types/react-icons/fa/toggle-on.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaToggleOn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/trademark.d.ts b/types/react-icons/fa/trademark.d.ts
deleted file mode 100644
index c8ddb8dbf6..0000000000
--- a/types/react-icons/fa/trademark.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTrademark extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/train.d.ts b/types/react-icons/fa/train.d.ts
deleted file mode 100644
index a686d3a677..0000000000
--- a/types/react-icons/fa/train.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTrain extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/transgender-alt.d.ts b/types/react-icons/fa/transgender-alt.d.ts
deleted file mode 100644
index 0794285d19..0000000000
--- a/types/react-icons/fa/transgender-alt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTransgenderAlt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/trash-o.d.ts b/types/react-icons/fa/trash-o.d.ts
deleted file mode 100644
index c76a07e3f8..0000000000
--- a/types/react-icons/fa/trash-o.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTrashO extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/trash.d.ts b/types/react-icons/fa/trash.d.ts
deleted file mode 100644
index f2f4ce4117..0000000000
--- a/types/react-icons/fa/trash.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTrash extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/tree.d.ts b/types/react-icons/fa/tree.d.ts
deleted file mode 100644
index 7b94f9f52e..0000000000
--- a/types/react-icons/fa/tree.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTree extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/trello.d.ts b/types/react-icons/fa/trello.d.ts
deleted file mode 100644
index a231c272aa..0000000000
--- a/types/react-icons/fa/trello.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTrello extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/tripadvisor.d.ts b/types/react-icons/fa/tripadvisor.d.ts
deleted file mode 100644
index 95ad22d7eb..0000000000
--- a/types/react-icons/fa/tripadvisor.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTripadvisor extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/trophy.d.ts b/types/react-icons/fa/trophy.d.ts
deleted file mode 100644
index 48f48edec1..0000000000
--- a/types/react-icons/fa/trophy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTrophy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/truck.d.ts b/types/react-icons/fa/truck.d.ts
deleted file mode 100644
index 00bc370441..0000000000
--- a/types/react-icons/fa/truck.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTruck extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/try.d.ts b/types/react-icons/fa/try.d.ts
deleted file mode 100644
index fa4492d24b..0000000000
--- a/types/react-icons/fa/try.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTry extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/tty.d.ts b/types/react-icons/fa/tty.d.ts
deleted file mode 100644
index 76ec94f74e..0000000000
--- a/types/react-icons/fa/tty.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTty extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/tumblr-square.d.ts b/types/react-icons/fa/tumblr-square.d.ts
deleted file mode 100644
index 2bf15bf460..0000000000
--- a/types/react-icons/fa/tumblr-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTumblrSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/tumblr.d.ts b/types/react-icons/fa/tumblr.d.ts
deleted file mode 100644
index c60ae76806..0000000000
--- a/types/react-icons/fa/tumblr.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTumblr extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/twitch.d.ts b/types/react-icons/fa/twitch.d.ts
deleted file mode 100644
index 3e46ebac6c..0000000000
--- a/types/react-icons/fa/twitch.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTwitch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/twitter-square.d.ts b/types/react-icons/fa/twitter-square.d.ts
deleted file mode 100644
index fb77d182e6..0000000000
--- a/types/react-icons/fa/twitter-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTwitterSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/twitter.d.ts b/types/react-icons/fa/twitter.d.ts
deleted file mode 100644
index e3d5259918..0000000000
--- a/types/react-icons/fa/twitter.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaTwitter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/umbrella.d.ts b/types/react-icons/fa/umbrella.d.ts
deleted file mode 100644
index 74fefd9404..0000000000
--- a/types/react-icons/fa/umbrella.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaUmbrella extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/underline.d.ts b/types/react-icons/fa/underline.d.ts
deleted file mode 100644
index af907eba18..0000000000
--- a/types/react-icons/fa/underline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaUnderline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/universal-access.d.ts b/types/react-icons/fa/universal-access.d.ts
deleted file mode 100644
index a02ba6c3be..0000000000
--- a/types/react-icons/fa/universal-access.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaUniversalAccess extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/unlock-alt.d.ts b/types/react-icons/fa/unlock-alt.d.ts
deleted file mode 100644
index 9d84986727..0000000000
--- a/types/react-icons/fa/unlock-alt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaUnlockAlt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/unlock.d.ts b/types/react-icons/fa/unlock.d.ts
deleted file mode 100644
index 5b1979f0cd..0000000000
--- a/types/react-icons/fa/unlock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaUnlock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/upload.d.ts b/types/react-icons/fa/upload.d.ts
deleted file mode 100644
index 566ab8a65d..0000000000
--- a/types/react-icons/fa/upload.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaUpload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/usb.d.ts b/types/react-icons/fa/usb.d.ts
deleted file mode 100644
index 6ca16d94e8..0000000000
--- a/types/react-icons/fa/usb.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaUsb extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/user-md.d.ts b/types/react-icons/fa/user-md.d.ts
deleted file mode 100644
index 0d6f2d9781..0000000000
--- a/types/react-icons/fa/user-md.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaUserMd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/user-plus.d.ts b/types/react-icons/fa/user-plus.d.ts
deleted file mode 100644
index 659b2ecb13..0000000000
--- a/types/react-icons/fa/user-plus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaUserPlus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/user-secret.d.ts b/types/react-icons/fa/user-secret.d.ts
deleted file mode 100644
index 43bf4e4ac3..0000000000
--- a/types/react-icons/fa/user-secret.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaUserSecret extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/user-times.d.ts b/types/react-icons/fa/user-times.d.ts
deleted file mode 100644
index d235fd5463..0000000000
--- a/types/react-icons/fa/user-times.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaUserTimes extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/user.d.ts b/types/react-icons/fa/user.d.ts
deleted file mode 100644
index cf7b5ac689..0000000000
--- a/types/react-icons/fa/user.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaUser extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/venus-double.d.ts b/types/react-icons/fa/venus-double.d.ts
deleted file mode 100644
index 5a3602b516..0000000000
--- a/types/react-icons/fa/venus-double.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaVenusDouble extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/venus-mars.d.ts b/types/react-icons/fa/venus-mars.d.ts
deleted file mode 100644
index 70d7448d7e..0000000000
--- a/types/react-icons/fa/venus-mars.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaVenusMars extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/venus.d.ts b/types/react-icons/fa/venus.d.ts
deleted file mode 100644
index e80ab6053c..0000000000
--- a/types/react-icons/fa/venus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaVenus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/viacoin.d.ts b/types/react-icons/fa/viacoin.d.ts
deleted file mode 100644
index c9f1bef6f3..0000000000
--- a/types/react-icons/fa/viacoin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaViacoin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/viadeo-square.d.ts b/types/react-icons/fa/viadeo-square.d.ts
deleted file mode 100644
index 7f10d8302f..0000000000
--- a/types/react-icons/fa/viadeo-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaViadeoSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/viadeo.d.ts b/types/react-icons/fa/viadeo.d.ts
deleted file mode 100644
index 551545f5cc..0000000000
--- a/types/react-icons/fa/viadeo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaViadeo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/video-camera.d.ts b/types/react-icons/fa/video-camera.d.ts
deleted file mode 100644
index f3cf036582..0000000000
--- a/types/react-icons/fa/video-camera.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaVideoCamera extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/vimeo-square.d.ts b/types/react-icons/fa/vimeo-square.d.ts
deleted file mode 100644
index 9b0357e7ca..0000000000
--- a/types/react-icons/fa/vimeo-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaVimeoSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/vimeo.d.ts b/types/react-icons/fa/vimeo.d.ts
deleted file mode 100644
index 7331ef98e8..0000000000
--- a/types/react-icons/fa/vimeo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaVimeo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/vine.d.ts b/types/react-icons/fa/vine.d.ts
deleted file mode 100644
index b329619d15..0000000000
--- a/types/react-icons/fa/vine.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaVine extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/vk.d.ts b/types/react-icons/fa/vk.d.ts
deleted file mode 100644
index 07b3cdb5a9..0000000000
--- a/types/react-icons/fa/vk.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaVk extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/volume-control-phone.d.ts b/types/react-icons/fa/volume-control-phone.d.ts
deleted file mode 100644
index 5212a54d80..0000000000
--- a/types/react-icons/fa/volume-control-phone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaVolumeControlPhone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/volume-down.d.ts b/types/react-icons/fa/volume-down.d.ts
deleted file mode 100644
index 31c63f8901..0000000000
--- a/types/react-icons/fa/volume-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaVolumeDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/volume-off.d.ts b/types/react-icons/fa/volume-off.d.ts
deleted file mode 100644
index c0e0d7605e..0000000000
--- a/types/react-icons/fa/volume-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaVolumeOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/volume-up.d.ts b/types/react-icons/fa/volume-up.d.ts
deleted file mode 100644
index 957cdc648b..0000000000
--- a/types/react-icons/fa/volume-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaVolumeUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/wechat.d.ts b/types/react-icons/fa/wechat.d.ts
deleted file mode 100644
index 35b902956e..0000000000
--- a/types/react-icons/fa/wechat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaWechat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/weibo.d.ts b/types/react-icons/fa/weibo.d.ts
deleted file mode 100644
index afbebd68a5..0000000000
--- a/types/react-icons/fa/weibo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaWeibo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/whatsapp.d.ts b/types/react-icons/fa/whatsapp.d.ts
deleted file mode 100644
index d4491b527e..0000000000
--- a/types/react-icons/fa/whatsapp.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaWhatsapp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/wheelchair-alt.d.ts b/types/react-icons/fa/wheelchair-alt.d.ts
deleted file mode 100644
index beb76b7b56..0000000000
--- a/types/react-icons/fa/wheelchair-alt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaWheelchairAlt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/wheelchair.d.ts b/types/react-icons/fa/wheelchair.d.ts
deleted file mode 100644
index b93d14b52d..0000000000
--- a/types/react-icons/fa/wheelchair.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaWheelchair extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/wifi.d.ts b/types/react-icons/fa/wifi.d.ts
deleted file mode 100644
index 001d3cfc85..0000000000
--- a/types/react-icons/fa/wifi.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaWifi extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/wikipedia-w.d.ts b/types/react-icons/fa/wikipedia-w.d.ts
deleted file mode 100644
index 279a74f1af..0000000000
--- a/types/react-icons/fa/wikipedia-w.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaWikipediaW extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/windows.d.ts b/types/react-icons/fa/windows.d.ts
deleted file mode 100644
index 7e201a440e..0000000000
--- a/types/react-icons/fa/windows.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaWindows extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/wordpress.d.ts b/types/react-icons/fa/wordpress.d.ts
deleted file mode 100644
index 6419cd1638..0000000000
--- a/types/react-icons/fa/wordpress.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaWordpress extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/wpbeginner.d.ts b/types/react-icons/fa/wpbeginner.d.ts
deleted file mode 100644
index cccbdae9db..0000000000
--- a/types/react-icons/fa/wpbeginner.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaWpbeginner extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/wpforms.d.ts b/types/react-icons/fa/wpforms.d.ts
deleted file mode 100644
index 1ec4e76460..0000000000
--- a/types/react-icons/fa/wpforms.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaWpforms extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/wrench.d.ts b/types/react-icons/fa/wrench.d.ts
deleted file mode 100644
index 0264b8d26b..0000000000
--- a/types/react-icons/fa/wrench.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaWrench extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/xing-square.d.ts b/types/react-icons/fa/xing-square.d.ts
deleted file mode 100644
index 5f462112ea..0000000000
--- a/types/react-icons/fa/xing-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaXingSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/xing.d.ts b/types/react-icons/fa/xing.d.ts
deleted file mode 100644
index 1974b8c345..0000000000
--- a/types/react-icons/fa/xing.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaXing extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/y-combinator.d.ts b/types/react-icons/fa/y-combinator.d.ts
deleted file mode 100644
index 00fbccab76..0000000000
--- a/types/react-icons/fa/y-combinator.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaYCombinator extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/yahoo.d.ts b/types/react-icons/fa/yahoo.d.ts
deleted file mode 100644
index 20c14e5e13..0000000000
--- a/types/react-icons/fa/yahoo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaYahoo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/yelp.d.ts b/types/react-icons/fa/yelp.d.ts
deleted file mode 100644
index 72ade5360d..0000000000
--- a/types/react-icons/fa/yelp.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaYelp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/youtube-play.d.ts b/types/react-icons/fa/youtube-play.d.ts
deleted file mode 100644
index f1829960cf..0000000000
--- a/types/react-icons/fa/youtube-play.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaYoutubePlay extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/youtube-square.d.ts b/types/react-icons/fa/youtube-square.d.ts
deleted file mode 100644
index c0ccac4e45..0000000000
--- a/types/react-icons/fa/youtube-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaYoutubeSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/youtube.d.ts b/types/react-icons/fa/youtube.d.ts
deleted file mode 100644
index 7aee8011f5..0000000000
--- a/types/react-icons/fa/youtube.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class FaYoutube extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/alert.d.ts b/types/react-icons/go/alert.d.ts
deleted file mode 100644
index 7380b75f13..0000000000
--- a/types/react-icons/go/alert.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoAlert extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/alignment-align.d.ts b/types/react-icons/go/alignment-align.d.ts
deleted file mode 100644
index b0279982e2..0000000000
--- a/types/react-icons/go/alignment-align.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoAlignmentAlign extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/alignment-aligned-to.d.ts b/types/react-icons/go/alignment-aligned-to.d.ts
deleted file mode 100644
index 4d42f9aff5..0000000000
--- a/types/react-icons/go/alignment-aligned-to.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoAlignmentAlignedTo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/alignment-unalign.d.ts b/types/react-icons/go/alignment-unalign.d.ts
deleted file mode 100644
index fcc4e84501..0000000000
--- a/types/react-icons/go/alignment-unalign.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoAlignmentUnalign extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/arrow-down.d.ts b/types/react-icons/go/arrow-down.d.ts
deleted file mode 100644
index 88395ee5f4..0000000000
--- a/types/react-icons/go/arrow-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/arrow-left.d.ts b/types/react-icons/go/arrow-left.d.ts
deleted file mode 100644
index 4bbebb5f65..0000000000
--- a/types/react-icons/go/arrow-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/arrow-right.d.ts b/types/react-icons/go/arrow-right.d.ts
deleted file mode 100644
index 484a4f9317..0000000000
--- a/types/react-icons/go/arrow-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/arrow-small-down.d.ts b/types/react-icons/go/arrow-small-down.d.ts
deleted file mode 100644
index d4aa907034..0000000000
--- a/types/react-icons/go/arrow-small-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowSmallDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/arrow-small-left.d.ts b/types/react-icons/go/arrow-small-left.d.ts
deleted file mode 100644
index a3700b5837..0000000000
--- a/types/react-icons/go/arrow-small-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowSmallLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/arrow-small-right.d.ts b/types/react-icons/go/arrow-small-right.d.ts
deleted file mode 100644
index 0ada4d71ee..0000000000
--- a/types/react-icons/go/arrow-small-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowSmallRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/arrow-small-up.d.ts b/types/react-icons/go/arrow-small-up.d.ts
deleted file mode 100644
index 2bd6cdb4f3..0000000000
--- a/types/react-icons/go/arrow-small-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowSmallUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/arrow-up.d.ts b/types/react-icons/go/arrow-up.d.ts
deleted file mode 100644
index 67a6866297..0000000000
--- a/types/react-icons/go/arrow-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/beer.d.ts b/types/react-icons/go/beer.d.ts
deleted file mode 100644
index 71baf9a3ac..0000000000
--- a/types/react-icons/go/beer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoBeer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/book.d.ts b/types/react-icons/go/book.d.ts
deleted file mode 100644
index cd181328b6..0000000000
--- a/types/react-icons/go/book.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoBook extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/bookmark.d.ts b/types/react-icons/go/bookmark.d.ts
deleted file mode 100644
index d3b156181f..0000000000
--- a/types/react-icons/go/bookmark.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoBookmark extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/briefcase.d.ts b/types/react-icons/go/briefcase.d.ts
deleted file mode 100644
index 984092ba9b..0000000000
--- a/types/react-icons/go/briefcase.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoBriefcase extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/broadcast.d.ts b/types/react-icons/go/broadcast.d.ts
deleted file mode 100644
index 6c40834a02..0000000000
--- a/types/react-icons/go/broadcast.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoBroadcast extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/browser.d.ts b/types/react-icons/go/browser.d.ts
deleted file mode 100644
index c268f36ec0..0000000000
--- a/types/react-icons/go/browser.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoBrowser extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/bug.d.ts b/types/react-icons/go/bug.d.ts
deleted file mode 100644
index 8159ff886d..0000000000
--- a/types/react-icons/go/bug.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoBug extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/calendar.d.ts b/types/react-icons/go/calendar.d.ts
deleted file mode 100644
index 5c52a2bf67..0000000000
--- a/types/react-icons/go/calendar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoCalendar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/check.d.ts b/types/react-icons/go/check.d.ts
deleted file mode 100644
index f1f9c1536b..0000000000
--- a/types/react-icons/go/check.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoCheck extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/checklist.d.ts b/types/react-icons/go/checklist.d.ts
deleted file mode 100644
index e1bfc3a76e..0000000000
--- a/types/react-icons/go/checklist.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoChecklist extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/chevron-down.d.ts b/types/react-icons/go/chevron-down.d.ts
deleted file mode 100644
index 4879ed7129..0000000000
--- a/types/react-icons/go/chevron-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoChevronDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/chevron-left.d.ts b/types/react-icons/go/chevron-left.d.ts
deleted file mode 100644
index 36a6c0f96a..0000000000
--- a/types/react-icons/go/chevron-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoChevronLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/chevron-right.d.ts b/types/react-icons/go/chevron-right.d.ts
deleted file mode 100644
index 55e19d951a..0000000000
--- a/types/react-icons/go/chevron-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoChevronRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/chevron-up.d.ts b/types/react-icons/go/chevron-up.d.ts
deleted file mode 100644
index 2eba9e55c4..0000000000
--- a/types/react-icons/go/chevron-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoChevronUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/circle-slash.d.ts b/types/react-icons/go/circle-slash.d.ts
deleted file mode 100644
index 4400a217f6..0000000000
--- a/types/react-icons/go/circle-slash.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoCircleSlash extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/circuit-board.d.ts b/types/react-icons/go/circuit-board.d.ts
deleted file mode 100644
index 396c2dc8e8..0000000000
--- a/types/react-icons/go/circuit-board.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoCircuitBoard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/clippy.d.ts b/types/react-icons/go/clippy.d.ts
deleted file mode 100644
index 3483e7754e..0000000000
--- a/types/react-icons/go/clippy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoClippy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/clock.d.ts b/types/react-icons/go/clock.d.ts
deleted file mode 100644
index 3cac2ddd8a..0000000000
--- a/types/react-icons/go/clock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoClock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/cloud-download.d.ts b/types/react-icons/go/cloud-download.d.ts
deleted file mode 100644
index a04b70acac..0000000000
--- a/types/react-icons/go/cloud-download.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoCloudDownload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/cloud-upload.d.ts b/types/react-icons/go/cloud-upload.d.ts
deleted file mode 100644
index 07ac4f6286..0000000000
--- a/types/react-icons/go/cloud-upload.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoCloudUpload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/code.d.ts b/types/react-icons/go/code.d.ts
deleted file mode 100644
index 7bbb2b7348..0000000000
--- a/types/react-icons/go/code.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoCode extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/color-mode.d.ts b/types/react-icons/go/color-mode.d.ts
deleted file mode 100644
index f047381423..0000000000
--- a/types/react-icons/go/color-mode.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoColorMode extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/comment-discussion.d.ts b/types/react-icons/go/comment-discussion.d.ts
deleted file mode 100644
index 62be81f952..0000000000
--- a/types/react-icons/go/comment-discussion.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoCommentDiscussion extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/comment.d.ts b/types/react-icons/go/comment.d.ts
deleted file mode 100644
index 2e14daa806..0000000000
--- a/types/react-icons/go/comment.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoComment extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/credit-card.d.ts b/types/react-icons/go/credit-card.d.ts
deleted file mode 100644
index d7dbb4127c..0000000000
--- a/types/react-icons/go/credit-card.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoCreditCard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/dash.d.ts b/types/react-icons/go/dash.d.ts
deleted file mode 100644
index c7c6ca094f..0000000000
--- a/types/react-icons/go/dash.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoDash extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/dashboard.d.ts b/types/react-icons/go/dashboard.d.ts
deleted file mode 100644
index ab328f0213..0000000000
--- a/types/react-icons/go/dashboard.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoDashboard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/database.d.ts b/types/react-icons/go/database.d.ts
deleted file mode 100644
index 34758c332d..0000000000
--- a/types/react-icons/go/database.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoDatabase extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/device-camera-video.d.ts b/types/react-icons/go/device-camera-video.d.ts
deleted file mode 100644
index 9274c81fdd..0000000000
--- a/types/react-icons/go/device-camera-video.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoDeviceCameraVideo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/device-camera.d.ts b/types/react-icons/go/device-camera.d.ts
deleted file mode 100644
index 65a3f9aa8c..0000000000
--- a/types/react-icons/go/device-camera.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoDeviceCamera extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/device-desktop.d.ts b/types/react-icons/go/device-desktop.d.ts
deleted file mode 100644
index 7c75dfe2f1..0000000000
--- a/types/react-icons/go/device-desktop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoDeviceDesktop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/device-mobile.d.ts b/types/react-icons/go/device-mobile.d.ts
deleted file mode 100644
index 046f63558d..0000000000
--- a/types/react-icons/go/device-mobile.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoDeviceMobile extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/diff-added.d.ts b/types/react-icons/go/diff-added.d.ts
deleted file mode 100644
index bde41f0f53..0000000000
--- a/types/react-icons/go/diff-added.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoDiffAdded extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/diff-ignored.d.ts b/types/react-icons/go/diff-ignored.d.ts
deleted file mode 100644
index 2508e07fa9..0000000000
--- a/types/react-icons/go/diff-ignored.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoDiffIgnored extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/diff-modified.d.ts b/types/react-icons/go/diff-modified.d.ts
deleted file mode 100644
index af95e1337d..0000000000
--- a/types/react-icons/go/diff-modified.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoDiffModified extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/diff-removed.d.ts b/types/react-icons/go/diff-removed.d.ts
deleted file mode 100644
index 46b1e78387..0000000000
--- a/types/react-icons/go/diff-removed.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoDiffRemoved extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/diff-renamed.d.ts b/types/react-icons/go/diff-renamed.d.ts
deleted file mode 100644
index c73850d52c..0000000000
--- a/types/react-icons/go/diff-renamed.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoDiffRenamed extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/diff.d.ts b/types/react-icons/go/diff.d.ts
deleted file mode 100644
index ebc0f14e2d..0000000000
--- a/types/react-icons/go/diff.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoDiff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/ellipsis.d.ts b/types/react-icons/go/ellipsis.d.ts
deleted file mode 100644
index b8a40f3e30..0000000000
--- a/types/react-icons/go/ellipsis.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoEllipsis extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/eye.d.ts b/types/react-icons/go/eye.d.ts
deleted file mode 100644
index 91e5fe5385..0000000000
--- a/types/react-icons/go/eye.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoEye extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/file-binary.d.ts b/types/react-icons/go/file-binary.d.ts
deleted file mode 100644
index b5ab33f79a..0000000000
--- a/types/react-icons/go/file-binary.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoFileBinary extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/file-code.d.ts b/types/react-icons/go/file-code.d.ts
deleted file mode 100644
index 297e89de52..0000000000
--- a/types/react-icons/go/file-code.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoFileCode extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/file-directory.d.ts b/types/react-icons/go/file-directory.d.ts
deleted file mode 100644
index a64af8f137..0000000000
--- a/types/react-icons/go/file-directory.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoFileDirectory extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/file-media.d.ts b/types/react-icons/go/file-media.d.ts
deleted file mode 100644
index 8cf5535220..0000000000
--- a/types/react-icons/go/file-media.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoFileMedia extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/file-pdf.d.ts b/types/react-icons/go/file-pdf.d.ts
deleted file mode 100644
index 43ae39d5a7..0000000000
--- a/types/react-icons/go/file-pdf.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoFilePdf extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/file-submodule.d.ts b/types/react-icons/go/file-submodule.d.ts
deleted file mode 100644
index 5a9499dbac..0000000000
--- a/types/react-icons/go/file-submodule.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoFileSubmodule extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/file-symlink-directory.d.ts b/types/react-icons/go/file-symlink-directory.d.ts
deleted file mode 100644
index 5337059393..0000000000
--- a/types/react-icons/go/file-symlink-directory.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoFileSymlinkDirectory extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/file-symlink-file.d.ts b/types/react-icons/go/file-symlink-file.d.ts
deleted file mode 100644
index 0116f9d2f0..0000000000
--- a/types/react-icons/go/file-symlink-file.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoFileSymlinkFile extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/file-text.d.ts b/types/react-icons/go/file-text.d.ts
deleted file mode 100644
index 23b59dfcfd..0000000000
--- a/types/react-icons/go/file-text.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoFileText extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/file-zip.d.ts b/types/react-icons/go/file-zip.d.ts
deleted file mode 100644
index e4f588b5db..0000000000
--- a/types/react-icons/go/file-zip.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoFileZip extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/flame.d.ts b/types/react-icons/go/flame.d.ts
deleted file mode 100644
index baa5aa3739..0000000000
--- a/types/react-icons/go/flame.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoFlame extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/fold.d.ts b/types/react-icons/go/fold.d.ts
deleted file mode 100644
index 7ae869e942..0000000000
--- a/types/react-icons/go/fold.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoFold extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/gear.d.ts b/types/react-icons/go/gear.d.ts
deleted file mode 100644
index 7fd837ffbc..0000000000
--- a/types/react-icons/go/gear.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoGear extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/gift.d.ts b/types/react-icons/go/gift.d.ts
deleted file mode 100644
index 98b9deb223..0000000000
--- a/types/react-icons/go/gift.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoGift extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/gist-secret.d.ts b/types/react-icons/go/gist-secret.d.ts
deleted file mode 100644
index c69f135efd..0000000000
--- a/types/react-icons/go/gist-secret.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoGistSecret extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/gist.d.ts b/types/react-icons/go/gist.d.ts
deleted file mode 100644
index 8f1ff4e827..0000000000
--- a/types/react-icons/go/gist.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoGist extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/git-branch.d.ts b/types/react-icons/go/git-branch.d.ts
deleted file mode 100644
index 52a90bd2a5..0000000000
--- a/types/react-icons/go/git-branch.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoGitBranch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/git-commit.d.ts b/types/react-icons/go/git-commit.d.ts
deleted file mode 100644
index a1ad866ee2..0000000000
--- a/types/react-icons/go/git-commit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoGitCommit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/git-compare.d.ts b/types/react-icons/go/git-compare.d.ts
deleted file mode 100644
index 4336af1b22..0000000000
--- a/types/react-icons/go/git-compare.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoGitCompare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/git-merge.d.ts b/types/react-icons/go/git-merge.d.ts
deleted file mode 100644
index f7d3457db7..0000000000
--- a/types/react-icons/go/git-merge.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoGitMerge extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/git-pull-request.d.ts b/types/react-icons/go/git-pull-request.d.ts
deleted file mode 100644
index 0c79ca8175..0000000000
--- a/types/react-icons/go/git-pull-request.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoGitPullRequest extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/globe.d.ts b/types/react-icons/go/globe.d.ts
deleted file mode 100644
index b1893d7685..0000000000
--- a/types/react-icons/go/globe.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoGlobe extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/graph.d.ts b/types/react-icons/go/graph.d.ts
deleted file mode 100644
index 8f1c24ba75..0000000000
--- a/types/react-icons/go/graph.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoGraph extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/heart.d.ts b/types/react-icons/go/heart.d.ts
deleted file mode 100644
index 8f56d447ef..0000000000
--- a/types/react-icons/go/heart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoHeart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/history.d.ts b/types/react-icons/go/history.d.ts
deleted file mode 100644
index c91e923a69..0000000000
--- a/types/react-icons/go/history.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoHistory extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/home.d.ts b/types/react-icons/go/home.d.ts
deleted file mode 100644
index 97d032716f..0000000000
--- a/types/react-icons/go/home.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoHome extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/horizontal-rule.d.ts b/types/react-icons/go/horizontal-rule.d.ts
deleted file mode 100644
index 336e1f4eeb..0000000000
--- a/types/react-icons/go/horizontal-rule.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoHorizontalRule extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/hourglass.d.ts b/types/react-icons/go/hourglass.d.ts
deleted file mode 100644
index ad0fdf8563..0000000000
--- a/types/react-icons/go/hourglass.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoHourglass extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/hubot.d.ts b/types/react-icons/go/hubot.d.ts
deleted file mode 100644
index 984cc59a02..0000000000
--- a/types/react-icons/go/hubot.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoHubot extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/inbox.d.ts b/types/react-icons/go/inbox.d.ts
deleted file mode 100644
index fe75bf017e..0000000000
--- a/types/react-icons/go/inbox.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoInbox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/index.d.ts b/types/react-icons/go/index.d.ts
deleted file mode 100644
index 285be47453..0000000000
--- a/types/react-icons/go/index.d.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-export { default as GoAlert } from "./alert";
-export { default as GoAlignmentAlign } from "./alignment-align";
-export { default as GoAlignmentAlignedTo } from "./alignment-aligned-to";
-export { default as GoAlignmentUnalign } from "./alignment-unalign";
-export { default as GoArrowDown } from "./arrow-down";
-export { default as GoArrowLeft } from "./arrow-left";
-export { default as GoArrowRight } from "./arrow-right";
-export { default as GoArrowSmallDown } from "./arrow-small-down";
-export { default as GoArrowSmallLeft } from "./arrow-small-left";
-export { default as GoArrowSmallRight } from "./arrow-small-right";
-export { default as GoArrowSmallUp } from "./arrow-small-up";
-export { default as GoArrowUp } from "./arrow-up";
-export { default as GoBeer } from "./beer";
-export { default as GoBook } from "./book";
-export { default as GoBookmark } from "./bookmark";
-export { default as GoBriefcase } from "./briefcase";
-export { default as GoBroadcast } from "./broadcast";
-export { default as GoBrowser } from "./browser";
-export { default as GoBug } from "./bug";
-export { default as GoCalendar } from "./calendar";
-export { default as GoCheck } from "./check";
-export { default as GoChecklist } from "./checklist";
-export { default as GoChevronDown } from "./chevron-down";
-export { default as GoChevronLeft } from "./chevron-left";
-export { default as GoChevronRight } from "./chevron-right";
-export { default as GoChevronUp } from "./chevron-up";
-export { default as GoCircleSlash } from "./circle-slash";
-export { default as GoCircuitBoard } from "./circuit-board";
-export { default as GoClippy } from "./clippy";
-export { default as GoClock } from "./clock";
-export { default as GoCloudDownload } from "./cloud-download";
-export { default as GoCloudUpload } from "./cloud-upload";
-export { default as GoCode } from "./code";
-export { default as GoColorMode } from "./color-mode";
-export { default as GoCommentDiscussion } from "./comment-discussion";
-export { default as GoComment } from "./comment";
-export { default as GoCreditCard } from "./credit-card";
-export { default as GoDash } from "./dash";
-export { default as GoDashboard } from "./dashboard";
-export { default as GoDatabase } from "./database";
-export { default as GoDeviceCameraVideo } from "./device-camera-video";
-export { default as GoDeviceCamera } from "./device-camera";
-export { default as GoDeviceDesktop } from "./device-desktop";
-export { default as GoDeviceMobile } from "./device-mobile";
-export { default as GoDiffAdded } from "./diff-added";
-export { default as GoDiffIgnored } from "./diff-ignored";
-export { default as GoDiffModified } from "./diff-modified";
-export { default as GoDiffRemoved } from "./diff-removed";
-export { default as GoDiffRenamed } from "./diff-renamed";
-export { default as GoDiff } from "./diff";
-export { default as GoEllipsis } from "./ellipsis";
-export { default as GoEye } from "./eye";
-export { default as GoFileBinary } from "./file-binary";
-export { default as GoFileCode } from "./file-code";
-export { default as GoFileDirectory } from "./file-directory";
-export { default as GoFileMedia } from "./file-media";
-export { default as GoFilePdf } from "./file-pdf";
-export { default as GoFileSubmodule } from "./file-submodule";
-export { default as GoFileSymlinkDirectory } from "./file-symlink-directory";
-export { default as GoFileSymlinkFile } from "./file-symlink-file";
-export { default as GoFileText } from "./file-text";
-export { default as GoFileZip } from "./file-zip";
-export { default as GoFlame } from "./flame";
-export { default as GoFold } from "./fold";
-export { default as GoGear } from "./gear";
-export { default as GoGift } from "./gift";
-export { default as GoGistSecret } from "./gist-secret";
-export { default as GoGist } from "./gist";
-export { default as GoGitBranch } from "./git-branch";
-export { default as GoGitCommit } from "./git-commit";
-export { default as GoGitCompare } from "./git-compare";
-export { default as GoGitMerge } from "./git-merge";
-export { default as GoGitPullRequest } from "./git-pull-request";
-export { default as GoGlobe } from "./globe";
-export { default as GoGraph } from "./graph";
-export { default as GoHeart } from "./heart";
-export { default as GoHistory } from "./history";
-export { default as GoHome } from "./home";
-export { default as GoHorizontalRule } from "./horizontal-rule";
-export { default as GoHourglass } from "./hourglass";
-export { default as GoHubot } from "./hubot";
-export { default as GoInbox } from "./inbox";
-export { default as GoInfo } from "./info";
-export { default as GoIssueClosed } from "./issue-closed";
-export { default as GoIssueOpened } from "./issue-opened";
-export { default as GoIssueReopened } from "./issue-reopened";
-export { default as GoJersey } from "./jersey";
-export { default as GoJumpDown } from "./jump-down";
-export { default as GoJumpLeft } from "./jump-left";
-export { default as GoJumpRight } from "./jump-right";
-export { default as GoJumpUp } from "./jump-up";
-export { default as GoKey } from "./key";
-export { default as GoKeyboard } from "./keyboard";
-export { default as GoLaw } from "./law";
-export { default as GoLightBulb } from "./light-bulb";
-export { default as GoLinkExternal } from "./link-external";
-export { default as GoLink } from "./link";
-export { default as GoListOrdered } from "./list-ordered";
-export { default as GoListUnordered } from "./list-unordered";
-export { default as GoLocation } from "./location";
-export { default as GoLock } from "./lock";
-export { default as GoLogoGithub } from "./logo-github";
-export { default as GoMailRead } from "./mail-read";
-export { default as GoMailReply } from "./mail-reply";
-export { default as GoMail } from "./mail";
-export { default as GoMarkGithub } from "./mark-github";
-export { default as GoMarkdown } from "./markdown";
-export { default as GoMegaphone } from "./megaphone";
-export { default as GoMention } from "./mention";
-export { default as GoMicroscope } from "./microscope";
-export { default as GoMilestone } from "./milestone";
-export { default as GoMirror } from "./mirror";
-export { default as GoMortarBoard } from "./mortar-board";
-export { default as GoMoveDown } from "./move-down";
-export { default as GoMoveLeft } from "./move-left";
-export { default as GoMoveRight } from "./move-right";
-export { default as GoMoveUp } from "./move-up";
-export { default as GoMute } from "./mute";
-export { default as GoNoNewline } from "./no-newline";
-export { default as GoOctoface } from "./octoface";
-export { default as GoOrganization } from "./organization";
-export { default as GoPackage } from "./package";
-export { default as GoPaintcan } from "./paintcan";
-export { default as GoPencil } from "./pencil";
-export { default as GoPerson } from "./person";
-export { default as GoPin } from "./pin";
-export { default as GoPlaybackFastForward } from "./playback-fast-forward";
-export { default as GoPlaybackPause } from "./playback-pause";
-export { default as GoPlaybackPlay } from "./playback-play";
-export { default as GoPlaybackRewind } from "./playback-rewind";
-export { default as GoPlug } from "./plug";
-export { default as GoPlus } from "./plus";
-export { default as GoPodium } from "./podium";
-export { default as GoPrimitiveDot } from "./primitive-dot";
-export { default as GoPrimitiveSquare } from "./primitive-square";
-export { default as GoPulse } from "./pulse";
-export { default as GoPuzzle } from "./puzzle";
-export { default as GoQuestion } from "./question";
-export { default as GoQuote } from "./quote";
-export { default as GoRadioTower } from "./radio-tower";
-export { default as GoRepoClone } from "./repo-clone";
-export { default as GoRepoForcePush } from "./repo-force-push";
-export { default as GoRepoForked } from "./repo-forked";
-export { default as GoRepoPull } from "./repo-pull";
-export { default as GoRepoPush } from "./repo-push";
-export { default as GoRepo } from "./repo";
-export { default as GoRocket } from "./rocket";
-export { default as GoRss } from "./rss";
-export { default as GoRuby } from "./ruby";
-export { default as GoScreenFull } from "./screen-full";
-export { default as GoScreenNormal } from "./screen-normal";
-export { default as GoSearch } from "./search";
-export { default as GoServer } from "./server";
-export { default as GoSettings } from "./settings";
-export { default as GoSignIn } from "./sign-in";
-export { default as GoSignOut } from "./sign-out";
-export { default as GoSplit } from "./split";
-export { default as GoSquirrel } from "./squirrel";
-export { default as GoStar } from "./star";
-export { default as GoSteps } from "./steps";
-export { default as GoStop } from "./stop";
-export { default as GoSync } from "./sync";
-export { default as GoTag } from "./tag";
-export { default as GoTelescope } from "./telescope";
-export { default as GoTerminal } from "./terminal";
-export { default as GoThreeBars } from "./three-bars";
-export { default as GoTools } from "./tools";
-export { default as GoTrashcan } from "./trashcan";
-export { default as GoTriangleDown } from "./triangle-down";
-export { default as GoTriangleLeft } from "./triangle-left";
-export { default as GoTriangleRight } from "./triangle-right";
-export { default as GoTriangleUp } from "./triangle-up";
-export { default as GoUnfold } from "./unfold";
-export { default as GoUnmute } from "./unmute";
-export { default as GoVersions } from "./versions";
-export { default as GoX } from "./x";
-export { default as GoZap } from "./zap";
diff --git a/types/react-icons/go/info.d.ts b/types/react-icons/go/info.d.ts
deleted file mode 100644
index 2359f0e299..0000000000
--- a/types/react-icons/go/info.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoInfo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/issue-closed.d.ts b/types/react-icons/go/issue-closed.d.ts
deleted file mode 100644
index b06460c581..0000000000
--- a/types/react-icons/go/issue-closed.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoIssueClosed extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/issue-opened.d.ts b/types/react-icons/go/issue-opened.d.ts
deleted file mode 100644
index 331e3754a9..0000000000
--- a/types/react-icons/go/issue-opened.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoIssueOpened extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/issue-reopened.d.ts b/types/react-icons/go/issue-reopened.d.ts
deleted file mode 100644
index 460fb426c8..0000000000
--- a/types/react-icons/go/issue-reopened.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoIssueReopened extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/jersey.d.ts b/types/react-icons/go/jersey.d.ts
deleted file mode 100644
index 2c85c72ff0..0000000000
--- a/types/react-icons/go/jersey.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoJersey extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/jump-down.d.ts b/types/react-icons/go/jump-down.d.ts
deleted file mode 100644
index 8d0497969e..0000000000
--- a/types/react-icons/go/jump-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoJumpDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/jump-left.d.ts b/types/react-icons/go/jump-left.d.ts
deleted file mode 100644
index 9be1e1ded5..0000000000
--- a/types/react-icons/go/jump-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoJumpLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/jump-right.d.ts b/types/react-icons/go/jump-right.d.ts
deleted file mode 100644
index efdbf77170..0000000000
--- a/types/react-icons/go/jump-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoJumpRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/jump-up.d.ts b/types/react-icons/go/jump-up.d.ts
deleted file mode 100644
index f8ee7030f0..0000000000
--- a/types/react-icons/go/jump-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoJumpUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/key.d.ts b/types/react-icons/go/key.d.ts
deleted file mode 100644
index 635b754f56..0000000000
--- a/types/react-icons/go/key.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoKey extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/keyboard.d.ts b/types/react-icons/go/keyboard.d.ts
deleted file mode 100644
index 48e2f695ed..0000000000
--- a/types/react-icons/go/keyboard.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoKeyboard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/law.d.ts b/types/react-icons/go/law.d.ts
deleted file mode 100644
index 59e6dd09c6..0000000000
--- a/types/react-icons/go/law.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoLaw extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/light-bulb.d.ts b/types/react-icons/go/light-bulb.d.ts
deleted file mode 100644
index b020b05d25..0000000000
--- a/types/react-icons/go/light-bulb.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoLightBulb extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/link-external.d.ts b/types/react-icons/go/link-external.d.ts
deleted file mode 100644
index 9e93717352..0000000000
--- a/types/react-icons/go/link-external.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoLinkExternal extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/link.d.ts b/types/react-icons/go/link.d.ts
deleted file mode 100644
index 7def9d9bd3..0000000000
--- a/types/react-icons/go/link.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoLink extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/list-ordered.d.ts b/types/react-icons/go/list-ordered.d.ts
deleted file mode 100644
index 31a2859733..0000000000
--- a/types/react-icons/go/list-ordered.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoListOrdered extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/list-unordered.d.ts b/types/react-icons/go/list-unordered.d.ts
deleted file mode 100644
index 59b89e921e..0000000000
--- a/types/react-icons/go/list-unordered.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoListUnordered extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/location.d.ts b/types/react-icons/go/location.d.ts
deleted file mode 100644
index a382326479..0000000000
--- a/types/react-icons/go/location.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoLocation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/lock.d.ts b/types/react-icons/go/lock.d.ts
deleted file mode 100644
index 623ec47b53..0000000000
--- a/types/react-icons/go/lock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoLock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/logo-github.d.ts b/types/react-icons/go/logo-github.d.ts
deleted file mode 100644
index f57a2d07f7..0000000000
--- a/types/react-icons/go/logo-github.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoLogoGithub extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/mail-read.d.ts b/types/react-icons/go/mail-read.d.ts
deleted file mode 100644
index e6820b2732..0000000000
--- a/types/react-icons/go/mail-read.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMailRead extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/mail-reply.d.ts b/types/react-icons/go/mail-reply.d.ts
deleted file mode 100644
index 794cc6dca4..0000000000
--- a/types/react-icons/go/mail-reply.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMailReply extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/mail.d.ts b/types/react-icons/go/mail.d.ts
deleted file mode 100644
index bca60de455..0000000000
--- a/types/react-icons/go/mail.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMail extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/mark-github.d.ts b/types/react-icons/go/mark-github.d.ts
deleted file mode 100644
index 999521b725..0000000000
--- a/types/react-icons/go/mark-github.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMarkGithub extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/markdown.d.ts b/types/react-icons/go/markdown.d.ts
deleted file mode 100644
index 5533fd8deb..0000000000
--- a/types/react-icons/go/markdown.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMarkdown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/megaphone.d.ts b/types/react-icons/go/megaphone.d.ts
deleted file mode 100644
index c76f98d900..0000000000
--- a/types/react-icons/go/megaphone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMegaphone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/mention.d.ts b/types/react-icons/go/mention.d.ts
deleted file mode 100644
index 988f97ec6f..0000000000
--- a/types/react-icons/go/mention.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMention extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/microscope.d.ts b/types/react-icons/go/microscope.d.ts
deleted file mode 100644
index 79f91de4ab..0000000000
--- a/types/react-icons/go/microscope.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMicroscope extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/milestone.d.ts b/types/react-icons/go/milestone.d.ts
deleted file mode 100644
index a5df7c65b1..0000000000
--- a/types/react-icons/go/milestone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMilestone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/mirror.d.ts b/types/react-icons/go/mirror.d.ts
deleted file mode 100644
index c8f5f3a988..0000000000
--- a/types/react-icons/go/mirror.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMirror extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/mortar-board.d.ts b/types/react-icons/go/mortar-board.d.ts
deleted file mode 100644
index e435c2f899..0000000000
--- a/types/react-icons/go/mortar-board.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMortarBoard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/move-down.d.ts b/types/react-icons/go/move-down.d.ts
deleted file mode 100644
index cceb4a2fc6..0000000000
--- a/types/react-icons/go/move-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMoveDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/move-left.d.ts b/types/react-icons/go/move-left.d.ts
deleted file mode 100644
index 81c57b58d1..0000000000
--- a/types/react-icons/go/move-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMoveLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/move-right.d.ts b/types/react-icons/go/move-right.d.ts
deleted file mode 100644
index b9baed854c..0000000000
--- a/types/react-icons/go/move-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMoveRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/move-up.d.ts b/types/react-icons/go/move-up.d.ts
deleted file mode 100644
index b649bd2bca..0000000000
--- a/types/react-icons/go/move-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMoveUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/mute.d.ts b/types/react-icons/go/mute.d.ts
deleted file mode 100644
index 96aa49027f..0000000000
--- a/types/react-icons/go/mute.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoMute extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/no-newline.d.ts b/types/react-icons/go/no-newline.d.ts
deleted file mode 100644
index 2953cea8b0..0000000000
--- a/types/react-icons/go/no-newline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoNoNewline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/octoface.d.ts b/types/react-icons/go/octoface.d.ts
deleted file mode 100644
index 466708f844..0000000000
--- a/types/react-icons/go/octoface.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoOctoface extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/organization.d.ts b/types/react-icons/go/organization.d.ts
deleted file mode 100644
index 321899f2bd..0000000000
--- a/types/react-icons/go/organization.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoOrganization extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/package.d.ts b/types/react-icons/go/package.d.ts
deleted file mode 100644
index ecea623c3b..0000000000
--- a/types/react-icons/go/package.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPackage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/paintcan.d.ts b/types/react-icons/go/paintcan.d.ts
deleted file mode 100644
index b38f9aa673..0000000000
--- a/types/react-icons/go/paintcan.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPaintcan extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/pencil.d.ts b/types/react-icons/go/pencil.d.ts
deleted file mode 100644
index 9a2cc3fe1c..0000000000
--- a/types/react-icons/go/pencil.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPencil extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/person.d.ts b/types/react-icons/go/person.d.ts
deleted file mode 100644
index 177c738660..0000000000
--- a/types/react-icons/go/person.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPerson extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/pin.d.ts b/types/react-icons/go/pin.d.ts
deleted file mode 100644
index f083f58df7..0000000000
--- a/types/react-icons/go/pin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/playback-fast-forward.d.ts b/types/react-icons/go/playback-fast-forward.d.ts
deleted file mode 100644
index faa2293f90..0000000000
--- a/types/react-icons/go/playback-fast-forward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPlaybackFastForward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/playback-pause.d.ts b/types/react-icons/go/playback-pause.d.ts
deleted file mode 100644
index 43c3830eae..0000000000
--- a/types/react-icons/go/playback-pause.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPlaybackPause extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/playback-play.d.ts b/types/react-icons/go/playback-play.d.ts
deleted file mode 100644
index 6d90eadb63..0000000000
--- a/types/react-icons/go/playback-play.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPlaybackPlay extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/playback-rewind.d.ts b/types/react-icons/go/playback-rewind.d.ts
deleted file mode 100644
index 92080152af..0000000000
--- a/types/react-icons/go/playback-rewind.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPlaybackRewind extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/plug.d.ts b/types/react-icons/go/plug.d.ts
deleted file mode 100644
index da0ec12aa1..0000000000
--- a/types/react-icons/go/plug.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPlug extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/plus.d.ts b/types/react-icons/go/plus.d.ts
deleted file mode 100644
index 867c30b643..0000000000
--- a/types/react-icons/go/plus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPlus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/podium.d.ts b/types/react-icons/go/podium.d.ts
deleted file mode 100644
index 1c16142450..0000000000
--- a/types/react-icons/go/podium.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPodium extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/primitive-dot.d.ts b/types/react-icons/go/primitive-dot.d.ts
deleted file mode 100644
index 9a74108de7..0000000000
--- a/types/react-icons/go/primitive-dot.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPrimitiveDot extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/primitive-square.d.ts b/types/react-icons/go/primitive-square.d.ts
deleted file mode 100644
index 4a387621dd..0000000000
--- a/types/react-icons/go/primitive-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPrimitiveSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/pulse.d.ts b/types/react-icons/go/pulse.d.ts
deleted file mode 100644
index 111540b6ea..0000000000
--- a/types/react-icons/go/pulse.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPulse extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/puzzle.d.ts b/types/react-icons/go/puzzle.d.ts
deleted file mode 100644
index 759922a96d..0000000000
--- a/types/react-icons/go/puzzle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoPuzzle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/question.d.ts b/types/react-icons/go/question.d.ts
deleted file mode 100644
index 7dd4302a96..0000000000
--- a/types/react-icons/go/question.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoQuestion extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/quote.d.ts b/types/react-icons/go/quote.d.ts
deleted file mode 100644
index 47a6f2765a..0000000000
--- a/types/react-icons/go/quote.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoQuote extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/radio-tower.d.ts b/types/react-icons/go/radio-tower.d.ts
deleted file mode 100644
index fee3702338..0000000000
--- a/types/react-icons/go/radio-tower.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoRadioTower extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/repo-clone.d.ts b/types/react-icons/go/repo-clone.d.ts
deleted file mode 100644
index fb9957a21d..0000000000
--- a/types/react-icons/go/repo-clone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoRepoClone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/repo-force-push.d.ts b/types/react-icons/go/repo-force-push.d.ts
deleted file mode 100644
index 6b1bf3a2c1..0000000000
--- a/types/react-icons/go/repo-force-push.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoRepoForcePush extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/repo-forked.d.ts b/types/react-icons/go/repo-forked.d.ts
deleted file mode 100644
index e68f5a3df6..0000000000
--- a/types/react-icons/go/repo-forked.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoRepoForked extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/repo-pull.d.ts b/types/react-icons/go/repo-pull.d.ts
deleted file mode 100644
index 916310f2bc..0000000000
--- a/types/react-icons/go/repo-pull.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoRepoPull extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/repo-push.d.ts b/types/react-icons/go/repo-push.d.ts
deleted file mode 100644
index 5e9a25d3a6..0000000000
--- a/types/react-icons/go/repo-push.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoRepoPush extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/repo.d.ts b/types/react-icons/go/repo.d.ts
deleted file mode 100644
index 87dd983849..0000000000
--- a/types/react-icons/go/repo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoRepo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/rocket.d.ts b/types/react-icons/go/rocket.d.ts
deleted file mode 100644
index 04a9f8fbbb..0000000000
--- a/types/react-icons/go/rocket.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoRocket extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/rss.d.ts b/types/react-icons/go/rss.d.ts
deleted file mode 100644
index d18a40a2fb..0000000000
--- a/types/react-icons/go/rss.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoRss extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/ruby.d.ts b/types/react-icons/go/ruby.d.ts
deleted file mode 100644
index 467aecdce6..0000000000
--- a/types/react-icons/go/ruby.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoRuby extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/screen-full.d.ts b/types/react-icons/go/screen-full.d.ts
deleted file mode 100644
index f3eae2a63e..0000000000
--- a/types/react-icons/go/screen-full.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoScreenFull extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/screen-normal.d.ts b/types/react-icons/go/screen-normal.d.ts
deleted file mode 100644
index 59e38edc81..0000000000
--- a/types/react-icons/go/screen-normal.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoScreenNormal extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/search.d.ts b/types/react-icons/go/search.d.ts
deleted file mode 100644
index 54d1144369..0000000000
--- a/types/react-icons/go/search.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoSearch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/server.d.ts b/types/react-icons/go/server.d.ts
deleted file mode 100644
index 1de141c1a2..0000000000
--- a/types/react-icons/go/server.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoServer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/settings.d.ts b/types/react-icons/go/settings.d.ts
deleted file mode 100644
index a583ebe0fe..0000000000
--- a/types/react-icons/go/settings.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoSettings extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/sign-in.d.ts b/types/react-icons/go/sign-in.d.ts
deleted file mode 100644
index f1788d6395..0000000000
--- a/types/react-icons/go/sign-in.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoSignIn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/sign-out.d.ts b/types/react-icons/go/sign-out.d.ts
deleted file mode 100644
index dd87a41f43..0000000000
--- a/types/react-icons/go/sign-out.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoSignOut extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/split.d.ts b/types/react-icons/go/split.d.ts
deleted file mode 100644
index 4b930df74c..0000000000
--- a/types/react-icons/go/split.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoSplit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/squirrel.d.ts b/types/react-icons/go/squirrel.d.ts
deleted file mode 100644
index 2c1bfdc544..0000000000
--- a/types/react-icons/go/squirrel.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoSquirrel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/star.d.ts b/types/react-icons/go/star.d.ts
deleted file mode 100644
index a5f1a3718e..0000000000
--- a/types/react-icons/go/star.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoStar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/steps.d.ts b/types/react-icons/go/steps.d.ts
deleted file mode 100644
index ae1bd0f758..0000000000
--- a/types/react-icons/go/steps.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoSteps extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/stop.d.ts b/types/react-icons/go/stop.d.ts
deleted file mode 100644
index 6036ca3c7f..0000000000
--- a/types/react-icons/go/stop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoStop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/sync.d.ts b/types/react-icons/go/sync.d.ts
deleted file mode 100644
index 7a0ab4e316..0000000000
--- a/types/react-icons/go/sync.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoSync extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/tag.d.ts b/types/react-icons/go/tag.d.ts
deleted file mode 100644
index ff161ead97..0000000000
--- a/types/react-icons/go/tag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoTag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/telescope.d.ts b/types/react-icons/go/telescope.d.ts
deleted file mode 100644
index 943c1764db..0000000000
--- a/types/react-icons/go/telescope.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoTelescope extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/terminal.d.ts b/types/react-icons/go/terminal.d.ts
deleted file mode 100644
index e21c5a9461..0000000000
--- a/types/react-icons/go/terminal.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoTerminal extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/three-bars.d.ts b/types/react-icons/go/three-bars.d.ts
deleted file mode 100644
index 75fe787e3f..0000000000
--- a/types/react-icons/go/three-bars.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoThreeBars extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/tools.d.ts b/types/react-icons/go/tools.d.ts
deleted file mode 100644
index 8229abce20..0000000000
--- a/types/react-icons/go/tools.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoTools extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/trashcan.d.ts b/types/react-icons/go/trashcan.d.ts
deleted file mode 100644
index 4b27fba299..0000000000
--- a/types/react-icons/go/trashcan.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoTrashcan extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/triangle-down.d.ts b/types/react-icons/go/triangle-down.d.ts
deleted file mode 100644
index de19ba459a..0000000000
--- a/types/react-icons/go/triangle-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoTriangleDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/triangle-left.d.ts b/types/react-icons/go/triangle-left.d.ts
deleted file mode 100644
index 309b832111..0000000000
--- a/types/react-icons/go/triangle-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoTriangleLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/triangle-right.d.ts b/types/react-icons/go/triangle-right.d.ts
deleted file mode 100644
index 989f428fb3..0000000000
--- a/types/react-icons/go/triangle-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoTriangleRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/triangle-up.d.ts b/types/react-icons/go/triangle-up.d.ts
deleted file mode 100644
index fae4ac1c25..0000000000
--- a/types/react-icons/go/triangle-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoTriangleUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/unfold.d.ts b/types/react-icons/go/unfold.d.ts
deleted file mode 100644
index 1c00f170d5..0000000000
--- a/types/react-icons/go/unfold.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoUnfold extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/unmute.d.ts b/types/react-icons/go/unmute.d.ts
deleted file mode 100644
index 90eda20972..0000000000
--- a/types/react-icons/go/unmute.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoUnmute extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/versions.d.ts b/types/react-icons/go/versions.d.ts
deleted file mode 100644
index d11586398f..0000000000
--- a/types/react-icons/go/versions.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoVersions extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/x.d.ts b/types/react-icons/go/x.d.ts
deleted file mode 100644
index 379cb94d5c..0000000000
--- a/types/react-icons/go/x.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoX extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/zap.d.ts b/types/react-icons/go/zap.d.ts
deleted file mode 100644
index 9dafc26355..0000000000
--- a/types/react-icons/go/zap.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class GoZap extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/index.d.ts b/types/react-icons/index.d.ts
deleted file mode 100644
index e65de56b08..0000000000
--- a/types/react-icons/index.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Type definitions for react-icons 2.2
-// Project: https://github.com/gorangajic/react-icons#readme
-// Definitions by: Alexandre Paré <https://github.com/apare>
-//                 John Reilly <https://github.com/johnnyreilly>
-//                 Karol Janyst <https://github.com/LKay>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
diff --git a/types/react-icons/io/alert-circled.d.ts b/types/react-icons/io/alert-circled.d.ts
deleted file mode 100644
index 1fc164cf30..0000000000
--- a/types/react-icons/io/alert-circled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAlertCircled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/alert.d.ts b/types/react-icons/io/alert.d.ts
deleted file mode 100644
index f3f236a07b..0000000000
--- a/types/react-icons/io/alert.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAlert extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-add-circle.d.ts b/types/react-icons/io/android-add-circle.d.ts
deleted file mode 100644
index 83301fe5b9..0000000000
--- a/types/react-icons/io/android-add-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidAddCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-add.d.ts b/types/react-icons/io/android-add.d.ts
deleted file mode 100644
index d6ec32e120..0000000000
--- a/types/react-icons/io/android-add.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidAdd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-alarm-clock.d.ts b/types/react-icons/io/android-alarm-clock.d.ts
deleted file mode 100644
index ba7424414a..0000000000
--- a/types/react-icons/io/android-alarm-clock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidAlarmClock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-alert.d.ts b/types/react-icons/io/android-alert.d.ts
deleted file mode 100644
index 23f9c0fc85..0000000000
--- a/types/react-icons/io/android-alert.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidAlert extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-apps.d.ts b/types/react-icons/io/android-apps.d.ts
deleted file mode 100644
index 4ce9dca7c6..0000000000
--- a/types/react-icons/io/android-apps.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidApps extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-archive.d.ts b/types/react-icons/io/android-archive.d.ts
deleted file mode 100644
index bd86f53213..0000000000
--- a/types/react-icons/io/android-archive.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArchive extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-arrow-back.d.ts b/types/react-icons/io/android-arrow-back.d.ts
deleted file mode 100644
index ccf8a5dc52..0000000000
--- a/types/react-icons/io/android-arrow-back.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowBack extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-arrow-down.d.ts b/types/react-icons/io/android-arrow-down.d.ts
deleted file mode 100644
index 71d5471bb6..0000000000
--- a/types/react-icons/io/android-arrow-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-arrow-dropdown-circle.d.ts b/types/react-icons/io/android-arrow-dropdown-circle.d.ts
deleted file mode 100644
index 6a11a88c20..0000000000
--- a/types/react-icons/io/android-arrow-dropdown-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropdownCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-arrow-dropdown.d.ts b/types/react-icons/io/android-arrow-dropdown.d.ts
deleted file mode 100644
index ec91403322..0000000000
--- a/types/react-icons/io/android-arrow-dropdown.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropdown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-arrow-dropleft-circle.d.ts b/types/react-icons/io/android-arrow-dropleft-circle.d.ts
deleted file mode 100644
index a972b89ae8..0000000000
--- a/types/react-icons/io/android-arrow-dropleft-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropleftCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-arrow-dropleft.d.ts b/types/react-icons/io/android-arrow-dropleft.d.ts
deleted file mode 100644
index 0477b93c0b..0000000000
--- a/types/react-icons/io/android-arrow-dropleft.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropleft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-arrow-dropright-circle.d.ts b/types/react-icons/io/android-arrow-dropright-circle.d.ts
deleted file mode 100644
index 2e53387d79..0000000000
--- a/types/react-icons/io/android-arrow-dropright-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDroprightCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-arrow-dropright.d.ts b/types/react-icons/io/android-arrow-dropright.d.ts
deleted file mode 100644
index b1ebcac3a3..0000000000
--- a/types/react-icons/io/android-arrow-dropright.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropright extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-arrow-dropup-circle.d.ts b/types/react-icons/io/android-arrow-dropup-circle.d.ts
deleted file mode 100644
index cb8d87c3b7..0000000000
--- a/types/react-icons/io/android-arrow-dropup-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropupCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-arrow-dropup.d.ts b/types/react-icons/io/android-arrow-dropup.d.ts
deleted file mode 100644
index b52c196650..0000000000
--- a/types/react-icons/io/android-arrow-dropup.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropup extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-arrow-forward.d.ts b/types/react-icons/io/android-arrow-forward.d.ts
deleted file mode 100644
index a2e4cfcf3c..0000000000
--- a/types/react-icons/io/android-arrow-forward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowForward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-arrow-up.d.ts b/types/react-icons/io/android-arrow-up.d.ts
deleted file mode 100644
index 8d30e1f1d6..0000000000
--- a/types/react-icons/io/android-arrow-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-attach.d.ts b/types/react-icons/io/android-attach.d.ts
deleted file mode 100644
index 42b704ef71..0000000000
--- a/types/react-icons/io/android-attach.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidAttach extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-bar.d.ts b/types/react-icons/io/android-bar.d.ts
deleted file mode 100644
index 0dbc0148db..0000000000
--- a/types/react-icons/io/android-bar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-bicycle.d.ts b/types/react-icons/io/android-bicycle.d.ts
deleted file mode 100644
index 7e8c1ef911..0000000000
--- a/types/react-icons/io/android-bicycle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBicycle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-boat.d.ts b/types/react-icons/io/android-boat.d.ts
deleted file mode 100644
index 59bf285c2b..0000000000
--- a/types/react-icons/io/android-boat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBoat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-bookmark.d.ts b/types/react-icons/io/android-bookmark.d.ts
deleted file mode 100644
index 1585e691ac..0000000000
--- a/types/react-icons/io/android-bookmark.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBookmark extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-bulb.d.ts b/types/react-icons/io/android-bulb.d.ts
deleted file mode 100644
index 04b9d70acb..0000000000
--- a/types/react-icons/io/android-bulb.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBulb extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-bus.d.ts b/types/react-icons/io/android-bus.d.ts
deleted file mode 100644
index 2e93dc479b..0000000000
--- a/types/react-icons/io/android-bus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-calendar.d.ts b/types/react-icons/io/android-calendar.d.ts
deleted file mode 100644
index a884f3ff51..0000000000
--- a/types/react-icons/io/android-calendar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCalendar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-call.d.ts b/types/react-icons/io/android-call.d.ts
deleted file mode 100644
index 2b13615abf..0000000000
--- a/types/react-icons/io/android-call.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCall extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-camera.d.ts b/types/react-icons/io/android-camera.d.ts
deleted file mode 100644
index 042a0b2694..0000000000
--- a/types/react-icons/io/android-camera.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCamera extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-cancel.d.ts b/types/react-icons/io/android-cancel.d.ts
deleted file mode 100644
index 067a2a32f0..0000000000
--- a/types/react-icons/io/android-cancel.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCancel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-car.d.ts b/types/react-icons/io/android-car.d.ts
deleted file mode 100644
index fcb7c849d8..0000000000
--- a/types/react-icons/io/android-car.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-cart.d.ts b/types/react-icons/io/android-cart.d.ts
deleted file mode 100644
index 7d944a55c5..0000000000
--- a/types/react-icons/io/android-cart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-chat.d.ts b/types/react-icons/io/android-chat.d.ts
deleted file mode 100644
index 8789c4f12b..0000000000
--- a/types/react-icons/io/android-chat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidChat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-checkbox-blank.d.ts b/types/react-icons/io/android-checkbox-blank.d.ts
deleted file mode 100644
index 2651183ba1..0000000000
--- a/types/react-icons/io/android-checkbox-blank.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCheckboxBlank extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-checkbox-outline-blank.d.ts b/types/react-icons/io/android-checkbox-outline-blank.d.ts
deleted file mode 100644
index cf6a3a3d5e..0000000000
--- a/types/react-icons/io/android-checkbox-outline-blank.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCheckboxOutlineBlank extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-checkbox-outline.d.ts b/types/react-icons/io/android-checkbox-outline.d.ts
deleted file mode 100644
index 3a6347a302..0000000000
--- a/types/react-icons/io/android-checkbox-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCheckboxOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-checkbox.d.ts b/types/react-icons/io/android-checkbox.d.ts
deleted file mode 100644
index cb21d62e65..0000000000
--- a/types/react-icons/io/android-checkbox.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCheckbox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-checkmark-circle.d.ts b/types/react-icons/io/android-checkmark-circle.d.ts
deleted file mode 100644
index 3671ada3d0..0000000000
--- a/types/react-icons/io/android-checkmark-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCheckmarkCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-clipboard.d.ts b/types/react-icons/io/android-clipboard.d.ts
deleted file mode 100644
index 3d93506b17..0000000000
--- a/types/react-icons/io/android-clipboard.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidClipboard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-close.d.ts b/types/react-icons/io/android-close.d.ts
deleted file mode 100644
index ad32b8b302..0000000000
--- a/types/react-icons/io/android-close.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidClose extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-cloud-circle.d.ts b/types/react-icons/io/android-cloud-circle.d.ts
deleted file mode 100644
index 9c30f64677..0000000000
--- a/types/react-icons/io/android-cloud-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCloudCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-cloud-done.d.ts b/types/react-icons/io/android-cloud-done.d.ts
deleted file mode 100644
index 6900251eec..0000000000
--- a/types/react-icons/io/android-cloud-done.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCloudDone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-cloud-outline.d.ts b/types/react-icons/io/android-cloud-outline.d.ts
deleted file mode 100644
index a8144aad15..0000000000
--- a/types/react-icons/io/android-cloud-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCloudOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-cloud.d.ts b/types/react-icons/io/android-cloud.d.ts
deleted file mode 100644
index e0fc48bfd5..0000000000
--- a/types/react-icons/io/android-cloud.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCloud extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-color-palette.d.ts b/types/react-icons/io/android-color-palette.d.ts
deleted file mode 100644
index 79ddef8b10..0000000000
--- a/types/react-icons/io/android-color-palette.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidColorPalette extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-compass.d.ts b/types/react-icons/io/android-compass.d.ts
deleted file mode 100644
index c577a6a3fd..0000000000
--- a/types/react-icons/io/android-compass.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCompass extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-contact.d.ts b/types/react-icons/io/android-contact.d.ts
deleted file mode 100644
index 933faca311..0000000000
--- a/types/react-icons/io/android-contact.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidContact extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-contacts.d.ts b/types/react-icons/io/android-contacts.d.ts
deleted file mode 100644
index 22f23054ff..0000000000
--- a/types/react-icons/io/android-contacts.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidContacts extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-contract.d.ts b/types/react-icons/io/android-contract.d.ts
deleted file mode 100644
index 87c6a88fa1..0000000000
--- a/types/react-icons/io/android-contract.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidContract extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-create.d.ts b/types/react-icons/io/android-create.d.ts
deleted file mode 100644
index 38c4a7fa79..0000000000
--- a/types/react-icons/io/android-create.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCreate extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-delete.d.ts b/types/react-icons/io/android-delete.d.ts
deleted file mode 100644
index 1863649507..0000000000
--- a/types/react-icons/io/android-delete.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDelete extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-desktop.d.ts b/types/react-icons/io/android-desktop.d.ts
deleted file mode 100644
index a8233e4c61..0000000000
--- a/types/react-icons/io/android-desktop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDesktop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-document.d.ts b/types/react-icons/io/android-document.d.ts
deleted file mode 100644
index b2a4c4d5a3..0000000000
--- a/types/react-icons/io/android-document.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDocument extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-done-all.d.ts b/types/react-icons/io/android-done-all.d.ts
deleted file mode 100644
index 9759331f5e..0000000000
--- a/types/react-icons/io/android-done-all.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDoneAll extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-done.d.ts b/types/react-icons/io/android-done.d.ts
deleted file mode 100644
index ef68fc8e34..0000000000
--- a/types/react-icons/io/android-done.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-download.d.ts b/types/react-icons/io/android-download.d.ts
deleted file mode 100644
index 35caf226ba..0000000000
--- a/types/react-icons/io/android-download.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDownload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-drafts.d.ts b/types/react-icons/io/android-drafts.d.ts
deleted file mode 100644
index c143e50a3d..0000000000
--- a/types/react-icons/io/android-drafts.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDrafts extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-exit.d.ts b/types/react-icons/io/android-exit.d.ts
deleted file mode 100644
index ad1c1fa91e..0000000000
--- a/types/react-icons/io/android-exit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidExit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-expand.d.ts b/types/react-icons/io/android-expand.d.ts
deleted file mode 100644
index 01e32a17c5..0000000000
--- a/types/react-icons/io/android-expand.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidExpand extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-favorite-outline.d.ts b/types/react-icons/io/android-favorite-outline.d.ts
deleted file mode 100644
index 9d26146836..0000000000
--- a/types/react-icons/io/android-favorite-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFavoriteOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-favorite.d.ts b/types/react-icons/io/android-favorite.d.ts
deleted file mode 100644
index 17fd1ebcb0..0000000000
--- a/types/react-icons/io/android-favorite.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFavorite extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-film.d.ts b/types/react-icons/io/android-film.d.ts
deleted file mode 100644
index d78bd6bf92..0000000000
--- a/types/react-icons/io/android-film.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFilm extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-folder-open.d.ts b/types/react-icons/io/android-folder-open.d.ts
deleted file mode 100644
index b494784e58..0000000000
--- a/types/react-icons/io/android-folder-open.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFolderOpen extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-folder.d.ts b/types/react-icons/io/android-folder.d.ts
deleted file mode 100644
index 19fa386920..0000000000
--- a/types/react-icons/io/android-folder.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFolder extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-funnel.d.ts b/types/react-icons/io/android-funnel.d.ts
deleted file mode 100644
index a43e13c0e5..0000000000
--- a/types/react-icons/io/android-funnel.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFunnel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-globe.d.ts b/types/react-icons/io/android-globe.d.ts
deleted file mode 100644
index 7d27e58cc1..0000000000
--- a/types/react-icons/io/android-globe.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidGlobe extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-hand.d.ts b/types/react-icons/io/android-hand.d.ts
deleted file mode 100644
index 280652d333..0000000000
--- a/types/react-icons/io/android-hand.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidHand extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-hangout.d.ts b/types/react-icons/io/android-hangout.d.ts
deleted file mode 100644
index 452158902c..0000000000
--- a/types/react-icons/io/android-hangout.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidHangout extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-happy.d.ts b/types/react-icons/io/android-happy.d.ts
deleted file mode 100644
index 7343ceb5dd..0000000000
--- a/types/react-icons/io/android-happy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidHappy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-home.d.ts b/types/react-icons/io/android-home.d.ts
deleted file mode 100644
index 75cc1ed488..0000000000
--- a/types/react-icons/io/android-home.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidHome extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-image.d.ts b/types/react-icons/io/android-image.d.ts
deleted file mode 100644
index 46d20ffdc2..0000000000
--- a/types/react-icons/io/android-image.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidImage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-laptop.d.ts b/types/react-icons/io/android-laptop.d.ts
deleted file mode 100644
index 749f603ebc..0000000000
--- a/types/react-icons/io/android-laptop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidLaptop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-list.d.ts b/types/react-icons/io/android-list.d.ts
deleted file mode 100644
index d366495d98..0000000000
--- a/types/react-icons/io/android-list.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidList extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-locate.d.ts b/types/react-icons/io/android-locate.d.ts
deleted file mode 100644
index b99c14cf66..0000000000
--- a/types/react-icons/io/android-locate.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidLocate extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-lock.d.ts b/types/react-icons/io/android-lock.d.ts
deleted file mode 100644
index 5447214ecf..0000000000
--- a/types/react-icons/io/android-lock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidLock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-mail.d.ts b/types/react-icons/io/android-mail.d.ts
deleted file mode 100644
index 29529c349f..0000000000
--- a/types/react-icons/io/android-mail.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMail extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-map.d.ts b/types/react-icons/io/android-map.d.ts
deleted file mode 100644
index 521561d56e..0000000000
--- a/types/react-icons/io/android-map.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMap extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-menu.d.ts b/types/react-icons/io/android-menu.d.ts
deleted file mode 100644
index f14d3f29fa..0000000000
--- a/types/react-icons/io/android-menu.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMenu extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-microphone-off.d.ts b/types/react-icons/io/android-microphone-off.d.ts
deleted file mode 100644
index 57ea0597db..0000000000
--- a/types/react-icons/io/android-microphone-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMicrophoneOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-microphone.d.ts b/types/react-icons/io/android-microphone.d.ts
deleted file mode 100644
index 2e9105f34a..0000000000
--- a/types/react-icons/io/android-microphone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMicrophone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-more-horizontal.d.ts b/types/react-icons/io/android-more-horizontal.d.ts
deleted file mode 100644
index 4bdb7f35fd..0000000000
--- a/types/react-icons/io/android-more-horizontal.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMoreHorizontal extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-more-vertical.d.ts b/types/react-icons/io/android-more-vertical.d.ts
deleted file mode 100644
index f3b900b03a..0000000000
--- a/types/react-icons/io/android-more-vertical.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMoreVertical extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-navigate.d.ts b/types/react-icons/io/android-navigate.d.ts
deleted file mode 100644
index c062fdb9a2..0000000000
--- a/types/react-icons/io/android-navigate.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidNavigate extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-notifications-none.d.ts b/types/react-icons/io/android-notifications-none.d.ts
deleted file mode 100644
index a5df08d48a..0000000000
--- a/types/react-icons/io/android-notifications-none.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidNotificationsNone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-notifications-off.d.ts b/types/react-icons/io/android-notifications-off.d.ts
deleted file mode 100644
index 38e64be76b..0000000000
--- a/types/react-icons/io/android-notifications-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidNotificationsOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-notifications.d.ts b/types/react-icons/io/android-notifications.d.ts
deleted file mode 100644
index f3fdc7b4fe..0000000000
--- a/types/react-icons/io/android-notifications.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidNotifications extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-open.d.ts b/types/react-icons/io/android-open.d.ts
deleted file mode 100644
index 8ef0abebde..0000000000
--- a/types/react-icons/io/android-open.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidOpen extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-options.d.ts b/types/react-icons/io/android-options.d.ts
deleted file mode 100644
index 61640a419f..0000000000
--- a/types/react-icons/io/android-options.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidOptions extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-people.d.ts b/types/react-icons/io/android-people.d.ts
deleted file mode 100644
index 4f19a67eda..0000000000
--- a/types/react-icons/io/android-people.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPeople extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-person-add.d.ts b/types/react-icons/io/android-person-add.d.ts
deleted file mode 100644
index 4fe6408fe0..0000000000
--- a/types/react-icons/io/android-person-add.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPersonAdd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-person.d.ts b/types/react-icons/io/android-person.d.ts
deleted file mode 100644
index ad0e00481a..0000000000
--- a/types/react-icons/io/android-person.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPerson extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-phone-landscape.d.ts b/types/react-icons/io/android-phone-landscape.d.ts
deleted file mode 100644
index bfff8ac323..0000000000
--- a/types/react-icons/io/android-phone-landscape.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPhoneLandscape extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-phone-portrait.d.ts b/types/react-icons/io/android-phone-portrait.d.ts
deleted file mode 100644
index 4a14130c8d..0000000000
--- a/types/react-icons/io/android-phone-portrait.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPhonePortrait extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-pin.d.ts b/types/react-icons/io/android-pin.d.ts
deleted file mode 100644
index 5819b33b52..0000000000
--- a/types/react-icons/io/android-pin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-plane.d.ts b/types/react-icons/io/android-plane.d.ts
deleted file mode 100644
index 4b436e096b..0000000000
--- a/types/react-icons/io/android-plane.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPlane extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-playstore.d.ts b/types/react-icons/io/android-playstore.d.ts
deleted file mode 100644
index 99174ccab2..0000000000
--- a/types/react-icons/io/android-playstore.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPlaystore extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-print.d.ts b/types/react-icons/io/android-print.d.ts
deleted file mode 100644
index b2f5807f06..0000000000
--- a/types/react-icons/io/android-print.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPrint extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-radio-button-off.d.ts b/types/react-icons/io/android-radio-button-off.d.ts
deleted file mode 100644
index fc2f705ff1..0000000000
--- a/types/react-icons/io/android-radio-button-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRadioButtonOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-radio-button-on.d.ts b/types/react-icons/io/android-radio-button-on.d.ts
deleted file mode 100644
index be28d7626e..0000000000
--- a/types/react-icons/io/android-radio-button-on.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRadioButtonOn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-refresh.d.ts b/types/react-icons/io/android-refresh.d.ts
deleted file mode 100644
index eee0a2b96f..0000000000
--- a/types/react-icons/io/android-refresh.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRefresh extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-remove-circle.d.ts b/types/react-icons/io/android-remove-circle.d.ts
deleted file mode 100644
index 7c525668f8..0000000000
--- a/types/react-icons/io/android-remove-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRemoveCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-remove.d.ts b/types/react-icons/io/android-remove.d.ts
deleted file mode 100644
index 3767b079d3..0000000000
--- a/types/react-icons/io/android-remove.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRemove extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-restaurant.d.ts b/types/react-icons/io/android-restaurant.d.ts
deleted file mode 100644
index 5bb7a6ef15..0000000000
--- a/types/react-icons/io/android-restaurant.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRestaurant extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-sad.d.ts b/types/react-icons/io/android-sad.d.ts
deleted file mode 100644
index dc45162222..0000000000
--- a/types/react-icons/io/android-sad.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSad extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-search.d.ts b/types/react-icons/io/android-search.d.ts
deleted file mode 100644
index b5158286a1..0000000000
--- a/types/react-icons/io/android-search.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSearch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-send.d.ts b/types/react-icons/io/android-send.d.ts
deleted file mode 100644
index eebec03631..0000000000
--- a/types/react-icons/io/android-send.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSend extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-settings.d.ts b/types/react-icons/io/android-settings.d.ts
deleted file mode 100644
index c302aedf0c..0000000000
--- a/types/react-icons/io/android-settings.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSettings extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-share-alt.d.ts b/types/react-icons/io/android-share-alt.d.ts
deleted file mode 100644
index dcdb8a648c..0000000000
--- a/types/react-icons/io/android-share-alt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidShareAlt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-share.d.ts b/types/react-icons/io/android-share.d.ts
deleted file mode 100644
index 6b61e7c4e9..0000000000
--- a/types/react-icons/io/android-share.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidShare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-star-half.d.ts b/types/react-icons/io/android-star-half.d.ts
deleted file mode 100644
index 6a9ce4048a..0000000000
--- a/types/react-icons/io/android-star-half.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidStarHalf extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-star-outline.d.ts b/types/react-icons/io/android-star-outline.d.ts
deleted file mode 100644
index 3413a8803c..0000000000
--- a/types/react-icons/io/android-star-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidStarOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-star.d.ts b/types/react-icons/io/android-star.d.ts
deleted file mode 100644
index 0c6beadab5..0000000000
--- a/types/react-icons/io/android-star.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidStar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-stopwatch.d.ts b/types/react-icons/io/android-stopwatch.d.ts
deleted file mode 100644
index 1094ca3036..0000000000
--- a/types/react-icons/io/android-stopwatch.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidStopwatch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-subway.d.ts b/types/react-icons/io/android-subway.d.ts
deleted file mode 100644
index 1939fd06d3..0000000000
--- a/types/react-icons/io/android-subway.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSubway extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-sunny.d.ts b/types/react-icons/io/android-sunny.d.ts
deleted file mode 100644
index 382cc921aa..0000000000
--- a/types/react-icons/io/android-sunny.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSunny extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-sync.d.ts b/types/react-icons/io/android-sync.d.ts
deleted file mode 100644
index 27b8493ecf..0000000000
--- a/types/react-icons/io/android-sync.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSync extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-textsms.d.ts b/types/react-icons/io/android-textsms.d.ts
deleted file mode 100644
index 8020ed572a..0000000000
--- a/types/react-icons/io/android-textsms.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidTextsms extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-time.d.ts b/types/react-icons/io/android-time.d.ts
deleted file mode 100644
index 741d66a005..0000000000
--- a/types/react-icons/io/android-time.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidTime extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-train.d.ts b/types/react-icons/io/android-train.d.ts
deleted file mode 100644
index c55e985bdd..0000000000
--- a/types/react-icons/io/android-train.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidTrain extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-unlock.d.ts b/types/react-icons/io/android-unlock.d.ts
deleted file mode 100644
index 5eec9a875c..0000000000
--- a/types/react-icons/io/android-unlock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidUnlock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-upload.d.ts b/types/react-icons/io/android-upload.d.ts
deleted file mode 100644
index d5e092172f..0000000000
--- a/types/react-icons/io/android-upload.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidUpload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-volume-down.d.ts b/types/react-icons/io/android-volume-down.d.ts
deleted file mode 100644
index ce256873be..0000000000
--- a/types/react-icons/io/android-volume-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidVolumeDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-volume-mute.d.ts b/types/react-icons/io/android-volume-mute.d.ts
deleted file mode 100644
index 0675809779..0000000000
--- a/types/react-icons/io/android-volume-mute.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidVolumeMute extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-volume-off.d.ts b/types/react-icons/io/android-volume-off.d.ts
deleted file mode 100644
index 76cbb85947..0000000000
--- a/types/react-icons/io/android-volume-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidVolumeOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-volume-up.d.ts b/types/react-icons/io/android-volume-up.d.ts
deleted file mode 100644
index ff3531cf02..0000000000
--- a/types/react-icons/io/android-volume-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidVolumeUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-walk.d.ts b/types/react-icons/io/android-walk.d.ts
deleted file mode 100644
index 2d9c9fdfeb..0000000000
--- a/types/react-icons/io/android-walk.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidWalk extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-warning.d.ts b/types/react-icons/io/android-warning.d.ts
deleted file mode 100644
index ae0512a305..0000000000
--- a/types/react-icons/io/android-warning.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidWarning extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-watch.d.ts b/types/react-icons/io/android-watch.d.ts
deleted file mode 100644
index fd4f03a21d..0000000000
--- a/types/react-icons/io/android-watch.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidWatch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/android-wifi.d.ts b/types/react-icons/io/android-wifi.d.ts
deleted file mode 100644
index 52f56bfd92..0000000000
--- a/types/react-icons/io/android-wifi.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidWifi extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/aperture.d.ts b/types/react-icons/io/aperture.d.ts
deleted file mode 100644
index 433117938f..0000000000
--- a/types/react-icons/io/aperture.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAperture extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/archive.d.ts b/types/react-icons/io/archive.d.ts
deleted file mode 100644
index 90863a6615..0000000000
--- a/types/react-icons/io/archive.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArchive extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-down-a.d.ts b/types/react-icons/io/arrow-down-a.d.ts
deleted file mode 100644
index eadf0800bb..0000000000
--- a/types/react-icons/io/arrow-down-a.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowDownA extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-down-b.d.ts b/types/react-icons/io/arrow-down-b.d.ts
deleted file mode 100644
index 281147e627..0000000000
--- a/types/react-icons/io/arrow-down-b.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowDownB extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-down-c.d.ts b/types/react-icons/io/arrow-down-c.d.ts
deleted file mode 100644
index ab561572b2..0000000000
--- a/types/react-icons/io/arrow-down-c.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowDownC extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-expand.d.ts b/types/react-icons/io/arrow-expand.d.ts
deleted file mode 100644
index 273819c731..0000000000
--- a/types/react-icons/io/arrow-expand.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowExpand extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-graph-down-left.d.ts b/types/react-icons/io/arrow-graph-down-left.d.ts
deleted file mode 100644
index db6c5aed00..0000000000
--- a/types/react-icons/io/arrow-graph-down-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowGraphDownLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-graph-down-right.d.ts b/types/react-icons/io/arrow-graph-down-right.d.ts
deleted file mode 100644
index f64ec5a4b5..0000000000
--- a/types/react-icons/io/arrow-graph-down-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowGraphDownRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-graph-up-left.d.ts b/types/react-icons/io/arrow-graph-up-left.d.ts
deleted file mode 100644
index d4c1f87aee..0000000000
--- a/types/react-icons/io/arrow-graph-up-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowGraphUpLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-graph-up-right.d.ts b/types/react-icons/io/arrow-graph-up-right.d.ts
deleted file mode 100644
index 2b79959860..0000000000
--- a/types/react-icons/io/arrow-graph-up-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowGraphUpRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-left-a.d.ts b/types/react-icons/io/arrow-left-a.d.ts
deleted file mode 100644
index 3e7fb51bdd..0000000000
--- a/types/react-icons/io/arrow-left-a.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowLeftA extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-left-b.d.ts b/types/react-icons/io/arrow-left-b.d.ts
deleted file mode 100644
index 537365c037..0000000000
--- a/types/react-icons/io/arrow-left-b.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowLeftB extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-left-c.d.ts b/types/react-icons/io/arrow-left-c.d.ts
deleted file mode 100644
index a831c73c50..0000000000
--- a/types/react-icons/io/arrow-left-c.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowLeftC extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-move.d.ts b/types/react-icons/io/arrow-move.d.ts
deleted file mode 100644
index 1a61a6c75c..0000000000
--- a/types/react-icons/io/arrow-move.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowMove extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-resize.d.ts b/types/react-icons/io/arrow-resize.d.ts
deleted file mode 100644
index a8efbc36cf..0000000000
--- a/types/react-icons/io/arrow-resize.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowResize extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-return-left.d.ts b/types/react-icons/io/arrow-return-left.d.ts
deleted file mode 100644
index 9e0a076927..0000000000
--- a/types/react-icons/io/arrow-return-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowReturnLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-return-right.d.ts b/types/react-icons/io/arrow-return-right.d.ts
deleted file mode 100644
index 0bab75e6e9..0000000000
--- a/types/react-icons/io/arrow-return-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowReturnRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-right-a.d.ts b/types/react-icons/io/arrow-right-a.d.ts
deleted file mode 100644
index e91a2984da..0000000000
--- a/types/react-icons/io/arrow-right-a.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowRightA extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-right-b.d.ts b/types/react-icons/io/arrow-right-b.d.ts
deleted file mode 100644
index e85dce6f12..0000000000
--- a/types/react-icons/io/arrow-right-b.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowRightB extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-right-c.d.ts b/types/react-icons/io/arrow-right-c.d.ts
deleted file mode 100644
index 5673e8df4c..0000000000
--- a/types/react-icons/io/arrow-right-c.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowRightC extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-shrink.d.ts b/types/react-icons/io/arrow-shrink.d.ts
deleted file mode 100644
index 5fa8093af3..0000000000
--- a/types/react-icons/io/arrow-shrink.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowShrink extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-swap.d.ts b/types/react-icons/io/arrow-swap.d.ts
deleted file mode 100644
index 885a2c27ad..0000000000
--- a/types/react-icons/io/arrow-swap.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowSwap extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-up-a.d.ts b/types/react-icons/io/arrow-up-a.d.ts
deleted file mode 100644
index a3967e9d42..0000000000
--- a/types/react-icons/io/arrow-up-a.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowUpA extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-up-b.d.ts b/types/react-icons/io/arrow-up-b.d.ts
deleted file mode 100644
index 1c91d058f7..0000000000
--- a/types/react-icons/io/arrow-up-b.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowUpB extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/arrow-up-c.d.ts b/types/react-icons/io/arrow-up-c.d.ts
deleted file mode 100644
index 9ca25a35a9..0000000000
--- a/types/react-icons/io/arrow-up-c.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowUpC extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/asterisk.d.ts b/types/react-icons/io/asterisk.d.ts
deleted file mode 100644
index a5b58bd24e..0000000000
--- a/types/react-icons/io/asterisk.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAsterisk extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/at.d.ts b/types/react-icons/io/at.d.ts
deleted file mode 100644
index cb7284b40f..0000000000
--- a/types/react-icons/io/at.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoAt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/backspace-outline.d.ts b/types/react-icons/io/backspace-outline.d.ts
deleted file mode 100644
index 8ce9f476c5..0000000000
--- a/types/react-icons/io/backspace-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBackspaceOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/backspace.d.ts b/types/react-icons/io/backspace.d.ts
deleted file mode 100644
index a1d19677b8..0000000000
--- a/types/react-icons/io/backspace.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBackspace extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/bag.d.ts b/types/react-icons/io/bag.d.ts
deleted file mode 100644
index 538f19a520..0000000000
--- a/types/react-icons/io/bag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/battery-charging.d.ts b/types/react-icons/io/battery-charging.d.ts
deleted file mode 100644
index b950673aae..0000000000
--- a/types/react-icons/io/battery-charging.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBatteryCharging extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/battery-empty.d.ts b/types/react-icons/io/battery-empty.d.ts
deleted file mode 100644
index 0a8268869c..0000000000
--- a/types/react-icons/io/battery-empty.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBatteryEmpty extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/battery-full.d.ts b/types/react-icons/io/battery-full.d.ts
deleted file mode 100644
index 493488adf3..0000000000
--- a/types/react-icons/io/battery-full.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBatteryFull extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/battery-half.d.ts b/types/react-icons/io/battery-half.d.ts
deleted file mode 100644
index 0671295096..0000000000
--- a/types/react-icons/io/battery-half.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBatteryHalf extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/battery-low.d.ts b/types/react-icons/io/battery-low.d.ts
deleted file mode 100644
index 3c2964a52b..0000000000
--- a/types/react-icons/io/battery-low.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBatteryLow extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/beaker.d.ts b/types/react-icons/io/beaker.d.ts
deleted file mode 100644
index 5f68a801f8..0000000000
--- a/types/react-icons/io/beaker.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBeaker extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/beer.d.ts b/types/react-icons/io/beer.d.ts
deleted file mode 100644
index 9f2f5739ac..0000000000
--- a/types/react-icons/io/beer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBeer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/bluetooth.d.ts b/types/react-icons/io/bluetooth.d.ts
deleted file mode 100644
index 58eb2659e0..0000000000
--- a/types/react-icons/io/bluetooth.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBluetooth extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/bonfire.d.ts b/types/react-icons/io/bonfire.d.ts
deleted file mode 100644
index c0ef9d7cae..0000000000
--- a/types/react-icons/io/bonfire.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBonfire extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/bookmark.d.ts b/types/react-icons/io/bookmark.d.ts
deleted file mode 100644
index 3479c40e67..0000000000
--- a/types/react-icons/io/bookmark.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBookmark extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/bowtie.d.ts b/types/react-icons/io/bowtie.d.ts
deleted file mode 100644
index 6f983612ce..0000000000
--- a/types/react-icons/io/bowtie.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBowtie extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/briefcase.d.ts b/types/react-icons/io/briefcase.d.ts
deleted file mode 100644
index baa5708abd..0000000000
--- a/types/react-icons/io/briefcase.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBriefcase extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/bug.d.ts b/types/react-icons/io/bug.d.ts
deleted file mode 100644
index a97e391988..0000000000
--- a/types/react-icons/io/bug.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoBug extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/calculator.d.ts b/types/react-icons/io/calculator.d.ts
deleted file mode 100644
index 17bc0695d2..0000000000
--- a/types/react-icons/io/calculator.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCalculator extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/calendar.d.ts b/types/react-icons/io/calendar.d.ts
deleted file mode 100644
index 48de2d1402..0000000000
--- a/types/react-icons/io/calendar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCalendar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/camera.d.ts b/types/react-icons/io/camera.d.ts
deleted file mode 100644
index f362c37794..0000000000
--- a/types/react-icons/io/camera.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCamera extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/card.d.ts b/types/react-icons/io/card.d.ts
deleted file mode 100644
index 4aa32829b4..0000000000
--- a/types/react-icons/io/card.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/cash.d.ts b/types/react-icons/io/cash.d.ts
deleted file mode 100644
index 8c8a23acfd..0000000000
--- a/types/react-icons/io/cash.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCash extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/chatbox-working.d.ts b/types/react-icons/io/chatbox-working.d.ts
deleted file mode 100644
index 6574ba5b9c..0000000000
--- a/types/react-icons/io/chatbox-working.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoChatboxWorking extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/chatbox.d.ts b/types/react-icons/io/chatbox.d.ts
deleted file mode 100644
index 71907bcada..0000000000
--- a/types/react-icons/io/chatbox.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoChatbox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/chatboxes.d.ts b/types/react-icons/io/chatboxes.d.ts
deleted file mode 100644
index 6a4aff2857..0000000000
--- a/types/react-icons/io/chatboxes.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoChatboxes extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/chatbubble-working.d.ts b/types/react-icons/io/chatbubble-working.d.ts
deleted file mode 100644
index 667fb7fcde..0000000000
--- a/types/react-icons/io/chatbubble-working.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoChatbubbleWorking extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/chatbubble.d.ts b/types/react-icons/io/chatbubble.d.ts
deleted file mode 100644
index 08ecb48df7..0000000000
--- a/types/react-icons/io/chatbubble.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoChatbubble extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/chatbubbles.d.ts b/types/react-icons/io/chatbubbles.d.ts
deleted file mode 100644
index ebf87a1cc5..0000000000
--- a/types/react-icons/io/chatbubbles.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoChatbubbles extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/checkmark-circled.d.ts b/types/react-icons/io/checkmark-circled.d.ts
deleted file mode 100644
index 892e19a107..0000000000
--- a/types/react-icons/io/checkmark-circled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCheckmarkCircled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/checkmark-round.d.ts b/types/react-icons/io/checkmark-round.d.ts
deleted file mode 100644
index 1311db9d47..0000000000
--- a/types/react-icons/io/checkmark-round.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCheckmarkRound extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/checkmark.d.ts b/types/react-icons/io/checkmark.d.ts
deleted file mode 100644
index 0eda0d12da..0000000000
--- a/types/react-icons/io/checkmark.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCheckmark extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/chevron-down.d.ts b/types/react-icons/io/chevron-down.d.ts
deleted file mode 100644
index 0d9546467d..0000000000
--- a/types/react-icons/io/chevron-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoChevronDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/chevron-left.d.ts b/types/react-icons/io/chevron-left.d.ts
deleted file mode 100644
index 96fbe2a03f..0000000000
--- a/types/react-icons/io/chevron-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoChevronLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/chevron-right.d.ts b/types/react-icons/io/chevron-right.d.ts
deleted file mode 100644
index a83489fa83..0000000000
--- a/types/react-icons/io/chevron-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoChevronRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/chevron-up.d.ts b/types/react-icons/io/chevron-up.d.ts
deleted file mode 100644
index a56e43a584..0000000000
--- a/types/react-icons/io/chevron-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoChevronUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/clipboard.d.ts b/types/react-icons/io/clipboard.d.ts
deleted file mode 100644
index 79fc2dd2f7..0000000000
--- a/types/react-icons/io/clipboard.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoClipboard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/clock.d.ts b/types/react-icons/io/clock.d.ts
deleted file mode 100644
index 50d4dd2af1..0000000000
--- a/types/react-icons/io/clock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoClock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/close-circled.d.ts b/types/react-icons/io/close-circled.d.ts
deleted file mode 100644
index dd6fb5e9d2..0000000000
--- a/types/react-icons/io/close-circled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCloseCircled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/close-round.d.ts b/types/react-icons/io/close-round.d.ts
deleted file mode 100644
index a918a8e534..0000000000
--- a/types/react-icons/io/close-round.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCloseRound extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/close.d.ts b/types/react-icons/io/close.d.ts
deleted file mode 100644
index acc49f00ac..0000000000
--- a/types/react-icons/io/close.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoClose extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/closed-captioning.d.ts b/types/react-icons/io/closed-captioning.d.ts
deleted file mode 100644
index 5a2b68d149..0000000000
--- a/types/react-icons/io/closed-captioning.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoClosedCaptioning extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/cloud.d.ts b/types/react-icons/io/cloud.d.ts
deleted file mode 100644
index 837051ce2f..0000000000
--- a/types/react-icons/io/cloud.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCloud extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/code-download.d.ts b/types/react-icons/io/code-download.d.ts
deleted file mode 100644
index 765b401172..0000000000
--- a/types/react-icons/io/code-download.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCodeDownload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/code-working.d.ts b/types/react-icons/io/code-working.d.ts
deleted file mode 100644
index 48cf64ecd5..0000000000
--- a/types/react-icons/io/code-working.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCodeWorking extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/code.d.ts b/types/react-icons/io/code.d.ts
deleted file mode 100644
index 3d89e7aec1..0000000000
--- a/types/react-icons/io/code.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCode extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/coffee.d.ts b/types/react-icons/io/coffee.d.ts
deleted file mode 100644
index f3122b5343..0000000000
--- a/types/react-icons/io/coffee.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCoffee extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/compass.d.ts b/types/react-icons/io/compass.d.ts
deleted file mode 100644
index c0b78dd711..0000000000
--- a/types/react-icons/io/compass.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCompass extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/compose.d.ts b/types/react-icons/io/compose.d.ts
deleted file mode 100644
index 5250bbf5f9..0000000000
--- a/types/react-icons/io/compose.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCompose extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/connectbars.d.ts b/types/react-icons/io/connectbars.d.ts
deleted file mode 100644
index 2484005cf3..0000000000
--- a/types/react-icons/io/connectbars.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoConnectbars extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/contrast.d.ts b/types/react-icons/io/contrast.d.ts
deleted file mode 100644
index 871e34e2b5..0000000000
--- a/types/react-icons/io/contrast.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoContrast extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/crop.d.ts b/types/react-icons/io/crop.d.ts
deleted file mode 100644
index 1d9f6fe16f..0000000000
--- a/types/react-icons/io/crop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCrop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/cube.d.ts b/types/react-icons/io/cube.d.ts
deleted file mode 100644
index 0e20a500a0..0000000000
--- a/types/react-icons/io/cube.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoCube extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/disc.d.ts b/types/react-icons/io/disc.d.ts
deleted file mode 100644
index adb12527e7..0000000000
--- a/types/react-icons/io/disc.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoDisc extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/document-text.d.ts b/types/react-icons/io/document-text.d.ts
deleted file mode 100644
index 4c419e9766..0000000000
--- a/types/react-icons/io/document-text.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoDocumentText extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/document.d.ts b/types/react-icons/io/document.d.ts
deleted file mode 100644
index 098ab00b2a..0000000000
--- a/types/react-icons/io/document.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoDocument extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/drag.d.ts b/types/react-icons/io/drag.d.ts
deleted file mode 100644
index 628c38c338..0000000000
--- a/types/react-icons/io/drag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoDrag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/earth.d.ts b/types/react-icons/io/earth.d.ts
deleted file mode 100644
index 5d502a5882..0000000000
--- a/types/react-icons/io/earth.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoEarth extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/easel.d.ts b/types/react-icons/io/easel.d.ts
deleted file mode 100644
index dc8b3ff32d..0000000000
--- a/types/react-icons/io/easel.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoEasel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/edit.d.ts b/types/react-icons/io/edit.d.ts
deleted file mode 100644
index ea10d7df2a..0000000000
--- a/types/react-icons/io/edit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoEdit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/egg.d.ts b/types/react-icons/io/egg.d.ts
deleted file mode 100644
index 39e63c2f48..0000000000
--- a/types/react-icons/io/egg.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoEgg extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/eject.d.ts b/types/react-icons/io/eject.d.ts
deleted file mode 100644
index 1f859a0b76..0000000000
--- a/types/react-icons/io/eject.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoEject extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/email-unread.d.ts b/types/react-icons/io/email-unread.d.ts
deleted file mode 100644
index acdaefd764..0000000000
--- a/types/react-icons/io/email-unread.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoEmailUnread extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/email.d.ts b/types/react-icons/io/email.d.ts
deleted file mode 100644
index 7323479361..0000000000
--- a/types/react-icons/io/email.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoEmail extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/erlenmeyer-flask-bubbles.d.ts b/types/react-icons/io/erlenmeyer-flask-bubbles.d.ts
deleted file mode 100644
index fed2da9f1f..0000000000
--- a/types/react-icons/io/erlenmeyer-flask-bubbles.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoErlenmeyerFlaskBubbles extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/erlenmeyer-flask.d.ts b/types/react-icons/io/erlenmeyer-flask.d.ts
deleted file mode 100644
index 0de1fd7c42..0000000000
--- a/types/react-icons/io/erlenmeyer-flask.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoErlenmeyerFlask extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/eye-disabled.d.ts b/types/react-icons/io/eye-disabled.d.ts
deleted file mode 100644
index 3bf20def2a..0000000000
--- a/types/react-icons/io/eye-disabled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoEyeDisabled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/eye.d.ts b/types/react-icons/io/eye.d.ts
deleted file mode 100644
index 270c59505f..0000000000
--- a/types/react-icons/io/eye.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoEye extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/female.d.ts b/types/react-icons/io/female.d.ts
deleted file mode 100644
index cb795e884b..0000000000
--- a/types/react-icons/io/female.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoFemale extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/filing.d.ts b/types/react-icons/io/filing.d.ts
deleted file mode 100644
index ba69d4eb8b..0000000000
--- a/types/react-icons/io/filing.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoFiling extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/film-marker.d.ts b/types/react-icons/io/film-marker.d.ts
deleted file mode 100644
index 4e4a7158f2..0000000000
--- a/types/react-icons/io/film-marker.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoFilmMarker extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/fireball.d.ts b/types/react-icons/io/fireball.d.ts
deleted file mode 100644
index e7056b1534..0000000000
--- a/types/react-icons/io/fireball.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoFireball extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/flag.d.ts b/types/react-icons/io/flag.d.ts
deleted file mode 100644
index c06630b1a6..0000000000
--- a/types/react-icons/io/flag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoFlag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/flame.d.ts b/types/react-icons/io/flame.d.ts
deleted file mode 100644
index d49d1bd2db..0000000000
--- a/types/react-icons/io/flame.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoFlame extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/flash-off.d.ts b/types/react-icons/io/flash-off.d.ts
deleted file mode 100644
index 2b12ebe578..0000000000
--- a/types/react-icons/io/flash-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoFlashOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/flash.d.ts b/types/react-icons/io/flash.d.ts
deleted file mode 100644
index 32901f5a9d..0000000000
--- a/types/react-icons/io/flash.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoFlash extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/folder.d.ts b/types/react-icons/io/folder.d.ts
deleted file mode 100644
index dd14763f19..0000000000
--- a/types/react-icons/io/folder.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoFolder extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/fork-repo.d.ts b/types/react-icons/io/fork-repo.d.ts
deleted file mode 100644
index 19dfd6a33c..0000000000
--- a/types/react-icons/io/fork-repo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoForkRepo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/fork.d.ts b/types/react-icons/io/fork.d.ts
deleted file mode 100644
index b06aa1f455..0000000000
--- a/types/react-icons/io/fork.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoFork extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/forward.d.ts b/types/react-icons/io/forward.d.ts
deleted file mode 100644
index 1b36aa1de7..0000000000
--- a/types/react-icons/io/forward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoForward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/funnel.d.ts b/types/react-icons/io/funnel.d.ts
deleted file mode 100644
index be56fcd18c..0000000000
--- a/types/react-icons/io/funnel.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoFunnel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/gear-a.d.ts b/types/react-icons/io/gear-a.d.ts
deleted file mode 100644
index b04f6af6c2..0000000000
--- a/types/react-icons/io/gear-a.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoGearA extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/gear-b.d.ts b/types/react-icons/io/gear-b.d.ts
deleted file mode 100644
index b580d2bc7c..0000000000
--- a/types/react-icons/io/gear-b.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoGearB extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/grid.d.ts b/types/react-icons/io/grid.d.ts
deleted file mode 100644
index b30f3a11c2..0000000000
--- a/types/react-icons/io/grid.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoGrid extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/hammer.d.ts b/types/react-icons/io/hammer.d.ts
deleted file mode 100644
index 4ea6d0c306..0000000000
--- a/types/react-icons/io/hammer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoHammer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/happy-outline.d.ts b/types/react-icons/io/happy-outline.d.ts
deleted file mode 100644
index 3207610467..0000000000
--- a/types/react-icons/io/happy-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoHappyOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/happy.d.ts b/types/react-icons/io/happy.d.ts
deleted file mode 100644
index f773c9e528..0000000000
--- a/types/react-icons/io/happy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoHappy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/headphone.d.ts b/types/react-icons/io/headphone.d.ts
deleted file mode 100644
index e1ebdc9185..0000000000
--- a/types/react-icons/io/headphone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoHeadphone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/heart-broken.d.ts b/types/react-icons/io/heart-broken.d.ts
deleted file mode 100644
index 822a928ac6..0000000000
--- a/types/react-icons/io/heart-broken.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoHeartBroken extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/heart.d.ts b/types/react-icons/io/heart.d.ts
deleted file mode 100644
index e543207ae6..0000000000
--- a/types/react-icons/io/heart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoHeart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/help-buoy.d.ts b/types/react-icons/io/help-buoy.d.ts
deleted file mode 100644
index 9a84933640..0000000000
--- a/types/react-icons/io/help-buoy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoHelpBuoy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/help-circled.d.ts b/types/react-icons/io/help-circled.d.ts
deleted file mode 100644
index f36a8fd5f8..0000000000
--- a/types/react-icons/io/help-circled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoHelpCircled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/help.d.ts b/types/react-icons/io/help.d.ts
deleted file mode 100644
index 8eee2581c6..0000000000
--- a/types/react-icons/io/help.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoHelp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/home.d.ts b/types/react-icons/io/home.d.ts
deleted file mode 100644
index 337bace8fa..0000000000
--- a/types/react-icons/io/home.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoHome extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/icecream.d.ts b/types/react-icons/io/icecream.d.ts
deleted file mode 100644
index 1c3f0bd2af..0000000000
--- a/types/react-icons/io/icecream.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIcecream extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/image.d.ts b/types/react-icons/io/image.d.ts
deleted file mode 100644
index 3fbf7da59a..0000000000
--- a/types/react-icons/io/image.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoImage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/images.d.ts b/types/react-icons/io/images.d.ts
deleted file mode 100644
index ae80a81b1e..0000000000
--- a/types/react-icons/io/images.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoImages extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/index.d.ts b/types/react-icons/io/index.d.ts
deleted file mode 100644
index ef86c25e2b..0000000000
--- a/types/react-icons/io/index.d.ts
+++ /dev/null
@@ -1,733 +0,0 @@
-export { default as IoAlertCircled } from "./alert-circled";
-export { default as IoAlert } from "./alert";
-export { default as IoAndroidAddCircle } from "./android-add-circle";
-export { default as IoAndroidAdd } from "./android-add";
-export { default as IoAndroidAlarmClock } from "./android-alarm-clock";
-export { default as IoAndroidAlert } from "./android-alert";
-export { default as IoAndroidApps } from "./android-apps";
-export { default as IoAndroidArchive } from "./android-archive";
-export { default as IoAndroidArrowBack } from "./android-arrow-back";
-export { default as IoAndroidArrowDown } from "./android-arrow-down";
-export { default as IoAndroidArrowDropdownCircle } from "./android-arrow-dropdown-circle";
-export { default as IoAndroidArrowDropdown } from "./android-arrow-dropdown";
-export { default as IoAndroidArrowDropleftCircle } from "./android-arrow-dropleft-circle";
-export { default as IoAndroidArrowDropleft } from "./android-arrow-dropleft";
-export { default as IoAndroidArrowDroprightCircle } from "./android-arrow-dropright-circle";
-export { default as IoAndroidArrowDropright } from "./android-arrow-dropright";
-export { default as IoAndroidArrowDropupCircle } from "./android-arrow-dropup-circle";
-export { default as IoAndroidArrowDropup } from "./android-arrow-dropup";
-export { default as IoAndroidArrowForward } from "./android-arrow-forward";
-export { default as IoAndroidArrowUp } from "./android-arrow-up";
-export { default as IoAndroidAttach } from "./android-attach";
-export { default as IoAndroidBar } from "./android-bar";
-export { default as IoAndroidBicycle } from "./android-bicycle";
-export { default as IoAndroidBoat } from "./android-boat";
-export { default as IoAndroidBookmark } from "./android-bookmark";
-export { default as IoAndroidBulb } from "./android-bulb";
-export { default as IoAndroidBus } from "./android-bus";
-export { default as IoAndroidCalendar } from "./android-calendar";
-export { default as IoAndroidCall } from "./android-call";
-export { default as IoAndroidCamera } from "./android-camera";
-export { default as IoAndroidCancel } from "./android-cancel";
-export { default as IoAndroidCar } from "./android-car";
-export { default as IoAndroidCart } from "./android-cart";
-export { default as IoAndroidChat } from "./android-chat";
-export { default as IoAndroidCheckboxBlank } from "./android-checkbox-blank";
-export { default as IoAndroidCheckboxOutlineBlank } from "./android-checkbox-outline-blank";
-export { default as IoAndroidCheckboxOutline } from "./android-checkbox-outline";
-export { default as IoAndroidCheckbox } from "./android-checkbox";
-export { default as IoAndroidCheckmarkCircle } from "./android-checkmark-circle";
-export { default as IoAndroidClipboard } from "./android-clipboard";
-export { default as IoAndroidClose } from "./android-close";
-export { default as IoAndroidCloudCircle } from "./android-cloud-circle";
-export { default as IoAndroidCloudDone } from "./android-cloud-done";
-export { default as IoAndroidCloudOutline } from "./android-cloud-outline";
-export { default as IoAndroidCloud } from "./android-cloud";
-export { default as IoAndroidColorPalette } from "./android-color-palette";
-export { default as IoAndroidCompass } from "./android-compass";
-export { default as IoAndroidContact } from "./android-contact";
-export { default as IoAndroidContacts } from "./android-contacts";
-export { default as IoAndroidContract } from "./android-contract";
-export { default as IoAndroidCreate } from "./android-create";
-export { default as IoAndroidDelete } from "./android-delete";
-export { default as IoAndroidDesktop } from "./android-desktop";
-export { default as IoAndroidDocument } from "./android-document";
-export { default as IoAndroidDoneAll } from "./android-done-all";
-export { default as IoAndroidDone } from "./android-done";
-export { default as IoAndroidDownload } from "./android-download";
-export { default as IoAndroidDrafts } from "./android-drafts";
-export { default as IoAndroidExit } from "./android-exit";
-export { default as IoAndroidExpand } from "./android-expand";
-export { default as IoAndroidFavoriteOutline } from "./android-favorite-outline";
-export { default as IoAndroidFavorite } from "./android-favorite";
-export { default as IoAndroidFilm } from "./android-film";
-export { default as IoAndroidFolderOpen } from "./android-folder-open";
-export { default as IoAndroidFolder } from "./android-folder";
-export { default as IoAndroidFunnel } from "./android-funnel";
-export { default as IoAndroidGlobe } from "./android-globe";
-export { default as IoAndroidHand } from "./android-hand";
-export { default as IoAndroidHangout } from "./android-hangout";
-export { default as IoAndroidHappy } from "./android-happy";
-export { default as IoAndroidHome } from "./android-home";
-export { default as IoAndroidImage } from "./android-image";
-export { default as IoAndroidLaptop } from "./android-laptop";
-export { default as IoAndroidList } from "./android-list";
-export { default as IoAndroidLocate } from "./android-locate";
-export { default as IoAndroidLock } from "./android-lock";
-export { default as IoAndroidMail } from "./android-mail";
-export { default as IoAndroidMap } from "./android-map";
-export { default as IoAndroidMenu } from "./android-menu";
-export { default as IoAndroidMicrophoneOff } from "./android-microphone-off";
-export { default as IoAndroidMicrophone } from "./android-microphone";
-export { default as IoAndroidMoreHorizontal } from "./android-more-horizontal";
-export { default as IoAndroidMoreVertical } from "./android-more-vertical";
-export { default as IoAndroidNavigate } from "./android-navigate";
-export { default as IoAndroidNotificationsNone } from "./android-notifications-none";
-export { default as IoAndroidNotificationsOff } from "./android-notifications-off";
-export { default as IoAndroidNotifications } from "./android-notifications";
-export { default as IoAndroidOpen } from "./android-open";
-export { default as IoAndroidOptions } from "./android-options";
-export { default as IoAndroidPeople } from "./android-people";
-export { default as IoAndroidPersonAdd } from "./android-person-add";
-export { default as IoAndroidPerson } from "./android-person";
-export { default as IoAndroidPhoneLandscape } from "./android-phone-landscape";
-export { default as IoAndroidPhonePortrait } from "./android-phone-portrait";
-export { default as IoAndroidPin } from "./android-pin";
-export { default as IoAndroidPlane } from "./android-plane";
-export { default as IoAndroidPlaystore } from "./android-playstore";
-export { default as IoAndroidPrint } from "./android-print";
-export { default as IoAndroidRadioButtonOff } from "./android-radio-button-off";
-export { default as IoAndroidRadioButtonOn } from "./android-radio-button-on";
-export { default as IoAndroidRefresh } from "./android-refresh";
-export { default as IoAndroidRemoveCircle } from "./android-remove-circle";
-export { default as IoAndroidRemove } from "./android-remove";
-export { default as IoAndroidRestaurant } from "./android-restaurant";
-export { default as IoAndroidSad } from "./android-sad";
-export { default as IoAndroidSearch } from "./android-search";
-export { default as IoAndroidSend } from "./android-send";
-export { default as IoAndroidSettings } from "./android-settings";
-export { default as IoAndroidShareAlt } from "./android-share-alt";
-export { default as IoAndroidShare } from "./android-share";
-export { default as IoAndroidStarHalf } from "./android-star-half";
-export { default as IoAndroidStarOutline } from "./android-star-outline";
-export { default as IoAndroidStar } from "./android-star";
-export { default as IoAndroidStopwatch } from "./android-stopwatch";
-export { default as IoAndroidSubway } from "./android-subway";
-export { default as IoAndroidSunny } from "./android-sunny";
-export { default as IoAndroidSync } from "./android-sync";
-export { default as IoAndroidTextsms } from "./android-textsms";
-export { default as IoAndroidTime } from "./android-time";
-export { default as IoAndroidTrain } from "./android-train";
-export { default as IoAndroidUnlock } from "./android-unlock";
-export { default as IoAndroidUpload } from "./android-upload";
-export { default as IoAndroidVolumeDown } from "./android-volume-down";
-export { default as IoAndroidVolumeMute } from "./android-volume-mute";
-export { default as IoAndroidVolumeOff } from "./android-volume-off";
-export { default as IoAndroidVolumeUp } from "./android-volume-up";
-export { default as IoAndroidWalk } from "./android-walk";
-export { default as IoAndroidWarning } from "./android-warning";
-export { default as IoAndroidWatch } from "./android-watch";
-export { default as IoAndroidWifi } from "./android-wifi";
-export { default as IoAperture } from "./aperture";
-export { default as IoArchive } from "./archive";
-export { default as IoArrowDownA } from "./arrow-down-a";
-export { default as IoArrowDownB } from "./arrow-down-b";
-export { default as IoArrowDownC } from "./arrow-down-c";
-export { default as IoArrowExpand } from "./arrow-expand";
-export { default as IoArrowGraphDownLeft } from "./arrow-graph-down-left";
-export { default as IoArrowGraphDownRight } from "./arrow-graph-down-right";
-export { default as IoArrowGraphUpLeft } from "./arrow-graph-up-left";
-export { default as IoArrowGraphUpRight } from "./arrow-graph-up-right";
-export { default as IoArrowLeftA } from "./arrow-left-a";
-export { default as IoArrowLeftB } from "./arrow-left-b";
-export { default as IoArrowLeftC } from "./arrow-left-c";
-export { default as IoArrowMove } from "./arrow-move";
-export { default as IoArrowResize } from "./arrow-resize";
-export { default as IoArrowReturnLeft } from "./arrow-return-left";
-export { default as IoArrowReturnRight } from "./arrow-return-right";
-export { default as IoArrowRightA } from "./arrow-right-a";
-export { default as IoArrowRightB } from "./arrow-right-b";
-export { default as IoArrowRightC } from "./arrow-right-c";
-export { default as IoArrowShrink } from "./arrow-shrink";
-export { default as IoArrowSwap } from "./arrow-swap";
-export { default as IoArrowUpA } from "./arrow-up-a";
-export { default as IoArrowUpB } from "./arrow-up-b";
-export { default as IoArrowUpC } from "./arrow-up-c";
-export { default as IoAsterisk } from "./asterisk";
-export { default as IoAt } from "./at";
-export { default as IoBackspaceOutline } from "./backspace-outline";
-export { default as IoBackspace } from "./backspace";
-export { default as IoBag } from "./bag";
-export { default as IoBatteryCharging } from "./battery-charging";
-export { default as IoBatteryEmpty } from "./battery-empty";
-export { default as IoBatteryFull } from "./battery-full";
-export { default as IoBatteryHalf } from "./battery-half";
-export { default as IoBatteryLow } from "./battery-low";
-export { default as IoBeaker } from "./beaker";
-export { default as IoBeer } from "./beer";
-export { default as IoBluetooth } from "./bluetooth";
-export { default as IoBonfire } from "./bonfire";
-export { default as IoBookmark } from "./bookmark";
-export { default as IoBowtie } from "./bowtie";
-export { default as IoBriefcase } from "./briefcase";
-export { default as IoBug } from "./bug";
-export { default as IoCalculator } from "./calculator";
-export { default as IoCalendar } from "./calendar";
-export { default as IoCamera } from "./camera";
-export { default as IoCard } from "./card";
-export { default as IoCash } from "./cash";
-export { default as IoChatboxWorking } from "./chatbox-working";
-export { default as IoChatbox } from "./chatbox";
-export { default as IoChatboxes } from "./chatboxes";
-export { default as IoChatbubbleWorking } from "./chatbubble-working";
-export { default as IoChatbubble } from "./chatbubble";
-export { default as IoChatbubbles } from "./chatbubbles";
-export { default as IoCheckmarkCircled } from "./checkmark-circled";
-export { default as IoCheckmarkRound } from "./checkmark-round";
-export { default as IoCheckmark } from "./checkmark";
-export { default as IoChevronDown } from "./chevron-down";
-export { default as IoChevronLeft } from "./chevron-left";
-export { default as IoChevronRight } from "./chevron-right";
-export { default as IoChevronUp } from "./chevron-up";
-export { default as IoClipboard } from "./clipboard";
-export { default as IoClock } from "./clock";
-export { default as IoCloseCircled } from "./close-circled";
-export { default as IoCloseRound } from "./close-round";
-export { default as IoClose } from "./close";
-export { default as IoClosedCaptioning } from "./closed-captioning";
-export { default as IoCloud } from "./cloud";
-export { default as IoCodeDownload } from "./code-download";
-export { default as IoCodeWorking } from "./code-working";
-export { default as IoCode } from "./code";
-export { default as IoCoffee } from "./coffee";
-export { default as IoCompass } from "./compass";
-export { default as IoCompose } from "./compose";
-export { default as IoConnectbars } from "./connectbars";
-export { default as IoContrast } from "./contrast";
-export { default as IoCrop } from "./crop";
-export { default as IoCube } from "./cube";
-export { default as IoDisc } from "./disc";
-export { default as IoDocumentText } from "./document-text";
-export { default as IoDocument } from "./document";
-export { default as IoDrag } from "./drag";
-export { default as IoEarth } from "./earth";
-export { default as IoEasel } from "./easel";
-export { default as IoEdit } from "./edit";
-export { default as IoEgg } from "./egg";
-export { default as IoEject } from "./eject";
-export { default as IoEmailUnread } from "./email-unread";
-export { default as IoEmail } from "./email";
-export { default as IoErlenmeyerFlaskBubbles } from "./erlenmeyer-flask-bubbles";
-export { default as IoErlenmeyerFlask } from "./erlenmeyer-flask";
-export { default as IoEyeDisabled } from "./eye-disabled";
-export { default as IoEye } from "./eye";
-export { default as IoFemale } from "./female";
-export { default as IoFiling } from "./filing";
-export { default as IoFilmMarker } from "./film-marker";
-export { default as IoFireball } from "./fireball";
-export { default as IoFlag } from "./flag";
-export { default as IoFlame } from "./flame";
-export { default as IoFlashOff } from "./flash-off";
-export { default as IoFlash } from "./flash";
-export { default as IoFolder } from "./folder";
-export { default as IoForkRepo } from "./fork-repo";
-export { default as IoFork } from "./fork";
-export { default as IoForward } from "./forward";
-export { default as IoFunnel } from "./funnel";
-export { default as IoGearA } from "./gear-a";
-export { default as IoGearB } from "./gear-b";
-export { default as IoGrid } from "./grid";
-export { default as IoHammer } from "./hammer";
-export { default as IoHappyOutline } from "./happy-outline";
-export { default as IoHappy } from "./happy";
-export { default as IoHeadphone } from "./headphone";
-export { default as IoHeartBroken } from "./heart-broken";
-export { default as IoHeart } from "./heart";
-export { default as IoHelpBuoy } from "./help-buoy";
-export { default as IoHelpCircled } from "./help-circled";
-export { default as IoHelp } from "./help";
-export { default as IoHome } from "./home";
-export { default as IoIcecream } from "./icecream";
-export { default as IoImage } from "./image";
-export { default as IoImages } from "./images";
-export { default as IoInformatcircled } from "./informatcircled";
-export { default as IoInformation } from "./information";
-export { default as IoIonic } from "./ionic";
-export { default as IoIosAlarmOutline } from "./ios-alarm-outline";
-export { default as IoIosAlarm } from "./ios-alarm";
-export { default as IoIosAlbumsOutline } from "./ios-albums-outline";
-export { default as IoIosAlbums } from "./ios-albums";
-export { default as IoIosAmericanfootballOutline } from "./ios-americanfootball-outline";
-export { default as IoIosAmericanfootball } from "./ios-americanfootball";
-export { default as IoIosAnalyticsOutline } from "./ios-analytics-outline";
-export { default as IoIosAnalytics } from "./ios-analytics";
-export { default as IoIosArrowBack } from "./ios-arrow-back";
-export { default as IoIosArrowDown } from "./ios-arrow-down";
-export { default as IoIosArrowForward } from "./ios-arrow-forward";
-export { default as IoIosArrowLeft } from "./ios-arrow-left";
-export { default as IoIosArrowRight } from "./ios-arrow-right";
-export { default as IoIosArrowThinDown } from "./ios-arrow-thin-down";
-export { default as IoIosArrowThinLeft } from "./ios-arrow-thin-left";
-export { default as IoIosArrowThinRight } from "./ios-arrow-thin-right";
-export { default as IoIosArrowThinUp } from "./ios-arrow-thin-up";
-export { default as IoIosArrowUp } from "./ios-arrow-up";
-export { default as IoIosAtOutline } from "./ios-at-outline";
-export { default as IoIosAt } from "./ios-at";
-export { default as IoIosBarcodeOutline } from "./ios-barcode-outline";
-export { default as IoIosBarcode } from "./ios-barcode";
-export { default as IoIosBaseballOutline } from "./ios-baseball-outline";
-export { default as IoIosBaseball } from "./ios-baseball";
-export { default as IoIosBasketballOutline } from "./ios-basketball-outline";
-export { default as IoIosBasketball } from "./ios-basketball";
-export { default as IoIosBellOutline } from "./ios-bell-outline";
-export { default as IoIosBell } from "./ios-bell";
-export { default as IoIosBodyOutline } from "./ios-body-outline";
-export { default as IoIosBody } from "./ios-body";
-export { default as IoIosBoltOutline } from "./ios-bolt-outline";
-export { default as IoIosBolt } from "./ios-bolt";
-export { default as IoIosBookOutline } from "./ios-book-outline";
-export { default as IoIosBook } from "./ios-book";
-export { default as IoIosBookmarksOutline } from "./ios-bookmarks-outline";
-export { default as IoIosBookmarks } from "./ios-bookmarks";
-export { default as IoIosBoxOutline } from "./ios-box-outline";
-export { default as IoIosBox } from "./ios-box";
-export { default as IoIosBriefcaseOutline } from "./ios-briefcase-outline";
-export { default as IoIosBriefcase } from "./ios-briefcase";
-export { default as IoIosBrowsersOutline } from "./ios-browsers-outline";
-export { default as IoIosBrowsers } from "./ios-browsers";
-export { default as IoIosCalculatorOutline } from "./ios-calculator-outline";
-export { default as IoIosCalculator } from "./ios-calculator";
-export { default as IoIosCalendarOutline } from "./ios-calendar-outline";
-export { default as IoIosCalendar } from "./ios-calendar";
-export { default as IoIosCameraOutline } from "./ios-camera-outline";
-export { default as IoIosCamera } from "./ios-camera";
-export { default as IoIosCartOutline } from "./ios-cart-outline";
-export { default as IoIosCart } from "./ios-cart";
-export { default as IoIosChatboxesOutline } from "./ios-chatboxes-outline";
-export { default as IoIosChatboxes } from "./ios-chatboxes";
-export { default as IoIosChatbubbleOutline } from "./ios-chatbubble-outline";
-export { default as IoIosChatbubble } from "./ios-chatbubble";
-export { default as IoIosCheckmarkEmpty } from "./ios-checkmark-empty";
-export { default as IoIosCheckmarkOutline } from "./ios-checkmark-outline";
-export { default as IoIosCheckmark } from "./ios-checkmark";
-export { default as IoIosCircleFilled } from "./ios-circle-filled";
-export { default as IoIosCircleOutline } from "./ios-circle-outline";
-export { default as IoIosClockOutline } from "./ios-clock-outline";
-export { default as IoIosClock } from "./ios-clock";
-export { default as IoIosCloseEmpty } from "./ios-close-empty";
-export { default as IoIosCloseOutline } from "./ios-close-outline";
-export { default as IoIosClose } from "./ios-close";
-export { default as IoIosCloudDownloadOutline } from "./ios-cloud-download-outline";
-export { default as IoIosCloudDownload } from "./ios-cloud-download";
-export { default as IoIosCloudOutline } from "./ios-cloud-outline";
-export { default as IoIosCloudUploadOutline } from "./ios-cloud-upload-outline";
-export { default as IoIosCloudUpload } from "./ios-cloud-upload";
-export { default as IoIosCloud } from "./ios-cloud";
-export { default as IoIosCloudyNightOutline } from "./ios-cloudy-night-outline";
-export { default as IoIosCloudyNight } from "./ios-cloudy-night";
-export { default as IoIosCloudyOutline } from "./ios-cloudy-outline";
-export { default as IoIosCloudy } from "./ios-cloudy";
-export { default as IoIosCogOutline } from "./ios-cog-outline";
-export { default as IoIosCog } from "./ios-cog";
-export { default as IoIosColorFilterOutline } from "./ios-color-filter-outline";
-export { default as IoIosColorFilter } from "./ios-color-filter";
-export { default as IoIosColorWandOutline } from "./ios-color-wand-outline";
-export { default as IoIosColorWand } from "./ios-color-wand";
-export { default as IoIosComposeOutline } from "./ios-compose-outline";
-export { default as IoIosCompose } from "./ios-compose";
-export { default as IoIosContactOutline } from "./ios-contact-outline";
-export { default as IoIosContact } from "./ios-contact";
-export { default as IoIosCopyOutline } from "./ios-copy-outline";
-export { default as IoIosCopy } from "./ios-copy";
-export { default as IoIosCropStrong } from "./ios-crop-strong";
-export { default as IoIosCrop } from "./ios-crop";
-export { default as IoIosDownloadOutline } from "./ios-download-outline";
-export { default as IoIosDownload } from "./ios-download";
-export { default as IoIosDrag } from "./ios-drag";
-export { default as IoIosEmailOutline } from "./ios-email-outline";
-export { default as IoIosEmail } from "./ios-email";
-export { default as IoIosEyeOutline } from "./ios-eye-outline";
-export { default as IoIosEye } from "./ios-eye";
-export { default as IoIosFastforwardOutline } from "./ios-fastforward-outline";
-export { default as IoIosFastforward } from "./ios-fastforward";
-export { default as IoIosFilingOutline } from "./ios-filing-outline";
-export { default as IoIosFiling } from "./ios-filing";
-export { default as IoIosFilmOutline } from "./ios-film-outline";
-export { default as IoIosFilm } from "./ios-film";
-export { default as IoIosFlagOutline } from "./ios-flag-outline";
-export { default as IoIosFlag } from "./ios-flag";
-export { default as IoIosFlameOutline } from "./ios-flame-outline";
-export { default as IoIosFlame } from "./ios-flame";
-export { default as IoIosFlaskOutline } from "./ios-flask-outline";
-export { default as IoIosFlask } from "./ios-flask";
-export { default as IoIosFlowerOutline } from "./ios-flower-outline";
-export { default as IoIosFlower } from "./ios-flower";
-export { default as IoIosFolderOutline } from "./ios-folder-outline";
-export { default as IoIosFolder } from "./ios-folder";
-export { default as IoIosFootballOutline } from "./ios-football-outline";
-export { default as IoIosFootball } from "./ios-football";
-export { default as IoIosGameControllerAOutline } from "./ios-game-controller-a-outline";
-export { default as IoIosGameControllerA } from "./ios-game-controller-a";
-export { default as IoIosGameControllerBOutline } from "./ios-game-controller-b-outline";
-export { default as IoIosGameControllerB } from "./ios-game-controller-b";
-export { default as IoIosGearOutline } from "./ios-gear-outline";
-export { default as IoIosGear } from "./ios-gear";
-export { default as IoIosGlassesOutline } from "./ios-glasses-outline";
-export { default as IoIosGlasses } from "./ios-glasses";
-export { default as IoIosGridViewOutline } from "./ios-grid-view-outline";
-export { default as IoIosGridView } from "./ios-grid-view";
-export { default as IoIosHeartOutline } from "./ios-heart-outline";
-export { default as IoIosHeart } from "./ios-heart";
-export { default as IoIosHelpEmpty } from "./ios-help-empty";
-export { default as IoIosHelpOutline } from "./ios-help-outline";
-export { default as IoIosHelp } from "./ios-help";
-export { default as IoIosHomeOutline } from "./ios-home-outline";
-export { default as IoIosHome } from "./ios-home";
-export { default as IoIosInfiniteOutline } from "./ios-infinite-outline";
-export { default as IoIosInfinite } from "./ios-infinite";
-export { default as IoIosInformatempty } from "./ios-informatempty";
-export { default as IoIosInformation } from "./ios-information";
-export { default as IoIosInformatoutline } from "./ios-informatoutline";
-export { default as IoIosIonicOutline } from "./ios-ionic-outline";
-export { default as IoIosKeypadOutline } from "./ios-keypad-outline";
-export { default as IoIosKeypad } from "./ios-keypad";
-export { default as IoIosLightbulbOutline } from "./ios-lightbulb-outline";
-export { default as IoIosLightbulb } from "./ios-lightbulb";
-export { default as IoIosListOutline } from "./ios-list-outline";
-export { default as IoIosList } from "./ios-list";
-export { default as IoIosLocation } from "./ios-location";
-export { default as IoIosLocatoutline } from "./ios-locatoutline";
-export { default as IoIosLockedOutline } from "./ios-locked-outline";
-export { default as IoIosLocked } from "./ios-locked";
-export { default as IoIosLoopStrong } from "./ios-loop-strong";
-export { default as IoIosLoop } from "./ios-loop";
-export { default as IoIosMedicalOutline } from "./ios-medical-outline";
-export { default as IoIosMedical } from "./ios-medical";
-export { default as IoIosMedkitOutline } from "./ios-medkit-outline";
-export { default as IoIosMedkit } from "./ios-medkit";
-export { default as IoIosMicOff } from "./ios-mic-off";
-export { default as IoIosMicOutline } from "./ios-mic-outline";
-export { default as IoIosMic } from "./ios-mic";
-export { default as IoIosMinusEmpty } from "./ios-minus-empty";
-export { default as IoIosMinusOutline } from "./ios-minus-outline";
-export { default as IoIosMinus } from "./ios-minus";
-export { default as IoIosMonitorOutline } from "./ios-monitor-outline";
-export { default as IoIosMonitor } from "./ios-monitor";
-export { default as IoIosMoonOutline } from "./ios-moon-outline";
-export { default as IoIosMoon } from "./ios-moon";
-export { default as IoIosMoreOutline } from "./ios-more-outline";
-export { default as IoIosMore } from "./ios-more";
-export { default as IoIosMusicalNote } from "./ios-musical-note";
-export { default as IoIosMusicalNotes } from "./ios-musical-notes";
-export { default as IoIosNavigateOutline } from "./ios-navigate-outline";
-export { default as IoIosNavigate } from "./ios-navigate";
-export { default as IoIosNutrition } from "./ios-nutrition";
-export { default as IoIosNutritoutline } from "./ios-nutritoutline";
-export { default as IoIosPaperOutline } from "./ios-paper-outline";
-export { default as IoIosPaper } from "./ios-paper";
-export { default as IoIosPaperplaneOutline } from "./ios-paperplane-outline";
-export { default as IoIosPaperplane } from "./ios-paperplane";
-export { default as IoIosPartlysunnyOutline } from "./ios-partlysunny-outline";
-export { default as IoIosPartlysunny } from "./ios-partlysunny";
-export { default as IoIosPauseOutline } from "./ios-pause-outline";
-export { default as IoIosPause } from "./ios-pause";
-export { default as IoIosPawOutline } from "./ios-paw-outline";
-export { default as IoIosPaw } from "./ios-paw";
-export { default as IoIosPeopleOutline } from "./ios-people-outline";
-export { default as IoIosPeople } from "./ios-people";
-export { default as IoIosPersonOutline } from "./ios-person-outline";
-export { default as IoIosPerson } from "./ios-person";
-export { default as IoIosPersonaddOutline } from "./ios-personadd-outline";
-export { default as IoIosPersonadd } from "./ios-personadd";
-export { default as IoIosPhotosOutline } from "./ios-photos-outline";
-export { default as IoIosPhotos } from "./ios-photos";
-export { default as IoIosPieOutline } from "./ios-pie-outline";
-export { default as IoIosPie } from "./ios-pie";
-export { default as IoIosPintOutline } from "./ios-pint-outline";
-export { default as IoIosPint } from "./ios-pint";
-export { default as IoIosPlayOutline } from "./ios-play-outline";
-export { default as IoIosPlay } from "./ios-play";
-export { default as IoIosPlusEmpty } from "./ios-plus-empty";
-export { default as IoIosPlusOutline } from "./ios-plus-outline";
-export { default as IoIosPlus } from "./ios-plus";
-export { default as IoIosPricetagOutline } from "./ios-pricetag-outline";
-export { default as IoIosPricetag } from "./ios-pricetag";
-export { default as IoIosPricetagsOutline } from "./ios-pricetags-outline";
-export { default as IoIosPricetags } from "./ios-pricetags";
-export { default as IoIosPrinterOutline } from "./ios-printer-outline";
-export { default as IoIosPrinter } from "./ios-printer";
-export { default as IoIosPulseStrong } from "./ios-pulse-strong";
-export { default as IoIosPulse } from "./ios-pulse";
-export { default as IoIosRainyOutline } from "./ios-rainy-outline";
-export { default as IoIosRainy } from "./ios-rainy";
-export { default as IoIosRecordingOutline } from "./ios-recording-outline";
-export { default as IoIosRecording } from "./ios-recording";
-export { default as IoIosRedoOutline } from "./ios-redo-outline";
-export { default as IoIosRedo } from "./ios-redo";
-export { default as IoIosRefreshEmpty } from "./ios-refresh-empty";
-export { default as IoIosRefreshOutline } from "./ios-refresh-outline";
-export { default as IoIosRefresh } from "./ios-refresh";
-export { default as IoIosReload } from "./ios-reload";
-export { default as IoIosReverseCameraOutline } from "./ios-reverse-camera-outline";
-export { default as IoIosReverseCamera } from "./ios-reverse-camera";
-export { default as IoIosRewindOutline } from "./ios-rewind-outline";
-export { default as IoIosRewind } from "./ios-rewind";
-export { default as IoIosRoseOutline } from "./ios-rose-outline";
-export { default as IoIosRose } from "./ios-rose";
-export { default as IoIosSearchStrong } from "./ios-search-strong";
-export { default as IoIosSearch } from "./ios-search";
-export { default as IoIosSettingsStrong } from "./ios-settings-strong";
-export { default as IoIosSettings } from "./ios-settings";
-export { default as IoIosShuffleStrong } from "./ios-shuffle-strong";
-export { default as IoIosShuffle } from "./ios-shuffle";
-export { default as IoIosSkipbackwardOutline } from "./ios-skipbackward-outline";
-export { default as IoIosSkipbackward } from "./ios-skipbackward";
-export { default as IoIosSkipforwardOutline } from "./ios-skipforward-outline";
-export { default as IoIosSkipforward } from "./ios-skipforward";
-export { default as IoIosSnowy } from "./ios-snowy";
-export { default as IoIosSpeedometerOutline } from "./ios-speedometer-outline";
-export { default as IoIosSpeedometer } from "./ios-speedometer";
-export { default as IoIosStarHalf } from "./ios-star-half";
-export { default as IoIosStarOutline } from "./ios-star-outline";
-export { default as IoIosStar } from "./ios-star";
-export { default as IoIosStopwatchOutline } from "./ios-stopwatch-outline";
-export { default as IoIosStopwatch } from "./ios-stopwatch";
-export { default as IoIosSunnyOutline } from "./ios-sunny-outline";
-export { default as IoIosSunny } from "./ios-sunny";
-export { default as IoIosTelephoneOutline } from "./ios-telephone-outline";
-export { default as IoIosTelephone } from "./ios-telephone";
-export { default as IoIosTennisballOutline } from "./ios-tennisball-outline";
-export { default as IoIosTennisball } from "./ios-tennisball";
-export { default as IoIosThunderstormOutline } from "./ios-thunderstorm-outline";
-export { default as IoIosThunderstorm } from "./ios-thunderstorm";
-export { default as IoIosTimeOutline } from "./ios-time-outline";
-export { default as IoIosTime } from "./ios-time";
-export { default as IoIosTimerOutline } from "./ios-timer-outline";
-export { default as IoIosTimer } from "./ios-timer";
-export { default as IoIosToggleOutline } from "./ios-toggle-outline";
-export { default as IoIosToggle } from "./ios-toggle";
-export { default as IoIosTrashOutline } from "./ios-trash-outline";
-export { default as IoIosTrash } from "./ios-trash";
-export { default as IoIosUndoOutline } from "./ios-undo-outline";
-export { default as IoIosUndo } from "./ios-undo";
-export { default as IoIosUnlockedOutline } from "./ios-unlocked-outline";
-export { default as IoIosUnlocked } from "./ios-unlocked";
-export { default as IoIosUploadOutline } from "./ios-upload-outline";
-export { default as IoIosUpload } from "./ios-upload";
-export { default as IoIosVideocamOutline } from "./ios-videocam-outline";
-export { default as IoIosVideocam } from "./ios-videocam";
-export { default as IoIosVolumeHigh } from "./ios-volume-high";
-export { default as IoIosVolumeLow } from "./ios-volume-low";
-export { default as IoIosWineglassOutline } from "./ios-wineglass-outline";
-export { default as IoIosWineglass } from "./ios-wineglass";
-export { default as IoIosWorldOutline } from "./ios-world-outline";
-export { default as IoIosWorld } from "./ios-world";
-export { default as IoIpad } from "./ipad";
-export { default as IoIphone } from "./iphone";
-export { default as IoIpod } from "./ipod";
-export { default as IoJet } from "./jet";
-export { default as IoKey } from "./key";
-export { default as IoKnife } from "./knife";
-export { default as IoLaptop } from "./laptop";
-export { default as IoLeaf } from "./leaf";
-export { default as IoLevels } from "./levels";
-export { default as IoLightbulb } from "./lightbulb";
-export { default as IoLink } from "./link";
-export { default as IoLoadA } from "./load-a";
-export { default as IoLoadB } from "./load-b";
-export { default as IoLoadC } from "./load-c";
-export { default as IoLoadD } from "./load-d";
-export { default as IoLocation } from "./location";
-export { default as IoLockCombination } from "./lock-combination";
-export { default as IoLocked } from "./locked";
-export { default as IoLogIn } from "./log-in";
-export { default as IoLogOut } from "./log-out";
-export { default as IoLoop } from "./loop";
-export { default as IoMagnet } from "./magnet";
-export { default as IoMale } from "./male";
-export { default as IoMan } from "./man";
-export { default as IoMap } from "./map";
-export { default as IoMedkit } from "./medkit";
-export { default as IoMerge } from "./merge";
-export { default as IoMicA } from "./mic-a";
-export { default as IoMicB } from "./mic-b";
-export { default as IoMicC } from "./mic-c";
-export { default as IoMinusCircled } from "./minus-circled";
-export { default as IoMinusRound } from "./minus-round";
-export { default as IoMinus } from "./minus";
-export { default as IoModelS } from "./model-s";
-export { default as IoMonitor } from "./monitor";
-export { default as IoMore } from "./more";
-export { default as IoMouse } from "./mouse";
-export { default as IoMusicNote } from "./music-note";
-export { default as IoNaviconRound } from "./navicon-round";
-export { default as IoNavicon } from "./navicon";
-export { default as IoNavigate } from "./navigate";
-export { default as IoNetwork } from "./network";
-export { default as IoNoSmoking } from "./no-smoking";
-export { default as IoNuclear } from "./nuclear";
-export { default as IoOutlet } from "./outlet";
-export { default as IoPaintbrush } from "./paintbrush";
-export { default as IoPaintbucket } from "./paintbucket";
-export { default as IoPaperAirplane } from "./paper-airplane";
-export { default as IoPaperclip } from "./paperclip";
-export { default as IoPause } from "./pause";
-export { default as IoPersonAdd } from "./person-add";
-export { default as IoPersonStalker } from "./person-stalker";
-export { default as IoPerson } from "./person";
-export { default as IoPieGraph } from "./pie-graph";
-export { default as IoPin } from "./pin";
-export { default as IoPinpoint } from "./pinpoint";
-export { default as IoPizza } from "./pizza";
-export { default as IoPlane } from "./plane";
-export { default as IoPlanet } from "./planet";
-export { default as IoPlay } from "./play";
-export { default as IoPlaystation } from "./playstation";
-export { default as IoPlusCircled } from "./plus-circled";
-export { default as IoPlusRound } from "./plus-round";
-export { default as IoPlus } from "./plus";
-export { default as IoPodium } from "./podium";
-export { default as IoPound } from "./pound";
-export { default as IoPower } from "./power";
-export { default as IoPricetag } from "./pricetag";
-export { default as IoPricetags } from "./pricetags";
-export { default as IoPrinter } from "./printer";
-export { default as IoPullRequest } from "./pull-request";
-export { default as IoQrScanner } from "./qr-scanner";
-export { default as IoQuote } from "./quote";
-export { default as IoRadioWaves } from "./radio-waves";
-export { default as IoRecord } from "./record";
-export { default as IoRefresh } from "./refresh";
-export { default as IoReplyAll } from "./reply-all";
-export { default as IoReply } from "./reply";
-export { default as IoRibbonA } from "./ribbon-a";
-export { default as IoRibbonB } from "./ribbon-b";
-export { default as IoSadOutline } from "./sad-outline";
-export { default as IoSad } from "./sad";
-export { default as IoScissors } from "./scissors";
-export { default as IoSearch } from "./search";
-export { default as IoSettings } from "./settings";
-export { default as IoShare } from "./share";
-export { default as IoShuffle } from "./shuffle";
-export { default as IoSkipBackward } from "./skip-backward";
-export { default as IoSkipForward } from "./skip-forward";
-export { default as IoSocialAndroidOutline } from "./social-android-outline";
-export { default as IoSocialAndroid } from "./social-android";
-export { default as IoSocialAngularOutline } from "./social-angular-outline";
-export { default as IoSocialAngular } from "./social-angular";
-export { default as IoSocialAppleOutline } from "./social-apple-outline";
-export { default as IoSocialApple } from "./social-apple";
-export { default as IoSocialBitcoinOutline } from "./social-bitcoin-outline";
-export { default as IoSocialBitcoin } from "./social-bitcoin";
-export { default as IoSocialBufferOutline } from "./social-buffer-outline";
-export { default as IoSocialBuffer } from "./social-buffer";
-export { default as IoSocialChromeOutline } from "./social-chrome-outline";
-export { default as IoSocialChrome } from "./social-chrome";
-export { default as IoSocialCodepenOutline } from "./social-codepen-outline";
-export { default as IoSocialCodepen } from "./social-codepen";
-export { default as IoSocialCss3Outline } from "./social-css3-outline";
-export { default as IoSocialCss3 } from "./social-css3";
-export { default as IoSocialDesignernewsOutline } from "./social-designernews-outline";
-export { default as IoSocialDesignernews } from "./social-designernews";
-export { default as IoSocialDribbbleOutline } from "./social-dribbble-outline";
-export { default as IoSocialDribbble } from "./social-dribbble";
-export { default as IoSocialDropboxOutline } from "./social-dropbox-outline";
-export { default as IoSocialDropbox } from "./social-dropbox";
-export { default as IoSocialEuroOutline } from "./social-euro-outline";
-export { default as IoSocialEuro } from "./social-euro";
-export { default as IoSocialFacebookOutline } from "./social-facebook-outline";
-export { default as IoSocialFacebook } from "./social-facebook";
-export { default as IoSocialFoursquareOutline } from "./social-foursquare-outline";
-export { default as IoSocialFoursquare } from "./social-foursquare";
-export { default as IoSocialFreebsdDevil } from "./social-freebsd-devil";
-export { default as IoSocialGithubOutline } from "./social-github-outline";
-export { default as IoSocialGithub } from "./social-github";
-export { default as IoSocialGoogleOutline } from "./social-google-outline";
-export { default as IoSocialGoogle } from "./social-google";
-export { default as IoSocialGoogleplusOutline } from "./social-googleplus-outline";
-export { default as IoSocialGoogleplus } from "./social-googleplus";
-export { default as IoSocialHackernewsOutline } from "./social-hackernews-outline";
-export { default as IoSocialHackernews } from "./social-hackernews";
-export { default as IoSocialHtml5Outline } from "./social-html5-outline";
-export { default as IoSocialHtml5 } from "./social-html5";
-export { default as IoSocialInstagramOutline } from "./social-instagram-outline";
-export { default as IoSocialInstagram } from "./social-instagram";
-export { default as IoSocialJavascriptOutline } from "./social-javascript-outline";
-export { default as IoSocialJavascript } from "./social-javascript";
-export { default as IoSocialLinkedinOutline } from "./social-linkedin-outline";
-export { default as IoSocialLinkedin } from "./social-linkedin";
-export { default as IoSocialMarkdown } from "./social-markdown";
-export { default as IoSocialNodejs } from "./social-nodejs";
-export { default as IoSocialOctocat } from "./social-octocat";
-export { default as IoSocialPinterestOutline } from "./social-pinterest-outline";
-export { default as IoSocialPinterest } from "./social-pinterest";
-export { default as IoSocialPython } from "./social-python";
-export { default as IoSocialRedditOutline } from "./social-reddit-outline";
-export { default as IoSocialReddit } from "./social-reddit";
-export { default as IoSocialRssOutline } from "./social-rss-outline";
-export { default as IoSocialRss } from "./social-rss";
-export { default as IoSocialSass } from "./social-sass";
-export { default as IoSocialSkypeOutline } from "./social-skype-outline";
-export { default as IoSocialSkype } from "./social-skype";
-export { default as IoSocialSnapchatOutline } from "./social-snapchat-outline";
-export { default as IoSocialSnapchat } from "./social-snapchat";
-export { default as IoSocialTumblrOutline } from "./social-tumblr-outline";
-export { default as IoSocialTumblr } from "./social-tumblr";
-export { default as IoSocialTux } from "./social-tux";
-export { default as IoSocialTwitchOutline } from "./social-twitch-outline";
-export { default as IoSocialTwitch } from "./social-twitch";
-export { default as IoSocialTwitterOutline } from "./social-twitter-outline";
-export { default as IoSocialTwitter } from "./social-twitter";
-export { default as IoSocialUsdOutline } from "./social-usd-outline";
-export { default as IoSocialUsd } from "./social-usd";
-export { default as IoSocialVimeoOutline } from "./social-vimeo-outline";
-export { default as IoSocialVimeo } from "./social-vimeo";
-export { default as IoSocialWhatsappOutline } from "./social-whatsapp-outline";
-export { default as IoSocialWhatsapp } from "./social-whatsapp";
-export { default as IoSocialWindowsOutline } from "./social-windows-outline";
-export { default as IoSocialWindows } from "./social-windows";
-export { default as IoSocialWordpressOutline } from "./social-wordpress-outline";
-export { default as IoSocialWordpress } from "./social-wordpress";
-export { default as IoSocialYahooOutline } from "./social-yahoo-outline";
-export { default as IoSocialYahoo } from "./social-yahoo";
-export { default as IoSocialYenOutline } from "./social-yen-outline";
-export { default as IoSocialYen } from "./social-yen";
-export { default as IoSocialYoutubeOutline } from "./social-youtube-outline";
-export { default as IoSocialYoutube } from "./social-youtube";
-export { default as IoSoupCanOutline } from "./soup-can-outline";
-export { default as IoSoupCan } from "./soup-can";
-export { default as IoSpeakerphone } from "./speakerphone";
-export { default as IoSpeedometer } from "./speedometer";
-export { default as IoSpoon } from "./spoon";
-export { default as IoStar } from "./star";
-export { default as IoStatsBars } from "./stats-bars";
-export { default as IoSteam } from "./steam";
-export { default as IoStop } from "./stop";
-export { default as IoThermometer } from "./thermometer";
-export { default as IoThumbsdown } from "./thumbsdown";
-export { default as IoThumbsup } from "./thumbsup";
-export { default as IoToggleFilled } from "./toggle-filled";
-export { default as IoToggle } from "./toggle";
-export { default as IoTransgender } from "./transgender";
-export { default as IoTrashA } from "./trash-a";
-export { default as IoTrashB } from "./trash-b";
-export { default as IoTrophy } from "./trophy";
-export { default as IoTshirtOutline } from "./tshirt-outline";
-export { default as IoTshirt } from "./tshirt";
-export { default as IoUmbrella } from "./umbrella";
-export { default as IoUniversity } from "./university";
-export { default as IoUnlocked } from "./unlocked";
-export { default as IoUpload } from "./upload";
-export { default as IoUsb } from "./usb";
-export { default as IoVideocamera } from "./videocamera";
-export { default as IoVolumeHigh } from "./volume-high";
-export { default as IoVolumeLow } from "./volume-low";
-export { default as IoVolumeMedium } from "./volume-medium";
-export { default as IoVolumeMute } from "./volume-mute";
-export { default as IoWand } from "./wand";
-export { default as IoWaterdrop } from "./waterdrop";
-export { default as IoWifi } from "./wifi";
-export { default as IoWineglass } from "./wineglass";
-export { default as IoWoman } from "./woman";
-export { default as IoWrench } from "./wrench";
-export { default as IoXbox } from "./xbox";
diff --git a/types/react-icons/io/informatcircled.d.ts b/types/react-icons/io/informatcircled.d.ts
deleted file mode 100644
index 2ef20abca7..0000000000
--- a/types/react-icons/io/informatcircled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoInformatcircled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/information.d.ts b/types/react-icons/io/information.d.ts
deleted file mode 100644
index 02652a360f..0000000000
--- a/types/react-icons/io/information.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoInformation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ionic.d.ts b/types/react-icons/io/ionic.d.ts
deleted file mode 100644
index 9e19c402cf..0000000000
--- a/types/react-icons/io/ionic.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIonic extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-alarm-outline.d.ts b/types/react-icons/io/ios-alarm-outline.d.ts
deleted file mode 100644
index c211ebccee..0000000000
--- a/types/react-icons/io/ios-alarm-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAlarmOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-alarm.d.ts b/types/react-icons/io/ios-alarm.d.ts
deleted file mode 100644
index c61987318d..0000000000
--- a/types/react-icons/io/ios-alarm.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAlarm extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-albums-outline.d.ts b/types/react-icons/io/ios-albums-outline.d.ts
deleted file mode 100644
index 48e06ad4b8..0000000000
--- a/types/react-icons/io/ios-albums-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAlbumsOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-albums.d.ts b/types/react-icons/io/ios-albums.d.ts
deleted file mode 100644
index be7c86317a..0000000000
--- a/types/react-icons/io/ios-albums.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAlbums extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-americanfootball-outline.d.ts b/types/react-icons/io/ios-americanfootball-outline.d.ts
deleted file mode 100644
index d7041c17d3..0000000000
--- a/types/react-icons/io/ios-americanfootball-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAmericanfootballOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-americanfootball.d.ts b/types/react-icons/io/ios-americanfootball.d.ts
deleted file mode 100644
index 4af77520ff..0000000000
--- a/types/react-icons/io/ios-americanfootball.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAmericanfootball extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-analytics-outline.d.ts b/types/react-icons/io/ios-analytics-outline.d.ts
deleted file mode 100644
index 6192de6c58..0000000000
--- a/types/react-icons/io/ios-analytics-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAnalyticsOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-analytics.d.ts b/types/react-icons/io/ios-analytics.d.ts
deleted file mode 100644
index 9f3d9e110e..0000000000
--- a/types/react-icons/io/ios-analytics.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAnalytics extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-arrow-back.d.ts b/types/react-icons/io/ios-arrow-back.d.ts
deleted file mode 100644
index 1466e59a6d..0000000000
--- a/types/react-icons/io/ios-arrow-back.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowBack extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-arrow-down.d.ts b/types/react-icons/io/ios-arrow-down.d.ts
deleted file mode 100644
index 91773f927b..0000000000
--- a/types/react-icons/io/ios-arrow-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-arrow-forward.d.ts b/types/react-icons/io/ios-arrow-forward.d.ts
deleted file mode 100644
index a2bf7fe213..0000000000
--- a/types/react-icons/io/ios-arrow-forward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowForward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-arrow-left.d.ts b/types/react-icons/io/ios-arrow-left.d.ts
deleted file mode 100644
index 0588edeed0..0000000000
--- a/types/react-icons/io/ios-arrow-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-arrow-right.d.ts b/types/react-icons/io/ios-arrow-right.d.ts
deleted file mode 100644
index 5642202b5c..0000000000
--- a/types/react-icons/io/ios-arrow-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-arrow-thin-down.d.ts b/types/react-icons/io/ios-arrow-thin-down.d.ts
deleted file mode 100644
index 183b547848..0000000000
--- a/types/react-icons/io/ios-arrow-thin-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowThinDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-arrow-thin-left.d.ts b/types/react-icons/io/ios-arrow-thin-left.d.ts
deleted file mode 100644
index 4fea91fe45..0000000000
--- a/types/react-icons/io/ios-arrow-thin-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowThinLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-arrow-thin-right.d.ts b/types/react-icons/io/ios-arrow-thin-right.d.ts
deleted file mode 100644
index 5e70abd099..0000000000
--- a/types/react-icons/io/ios-arrow-thin-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowThinRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-arrow-thin-up.d.ts b/types/react-icons/io/ios-arrow-thin-up.d.ts
deleted file mode 100644
index 412e0b53a2..0000000000
--- a/types/react-icons/io/ios-arrow-thin-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowThinUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-arrow-up.d.ts b/types/react-icons/io/ios-arrow-up.d.ts
deleted file mode 100644
index 2adf431795..0000000000
--- a/types/react-icons/io/ios-arrow-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-at-outline.d.ts b/types/react-icons/io/ios-at-outline.d.ts
deleted file mode 100644
index 7d20c06912..0000000000
--- a/types/react-icons/io/ios-at-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAtOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-at.d.ts b/types/react-icons/io/ios-at.d.ts
deleted file mode 100644
index 5789d0b976..0000000000
--- a/types/react-icons/io/ios-at.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-barcode-outline.d.ts b/types/react-icons/io/ios-barcode-outline.d.ts
deleted file mode 100644
index a82a5b88c8..0000000000
--- a/types/react-icons/io/ios-barcode-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBarcodeOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-barcode.d.ts b/types/react-icons/io/ios-barcode.d.ts
deleted file mode 100644
index 20a769e78e..0000000000
--- a/types/react-icons/io/ios-barcode.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBarcode extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-baseball-outline.d.ts b/types/react-icons/io/ios-baseball-outline.d.ts
deleted file mode 100644
index 99856309a9..0000000000
--- a/types/react-icons/io/ios-baseball-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBaseballOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-baseball.d.ts b/types/react-icons/io/ios-baseball.d.ts
deleted file mode 100644
index 1470fd138c..0000000000
--- a/types/react-icons/io/ios-baseball.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBaseball extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-basketball-outline.d.ts b/types/react-icons/io/ios-basketball-outline.d.ts
deleted file mode 100644
index 5b2d8845df..0000000000
--- a/types/react-icons/io/ios-basketball-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBasketballOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-basketball.d.ts b/types/react-icons/io/ios-basketball.d.ts
deleted file mode 100644
index 294798f648..0000000000
--- a/types/react-icons/io/ios-basketball.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBasketball extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-bell-outline.d.ts b/types/react-icons/io/ios-bell-outline.d.ts
deleted file mode 100644
index c03c49121e..0000000000
--- a/types/react-icons/io/ios-bell-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBellOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-bell.d.ts b/types/react-icons/io/ios-bell.d.ts
deleted file mode 100644
index d1b90b21f9..0000000000
--- a/types/react-icons/io/ios-bell.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBell extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-body-outline.d.ts b/types/react-icons/io/ios-body-outline.d.ts
deleted file mode 100644
index 235ed9bca0..0000000000
--- a/types/react-icons/io/ios-body-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBodyOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-body.d.ts b/types/react-icons/io/ios-body.d.ts
deleted file mode 100644
index 89712f6b0e..0000000000
--- a/types/react-icons/io/ios-body.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBody extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-bolt-outline.d.ts b/types/react-icons/io/ios-bolt-outline.d.ts
deleted file mode 100644
index acc1db40e6..0000000000
--- a/types/react-icons/io/ios-bolt-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBoltOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-bolt.d.ts b/types/react-icons/io/ios-bolt.d.ts
deleted file mode 100644
index a953af8901..0000000000
--- a/types/react-icons/io/ios-bolt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBolt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-book-outline.d.ts b/types/react-icons/io/ios-book-outline.d.ts
deleted file mode 100644
index d6587de870..0000000000
--- a/types/react-icons/io/ios-book-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBookOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-book.d.ts b/types/react-icons/io/ios-book.d.ts
deleted file mode 100644
index 9bcddd9e60..0000000000
--- a/types/react-icons/io/ios-book.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBook extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-bookmarks-outline.d.ts b/types/react-icons/io/ios-bookmarks-outline.d.ts
deleted file mode 100644
index c999d5cdd5..0000000000
--- a/types/react-icons/io/ios-bookmarks-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBookmarksOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-bookmarks.d.ts b/types/react-icons/io/ios-bookmarks.d.ts
deleted file mode 100644
index 42a926adda..0000000000
--- a/types/react-icons/io/ios-bookmarks.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBookmarks extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-box-outline.d.ts b/types/react-icons/io/ios-box-outline.d.ts
deleted file mode 100644
index 02b34cefc1..0000000000
--- a/types/react-icons/io/ios-box-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBoxOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-box.d.ts b/types/react-icons/io/ios-box.d.ts
deleted file mode 100644
index 67ab43d367..0000000000
--- a/types/react-icons/io/ios-box.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-briefcase-outline.d.ts b/types/react-icons/io/ios-briefcase-outline.d.ts
deleted file mode 100644
index bcba814767..0000000000
--- a/types/react-icons/io/ios-briefcase-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBriefcaseOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-briefcase.d.ts b/types/react-icons/io/ios-briefcase.d.ts
deleted file mode 100644
index 03409c1dc4..0000000000
--- a/types/react-icons/io/ios-briefcase.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBriefcase extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-browsers-outline.d.ts b/types/react-icons/io/ios-browsers-outline.d.ts
deleted file mode 100644
index a85fd4dfc9..0000000000
--- a/types/react-icons/io/ios-browsers-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBrowsersOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-browsers.d.ts b/types/react-icons/io/ios-browsers.d.ts
deleted file mode 100644
index 155d546472..0000000000
--- a/types/react-icons/io/ios-browsers.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBrowsers extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-calculator-outline.d.ts b/types/react-icons/io/ios-calculator-outline.d.ts
deleted file mode 100644
index 19453725e5..0000000000
--- a/types/react-icons/io/ios-calculator-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCalculatorOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-calculator.d.ts b/types/react-icons/io/ios-calculator.d.ts
deleted file mode 100644
index 736a4f431f..0000000000
--- a/types/react-icons/io/ios-calculator.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCalculator extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-calendar-outline.d.ts b/types/react-icons/io/ios-calendar-outline.d.ts
deleted file mode 100644
index 131eba8430..0000000000
--- a/types/react-icons/io/ios-calendar-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCalendarOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-calendar.d.ts b/types/react-icons/io/ios-calendar.d.ts
deleted file mode 100644
index 3275cc770c..0000000000
--- a/types/react-icons/io/ios-calendar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCalendar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-camera-outline.d.ts b/types/react-icons/io/ios-camera-outline.d.ts
deleted file mode 100644
index 194cacb253..0000000000
--- a/types/react-icons/io/ios-camera-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCameraOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-camera.d.ts b/types/react-icons/io/ios-camera.d.ts
deleted file mode 100644
index 346d035f8c..0000000000
--- a/types/react-icons/io/ios-camera.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCamera extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-cart-outline.d.ts b/types/react-icons/io/ios-cart-outline.d.ts
deleted file mode 100644
index d7f76296dd..0000000000
--- a/types/react-icons/io/ios-cart-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCartOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-cart.d.ts b/types/react-icons/io/ios-cart.d.ts
deleted file mode 100644
index 918b941efc..0000000000
--- a/types/react-icons/io/ios-cart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-chatboxes-outline.d.ts b/types/react-icons/io/ios-chatboxes-outline.d.ts
deleted file mode 100644
index 1db97e7086..0000000000
--- a/types/react-icons/io/ios-chatboxes-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosChatboxesOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-chatboxes.d.ts b/types/react-icons/io/ios-chatboxes.d.ts
deleted file mode 100644
index a32fdd72c4..0000000000
--- a/types/react-icons/io/ios-chatboxes.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosChatboxes extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-chatbubble-outline.d.ts b/types/react-icons/io/ios-chatbubble-outline.d.ts
deleted file mode 100644
index ba2b57a053..0000000000
--- a/types/react-icons/io/ios-chatbubble-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosChatbubbleOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-chatbubble.d.ts b/types/react-icons/io/ios-chatbubble.d.ts
deleted file mode 100644
index bb9d024821..0000000000
--- a/types/react-icons/io/ios-chatbubble.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosChatbubble extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-checkmark-empty.d.ts b/types/react-icons/io/ios-checkmark-empty.d.ts
deleted file mode 100644
index 328adb1f00..0000000000
--- a/types/react-icons/io/ios-checkmark-empty.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCheckmarkEmpty extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-checkmark-outline.d.ts b/types/react-icons/io/ios-checkmark-outline.d.ts
deleted file mode 100644
index cb19eebc9b..0000000000
--- a/types/react-icons/io/ios-checkmark-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCheckmarkOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-checkmark.d.ts b/types/react-icons/io/ios-checkmark.d.ts
deleted file mode 100644
index 3fcabda1bf..0000000000
--- a/types/react-icons/io/ios-checkmark.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCheckmark extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-circle-filled.d.ts b/types/react-icons/io/ios-circle-filled.d.ts
deleted file mode 100644
index 4b4192096d..0000000000
--- a/types/react-icons/io/ios-circle-filled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCircleFilled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-circle-outline.d.ts b/types/react-icons/io/ios-circle-outline.d.ts
deleted file mode 100644
index 99a0ae723f..0000000000
--- a/types/react-icons/io/ios-circle-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCircleOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-clock-outline.d.ts b/types/react-icons/io/ios-clock-outline.d.ts
deleted file mode 100644
index 2d5febf0a9..0000000000
--- a/types/react-icons/io/ios-clock-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosClockOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-clock.d.ts b/types/react-icons/io/ios-clock.d.ts
deleted file mode 100644
index aa160a4bd7..0000000000
--- a/types/react-icons/io/ios-clock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosClock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-close-empty.d.ts b/types/react-icons/io/ios-close-empty.d.ts
deleted file mode 100644
index 44a0c8d17b..0000000000
--- a/types/react-icons/io/ios-close-empty.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloseEmpty extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-close-outline.d.ts b/types/react-icons/io/ios-close-outline.d.ts
deleted file mode 100644
index 323c5b9d4a..0000000000
--- a/types/react-icons/io/ios-close-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloseOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-close.d.ts b/types/react-icons/io/ios-close.d.ts
deleted file mode 100644
index 21ed802d2a..0000000000
--- a/types/react-icons/io/ios-close.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosClose extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-cloud-download-outline.d.ts b/types/react-icons/io/ios-cloud-download-outline.d.ts
deleted file mode 100644
index 3e4358be6d..0000000000
--- a/types/react-icons/io/ios-cloud-download-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudDownloadOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-cloud-download.d.ts b/types/react-icons/io/ios-cloud-download.d.ts
deleted file mode 100644
index 593e0c7730..0000000000
--- a/types/react-icons/io/ios-cloud-download.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudDownload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-cloud-outline.d.ts b/types/react-icons/io/ios-cloud-outline.d.ts
deleted file mode 100644
index c70f0794c3..0000000000
--- a/types/react-icons/io/ios-cloud-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-cloud-upload-outline.d.ts b/types/react-icons/io/ios-cloud-upload-outline.d.ts
deleted file mode 100644
index 2796f586ec..0000000000
--- a/types/react-icons/io/ios-cloud-upload-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudUploadOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-cloud-upload.d.ts b/types/react-icons/io/ios-cloud-upload.d.ts
deleted file mode 100644
index b34cc692a2..0000000000
--- a/types/react-icons/io/ios-cloud-upload.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudUpload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-cloud.d.ts b/types/react-icons/io/ios-cloud.d.ts
deleted file mode 100644
index a802116f9f..0000000000
--- a/types/react-icons/io/ios-cloud.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloud extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-cloudy-night-outline.d.ts b/types/react-icons/io/ios-cloudy-night-outline.d.ts
deleted file mode 100644
index 4845f7470d..0000000000
--- a/types/react-icons/io/ios-cloudy-night-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudyNightOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-cloudy-night.d.ts b/types/react-icons/io/ios-cloudy-night.d.ts
deleted file mode 100644
index 9298dc5823..0000000000
--- a/types/react-icons/io/ios-cloudy-night.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudyNight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-cloudy-outline.d.ts b/types/react-icons/io/ios-cloudy-outline.d.ts
deleted file mode 100644
index cfcfd72e69..0000000000
--- a/types/react-icons/io/ios-cloudy-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudyOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-cloudy.d.ts b/types/react-icons/io/ios-cloudy.d.ts
deleted file mode 100644
index 1d30070268..0000000000
--- a/types/react-icons/io/ios-cloudy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-cog-outline.d.ts b/types/react-icons/io/ios-cog-outline.d.ts
deleted file mode 100644
index 8553742da2..0000000000
--- a/types/react-icons/io/ios-cog-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCogOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-cog.d.ts b/types/react-icons/io/ios-cog.d.ts
deleted file mode 100644
index b834fcb3c8..0000000000
--- a/types/react-icons/io/ios-cog.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCog extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-color-filter-outline.d.ts b/types/react-icons/io/ios-color-filter-outline.d.ts
deleted file mode 100644
index a3a38a75c9..0000000000
--- a/types/react-icons/io/ios-color-filter-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosColorFilterOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-color-filter.d.ts b/types/react-icons/io/ios-color-filter.d.ts
deleted file mode 100644
index 20fcdef6df..0000000000
--- a/types/react-icons/io/ios-color-filter.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosColorFilter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-color-wand-outline.d.ts b/types/react-icons/io/ios-color-wand-outline.d.ts
deleted file mode 100644
index ddb1cb938c..0000000000
--- a/types/react-icons/io/ios-color-wand-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosColorWandOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-color-wand.d.ts b/types/react-icons/io/ios-color-wand.d.ts
deleted file mode 100644
index 2cffa4f89e..0000000000
--- a/types/react-icons/io/ios-color-wand.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosColorWand extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-compose-outline.d.ts b/types/react-icons/io/ios-compose-outline.d.ts
deleted file mode 100644
index 30d416ed90..0000000000
--- a/types/react-icons/io/ios-compose-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosComposeOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-compose.d.ts b/types/react-icons/io/ios-compose.d.ts
deleted file mode 100644
index 9445eed5c1..0000000000
--- a/types/react-icons/io/ios-compose.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCompose extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-contact-outline.d.ts b/types/react-icons/io/ios-contact-outline.d.ts
deleted file mode 100644
index 7eb6eb546f..0000000000
--- a/types/react-icons/io/ios-contact-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosContactOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-contact.d.ts b/types/react-icons/io/ios-contact.d.ts
deleted file mode 100644
index 59c2798235..0000000000
--- a/types/react-icons/io/ios-contact.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosContact extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-copy-outline.d.ts b/types/react-icons/io/ios-copy-outline.d.ts
deleted file mode 100644
index 5af5717e89..0000000000
--- a/types/react-icons/io/ios-copy-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCopyOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-copy.d.ts b/types/react-icons/io/ios-copy.d.ts
deleted file mode 100644
index 2523a14f88..0000000000
--- a/types/react-icons/io/ios-copy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCopy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-crop-strong.d.ts b/types/react-icons/io/ios-crop-strong.d.ts
deleted file mode 100644
index b0126c2482..0000000000
--- a/types/react-icons/io/ios-crop-strong.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCropStrong extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-crop.d.ts b/types/react-icons/io/ios-crop.d.ts
deleted file mode 100644
index ab76318d3a..0000000000
--- a/types/react-icons/io/ios-crop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCrop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-download-outline.d.ts b/types/react-icons/io/ios-download-outline.d.ts
deleted file mode 100644
index 4498357495..0000000000
--- a/types/react-icons/io/ios-download-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosDownloadOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-download.d.ts b/types/react-icons/io/ios-download.d.ts
deleted file mode 100644
index 35aaac4be0..0000000000
--- a/types/react-icons/io/ios-download.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosDownload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-drag.d.ts b/types/react-icons/io/ios-drag.d.ts
deleted file mode 100644
index 17979b680a..0000000000
--- a/types/react-icons/io/ios-drag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosDrag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-email-outline.d.ts b/types/react-icons/io/ios-email-outline.d.ts
deleted file mode 100644
index 3ad2b9cb16..0000000000
--- a/types/react-icons/io/ios-email-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosEmailOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-email.d.ts b/types/react-icons/io/ios-email.d.ts
deleted file mode 100644
index ac81192fe0..0000000000
--- a/types/react-icons/io/ios-email.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosEmail extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-eye-outline.d.ts b/types/react-icons/io/ios-eye-outline.d.ts
deleted file mode 100644
index 8f83b25a13..0000000000
--- a/types/react-icons/io/ios-eye-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosEyeOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-eye.d.ts b/types/react-icons/io/ios-eye.d.ts
deleted file mode 100644
index 2a3db8b839..0000000000
--- a/types/react-icons/io/ios-eye.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosEye extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-fastforward-outline.d.ts b/types/react-icons/io/ios-fastforward-outline.d.ts
deleted file mode 100644
index ebc30ba915..0000000000
--- a/types/react-icons/io/ios-fastforward-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFastforwardOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-fastforward.d.ts b/types/react-icons/io/ios-fastforward.d.ts
deleted file mode 100644
index 2fedece46c..0000000000
--- a/types/react-icons/io/ios-fastforward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFastforward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-filing-outline.d.ts b/types/react-icons/io/ios-filing-outline.d.ts
deleted file mode 100644
index 07291ebfd3..0000000000
--- a/types/react-icons/io/ios-filing-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFilingOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-filing.d.ts b/types/react-icons/io/ios-filing.d.ts
deleted file mode 100644
index 0ccb6e3e3b..0000000000
--- a/types/react-icons/io/ios-filing.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFiling extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-film-outline.d.ts b/types/react-icons/io/ios-film-outline.d.ts
deleted file mode 100644
index 5528977dce..0000000000
--- a/types/react-icons/io/ios-film-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFilmOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-film.d.ts b/types/react-icons/io/ios-film.d.ts
deleted file mode 100644
index 447ebbe08e..0000000000
--- a/types/react-icons/io/ios-film.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFilm extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-flag-outline.d.ts b/types/react-icons/io/ios-flag-outline.d.ts
deleted file mode 100644
index f602c44993..0000000000
--- a/types/react-icons/io/ios-flag-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlagOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-flag.d.ts b/types/react-icons/io/ios-flag.d.ts
deleted file mode 100644
index d6095c22f3..0000000000
--- a/types/react-icons/io/ios-flag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-flame-outline.d.ts b/types/react-icons/io/ios-flame-outline.d.ts
deleted file mode 100644
index 0e8b7410e9..0000000000
--- a/types/react-icons/io/ios-flame-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlameOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-flame.d.ts b/types/react-icons/io/ios-flame.d.ts
deleted file mode 100644
index a21289710b..0000000000
--- a/types/react-icons/io/ios-flame.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlame extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-flask-outline.d.ts b/types/react-icons/io/ios-flask-outline.d.ts
deleted file mode 100644
index 2082d7a326..0000000000
--- a/types/react-icons/io/ios-flask-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlaskOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-flask.d.ts b/types/react-icons/io/ios-flask.d.ts
deleted file mode 100644
index 0b622f18e2..0000000000
--- a/types/react-icons/io/ios-flask.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlask extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-flower-outline.d.ts b/types/react-icons/io/ios-flower-outline.d.ts
deleted file mode 100644
index 7886cbc193..0000000000
--- a/types/react-icons/io/ios-flower-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlowerOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-flower.d.ts b/types/react-icons/io/ios-flower.d.ts
deleted file mode 100644
index 9e1ba1e0bc..0000000000
--- a/types/react-icons/io/ios-flower.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlower extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-folder-outline.d.ts b/types/react-icons/io/ios-folder-outline.d.ts
deleted file mode 100644
index 43c60dc202..0000000000
--- a/types/react-icons/io/ios-folder-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFolderOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-folder.d.ts b/types/react-icons/io/ios-folder.d.ts
deleted file mode 100644
index 785495d440..0000000000
--- a/types/react-icons/io/ios-folder.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFolder extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-football-outline.d.ts b/types/react-icons/io/ios-football-outline.d.ts
deleted file mode 100644
index 6f669b0cd0..0000000000
--- a/types/react-icons/io/ios-football-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFootballOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-football.d.ts b/types/react-icons/io/ios-football.d.ts
deleted file mode 100644
index 0ece60db03..0000000000
--- a/types/react-icons/io/ios-football.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFootball extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-game-controller-a-outline.d.ts b/types/react-icons/io/ios-game-controller-a-outline.d.ts
deleted file mode 100644
index 200c64a673..0000000000
--- a/types/react-icons/io/ios-game-controller-a-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGameControllerAOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-game-controller-a.d.ts b/types/react-icons/io/ios-game-controller-a.d.ts
deleted file mode 100644
index e9e7048f94..0000000000
--- a/types/react-icons/io/ios-game-controller-a.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGameControllerA extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-game-controller-b-outline.d.ts b/types/react-icons/io/ios-game-controller-b-outline.d.ts
deleted file mode 100644
index d7d82be788..0000000000
--- a/types/react-icons/io/ios-game-controller-b-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGameControllerBOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-game-controller-b.d.ts b/types/react-icons/io/ios-game-controller-b.d.ts
deleted file mode 100644
index 6e5435416c..0000000000
--- a/types/react-icons/io/ios-game-controller-b.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGameControllerB extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-gear-outline.d.ts b/types/react-icons/io/ios-gear-outline.d.ts
deleted file mode 100644
index 22181a1a55..0000000000
--- a/types/react-icons/io/ios-gear-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGearOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-gear.d.ts b/types/react-icons/io/ios-gear.d.ts
deleted file mode 100644
index e899faa7a9..0000000000
--- a/types/react-icons/io/ios-gear.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGear extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-glasses-outline.d.ts b/types/react-icons/io/ios-glasses-outline.d.ts
deleted file mode 100644
index 049fc5bd95..0000000000
--- a/types/react-icons/io/ios-glasses-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGlassesOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-glasses.d.ts b/types/react-icons/io/ios-glasses.d.ts
deleted file mode 100644
index 585312b1f7..0000000000
--- a/types/react-icons/io/ios-glasses.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGlasses extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-grid-view-outline.d.ts b/types/react-icons/io/ios-grid-view-outline.d.ts
deleted file mode 100644
index f1cf87b7d6..0000000000
--- a/types/react-icons/io/ios-grid-view-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGridViewOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-grid-view.d.ts b/types/react-icons/io/ios-grid-view.d.ts
deleted file mode 100644
index 00f6bb916c..0000000000
--- a/types/react-icons/io/ios-grid-view.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGridView extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-heart-outline.d.ts b/types/react-icons/io/ios-heart-outline.d.ts
deleted file mode 100644
index 354c5543f3..0000000000
--- a/types/react-icons/io/ios-heart-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHeartOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-heart.d.ts b/types/react-icons/io/ios-heart.d.ts
deleted file mode 100644
index 254ce938f3..0000000000
--- a/types/react-icons/io/ios-heart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHeart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-help-empty.d.ts b/types/react-icons/io/ios-help-empty.d.ts
deleted file mode 100644
index cd94f6ceed..0000000000
--- a/types/react-icons/io/ios-help-empty.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHelpEmpty extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-help-outline.d.ts b/types/react-icons/io/ios-help-outline.d.ts
deleted file mode 100644
index 3e73ec588b..0000000000
--- a/types/react-icons/io/ios-help-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHelpOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-help.d.ts b/types/react-icons/io/ios-help.d.ts
deleted file mode 100644
index 00ede643d8..0000000000
--- a/types/react-icons/io/ios-help.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHelp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-home-outline.d.ts b/types/react-icons/io/ios-home-outline.d.ts
deleted file mode 100644
index 17f1432ff8..0000000000
--- a/types/react-icons/io/ios-home-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHomeOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-home.d.ts b/types/react-icons/io/ios-home.d.ts
deleted file mode 100644
index c0f80ecaf3..0000000000
--- a/types/react-icons/io/ios-home.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHome extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-infinite-outline.d.ts b/types/react-icons/io/ios-infinite-outline.d.ts
deleted file mode 100644
index 0b043764ee..0000000000
--- a/types/react-icons/io/ios-infinite-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosInfiniteOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-infinite.d.ts b/types/react-icons/io/ios-infinite.d.ts
deleted file mode 100644
index bf78e5f95b..0000000000
--- a/types/react-icons/io/ios-infinite.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosInfinite extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-informatempty.d.ts b/types/react-icons/io/ios-informatempty.d.ts
deleted file mode 100644
index 34c1b0c19c..0000000000
--- a/types/react-icons/io/ios-informatempty.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosInformatempty extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-information.d.ts b/types/react-icons/io/ios-information.d.ts
deleted file mode 100644
index f6e3295ac3..0000000000
--- a/types/react-icons/io/ios-information.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosInformation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-informatoutline.d.ts b/types/react-icons/io/ios-informatoutline.d.ts
deleted file mode 100644
index 038ce93a28..0000000000
--- a/types/react-icons/io/ios-informatoutline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosInformatoutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-ionic-outline.d.ts b/types/react-icons/io/ios-ionic-outline.d.ts
deleted file mode 100644
index bd42bf2316..0000000000
--- a/types/react-icons/io/ios-ionic-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosIonicOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-keypad-outline.d.ts b/types/react-icons/io/ios-keypad-outline.d.ts
deleted file mode 100644
index 9adff455e3..0000000000
--- a/types/react-icons/io/ios-keypad-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosKeypadOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-keypad.d.ts b/types/react-icons/io/ios-keypad.d.ts
deleted file mode 100644
index a804cf857f..0000000000
--- a/types/react-icons/io/ios-keypad.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosKeypad extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-lightbulb-outline.d.ts b/types/react-icons/io/ios-lightbulb-outline.d.ts
deleted file mode 100644
index 4c92bdd5d6..0000000000
--- a/types/react-icons/io/ios-lightbulb-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLightbulbOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-lightbulb.d.ts b/types/react-icons/io/ios-lightbulb.d.ts
deleted file mode 100644
index a7bbb177bb..0000000000
--- a/types/react-icons/io/ios-lightbulb.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLightbulb extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-list-outline.d.ts b/types/react-icons/io/ios-list-outline.d.ts
deleted file mode 100644
index 839d753887..0000000000
--- a/types/react-icons/io/ios-list-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosListOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-list.d.ts b/types/react-icons/io/ios-list.d.ts
deleted file mode 100644
index 9789a06dc7..0000000000
--- a/types/react-icons/io/ios-list.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosList extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-location.d.ts b/types/react-icons/io/ios-location.d.ts
deleted file mode 100644
index 617b853698..0000000000
--- a/types/react-icons/io/ios-location.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLocation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-locatoutline.d.ts b/types/react-icons/io/ios-locatoutline.d.ts
deleted file mode 100644
index 141e72e594..0000000000
--- a/types/react-icons/io/ios-locatoutline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLocatoutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-locked-outline.d.ts b/types/react-icons/io/ios-locked-outline.d.ts
deleted file mode 100644
index 3f0855a38d..0000000000
--- a/types/react-icons/io/ios-locked-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLockedOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-locked.d.ts b/types/react-icons/io/ios-locked.d.ts
deleted file mode 100644
index b22a3238d4..0000000000
--- a/types/react-icons/io/ios-locked.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLocked extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-loop-strong.d.ts b/types/react-icons/io/ios-loop-strong.d.ts
deleted file mode 100644
index 900c41d788..0000000000
--- a/types/react-icons/io/ios-loop-strong.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLoopStrong extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-loop.d.ts b/types/react-icons/io/ios-loop.d.ts
deleted file mode 100644
index 0235e4f546..0000000000
--- a/types/react-icons/io/ios-loop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLoop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-medical-outline.d.ts b/types/react-icons/io/ios-medical-outline.d.ts
deleted file mode 100644
index dadb2e61ae..0000000000
--- a/types/react-icons/io/ios-medical-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMedicalOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-medical.d.ts b/types/react-icons/io/ios-medical.d.ts
deleted file mode 100644
index 1d63e24694..0000000000
--- a/types/react-icons/io/ios-medical.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMedical extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-medkit-outline.d.ts b/types/react-icons/io/ios-medkit-outline.d.ts
deleted file mode 100644
index 367cb88b6f..0000000000
--- a/types/react-icons/io/ios-medkit-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMedkitOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-medkit.d.ts b/types/react-icons/io/ios-medkit.d.ts
deleted file mode 100644
index bf5d378f58..0000000000
--- a/types/react-icons/io/ios-medkit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMedkit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-mic-off.d.ts b/types/react-icons/io/ios-mic-off.d.ts
deleted file mode 100644
index 093cc13897..0000000000
--- a/types/react-icons/io/ios-mic-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMicOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-mic-outline.d.ts b/types/react-icons/io/ios-mic-outline.d.ts
deleted file mode 100644
index 1e2a4f7ca6..0000000000
--- a/types/react-icons/io/ios-mic-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMicOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-mic.d.ts b/types/react-icons/io/ios-mic.d.ts
deleted file mode 100644
index a561e50887..0000000000
--- a/types/react-icons/io/ios-mic.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMic extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-minus-empty.d.ts b/types/react-icons/io/ios-minus-empty.d.ts
deleted file mode 100644
index d33c1a6e8c..0000000000
--- a/types/react-icons/io/ios-minus-empty.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMinusEmpty extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-minus-outline.d.ts b/types/react-icons/io/ios-minus-outline.d.ts
deleted file mode 100644
index d7373a37df..0000000000
--- a/types/react-icons/io/ios-minus-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMinusOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-minus.d.ts b/types/react-icons/io/ios-minus.d.ts
deleted file mode 100644
index abc0a2679e..0000000000
--- a/types/react-icons/io/ios-minus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMinus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-monitor-outline.d.ts b/types/react-icons/io/ios-monitor-outline.d.ts
deleted file mode 100644
index 8dd207f86e..0000000000
--- a/types/react-icons/io/ios-monitor-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMonitorOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-monitor.d.ts b/types/react-icons/io/ios-monitor.d.ts
deleted file mode 100644
index 965a9b5d3b..0000000000
--- a/types/react-icons/io/ios-monitor.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMonitor extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-moon-outline.d.ts b/types/react-icons/io/ios-moon-outline.d.ts
deleted file mode 100644
index e35e94911f..0000000000
--- a/types/react-icons/io/ios-moon-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMoonOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-moon.d.ts b/types/react-icons/io/ios-moon.d.ts
deleted file mode 100644
index cee7a782f1..0000000000
--- a/types/react-icons/io/ios-moon.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMoon extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-more-outline.d.ts b/types/react-icons/io/ios-more-outline.d.ts
deleted file mode 100644
index a5a83f41cf..0000000000
--- a/types/react-icons/io/ios-more-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMoreOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-more.d.ts b/types/react-icons/io/ios-more.d.ts
deleted file mode 100644
index 9fb63209db..0000000000
--- a/types/react-icons/io/ios-more.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMore extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-musical-note.d.ts b/types/react-icons/io/ios-musical-note.d.ts
deleted file mode 100644
index 123b990474..0000000000
--- a/types/react-icons/io/ios-musical-note.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMusicalNote extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-musical-notes.d.ts b/types/react-icons/io/ios-musical-notes.d.ts
deleted file mode 100644
index 54daf1715e..0000000000
--- a/types/react-icons/io/ios-musical-notes.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMusicalNotes extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-navigate-outline.d.ts b/types/react-icons/io/ios-navigate-outline.d.ts
deleted file mode 100644
index daaafc5c76..0000000000
--- a/types/react-icons/io/ios-navigate-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosNavigateOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-navigate.d.ts b/types/react-icons/io/ios-navigate.d.ts
deleted file mode 100644
index 3a8a955fa6..0000000000
--- a/types/react-icons/io/ios-navigate.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosNavigate extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-nutrition.d.ts b/types/react-icons/io/ios-nutrition.d.ts
deleted file mode 100644
index 19b5f0eae6..0000000000
--- a/types/react-icons/io/ios-nutrition.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosNutrition extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-nutritoutline.d.ts b/types/react-icons/io/ios-nutritoutline.d.ts
deleted file mode 100644
index 9ce2ea6d24..0000000000
--- a/types/react-icons/io/ios-nutritoutline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosNutritoutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-paper-outline.d.ts b/types/react-icons/io/ios-paper-outline.d.ts
deleted file mode 100644
index f491c2a055..0000000000
--- a/types/react-icons/io/ios-paper-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPaperOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-paper.d.ts b/types/react-icons/io/ios-paper.d.ts
deleted file mode 100644
index bf98a1330d..0000000000
--- a/types/react-icons/io/ios-paper.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPaper extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-paperplane-outline.d.ts b/types/react-icons/io/ios-paperplane-outline.d.ts
deleted file mode 100644
index 381b337e35..0000000000
--- a/types/react-icons/io/ios-paperplane-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPaperplaneOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-paperplane.d.ts b/types/react-icons/io/ios-paperplane.d.ts
deleted file mode 100644
index 3999ec063c..0000000000
--- a/types/react-icons/io/ios-paperplane.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPaperplane extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-partlysunny-outline.d.ts b/types/react-icons/io/ios-partlysunny-outline.d.ts
deleted file mode 100644
index 96fddf3405..0000000000
--- a/types/react-icons/io/ios-partlysunny-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPartlysunnyOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-partlysunny.d.ts b/types/react-icons/io/ios-partlysunny.d.ts
deleted file mode 100644
index f0f7b24a0f..0000000000
--- a/types/react-icons/io/ios-partlysunny.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPartlysunny extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-pause-outline.d.ts b/types/react-icons/io/ios-pause-outline.d.ts
deleted file mode 100644
index a3c096ec70..0000000000
--- a/types/react-icons/io/ios-pause-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPauseOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-pause.d.ts b/types/react-icons/io/ios-pause.d.ts
deleted file mode 100644
index 5be0dbb44e..0000000000
--- a/types/react-icons/io/ios-pause.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPause extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-paw-outline.d.ts b/types/react-icons/io/ios-paw-outline.d.ts
deleted file mode 100644
index 59ff2ba1f0..0000000000
--- a/types/react-icons/io/ios-paw-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPawOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-paw.d.ts b/types/react-icons/io/ios-paw.d.ts
deleted file mode 100644
index 8907243697..0000000000
--- a/types/react-icons/io/ios-paw.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPaw extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-people-outline.d.ts b/types/react-icons/io/ios-people-outline.d.ts
deleted file mode 100644
index fca7beebf0..0000000000
--- a/types/react-icons/io/ios-people-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPeopleOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-people.d.ts b/types/react-icons/io/ios-people.d.ts
deleted file mode 100644
index 47167ca242..0000000000
--- a/types/react-icons/io/ios-people.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPeople extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-person-outline.d.ts b/types/react-icons/io/ios-person-outline.d.ts
deleted file mode 100644
index d9dcad6337..0000000000
--- a/types/react-icons/io/ios-person-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPersonOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-person.d.ts b/types/react-icons/io/ios-person.d.ts
deleted file mode 100644
index c0a721cdc9..0000000000
--- a/types/react-icons/io/ios-person.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPerson extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-personadd-outline.d.ts b/types/react-icons/io/ios-personadd-outline.d.ts
deleted file mode 100644
index 0c2ef41134..0000000000
--- a/types/react-icons/io/ios-personadd-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPersonaddOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-personadd.d.ts b/types/react-icons/io/ios-personadd.d.ts
deleted file mode 100644
index 76064513f6..0000000000
--- a/types/react-icons/io/ios-personadd.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPersonadd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-photos-outline.d.ts b/types/react-icons/io/ios-photos-outline.d.ts
deleted file mode 100644
index b6bcf6e60a..0000000000
--- a/types/react-icons/io/ios-photos-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPhotosOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-photos.d.ts b/types/react-icons/io/ios-photos.d.ts
deleted file mode 100644
index 1f4a1d7b0a..0000000000
--- a/types/react-icons/io/ios-photos.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPhotos extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-pie-outline.d.ts b/types/react-icons/io/ios-pie-outline.d.ts
deleted file mode 100644
index a370ac6e6e..0000000000
--- a/types/react-icons/io/ios-pie-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPieOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-pie.d.ts b/types/react-icons/io/ios-pie.d.ts
deleted file mode 100644
index 4a1c78801a..0000000000
--- a/types/react-icons/io/ios-pie.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPie extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-pint-outline.d.ts b/types/react-icons/io/ios-pint-outline.d.ts
deleted file mode 100644
index d400fd801a..0000000000
--- a/types/react-icons/io/ios-pint-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPintOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-pint.d.ts b/types/react-icons/io/ios-pint.d.ts
deleted file mode 100644
index 21bd07ccd5..0000000000
--- a/types/react-icons/io/ios-pint.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPint extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-play-outline.d.ts b/types/react-icons/io/ios-play-outline.d.ts
deleted file mode 100644
index 4c7a550e46..0000000000
--- a/types/react-icons/io/ios-play-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPlayOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-play.d.ts b/types/react-icons/io/ios-play.d.ts
deleted file mode 100644
index 18f66a8f59..0000000000
--- a/types/react-icons/io/ios-play.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPlay extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-plus-empty.d.ts b/types/react-icons/io/ios-plus-empty.d.ts
deleted file mode 100644
index a7235d6322..0000000000
--- a/types/react-icons/io/ios-plus-empty.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPlusEmpty extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-plus-outline.d.ts b/types/react-icons/io/ios-plus-outline.d.ts
deleted file mode 100644
index 719bce1444..0000000000
--- a/types/react-icons/io/ios-plus-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPlusOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-plus.d.ts b/types/react-icons/io/ios-plus.d.ts
deleted file mode 100644
index 7d29ea3f40..0000000000
--- a/types/react-icons/io/ios-plus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPlus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-pricetag-outline.d.ts b/types/react-icons/io/ios-pricetag-outline.d.ts
deleted file mode 100644
index 23a4c0c869..0000000000
--- a/types/react-icons/io/ios-pricetag-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPricetagOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-pricetag.d.ts b/types/react-icons/io/ios-pricetag.d.ts
deleted file mode 100644
index 601743c434..0000000000
--- a/types/react-icons/io/ios-pricetag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPricetag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-pricetags-outline.d.ts b/types/react-icons/io/ios-pricetags-outline.d.ts
deleted file mode 100644
index 0e1e574dac..0000000000
--- a/types/react-icons/io/ios-pricetags-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPricetagsOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-pricetags.d.ts b/types/react-icons/io/ios-pricetags.d.ts
deleted file mode 100644
index 4cc3aebb75..0000000000
--- a/types/react-icons/io/ios-pricetags.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPricetags extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-printer-outline.d.ts b/types/react-icons/io/ios-printer-outline.d.ts
deleted file mode 100644
index d20dcedadf..0000000000
--- a/types/react-icons/io/ios-printer-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPrinterOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-printer.d.ts b/types/react-icons/io/ios-printer.d.ts
deleted file mode 100644
index dc9bccfb25..0000000000
--- a/types/react-icons/io/ios-printer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPrinter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-pulse-strong.d.ts b/types/react-icons/io/ios-pulse-strong.d.ts
deleted file mode 100644
index 8f7e12017a..0000000000
--- a/types/react-icons/io/ios-pulse-strong.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPulseStrong extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-pulse.d.ts b/types/react-icons/io/ios-pulse.d.ts
deleted file mode 100644
index a7ff149ddf..0000000000
--- a/types/react-icons/io/ios-pulse.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPulse extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-rainy-outline.d.ts b/types/react-icons/io/ios-rainy-outline.d.ts
deleted file mode 100644
index 7e283d1cb3..0000000000
--- a/types/react-icons/io/ios-rainy-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRainyOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-rainy.d.ts b/types/react-icons/io/ios-rainy.d.ts
deleted file mode 100644
index a701475ef0..0000000000
--- a/types/react-icons/io/ios-rainy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRainy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-recording-outline.d.ts b/types/react-icons/io/ios-recording-outline.d.ts
deleted file mode 100644
index 9fc2e6ffca..0000000000
--- a/types/react-icons/io/ios-recording-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRecordingOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-recording.d.ts b/types/react-icons/io/ios-recording.d.ts
deleted file mode 100644
index 77d0e299cd..0000000000
--- a/types/react-icons/io/ios-recording.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRecording extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-redo-outline.d.ts b/types/react-icons/io/ios-redo-outline.d.ts
deleted file mode 100644
index 47bae67c99..0000000000
--- a/types/react-icons/io/ios-redo-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRedoOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-redo.d.ts b/types/react-icons/io/ios-redo.d.ts
deleted file mode 100644
index 0935996be6..0000000000
--- a/types/react-icons/io/ios-redo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRedo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-refresh-empty.d.ts b/types/react-icons/io/ios-refresh-empty.d.ts
deleted file mode 100644
index 0e7f151339..0000000000
--- a/types/react-icons/io/ios-refresh-empty.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRefreshEmpty extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-refresh-outline.d.ts b/types/react-icons/io/ios-refresh-outline.d.ts
deleted file mode 100644
index 7679405065..0000000000
--- a/types/react-icons/io/ios-refresh-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRefreshOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-refresh.d.ts b/types/react-icons/io/ios-refresh.d.ts
deleted file mode 100644
index 420affa507..0000000000
--- a/types/react-icons/io/ios-refresh.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRefresh extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-reload.d.ts b/types/react-icons/io/ios-reload.d.ts
deleted file mode 100644
index 93e947db67..0000000000
--- a/types/react-icons/io/ios-reload.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosReload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-reverse-camera-outline.d.ts b/types/react-icons/io/ios-reverse-camera-outline.d.ts
deleted file mode 100644
index 808d6ca0bf..0000000000
--- a/types/react-icons/io/ios-reverse-camera-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosReverseCameraOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-reverse-camera.d.ts b/types/react-icons/io/ios-reverse-camera.d.ts
deleted file mode 100644
index 0e74f82ab0..0000000000
--- a/types/react-icons/io/ios-reverse-camera.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosReverseCamera extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-rewind-outline.d.ts b/types/react-icons/io/ios-rewind-outline.d.ts
deleted file mode 100644
index dfc69fc86d..0000000000
--- a/types/react-icons/io/ios-rewind-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRewindOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-rewind.d.ts b/types/react-icons/io/ios-rewind.d.ts
deleted file mode 100644
index 7f883de8bf..0000000000
--- a/types/react-icons/io/ios-rewind.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRewind extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-rose-outline.d.ts b/types/react-icons/io/ios-rose-outline.d.ts
deleted file mode 100644
index dc112023a5..0000000000
--- a/types/react-icons/io/ios-rose-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRoseOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-rose.d.ts b/types/react-icons/io/ios-rose.d.ts
deleted file mode 100644
index 8cd590321f..0000000000
--- a/types/react-icons/io/ios-rose.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRose extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-search-strong.d.ts b/types/react-icons/io/ios-search-strong.d.ts
deleted file mode 100644
index 3b0ab67ed2..0000000000
--- a/types/react-icons/io/ios-search-strong.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSearchStrong extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-search.d.ts b/types/react-icons/io/ios-search.d.ts
deleted file mode 100644
index bd95701f4d..0000000000
--- a/types/react-icons/io/ios-search.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSearch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-settings-strong.d.ts b/types/react-icons/io/ios-settings-strong.d.ts
deleted file mode 100644
index 0bb6ef49aa..0000000000
--- a/types/react-icons/io/ios-settings-strong.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSettingsStrong extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-settings.d.ts b/types/react-icons/io/ios-settings.d.ts
deleted file mode 100644
index 26ff75fb04..0000000000
--- a/types/react-icons/io/ios-settings.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSettings extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-shuffle-strong.d.ts b/types/react-icons/io/ios-shuffle-strong.d.ts
deleted file mode 100644
index 15d2841c2f..0000000000
--- a/types/react-icons/io/ios-shuffle-strong.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosShuffleStrong extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-shuffle.d.ts b/types/react-icons/io/ios-shuffle.d.ts
deleted file mode 100644
index 305b4ff79b..0000000000
--- a/types/react-icons/io/ios-shuffle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosShuffle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-skipbackward-outline.d.ts b/types/react-icons/io/ios-skipbackward-outline.d.ts
deleted file mode 100644
index fa9db170bd..0000000000
--- a/types/react-icons/io/ios-skipbackward-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSkipbackwardOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-skipbackward.d.ts b/types/react-icons/io/ios-skipbackward.d.ts
deleted file mode 100644
index d9b009ed49..0000000000
--- a/types/react-icons/io/ios-skipbackward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSkipbackward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-skipforward-outline.d.ts b/types/react-icons/io/ios-skipforward-outline.d.ts
deleted file mode 100644
index 63c174f6b2..0000000000
--- a/types/react-icons/io/ios-skipforward-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSkipforwardOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-skipforward.d.ts b/types/react-icons/io/ios-skipforward.d.ts
deleted file mode 100644
index 39ce459a57..0000000000
--- a/types/react-icons/io/ios-skipforward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSkipforward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-snowy.d.ts b/types/react-icons/io/ios-snowy.d.ts
deleted file mode 100644
index f55f087752..0000000000
--- a/types/react-icons/io/ios-snowy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSnowy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-speedometer-outline.d.ts b/types/react-icons/io/ios-speedometer-outline.d.ts
deleted file mode 100644
index b0263dc761..0000000000
--- a/types/react-icons/io/ios-speedometer-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSpeedometerOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-speedometer.d.ts b/types/react-icons/io/ios-speedometer.d.ts
deleted file mode 100644
index f5d6862d1a..0000000000
--- a/types/react-icons/io/ios-speedometer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSpeedometer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-star-half.d.ts b/types/react-icons/io/ios-star-half.d.ts
deleted file mode 100644
index 03adf4a4d2..0000000000
--- a/types/react-icons/io/ios-star-half.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosStarHalf extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-star-outline.d.ts b/types/react-icons/io/ios-star-outline.d.ts
deleted file mode 100644
index 61dfe85fc1..0000000000
--- a/types/react-icons/io/ios-star-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosStarOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-star.d.ts b/types/react-icons/io/ios-star.d.ts
deleted file mode 100644
index 763d68d34c..0000000000
--- a/types/react-icons/io/ios-star.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosStar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-stopwatch-outline.d.ts b/types/react-icons/io/ios-stopwatch-outline.d.ts
deleted file mode 100644
index 73a9091d13..0000000000
--- a/types/react-icons/io/ios-stopwatch-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosStopwatchOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-stopwatch.d.ts b/types/react-icons/io/ios-stopwatch.d.ts
deleted file mode 100644
index 27bf6e3b40..0000000000
--- a/types/react-icons/io/ios-stopwatch.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosStopwatch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-sunny-outline.d.ts b/types/react-icons/io/ios-sunny-outline.d.ts
deleted file mode 100644
index 6c1f62f799..0000000000
--- a/types/react-icons/io/ios-sunny-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSunnyOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-sunny.d.ts b/types/react-icons/io/ios-sunny.d.ts
deleted file mode 100644
index e570cdf17c..0000000000
--- a/types/react-icons/io/ios-sunny.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSunny extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-telephone-outline.d.ts b/types/react-icons/io/ios-telephone-outline.d.ts
deleted file mode 100644
index 91d22539d0..0000000000
--- a/types/react-icons/io/ios-telephone-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTelephoneOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-telephone.d.ts b/types/react-icons/io/ios-telephone.d.ts
deleted file mode 100644
index 349826b187..0000000000
--- a/types/react-icons/io/ios-telephone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTelephone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-tennisball-outline.d.ts b/types/react-icons/io/ios-tennisball-outline.d.ts
deleted file mode 100644
index df889878d4..0000000000
--- a/types/react-icons/io/ios-tennisball-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTennisballOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-tennisball.d.ts b/types/react-icons/io/ios-tennisball.d.ts
deleted file mode 100644
index 177485e5ea..0000000000
--- a/types/react-icons/io/ios-tennisball.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTennisball extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-thunderstorm-outline.d.ts b/types/react-icons/io/ios-thunderstorm-outline.d.ts
deleted file mode 100644
index ac3f8120a7..0000000000
--- a/types/react-icons/io/ios-thunderstorm-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosThunderstormOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-thunderstorm.d.ts b/types/react-icons/io/ios-thunderstorm.d.ts
deleted file mode 100644
index 9612dc49cc..0000000000
--- a/types/react-icons/io/ios-thunderstorm.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosThunderstorm extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-time-outline.d.ts b/types/react-icons/io/ios-time-outline.d.ts
deleted file mode 100644
index 8067387f05..0000000000
--- a/types/react-icons/io/ios-time-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTimeOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-time.d.ts b/types/react-icons/io/ios-time.d.ts
deleted file mode 100644
index cdc944bd0b..0000000000
--- a/types/react-icons/io/ios-time.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTime extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-timer-outline.d.ts b/types/react-icons/io/ios-timer-outline.d.ts
deleted file mode 100644
index 21b2cdca0f..0000000000
--- a/types/react-icons/io/ios-timer-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTimerOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-timer.d.ts b/types/react-icons/io/ios-timer.d.ts
deleted file mode 100644
index 729f3f79d4..0000000000
--- a/types/react-icons/io/ios-timer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTimer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-toggle-outline.d.ts b/types/react-icons/io/ios-toggle-outline.d.ts
deleted file mode 100644
index fa23191d8c..0000000000
--- a/types/react-icons/io/ios-toggle-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosToggleOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-toggle.d.ts b/types/react-icons/io/ios-toggle.d.ts
deleted file mode 100644
index e01579ec53..0000000000
--- a/types/react-icons/io/ios-toggle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosToggle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-trash-outline.d.ts b/types/react-icons/io/ios-trash-outline.d.ts
deleted file mode 100644
index 55412f0ae2..0000000000
--- a/types/react-icons/io/ios-trash-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTrashOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-trash.d.ts b/types/react-icons/io/ios-trash.d.ts
deleted file mode 100644
index 296e42671e..0000000000
--- a/types/react-icons/io/ios-trash.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTrash extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-undo-outline.d.ts b/types/react-icons/io/ios-undo-outline.d.ts
deleted file mode 100644
index 093074d857..0000000000
--- a/types/react-icons/io/ios-undo-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUndoOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-undo.d.ts b/types/react-icons/io/ios-undo.d.ts
deleted file mode 100644
index 4bcdef2e88..0000000000
--- a/types/react-icons/io/ios-undo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUndo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-unlocked-outline.d.ts b/types/react-icons/io/ios-unlocked-outline.d.ts
deleted file mode 100644
index d14b0f7ffc..0000000000
--- a/types/react-icons/io/ios-unlocked-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUnlockedOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-unlocked.d.ts b/types/react-icons/io/ios-unlocked.d.ts
deleted file mode 100644
index d873e5f8d1..0000000000
--- a/types/react-icons/io/ios-unlocked.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUnlocked extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-upload-outline.d.ts b/types/react-icons/io/ios-upload-outline.d.ts
deleted file mode 100644
index 5f397a2bd8..0000000000
--- a/types/react-icons/io/ios-upload-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUploadOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-upload.d.ts b/types/react-icons/io/ios-upload.d.ts
deleted file mode 100644
index 5b9acf6b9c..0000000000
--- a/types/react-icons/io/ios-upload.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUpload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-videocam-outline.d.ts b/types/react-icons/io/ios-videocam-outline.d.ts
deleted file mode 100644
index 96fac95c0e..0000000000
--- a/types/react-icons/io/ios-videocam-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosVideocamOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-videocam.d.ts b/types/react-icons/io/ios-videocam.d.ts
deleted file mode 100644
index a55ede9155..0000000000
--- a/types/react-icons/io/ios-videocam.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosVideocam extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-volume-high.d.ts b/types/react-icons/io/ios-volume-high.d.ts
deleted file mode 100644
index 9ae46e1936..0000000000
--- a/types/react-icons/io/ios-volume-high.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosVolumeHigh extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-volume-low.d.ts b/types/react-icons/io/ios-volume-low.d.ts
deleted file mode 100644
index 402ee999cb..0000000000
--- a/types/react-icons/io/ios-volume-low.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosVolumeLow extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-wineglass-outline.d.ts b/types/react-icons/io/ios-wineglass-outline.d.ts
deleted file mode 100644
index 3e34e8f73d..0000000000
--- a/types/react-icons/io/ios-wineglass-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosWineglassOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-wineglass.d.ts b/types/react-icons/io/ios-wineglass.d.ts
deleted file mode 100644
index aaf3e6bd56..0000000000
--- a/types/react-icons/io/ios-wineglass.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosWineglass extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-world-outline.d.ts b/types/react-icons/io/ios-world-outline.d.ts
deleted file mode 100644
index 4b5d4ab7b1..0000000000
--- a/types/react-icons/io/ios-world-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosWorldOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ios-world.d.ts b/types/react-icons/io/ios-world.d.ts
deleted file mode 100644
index 6a2b5a3392..0000000000
--- a/types/react-icons/io/ios-world.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIosWorld extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ipad.d.ts b/types/react-icons/io/ipad.d.ts
deleted file mode 100644
index 5f534f3a70..0000000000
--- a/types/react-icons/io/ipad.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIpad extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/iphone.d.ts b/types/react-icons/io/iphone.d.ts
deleted file mode 100644
index 4b4fc084d6..0000000000
--- a/types/react-icons/io/iphone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIphone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ipod.d.ts b/types/react-icons/io/ipod.d.ts
deleted file mode 100644
index 793b8f7f92..0000000000
--- a/types/react-icons/io/ipod.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoIpod extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/jet.d.ts b/types/react-icons/io/jet.d.ts
deleted file mode 100644
index 7f8ef429e2..0000000000
--- a/types/react-icons/io/jet.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoJet extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/key.d.ts b/types/react-icons/io/key.d.ts
deleted file mode 100644
index 8a84a24518..0000000000
--- a/types/react-icons/io/key.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoKey extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/knife.d.ts b/types/react-icons/io/knife.d.ts
deleted file mode 100644
index f9683f399b..0000000000
--- a/types/react-icons/io/knife.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoKnife extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/laptop.d.ts b/types/react-icons/io/laptop.d.ts
deleted file mode 100644
index ffd3252609..0000000000
--- a/types/react-icons/io/laptop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoLaptop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/leaf.d.ts b/types/react-icons/io/leaf.d.ts
deleted file mode 100644
index bc0235a24a..0000000000
--- a/types/react-icons/io/leaf.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoLeaf extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/levels.d.ts b/types/react-icons/io/levels.d.ts
deleted file mode 100644
index 0bd2e2c1e9..0000000000
--- a/types/react-icons/io/levels.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoLevels extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/lightbulb.d.ts b/types/react-icons/io/lightbulb.d.ts
deleted file mode 100644
index c16e16a2fa..0000000000
--- a/types/react-icons/io/lightbulb.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoLightbulb extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/link.d.ts b/types/react-icons/io/link.d.ts
deleted file mode 100644
index c0c376d736..0000000000
--- a/types/react-icons/io/link.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoLink extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/load-a.d.ts b/types/react-icons/io/load-a.d.ts
deleted file mode 100644
index bf0b3ec100..0000000000
--- a/types/react-icons/io/load-a.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoLoadA extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/load-b.d.ts b/types/react-icons/io/load-b.d.ts
deleted file mode 100644
index 85dcae989a..0000000000
--- a/types/react-icons/io/load-b.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoLoadB extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/load-c.d.ts b/types/react-icons/io/load-c.d.ts
deleted file mode 100644
index 733dff4bfa..0000000000
--- a/types/react-icons/io/load-c.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoLoadC extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/load-d.d.ts b/types/react-icons/io/load-d.d.ts
deleted file mode 100644
index 160d71b383..0000000000
--- a/types/react-icons/io/load-d.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoLoadD extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/location.d.ts b/types/react-icons/io/location.d.ts
deleted file mode 100644
index 04e657adc4..0000000000
--- a/types/react-icons/io/location.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoLocation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/lock-combination.d.ts b/types/react-icons/io/lock-combination.d.ts
deleted file mode 100644
index d25e21ded1..0000000000
--- a/types/react-icons/io/lock-combination.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoLockCombination extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/locked.d.ts b/types/react-icons/io/locked.d.ts
deleted file mode 100644
index db82275a8e..0000000000
--- a/types/react-icons/io/locked.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoLocked extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/log-in.d.ts b/types/react-icons/io/log-in.d.ts
deleted file mode 100644
index bb045baf8e..0000000000
--- a/types/react-icons/io/log-in.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoLogIn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/log-out.d.ts b/types/react-icons/io/log-out.d.ts
deleted file mode 100644
index 0374ff539d..0000000000
--- a/types/react-icons/io/log-out.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoLogOut extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/loop.d.ts b/types/react-icons/io/loop.d.ts
deleted file mode 100644
index 2f5d563c07..0000000000
--- a/types/react-icons/io/loop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoLoop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/magnet.d.ts b/types/react-icons/io/magnet.d.ts
deleted file mode 100644
index b8625a2ccf..0000000000
--- a/types/react-icons/io/magnet.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMagnet extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/male.d.ts b/types/react-icons/io/male.d.ts
deleted file mode 100644
index 62bfbd5067..0000000000
--- a/types/react-icons/io/male.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMale extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/man.d.ts b/types/react-icons/io/man.d.ts
deleted file mode 100644
index 2770ac14e2..0000000000
--- a/types/react-icons/io/man.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMan extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/map.d.ts b/types/react-icons/io/map.d.ts
deleted file mode 100644
index 4c48512de6..0000000000
--- a/types/react-icons/io/map.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMap extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/medkit.d.ts b/types/react-icons/io/medkit.d.ts
deleted file mode 100644
index e15728387c..0000000000
--- a/types/react-icons/io/medkit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMedkit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/merge.d.ts b/types/react-icons/io/merge.d.ts
deleted file mode 100644
index 6a41308d9b..0000000000
--- a/types/react-icons/io/merge.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMerge extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/mic-a.d.ts b/types/react-icons/io/mic-a.d.ts
deleted file mode 100644
index c5cf11831d..0000000000
--- a/types/react-icons/io/mic-a.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMicA extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/mic-b.d.ts b/types/react-icons/io/mic-b.d.ts
deleted file mode 100644
index 68a0acf707..0000000000
--- a/types/react-icons/io/mic-b.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMicB extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/mic-c.d.ts b/types/react-icons/io/mic-c.d.ts
deleted file mode 100644
index 2d8ddc3be6..0000000000
--- a/types/react-icons/io/mic-c.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMicC extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/minus-circled.d.ts b/types/react-icons/io/minus-circled.d.ts
deleted file mode 100644
index 1b5edd59e7..0000000000
--- a/types/react-icons/io/minus-circled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMinusCircled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/minus-round.d.ts b/types/react-icons/io/minus-round.d.ts
deleted file mode 100644
index 1a75a9c5d4..0000000000
--- a/types/react-icons/io/minus-round.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMinusRound extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/minus.d.ts b/types/react-icons/io/minus.d.ts
deleted file mode 100644
index ee58f016db..0000000000
--- a/types/react-icons/io/minus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMinus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/model-s.d.ts b/types/react-icons/io/model-s.d.ts
deleted file mode 100644
index 567219cde6..0000000000
--- a/types/react-icons/io/model-s.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoModelS extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/monitor.d.ts b/types/react-icons/io/monitor.d.ts
deleted file mode 100644
index 3454bea09f..0000000000
--- a/types/react-icons/io/monitor.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMonitor extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/more.d.ts b/types/react-icons/io/more.d.ts
deleted file mode 100644
index 2c528b5bae..0000000000
--- a/types/react-icons/io/more.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMore extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/mouse.d.ts b/types/react-icons/io/mouse.d.ts
deleted file mode 100644
index af862564ba..0000000000
--- a/types/react-icons/io/mouse.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMouse extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/music-note.d.ts b/types/react-icons/io/music-note.d.ts
deleted file mode 100644
index 92875eb08a..0000000000
--- a/types/react-icons/io/music-note.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoMusicNote extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/navicon-round.d.ts b/types/react-icons/io/navicon-round.d.ts
deleted file mode 100644
index 5d1bc53526..0000000000
--- a/types/react-icons/io/navicon-round.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoNaviconRound extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/navicon.d.ts b/types/react-icons/io/navicon.d.ts
deleted file mode 100644
index cdae5d7238..0000000000
--- a/types/react-icons/io/navicon.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoNavicon extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/navigate.d.ts b/types/react-icons/io/navigate.d.ts
deleted file mode 100644
index 2fe67c17b2..0000000000
--- a/types/react-icons/io/navigate.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoNavigate extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/network.d.ts b/types/react-icons/io/network.d.ts
deleted file mode 100644
index 359c0abbd2..0000000000
--- a/types/react-icons/io/network.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoNetwork extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/no-smoking.d.ts b/types/react-icons/io/no-smoking.d.ts
deleted file mode 100644
index 074789127a..0000000000
--- a/types/react-icons/io/no-smoking.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoNoSmoking extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/nuclear.d.ts b/types/react-icons/io/nuclear.d.ts
deleted file mode 100644
index 559674f85e..0000000000
--- a/types/react-icons/io/nuclear.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoNuclear extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/outlet.d.ts b/types/react-icons/io/outlet.d.ts
deleted file mode 100644
index f68de98cb1..0000000000
--- a/types/react-icons/io/outlet.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoOutlet extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/paintbrush.d.ts b/types/react-icons/io/paintbrush.d.ts
deleted file mode 100644
index 1cc12bebca..0000000000
--- a/types/react-icons/io/paintbrush.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPaintbrush extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/paintbucket.d.ts b/types/react-icons/io/paintbucket.d.ts
deleted file mode 100644
index 0e6dce8aa7..0000000000
--- a/types/react-icons/io/paintbucket.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPaintbucket extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/paper-airplane.d.ts b/types/react-icons/io/paper-airplane.d.ts
deleted file mode 100644
index e5c2d64cb8..0000000000
--- a/types/react-icons/io/paper-airplane.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPaperAirplane extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/paperclip.d.ts b/types/react-icons/io/paperclip.d.ts
deleted file mode 100644
index cb9463bdf1..0000000000
--- a/types/react-icons/io/paperclip.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPaperclip extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/pause.d.ts b/types/react-icons/io/pause.d.ts
deleted file mode 100644
index 2680c5b1b4..0000000000
--- a/types/react-icons/io/pause.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPause extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/person-add.d.ts b/types/react-icons/io/person-add.d.ts
deleted file mode 100644
index 43a66e58c0..0000000000
--- a/types/react-icons/io/person-add.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPersonAdd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/person-stalker.d.ts b/types/react-icons/io/person-stalker.d.ts
deleted file mode 100644
index 59ed89e000..0000000000
--- a/types/react-icons/io/person-stalker.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPersonStalker extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/person.d.ts b/types/react-icons/io/person.d.ts
deleted file mode 100644
index 0970df9ab0..0000000000
--- a/types/react-icons/io/person.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPerson extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/pie-graph.d.ts b/types/react-icons/io/pie-graph.d.ts
deleted file mode 100644
index 4171c0ee1d..0000000000
--- a/types/react-icons/io/pie-graph.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPieGraph extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/pin.d.ts b/types/react-icons/io/pin.d.ts
deleted file mode 100644
index 7e1d58f30e..0000000000
--- a/types/react-icons/io/pin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/pinpoint.d.ts b/types/react-icons/io/pinpoint.d.ts
deleted file mode 100644
index 8ecf88a45b..0000000000
--- a/types/react-icons/io/pinpoint.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPinpoint extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/pizza.d.ts b/types/react-icons/io/pizza.d.ts
deleted file mode 100644
index ef5ce7525b..0000000000
--- a/types/react-icons/io/pizza.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPizza extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/plane.d.ts b/types/react-icons/io/plane.d.ts
deleted file mode 100644
index 9f0b2eaff2..0000000000
--- a/types/react-icons/io/plane.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPlane extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/planet.d.ts b/types/react-icons/io/planet.d.ts
deleted file mode 100644
index b91ae2a503..0000000000
--- a/types/react-icons/io/planet.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPlanet extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/play.d.ts b/types/react-icons/io/play.d.ts
deleted file mode 100644
index 8a66797eb2..0000000000
--- a/types/react-icons/io/play.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPlay extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/playstation.d.ts b/types/react-icons/io/playstation.d.ts
deleted file mode 100644
index 315eecce09..0000000000
--- a/types/react-icons/io/playstation.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPlaystation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/plus-circled.d.ts b/types/react-icons/io/plus-circled.d.ts
deleted file mode 100644
index a74703c85d..0000000000
--- a/types/react-icons/io/plus-circled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPlusCircled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/plus-round.d.ts b/types/react-icons/io/plus-round.d.ts
deleted file mode 100644
index 3e7ba67f3a..0000000000
--- a/types/react-icons/io/plus-round.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPlusRound extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/plus.d.ts b/types/react-icons/io/plus.d.ts
deleted file mode 100644
index f61bf82a1a..0000000000
--- a/types/react-icons/io/plus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPlus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/podium.d.ts b/types/react-icons/io/podium.d.ts
deleted file mode 100644
index af2e204331..0000000000
--- a/types/react-icons/io/podium.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPodium extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/pound.d.ts b/types/react-icons/io/pound.d.ts
deleted file mode 100644
index b7b2e28b9e..0000000000
--- a/types/react-icons/io/pound.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPound extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/power.d.ts b/types/react-icons/io/power.d.ts
deleted file mode 100644
index f41d3d5e00..0000000000
--- a/types/react-icons/io/power.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPower extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/pricetag.d.ts b/types/react-icons/io/pricetag.d.ts
deleted file mode 100644
index b8f2d47c03..0000000000
--- a/types/react-icons/io/pricetag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPricetag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/pricetags.d.ts b/types/react-icons/io/pricetags.d.ts
deleted file mode 100644
index cca52cc061..0000000000
--- a/types/react-icons/io/pricetags.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPricetags extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/printer.d.ts b/types/react-icons/io/printer.d.ts
deleted file mode 100644
index 33bc74b2c2..0000000000
--- a/types/react-icons/io/printer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPrinter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/pull-request.d.ts b/types/react-icons/io/pull-request.d.ts
deleted file mode 100644
index b788efefdc..0000000000
--- a/types/react-icons/io/pull-request.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoPullRequest extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/qr-scanner.d.ts b/types/react-icons/io/qr-scanner.d.ts
deleted file mode 100644
index 77b1ca1dcf..0000000000
--- a/types/react-icons/io/qr-scanner.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoQrScanner extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/quote.d.ts b/types/react-icons/io/quote.d.ts
deleted file mode 100644
index ac7f5d32ef..0000000000
--- a/types/react-icons/io/quote.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoQuote extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/radio-waves.d.ts b/types/react-icons/io/radio-waves.d.ts
deleted file mode 100644
index 0b67b79379..0000000000
--- a/types/react-icons/io/radio-waves.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoRadioWaves extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/record.d.ts b/types/react-icons/io/record.d.ts
deleted file mode 100644
index dd7cd7a65f..0000000000
--- a/types/react-icons/io/record.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoRecord extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/refresh.d.ts b/types/react-icons/io/refresh.d.ts
deleted file mode 100644
index 8712271741..0000000000
--- a/types/react-icons/io/refresh.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoRefresh extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/reply-all.d.ts b/types/react-icons/io/reply-all.d.ts
deleted file mode 100644
index 568a1f8dd4..0000000000
--- a/types/react-icons/io/reply-all.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoReplyAll extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/reply.d.ts b/types/react-icons/io/reply.d.ts
deleted file mode 100644
index 628b3c6ade..0000000000
--- a/types/react-icons/io/reply.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoReply extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ribbon-a.d.ts b/types/react-icons/io/ribbon-a.d.ts
deleted file mode 100644
index 38d15e1fd1..0000000000
--- a/types/react-icons/io/ribbon-a.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoRibbonA extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/ribbon-b.d.ts b/types/react-icons/io/ribbon-b.d.ts
deleted file mode 100644
index 8e2ba836cc..0000000000
--- a/types/react-icons/io/ribbon-b.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoRibbonB extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/sad-outline.d.ts b/types/react-icons/io/sad-outline.d.ts
deleted file mode 100644
index 07ef27ecfb..0000000000
--- a/types/react-icons/io/sad-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSadOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/sad.d.ts b/types/react-icons/io/sad.d.ts
deleted file mode 100644
index de6e0e3b98..0000000000
--- a/types/react-icons/io/sad.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSad extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/scissors.d.ts b/types/react-icons/io/scissors.d.ts
deleted file mode 100644
index 18b40acd88..0000000000
--- a/types/react-icons/io/scissors.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoScissors extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/search.d.ts b/types/react-icons/io/search.d.ts
deleted file mode 100644
index 00175f972b..0000000000
--- a/types/react-icons/io/search.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSearch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/settings.d.ts b/types/react-icons/io/settings.d.ts
deleted file mode 100644
index b5793e8679..0000000000
--- a/types/react-icons/io/settings.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSettings extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/share.d.ts b/types/react-icons/io/share.d.ts
deleted file mode 100644
index ba6d9a210a..0000000000
--- a/types/react-icons/io/share.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoShare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/shuffle.d.ts b/types/react-icons/io/shuffle.d.ts
deleted file mode 100644
index fb4bf71aad..0000000000
--- a/types/react-icons/io/shuffle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoShuffle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/skip-backward.d.ts b/types/react-icons/io/skip-backward.d.ts
deleted file mode 100644
index 94bf5675c3..0000000000
--- a/types/react-icons/io/skip-backward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSkipBackward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/skip-forward.d.ts b/types/react-icons/io/skip-forward.d.ts
deleted file mode 100644
index 7912bd2dfa..0000000000
--- a/types/react-icons/io/skip-forward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSkipForward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-android-outline.d.ts b/types/react-icons/io/social-android-outline.d.ts
deleted file mode 100644
index 3b306ef4a2..0000000000
--- a/types/react-icons/io/social-android-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialAndroidOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-android.d.ts b/types/react-icons/io/social-android.d.ts
deleted file mode 100644
index 362c2af2c5..0000000000
--- a/types/react-icons/io/social-android.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialAndroid extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-angular-outline.d.ts b/types/react-icons/io/social-angular-outline.d.ts
deleted file mode 100644
index be0ad623a7..0000000000
--- a/types/react-icons/io/social-angular-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialAngularOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-angular.d.ts b/types/react-icons/io/social-angular.d.ts
deleted file mode 100644
index 0286fd5c24..0000000000
--- a/types/react-icons/io/social-angular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialAngular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-apple-outline.d.ts b/types/react-icons/io/social-apple-outline.d.ts
deleted file mode 100644
index 13ef33d192..0000000000
--- a/types/react-icons/io/social-apple-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialAppleOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-apple.d.ts b/types/react-icons/io/social-apple.d.ts
deleted file mode 100644
index bece372480..0000000000
--- a/types/react-icons/io/social-apple.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialApple extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-bitcoin-outline.d.ts b/types/react-icons/io/social-bitcoin-outline.d.ts
deleted file mode 100644
index 9044d3dc51..0000000000
--- a/types/react-icons/io/social-bitcoin-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialBitcoinOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-bitcoin.d.ts b/types/react-icons/io/social-bitcoin.d.ts
deleted file mode 100644
index f13a9ca0e2..0000000000
--- a/types/react-icons/io/social-bitcoin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialBitcoin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-buffer-outline.d.ts b/types/react-icons/io/social-buffer-outline.d.ts
deleted file mode 100644
index 073a4d3256..0000000000
--- a/types/react-icons/io/social-buffer-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialBufferOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-buffer.d.ts b/types/react-icons/io/social-buffer.d.ts
deleted file mode 100644
index 8f103cbc23..0000000000
--- a/types/react-icons/io/social-buffer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialBuffer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-chrome-outline.d.ts b/types/react-icons/io/social-chrome-outline.d.ts
deleted file mode 100644
index e0b96d90a9..0000000000
--- a/types/react-icons/io/social-chrome-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialChromeOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-chrome.d.ts b/types/react-icons/io/social-chrome.d.ts
deleted file mode 100644
index a98ec53c7b..0000000000
--- a/types/react-icons/io/social-chrome.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialChrome extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-codepen-outline.d.ts b/types/react-icons/io/social-codepen-outline.d.ts
deleted file mode 100644
index 86affb85f1..0000000000
--- a/types/react-icons/io/social-codepen-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialCodepenOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-codepen.d.ts b/types/react-icons/io/social-codepen.d.ts
deleted file mode 100644
index bd6d0fe2ff..0000000000
--- a/types/react-icons/io/social-codepen.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialCodepen extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-css3-outline.d.ts b/types/react-icons/io/social-css3-outline.d.ts
deleted file mode 100644
index 0d792c0e6a..0000000000
--- a/types/react-icons/io/social-css3-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialCss3Outline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-css3.d.ts b/types/react-icons/io/social-css3.d.ts
deleted file mode 100644
index f8ef55d480..0000000000
--- a/types/react-icons/io/social-css3.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialCss3 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-designernews-outline.d.ts b/types/react-icons/io/social-designernews-outline.d.ts
deleted file mode 100644
index 9a84d73221..0000000000
--- a/types/react-icons/io/social-designernews-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDesignernewsOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-designernews.d.ts b/types/react-icons/io/social-designernews.d.ts
deleted file mode 100644
index b7f5b92381..0000000000
--- a/types/react-icons/io/social-designernews.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDesignernews extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-dribbble-outline.d.ts b/types/react-icons/io/social-dribbble-outline.d.ts
deleted file mode 100644
index ba7a99e3ab..0000000000
--- a/types/react-icons/io/social-dribbble-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDribbbleOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-dribbble.d.ts b/types/react-icons/io/social-dribbble.d.ts
deleted file mode 100644
index ef43f8d862..0000000000
--- a/types/react-icons/io/social-dribbble.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDribbble extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-dropbox-outline.d.ts b/types/react-icons/io/social-dropbox-outline.d.ts
deleted file mode 100644
index 71959da367..0000000000
--- a/types/react-icons/io/social-dropbox-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDropboxOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-dropbox.d.ts b/types/react-icons/io/social-dropbox.d.ts
deleted file mode 100644
index e0f243a8fa..0000000000
--- a/types/react-icons/io/social-dropbox.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDropbox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-euro-outline.d.ts b/types/react-icons/io/social-euro-outline.d.ts
deleted file mode 100644
index ec55bb73a5..0000000000
--- a/types/react-icons/io/social-euro-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialEuroOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-euro.d.ts b/types/react-icons/io/social-euro.d.ts
deleted file mode 100644
index b0b70b5796..0000000000
--- a/types/react-icons/io/social-euro.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialEuro extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-facebook-outline.d.ts b/types/react-icons/io/social-facebook-outline.d.ts
deleted file mode 100644
index fce2eda2b9..0000000000
--- a/types/react-icons/io/social-facebook-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialFacebookOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-facebook.d.ts b/types/react-icons/io/social-facebook.d.ts
deleted file mode 100644
index 696c8f5401..0000000000
--- a/types/react-icons/io/social-facebook.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialFacebook extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-foursquare-outline.d.ts b/types/react-icons/io/social-foursquare-outline.d.ts
deleted file mode 100644
index aa643db79c..0000000000
--- a/types/react-icons/io/social-foursquare-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialFoursquareOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-foursquare.d.ts b/types/react-icons/io/social-foursquare.d.ts
deleted file mode 100644
index d4555bfc41..0000000000
--- a/types/react-icons/io/social-foursquare.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialFoursquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-freebsd-devil.d.ts b/types/react-icons/io/social-freebsd-devil.d.ts
deleted file mode 100644
index 17715e0a06..0000000000
--- a/types/react-icons/io/social-freebsd-devil.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialFreebsdDevil extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-github-outline.d.ts b/types/react-icons/io/social-github-outline.d.ts
deleted file mode 100644
index ad810dd9f5..0000000000
--- a/types/react-icons/io/social-github-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGithubOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-github.d.ts b/types/react-icons/io/social-github.d.ts
deleted file mode 100644
index dabc247815..0000000000
--- a/types/react-icons/io/social-github.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGithub extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-google-outline.d.ts b/types/react-icons/io/social-google-outline.d.ts
deleted file mode 100644
index 76fa21d665..0000000000
--- a/types/react-icons/io/social-google-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGoogleOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-google.d.ts b/types/react-icons/io/social-google.d.ts
deleted file mode 100644
index c31283ade3..0000000000
--- a/types/react-icons/io/social-google.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGoogle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-googleplus-outline.d.ts b/types/react-icons/io/social-googleplus-outline.d.ts
deleted file mode 100644
index fe28dee981..0000000000
--- a/types/react-icons/io/social-googleplus-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGoogleplusOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-googleplus.d.ts b/types/react-icons/io/social-googleplus.d.ts
deleted file mode 100644
index 3fe4052899..0000000000
--- a/types/react-icons/io/social-googleplus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGoogleplus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-hackernews-outline.d.ts b/types/react-icons/io/social-hackernews-outline.d.ts
deleted file mode 100644
index c71910be26..0000000000
--- a/types/react-icons/io/social-hackernews-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialHackernewsOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-hackernews.d.ts b/types/react-icons/io/social-hackernews.d.ts
deleted file mode 100644
index 69f8ffd48e..0000000000
--- a/types/react-icons/io/social-hackernews.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialHackernews extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-html5-outline.d.ts b/types/react-icons/io/social-html5-outline.d.ts
deleted file mode 100644
index 3c8d43114f..0000000000
--- a/types/react-icons/io/social-html5-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialHtml5Outline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-html5.d.ts b/types/react-icons/io/social-html5.d.ts
deleted file mode 100644
index 9916b17e2c..0000000000
--- a/types/react-icons/io/social-html5.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialHtml5 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-instagram-outline.d.ts b/types/react-icons/io/social-instagram-outline.d.ts
deleted file mode 100644
index ffc74066b7..0000000000
--- a/types/react-icons/io/social-instagram-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialInstagramOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-instagram.d.ts b/types/react-icons/io/social-instagram.d.ts
deleted file mode 100644
index 7c06ae1833..0000000000
--- a/types/react-icons/io/social-instagram.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialInstagram extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-javascript-outline.d.ts b/types/react-icons/io/social-javascript-outline.d.ts
deleted file mode 100644
index 0f21ff7483..0000000000
--- a/types/react-icons/io/social-javascript-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialJavascriptOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-javascript.d.ts b/types/react-icons/io/social-javascript.d.ts
deleted file mode 100644
index 99905575bf..0000000000
--- a/types/react-icons/io/social-javascript.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialJavascript extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-linkedin-outline.d.ts b/types/react-icons/io/social-linkedin-outline.d.ts
deleted file mode 100644
index 3ddee8261a..0000000000
--- a/types/react-icons/io/social-linkedin-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialLinkedinOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-linkedin.d.ts b/types/react-icons/io/social-linkedin.d.ts
deleted file mode 100644
index 0266663678..0000000000
--- a/types/react-icons/io/social-linkedin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialLinkedin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-markdown.d.ts b/types/react-icons/io/social-markdown.d.ts
deleted file mode 100644
index 963119614d..0000000000
--- a/types/react-icons/io/social-markdown.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialMarkdown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-nodejs.d.ts b/types/react-icons/io/social-nodejs.d.ts
deleted file mode 100644
index 642390dc4a..0000000000
--- a/types/react-icons/io/social-nodejs.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialNodejs extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-octocat.d.ts b/types/react-icons/io/social-octocat.d.ts
deleted file mode 100644
index 0003cb487c..0000000000
--- a/types/react-icons/io/social-octocat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialOctocat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-pinterest-outline.d.ts b/types/react-icons/io/social-pinterest-outline.d.ts
deleted file mode 100644
index 4ed2d123ac..0000000000
--- a/types/react-icons/io/social-pinterest-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialPinterestOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-pinterest.d.ts b/types/react-icons/io/social-pinterest.d.ts
deleted file mode 100644
index f2ee95376f..0000000000
--- a/types/react-icons/io/social-pinterest.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialPinterest extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-python.d.ts b/types/react-icons/io/social-python.d.ts
deleted file mode 100644
index 78a6e50954..0000000000
--- a/types/react-icons/io/social-python.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialPython extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-reddit-outline.d.ts b/types/react-icons/io/social-reddit-outline.d.ts
deleted file mode 100644
index 9dd5355bdc..0000000000
--- a/types/react-icons/io/social-reddit-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialRedditOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-reddit.d.ts b/types/react-icons/io/social-reddit.d.ts
deleted file mode 100644
index e103be80d3..0000000000
--- a/types/react-icons/io/social-reddit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialReddit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-rss-outline.d.ts b/types/react-icons/io/social-rss-outline.d.ts
deleted file mode 100644
index 4baab1f80b..0000000000
--- a/types/react-icons/io/social-rss-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialRssOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-rss.d.ts b/types/react-icons/io/social-rss.d.ts
deleted file mode 100644
index 2c749b4af9..0000000000
--- a/types/react-icons/io/social-rss.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialRss extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-sass.d.ts b/types/react-icons/io/social-sass.d.ts
deleted file mode 100644
index 6ba05bc9ae..0000000000
--- a/types/react-icons/io/social-sass.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialSass extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-skype-outline.d.ts b/types/react-icons/io/social-skype-outline.d.ts
deleted file mode 100644
index cefebe89c9..0000000000
--- a/types/react-icons/io/social-skype-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialSkypeOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-skype.d.ts b/types/react-icons/io/social-skype.d.ts
deleted file mode 100644
index a49a35ce62..0000000000
--- a/types/react-icons/io/social-skype.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialSkype extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-snapchat-outline.d.ts b/types/react-icons/io/social-snapchat-outline.d.ts
deleted file mode 100644
index 5fe324cb94..0000000000
--- a/types/react-icons/io/social-snapchat-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialSnapchatOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-snapchat.d.ts b/types/react-icons/io/social-snapchat.d.ts
deleted file mode 100644
index ba87070d61..0000000000
--- a/types/react-icons/io/social-snapchat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialSnapchat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-tumblr-outline.d.ts b/types/react-icons/io/social-tumblr-outline.d.ts
deleted file mode 100644
index dbf70d2b60..0000000000
--- a/types/react-icons/io/social-tumblr-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTumblrOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-tumblr.d.ts b/types/react-icons/io/social-tumblr.d.ts
deleted file mode 100644
index ce5c8b4170..0000000000
--- a/types/react-icons/io/social-tumblr.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTumblr extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-tux.d.ts b/types/react-icons/io/social-tux.d.ts
deleted file mode 100644
index 411ff72010..0000000000
--- a/types/react-icons/io/social-tux.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTux extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-twitch-outline.d.ts b/types/react-icons/io/social-twitch-outline.d.ts
deleted file mode 100644
index 5875914d98..0000000000
--- a/types/react-icons/io/social-twitch-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTwitchOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-twitch.d.ts b/types/react-icons/io/social-twitch.d.ts
deleted file mode 100644
index 109993f553..0000000000
--- a/types/react-icons/io/social-twitch.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTwitch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-twitter-outline.d.ts b/types/react-icons/io/social-twitter-outline.d.ts
deleted file mode 100644
index 2ecfe578dd..0000000000
--- a/types/react-icons/io/social-twitter-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTwitterOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-twitter.d.ts b/types/react-icons/io/social-twitter.d.ts
deleted file mode 100644
index 81b8c0817a..0000000000
--- a/types/react-icons/io/social-twitter.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTwitter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-usd-outline.d.ts b/types/react-icons/io/social-usd-outline.d.ts
deleted file mode 100644
index 8c12d195f5..0000000000
--- a/types/react-icons/io/social-usd-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialUsdOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-usd.d.ts b/types/react-icons/io/social-usd.d.ts
deleted file mode 100644
index a6814ba496..0000000000
--- a/types/react-icons/io/social-usd.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialUsd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-vimeo-outline.d.ts b/types/react-icons/io/social-vimeo-outline.d.ts
deleted file mode 100644
index bcac0c4f79..0000000000
--- a/types/react-icons/io/social-vimeo-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialVimeoOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-vimeo.d.ts b/types/react-icons/io/social-vimeo.d.ts
deleted file mode 100644
index 5e0e068a51..0000000000
--- a/types/react-icons/io/social-vimeo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialVimeo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-whatsapp-outline.d.ts b/types/react-icons/io/social-whatsapp-outline.d.ts
deleted file mode 100644
index d3945dd43a..0000000000
--- a/types/react-icons/io/social-whatsapp-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWhatsappOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-whatsapp.d.ts b/types/react-icons/io/social-whatsapp.d.ts
deleted file mode 100644
index 3f767a557e..0000000000
--- a/types/react-icons/io/social-whatsapp.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWhatsapp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-windows-outline.d.ts b/types/react-icons/io/social-windows-outline.d.ts
deleted file mode 100644
index 204f5cc4ef..0000000000
--- a/types/react-icons/io/social-windows-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWindowsOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-windows.d.ts b/types/react-icons/io/social-windows.d.ts
deleted file mode 100644
index 4a5a4854bd..0000000000
--- a/types/react-icons/io/social-windows.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWindows extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-wordpress-outline.d.ts b/types/react-icons/io/social-wordpress-outline.d.ts
deleted file mode 100644
index 15e7a115dd..0000000000
--- a/types/react-icons/io/social-wordpress-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWordpressOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-wordpress.d.ts b/types/react-icons/io/social-wordpress.d.ts
deleted file mode 100644
index 4d6e02a859..0000000000
--- a/types/react-icons/io/social-wordpress.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWordpress extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-yahoo-outline.d.ts b/types/react-icons/io/social-yahoo-outline.d.ts
deleted file mode 100644
index 5dcc671758..0000000000
--- a/types/react-icons/io/social-yahoo-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYahooOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-yahoo.d.ts b/types/react-icons/io/social-yahoo.d.ts
deleted file mode 100644
index b5e6c878d6..0000000000
--- a/types/react-icons/io/social-yahoo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYahoo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-yen-outline.d.ts b/types/react-icons/io/social-yen-outline.d.ts
deleted file mode 100644
index 889d6655a6..0000000000
--- a/types/react-icons/io/social-yen-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYenOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-yen.d.ts b/types/react-icons/io/social-yen.d.ts
deleted file mode 100644
index 59d9b2b28b..0000000000
--- a/types/react-icons/io/social-yen.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYen extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-youtube-outline.d.ts b/types/react-icons/io/social-youtube-outline.d.ts
deleted file mode 100644
index 09812d8e86..0000000000
--- a/types/react-icons/io/social-youtube-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYoutubeOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/social-youtube.d.ts b/types/react-icons/io/social-youtube.d.ts
deleted file mode 100644
index 881e782d72..0000000000
--- a/types/react-icons/io/social-youtube.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYoutube extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/soup-can-outline.d.ts b/types/react-icons/io/soup-can-outline.d.ts
deleted file mode 100644
index e1fe063808..0000000000
--- a/types/react-icons/io/soup-can-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSoupCanOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/soup-can.d.ts b/types/react-icons/io/soup-can.d.ts
deleted file mode 100644
index 50b4167624..0000000000
--- a/types/react-icons/io/soup-can.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSoupCan extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/speakerphone.d.ts b/types/react-icons/io/speakerphone.d.ts
deleted file mode 100644
index af9117f78e..0000000000
--- a/types/react-icons/io/speakerphone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSpeakerphone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/speedometer.d.ts b/types/react-icons/io/speedometer.d.ts
deleted file mode 100644
index 50d69af596..0000000000
--- a/types/react-icons/io/speedometer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSpeedometer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/spoon.d.ts b/types/react-icons/io/spoon.d.ts
deleted file mode 100644
index 107a88c9a6..0000000000
--- a/types/react-icons/io/spoon.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSpoon extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/star.d.ts b/types/react-icons/io/star.d.ts
deleted file mode 100644
index f4c1953512..0000000000
--- a/types/react-icons/io/star.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoStar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/stats-bars.d.ts b/types/react-icons/io/stats-bars.d.ts
deleted file mode 100644
index 2d5e5024cb..0000000000
--- a/types/react-icons/io/stats-bars.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoStatsBars extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/steam.d.ts b/types/react-icons/io/steam.d.ts
deleted file mode 100644
index 097461e15c..0000000000
--- a/types/react-icons/io/steam.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoSteam extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/stop.d.ts b/types/react-icons/io/stop.d.ts
deleted file mode 100644
index 5fed81dabb..0000000000
--- a/types/react-icons/io/stop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoStop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/thermometer.d.ts b/types/react-icons/io/thermometer.d.ts
deleted file mode 100644
index f76efa25ac..0000000000
--- a/types/react-icons/io/thermometer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoThermometer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/thumbsdown.d.ts b/types/react-icons/io/thumbsdown.d.ts
deleted file mode 100644
index ebbbe6a64e..0000000000
--- a/types/react-icons/io/thumbsdown.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoThumbsdown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/thumbsup.d.ts b/types/react-icons/io/thumbsup.d.ts
deleted file mode 100644
index 285d40f186..0000000000
--- a/types/react-icons/io/thumbsup.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoThumbsup extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/toggle-filled.d.ts b/types/react-icons/io/toggle-filled.d.ts
deleted file mode 100644
index 93cba93938..0000000000
--- a/types/react-icons/io/toggle-filled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoToggleFilled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/toggle.d.ts b/types/react-icons/io/toggle.d.ts
deleted file mode 100644
index 1af341ce4f..0000000000
--- a/types/react-icons/io/toggle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoToggle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/transgender.d.ts b/types/react-icons/io/transgender.d.ts
deleted file mode 100644
index 254ada7d1a..0000000000
--- a/types/react-icons/io/transgender.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoTransgender extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/trash-a.d.ts b/types/react-icons/io/trash-a.d.ts
deleted file mode 100644
index bfd8815599..0000000000
--- a/types/react-icons/io/trash-a.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoTrashA extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/trash-b.d.ts b/types/react-icons/io/trash-b.d.ts
deleted file mode 100644
index c7c0cde13a..0000000000
--- a/types/react-icons/io/trash-b.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoTrashB extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/trophy.d.ts b/types/react-icons/io/trophy.d.ts
deleted file mode 100644
index f5f159c2e2..0000000000
--- a/types/react-icons/io/trophy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoTrophy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/tshirt-outline.d.ts b/types/react-icons/io/tshirt-outline.d.ts
deleted file mode 100644
index b530f97107..0000000000
--- a/types/react-icons/io/tshirt-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoTshirtOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/tshirt.d.ts b/types/react-icons/io/tshirt.d.ts
deleted file mode 100644
index b0072273b9..0000000000
--- a/types/react-icons/io/tshirt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoTshirt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/umbrella.d.ts b/types/react-icons/io/umbrella.d.ts
deleted file mode 100644
index b85cf5b8c9..0000000000
--- a/types/react-icons/io/umbrella.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoUmbrella extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/university.d.ts b/types/react-icons/io/university.d.ts
deleted file mode 100644
index 5947ae4172..0000000000
--- a/types/react-icons/io/university.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoUniversity extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/unlocked.d.ts b/types/react-icons/io/unlocked.d.ts
deleted file mode 100644
index 741c5ea952..0000000000
--- a/types/react-icons/io/unlocked.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoUnlocked extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/upload.d.ts b/types/react-icons/io/upload.d.ts
deleted file mode 100644
index 1ffb5c4aaf..0000000000
--- a/types/react-icons/io/upload.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoUpload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/usb.d.ts b/types/react-icons/io/usb.d.ts
deleted file mode 100644
index e53180c80e..0000000000
--- a/types/react-icons/io/usb.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoUsb extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/videocamera.d.ts b/types/react-icons/io/videocamera.d.ts
deleted file mode 100644
index 43148acede..0000000000
--- a/types/react-icons/io/videocamera.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoVideocamera extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/volume-high.d.ts b/types/react-icons/io/volume-high.d.ts
deleted file mode 100644
index fdb362c990..0000000000
--- a/types/react-icons/io/volume-high.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoVolumeHigh extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/volume-low.d.ts b/types/react-icons/io/volume-low.d.ts
deleted file mode 100644
index 1ac513c891..0000000000
--- a/types/react-icons/io/volume-low.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoVolumeLow extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/volume-medium.d.ts b/types/react-icons/io/volume-medium.d.ts
deleted file mode 100644
index 7607d22632..0000000000
--- a/types/react-icons/io/volume-medium.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoVolumeMedium extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/volume-mute.d.ts b/types/react-icons/io/volume-mute.d.ts
deleted file mode 100644
index ff7330e544..0000000000
--- a/types/react-icons/io/volume-mute.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoVolumeMute extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/wand.d.ts b/types/react-icons/io/wand.d.ts
deleted file mode 100644
index e1e22869ee..0000000000
--- a/types/react-icons/io/wand.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoWand extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/waterdrop.d.ts b/types/react-icons/io/waterdrop.d.ts
deleted file mode 100644
index a674835d55..0000000000
--- a/types/react-icons/io/waterdrop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoWaterdrop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/wifi.d.ts b/types/react-icons/io/wifi.d.ts
deleted file mode 100644
index 3bec1b2449..0000000000
--- a/types/react-icons/io/wifi.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoWifi extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/wineglass.d.ts b/types/react-icons/io/wineglass.d.ts
deleted file mode 100644
index 33b7d9843e..0000000000
--- a/types/react-icons/io/wineglass.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoWineglass extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/woman.d.ts b/types/react-icons/io/woman.d.ts
deleted file mode 100644
index b3cbbd6294..0000000000
--- a/types/react-icons/io/woman.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoWoman extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/wrench.d.ts b/types/react-icons/io/wrench.d.ts
deleted file mode 100644
index 6f53a0a8cd..0000000000
--- a/types/react-icons/io/wrench.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoWrench extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/xbox.d.ts b/types/react-icons/io/xbox.d.ts
deleted file mode 100644
index 2d3db0cbbc..0000000000
--- a/types/react-icons/io/xbox.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class IoXbox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/lib/fa/500px.d.ts b/types/react-icons/lib/fa/500px.d.ts
deleted file mode 100644
index d70cfd4f19..0000000000
--- a/types/react-icons/lib/fa/500px.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class Fa500px extends React.Component<IconBaseProps> { }
-export = Fa500px;
diff --git a/types/react-icons/lib/fa/adjust.d.ts b/types/react-icons/lib/fa/adjust.d.ts
deleted file mode 100644
index af4b024240..0000000000
--- a/types/react-icons/lib/fa/adjust.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAdjust extends React.Component<IconBaseProps> { }
-export = FaAdjust;
diff --git a/types/react-icons/lib/fa/adn.d.ts b/types/react-icons/lib/fa/adn.d.ts
deleted file mode 100644
index f1b5d2be13..0000000000
--- a/types/react-icons/lib/fa/adn.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAdn extends React.Component<IconBaseProps> { }
-export = FaAdn;
diff --git a/types/react-icons/lib/fa/align-center.d.ts b/types/react-icons/lib/fa/align-center.d.ts
deleted file mode 100644
index ffd972db6a..0000000000
--- a/types/react-icons/lib/fa/align-center.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAlignCenter extends React.Component<IconBaseProps> { }
-export = FaAlignCenter;
diff --git a/types/react-icons/lib/fa/align-justify.d.ts b/types/react-icons/lib/fa/align-justify.d.ts
deleted file mode 100644
index 43432a6126..0000000000
--- a/types/react-icons/lib/fa/align-justify.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAlignJustify extends React.Component<IconBaseProps> { }
-export = FaAlignJustify;
diff --git a/types/react-icons/lib/fa/align-left.d.ts b/types/react-icons/lib/fa/align-left.d.ts
deleted file mode 100644
index ba9d433ee3..0000000000
--- a/types/react-icons/lib/fa/align-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAlignLeft extends React.Component<IconBaseProps> { }
-export = FaAlignLeft;
diff --git a/types/react-icons/lib/fa/align-right.d.ts b/types/react-icons/lib/fa/align-right.d.ts
deleted file mode 100644
index a85c63eb0f..0000000000
--- a/types/react-icons/lib/fa/align-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAlignRight extends React.Component<IconBaseProps> { }
-export = FaAlignRight;
diff --git a/types/react-icons/lib/fa/amazon.d.ts b/types/react-icons/lib/fa/amazon.d.ts
deleted file mode 100644
index bb037b45c4..0000000000
--- a/types/react-icons/lib/fa/amazon.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAmazon extends React.Component<IconBaseProps> { }
-export = FaAmazon;
diff --git a/types/react-icons/lib/fa/ambulance.d.ts b/types/react-icons/lib/fa/ambulance.d.ts
deleted file mode 100644
index b826f5571a..0000000000
--- a/types/react-icons/lib/fa/ambulance.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAmbulance extends React.Component<IconBaseProps> { }
-export = FaAmbulance;
diff --git a/types/react-icons/lib/fa/american-sign-language-interpreting.d.ts b/types/react-icons/lib/fa/american-sign-language-interpreting.d.ts
deleted file mode 100644
index 5c83ce813a..0000000000
--- a/types/react-icons/lib/fa/american-sign-language-interpreting.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAmericanSignLanguageInterpreting extends React.Component<IconBaseProps> { }
-export = FaAmericanSignLanguageInterpreting;
diff --git a/types/react-icons/lib/fa/anchor.d.ts b/types/react-icons/lib/fa/anchor.d.ts
deleted file mode 100644
index 340f0da07a..0000000000
--- a/types/react-icons/lib/fa/anchor.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAnchor extends React.Component<IconBaseProps> { }
-export = FaAnchor;
diff --git a/types/react-icons/lib/fa/android.d.ts b/types/react-icons/lib/fa/android.d.ts
deleted file mode 100644
index 5f7c1fd608..0000000000
--- a/types/react-icons/lib/fa/android.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAndroid extends React.Component<IconBaseProps> { }
-export = FaAndroid;
diff --git a/types/react-icons/lib/fa/angellist.d.ts b/types/react-icons/lib/fa/angellist.d.ts
deleted file mode 100644
index e89b663a80..0000000000
--- a/types/react-icons/lib/fa/angellist.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAngellist extends React.Component<IconBaseProps> { }
-export = FaAngellist;
diff --git a/types/react-icons/lib/fa/angle-double-down.d.ts b/types/react-icons/lib/fa/angle-double-down.d.ts
deleted file mode 100644
index 2d556e859e..0000000000
--- a/types/react-icons/lib/fa/angle-double-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAngleDoubleDown extends React.Component<IconBaseProps> { }
-export = FaAngleDoubleDown;
diff --git a/types/react-icons/lib/fa/angle-double-left.d.ts b/types/react-icons/lib/fa/angle-double-left.d.ts
deleted file mode 100644
index 6813d50bd2..0000000000
--- a/types/react-icons/lib/fa/angle-double-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAngleDoubleLeft extends React.Component<IconBaseProps> { }
-export = FaAngleDoubleLeft;
diff --git a/types/react-icons/lib/fa/angle-double-right.d.ts b/types/react-icons/lib/fa/angle-double-right.d.ts
deleted file mode 100644
index 196cedf761..0000000000
--- a/types/react-icons/lib/fa/angle-double-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAngleDoubleRight extends React.Component<IconBaseProps> { }
-export = FaAngleDoubleRight;
diff --git a/types/react-icons/lib/fa/angle-double-up.d.ts b/types/react-icons/lib/fa/angle-double-up.d.ts
deleted file mode 100644
index b0084150ce..0000000000
--- a/types/react-icons/lib/fa/angle-double-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAngleDoubleUp extends React.Component<IconBaseProps> { }
-export = FaAngleDoubleUp;
diff --git a/types/react-icons/lib/fa/angle-down.d.ts b/types/react-icons/lib/fa/angle-down.d.ts
deleted file mode 100644
index 6ff5e062e4..0000000000
--- a/types/react-icons/lib/fa/angle-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAngleDown extends React.Component<IconBaseProps> { }
-export = FaAngleDown;
diff --git a/types/react-icons/lib/fa/angle-left.d.ts b/types/react-icons/lib/fa/angle-left.d.ts
deleted file mode 100644
index 4ce5ba28d0..0000000000
--- a/types/react-icons/lib/fa/angle-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAngleLeft extends React.Component<IconBaseProps> { }
-export = FaAngleLeft;
diff --git a/types/react-icons/lib/fa/angle-right.d.ts b/types/react-icons/lib/fa/angle-right.d.ts
deleted file mode 100644
index 5329f3c345..0000000000
--- a/types/react-icons/lib/fa/angle-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAngleRight extends React.Component<IconBaseProps> { }
-export = FaAngleRight;
diff --git a/types/react-icons/lib/fa/angle-up.d.ts b/types/react-icons/lib/fa/angle-up.d.ts
deleted file mode 100644
index 6c069a95cd..0000000000
--- a/types/react-icons/lib/fa/angle-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAngleUp extends React.Component<IconBaseProps> { }
-export = FaAngleUp;
diff --git a/types/react-icons/lib/fa/apple.d.ts b/types/react-icons/lib/fa/apple.d.ts
deleted file mode 100644
index ab5ab406ac..0000000000
--- a/types/react-icons/lib/fa/apple.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaApple extends React.Component<IconBaseProps> { }
-export = FaApple;
diff --git a/types/react-icons/lib/fa/archive.d.ts b/types/react-icons/lib/fa/archive.d.ts
deleted file mode 100644
index c61ba115a6..0000000000
--- a/types/react-icons/lib/fa/archive.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArchive extends React.Component<IconBaseProps> { }
-export = FaArchive;
diff --git a/types/react-icons/lib/fa/area-chart.d.ts b/types/react-icons/lib/fa/area-chart.d.ts
deleted file mode 100644
index 7950cbc4ac..0000000000
--- a/types/react-icons/lib/fa/area-chart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAreaChart extends React.Component<IconBaseProps> { }
-export = FaAreaChart;
diff --git a/types/react-icons/lib/fa/arrow-circle-down.d.ts b/types/react-icons/lib/fa/arrow-circle-down.d.ts
deleted file mode 100644
index 034a89aa1b..0000000000
--- a/types/react-icons/lib/fa/arrow-circle-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrowCircleDown extends React.Component<IconBaseProps> { }
-export = FaArrowCircleDown;
diff --git a/types/react-icons/lib/fa/arrow-circle-left.d.ts b/types/react-icons/lib/fa/arrow-circle-left.d.ts
deleted file mode 100644
index a6bd782c7b..0000000000
--- a/types/react-icons/lib/fa/arrow-circle-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrowCircleLeft extends React.Component<IconBaseProps> { }
-export = FaArrowCircleLeft;
diff --git a/types/react-icons/lib/fa/arrow-circle-o-down.d.ts b/types/react-icons/lib/fa/arrow-circle-o-down.d.ts
deleted file mode 100644
index a0af735c04..0000000000
--- a/types/react-icons/lib/fa/arrow-circle-o-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrowCircleODown extends React.Component<IconBaseProps> { }
-export = FaArrowCircleODown;
diff --git a/types/react-icons/lib/fa/arrow-circle-o-left.d.ts b/types/react-icons/lib/fa/arrow-circle-o-left.d.ts
deleted file mode 100644
index da661fb85c..0000000000
--- a/types/react-icons/lib/fa/arrow-circle-o-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrowCircleOLeft extends React.Component<IconBaseProps> { }
-export = FaArrowCircleOLeft;
diff --git a/types/react-icons/lib/fa/arrow-circle-o-right.d.ts b/types/react-icons/lib/fa/arrow-circle-o-right.d.ts
deleted file mode 100644
index e850fbc8b2..0000000000
--- a/types/react-icons/lib/fa/arrow-circle-o-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrowCircleORight extends React.Component<IconBaseProps> { }
-export = FaArrowCircleORight;
diff --git a/types/react-icons/lib/fa/arrow-circle-o-up.d.ts b/types/react-icons/lib/fa/arrow-circle-o-up.d.ts
deleted file mode 100644
index 38dfda171a..0000000000
--- a/types/react-icons/lib/fa/arrow-circle-o-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrowCircleOUp extends React.Component<IconBaseProps> { }
-export = FaArrowCircleOUp;
diff --git a/types/react-icons/lib/fa/arrow-circle-right.d.ts b/types/react-icons/lib/fa/arrow-circle-right.d.ts
deleted file mode 100644
index 3875683a1d..0000000000
--- a/types/react-icons/lib/fa/arrow-circle-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrowCircleRight extends React.Component<IconBaseProps> { }
-export = FaArrowCircleRight;
diff --git a/types/react-icons/lib/fa/arrow-circle-up.d.ts b/types/react-icons/lib/fa/arrow-circle-up.d.ts
deleted file mode 100644
index a58794ce34..0000000000
--- a/types/react-icons/lib/fa/arrow-circle-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrowCircleUp extends React.Component<IconBaseProps> { }
-export = FaArrowCircleUp;
diff --git a/types/react-icons/lib/fa/arrow-down.d.ts b/types/react-icons/lib/fa/arrow-down.d.ts
deleted file mode 100644
index f69d965a52..0000000000
--- a/types/react-icons/lib/fa/arrow-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrowDown extends React.Component<IconBaseProps> { }
-export = FaArrowDown;
diff --git a/types/react-icons/lib/fa/arrow-left.d.ts b/types/react-icons/lib/fa/arrow-left.d.ts
deleted file mode 100644
index 2d0d8a3243..0000000000
--- a/types/react-icons/lib/fa/arrow-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrowLeft extends React.Component<IconBaseProps> { }
-export = FaArrowLeft;
diff --git a/types/react-icons/lib/fa/arrow-right.d.ts b/types/react-icons/lib/fa/arrow-right.d.ts
deleted file mode 100644
index cc35c17bd7..0000000000
--- a/types/react-icons/lib/fa/arrow-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrowRight extends React.Component<IconBaseProps> { }
-export = FaArrowRight;
diff --git a/types/react-icons/lib/fa/arrow-up.d.ts b/types/react-icons/lib/fa/arrow-up.d.ts
deleted file mode 100644
index ad5df3bf2f..0000000000
--- a/types/react-icons/lib/fa/arrow-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrowUp extends React.Component<IconBaseProps> { }
-export = FaArrowUp;
diff --git a/types/react-icons/lib/fa/arrows-alt.d.ts b/types/react-icons/lib/fa/arrows-alt.d.ts
deleted file mode 100644
index b1b0e83089..0000000000
--- a/types/react-icons/lib/fa/arrows-alt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrowsAlt extends React.Component<IconBaseProps> { }
-export = FaArrowsAlt;
diff --git a/types/react-icons/lib/fa/arrows-h.d.ts b/types/react-icons/lib/fa/arrows-h.d.ts
deleted file mode 100644
index fe27c6704c..0000000000
--- a/types/react-icons/lib/fa/arrows-h.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrowsH extends React.Component<IconBaseProps> { }
-export = FaArrowsH;
diff --git a/types/react-icons/lib/fa/arrows-v.d.ts b/types/react-icons/lib/fa/arrows-v.d.ts
deleted file mode 100644
index fe497bc606..0000000000
--- a/types/react-icons/lib/fa/arrows-v.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrowsV extends React.Component<IconBaseProps> { }
-export = FaArrowsV;
diff --git a/types/react-icons/lib/fa/arrows.d.ts b/types/react-icons/lib/fa/arrows.d.ts
deleted file mode 100644
index 37a13e7360..0000000000
--- a/types/react-icons/lib/fa/arrows.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaArrows extends React.Component<IconBaseProps> { }
-export = FaArrows;
diff --git a/types/react-icons/lib/fa/assistive-listening-systems.d.ts b/types/react-icons/lib/fa/assistive-listening-systems.d.ts
deleted file mode 100644
index 09c0dc1a5c..0000000000
--- a/types/react-icons/lib/fa/assistive-listening-systems.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAssistiveListeningSystems extends React.Component<IconBaseProps> { }
-export = FaAssistiveListeningSystems;
diff --git a/types/react-icons/lib/fa/asterisk.d.ts b/types/react-icons/lib/fa/asterisk.d.ts
deleted file mode 100644
index 943431df3b..0000000000
--- a/types/react-icons/lib/fa/asterisk.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAsterisk extends React.Component<IconBaseProps> { }
-export = FaAsterisk;
diff --git a/types/react-icons/lib/fa/at.d.ts b/types/react-icons/lib/fa/at.d.ts
deleted file mode 100644
index 86af31e86b..0000000000
--- a/types/react-icons/lib/fa/at.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAt extends React.Component<IconBaseProps> { }
-export = FaAt;
diff --git a/types/react-icons/lib/fa/audio-description.d.ts b/types/react-icons/lib/fa/audio-description.d.ts
deleted file mode 100644
index 97655de683..0000000000
--- a/types/react-icons/lib/fa/audio-description.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAudioDescription extends React.Component<IconBaseProps> { }
-export = FaAudioDescription;
diff --git a/types/react-icons/lib/fa/automobile.d.ts b/types/react-icons/lib/fa/automobile.d.ts
deleted file mode 100644
index 224b7fa8c4..0000000000
--- a/types/react-icons/lib/fa/automobile.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaAutomobile extends React.Component<IconBaseProps> { }
-export = FaAutomobile;
diff --git a/types/react-icons/lib/fa/backward.d.ts b/types/react-icons/lib/fa/backward.d.ts
deleted file mode 100644
index 3897d97cf0..0000000000
--- a/types/react-icons/lib/fa/backward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBackward extends React.Component<IconBaseProps> { }
-export = FaBackward;
diff --git a/types/react-icons/lib/fa/balance-scale.d.ts b/types/react-icons/lib/fa/balance-scale.d.ts
deleted file mode 100644
index 70cb498e76..0000000000
--- a/types/react-icons/lib/fa/balance-scale.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBalanceScale extends React.Component<IconBaseProps> { }
-export = FaBalanceScale;
diff --git a/types/react-icons/lib/fa/ban.d.ts b/types/react-icons/lib/fa/ban.d.ts
deleted file mode 100644
index aa11e72dfd..0000000000
--- a/types/react-icons/lib/fa/ban.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBan extends React.Component<IconBaseProps> { }
-export = FaBan;
diff --git a/types/react-icons/lib/fa/bank.d.ts b/types/react-icons/lib/fa/bank.d.ts
deleted file mode 100644
index c52ff017ca..0000000000
--- a/types/react-icons/lib/fa/bank.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBank extends React.Component<IconBaseProps> { }
-export = FaBank;
diff --git a/types/react-icons/lib/fa/bar-chart.d.ts b/types/react-icons/lib/fa/bar-chart.d.ts
deleted file mode 100644
index 6dd339888f..0000000000
--- a/types/react-icons/lib/fa/bar-chart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBarChart extends React.Component<IconBaseProps> { }
-export = FaBarChart;
diff --git a/types/react-icons/lib/fa/barcode.d.ts b/types/react-icons/lib/fa/barcode.d.ts
deleted file mode 100644
index 14fcd7483f..0000000000
--- a/types/react-icons/lib/fa/barcode.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBarcode extends React.Component<IconBaseProps> { }
-export = FaBarcode;
diff --git a/types/react-icons/lib/fa/bars.d.ts b/types/react-icons/lib/fa/bars.d.ts
deleted file mode 100644
index 4eb2a2c4ec..0000000000
--- a/types/react-icons/lib/fa/bars.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBars extends React.Component<IconBaseProps> { }
-export = FaBars;
diff --git a/types/react-icons/lib/fa/battery-0.d.ts b/types/react-icons/lib/fa/battery-0.d.ts
deleted file mode 100644
index b522ea5f95..0000000000
--- a/types/react-icons/lib/fa/battery-0.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBattery0 extends React.Component<IconBaseProps> { }
-export = FaBattery0;
diff --git a/types/react-icons/lib/fa/battery-1.d.ts b/types/react-icons/lib/fa/battery-1.d.ts
deleted file mode 100644
index 51e5018032..0000000000
--- a/types/react-icons/lib/fa/battery-1.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBattery1 extends React.Component<IconBaseProps> { }
-export = FaBattery1;
diff --git a/types/react-icons/lib/fa/battery-2.d.ts b/types/react-icons/lib/fa/battery-2.d.ts
deleted file mode 100644
index b203f533d3..0000000000
--- a/types/react-icons/lib/fa/battery-2.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBattery2 extends React.Component<IconBaseProps> { }
-export = FaBattery2;
diff --git a/types/react-icons/lib/fa/battery-3.d.ts b/types/react-icons/lib/fa/battery-3.d.ts
deleted file mode 100644
index c95a67cd36..0000000000
--- a/types/react-icons/lib/fa/battery-3.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBattery3 extends React.Component<IconBaseProps> { }
-export = FaBattery3;
diff --git a/types/react-icons/lib/fa/battery-4.d.ts b/types/react-icons/lib/fa/battery-4.d.ts
deleted file mode 100644
index da0aabf0b7..0000000000
--- a/types/react-icons/lib/fa/battery-4.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBattery4 extends React.Component<IconBaseProps> { }
-export = FaBattery4;
diff --git a/types/react-icons/lib/fa/bed.d.ts b/types/react-icons/lib/fa/bed.d.ts
deleted file mode 100644
index 81f8b9973f..0000000000
--- a/types/react-icons/lib/fa/bed.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBed extends React.Component<IconBaseProps> { }
-export = FaBed;
diff --git a/types/react-icons/lib/fa/beer.d.ts b/types/react-icons/lib/fa/beer.d.ts
deleted file mode 100644
index eb032e6207..0000000000
--- a/types/react-icons/lib/fa/beer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBeer extends React.Component<IconBaseProps> { }
-export = FaBeer;
diff --git a/types/react-icons/lib/fa/behance-square.d.ts b/types/react-icons/lib/fa/behance-square.d.ts
deleted file mode 100644
index de83781aba..0000000000
--- a/types/react-icons/lib/fa/behance-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBehanceSquare extends React.Component<IconBaseProps> { }
-export = FaBehanceSquare;
diff --git a/types/react-icons/lib/fa/behance.d.ts b/types/react-icons/lib/fa/behance.d.ts
deleted file mode 100644
index 9c15559ce1..0000000000
--- a/types/react-icons/lib/fa/behance.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBehance extends React.Component<IconBaseProps> { }
-export = FaBehance;
diff --git a/types/react-icons/lib/fa/bell-o.d.ts b/types/react-icons/lib/fa/bell-o.d.ts
deleted file mode 100644
index 813bd69eea..0000000000
--- a/types/react-icons/lib/fa/bell-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBellO extends React.Component<IconBaseProps> { }
-export = FaBellO;
diff --git a/types/react-icons/lib/fa/bell-slash-o.d.ts b/types/react-icons/lib/fa/bell-slash-o.d.ts
deleted file mode 100644
index 8db73c3d1f..0000000000
--- a/types/react-icons/lib/fa/bell-slash-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBellSlashO extends React.Component<IconBaseProps> { }
-export = FaBellSlashO;
diff --git a/types/react-icons/lib/fa/bell-slash.d.ts b/types/react-icons/lib/fa/bell-slash.d.ts
deleted file mode 100644
index d035fa6a1f..0000000000
--- a/types/react-icons/lib/fa/bell-slash.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBellSlash extends React.Component<IconBaseProps> { }
-export = FaBellSlash;
diff --git a/types/react-icons/lib/fa/bell.d.ts b/types/react-icons/lib/fa/bell.d.ts
deleted file mode 100644
index 0fbffd107f..0000000000
--- a/types/react-icons/lib/fa/bell.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBell extends React.Component<IconBaseProps> { }
-export = FaBell;
diff --git a/types/react-icons/lib/fa/bicycle.d.ts b/types/react-icons/lib/fa/bicycle.d.ts
deleted file mode 100644
index 15b474f323..0000000000
--- a/types/react-icons/lib/fa/bicycle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBicycle extends React.Component<IconBaseProps> { }
-export = FaBicycle;
diff --git a/types/react-icons/lib/fa/binoculars.d.ts b/types/react-icons/lib/fa/binoculars.d.ts
deleted file mode 100644
index 510cbc7f7e..0000000000
--- a/types/react-icons/lib/fa/binoculars.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBinoculars extends React.Component<IconBaseProps> { }
-export = FaBinoculars;
diff --git a/types/react-icons/lib/fa/birthday-cake.d.ts b/types/react-icons/lib/fa/birthday-cake.d.ts
deleted file mode 100644
index b24bb44278..0000000000
--- a/types/react-icons/lib/fa/birthday-cake.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBirthdayCake extends React.Component<IconBaseProps> { }
-export = FaBirthdayCake;
diff --git a/types/react-icons/lib/fa/bitbucket-square.d.ts b/types/react-icons/lib/fa/bitbucket-square.d.ts
deleted file mode 100644
index 6a7c1e9415..0000000000
--- a/types/react-icons/lib/fa/bitbucket-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBitbucketSquare extends React.Component<IconBaseProps> { }
-export = FaBitbucketSquare;
diff --git a/types/react-icons/lib/fa/bitbucket.d.ts b/types/react-icons/lib/fa/bitbucket.d.ts
deleted file mode 100644
index fcced54555..0000000000
--- a/types/react-icons/lib/fa/bitbucket.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBitbucket extends React.Component<IconBaseProps> { }
-export = FaBitbucket;
diff --git a/types/react-icons/lib/fa/bitcoin.d.ts b/types/react-icons/lib/fa/bitcoin.d.ts
deleted file mode 100644
index 0e8499c6f9..0000000000
--- a/types/react-icons/lib/fa/bitcoin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBitcoin extends React.Component<IconBaseProps> { }
-export = FaBitcoin;
diff --git a/types/react-icons/lib/fa/black-tie.d.ts b/types/react-icons/lib/fa/black-tie.d.ts
deleted file mode 100644
index 84def8b91a..0000000000
--- a/types/react-icons/lib/fa/black-tie.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBlackTie extends React.Component<IconBaseProps> { }
-export = FaBlackTie;
diff --git a/types/react-icons/lib/fa/blind.d.ts b/types/react-icons/lib/fa/blind.d.ts
deleted file mode 100644
index 9407689ee6..0000000000
--- a/types/react-icons/lib/fa/blind.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBlind extends React.Component<IconBaseProps> { }
-export = FaBlind;
diff --git a/types/react-icons/lib/fa/bluetooth-b.d.ts b/types/react-icons/lib/fa/bluetooth-b.d.ts
deleted file mode 100644
index 0c88c2dad5..0000000000
--- a/types/react-icons/lib/fa/bluetooth-b.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBluetoothB extends React.Component<IconBaseProps> { }
-export = FaBluetoothB;
diff --git a/types/react-icons/lib/fa/bluetooth.d.ts b/types/react-icons/lib/fa/bluetooth.d.ts
deleted file mode 100644
index 79251f2caa..0000000000
--- a/types/react-icons/lib/fa/bluetooth.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBluetooth extends React.Component<IconBaseProps> { }
-export = FaBluetooth;
diff --git a/types/react-icons/lib/fa/bold.d.ts b/types/react-icons/lib/fa/bold.d.ts
deleted file mode 100644
index 60666c9484..0000000000
--- a/types/react-icons/lib/fa/bold.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBold extends React.Component<IconBaseProps> { }
-export = FaBold;
diff --git a/types/react-icons/lib/fa/bolt.d.ts b/types/react-icons/lib/fa/bolt.d.ts
deleted file mode 100644
index 0eeb09b26e..0000000000
--- a/types/react-icons/lib/fa/bolt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBolt extends React.Component<IconBaseProps> { }
-export = FaBolt;
diff --git a/types/react-icons/lib/fa/bomb.d.ts b/types/react-icons/lib/fa/bomb.d.ts
deleted file mode 100644
index e2e806217b..0000000000
--- a/types/react-icons/lib/fa/bomb.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBomb extends React.Component<IconBaseProps> { }
-export = FaBomb;
diff --git a/types/react-icons/lib/fa/book.d.ts b/types/react-icons/lib/fa/book.d.ts
deleted file mode 100644
index 977bc019b9..0000000000
--- a/types/react-icons/lib/fa/book.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBook extends React.Component<IconBaseProps> { }
-export = FaBook;
diff --git a/types/react-icons/lib/fa/bookmark-o.d.ts b/types/react-icons/lib/fa/bookmark-o.d.ts
deleted file mode 100644
index ee3ada48ce..0000000000
--- a/types/react-icons/lib/fa/bookmark-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBookmarkO extends React.Component<IconBaseProps> { }
-export = FaBookmarkO;
diff --git a/types/react-icons/lib/fa/bookmark.d.ts b/types/react-icons/lib/fa/bookmark.d.ts
deleted file mode 100644
index 7dbc33515b..0000000000
--- a/types/react-icons/lib/fa/bookmark.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBookmark extends React.Component<IconBaseProps> { }
-export = FaBookmark;
diff --git a/types/react-icons/lib/fa/braille.d.ts b/types/react-icons/lib/fa/braille.d.ts
deleted file mode 100644
index 022d390d2b..0000000000
--- a/types/react-icons/lib/fa/braille.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBraille extends React.Component<IconBaseProps> { }
-export = FaBraille;
diff --git a/types/react-icons/lib/fa/briefcase.d.ts b/types/react-icons/lib/fa/briefcase.d.ts
deleted file mode 100644
index 302ba644f7..0000000000
--- a/types/react-icons/lib/fa/briefcase.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBriefcase extends React.Component<IconBaseProps> { }
-export = FaBriefcase;
diff --git a/types/react-icons/lib/fa/bug.d.ts b/types/react-icons/lib/fa/bug.d.ts
deleted file mode 100644
index 01098a9aa2..0000000000
--- a/types/react-icons/lib/fa/bug.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBug extends React.Component<IconBaseProps> { }
-export = FaBug;
diff --git a/types/react-icons/lib/fa/building-o.d.ts b/types/react-icons/lib/fa/building-o.d.ts
deleted file mode 100644
index c3045c9cd7..0000000000
--- a/types/react-icons/lib/fa/building-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBuildingO extends React.Component<IconBaseProps> { }
-export = FaBuildingO;
diff --git a/types/react-icons/lib/fa/building.d.ts b/types/react-icons/lib/fa/building.d.ts
deleted file mode 100644
index b1b7dce542..0000000000
--- a/types/react-icons/lib/fa/building.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBuilding extends React.Component<IconBaseProps> { }
-export = FaBuilding;
diff --git a/types/react-icons/lib/fa/bullhorn.d.ts b/types/react-icons/lib/fa/bullhorn.d.ts
deleted file mode 100644
index 75d62ada6c..0000000000
--- a/types/react-icons/lib/fa/bullhorn.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBullhorn extends React.Component<IconBaseProps> { }
-export = FaBullhorn;
diff --git a/types/react-icons/lib/fa/bullseye.d.ts b/types/react-icons/lib/fa/bullseye.d.ts
deleted file mode 100644
index 07754ecece..0000000000
--- a/types/react-icons/lib/fa/bullseye.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBullseye extends React.Component<IconBaseProps> { }
-export = FaBullseye;
diff --git a/types/react-icons/lib/fa/bus.d.ts b/types/react-icons/lib/fa/bus.d.ts
deleted file mode 100644
index f665b70b03..0000000000
--- a/types/react-icons/lib/fa/bus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBus extends React.Component<IconBaseProps> { }
-export = FaBus;
diff --git a/types/react-icons/lib/fa/buysellads.d.ts b/types/react-icons/lib/fa/buysellads.d.ts
deleted file mode 100644
index 5c4ff08cec..0000000000
--- a/types/react-icons/lib/fa/buysellads.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaBuysellads extends React.Component<IconBaseProps> { }
-export = FaBuysellads;
diff --git a/types/react-icons/lib/fa/cab.d.ts b/types/react-icons/lib/fa/cab.d.ts
deleted file mode 100644
index 0fef928008..0000000000
--- a/types/react-icons/lib/fa/cab.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCab extends React.Component<IconBaseProps> { }
-export = FaCab;
diff --git a/types/react-icons/lib/fa/calculator.d.ts b/types/react-icons/lib/fa/calculator.d.ts
deleted file mode 100644
index 529ee803cb..0000000000
--- a/types/react-icons/lib/fa/calculator.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCalculator extends React.Component<IconBaseProps> { }
-export = FaCalculator;
diff --git a/types/react-icons/lib/fa/calendar-check-o.d.ts b/types/react-icons/lib/fa/calendar-check-o.d.ts
deleted file mode 100644
index 5d1cb2ff90..0000000000
--- a/types/react-icons/lib/fa/calendar-check-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCalendarCheckO extends React.Component<IconBaseProps> { }
-export = FaCalendarCheckO;
diff --git a/types/react-icons/lib/fa/calendar-minus-o.d.ts b/types/react-icons/lib/fa/calendar-minus-o.d.ts
deleted file mode 100644
index 3543a84dee..0000000000
--- a/types/react-icons/lib/fa/calendar-minus-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCalendarMinusO extends React.Component<IconBaseProps> { }
-export = FaCalendarMinusO;
diff --git a/types/react-icons/lib/fa/calendar-o.d.ts b/types/react-icons/lib/fa/calendar-o.d.ts
deleted file mode 100644
index 800d56b20e..0000000000
--- a/types/react-icons/lib/fa/calendar-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCalendarO extends React.Component<IconBaseProps> { }
-export = FaCalendarO;
diff --git a/types/react-icons/lib/fa/calendar-plus-o.d.ts b/types/react-icons/lib/fa/calendar-plus-o.d.ts
deleted file mode 100644
index 3aad9661ce..0000000000
--- a/types/react-icons/lib/fa/calendar-plus-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCalendarPlusO extends React.Component<IconBaseProps> { }
-export = FaCalendarPlusO;
diff --git a/types/react-icons/lib/fa/calendar-times-o.d.ts b/types/react-icons/lib/fa/calendar-times-o.d.ts
deleted file mode 100644
index 5553fd7d71..0000000000
--- a/types/react-icons/lib/fa/calendar-times-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCalendarTimesO extends React.Component<IconBaseProps> { }
-export = FaCalendarTimesO;
diff --git a/types/react-icons/lib/fa/calendar.d.ts b/types/react-icons/lib/fa/calendar.d.ts
deleted file mode 100644
index e013516f56..0000000000
--- a/types/react-icons/lib/fa/calendar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCalendar extends React.Component<IconBaseProps> { }
-export = FaCalendar;
diff --git a/types/react-icons/lib/fa/camera-retro.d.ts b/types/react-icons/lib/fa/camera-retro.d.ts
deleted file mode 100644
index 3874bc78d8..0000000000
--- a/types/react-icons/lib/fa/camera-retro.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCameraRetro extends React.Component<IconBaseProps> { }
-export = FaCameraRetro;
diff --git a/types/react-icons/lib/fa/camera.d.ts b/types/react-icons/lib/fa/camera.d.ts
deleted file mode 100644
index 65c011e1ac..0000000000
--- a/types/react-icons/lib/fa/camera.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCamera extends React.Component<IconBaseProps> { }
-export = FaCamera;
diff --git a/types/react-icons/lib/fa/caret-down.d.ts b/types/react-icons/lib/fa/caret-down.d.ts
deleted file mode 100644
index 9c2cfb0314..0000000000
--- a/types/react-icons/lib/fa/caret-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCaretDown extends React.Component<IconBaseProps> { }
-export = FaCaretDown;
diff --git a/types/react-icons/lib/fa/caret-left.d.ts b/types/react-icons/lib/fa/caret-left.d.ts
deleted file mode 100644
index c4d40cd908..0000000000
--- a/types/react-icons/lib/fa/caret-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCaretLeft extends React.Component<IconBaseProps> { }
-export = FaCaretLeft;
diff --git a/types/react-icons/lib/fa/caret-right.d.ts b/types/react-icons/lib/fa/caret-right.d.ts
deleted file mode 100644
index fa5bed855e..0000000000
--- a/types/react-icons/lib/fa/caret-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCaretRight extends React.Component<IconBaseProps> { }
-export = FaCaretRight;
diff --git a/types/react-icons/lib/fa/caret-square-o-down.d.ts b/types/react-icons/lib/fa/caret-square-o-down.d.ts
deleted file mode 100644
index c8a67aa27c..0000000000
--- a/types/react-icons/lib/fa/caret-square-o-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCaretSquareODown extends React.Component<IconBaseProps> { }
-export = FaCaretSquareODown;
diff --git a/types/react-icons/lib/fa/caret-square-o-left.d.ts b/types/react-icons/lib/fa/caret-square-o-left.d.ts
deleted file mode 100644
index 5aad5ec1e4..0000000000
--- a/types/react-icons/lib/fa/caret-square-o-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCaretSquareOLeft extends React.Component<IconBaseProps> { }
-export = FaCaretSquareOLeft;
diff --git a/types/react-icons/lib/fa/caret-square-o-right.d.ts b/types/react-icons/lib/fa/caret-square-o-right.d.ts
deleted file mode 100644
index f84499954b..0000000000
--- a/types/react-icons/lib/fa/caret-square-o-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCaretSquareORight extends React.Component<IconBaseProps> { }
-export = FaCaretSquareORight;
diff --git a/types/react-icons/lib/fa/caret-square-o-up.d.ts b/types/react-icons/lib/fa/caret-square-o-up.d.ts
deleted file mode 100644
index 905bb5f071..0000000000
--- a/types/react-icons/lib/fa/caret-square-o-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCaretSquareOUp extends React.Component<IconBaseProps> { }
-export = FaCaretSquareOUp;
diff --git a/types/react-icons/lib/fa/caret-up.d.ts b/types/react-icons/lib/fa/caret-up.d.ts
deleted file mode 100644
index 7960d7953b..0000000000
--- a/types/react-icons/lib/fa/caret-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCaretUp extends React.Component<IconBaseProps> { }
-export = FaCaretUp;
diff --git a/types/react-icons/lib/fa/cart-arrow-down.d.ts b/types/react-icons/lib/fa/cart-arrow-down.d.ts
deleted file mode 100644
index d62cc7ab36..0000000000
--- a/types/react-icons/lib/fa/cart-arrow-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCartArrowDown extends React.Component<IconBaseProps> { }
-export = FaCartArrowDown;
diff --git a/types/react-icons/lib/fa/cart-plus.d.ts b/types/react-icons/lib/fa/cart-plus.d.ts
deleted file mode 100644
index c8d1c7df7b..0000000000
--- a/types/react-icons/lib/fa/cart-plus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCartPlus extends React.Component<IconBaseProps> { }
-export = FaCartPlus;
diff --git a/types/react-icons/lib/fa/cc-amex.d.ts b/types/react-icons/lib/fa/cc-amex.d.ts
deleted file mode 100644
index 799b2ef861..0000000000
--- a/types/react-icons/lib/fa/cc-amex.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCcAmex extends React.Component<IconBaseProps> { }
-export = FaCcAmex;
diff --git a/types/react-icons/lib/fa/cc-diners-club.d.ts b/types/react-icons/lib/fa/cc-diners-club.d.ts
deleted file mode 100644
index 24a9063012..0000000000
--- a/types/react-icons/lib/fa/cc-diners-club.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCcDinersClub extends React.Component<IconBaseProps> { }
-export = FaCcDinersClub;
diff --git a/types/react-icons/lib/fa/cc-discover.d.ts b/types/react-icons/lib/fa/cc-discover.d.ts
deleted file mode 100644
index ab5013f5be..0000000000
--- a/types/react-icons/lib/fa/cc-discover.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCcDiscover extends React.Component<IconBaseProps> { }
-export = FaCcDiscover;
diff --git a/types/react-icons/lib/fa/cc-jcb.d.ts b/types/react-icons/lib/fa/cc-jcb.d.ts
deleted file mode 100644
index abce375354..0000000000
--- a/types/react-icons/lib/fa/cc-jcb.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCcJcb extends React.Component<IconBaseProps> { }
-export = FaCcJcb;
diff --git a/types/react-icons/lib/fa/cc-mastercard.d.ts b/types/react-icons/lib/fa/cc-mastercard.d.ts
deleted file mode 100644
index ef56888e0d..0000000000
--- a/types/react-icons/lib/fa/cc-mastercard.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCcMastercard extends React.Component<IconBaseProps> { }
-export = FaCcMastercard;
diff --git a/types/react-icons/lib/fa/cc-paypal.d.ts b/types/react-icons/lib/fa/cc-paypal.d.ts
deleted file mode 100644
index 5eb38ef785..0000000000
--- a/types/react-icons/lib/fa/cc-paypal.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCcPaypal extends React.Component<IconBaseProps> { }
-export = FaCcPaypal;
diff --git a/types/react-icons/lib/fa/cc-stripe.d.ts b/types/react-icons/lib/fa/cc-stripe.d.ts
deleted file mode 100644
index fd72b8aa13..0000000000
--- a/types/react-icons/lib/fa/cc-stripe.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCcStripe extends React.Component<IconBaseProps> { }
-export = FaCcStripe;
diff --git a/types/react-icons/lib/fa/cc-visa.d.ts b/types/react-icons/lib/fa/cc-visa.d.ts
deleted file mode 100644
index d0dc3e793c..0000000000
--- a/types/react-icons/lib/fa/cc-visa.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCcVisa extends React.Component<IconBaseProps> { }
-export = FaCcVisa;
diff --git a/types/react-icons/lib/fa/cc.d.ts b/types/react-icons/lib/fa/cc.d.ts
deleted file mode 100644
index 4a74a0e2c4..0000000000
--- a/types/react-icons/lib/fa/cc.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCc extends React.Component<IconBaseProps> { }
-export = FaCc;
diff --git a/types/react-icons/lib/fa/certificate.d.ts b/types/react-icons/lib/fa/certificate.d.ts
deleted file mode 100644
index edbb804b75..0000000000
--- a/types/react-icons/lib/fa/certificate.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCertificate extends React.Component<IconBaseProps> { }
-export = FaCertificate;
diff --git a/types/react-icons/lib/fa/chain-broken.d.ts b/types/react-icons/lib/fa/chain-broken.d.ts
deleted file mode 100644
index e799c01fed..0000000000
--- a/types/react-icons/lib/fa/chain-broken.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaChainBroken extends React.Component<IconBaseProps> { }
-export = FaChainBroken;
diff --git a/types/react-icons/lib/fa/chain.d.ts b/types/react-icons/lib/fa/chain.d.ts
deleted file mode 100644
index 851a1bcc8e..0000000000
--- a/types/react-icons/lib/fa/chain.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaChain extends React.Component<IconBaseProps> { }
-export = FaChain;
diff --git a/types/react-icons/lib/fa/check-circle-o.d.ts b/types/react-icons/lib/fa/check-circle-o.d.ts
deleted file mode 100644
index dbb3f5bb83..0000000000
--- a/types/react-icons/lib/fa/check-circle-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCheckCircleO extends React.Component<IconBaseProps> { }
-export = FaCheckCircleO;
diff --git a/types/react-icons/lib/fa/check-circle.d.ts b/types/react-icons/lib/fa/check-circle.d.ts
deleted file mode 100644
index 121f56e87a..0000000000
--- a/types/react-icons/lib/fa/check-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCheckCircle extends React.Component<IconBaseProps> { }
-export = FaCheckCircle;
diff --git a/types/react-icons/lib/fa/check-square-o.d.ts b/types/react-icons/lib/fa/check-square-o.d.ts
deleted file mode 100644
index fdd433d5a7..0000000000
--- a/types/react-icons/lib/fa/check-square-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCheckSquareO extends React.Component<IconBaseProps> { }
-export = FaCheckSquareO;
diff --git a/types/react-icons/lib/fa/check-square.d.ts b/types/react-icons/lib/fa/check-square.d.ts
deleted file mode 100644
index 3c83c64db3..0000000000
--- a/types/react-icons/lib/fa/check-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCheckSquare extends React.Component<IconBaseProps> { }
-export = FaCheckSquare;
diff --git a/types/react-icons/lib/fa/check.d.ts b/types/react-icons/lib/fa/check.d.ts
deleted file mode 100644
index 28ef292a15..0000000000
--- a/types/react-icons/lib/fa/check.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCheck extends React.Component<IconBaseProps> { }
-export = FaCheck;
diff --git a/types/react-icons/lib/fa/chevron-circle-down.d.ts b/types/react-icons/lib/fa/chevron-circle-down.d.ts
deleted file mode 100644
index 4faa5f1df4..0000000000
--- a/types/react-icons/lib/fa/chevron-circle-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaChevronCircleDown extends React.Component<IconBaseProps> { }
-export = FaChevronCircleDown;
diff --git a/types/react-icons/lib/fa/chevron-circle-left.d.ts b/types/react-icons/lib/fa/chevron-circle-left.d.ts
deleted file mode 100644
index b704b3f359..0000000000
--- a/types/react-icons/lib/fa/chevron-circle-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaChevronCircleLeft extends React.Component<IconBaseProps> { }
-export = FaChevronCircleLeft;
diff --git a/types/react-icons/lib/fa/chevron-circle-right.d.ts b/types/react-icons/lib/fa/chevron-circle-right.d.ts
deleted file mode 100644
index 19672a33b7..0000000000
--- a/types/react-icons/lib/fa/chevron-circle-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaChevronCircleRight extends React.Component<IconBaseProps> { }
-export = FaChevronCircleRight;
diff --git a/types/react-icons/lib/fa/chevron-circle-up.d.ts b/types/react-icons/lib/fa/chevron-circle-up.d.ts
deleted file mode 100644
index 8cb4ba33e8..0000000000
--- a/types/react-icons/lib/fa/chevron-circle-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaChevronCircleUp extends React.Component<IconBaseProps> { }
-export = FaChevronCircleUp;
diff --git a/types/react-icons/lib/fa/chevron-down.d.ts b/types/react-icons/lib/fa/chevron-down.d.ts
deleted file mode 100644
index 7a113a7bd3..0000000000
--- a/types/react-icons/lib/fa/chevron-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaChevronDown extends React.Component<IconBaseProps> { }
-export = FaChevronDown;
diff --git a/types/react-icons/lib/fa/chevron-left.d.ts b/types/react-icons/lib/fa/chevron-left.d.ts
deleted file mode 100644
index 2a797f7bfb..0000000000
--- a/types/react-icons/lib/fa/chevron-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaChevronLeft extends React.Component<IconBaseProps> { }
-export = FaChevronLeft;
diff --git a/types/react-icons/lib/fa/chevron-right.d.ts b/types/react-icons/lib/fa/chevron-right.d.ts
deleted file mode 100644
index 0022750994..0000000000
--- a/types/react-icons/lib/fa/chevron-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaChevronRight extends React.Component<IconBaseProps> { }
-export = FaChevronRight;
diff --git a/types/react-icons/lib/fa/chevron-up.d.ts b/types/react-icons/lib/fa/chevron-up.d.ts
deleted file mode 100644
index b1cece9f2c..0000000000
--- a/types/react-icons/lib/fa/chevron-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaChevronUp extends React.Component<IconBaseProps> { }
-export = FaChevronUp;
diff --git a/types/react-icons/lib/fa/child.d.ts b/types/react-icons/lib/fa/child.d.ts
deleted file mode 100644
index 3a9361e176..0000000000
--- a/types/react-icons/lib/fa/child.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaChild extends React.Component<IconBaseProps> { }
-export = FaChild;
diff --git a/types/react-icons/lib/fa/chrome.d.ts b/types/react-icons/lib/fa/chrome.d.ts
deleted file mode 100644
index 691dec5b26..0000000000
--- a/types/react-icons/lib/fa/chrome.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaChrome extends React.Component<IconBaseProps> { }
-export = FaChrome;
diff --git a/types/react-icons/lib/fa/circle-o-notch.d.ts b/types/react-icons/lib/fa/circle-o-notch.d.ts
deleted file mode 100644
index b58f16f73d..0000000000
--- a/types/react-icons/lib/fa/circle-o-notch.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCircleONotch extends React.Component<IconBaseProps> { }
-export = FaCircleONotch;
diff --git a/types/react-icons/lib/fa/circle-o.d.ts b/types/react-icons/lib/fa/circle-o.d.ts
deleted file mode 100644
index f39a3363db..0000000000
--- a/types/react-icons/lib/fa/circle-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCircleO extends React.Component<IconBaseProps> { }
-export = FaCircleO;
diff --git a/types/react-icons/lib/fa/circle-thin.d.ts b/types/react-icons/lib/fa/circle-thin.d.ts
deleted file mode 100644
index 20bb05625d..0000000000
--- a/types/react-icons/lib/fa/circle-thin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCircleThin extends React.Component<IconBaseProps> { }
-export = FaCircleThin;
diff --git a/types/react-icons/lib/fa/circle.d.ts b/types/react-icons/lib/fa/circle.d.ts
deleted file mode 100644
index 868df82fd0..0000000000
--- a/types/react-icons/lib/fa/circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCircle extends React.Component<IconBaseProps> { }
-export = FaCircle;
diff --git a/types/react-icons/lib/fa/clipboard.d.ts b/types/react-icons/lib/fa/clipboard.d.ts
deleted file mode 100644
index e22d01efc8..0000000000
--- a/types/react-icons/lib/fa/clipboard.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaClipboard extends React.Component<IconBaseProps> { }
-export = FaClipboard;
diff --git a/types/react-icons/lib/fa/clock-o.d.ts b/types/react-icons/lib/fa/clock-o.d.ts
deleted file mode 100644
index cdc63f0cff..0000000000
--- a/types/react-icons/lib/fa/clock-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaClockO extends React.Component<IconBaseProps> { }
-export = FaClockO;
diff --git a/types/react-icons/lib/fa/clone.d.ts b/types/react-icons/lib/fa/clone.d.ts
deleted file mode 100644
index f0f4ffb33a..0000000000
--- a/types/react-icons/lib/fa/clone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaClone extends React.Component<IconBaseProps> { }
-export = FaClone;
diff --git a/types/react-icons/lib/fa/close.d.ts b/types/react-icons/lib/fa/close.d.ts
deleted file mode 100644
index 094b3e1b85..0000000000
--- a/types/react-icons/lib/fa/close.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaClose extends React.Component<IconBaseProps> { }
-export = FaClose;
diff --git a/types/react-icons/lib/fa/cloud-download.d.ts b/types/react-icons/lib/fa/cloud-download.d.ts
deleted file mode 100644
index 7c43077f87..0000000000
--- a/types/react-icons/lib/fa/cloud-download.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCloudDownload extends React.Component<IconBaseProps> { }
-export = FaCloudDownload;
diff --git a/types/react-icons/lib/fa/cloud-upload.d.ts b/types/react-icons/lib/fa/cloud-upload.d.ts
deleted file mode 100644
index a1889f0e7a..0000000000
--- a/types/react-icons/lib/fa/cloud-upload.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCloudUpload extends React.Component<IconBaseProps> { }
-export = FaCloudUpload;
diff --git a/types/react-icons/lib/fa/cloud.d.ts b/types/react-icons/lib/fa/cloud.d.ts
deleted file mode 100644
index 3731c7dc7f..0000000000
--- a/types/react-icons/lib/fa/cloud.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCloud extends React.Component<IconBaseProps> { }
-export = FaCloud;
diff --git a/types/react-icons/lib/fa/cny.d.ts b/types/react-icons/lib/fa/cny.d.ts
deleted file mode 100644
index 0beb3d9267..0000000000
--- a/types/react-icons/lib/fa/cny.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCny extends React.Component<IconBaseProps> { }
-export = FaCny;
diff --git a/types/react-icons/lib/fa/code-fork.d.ts b/types/react-icons/lib/fa/code-fork.d.ts
deleted file mode 100644
index 629cb69d31..0000000000
--- a/types/react-icons/lib/fa/code-fork.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCodeFork extends React.Component<IconBaseProps> { }
-export = FaCodeFork;
diff --git a/types/react-icons/lib/fa/code.d.ts b/types/react-icons/lib/fa/code.d.ts
deleted file mode 100644
index c326599c5b..0000000000
--- a/types/react-icons/lib/fa/code.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCode extends React.Component<IconBaseProps> { }
-export = FaCode;
diff --git a/types/react-icons/lib/fa/codepen.d.ts b/types/react-icons/lib/fa/codepen.d.ts
deleted file mode 100644
index fca3ca9958..0000000000
--- a/types/react-icons/lib/fa/codepen.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCodepen extends React.Component<IconBaseProps> { }
-export = FaCodepen;
diff --git a/types/react-icons/lib/fa/codiepie.d.ts b/types/react-icons/lib/fa/codiepie.d.ts
deleted file mode 100644
index fe85ee642b..0000000000
--- a/types/react-icons/lib/fa/codiepie.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCodiepie extends React.Component<IconBaseProps> { }
-export = FaCodiepie;
diff --git a/types/react-icons/lib/fa/coffee.d.ts b/types/react-icons/lib/fa/coffee.d.ts
deleted file mode 100644
index c180b18989..0000000000
--- a/types/react-icons/lib/fa/coffee.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCoffee extends React.Component<IconBaseProps> { }
-export = FaCoffee;
diff --git a/types/react-icons/lib/fa/cog.d.ts b/types/react-icons/lib/fa/cog.d.ts
deleted file mode 100644
index 1a334e597a..0000000000
--- a/types/react-icons/lib/fa/cog.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCog extends React.Component<IconBaseProps> { }
-export = FaCog;
diff --git a/types/react-icons/lib/fa/cogs.d.ts b/types/react-icons/lib/fa/cogs.d.ts
deleted file mode 100644
index af3acaec4d..0000000000
--- a/types/react-icons/lib/fa/cogs.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCogs extends React.Component<IconBaseProps> { }
-export = FaCogs;
diff --git a/types/react-icons/lib/fa/columns.d.ts b/types/react-icons/lib/fa/columns.d.ts
deleted file mode 100644
index c4654d0a77..0000000000
--- a/types/react-icons/lib/fa/columns.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaColumns extends React.Component<IconBaseProps> { }
-export = FaColumns;
diff --git a/types/react-icons/lib/fa/comment-o.d.ts b/types/react-icons/lib/fa/comment-o.d.ts
deleted file mode 100644
index dd54ac16e0..0000000000
--- a/types/react-icons/lib/fa/comment-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCommentO extends React.Component<IconBaseProps> { }
-export = FaCommentO;
diff --git a/types/react-icons/lib/fa/comment.d.ts b/types/react-icons/lib/fa/comment.d.ts
deleted file mode 100644
index a047b84b08..0000000000
--- a/types/react-icons/lib/fa/comment.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaComment extends React.Component<IconBaseProps> { }
-export = FaComment;
diff --git a/types/react-icons/lib/fa/commenting-o.d.ts b/types/react-icons/lib/fa/commenting-o.d.ts
deleted file mode 100644
index 62f564350d..0000000000
--- a/types/react-icons/lib/fa/commenting-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCommentingO extends React.Component<IconBaseProps> { }
-export = FaCommentingO;
diff --git a/types/react-icons/lib/fa/commenting.d.ts b/types/react-icons/lib/fa/commenting.d.ts
deleted file mode 100644
index d441889bfa..0000000000
--- a/types/react-icons/lib/fa/commenting.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCommenting extends React.Component<IconBaseProps> { }
-export = FaCommenting;
diff --git a/types/react-icons/lib/fa/comments-o.d.ts b/types/react-icons/lib/fa/comments-o.d.ts
deleted file mode 100644
index fc8d61a241..0000000000
--- a/types/react-icons/lib/fa/comments-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCommentsO extends React.Component<IconBaseProps> { }
-export = FaCommentsO;
diff --git a/types/react-icons/lib/fa/comments.d.ts b/types/react-icons/lib/fa/comments.d.ts
deleted file mode 100644
index bfcc34638d..0000000000
--- a/types/react-icons/lib/fa/comments.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaComments extends React.Component<IconBaseProps> { }
-export = FaComments;
diff --git a/types/react-icons/lib/fa/compass.d.ts b/types/react-icons/lib/fa/compass.d.ts
deleted file mode 100644
index 723d54adc2..0000000000
--- a/types/react-icons/lib/fa/compass.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCompass extends React.Component<IconBaseProps> { }
-export = FaCompass;
diff --git a/types/react-icons/lib/fa/compress.d.ts b/types/react-icons/lib/fa/compress.d.ts
deleted file mode 100644
index b74cdb1972..0000000000
--- a/types/react-icons/lib/fa/compress.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCompress extends React.Component<IconBaseProps> { }
-export = FaCompress;
diff --git a/types/react-icons/lib/fa/connectdevelop.d.ts b/types/react-icons/lib/fa/connectdevelop.d.ts
deleted file mode 100644
index efbff96350..0000000000
--- a/types/react-icons/lib/fa/connectdevelop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaConnectdevelop extends React.Component<IconBaseProps> { }
-export = FaConnectdevelop;
diff --git a/types/react-icons/lib/fa/contao.d.ts b/types/react-icons/lib/fa/contao.d.ts
deleted file mode 100644
index bef2e66ee5..0000000000
--- a/types/react-icons/lib/fa/contao.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaContao extends React.Component<IconBaseProps> { }
-export = FaContao;
diff --git a/types/react-icons/lib/fa/copy.d.ts b/types/react-icons/lib/fa/copy.d.ts
deleted file mode 100644
index df23e99f5c..0000000000
--- a/types/react-icons/lib/fa/copy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCopy extends React.Component<IconBaseProps> { }
-export = FaCopy;
diff --git a/types/react-icons/lib/fa/copyright.d.ts b/types/react-icons/lib/fa/copyright.d.ts
deleted file mode 100644
index 5e4d25dddf..0000000000
--- a/types/react-icons/lib/fa/copyright.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCopyright extends React.Component<IconBaseProps> { }
-export = FaCopyright;
diff --git a/types/react-icons/lib/fa/creative-commons.d.ts b/types/react-icons/lib/fa/creative-commons.d.ts
deleted file mode 100644
index 0d7a0f343d..0000000000
--- a/types/react-icons/lib/fa/creative-commons.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCreativeCommons extends React.Component<IconBaseProps> { }
-export = FaCreativeCommons;
diff --git a/types/react-icons/lib/fa/credit-card-alt.d.ts b/types/react-icons/lib/fa/credit-card-alt.d.ts
deleted file mode 100644
index 6a21316ced..0000000000
--- a/types/react-icons/lib/fa/credit-card-alt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCreditCardAlt extends React.Component<IconBaseProps> { }
-export = FaCreditCardAlt;
diff --git a/types/react-icons/lib/fa/credit-card.d.ts b/types/react-icons/lib/fa/credit-card.d.ts
deleted file mode 100644
index 0a66aa3502..0000000000
--- a/types/react-icons/lib/fa/credit-card.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCreditCard extends React.Component<IconBaseProps> { }
-export = FaCreditCard;
diff --git a/types/react-icons/lib/fa/crop.d.ts b/types/react-icons/lib/fa/crop.d.ts
deleted file mode 100644
index d5a8fca0c0..0000000000
--- a/types/react-icons/lib/fa/crop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCrop extends React.Component<IconBaseProps> { }
-export = FaCrop;
diff --git a/types/react-icons/lib/fa/crosshairs.d.ts b/types/react-icons/lib/fa/crosshairs.d.ts
deleted file mode 100644
index 9d0eec3c43..0000000000
--- a/types/react-icons/lib/fa/crosshairs.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCrosshairs extends React.Component<IconBaseProps> { }
-export = FaCrosshairs;
diff --git a/types/react-icons/lib/fa/css3.d.ts b/types/react-icons/lib/fa/css3.d.ts
deleted file mode 100644
index 09da385a81..0000000000
--- a/types/react-icons/lib/fa/css3.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCss3 extends React.Component<IconBaseProps> { }
-export = FaCss3;
diff --git a/types/react-icons/lib/fa/cube.d.ts b/types/react-icons/lib/fa/cube.d.ts
deleted file mode 100644
index 8ecf9e7fdb..0000000000
--- a/types/react-icons/lib/fa/cube.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCube extends React.Component<IconBaseProps> { }
-export = FaCube;
diff --git a/types/react-icons/lib/fa/cubes.d.ts b/types/react-icons/lib/fa/cubes.d.ts
deleted file mode 100644
index e2d2ea0f93..0000000000
--- a/types/react-icons/lib/fa/cubes.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCubes extends React.Component<IconBaseProps> { }
-export = FaCubes;
diff --git a/types/react-icons/lib/fa/cut.d.ts b/types/react-icons/lib/fa/cut.d.ts
deleted file mode 100644
index bba94e53ba..0000000000
--- a/types/react-icons/lib/fa/cut.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCut extends React.Component<IconBaseProps> { }
-export = FaCut;
diff --git a/types/react-icons/lib/fa/cutlery.d.ts b/types/react-icons/lib/fa/cutlery.d.ts
deleted file mode 100644
index 74ace7cf30..0000000000
--- a/types/react-icons/lib/fa/cutlery.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaCutlery extends React.Component<IconBaseProps> { }
-export = FaCutlery;
diff --git a/types/react-icons/lib/fa/dashboard.d.ts b/types/react-icons/lib/fa/dashboard.d.ts
deleted file mode 100644
index 20824e5f61..0000000000
--- a/types/react-icons/lib/fa/dashboard.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDashboard extends React.Component<IconBaseProps> { }
-export = FaDashboard;
diff --git a/types/react-icons/lib/fa/dashcube.d.ts b/types/react-icons/lib/fa/dashcube.d.ts
deleted file mode 100644
index 2b11b28908..0000000000
--- a/types/react-icons/lib/fa/dashcube.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDashcube extends React.Component<IconBaseProps> { }
-export = FaDashcube;
diff --git a/types/react-icons/lib/fa/database.d.ts b/types/react-icons/lib/fa/database.d.ts
deleted file mode 100644
index ac4aae49de..0000000000
--- a/types/react-icons/lib/fa/database.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDatabase extends React.Component<IconBaseProps> { }
-export = FaDatabase;
diff --git a/types/react-icons/lib/fa/deaf.d.ts b/types/react-icons/lib/fa/deaf.d.ts
deleted file mode 100644
index a1c6fdd7b6..0000000000
--- a/types/react-icons/lib/fa/deaf.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDeaf extends React.Component<IconBaseProps> { }
-export = FaDeaf;
diff --git a/types/react-icons/lib/fa/dedent.d.ts b/types/react-icons/lib/fa/dedent.d.ts
deleted file mode 100644
index 9d7c8bcf7c..0000000000
--- a/types/react-icons/lib/fa/dedent.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDedent extends React.Component<IconBaseProps> { }
-export = FaDedent;
diff --git a/types/react-icons/lib/fa/delicious.d.ts b/types/react-icons/lib/fa/delicious.d.ts
deleted file mode 100644
index b2e522393f..0000000000
--- a/types/react-icons/lib/fa/delicious.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDelicious extends React.Component<IconBaseProps> { }
-export = FaDelicious;
diff --git a/types/react-icons/lib/fa/desktop.d.ts b/types/react-icons/lib/fa/desktop.d.ts
deleted file mode 100644
index 46bc3de05f..0000000000
--- a/types/react-icons/lib/fa/desktop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDesktop extends React.Component<IconBaseProps> { }
-export = FaDesktop;
diff --git a/types/react-icons/lib/fa/deviantart.d.ts b/types/react-icons/lib/fa/deviantart.d.ts
deleted file mode 100644
index f81be1f6c7..0000000000
--- a/types/react-icons/lib/fa/deviantart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDeviantart extends React.Component<IconBaseProps> { }
-export = FaDeviantart;
diff --git a/types/react-icons/lib/fa/diamond.d.ts b/types/react-icons/lib/fa/diamond.d.ts
deleted file mode 100644
index 7e5ae9df3b..0000000000
--- a/types/react-icons/lib/fa/diamond.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDiamond extends React.Component<IconBaseProps> { }
-export = FaDiamond;
diff --git a/types/react-icons/lib/fa/digg.d.ts b/types/react-icons/lib/fa/digg.d.ts
deleted file mode 100644
index 23583964a5..0000000000
--- a/types/react-icons/lib/fa/digg.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDigg extends React.Component<IconBaseProps> { }
-export = FaDigg;
diff --git a/types/react-icons/lib/fa/dollar.d.ts b/types/react-icons/lib/fa/dollar.d.ts
deleted file mode 100644
index 5311f1a562..0000000000
--- a/types/react-icons/lib/fa/dollar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDollar extends React.Component<IconBaseProps> { }
-export = FaDollar;
diff --git a/types/react-icons/lib/fa/dot-circle-o.d.ts b/types/react-icons/lib/fa/dot-circle-o.d.ts
deleted file mode 100644
index 35f9eb9650..0000000000
--- a/types/react-icons/lib/fa/dot-circle-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDotCircleO extends React.Component<IconBaseProps> { }
-export = FaDotCircleO;
diff --git a/types/react-icons/lib/fa/download.d.ts b/types/react-icons/lib/fa/download.d.ts
deleted file mode 100644
index 256c59de79..0000000000
--- a/types/react-icons/lib/fa/download.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDownload extends React.Component<IconBaseProps> { }
-export = FaDownload;
diff --git a/types/react-icons/lib/fa/dribbble.d.ts b/types/react-icons/lib/fa/dribbble.d.ts
deleted file mode 100644
index 668a16710b..0000000000
--- a/types/react-icons/lib/fa/dribbble.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDribbble extends React.Component<IconBaseProps> { }
-export = FaDribbble;
diff --git a/types/react-icons/lib/fa/dropbox.d.ts b/types/react-icons/lib/fa/dropbox.d.ts
deleted file mode 100644
index 8f780c1b1a..0000000000
--- a/types/react-icons/lib/fa/dropbox.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDropbox extends React.Component<IconBaseProps> { }
-export = FaDropbox;
diff --git a/types/react-icons/lib/fa/drupal.d.ts b/types/react-icons/lib/fa/drupal.d.ts
deleted file mode 100644
index 7e1f23e073..0000000000
--- a/types/react-icons/lib/fa/drupal.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaDrupal extends React.Component<IconBaseProps> { }
-export = FaDrupal;
diff --git a/types/react-icons/lib/fa/edge.d.ts b/types/react-icons/lib/fa/edge.d.ts
deleted file mode 100644
index 38b4368b33..0000000000
--- a/types/react-icons/lib/fa/edge.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaEdge extends React.Component<IconBaseProps> { }
-export = FaEdge;
diff --git a/types/react-icons/lib/fa/edit.d.ts b/types/react-icons/lib/fa/edit.d.ts
deleted file mode 100644
index 989dc37c64..0000000000
--- a/types/react-icons/lib/fa/edit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaEdit extends React.Component<IconBaseProps> { }
-export = FaEdit;
diff --git a/types/react-icons/lib/fa/eject.d.ts b/types/react-icons/lib/fa/eject.d.ts
deleted file mode 100644
index bc9e34c4a8..0000000000
--- a/types/react-icons/lib/fa/eject.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaEject extends React.Component<IconBaseProps> { }
-export = FaEject;
diff --git a/types/react-icons/lib/fa/ellipsis-h.d.ts b/types/react-icons/lib/fa/ellipsis-h.d.ts
deleted file mode 100644
index d00da1e799..0000000000
--- a/types/react-icons/lib/fa/ellipsis-h.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaEllipsisH extends React.Component<IconBaseProps> { }
-export = FaEllipsisH;
diff --git a/types/react-icons/lib/fa/ellipsis-v.d.ts b/types/react-icons/lib/fa/ellipsis-v.d.ts
deleted file mode 100644
index d9d4e1c84e..0000000000
--- a/types/react-icons/lib/fa/ellipsis-v.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaEllipsisV extends React.Component<IconBaseProps> { }
-export = FaEllipsisV;
diff --git a/types/react-icons/lib/fa/empire.d.ts b/types/react-icons/lib/fa/empire.d.ts
deleted file mode 100644
index 5cc1dad476..0000000000
--- a/types/react-icons/lib/fa/empire.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaEmpire extends React.Component<IconBaseProps> { }
-export = FaEmpire;
diff --git a/types/react-icons/lib/fa/envelope-o.d.ts b/types/react-icons/lib/fa/envelope-o.d.ts
deleted file mode 100644
index 4469389609..0000000000
--- a/types/react-icons/lib/fa/envelope-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaEnvelopeO extends React.Component<IconBaseProps> { }
-export = FaEnvelopeO;
diff --git a/types/react-icons/lib/fa/envelope-square.d.ts b/types/react-icons/lib/fa/envelope-square.d.ts
deleted file mode 100644
index 6d3c1cf0f8..0000000000
--- a/types/react-icons/lib/fa/envelope-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaEnvelopeSquare extends React.Component<IconBaseProps> { }
-export = FaEnvelopeSquare;
diff --git a/types/react-icons/lib/fa/envelope.d.ts b/types/react-icons/lib/fa/envelope.d.ts
deleted file mode 100644
index 219156d484..0000000000
--- a/types/react-icons/lib/fa/envelope.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaEnvelope extends React.Component<IconBaseProps> { }
-export = FaEnvelope;
diff --git a/types/react-icons/lib/fa/envira.d.ts b/types/react-icons/lib/fa/envira.d.ts
deleted file mode 100644
index 4ab89938e7..0000000000
--- a/types/react-icons/lib/fa/envira.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaEnvira extends React.Component<IconBaseProps> { }
-export = FaEnvira;
diff --git a/types/react-icons/lib/fa/eraser.d.ts b/types/react-icons/lib/fa/eraser.d.ts
deleted file mode 100644
index ad40c75975..0000000000
--- a/types/react-icons/lib/fa/eraser.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaEraser extends React.Component<IconBaseProps> { }
-export = FaEraser;
diff --git a/types/react-icons/lib/fa/eur.d.ts b/types/react-icons/lib/fa/eur.d.ts
deleted file mode 100644
index 6d18711dd5..0000000000
--- a/types/react-icons/lib/fa/eur.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaEur extends React.Component<IconBaseProps> { }
-export = FaEur;
diff --git a/types/react-icons/lib/fa/exchange.d.ts b/types/react-icons/lib/fa/exchange.d.ts
deleted file mode 100644
index 86e1df628d..0000000000
--- a/types/react-icons/lib/fa/exchange.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaExchange extends React.Component<IconBaseProps> { }
-export = FaExchange;
diff --git a/types/react-icons/lib/fa/exclamation-circle.d.ts b/types/react-icons/lib/fa/exclamation-circle.d.ts
deleted file mode 100644
index b421e2dd49..0000000000
--- a/types/react-icons/lib/fa/exclamation-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaExclamationCircle extends React.Component<IconBaseProps> { }
-export = FaExclamationCircle;
diff --git a/types/react-icons/lib/fa/exclamation-triangle.d.ts b/types/react-icons/lib/fa/exclamation-triangle.d.ts
deleted file mode 100644
index 340cdae80e..0000000000
--- a/types/react-icons/lib/fa/exclamation-triangle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaExclamationTriangle extends React.Component<IconBaseProps> { }
-export = FaExclamationTriangle;
diff --git a/types/react-icons/lib/fa/exclamation.d.ts b/types/react-icons/lib/fa/exclamation.d.ts
deleted file mode 100644
index 9faa259a47..0000000000
--- a/types/react-icons/lib/fa/exclamation.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaExclamation extends React.Component<IconBaseProps> { }
-export = FaExclamation;
diff --git a/types/react-icons/lib/fa/expand.d.ts b/types/react-icons/lib/fa/expand.d.ts
deleted file mode 100644
index 8a85cf0f71..0000000000
--- a/types/react-icons/lib/fa/expand.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaExpand extends React.Component<IconBaseProps> { }
-export = FaExpand;
diff --git a/types/react-icons/lib/fa/expeditedssl.d.ts b/types/react-icons/lib/fa/expeditedssl.d.ts
deleted file mode 100644
index 881ce2621c..0000000000
--- a/types/react-icons/lib/fa/expeditedssl.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaExpeditedssl extends React.Component<IconBaseProps> { }
-export = FaExpeditedssl;
diff --git a/types/react-icons/lib/fa/external-link-square.d.ts b/types/react-icons/lib/fa/external-link-square.d.ts
deleted file mode 100644
index 9fb66091cb..0000000000
--- a/types/react-icons/lib/fa/external-link-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaExternalLinkSquare extends React.Component<IconBaseProps> { }
-export = FaExternalLinkSquare;
diff --git a/types/react-icons/lib/fa/external-link.d.ts b/types/react-icons/lib/fa/external-link.d.ts
deleted file mode 100644
index eb4af13164..0000000000
--- a/types/react-icons/lib/fa/external-link.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaExternalLink extends React.Component<IconBaseProps> { }
-export = FaExternalLink;
diff --git a/types/react-icons/lib/fa/eye-slash.d.ts b/types/react-icons/lib/fa/eye-slash.d.ts
deleted file mode 100644
index ca8008324d..0000000000
--- a/types/react-icons/lib/fa/eye-slash.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaEyeSlash extends React.Component<IconBaseProps> { }
-export = FaEyeSlash;
diff --git a/types/react-icons/lib/fa/eye.d.ts b/types/react-icons/lib/fa/eye.d.ts
deleted file mode 100644
index 74acb8f8d6..0000000000
--- a/types/react-icons/lib/fa/eye.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaEye extends React.Component<IconBaseProps> { }
-export = FaEye;
diff --git a/types/react-icons/lib/fa/eyedropper.d.ts b/types/react-icons/lib/fa/eyedropper.d.ts
deleted file mode 100644
index 41ec80d371..0000000000
--- a/types/react-icons/lib/fa/eyedropper.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaEyedropper extends React.Component<IconBaseProps> { }
-export = FaEyedropper;
diff --git a/types/react-icons/lib/fa/facebook-official.d.ts b/types/react-icons/lib/fa/facebook-official.d.ts
deleted file mode 100644
index 1f1a4d12ff..0000000000
--- a/types/react-icons/lib/fa/facebook-official.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFacebookOfficial extends React.Component<IconBaseProps> { }
-export = FaFacebookOfficial;
diff --git a/types/react-icons/lib/fa/facebook-square.d.ts b/types/react-icons/lib/fa/facebook-square.d.ts
deleted file mode 100644
index 9913daf360..0000000000
--- a/types/react-icons/lib/fa/facebook-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFacebookSquare extends React.Component<IconBaseProps> { }
-export = FaFacebookSquare;
diff --git a/types/react-icons/lib/fa/facebook.d.ts b/types/react-icons/lib/fa/facebook.d.ts
deleted file mode 100644
index 1644fe29eb..0000000000
--- a/types/react-icons/lib/fa/facebook.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFacebook extends React.Component<IconBaseProps> { }
-export = FaFacebook;
diff --git a/types/react-icons/lib/fa/fast-backward.d.ts b/types/react-icons/lib/fa/fast-backward.d.ts
deleted file mode 100644
index 1e7d42c3b6..0000000000
--- a/types/react-icons/lib/fa/fast-backward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFastBackward extends React.Component<IconBaseProps> { }
-export = FaFastBackward;
diff --git a/types/react-icons/lib/fa/fast-forward.d.ts b/types/react-icons/lib/fa/fast-forward.d.ts
deleted file mode 100644
index 6321e070d6..0000000000
--- a/types/react-icons/lib/fa/fast-forward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFastForward extends React.Component<IconBaseProps> { }
-export = FaFastForward;
diff --git a/types/react-icons/lib/fa/fax.d.ts b/types/react-icons/lib/fa/fax.d.ts
deleted file mode 100644
index 9b132d388d..0000000000
--- a/types/react-icons/lib/fa/fax.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFax extends React.Component<IconBaseProps> { }
-export = FaFax;
diff --git a/types/react-icons/lib/fa/feed.d.ts b/types/react-icons/lib/fa/feed.d.ts
deleted file mode 100644
index 38127134e7..0000000000
--- a/types/react-icons/lib/fa/feed.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFeed extends React.Component<IconBaseProps> { }
-export = FaFeed;
diff --git a/types/react-icons/lib/fa/female.d.ts b/types/react-icons/lib/fa/female.d.ts
deleted file mode 100644
index 03d6b92278..0000000000
--- a/types/react-icons/lib/fa/female.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFemale extends React.Component<IconBaseProps> { }
-export = FaFemale;
diff --git a/types/react-icons/lib/fa/fighter-jet.d.ts b/types/react-icons/lib/fa/fighter-jet.d.ts
deleted file mode 100644
index e6cf5be901..0000000000
--- a/types/react-icons/lib/fa/fighter-jet.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFighterJet extends React.Component<IconBaseProps> { }
-export = FaFighterJet;
diff --git a/types/react-icons/lib/fa/file-archive-o.d.ts b/types/react-icons/lib/fa/file-archive-o.d.ts
deleted file mode 100644
index ff25fc06ad..0000000000
--- a/types/react-icons/lib/fa/file-archive-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFileArchiveO extends React.Component<IconBaseProps> { }
-export = FaFileArchiveO;
diff --git a/types/react-icons/lib/fa/file-audio-o.d.ts b/types/react-icons/lib/fa/file-audio-o.d.ts
deleted file mode 100644
index 211c6fa6d9..0000000000
--- a/types/react-icons/lib/fa/file-audio-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFileAudioO extends React.Component<IconBaseProps> { }
-export = FaFileAudioO;
diff --git a/types/react-icons/lib/fa/file-code-o.d.ts b/types/react-icons/lib/fa/file-code-o.d.ts
deleted file mode 100644
index 9a29a3c9b2..0000000000
--- a/types/react-icons/lib/fa/file-code-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFileCodeO extends React.Component<IconBaseProps> { }
-export = FaFileCodeO;
diff --git a/types/react-icons/lib/fa/file-excel-o.d.ts b/types/react-icons/lib/fa/file-excel-o.d.ts
deleted file mode 100644
index 4bbfd0bcea..0000000000
--- a/types/react-icons/lib/fa/file-excel-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFileExcelO extends React.Component<IconBaseProps> { }
-export = FaFileExcelO;
diff --git a/types/react-icons/lib/fa/file-image-o.d.ts b/types/react-icons/lib/fa/file-image-o.d.ts
deleted file mode 100644
index 11ae1f0c6f..0000000000
--- a/types/react-icons/lib/fa/file-image-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFileImageO extends React.Component<IconBaseProps> { }
-export = FaFileImageO;
diff --git a/types/react-icons/lib/fa/file-movie-o.d.ts b/types/react-icons/lib/fa/file-movie-o.d.ts
deleted file mode 100644
index 9ed9155780..0000000000
--- a/types/react-icons/lib/fa/file-movie-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFileMovieO extends React.Component<IconBaseProps> { }
-export = FaFileMovieO;
diff --git a/types/react-icons/lib/fa/file-o.d.ts b/types/react-icons/lib/fa/file-o.d.ts
deleted file mode 100644
index d999ac3e54..0000000000
--- a/types/react-icons/lib/fa/file-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFileO extends React.Component<IconBaseProps> { }
-export = FaFileO;
diff --git a/types/react-icons/lib/fa/file-pdf-o.d.ts b/types/react-icons/lib/fa/file-pdf-o.d.ts
deleted file mode 100644
index e2abcd0736..0000000000
--- a/types/react-icons/lib/fa/file-pdf-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFilePdfO extends React.Component<IconBaseProps> { }
-export = FaFilePdfO;
diff --git a/types/react-icons/lib/fa/file-powerpoint-o.d.ts b/types/react-icons/lib/fa/file-powerpoint-o.d.ts
deleted file mode 100644
index 447f354ee1..0000000000
--- a/types/react-icons/lib/fa/file-powerpoint-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFilePowerpointO extends React.Component<IconBaseProps> { }
-export = FaFilePowerpointO;
diff --git a/types/react-icons/lib/fa/file-text-o.d.ts b/types/react-icons/lib/fa/file-text-o.d.ts
deleted file mode 100644
index 8d1d06d3fc..0000000000
--- a/types/react-icons/lib/fa/file-text-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFileTextO extends React.Component<IconBaseProps> { }
-export = FaFileTextO;
diff --git a/types/react-icons/lib/fa/file-text.d.ts b/types/react-icons/lib/fa/file-text.d.ts
deleted file mode 100644
index d551df577a..0000000000
--- a/types/react-icons/lib/fa/file-text.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFileText extends React.Component<IconBaseProps> { }
-export = FaFileText;
diff --git a/types/react-icons/lib/fa/file-word-o.d.ts b/types/react-icons/lib/fa/file-word-o.d.ts
deleted file mode 100644
index 7dd12a0dbb..0000000000
--- a/types/react-icons/lib/fa/file-word-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFileWordO extends React.Component<IconBaseProps> { }
-export = FaFileWordO;
diff --git a/types/react-icons/lib/fa/file.d.ts b/types/react-icons/lib/fa/file.d.ts
deleted file mode 100644
index 90eea6dacf..0000000000
--- a/types/react-icons/lib/fa/file.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFile extends React.Component<IconBaseProps> { }
-export = FaFile;
diff --git a/types/react-icons/lib/fa/film.d.ts b/types/react-icons/lib/fa/film.d.ts
deleted file mode 100644
index ccc05405ee..0000000000
--- a/types/react-icons/lib/fa/film.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFilm extends React.Component<IconBaseProps> { }
-export = FaFilm;
diff --git a/types/react-icons/lib/fa/filter.d.ts b/types/react-icons/lib/fa/filter.d.ts
deleted file mode 100644
index 02308d24fd..0000000000
--- a/types/react-icons/lib/fa/filter.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFilter extends React.Component<IconBaseProps> { }
-export = FaFilter;
diff --git a/types/react-icons/lib/fa/fire-extinguisher.d.ts b/types/react-icons/lib/fa/fire-extinguisher.d.ts
deleted file mode 100644
index 2f2637ebfc..0000000000
--- a/types/react-icons/lib/fa/fire-extinguisher.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFireExtinguisher extends React.Component<IconBaseProps> { }
-export = FaFireExtinguisher;
diff --git a/types/react-icons/lib/fa/fire.d.ts b/types/react-icons/lib/fa/fire.d.ts
deleted file mode 100644
index 16231c9435..0000000000
--- a/types/react-icons/lib/fa/fire.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFire extends React.Component<IconBaseProps> { }
-export = FaFire;
diff --git a/types/react-icons/lib/fa/firefox.d.ts b/types/react-icons/lib/fa/firefox.d.ts
deleted file mode 100644
index e4270d68f1..0000000000
--- a/types/react-icons/lib/fa/firefox.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFirefox extends React.Component<IconBaseProps> { }
-export = FaFirefox;
diff --git a/types/react-icons/lib/fa/flag-checkered.d.ts b/types/react-icons/lib/fa/flag-checkered.d.ts
deleted file mode 100644
index 0593962a85..0000000000
--- a/types/react-icons/lib/fa/flag-checkered.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFlagCheckered extends React.Component<IconBaseProps> { }
-export = FaFlagCheckered;
diff --git a/types/react-icons/lib/fa/flag-o.d.ts b/types/react-icons/lib/fa/flag-o.d.ts
deleted file mode 100644
index 799d680b87..0000000000
--- a/types/react-icons/lib/fa/flag-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFlagO extends React.Component<IconBaseProps> { }
-export = FaFlagO;
diff --git a/types/react-icons/lib/fa/flag.d.ts b/types/react-icons/lib/fa/flag.d.ts
deleted file mode 100644
index 0ffe7c5e21..0000000000
--- a/types/react-icons/lib/fa/flag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFlag extends React.Component<IconBaseProps> { }
-export = FaFlag;
diff --git a/types/react-icons/lib/fa/flask.d.ts b/types/react-icons/lib/fa/flask.d.ts
deleted file mode 100644
index 3c6ed4067e..0000000000
--- a/types/react-icons/lib/fa/flask.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFlask extends React.Component<IconBaseProps> { }
-export = FaFlask;
diff --git a/types/react-icons/lib/fa/flickr.d.ts b/types/react-icons/lib/fa/flickr.d.ts
deleted file mode 100644
index b35696f10a..0000000000
--- a/types/react-icons/lib/fa/flickr.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFlickr extends React.Component<IconBaseProps> { }
-export = FaFlickr;
diff --git a/types/react-icons/lib/fa/floppy-o.d.ts b/types/react-icons/lib/fa/floppy-o.d.ts
deleted file mode 100644
index 2eacb6d2da..0000000000
--- a/types/react-icons/lib/fa/floppy-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFloppyO extends React.Component<IconBaseProps> { }
-export = FaFloppyO;
diff --git a/types/react-icons/lib/fa/folder-o.d.ts b/types/react-icons/lib/fa/folder-o.d.ts
deleted file mode 100644
index df997f3bbb..0000000000
--- a/types/react-icons/lib/fa/folder-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFolderO extends React.Component<IconBaseProps> { }
-export = FaFolderO;
diff --git a/types/react-icons/lib/fa/folder-open-o.d.ts b/types/react-icons/lib/fa/folder-open-o.d.ts
deleted file mode 100644
index 99f32e2b2c..0000000000
--- a/types/react-icons/lib/fa/folder-open-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFolderOpenO extends React.Component<IconBaseProps> { }
-export = FaFolderOpenO;
diff --git a/types/react-icons/lib/fa/folder-open.d.ts b/types/react-icons/lib/fa/folder-open.d.ts
deleted file mode 100644
index 0e9fac95ac..0000000000
--- a/types/react-icons/lib/fa/folder-open.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFolderOpen extends React.Component<IconBaseProps> { }
-export = FaFolderOpen;
diff --git a/types/react-icons/lib/fa/folder.d.ts b/types/react-icons/lib/fa/folder.d.ts
deleted file mode 100644
index 710bee7179..0000000000
--- a/types/react-icons/lib/fa/folder.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFolder extends React.Component<IconBaseProps> { }
-export = FaFolder;
diff --git a/types/react-icons/lib/fa/font.d.ts b/types/react-icons/lib/fa/font.d.ts
deleted file mode 100644
index 0ab7e0ef5c..0000000000
--- a/types/react-icons/lib/fa/font.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFont extends React.Component<IconBaseProps> { }
-export = FaFont;
diff --git a/types/react-icons/lib/fa/fonticons.d.ts b/types/react-icons/lib/fa/fonticons.d.ts
deleted file mode 100644
index a219058840..0000000000
--- a/types/react-icons/lib/fa/fonticons.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFonticons extends React.Component<IconBaseProps> { }
-export = FaFonticons;
diff --git a/types/react-icons/lib/fa/fort-awesome.d.ts b/types/react-icons/lib/fa/fort-awesome.d.ts
deleted file mode 100644
index af5c2699ca..0000000000
--- a/types/react-icons/lib/fa/fort-awesome.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFortAwesome extends React.Component<IconBaseProps> { }
-export = FaFortAwesome;
diff --git a/types/react-icons/lib/fa/forumbee.d.ts b/types/react-icons/lib/fa/forumbee.d.ts
deleted file mode 100644
index 6ba90b5966..0000000000
--- a/types/react-icons/lib/fa/forumbee.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaForumbee extends React.Component<IconBaseProps> { }
-export = FaForumbee;
diff --git a/types/react-icons/lib/fa/forward.d.ts b/types/react-icons/lib/fa/forward.d.ts
deleted file mode 100644
index 5a25112852..0000000000
--- a/types/react-icons/lib/fa/forward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaForward extends React.Component<IconBaseProps> { }
-export = FaForward;
diff --git a/types/react-icons/lib/fa/foursquare.d.ts b/types/react-icons/lib/fa/foursquare.d.ts
deleted file mode 100644
index 1092fdbd86..0000000000
--- a/types/react-icons/lib/fa/foursquare.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFoursquare extends React.Component<IconBaseProps> { }
-export = FaFoursquare;
diff --git a/types/react-icons/lib/fa/frown-o.d.ts b/types/react-icons/lib/fa/frown-o.d.ts
deleted file mode 100644
index 989c142ac7..0000000000
--- a/types/react-icons/lib/fa/frown-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFrownO extends React.Component<IconBaseProps> { }
-export = FaFrownO;
diff --git a/types/react-icons/lib/fa/futbol-o.d.ts b/types/react-icons/lib/fa/futbol-o.d.ts
deleted file mode 100644
index e98209d9ed..0000000000
--- a/types/react-icons/lib/fa/futbol-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaFutbolO extends React.Component<IconBaseProps> { }
-export = FaFutbolO;
diff --git a/types/react-icons/lib/fa/gamepad.d.ts b/types/react-icons/lib/fa/gamepad.d.ts
deleted file mode 100644
index 5c747b4850..0000000000
--- a/types/react-icons/lib/fa/gamepad.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGamepad extends React.Component<IconBaseProps> { }
-export = FaGamepad;
diff --git a/types/react-icons/lib/fa/gavel.d.ts b/types/react-icons/lib/fa/gavel.d.ts
deleted file mode 100644
index 5e5e0e5084..0000000000
--- a/types/react-icons/lib/fa/gavel.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGavel extends React.Component<IconBaseProps> { }
-export = FaGavel;
diff --git a/types/react-icons/lib/fa/gbp.d.ts b/types/react-icons/lib/fa/gbp.d.ts
deleted file mode 100644
index ec7abd138a..0000000000
--- a/types/react-icons/lib/fa/gbp.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGbp extends React.Component<IconBaseProps> { }
-export = FaGbp;
diff --git a/types/react-icons/lib/fa/genderless.d.ts b/types/react-icons/lib/fa/genderless.d.ts
deleted file mode 100644
index a28ebcf09d..0000000000
--- a/types/react-icons/lib/fa/genderless.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGenderless extends React.Component<IconBaseProps> { }
-export = FaGenderless;
diff --git a/types/react-icons/lib/fa/get-pocket.d.ts b/types/react-icons/lib/fa/get-pocket.d.ts
deleted file mode 100644
index 8184834bc9..0000000000
--- a/types/react-icons/lib/fa/get-pocket.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGetPocket extends React.Component<IconBaseProps> { }
-export = FaGetPocket;
diff --git a/types/react-icons/lib/fa/gg-circle.d.ts b/types/react-icons/lib/fa/gg-circle.d.ts
deleted file mode 100644
index 08edcf12d9..0000000000
--- a/types/react-icons/lib/fa/gg-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGgCircle extends React.Component<IconBaseProps> { }
-export = FaGgCircle;
diff --git a/types/react-icons/lib/fa/gg.d.ts b/types/react-icons/lib/fa/gg.d.ts
deleted file mode 100644
index 923b9e251c..0000000000
--- a/types/react-icons/lib/fa/gg.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGg extends React.Component<IconBaseProps> { }
-export = FaGg;
diff --git a/types/react-icons/lib/fa/gift.d.ts b/types/react-icons/lib/fa/gift.d.ts
deleted file mode 100644
index 3f2bbab5bd..0000000000
--- a/types/react-icons/lib/fa/gift.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGift extends React.Component<IconBaseProps> { }
-export = FaGift;
diff --git a/types/react-icons/lib/fa/git-square.d.ts b/types/react-icons/lib/fa/git-square.d.ts
deleted file mode 100644
index 6f35bf4d1e..0000000000
--- a/types/react-icons/lib/fa/git-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGitSquare extends React.Component<IconBaseProps> { }
-export = FaGitSquare;
diff --git a/types/react-icons/lib/fa/git.d.ts b/types/react-icons/lib/fa/git.d.ts
deleted file mode 100644
index e2f02405d1..0000000000
--- a/types/react-icons/lib/fa/git.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGit extends React.Component<IconBaseProps> { }
-export = FaGit;
diff --git a/types/react-icons/lib/fa/github-alt.d.ts b/types/react-icons/lib/fa/github-alt.d.ts
deleted file mode 100644
index 83433ff8c4..0000000000
--- a/types/react-icons/lib/fa/github-alt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGithubAlt extends React.Component<IconBaseProps> { }
-export = FaGithubAlt;
diff --git a/types/react-icons/lib/fa/github-square.d.ts b/types/react-icons/lib/fa/github-square.d.ts
deleted file mode 100644
index 97e33a57ce..0000000000
--- a/types/react-icons/lib/fa/github-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGithubSquare extends React.Component<IconBaseProps> { }
-export = FaGithubSquare;
diff --git a/types/react-icons/lib/fa/github.d.ts b/types/react-icons/lib/fa/github.d.ts
deleted file mode 100644
index 47d9b29a3d..0000000000
--- a/types/react-icons/lib/fa/github.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGithub extends React.Component<IconBaseProps> { }
-export = FaGithub;
diff --git a/types/react-icons/lib/fa/gitlab.d.ts b/types/react-icons/lib/fa/gitlab.d.ts
deleted file mode 100644
index 109562b8e7..0000000000
--- a/types/react-icons/lib/fa/gitlab.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGitlab extends React.Component<IconBaseProps> { }
-export = FaGitlab;
diff --git a/types/react-icons/lib/fa/gittip.d.ts b/types/react-icons/lib/fa/gittip.d.ts
deleted file mode 100644
index f24ab2ec75..0000000000
--- a/types/react-icons/lib/fa/gittip.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGittip extends React.Component<IconBaseProps> { }
-export = FaGittip;
diff --git a/types/react-icons/lib/fa/glass.d.ts b/types/react-icons/lib/fa/glass.d.ts
deleted file mode 100644
index daf740f992..0000000000
--- a/types/react-icons/lib/fa/glass.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGlass extends React.Component<IconBaseProps> { }
-export = FaGlass;
diff --git a/types/react-icons/lib/fa/glide-g.d.ts b/types/react-icons/lib/fa/glide-g.d.ts
deleted file mode 100644
index b3125de468..0000000000
--- a/types/react-icons/lib/fa/glide-g.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGlideG extends React.Component<IconBaseProps> { }
-export = FaGlideG;
diff --git a/types/react-icons/lib/fa/glide.d.ts b/types/react-icons/lib/fa/glide.d.ts
deleted file mode 100644
index ff48d02cfd..0000000000
--- a/types/react-icons/lib/fa/glide.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGlide extends React.Component<IconBaseProps> { }
-export = FaGlide;
diff --git a/types/react-icons/lib/fa/globe.d.ts b/types/react-icons/lib/fa/globe.d.ts
deleted file mode 100644
index 609ce3127a..0000000000
--- a/types/react-icons/lib/fa/globe.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGlobe extends React.Component<IconBaseProps> { }
-export = FaGlobe;
diff --git a/types/react-icons/lib/fa/google-plus-square.d.ts b/types/react-icons/lib/fa/google-plus-square.d.ts
deleted file mode 100644
index 3f5f54ebe1..0000000000
--- a/types/react-icons/lib/fa/google-plus-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGooglePlusSquare extends React.Component<IconBaseProps> { }
-export = FaGooglePlusSquare;
diff --git a/types/react-icons/lib/fa/google-plus.d.ts b/types/react-icons/lib/fa/google-plus.d.ts
deleted file mode 100644
index 080f4dcba2..0000000000
--- a/types/react-icons/lib/fa/google-plus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGooglePlus extends React.Component<IconBaseProps> { }
-export = FaGooglePlus;
diff --git a/types/react-icons/lib/fa/google-wallet.d.ts b/types/react-icons/lib/fa/google-wallet.d.ts
deleted file mode 100644
index b19019fcff..0000000000
--- a/types/react-icons/lib/fa/google-wallet.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGoogleWallet extends React.Component<IconBaseProps> { }
-export = FaGoogleWallet;
diff --git a/types/react-icons/lib/fa/google.d.ts b/types/react-icons/lib/fa/google.d.ts
deleted file mode 100644
index 4318a2f68c..0000000000
--- a/types/react-icons/lib/fa/google.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGoogle extends React.Component<IconBaseProps> { }
-export = FaGoogle;
diff --git a/types/react-icons/lib/fa/graduation-cap.d.ts b/types/react-icons/lib/fa/graduation-cap.d.ts
deleted file mode 100644
index daafb2481f..0000000000
--- a/types/react-icons/lib/fa/graduation-cap.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGraduationCap extends React.Component<IconBaseProps> { }
-export = FaGraduationCap;
diff --git a/types/react-icons/lib/fa/group.d.ts b/types/react-icons/lib/fa/group.d.ts
deleted file mode 100644
index 9dbd8004a0..0000000000
--- a/types/react-icons/lib/fa/group.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaGroup extends React.Component<IconBaseProps> { }
-export = FaGroup;
diff --git a/types/react-icons/lib/fa/h-square.d.ts b/types/react-icons/lib/fa/h-square.d.ts
deleted file mode 100644
index 1f83d2fe5c..0000000000
--- a/types/react-icons/lib/fa/h-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHSquare extends React.Component<IconBaseProps> { }
-export = FaHSquare;
diff --git a/types/react-icons/lib/fa/hacker-news.d.ts b/types/react-icons/lib/fa/hacker-news.d.ts
deleted file mode 100644
index fe36aed2e0..0000000000
--- a/types/react-icons/lib/fa/hacker-news.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHackerNews extends React.Component<IconBaseProps> { }
-export = FaHackerNews;
diff --git a/types/react-icons/lib/fa/hand-grab-o.d.ts b/types/react-icons/lib/fa/hand-grab-o.d.ts
deleted file mode 100644
index d814d66263..0000000000
--- a/types/react-icons/lib/fa/hand-grab-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHandGrabO extends React.Component<IconBaseProps> { }
-export = FaHandGrabO;
diff --git a/types/react-icons/lib/fa/hand-lizard-o.d.ts b/types/react-icons/lib/fa/hand-lizard-o.d.ts
deleted file mode 100644
index 7e239112be..0000000000
--- a/types/react-icons/lib/fa/hand-lizard-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHandLizardO extends React.Component<IconBaseProps> { }
-export = FaHandLizardO;
diff --git a/types/react-icons/lib/fa/hand-o-down.d.ts b/types/react-icons/lib/fa/hand-o-down.d.ts
deleted file mode 100644
index 1f2308b32e..0000000000
--- a/types/react-icons/lib/fa/hand-o-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHandODown extends React.Component<IconBaseProps> { }
-export = FaHandODown;
diff --git a/types/react-icons/lib/fa/hand-o-left.d.ts b/types/react-icons/lib/fa/hand-o-left.d.ts
deleted file mode 100644
index 6f6dd87b13..0000000000
--- a/types/react-icons/lib/fa/hand-o-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHandOLeft extends React.Component<IconBaseProps> { }
-export = FaHandOLeft;
diff --git a/types/react-icons/lib/fa/hand-o-right.d.ts b/types/react-icons/lib/fa/hand-o-right.d.ts
deleted file mode 100644
index 968a22b1db..0000000000
--- a/types/react-icons/lib/fa/hand-o-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHandORight extends React.Component<IconBaseProps> { }
-export = FaHandORight;
diff --git a/types/react-icons/lib/fa/hand-o-up.d.ts b/types/react-icons/lib/fa/hand-o-up.d.ts
deleted file mode 100644
index 38b891f8bc..0000000000
--- a/types/react-icons/lib/fa/hand-o-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHandOUp extends React.Component<IconBaseProps> { }
-export = FaHandOUp;
diff --git a/types/react-icons/lib/fa/hand-paper-o.d.ts b/types/react-icons/lib/fa/hand-paper-o.d.ts
deleted file mode 100644
index 93dc962baf..0000000000
--- a/types/react-icons/lib/fa/hand-paper-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHandPaperO extends React.Component<IconBaseProps> { }
-export = FaHandPaperO;
diff --git a/types/react-icons/lib/fa/hand-peace-o.d.ts b/types/react-icons/lib/fa/hand-peace-o.d.ts
deleted file mode 100644
index 10e5aff762..0000000000
--- a/types/react-icons/lib/fa/hand-peace-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHandPeaceO extends React.Component<IconBaseProps> { }
-export = FaHandPeaceO;
diff --git a/types/react-icons/lib/fa/hand-pointer-o.d.ts b/types/react-icons/lib/fa/hand-pointer-o.d.ts
deleted file mode 100644
index 5ab960e769..0000000000
--- a/types/react-icons/lib/fa/hand-pointer-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHandPointerO extends React.Component<IconBaseProps> { }
-export = FaHandPointerO;
diff --git a/types/react-icons/lib/fa/hand-scissors-o.d.ts b/types/react-icons/lib/fa/hand-scissors-o.d.ts
deleted file mode 100644
index 18e8fda827..0000000000
--- a/types/react-icons/lib/fa/hand-scissors-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHandScissorsO extends React.Component<IconBaseProps> { }
-export = FaHandScissorsO;
diff --git a/types/react-icons/lib/fa/hand-spock-o.d.ts b/types/react-icons/lib/fa/hand-spock-o.d.ts
deleted file mode 100644
index 7c52267033..0000000000
--- a/types/react-icons/lib/fa/hand-spock-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHandSpockO extends React.Component<IconBaseProps> { }
-export = FaHandSpockO;
diff --git a/types/react-icons/lib/fa/hashtag.d.ts b/types/react-icons/lib/fa/hashtag.d.ts
deleted file mode 100644
index f992235c21..0000000000
--- a/types/react-icons/lib/fa/hashtag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHashtag extends React.Component<IconBaseProps> { }
-export = FaHashtag;
diff --git a/types/react-icons/lib/fa/hdd-o.d.ts b/types/react-icons/lib/fa/hdd-o.d.ts
deleted file mode 100644
index e936e29487..0000000000
--- a/types/react-icons/lib/fa/hdd-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHddO extends React.Component<IconBaseProps> { }
-export = FaHddO;
diff --git a/types/react-icons/lib/fa/header.d.ts b/types/react-icons/lib/fa/header.d.ts
deleted file mode 100644
index 386ceda142..0000000000
--- a/types/react-icons/lib/fa/header.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHeader extends React.Component<IconBaseProps> { }
-export = FaHeader;
diff --git a/types/react-icons/lib/fa/headphones.d.ts b/types/react-icons/lib/fa/headphones.d.ts
deleted file mode 100644
index b829255129..0000000000
--- a/types/react-icons/lib/fa/headphones.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHeadphones extends React.Component<IconBaseProps> { }
-export = FaHeadphones;
diff --git a/types/react-icons/lib/fa/heart-o.d.ts b/types/react-icons/lib/fa/heart-o.d.ts
deleted file mode 100644
index eba3e6b5cc..0000000000
--- a/types/react-icons/lib/fa/heart-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHeartO extends React.Component<IconBaseProps> { }
-export = FaHeartO;
diff --git a/types/react-icons/lib/fa/heart.d.ts b/types/react-icons/lib/fa/heart.d.ts
deleted file mode 100644
index 57d8acf1b2..0000000000
--- a/types/react-icons/lib/fa/heart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHeart extends React.Component<IconBaseProps> { }
-export = FaHeart;
diff --git a/types/react-icons/lib/fa/heartbeat.d.ts b/types/react-icons/lib/fa/heartbeat.d.ts
deleted file mode 100644
index 706f8826c9..0000000000
--- a/types/react-icons/lib/fa/heartbeat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHeartbeat extends React.Component<IconBaseProps> { }
-export = FaHeartbeat;
diff --git a/types/react-icons/lib/fa/history.d.ts b/types/react-icons/lib/fa/history.d.ts
deleted file mode 100644
index 55885501cf..0000000000
--- a/types/react-icons/lib/fa/history.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHistory extends React.Component<IconBaseProps> { }
-export = FaHistory;
diff --git a/types/react-icons/lib/fa/home.d.ts b/types/react-icons/lib/fa/home.d.ts
deleted file mode 100644
index 43b95643c9..0000000000
--- a/types/react-icons/lib/fa/home.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHome extends React.Component<IconBaseProps> { }
-export = FaHome;
diff --git a/types/react-icons/lib/fa/hospital-o.d.ts b/types/react-icons/lib/fa/hospital-o.d.ts
deleted file mode 100644
index 8b73adbf4a..0000000000
--- a/types/react-icons/lib/fa/hospital-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHospitalO extends React.Component<IconBaseProps> { }
-export = FaHospitalO;
diff --git a/types/react-icons/lib/fa/hourglass-1.d.ts b/types/react-icons/lib/fa/hourglass-1.d.ts
deleted file mode 100644
index df93b9799e..0000000000
--- a/types/react-icons/lib/fa/hourglass-1.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHourglass1 extends React.Component<IconBaseProps> { }
-export = FaHourglass1;
diff --git a/types/react-icons/lib/fa/hourglass-2.d.ts b/types/react-icons/lib/fa/hourglass-2.d.ts
deleted file mode 100644
index 674576be63..0000000000
--- a/types/react-icons/lib/fa/hourglass-2.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHourglass2 extends React.Component<IconBaseProps> { }
-export = FaHourglass2;
diff --git a/types/react-icons/lib/fa/hourglass-3.d.ts b/types/react-icons/lib/fa/hourglass-3.d.ts
deleted file mode 100644
index eb3fa708bc..0000000000
--- a/types/react-icons/lib/fa/hourglass-3.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHourglass3 extends React.Component<IconBaseProps> { }
-export = FaHourglass3;
diff --git a/types/react-icons/lib/fa/hourglass-o.d.ts b/types/react-icons/lib/fa/hourglass-o.d.ts
deleted file mode 100644
index 4052d297c9..0000000000
--- a/types/react-icons/lib/fa/hourglass-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHourglassO extends React.Component<IconBaseProps> { }
-export = FaHourglassO;
diff --git a/types/react-icons/lib/fa/hourglass.d.ts b/types/react-icons/lib/fa/hourglass.d.ts
deleted file mode 100644
index 2e05acd88c..0000000000
--- a/types/react-icons/lib/fa/hourglass.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHourglass extends React.Component<IconBaseProps> { }
-export = FaHourglass;
diff --git a/types/react-icons/lib/fa/houzz.d.ts b/types/react-icons/lib/fa/houzz.d.ts
deleted file mode 100644
index 68e7283cc2..0000000000
--- a/types/react-icons/lib/fa/houzz.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHouzz extends React.Component<IconBaseProps> { }
-export = FaHouzz;
diff --git a/types/react-icons/lib/fa/html5.d.ts b/types/react-icons/lib/fa/html5.d.ts
deleted file mode 100644
index 4829905b68..0000000000
--- a/types/react-icons/lib/fa/html5.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaHtml5 extends React.Component<IconBaseProps> { }
-export = FaHtml5;
diff --git a/types/react-icons/lib/fa/i-cursor.d.ts b/types/react-icons/lib/fa/i-cursor.d.ts
deleted file mode 100644
index fcbe8c366d..0000000000
--- a/types/react-icons/lib/fa/i-cursor.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaICursor extends React.Component<IconBaseProps> { }
-export = FaICursor;
diff --git a/types/react-icons/lib/fa/ils.d.ts b/types/react-icons/lib/fa/ils.d.ts
deleted file mode 100644
index 046d06284a..0000000000
--- a/types/react-icons/lib/fa/ils.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaIls extends React.Component<IconBaseProps> { }
-export = FaIls;
diff --git a/types/react-icons/lib/fa/image.d.ts b/types/react-icons/lib/fa/image.d.ts
deleted file mode 100644
index 72edc4be49..0000000000
--- a/types/react-icons/lib/fa/image.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaImage extends React.Component<IconBaseProps> { }
-export = FaImage;
diff --git a/types/react-icons/lib/fa/inbox.d.ts b/types/react-icons/lib/fa/inbox.d.ts
deleted file mode 100644
index 272e6a209c..0000000000
--- a/types/react-icons/lib/fa/inbox.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaInbox extends React.Component<IconBaseProps> { }
-export = FaInbox;
diff --git a/types/react-icons/lib/fa/indent.d.ts b/types/react-icons/lib/fa/indent.d.ts
deleted file mode 100644
index 2829ca18c3..0000000000
--- a/types/react-icons/lib/fa/indent.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaIndent extends React.Component<IconBaseProps> { }
-export = FaIndent;
diff --git a/types/react-icons/lib/fa/index.d.ts b/types/react-icons/lib/fa/index.d.ts
deleted file mode 100644
index 073a1797a9..0000000000
--- a/types/react-icons/lib/fa/index.d.ts
+++ /dev/null
@@ -1,628 +0,0 @@
-export { default as Fa500px } from "../../fa/500px";
-export { default as FaAdjust } from "../../fa/adjust";
-export { default as FaAdn } from "../../fa/adn";
-export { default as FaAlignCenter } from "../../fa/align-center";
-export { default as FaAlignJustify } from "../../fa/align-justify";
-export { default as FaAlignLeft } from "../../fa/align-left";
-export { default as FaAlignRight } from "../../fa/align-right";
-export { default as FaAmazon } from "../../fa/amazon";
-export { default as FaAmbulance } from "../../fa/ambulance";
-export { default as FaAmericanSignLanguageInterpreting } from "../../fa/american-sign-language-interpreting";
-export { default as FaAnchor } from "../../fa/anchor";
-export { default as FaAndroid } from "../../fa/android";
-export { default as FaAngellist } from "../../fa/angellist";
-export { default as FaAngleDoubleDown } from "../../fa/angle-double-down";
-export { default as FaAngleDoubleLeft } from "../../fa/angle-double-left";
-export { default as FaAngleDoubleRight } from "../../fa/angle-double-right";
-export { default as FaAngleDoubleUp } from "../../fa/angle-double-up";
-export { default as FaAngleDown } from "../../fa/angle-down";
-export { default as FaAngleLeft } from "../../fa/angle-left";
-export { default as FaAngleRight } from "../../fa/angle-right";
-export { default as FaAngleUp } from "../../fa/angle-up";
-export { default as FaApple } from "../../fa/apple";
-export { default as FaArchive } from "../../fa/archive";
-export { default as FaAreaChart } from "../../fa/area-chart";
-export { default as FaArrowCircleDown } from "../../fa/arrow-circle-down";
-export { default as FaArrowCircleLeft } from "../../fa/arrow-circle-left";
-export { default as FaArrowCircleODown } from "../../fa/arrow-circle-o-down";
-export { default as FaArrowCircleOLeft } from "../../fa/arrow-circle-o-left";
-export { default as FaArrowCircleORight } from "../../fa/arrow-circle-o-right";
-export { default as FaArrowCircleOUp } from "../../fa/arrow-circle-o-up";
-export { default as FaArrowCircleRight } from "../../fa/arrow-circle-right";
-export { default as FaArrowCircleUp } from "../../fa/arrow-circle-up";
-export { default as FaArrowDown } from "../../fa/arrow-down";
-export { default as FaArrowLeft } from "../../fa/arrow-left";
-export { default as FaArrowRight } from "../../fa/arrow-right";
-export { default as FaArrowUp } from "../../fa/arrow-up";
-export { default as FaArrowsAlt } from "../../fa/arrows-alt";
-export { default as FaArrowsH } from "../../fa/arrows-h";
-export { default as FaArrowsV } from "../../fa/arrows-v";
-export { default as FaArrows } from "../../fa/arrows";
-export { default as FaAssistiveListeningSystems } from "../../fa/assistive-listening-systems";
-export { default as FaAsterisk } from "../../fa/asterisk";
-export { default as FaAt } from "../../fa/at";
-export { default as FaAudioDescription } from "../../fa/audio-description";
-export { default as FaAutomobile } from "../../fa/automobile";
-export { default as FaBackward } from "../../fa/backward";
-export { default as FaBalanceScale } from "../../fa/balance-scale";
-export { default as FaBan } from "../../fa/ban";
-export { default as FaBank } from "../../fa/bank";
-export { default as FaBarChart } from "../../fa/bar-chart";
-export { default as FaBarcode } from "../../fa/barcode";
-export { default as FaBars } from "../../fa/bars";
-export { default as FaBattery0 } from "../../fa/battery-0";
-export { default as FaBattery1 } from "../../fa/battery-1";
-export { default as FaBattery2 } from "../../fa/battery-2";
-export { default as FaBattery3 } from "../../fa/battery-3";
-export { default as FaBattery4 } from "../../fa/battery-4";
-export { default as FaBed } from "../../fa/bed";
-export { default as FaBeer } from "../../fa/beer";
-export { default as FaBehanceSquare } from "../../fa/behance-square";
-export { default as FaBehance } from "../../fa/behance";
-export { default as FaBellO } from "../../fa/bell-o";
-export { default as FaBellSlashO } from "../../fa/bell-slash-o";
-export { default as FaBellSlash } from "../../fa/bell-slash";
-export { default as FaBell } from "../../fa/bell";
-export { default as FaBicycle } from "../../fa/bicycle";
-export { default as FaBinoculars } from "../../fa/binoculars";
-export { default as FaBirthdayCake } from "../../fa/birthday-cake";
-export { default as FaBitbucketSquare } from "../../fa/bitbucket-square";
-export { default as FaBitbucket } from "../../fa/bitbucket";
-export { default as FaBitcoin } from "../../fa/bitcoin";
-export { default as FaBlackTie } from "../../fa/black-tie";
-export { default as FaBlind } from "../../fa/blind";
-export { default as FaBluetoothB } from "../../fa/bluetooth-b";
-export { default as FaBluetooth } from "../../fa/bluetooth";
-export { default as FaBold } from "../../fa/bold";
-export { default as FaBolt } from "../../fa/bolt";
-export { default as FaBomb } from "../../fa/bomb";
-export { default as FaBook } from "../../fa/book";
-export { default as FaBookmarkO } from "../../fa/bookmark-o";
-export { default as FaBookmark } from "../../fa/bookmark";
-export { default as FaBraille } from "../../fa/braille";
-export { default as FaBriefcase } from "../../fa/briefcase";
-export { default as FaBug } from "../../fa/bug";
-export { default as FaBuildingO } from "../../fa/building-o";
-export { default as FaBuilding } from "../../fa/building";
-export { default as FaBullhorn } from "../../fa/bullhorn";
-export { default as FaBullseye } from "../../fa/bullseye";
-export { default as FaBus } from "../../fa/bus";
-export { default as FaBuysellads } from "../../fa/buysellads";
-export { default as FaCab } from "../../fa/cab";
-export { default as FaCalculator } from "../../fa/calculator";
-export { default as FaCalendarCheckO } from "../../fa/calendar-check-o";
-export { default as FaCalendarMinusO } from "../../fa/calendar-minus-o";
-export { default as FaCalendarO } from "../../fa/calendar-o";
-export { default as FaCalendarPlusO } from "../../fa/calendar-plus-o";
-export { default as FaCalendarTimesO } from "../../fa/calendar-times-o";
-export { default as FaCalendar } from "../../fa/calendar";
-export { default as FaCameraRetro } from "../../fa/camera-retro";
-export { default as FaCamera } from "../../fa/camera";
-export { default as FaCaretDown } from "../../fa/caret-down";
-export { default as FaCaretLeft } from "../../fa/caret-left";
-export { default as FaCaretRight } from "../../fa/caret-right";
-export { default as FaCaretSquareODown } from "../../fa/caret-square-o-down";
-export { default as FaCaretSquareOLeft } from "../../fa/caret-square-o-left";
-export { default as FaCaretSquareORight } from "../../fa/caret-square-o-right";
-export { default as FaCaretSquareOUp } from "../../fa/caret-square-o-up";
-export { default as FaCaretUp } from "../../fa/caret-up";
-export { default as FaCartArrowDown } from "../../fa/cart-arrow-down";
-export { default as FaCartPlus } from "../../fa/cart-plus";
-export { default as FaCcAmex } from "../../fa/cc-amex";
-export { default as FaCcDinersClub } from "../../fa/cc-diners-club";
-export { default as FaCcDiscover } from "../../fa/cc-discover";
-export { default as FaCcJcb } from "../../fa/cc-jcb";
-export { default as FaCcMastercard } from "../../fa/cc-mastercard";
-export { default as FaCcPaypal } from "../../fa/cc-paypal";
-export { default as FaCcStripe } from "../../fa/cc-stripe";
-export { default as FaCcVisa } from "../../fa/cc-visa";
-export { default as FaCc } from "../../fa/cc";
-export { default as FaCertificate } from "../../fa/certificate";
-export { default as FaChainBroken } from "../../fa/chain-broken";
-export { default as FaChain } from "../../fa/chain";
-export { default as FaCheckCircleO } from "../../fa/check-circle-o";
-export { default as FaCheckCircle } from "../../fa/check-circle";
-export { default as FaCheckSquareO } from "../../fa/check-square-o";
-export { default as FaCheckSquare } from "../../fa/check-square";
-export { default as FaCheck } from "../../fa/check";
-export { default as FaChevronCircleDown } from "../../fa/chevron-circle-down";
-export { default as FaChevronCircleLeft } from "../../fa/chevron-circle-left";
-export { default as FaChevronCircleRight } from "../../fa/chevron-circle-right";
-export { default as FaChevronCircleUp } from "../../fa/chevron-circle-up";
-export { default as FaChevronDown } from "../../fa/chevron-down";
-export { default as FaChevronLeft } from "../../fa/chevron-left";
-export { default as FaChevronRight } from "../../fa/chevron-right";
-export { default as FaChevronUp } from "../../fa/chevron-up";
-export { default as FaChild } from "../../fa/child";
-export { default as FaChrome } from "../../fa/chrome";
-export { default as FaCircleONotch } from "../../fa/circle-o-notch";
-export { default as FaCircleO } from "../../fa/circle-o";
-export { default as FaCircleThin } from "../../fa/circle-thin";
-export { default as FaCircle } from "../../fa/circle";
-export { default as FaClipboard } from "../../fa/clipboard";
-export { default as FaClockO } from "../../fa/clock-o";
-export { default as FaClone } from "../../fa/clone";
-export { default as FaClose } from "../../fa/close";
-export { default as FaCloudDownload } from "../../fa/cloud-download";
-export { default as FaCloudUpload } from "../../fa/cloud-upload";
-export { default as FaCloud } from "../../fa/cloud";
-export { default as FaCny } from "../../fa/cny";
-export { default as FaCodeFork } from "../../fa/code-fork";
-export { default as FaCode } from "../../fa/code";
-export { default as FaCodepen } from "../../fa/codepen";
-export { default as FaCodiepie } from "../../fa/codiepie";
-export { default as FaCoffee } from "../../fa/coffee";
-export { default as FaCog } from "../../fa/cog";
-export { default as FaCogs } from "../../fa/cogs";
-export { default as FaColumns } from "../../fa/columns";
-export { default as FaCommentO } from "../../fa/comment-o";
-export { default as FaComment } from "../../fa/comment";
-export { default as FaCommentingO } from "../../fa/commenting-o";
-export { default as FaCommenting } from "../../fa/commenting";
-export { default as FaCommentsO } from "../../fa/comments-o";
-export { default as FaComments } from "../../fa/comments";
-export { default as FaCompass } from "../../fa/compass";
-export { default as FaCompress } from "../../fa/compress";
-export { default as FaConnectdevelop } from "../../fa/connectdevelop";
-export { default as FaContao } from "../../fa/contao";
-export { default as FaCopy } from "../../fa/copy";
-export { default as FaCopyright } from "../../fa/copyright";
-export { default as FaCreativeCommons } from "../../fa/creative-commons";
-export { default as FaCreditCardAlt } from "../../fa/credit-card-alt";
-export { default as FaCreditCard } from "../../fa/credit-card";
-export { default as FaCrop } from "../../fa/crop";
-export { default as FaCrosshairs } from "../../fa/crosshairs";
-export { default as FaCss3 } from "../../fa/css3";
-export { default as FaCube } from "../../fa/cube";
-export { default as FaCubes } from "../../fa/cubes";
-export { default as FaCut } from "../../fa/cut";
-export { default as FaCutlery } from "../../fa/cutlery";
-export { default as FaDashboard } from "../../fa/dashboard";
-export { default as FaDashcube } from "../../fa/dashcube";
-export { default as FaDatabase } from "../../fa/database";
-export { default as FaDeaf } from "../../fa/deaf";
-export { default as FaDedent } from "../../fa/dedent";
-export { default as FaDelicious } from "../../fa/delicious";
-export { default as FaDesktop } from "../../fa/desktop";
-export { default as FaDeviantart } from "../../fa/deviantart";
-export { default as FaDiamond } from "../../fa/diamond";
-export { default as FaDigg } from "../../fa/digg";
-export { default as FaDollar } from "../../fa/dollar";
-export { default as FaDotCircleO } from "../../fa/dot-circle-o";
-export { default as FaDownload } from "../../fa/download";
-export { default as FaDribbble } from "../../fa/dribbble";
-export { default as FaDropbox } from "../../fa/dropbox";
-export { default as FaDrupal } from "../../fa/drupal";
-export { default as FaEdge } from "../../fa/edge";
-export { default as FaEdit } from "../../fa/edit";
-export { default as FaEject } from "../../fa/eject";
-export { default as FaEllipsisH } from "../../fa/ellipsis-h";
-export { default as FaEllipsisV } from "../../fa/ellipsis-v";
-export { default as FaEmpire } from "../../fa/empire";
-export { default as FaEnvelopeO } from "../../fa/envelope-o";
-export { default as FaEnvelopeSquare } from "../../fa/envelope-square";
-export { default as FaEnvelope } from "../../fa/envelope";
-export { default as FaEnvira } from "../../fa/envira";
-export { default as FaEraser } from "../../fa/eraser";
-export { default as FaEur } from "../../fa/eur";
-export { default as FaExchange } from "../../fa/exchange";
-export { default as FaExclamationCircle } from "../../fa/exclamation-circle";
-export { default as FaExclamationTriangle } from "../../fa/exclamation-triangle";
-export { default as FaExclamation } from "../../fa/exclamation";
-export { default as FaExpand } from "../../fa/expand";
-export { default as FaExpeditedssl } from "../../fa/expeditedssl";
-export { default as FaExternalLinkSquare } from "../../fa/external-link-square";
-export { default as FaExternalLink } from "../../fa/external-link";
-export { default as FaEyeSlash } from "../../fa/eye-slash";
-export { default as FaEye } from "../../fa/eye";
-export { default as FaEyedropper } from "../../fa/eyedropper";
-export { default as FaFacebookOfficial } from "../../fa/facebook-official";
-export { default as FaFacebookSquare } from "../../fa/facebook-square";
-export { default as FaFacebook } from "../../fa/facebook";
-export { default as FaFastBackward } from "../../fa/fast-backward";
-export { default as FaFastForward } from "../../fa/fast-forward";
-export { default as FaFax } from "../../fa/fax";
-export { default as FaFeed } from "../../fa/feed";
-export { default as FaFemale } from "../../fa/female";
-export { default as FaFighterJet } from "../../fa/fighter-jet";
-export { default as FaFileArchiveO } from "../../fa/file-archive-o";
-export { default as FaFileAudioO } from "../../fa/file-audio-o";
-export { default as FaFileCodeO } from "../../fa/file-code-o";
-export { default as FaFileExcelO } from "../../fa/file-excel-o";
-export { default as FaFileImageO } from "../../fa/file-image-o";
-export { default as FaFileMovieO } from "../../fa/file-movie-o";
-export { default as FaFileO } from "../../fa/file-o";
-export { default as FaFilePdfO } from "../../fa/file-pdf-o";
-export { default as FaFilePowerpointO } from "../../fa/file-powerpoint-o";
-export { default as FaFileTextO } from "../../fa/file-text-o";
-export { default as FaFileText } from "../../fa/file-text";
-export { default as FaFileWordO } from "../../fa/file-word-o";
-export { default as FaFile } from "../../fa/file";
-export { default as FaFilm } from "../../fa/film";
-export { default as FaFilter } from "../../fa/filter";
-export { default as FaFireExtinguisher } from "../../fa/fire-extinguisher";
-export { default as FaFire } from "../../fa/fire";
-export { default as FaFirefox } from "../../fa/firefox";
-export { default as FaFlagCheckered } from "../../fa/flag-checkered";
-export { default as FaFlagO } from "../../fa/flag-o";
-export { default as FaFlag } from "../../fa/flag";
-export { default as FaFlask } from "../../fa/flask";
-export { default as FaFlickr } from "../../fa/flickr";
-export { default as FaFloppyO } from "../../fa/floppy-o";
-export { default as FaFolderO } from "../../fa/folder-o";
-export { default as FaFolderOpenO } from "../../fa/folder-open-o";
-export { default as FaFolderOpen } from "../../fa/folder-open";
-export { default as FaFolder } from "../../fa/folder";
-export { default as FaFont } from "../../fa/font";
-export { default as FaFonticons } from "../../fa/fonticons";
-export { default as FaFortAwesome } from "../../fa/fort-awesome";
-export { default as FaForumbee } from "../../fa/forumbee";
-export { default as FaForward } from "../../fa/forward";
-export { default as FaFoursquare } from "../../fa/foursquare";
-export { default as FaFrownO } from "../../fa/frown-o";
-export { default as FaFutbolO } from "../../fa/futbol-o";
-export { default as FaGamepad } from "../../fa/gamepad";
-export { default as FaGavel } from "../../fa/gavel";
-export { default as FaGbp } from "../../fa/gbp";
-export { default as FaGenderless } from "../../fa/genderless";
-export { default as FaGetPocket } from "../../fa/get-pocket";
-export { default as FaGgCircle } from "../../fa/gg-circle";
-export { default as FaGg } from "../../fa/gg";
-export { default as FaGift } from "../../fa/gift";
-export { default as FaGitSquare } from "../../fa/git-square";
-export { default as FaGit } from "../../fa/git";
-export { default as FaGithubAlt } from "../../fa/github-alt";
-export { default as FaGithubSquare } from "../../fa/github-square";
-export { default as FaGithub } from "../../fa/github";
-export { default as FaGitlab } from "../../fa/gitlab";
-export { default as FaGittip } from "../../fa/gittip";
-export { default as FaGlass } from "../../fa/glass";
-export { default as FaGlideG } from "../../fa/glide-g";
-export { default as FaGlide } from "../../fa/glide";
-export { default as FaGlobe } from "../../fa/globe";
-export { default as FaGooglePlusSquare } from "../../fa/google-plus-square";
-export { default as FaGooglePlus } from "../../fa/google-plus";
-export { default as FaGoogleWallet } from "../../fa/google-wallet";
-export { default as FaGoogle } from "../../fa/google";
-export { default as FaGraduationCap } from "../../fa/graduation-cap";
-export { default as FaGroup } from "../../fa/group";
-export { default as FaHSquare } from "../../fa/h-square";
-export { default as FaHackerNews } from "../../fa/hacker-news";
-export { default as FaHandGrabO } from "../../fa/hand-grab-o";
-export { default as FaHandLizardO } from "../../fa/hand-lizard-o";
-export { default as FaHandODown } from "../../fa/hand-o-down";
-export { default as FaHandOLeft } from "../../fa/hand-o-left";
-export { default as FaHandORight } from "../../fa/hand-o-right";
-export { default as FaHandOUp } from "../../fa/hand-o-up";
-export { default as FaHandPaperO } from "../../fa/hand-paper-o";
-export { default as FaHandPeaceO } from "../../fa/hand-peace-o";
-export { default as FaHandPointerO } from "../../fa/hand-pointer-o";
-export { default as FaHandScissorsO } from "../../fa/hand-scissors-o";
-export { default as FaHandSpockO } from "../../fa/hand-spock-o";
-export { default as FaHashtag } from "../../fa/hashtag";
-export { default as FaHddO } from "../../fa/hdd-o";
-export { default as FaHeader } from "../../fa/header";
-export { default as FaHeadphones } from "../../fa/headphones";
-export { default as FaHeartO } from "../../fa/heart-o";
-export { default as FaHeart } from "../../fa/heart";
-export { default as FaHeartbeat } from "../../fa/heartbeat";
-export { default as FaHistory } from "../../fa/history";
-export { default as FaHome } from "../../fa/home";
-export { default as FaHospitalO } from "../../fa/hospital-o";
-export { default as FaHourglass1 } from "../../fa/hourglass-1";
-export { default as FaHourglass2 } from "../../fa/hourglass-2";
-export { default as FaHourglass3 } from "../../fa/hourglass-3";
-export { default as FaHourglassO } from "../../fa/hourglass-o";
-export { default as FaHourglass } from "../../fa/hourglass";
-export { default as FaHouzz } from "../../fa/houzz";
-export { default as FaHtml5 } from "../../fa/html5";
-export { default as FaICursor } from "../../fa/i-cursor";
-export { default as FaIls } from "../../fa/ils";
-export { default as FaImage } from "../../fa/image";
-export { default as FaInbox } from "../../fa/inbox";
-export { default as FaIndent } from "../../fa/indent";
-export { default as FaIndustry } from "../../fa/industry";
-export { default as FaInfoCircle } from "../../fa/info-circle";
-export { default as FaInfo } from "../../fa/info";
-export { default as FaInr } from "../../fa/inr";
-export { default as FaInstagram } from "../../fa/instagram";
-export { default as FaInternetExplorer } from "../../fa/internet-explorer";
-export { default as FaIntersex } from "../../fa/intersex";
-export { default as FaIoxhost } from "../../fa/ioxhost";
-export { default as FaItalic } from "../../fa/italic";
-export { default as FaJoomla } from "../../fa/joomla";
-export { default as FaJsfiddle } from "../../fa/jsfiddle";
-export { default as FaKey } from "../../fa/key";
-export { default as FaKeyboardO } from "../../fa/keyboard-o";
-export { default as FaKrw } from "../../fa/krw";
-export { default as FaLanguage } from "../../fa/language";
-export { default as FaLaptop } from "../../fa/laptop";
-export { default as FaLastfmSquare } from "../../fa/lastfm-square";
-export { default as FaLastfm } from "../../fa/lastfm";
-export { default as FaLeaf } from "../../fa/leaf";
-export { default as FaLeanpub } from "../../fa/leanpub";
-export { default as FaLemonO } from "../../fa/lemon-o";
-export { default as FaLevelDown } from "../../fa/level-down";
-export { default as FaLevelUp } from "../../fa/level-up";
-export { default as FaLifeBouy } from "../../fa/life-bouy";
-export { default as FaLightbulbO } from "../../fa/lightbulb-o";
-export { default as FaLineChart } from "../../fa/line-chart";
-export { default as FaLinkedinSquare } from "../../fa/linkedin-square";
-export { default as FaLinkedin } from "../../fa/linkedin";
-export { default as FaLinux } from "../../fa/linux";
-export { default as FaListAlt } from "../../fa/list-alt";
-export { default as FaListOl } from "../../fa/list-ol";
-export { default as FaListUl } from "../../fa/list-ul";
-export { default as FaList } from "../../fa/list";
-export { default as FaLocationArrow } from "../../fa/location-arrow";
-export { default as FaLock } from "../../fa/lock";
-export { default as FaLongArrowDown } from "../../fa/long-arrow-down";
-export { default as FaLongArrowLeft } from "../../fa/long-arrow-left";
-export { default as FaLongArrowRight } from "../../fa/long-arrow-right";
-export { default as FaLongArrowUp } from "../../fa/long-arrow-up";
-export { default as FaLowVision } from "../../fa/low-vision";
-export { default as FaMagic } from "../../fa/magic";
-export { default as FaMagnet } from "../../fa/magnet";
-export { default as FaMailForward } from "../../fa/mail-forward";
-export { default as FaMailReplyAll } from "../../fa/mail-reply-all";
-export { default as FaMailReply } from "../../fa/mail-reply";
-export { default as FaMale } from "../../fa/male";
-export { default as FaMapMarker } from "../../fa/map-marker";
-export { default as FaMapO } from "../../fa/map-o";
-export { default as FaMapPin } from "../../fa/map-pin";
-export { default as FaMapSigns } from "../../fa/map-signs";
-export { default as FaMap } from "../../fa/map";
-export { default as FaMarsDouble } from "../../fa/mars-double";
-export { default as FaMarsStrokeH } from "../../fa/mars-stroke-h";
-export { default as FaMarsStrokeV } from "../../fa/mars-stroke-v";
-export { default as FaMarsStroke } from "../../fa/mars-stroke";
-export { default as FaMars } from "../../fa/mars";
-export { default as FaMaxcdn } from "../../fa/maxcdn";
-export { default as FaMeanpath } from "../../fa/meanpath";
-export { default as FaMedium } from "../../fa/medium";
-export { default as FaMedkit } from "../../fa/medkit";
-export { default as FaMehO } from "../../fa/meh-o";
-export { default as FaMercury } from "../../fa/mercury";
-export { default as FaMicrophoneSlash } from "../../fa/microphone-slash";
-export { default as FaMicrophone } from "../../fa/microphone";
-export { default as FaMinusCircle } from "../../fa/minus-circle";
-export { default as FaMinusSquareO } from "../../fa/minus-square-o";
-export { default as FaMinusSquare } from "../../fa/minus-square";
-export { default as FaMinus } from "../../fa/minus";
-export { default as FaMixcloud } from "../../fa/mixcloud";
-export { default as FaMobile } from "../../fa/mobile";
-export { default as FaModx } from "../../fa/modx";
-export { default as FaMoney } from "../../fa/money";
-export { default as FaMoonO } from "../../fa/moon-o";
-export { default as FaMotorcycle } from "../../fa/motorcycle";
-export { default as FaMousePointer } from "../../fa/mouse-pointer";
-export { default as FaMusic } from "../../fa/music";
-export { default as FaNeuter } from "../../fa/neuter";
-export { default as FaNewspaperO } from "../../fa/newspaper-o";
-export { default as FaObjectGroup } from "../../fa/object-group";
-export { default as FaObjectUngroup } from "../../fa/object-ungroup";
-export { default as FaOdnoklassnikiSquare } from "../../fa/odnoklassniki-square";
-export { default as FaOdnoklassniki } from "../../fa/odnoklassniki";
-export { default as FaOpencart } from "../../fa/opencart";
-export { default as FaOpenid } from "../../fa/openid";
-export { default as FaOpera } from "../../fa/opera";
-export { default as FaOptinMonster } from "../../fa/optin-monster";
-export { default as FaPagelines } from "../../fa/pagelines";
-export { default as FaPaintBrush } from "../../fa/paint-brush";
-export { default as FaPaperPlaneO } from "../../fa/paper-plane-o";
-export { default as FaPaperPlane } from "../../fa/paper-plane";
-export { default as FaPaperclip } from "../../fa/paperclip";
-export { default as FaParagraph } from "../../fa/paragraph";
-export { default as FaPauseCircleO } from "../../fa/pause-circle-o";
-export { default as FaPauseCircle } from "../../fa/pause-circle";
-export { default as FaPause } from "../../fa/pause";
-export { default as FaPaw } from "../../fa/paw";
-export { default as FaPaypal } from "../../fa/paypal";
-export { default as FaPencilSquare } from "../../fa/pencil-square";
-export { default as FaPencil } from "../../fa/pencil";
-export { default as FaPercent } from "../../fa/percent";
-export { default as FaPhoneSquare } from "../../fa/phone-square";
-export { default as FaPhone } from "../../fa/phone";
-export { default as FaPieChart } from "../../fa/pie-chart";
-export { default as FaPiedPiperAlt } from "../../fa/pied-piper-alt";
-export { default as FaPiedPiper } from "../../fa/pied-piper";
-export { default as FaPinterestP } from "../../fa/pinterest-p";
-export { default as FaPinterestSquare } from "../../fa/pinterest-square";
-export { default as FaPinterest } from "../../fa/pinterest";
-export { default as FaPlane } from "../../fa/plane";
-export { default as FaPlayCircleO } from "../../fa/play-circle-o";
-export { default as FaPlayCircle } from "../../fa/play-circle";
-export { default as FaPlay } from "../../fa/play";
-export { default as FaPlug } from "../../fa/plug";
-export { default as FaPlusCircle } from "../../fa/plus-circle";
-export { default as FaPlusSquareO } from "../../fa/plus-square-o";
-export { default as FaPlusSquare } from "../../fa/plus-square";
-export { default as FaPlus } from "../../fa/plus";
-export { default as FaPowerOff } from "../../fa/power-off";
-export { default as FaPrint } from "../../fa/print";
-export { default as FaProductHunt } from "../../fa/product-hunt";
-export { default as FaPuzzlePiece } from "../../fa/puzzle-piece";
-export { default as FaQq } from "../../fa/qq";
-export { default as FaQrcode } from "../../fa/qrcode";
-export { default as FaQuestionCircleO } from "../../fa/question-circle-o";
-export { default as FaQuestionCircle } from "../../fa/question-circle";
-export { default as FaQuestion } from "../../fa/question";
-export { default as FaQuoteLeft } from "../../fa/quote-left";
-export { default as FaQuoteRight } from "../../fa/quote-right";
-export { default as FaRa } from "../../fa/ra";
-export { default as FaRandom } from "../../fa/random";
-export { default as FaRecycle } from "../../fa/recycle";
-export { default as FaRedditAlien } from "../../fa/reddit-alien";
-export { default as FaRedditSquare } from "../../fa/reddit-square";
-export { default as FaReddit } from "../../fa/reddit";
-export { default as FaRefresh } from "../../fa/refresh";
-export { default as FaRegistered } from "../../fa/registered";
-export { default as FaRenren } from "../../fa/renren";
-export { default as FaRepeat } from "../../fa/repeat";
-export { default as FaRetweet } from "../../fa/retweet";
-export { default as FaRoad } from "../../fa/road";
-export { default as FaRocket } from "../../fa/rocket";
-export { default as FaRotateLeft } from "../../fa/rotate-left";
-export { default as FaRouble } from "../../fa/rouble";
-export { default as FaRssSquare } from "../../fa/rss-square";
-export { default as FaSafari } from "../../fa/safari";
-export { default as FaScribd } from "../../fa/scribd";
-export { default as FaSearchMinus } from "../../fa/search-minus";
-export { default as FaSearchPlus } from "../../fa/search-plus";
-export { default as FaSearch } from "../../fa/search";
-export { default as FaSellsy } from "../../fa/sellsy";
-export { default as FaServer } from "../../fa/server";
-export { default as FaShareAltSquare } from "../../fa/share-alt-square";
-export { default as FaShareAlt } from "../../fa/share-alt";
-export { default as FaShareSquareO } from "../../fa/share-square-o";
-export { default as FaShareSquare } from "../../fa/share-square";
-export { default as FaShield } from "../../fa/shield";
-export { default as FaShip } from "../../fa/ship";
-export { default as FaShirtsinbulk } from "../../fa/shirtsinbulk";
-export { default as FaShoppingBag } from "../../fa/shopping-bag";
-export { default as FaShoppingBasket } from "../../fa/shopping-basket";
-export { default as FaShoppingCart } from "../../fa/shopping-cart";
-export { default as FaSignIn } from "../../fa/sign-in";
-export { default as FaSignLanguage } from "../../fa/sign-language";
-export { default as FaSignOut } from "../../fa/sign-out";
-export { default as FaSignal } from "../../fa/signal";
-export { default as FaSimplybuilt } from "../../fa/simplybuilt";
-export { default as FaSitemap } from "../../fa/sitemap";
-export { default as FaSkyatlas } from "../../fa/skyatlas";
-export { default as FaSkype } from "../../fa/skype";
-export { default as FaSlack } from "../../fa/slack";
-export { default as FaSliders } from "../../fa/sliders";
-export { default as FaSlideshare } from "../../fa/slideshare";
-export { default as FaSmileO } from "../../fa/smile-o";
-export { default as FaSnapchatGhost } from "../../fa/snapchat-ghost";
-export { default as FaSnapchatSquare } from "../../fa/snapchat-square";
-export { default as FaSnapchat } from "../../fa/snapchat";
-export { default as FaSortAlphaAsc } from "../../fa/sort-alpha-asc";
-export { default as FaSortAlphaDesc } from "../../fa/sort-alpha-desc";
-export { default as FaSortAmountAsc } from "../../fa/sort-amount-asc";
-export { default as FaSortAmountDesc } from "../../fa/sort-amount-desc";
-export { default as FaSortAsc } from "../../fa/sort-asc";
-export { default as FaSortDesc } from "../../fa/sort-desc";
-export { default as FaSortNumericAsc } from "../../fa/sort-numeric-asc";
-export { default as FaSortNumericDesc } from "../../fa/sort-numeric-desc";
-export { default as FaSort } from "../../fa/sort";
-export { default as FaSoundcloud } from "../../fa/soundcloud";
-export { default as FaSpaceShuttle } from "../../fa/space-shuttle";
-export { default as FaSpinner } from "../../fa/spinner";
-export { default as FaSpoon } from "../../fa/spoon";
-export { default as FaSpotify } from "../../fa/spotify";
-export { default as FaSquareO } from "../../fa/square-o";
-export { default as FaSquare } from "../../fa/square";
-export { default as FaStackExchange } from "../../fa/stack-exchange";
-export { default as FaStackOverflow } from "../../fa/stack-overflow";
-export { default as FaStarHalfEmpty } from "../../fa/star-half-empty";
-export { default as FaStarHalf } from "../../fa/star-half";
-export { default as FaStarO } from "../../fa/star-o";
-export { default as FaStar } from "../../fa/star";
-export { default as FaSteamSquare } from "../../fa/steam-square";
-export { default as FaSteam } from "../../fa/steam";
-export { default as FaStepBackward } from "../../fa/step-backward";
-export { default as FaStepForward } from "../../fa/step-forward";
-export { default as FaStethoscope } from "../../fa/stethoscope";
-export { default as FaStickyNoteO } from "../../fa/sticky-note-o";
-export { default as FaStickyNote } from "../../fa/sticky-note";
-export { default as FaStopCircleO } from "../../fa/stop-circle-o";
-export { default as FaStopCircle } from "../../fa/stop-circle";
-export { default as FaStop } from "../../fa/stop";
-export { default as FaStreetView } from "../../fa/street-view";
-export { default as FaStrikethrough } from "../../fa/strikethrough";
-export { default as FaStumbleuponCircle } from "../../fa/stumbleupon-circle";
-export { default as FaStumbleupon } from "../../fa/stumbleupon";
-export { default as FaSubscript } from "../../fa/subscript";
-export { default as FaSubway } from "../../fa/subway";
-export { default as FaSuitcase } from "../../fa/suitcase";
-export { default as FaSunO } from "../../fa/sun-o";
-export { default as FaSuperscript } from "../../fa/superscript";
-export { default as FaTable } from "../../fa/table";
-export { default as FaTablet } from "../../fa/tablet";
-export { default as FaTag } from "../../fa/tag";
-export { default as FaTags } from "../../fa/tags";
-export { default as FaTasks } from "../../fa/tasks";
-export { default as FaTelevision } from "../../fa/television";
-export { default as FaTencentWeibo } from "../../fa/tencent-weibo";
-export { default as FaTerminal } from "../../fa/terminal";
-export { default as FaTextHeight } from "../../fa/text-height";
-export { default as FaTextWidth } from "../../fa/text-width";
-export { default as FaThLarge } from "../../fa/th-large";
-export { default as FaThList } from "../../fa/th-list";
-export { default as FaTh } from "../../fa/th";
-export { default as FaThumbTack } from "../../fa/thumb-tack";
-export { default as FaThumbsDown } from "../../fa/thumbs-down";
-export { default as FaThumbsODown } from "../../fa/thumbs-o-down";
-export { default as FaThumbsOUp } from "../../fa/thumbs-o-up";
-export { default as FaThumbsUp } from "../../fa/thumbs-up";
-export { default as FaTicket } from "../../fa/ticket";
-export { default as FaTimesCircleO } from "../../fa/times-circle-o";
-export { default as FaTimesCircle } from "../../fa/times-circle";
-export { default as FaTint } from "../../fa/tint";
-export { default as FaToggleOff } from "../../fa/toggle-off";
-export { default as FaToggleOn } from "../../fa/toggle-on";
-export { default as FaTrademark } from "../../fa/trademark";
-export { default as FaTrain } from "../../fa/train";
-export { default as FaTransgenderAlt } from "../../fa/transgender-alt";
-export { default as FaTrashO } from "../../fa/trash-o";
-export { default as FaTrash } from "../../fa/trash";
-export { default as FaTree } from "../../fa/tree";
-export { default as FaTrello } from "../../fa/trello";
-export { default as FaTripadvisor } from "../../fa/tripadvisor";
-export { default as FaTrophy } from "../../fa/trophy";
-export { default as FaTruck } from "../../fa/truck";
-export { default as FaTry } from "../../fa/try";
-export { default as FaTty } from "../../fa/tty";
-export { default as FaTumblrSquare } from "../../fa/tumblr-square";
-export { default as FaTumblr } from "../../fa/tumblr";
-export { default as FaTwitch } from "../../fa/twitch";
-export { default as FaTwitterSquare } from "../../fa/twitter-square";
-export { default as FaTwitter } from "../../fa/twitter";
-export { default as FaUmbrella } from "../../fa/umbrella";
-export { default as FaUnderline } from "../../fa/underline";
-export { default as FaUniversalAccess } from "../../fa/universal-access";
-export { default as FaUnlockAlt } from "../../fa/unlock-alt";
-export { default as FaUnlock } from "../../fa/unlock";
-export { default as FaUpload } from "../../fa/upload";
-export { default as FaUsb } from "../../fa/usb";
-export { default as FaUserMd } from "../../fa/user-md";
-export { default as FaUserPlus } from "../../fa/user-plus";
-export { default as FaUserSecret } from "../../fa/user-secret";
-export { default as FaUserTimes } from "../../fa/user-times";
-export { default as FaUser } from "../../fa/user";
-export { default as FaVenusDouble } from "../../fa/venus-double";
-export { default as FaVenusMars } from "../../fa/venus-mars";
-export { default as FaVenus } from "../../fa/venus";
-export { default as FaViacoin } from "../../fa/viacoin";
-export { default as FaViadeoSquare } from "../../fa/viadeo-square";
-export { default as FaViadeo } from "../../fa/viadeo";
-export { default as FaVideoCamera } from "../../fa/video-camera";
-export { default as FaVimeoSquare } from "../../fa/vimeo-square";
-export { default as FaVimeo } from "../../fa/vimeo";
-export { default as FaVine } from "../../fa/vine";
-export { default as FaVk } from "../../fa/vk";
-export { default as FaVolumeControlPhone } from "../../fa/volume-control-phone";
-export { default as FaVolumeDown } from "../../fa/volume-down";
-export { default as FaVolumeOff } from "../../fa/volume-off";
-export { default as FaVolumeUp } from "../../fa/volume-up";
-export { default as FaWechat } from "../../fa/wechat";
-export { default as FaWeibo } from "../../fa/weibo";
-export { default as FaWhatsapp } from "../../fa/whatsapp";
-export { default as FaWheelchairAlt } from "../../fa/wheelchair-alt";
-export { default as FaWheelchair } from "../../fa/wheelchair";
-export { default as FaWifi } from "../../fa/wifi";
-export { default as FaWikipediaW } from "../../fa/wikipedia-w";
-export { default as FaWindows } from "../../fa/windows";
-export { default as FaWordpress } from "../../fa/wordpress";
-export { default as FaWpbeginner } from "../../fa/wpbeginner";
-export { default as FaWpforms } from "../../fa/wpforms";
-export { default as FaWrench } from "../../fa/wrench";
-export { default as FaXingSquare } from "../../fa/xing-square";
-export { default as FaXing } from "../../fa/xing";
-export { default as FaYCombinator } from "../../fa/y-combinator";
-export { default as FaYahoo } from "../../fa/yahoo";
-export { default as FaYelp } from "../../fa/yelp";
-export { default as FaYoutubePlay } from "../../fa/youtube-play";
-export { default as FaYoutubeSquare } from "../../fa/youtube-square";
-export { default as FaYoutube } from "../../fa/youtube";
diff --git a/types/react-icons/lib/fa/industry.d.ts b/types/react-icons/lib/fa/industry.d.ts
deleted file mode 100644
index be16903151..0000000000
--- a/types/react-icons/lib/fa/industry.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaIndustry extends React.Component<IconBaseProps> { }
-export = FaIndustry;
diff --git a/types/react-icons/lib/fa/info-circle.d.ts b/types/react-icons/lib/fa/info-circle.d.ts
deleted file mode 100644
index dde66daea7..0000000000
--- a/types/react-icons/lib/fa/info-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaInfoCircle extends React.Component<IconBaseProps> { }
-export = FaInfoCircle;
diff --git a/types/react-icons/lib/fa/info.d.ts b/types/react-icons/lib/fa/info.d.ts
deleted file mode 100644
index cfab006429..0000000000
--- a/types/react-icons/lib/fa/info.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaInfo extends React.Component<IconBaseProps> { }
-export = FaInfo;
diff --git a/types/react-icons/lib/fa/inr.d.ts b/types/react-icons/lib/fa/inr.d.ts
deleted file mode 100644
index bcbf062b74..0000000000
--- a/types/react-icons/lib/fa/inr.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaInr extends React.Component<IconBaseProps> { }
-export = FaInr;
diff --git a/types/react-icons/lib/fa/instagram.d.ts b/types/react-icons/lib/fa/instagram.d.ts
deleted file mode 100644
index 835238de67..0000000000
--- a/types/react-icons/lib/fa/instagram.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaInstagram extends React.Component<IconBaseProps> { }
-export = FaInstagram;
diff --git a/types/react-icons/lib/fa/internet-explorer.d.ts b/types/react-icons/lib/fa/internet-explorer.d.ts
deleted file mode 100644
index 055c5df0a4..0000000000
--- a/types/react-icons/lib/fa/internet-explorer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaInternetExplorer extends React.Component<IconBaseProps> { }
-export = FaInternetExplorer;
diff --git a/types/react-icons/lib/fa/intersex.d.ts b/types/react-icons/lib/fa/intersex.d.ts
deleted file mode 100644
index f8948a1934..0000000000
--- a/types/react-icons/lib/fa/intersex.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaIntersex extends React.Component<IconBaseProps> { }
-export = FaIntersex;
diff --git a/types/react-icons/lib/fa/ioxhost.d.ts b/types/react-icons/lib/fa/ioxhost.d.ts
deleted file mode 100644
index 9d2e89cf0f..0000000000
--- a/types/react-icons/lib/fa/ioxhost.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaIoxhost extends React.Component<IconBaseProps> { }
-export = FaIoxhost;
diff --git a/types/react-icons/lib/fa/italic.d.ts b/types/react-icons/lib/fa/italic.d.ts
deleted file mode 100644
index a33d3414d4..0000000000
--- a/types/react-icons/lib/fa/italic.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaItalic extends React.Component<IconBaseProps> { }
-export = FaItalic;
diff --git a/types/react-icons/lib/fa/joomla.d.ts b/types/react-icons/lib/fa/joomla.d.ts
deleted file mode 100644
index 39c73065c5..0000000000
--- a/types/react-icons/lib/fa/joomla.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaJoomla extends React.Component<IconBaseProps> { }
-export = FaJoomla;
diff --git a/types/react-icons/lib/fa/jsfiddle.d.ts b/types/react-icons/lib/fa/jsfiddle.d.ts
deleted file mode 100644
index 8ff305e6b0..0000000000
--- a/types/react-icons/lib/fa/jsfiddle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaJsfiddle extends React.Component<IconBaseProps> { }
-export = FaJsfiddle;
diff --git a/types/react-icons/lib/fa/key.d.ts b/types/react-icons/lib/fa/key.d.ts
deleted file mode 100644
index cf50ee7c88..0000000000
--- a/types/react-icons/lib/fa/key.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaKey extends React.Component<IconBaseProps> { }
-export = FaKey;
diff --git a/types/react-icons/lib/fa/keyboard-o.d.ts b/types/react-icons/lib/fa/keyboard-o.d.ts
deleted file mode 100644
index 1c63b5099a..0000000000
--- a/types/react-icons/lib/fa/keyboard-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaKeyboardO extends React.Component<IconBaseProps> { }
-export = FaKeyboardO;
diff --git a/types/react-icons/lib/fa/krw.d.ts b/types/react-icons/lib/fa/krw.d.ts
deleted file mode 100644
index 79de06001e..0000000000
--- a/types/react-icons/lib/fa/krw.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaKrw extends React.Component<IconBaseProps> { }
-export = FaKrw;
diff --git a/types/react-icons/lib/fa/language.d.ts b/types/react-icons/lib/fa/language.d.ts
deleted file mode 100644
index 25b2433653..0000000000
--- a/types/react-icons/lib/fa/language.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLanguage extends React.Component<IconBaseProps> { }
-export = FaLanguage;
diff --git a/types/react-icons/lib/fa/laptop.d.ts b/types/react-icons/lib/fa/laptop.d.ts
deleted file mode 100644
index eec3856a86..0000000000
--- a/types/react-icons/lib/fa/laptop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLaptop extends React.Component<IconBaseProps> { }
-export = FaLaptop;
diff --git a/types/react-icons/lib/fa/lastfm-square.d.ts b/types/react-icons/lib/fa/lastfm-square.d.ts
deleted file mode 100644
index 22115486cd..0000000000
--- a/types/react-icons/lib/fa/lastfm-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLastfmSquare extends React.Component<IconBaseProps> { }
-export = FaLastfmSquare;
diff --git a/types/react-icons/lib/fa/lastfm.d.ts b/types/react-icons/lib/fa/lastfm.d.ts
deleted file mode 100644
index d155de9853..0000000000
--- a/types/react-icons/lib/fa/lastfm.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLastfm extends React.Component<IconBaseProps> { }
-export = FaLastfm;
diff --git a/types/react-icons/lib/fa/leaf.d.ts b/types/react-icons/lib/fa/leaf.d.ts
deleted file mode 100644
index 330210dddf..0000000000
--- a/types/react-icons/lib/fa/leaf.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLeaf extends React.Component<IconBaseProps> { }
-export = FaLeaf;
diff --git a/types/react-icons/lib/fa/leanpub.d.ts b/types/react-icons/lib/fa/leanpub.d.ts
deleted file mode 100644
index bbae6093d9..0000000000
--- a/types/react-icons/lib/fa/leanpub.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLeanpub extends React.Component<IconBaseProps> { }
-export = FaLeanpub;
diff --git a/types/react-icons/lib/fa/lemon-o.d.ts b/types/react-icons/lib/fa/lemon-o.d.ts
deleted file mode 100644
index dc2e3f8f72..0000000000
--- a/types/react-icons/lib/fa/lemon-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLemonO extends React.Component<IconBaseProps> { }
-export = FaLemonO;
diff --git a/types/react-icons/lib/fa/level-down.d.ts b/types/react-icons/lib/fa/level-down.d.ts
deleted file mode 100644
index b906bf1a0e..0000000000
--- a/types/react-icons/lib/fa/level-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLevelDown extends React.Component<IconBaseProps> { }
-export = FaLevelDown;
diff --git a/types/react-icons/lib/fa/level-up.d.ts b/types/react-icons/lib/fa/level-up.d.ts
deleted file mode 100644
index aaa9f46a90..0000000000
--- a/types/react-icons/lib/fa/level-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLevelUp extends React.Component<IconBaseProps> { }
-export = FaLevelUp;
diff --git a/types/react-icons/lib/fa/life-bouy.d.ts b/types/react-icons/lib/fa/life-bouy.d.ts
deleted file mode 100644
index d6a5ab382b..0000000000
--- a/types/react-icons/lib/fa/life-bouy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLifeBouy extends React.Component<IconBaseProps> { }
-export = FaLifeBouy;
diff --git a/types/react-icons/lib/fa/lightbulb-o.d.ts b/types/react-icons/lib/fa/lightbulb-o.d.ts
deleted file mode 100644
index 3dfc3d7e82..0000000000
--- a/types/react-icons/lib/fa/lightbulb-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLightbulbO extends React.Component<IconBaseProps> { }
-export = FaLightbulbO;
diff --git a/types/react-icons/lib/fa/line-chart.d.ts b/types/react-icons/lib/fa/line-chart.d.ts
deleted file mode 100644
index 0a08799a31..0000000000
--- a/types/react-icons/lib/fa/line-chart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLineChart extends React.Component<IconBaseProps> { }
-export = FaLineChart;
diff --git a/types/react-icons/lib/fa/linkedin-square.d.ts b/types/react-icons/lib/fa/linkedin-square.d.ts
deleted file mode 100644
index be3ee736d6..0000000000
--- a/types/react-icons/lib/fa/linkedin-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLinkedinSquare extends React.Component<IconBaseProps> { }
-export = FaLinkedinSquare;
diff --git a/types/react-icons/lib/fa/linkedin.d.ts b/types/react-icons/lib/fa/linkedin.d.ts
deleted file mode 100644
index 2f6d18f996..0000000000
--- a/types/react-icons/lib/fa/linkedin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLinkedin extends React.Component<IconBaseProps> { }
-export = FaLinkedin;
diff --git a/types/react-icons/lib/fa/linux.d.ts b/types/react-icons/lib/fa/linux.d.ts
deleted file mode 100644
index 1e2f751318..0000000000
--- a/types/react-icons/lib/fa/linux.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLinux extends React.Component<IconBaseProps> { }
-export = FaLinux;
diff --git a/types/react-icons/lib/fa/list-alt.d.ts b/types/react-icons/lib/fa/list-alt.d.ts
deleted file mode 100644
index 168926a8e8..0000000000
--- a/types/react-icons/lib/fa/list-alt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaListAlt extends React.Component<IconBaseProps> { }
-export = FaListAlt;
diff --git a/types/react-icons/lib/fa/list-ol.d.ts b/types/react-icons/lib/fa/list-ol.d.ts
deleted file mode 100644
index a741c78a9d..0000000000
--- a/types/react-icons/lib/fa/list-ol.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaListOl extends React.Component<IconBaseProps> { }
-export = FaListOl;
diff --git a/types/react-icons/lib/fa/list-ul.d.ts b/types/react-icons/lib/fa/list-ul.d.ts
deleted file mode 100644
index 38d0b3db98..0000000000
--- a/types/react-icons/lib/fa/list-ul.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaListUl extends React.Component<IconBaseProps> { }
-export = FaListUl;
diff --git a/types/react-icons/lib/fa/list.d.ts b/types/react-icons/lib/fa/list.d.ts
deleted file mode 100644
index f17ee7343f..0000000000
--- a/types/react-icons/lib/fa/list.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaList extends React.Component<IconBaseProps> { }
-export = FaList;
diff --git a/types/react-icons/lib/fa/location-arrow.d.ts b/types/react-icons/lib/fa/location-arrow.d.ts
deleted file mode 100644
index 91d33d7ff4..0000000000
--- a/types/react-icons/lib/fa/location-arrow.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLocationArrow extends React.Component<IconBaseProps> { }
-export = FaLocationArrow;
diff --git a/types/react-icons/lib/fa/lock.d.ts b/types/react-icons/lib/fa/lock.d.ts
deleted file mode 100644
index 3a200b8bfc..0000000000
--- a/types/react-icons/lib/fa/lock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLock extends React.Component<IconBaseProps> { }
-export = FaLock;
diff --git a/types/react-icons/lib/fa/long-arrow-down.d.ts b/types/react-icons/lib/fa/long-arrow-down.d.ts
deleted file mode 100644
index 85adda07a2..0000000000
--- a/types/react-icons/lib/fa/long-arrow-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLongArrowDown extends React.Component<IconBaseProps> { }
-export = FaLongArrowDown;
diff --git a/types/react-icons/lib/fa/long-arrow-left.d.ts b/types/react-icons/lib/fa/long-arrow-left.d.ts
deleted file mode 100644
index 3d6ad0f59a..0000000000
--- a/types/react-icons/lib/fa/long-arrow-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLongArrowLeft extends React.Component<IconBaseProps> { }
-export = FaLongArrowLeft;
diff --git a/types/react-icons/lib/fa/long-arrow-right.d.ts b/types/react-icons/lib/fa/long-arrow-right.d.ts
deleted file mode 100644
index b67d25b068..0000000000
--- a/types/react-icons/lib/fa/long-arrow-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLongArrowRight extends React.Component<IconBaseProps> { }
-export = FaLongArrowRight;
diff --git a/types/react-icons/lib/fa/long-arrow-up.d.ts b/types/react-icons/lib/fa/long-arrow-up.d.ts
deleted file mode 100644
index 844ceabee7..0000000000
--- a/types/react-icons/lib/fa/long-arrow-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLongArrowUp extends React.Component<IconBaseProps> { }
-export = FaLongArrowUp;
diff --git a/types/react-icons/lib/fa/low-vision.d.ts b/types/react-icons/lib/fa/low-vision.d.ts
deleted file mode 100644
index 2e86c1f55b..0000000000
--- a/types/react-icons/lib/fa/low-vision.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaLowVision extends React.Component<IconBaseProps> { }
-export = FaLowVision;
diff --git a/types/react-icons/lib/fa/magic.d.ts b/types/react-icons/lib/fa/magic.d.ts
deleted file mode 100644
index adbed81f80..0000000000
--- a/types/react-icons/lib/fa/magic.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMagic extends React.Component<IconBaseProps> { }
-export = FaMagic;
diff --git a/types/react-icons/lib/fa/magnet.d.ts b/types/react-icons/lib/fa/magnet.d.ts
deleted file mode 100644
index b6933258f5..0000000000
--- a/types/react-icons/lib/fa/magnet.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMagnet extends React.Component<IconBaseProps> { }
-export = FaMagnet;
diff --git a/types/react-icons/lib/fa/mail-forward.d.ts b/types/react-icons/lib/fa/mail-forward.d.ts
deleted file mode 100644
index 61680d6ff7..0000000000
--- a/types/react-icons/lib/fa/mail-forward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMailForward extends React.Component<IconBaseProps> { }
-export = FaMailForward;
diff --git a/types/react-icons/lib/fa/mail-reply-all.d.ts b/types/react-icons/lib/fa/mail-reply-all.d.ts
deleted file mode 100644
index edad2bb045..0000000000
--- a/types/react-icons/lib/fa/mail-reply-all.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMailReplyAll extends React.Component<IconBaseProps> { }
-export = FaMailReplyAll;
diff --git a/types/react-icons/lib/fa/mail-reply.d.ts b/types/react-icons/lib/fa/mail-reply.d.ts
deleted file mode 100644
index d179e93960..0000000000
--- a/types/react-icons/lib/fa/mail-reply.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMailReply extends React.Component<IconBaseProps> { }
-export = FaMailReply;
diff --git a/types/react-icons/lib/fa/male.d.ts b/types/react-icons/lib/fa/male.d.ts
deleted file mode 100644
index 09dabdb0e6..0000000000
--- a/types/react-icons/lib/fa/male.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMale extends React.Component<IconBaseProps> { }
-export = FaMale;
diff --git a/types/react-icons/lib/fa/map-marker.d.ts b/types/react-icons/lib/fa/map-marker.d.ts
deleted file mode 100644
index abd5361f41..0000000000
--- a/types/react-icons/lib/fa/map-marker.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMapMarker extends React.Component<IconBaseProps> { }
-export = FaMapMarker;
diff --git a/types/react-icons/lib/fa/map-o.d.ts b/types/react-icons/lib/fa/map-o.d.ts
deleted file mode 100644
index 587fc2d689..0000000000
--- a/types/react-icons/lib/fa/map-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMapO extends React.Component<IconBaseProps> { }
-export = FaMapO;
diff --git a/types/react-icons/lib/fa/map-pin.d.ts b/types/react-icons/lib/fa/map-pin.d.ts
deleted file mode 100644
index 9ed4ed4c3a..0000000000
--- a/types/react-icons/lib/fa/map-pin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMapPin extends React.Component<IconBaseProps> { }
-export = FaMapPin;
diff --git a/types/react-icons/lib/fa/map-signs.d.ts b/types/react-icons/lib/fa/map-signs.d.ts
deleted file mode 100644
index fab1cfec7a..0000000000
--- a/types/react-icons/lib/fa/map-signs.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMapSigns extends React.Component<IconBaseProps> { }
-export = FaMapSigns;
diff --git a/types/react-icons/lib/fa/map.d.ts b/types/react-icons/lib/fa/map.d.ts
deleted file mode 100644
index e7fcc24810..0000000000
--- a/types/react-icons/lib/fa/map.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMap extends React.Component<IconBaseProps> { }
-export = FaMap;
diff --git a/types/react-icons/lib/fa/mars-double.d.ts b/types/react-icons/lib/fa/mars-double.d.ts
deleted file mode 100644
index 23ae057446..0000000000
--- a/types/react-icons/lib/fa/mars-double.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMarsDouble extends React.Component<IconBaseProps> { }
-export = FaMarsDouble;
diff --git a/types/react-icons/lib/fa/mars-stroke-h.d.ts b/types/react-icons/lib/fa/mars-stroke-h.d.ts
deleted file mode 100644
index 8c413b89a1..0000000000
--- a/types/react-icons/lib/fa/mars-stroke-h.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMarsStrokeH extends React.Component<IconBaseProps> { }
-export = FaMarsStrokeH;
diff --git a/types/react-icons/lib/fa/mars-stroke-v.d.ts b/types/react-icons/lib/fa/mars-stroke-v.d.ts
deleted file mode 100644
index 7662429ca8..0000000000
--- a/types/react-icons/lib/fa/mars-stroke-v.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMarsStrokeV extends React.Component<IconBaseProps> { }
-export = FaMarsStrokeV;
diff --git a/types/react-icons/lib/fa/mars-stroke.d.ts b/types/react-icons/lib/fa/mars-stroke.d.ts
deleted file mode 100644
index 29c906f503..0000000000
--- a/types/react-icons/lib/fa/mars-stroke.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMarsStroke extends React.Component<IconBaseProps> { }
-export = FaMarsStroke;
diff --git a/types/react-icons/lib/fa/mars.d.ts b/types/react-icons/lib/fa/mars.d.ts
deleted file mode 100644
index c98f0b0963..0000000000
--- a/types/react-icons/lib/fa/mars.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMars extends React.Component<IconBaseProps> { }
-export = FaMars;
diff --git a/types/react-icons/lib/fa/maxcdn.d.ts b/types/react-icons/lib/fa/maxcdn.d.ts
deleted file mode 100644
index 764a8a7cc9..0000000000
--- a/types/react-icons/lib/fa/maxcdn.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMaxcdn extends React.Component<IconBaseProps> { }
-export = FaMaxcdn;
diff --git a/types/react-icons/lib/fa/meanpath.d.ts b/types/react-icons/lib/fa/meanpath.d.ts
deleted file mode 100644
index 70aeb9617a..0000000000
--- a/types/react-icons/lib/fa/meanpath.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMeanpath extends React.Component<IconBaseProps> { }
-export = FaMeanpath;
diff --git a/types/react-icons/lib/fa/medium.d.ts b/types/react-icons/lib/fa/medium.d.ts
deleted file mode 100644
index 178c3fb116..0000000000
--- a/types/react-icons/lib/fa/medium.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMedium extends React.Component<IconBaseProps> { }
-export = FaMedium;
diff --git a/types/react-icons/lib/fa/medkit.d.ts b/types/react-icons/lib/fa/medkit.d.ts
deleted file mode 100644
index 3b119f1fcb..0000000000
--- a/types/react-icons/lib/fa/medkit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMedkit extends React.Component<IconBaseProps> { }
-export = FaMedkit;
diff --git a/types/react-icons/lib/fa/meh-o.d.ts b/types/react-icons/lib/fa/meh-o.d.ts
deleted file mode 100644
index 07f39b354d..0000000000
--- a/types/react-icons/lib/fa/meh-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMehO extends React.Component<IconBaseProps> { }
-export = FaMehO;
diff --git a/types/react-icons/lib/fa/mercury.d.ts b/types/react-icons/lib/fa/mercury.d.ts
deleted file mode 100644
index 1ec67322b1..0000000000
--- a/types/react-icons/lib/fa/mercury.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMercury extends React.Component<IconBaseProps> { }
-export = FaMercury;
diff --git a/types/react-icons/lib/fa/microphone-slash.d.ts b/types/react-icons/lib/fa/microphone-slash.d.ts
deleted file mode 100644
index e57c4c0040..0000000000
--- a/types/react-icons/lib/fa/microphone-slash.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMicrophoneSlash extends React.Component<IconBaseProps> { }
-export = FaMicrophoneSlash;
diff --git a/types/react-icons/lib/fa/microphone.d.ts b/types/react-icons/lib/fa/microphone.d.ts
deleted file mode 100644
index 30306ea4f7..0000000000
--- a/types/react-icons/lib/fa/microphone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMicrophone extends React.Component<IconBaseProps> { }
-export = FaMicrophone;
diff --git a/types/react-icons/lib/fa/minus-circle.d.ts b/types/react-icons/lib/fa/minus-circle.d.ts
deleted file mode 100644
index 274e152b11..0000000000
--- a/types/react-icons/lib/fa/minus-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMinusCircle extends React.Component<IconBaseProps> { }
-export = FaMinusCircle;
diff --git a/types/react-icons/lib/fa/minus-square-o.d.ts b/types/react-icons/lib/fa/minus-square-o.d.ts
deleted file mode 100644
index 413f6b5da1..0000000000
--- a/types/react-icons/lib/fa/minus-square-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMinusSquareO extends React.Component<IconBaseProps> { }
-export = FaMinusSquareO;
diff --git a/types/react-icons/lib/fa/minus-square.d.ts b/types/react-icons/lib/fa/minus-square.d.ts
deleted file mode 100644
index a4e9551139..0000000000
--- a/types/react-icons/lib/fa/minus-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMinusSquare extends React.Component<IconBaseProps> { }
-export = FaMinusSquare;
diff --git a/types/react-icons/lib/fa/minus.d.ts b/types/react-icons/lib/fa/minus.d.ts
deleted file mode 100644
index 6d534eef94..0000000000
--- a/types/react-icons/lib/fa/minus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMinus extends React.Component<IconBaseProps> { }
-export = FaMinus;
diff --git a/types/react-icons/lib/fa/mixcloud.d.ts b/types/react-icons/lib/fa/mixcloud.d.ts
deleted file mode 100644
index 5a7c07d730..0000000000
--- a/types/react-icons/lib/fa/mixcloud.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMixcloud extends React.Component<IconBaseProps> { }
-export = FaMixcloud;
diff --git a/types/react-icons/lib/fa/mobile.d.ts b/types/react-icons/lib/fa/mobile.d.ts
deleted file mode 100644
index b05eb0cd2f..0000000000
--- a/types/react-icons/lib/fa/mobile.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMobile extends React.Component<IconBaseProps> { }
-export = FaMobile;
diff --git a/types/react-icons/lib/fa/modx.d.ts b/types/react-icons/lib/fa/modx.d.ts
deleted file mode 100644
index e54efad1ce..0000000000
--- a/types/react-icons/lib/fa/modx.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaModx extends React.Component<IconBaseProps> { }
-export = FaModx;
diff --git a/types/react-icons/lib/fa/money.d.ts b/types/react-icons/lib/fa/money.d.ts
deleted file mode 100644
index 0aa8c505ae..0000000000
--- a/types/react-icons/lib/fa/money.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMoney extends React.Component<IconBaseProps> { }
-export = FaMoney;
diff --git a/types/react-icons/lib/fa/moon-o.d.ts b/types/react-icons/lib/fa/moon-o.d.ts
deleted file mode 100644
index bbcf6097ac..0000000000
--- a/types/react-icons/lib/fa/moon-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMoonO extends React.Component<IconBaseProps> { }
-export = FaMoonO;
diff --git a/types/react-icons/lib/fa/motorcycle.d.ts b/types/react-icons/lib/fa/motorcycle.d.ts
deleted file mode 100644
index 428b96d4be..0000000000
--- a/types/react-icons/lib/fa/motorcycle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMotorcycle extends React.Component<IconBaseProps> { }
-export = FaMotorcycle;
diff --git a/types/react-icons/lib/fa/mouse-pointer.d.ts b/types/react-icons/lib/fa/mouse-pointer.d.ts
deleted file mode 100644
index cd05b52643..0000000000
--- a/types/react-icons/lib/fa/mouse-pointer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMousePointer extends React.Component<IconBaseProps> { }
-export = FaMousePointer;
diff --git a/types/react-icons/lib/fa/music.d.ts b/types/react-icons/lib/fa/music.d.ts
deleted file mode 100644
index 7b897563e3..0000000000
--- a/types/react-icons/lib/fa/music.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaMusic extends React.Component<IconBaseProps> { }
-export = FaMusic;
diff --git a/types/react-icons/lib/fa/neuter.d.ts b/types/react-icons/lib/fa/neuter.d.ts
deleted file mode 100644
index 54bc040a21..0000000000
--- a/types/react-icons/lib/fa/neuter.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaNeuter extends React.Component<IconBaseProps> { }
-export = FaNeuter;
diff --git a/types/react-icons/lib/fa/newspaper-o.d.ts b/types/react-icons/lib/fa/newspaper-o.d.ts
deleted file mode 100644
index 04afa361a9..0000000000
--- a/types/react-icons/lib/fa/newspaper-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaNewspaperO extends React.Component<IconBaseProps> { }
-export = FaNewspaperO;
diff --git a/types/react-icons/lib/fa/object-group.d.ts b/types/react-icons/lib/fa/object-group.d.ts
deleted file mode 100644
index 2f584e9792..0000000000
--- a/types/react-icons/lib/fa/object-group.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaObjectGroup extends React.Component<IconBaseProps> { }
-export = FaObjectGroup;
diff --git a/types/react-icons/lib/fa/object-ungroup.d.ts b/types/react-icons/lib/fa/object-ungroup.d.ts
deleted file mode 100644
index 64ef562d0b..0000000000
--- a/types/react-icons/lib/fa/object-ungroup.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaObjectUngroup extends React.Component<IconBaseProps> { }
-export = FaObjectUngroup;
diff --git a/types/react-icons/lib/fa/odnoklassniki-square.d.ts b/types/react-icons/lib/fa/odnoklassniki-square.d.ts
deleted file mode 100644
index 9eef0f65bc..0000000000
--- a/types/react-icons/lib/fa/odnoklassniki-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaOdnoklassnikiSquare extends React.Component<IconBaseProps> { }
-export = FaOdnoklassnikiSquare;
diff --git a/types/react-icons/lib/fa/odnoklassniki.d.ts b/types/react-icons/lib/fa/odnoklassniki.d.ts
deleted file mode 100644
index bd08137730..0000000000
--- a/types/react-icons/lib/fa/odnoklassniki.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaOdnoklassniki extends React.Component<IconBaseProps> { }
-export = FaOdnoklassniki;
diff --git a/types/react-icons/lib/fa/opencart.d.ts b/types/react-icons/lib/fa/opencart.d.ts
deleted file mode 100644
index 6b91510b98..0000000000
--- a/types/react-icons/lib/fa/opencart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaOpencart extends React.Component<IconBaseProps> { }
-export = FaOpencart;
diff --git a/types/react-icons/lib/fa/openid.d.ts b/types/react-icons/lib/fa/openid.d.ts
deleted file mode 100644
index a2440e94c0..0000000000
--- a/types/react-icons/lib/fa/openid.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaOpenid extends React.Component<IconBaseProps> { }
-export = FaOpenid;
diff --git a/types/react-icons/lib/fa/opera.d.ts b/types/react-icons/lib/fa/opera.d.ts
deleted file mode 100644
index 5e4a4ad5d1..0000000000
--- a/types/react-icons/lib/fa/opera.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaOpera extends React.Component<IconBaseProps> { }
-export = FaOpera;
diff --git a/types/react-icons/lib/fa/optin-monster.d.ts b/types/react-icons/lib/fa/optin-monster.d.ts
deleted file mode 100644
index 35a77228aa..0000000000
--- a/types/react-icons/lib/fa/optin-monster.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaOptinMonster extends React.Component<IconBaseProps> { }
-export = FaOptinMonster;
diff --git a/types/react-icons/lib/fa/pagelines.d.ts b/types/react-icons/lib/fa/pagelines.d.ts
deleted file mode 100644
index 48db91303e..0000000000
--- a/types/react-icons/lib/fa/pagelines.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPagelines extends React.Component<IconBaseProps> { }
-export = FaPagelines;
diff --git a/types/react-icons/lib/fa/paint-brush.d.ts b/types/react-icons/lib/fa/paint-brush.d.ts
deleted file mode 100644
index e00ca97541..0000000000
--- a/types/react-icons/lib/fa/paint-brush.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPaintBrush extends React.Component<IconBaseProps> { }
-export = FaPaintBrush;
diff --git a/types/react-icons/lib/fa/paper-plane-o.d.ts b/types/react-icons/lib/fa/paper-plane-o.d.ts
deleted file mode 100644
index b21b883cde..0000000000
--- a/types/react-icons/lib/fa/paper-plane-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPaperPlaneO extends React.Component<IconBaseProps> { }
-export = FaPaperPlaneO;
diff --git a/types/react-icons/lib/fa/paper-plane.d.ts b/types/react-icons/lib/fa/paper-plane.d.ts
deleted file mode 100644
index f0396a87cf..0000000000
--- a/types/react-icons/lib/fa/paper-plane.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPaperPlane extends React.Component<IconBaseProps> { }
-export = FaPaperPlane;
diff --git a/types/react-icons/lib/fa/paperclip.d.ts b/types/react-icons/lib/fa/paperclip.d.ts
deleted file mode 100644
index 073d3f8172..0000000000
--- a/types/react-icons/lib/fa/paperclip.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPaperclip extends React.Component<IconBaseProps> { }
-export = FaPaperclip;
diff --git a/types/react-icons/lib/fa/paragraph.d.ts b/types/react-icons/lib/fa/paragraph.d.ts
deleted file mode 100644
index 16f3b33755..0000000000
--- a/types/react-icons/lib/fa/paragraph.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaParagraph extends React.Component<IconBaseProps> { }
-export = FaParagraph;
diff --git a/types/react-icons/lib/fa/pause-circle-o.d.ts b/types/react-icons/lib/fa/pause-circle-o.d.ts
deleted file mode 100644
index 237f29bba3..0000000000
--- a/types/react-icons/lib/fa/pause-circle-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPauseCircleO extends React.Component<IconBaseProps> { }
-export = FaPauseCircleO;
diff --git a/types/react-icons/lib/fa/pause-circle.d.ts b/types/react-icons/lib/fa/pause-circle.d.ts
deleted file mode 100644
index e596ec02db..0000000000
--- a/types/react-icons/lib/fa/pause-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPauseCircle extends React.Component<IconBaseProps> { }
-export = FaPauseCircle;
diff --git a/types/react-icons/lib/fa/pause.d.ts b/types/react-icons/lib/fa/pause.d.ts
deleted file mode 100644
index d84c25805f..0000000000
--- a/types/react-icons/lib/fa/pause.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPause extends React.Component<IconBaseProps> { }
-export = FaPause;
diff --git a/types/react-icons/lib/fa/paw.d.ts b/types/react-icons/lib/fa/paw.d.ts
deleted file mode 100644
index 6d0dd51dad..0000000000
--- a/types/react-icons/lib/fa/paw.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPaw extends React.Component<IconBaseProps> { }
-export = FaPaw;
diff --git a/types/react-icons/lib/fa/paypal.d.ts b/types/react-icons/lib/fa/paypal.d.ts
deleted file mode 100644
index ac59970a20..0000000000
--- a/types/react-icons/lib/fa/paypal.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPaypal extends React.Component<IconBaseProps> { }
-export = FaPaypal;
diff --git a/types/react-icons/lib/fa/pencil-square.d.ts b/types/react-icons/lib/fa/pencil-square.d.ts
deleted file mode 100644
index d9853f6fea..0000000000
--- a/types/react-icons/lib/fa/pencil-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPencilSquare extends React.Component<IconBaseProps> { }
-export = FaPencilSquare;
diff --git a/types/react-icons/lib/fa/pencil.d.ts b/types/react-icons/lib/fa/pencil.d.ts
deleted file mode 100644
index f4624c1974..0000000000
--- a/types/react-icons/lib/fa/pencil.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPencil extends React.Component<IconBaseProps> { }
-export = FaPencil;
diff --git a/types/react-icons/lib/fa/percent.d.ts b/types/react-icons/lib/fa/percent.d.ts
deleted file mode 100644
index 6c63e0b1b0..0000000000
--- a/types/react-icons/lib/fa/percent.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPercent extends React.Component<IconBaseProps> { }
-export = FaPercent;
diff --git a/types/react-icons/lib/fa/phone-square.d.ts b/types/react-icons/lib/fa/phone-square.d.ts
deleted file mode 100644
index c64fac18e4..0000000000
--- a/types/react-icons/lib/fa/phone-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPhoneSquare extends React.Component<IconBaseProps> { }
-export = FaPhoneSquare;
diff --git a/types/react-icons/lib/fa/phone.d.ts b/types/react-icons/lib/fa/phone.d.ts
deleted file mode 100644
index 7c9113a801..0000000000
--- a/types/react-icons/lib/fa/phone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPhone extends React.Component<IconBaseProps> { }
-export = FaPhone;
diff --git a/types/react-icons/lib/fa/pie-chart.d.ts b/types/react-icons/lib/fa/pie-chart.d.ts
deleted file mode 100644
index b1f1532a75..0000000000
--- a/types/react-icons/lib/fa/pie-chart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPieChart extends React.Component<IconBaseProps> { }
-export = FaPieChart;
diff --git a/types/react-icons/lib/fa/pied-piper-alt.d.ts b/types/react-icons/lib/fa/pied-piper-alt.d.ts
deleted file mode 100644
index c3e62c90c1..0000000000
--- a/types/react-icons/lib/fa/pied-piper-alt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPiedPiperAlt extends React.Component<IconBaseProps> { }
-export = FaPiedPiperAlt;
diff --git a/types/react-icons/lib/fa/pied-piper.d.ts b/types/react-icons/lib/fa/pied-piper.d.ts
deleted file mode 100644
index bcdea4439a..0000000000
--- a/types/react-icons/lib/fa/pied-piper.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPiedPiper extends React.Component<IconBaseProps> { }
-export = FaPiedPiper;
diff --git a/types/react-icons/lib/fa/pinterest-p.d.ts b/types/react-icons/lib/fa/pinterest-p.d.ts
deleted file mode 100644
index 5387cd9430..0000000000
--- a/types/react-icons/lib/fa/pinterest-p.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPinterestP extends React.Component<IconBaseProps> { }
-export = FaPinterestP;
diff --git a/types/react-icons/lib/fa/pinterest-square.d.ts b/types/react-icons/lib/fa/pinterest-square.d.ts
deleted file mode 100644
index 9f9dbb3869..0000000000
--- a/types/react-icons/lib/fa/pinterest-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPinterestSquare extends React.Component<IconBaseProps> { }
-export = FaPinterestSquare;
diff --git a/types/react-icons/lib/fa/pinterest.d.ts b/types/react-icons/lib/fa/pinterest.d.ts
deleted file mode 100644
index cc4dd7d77b..0000000000
--- a/types/react-icons/lib/fa/pinterest.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPinterest extends React.Component<IconBaseProps> { }
-export = FaPinterest;
diff --git a/types/react-icons/lib/fa/plane.d.ts b/types/react-icons/lib/fa/plane.d.ts
deleted file mode 100644
index d8c14730b6..0000000000
--- a/types/react-icons/lib/fa/plane.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPlane extends React.Component<IconBaseProps> { }
-export = FaPlane;
diff --git a/types/react-icons/lib/fa/play-circle-o.d.ts b/types/react-icons/lib/fa/play-circle-o.d.ts
deleted file mode 100644
index eff8fcd09f..0000000000
--- a/types/react-icons/lib/fa/play-circle-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPlayCircleO extends React.Component<IconBaseProps> { }
-export = FaPlayCircleO;
diff --git a/types/react-icons/lib/fa/play-circle.d.ts b/types/react-icons/lib/fa/play-circle.d.ts
deleted file mode 100644
index 850c43afb9..0000000000
--- a/types/react-icons/lib/fa/play-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPlayCircle extends React.Component<IconBaseProps> { }
-export = FaPlayCircle;
diff --git a/types/react-icons/lib/fa/play.d.ts b/types/react-icons/lib/fa/play.d.ts
deleted file mode 100644
index 54a66a1994..0000000000
--- a/types/react-icons/lib/fa/play.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPlay extends React.Component<IconBaseProps> { }
-export = FaPlay;
diff --git a/types/react-icons/lib/fa/plug.d.ts b/types/react-icons/lib/fa/plug.d.ts
deleted file mode 100644
index 601b908307..0000000000
--- a/types/react-icons/lib/fa/plug.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPlug extends React.Component<IconBaseProps> { }
-export = FaPlug;
diff --git a/types/react-icons/lib/fa/plus-circle.d.ts b/types/react-icons/lib/fa/plus-circle.d.ts
deleted file mode 100644
index af1595428f..0000000000
--- a/types/react-icons/lib/fa/plus-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPlusCircle extends React.Component<IconBaseProps> { }
-export = FaPlusCircle;
diff --git a/types/react-icons/lib/fa/plus-square-o.d.ts b/types/react-icons/lib/fa/plus-square-o.d.ts
deleted file mode 100644
index e9fb5b2ca1..0000000000
--- a/types/react-icons/lib/fa/plus-square-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPlusSquareO extends React.Component<IconBaseProps> { }
-export = FaPlusSquareO;
diff --git a/types/react-icons/lib/fa/plus-square.d.ts b/types/react-icons/lib/fa/plus-square.d.ts
deleted file mode 100644
index 478a80a7a4..0000000000
--- a/types/react-icons/lib/fa/plus-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPlusSquare extends React.Component<IconBaseProps> { }
-export = FaPlusSquare;
diff --git a/types/react-icons/lib/fa/plus.d.ts b/types/react-icons/lib/fa/plus.d.ts
deleted file mode 100644
index 3a8423a776..0000000000
--- a/types/react-icons/lib/fa/plus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPlus extends React.Component<IconBaseProps> { }
-export = FaPlus;
diff --git a/types/react-icons/lib/fa/power-off.d.ts b/types/react-icons/lib/fa/power-off.d.ts
deleted file mode 100644
index 091d3ee694..0000000000
--- a/types/react-icons/lib/fa/power-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPowerOff extends React.Component<IconBaseProps> { }
-export = FaPowerOff;
diff --git a/types/react-icons/lib/fa/print.d.ts b/types/react-icons/lib/fa/print.d.ts
deleted file mode 100644
index 8efbedf76f..0000000000
--- a/types/react-icons/lib/fa/print.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPrint extends React.Component<IconBaseProps> { }
-export = FaPrint;
diff --git a/types/react-icons/lib/fa/product-hunt.d.ts b/types/react-icons/lib/fa/product-hunt.d.ts
deleted file mode 100644
index 64b2613692..0000000000
--- a/types/react-icons/lib/fa/product-hunt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaProductHunt extends React.Component<IconBaseProps> { }
-export = FaProductHunt;
diff --git a/types/react-icons/lib/fa/puzzle-piece.d.ts b/types/react-icons/lib/fa/puzzle-piece.d.ts
deleted file mode 100644
index 200b21237b..0000000000
--- a/types/react-icons/lib/fa/puzzle-piece.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaPuzzlePiece extends React.Component<IconBaseProps> { }
-export = FaPuzzlePiece;
diff --git a/types/react-icons/lib/fa/qq.d.ts b/types/react-icons/lib/fa/qq.d.ts
deleted file mode 100644
index 84fde8990e..0000000000
--- a/types/react-icons/lib/fa/qq.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaQq extends React.Component<IconBaseProps> { }
-export = FaQq;
diff --git a/types/react-icons/lib/fa/qrcode.d.ts b/types/react-icons/lib/fa/qrcode.d.ts
deleted file mode 100644
index 2fba577719..0000000000
--- a/types/react-icons/lib/fa/qrcode.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaQrcode extends React.Component<IconBaseProps> { }
-export = FaQrcode;
diff --git a/types/react-icons/lib/fa/question-circle-o.d.ts b/types/react-icons/lib/fa/question-circle-o.d.ts
deleted file mode 100644
index 6188c56712..0000000000
--- a/types/react-icons/lib/fa/question-circle-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaQuestionCircleO extends React.Component<IconBaseProps> { }
-export = FaQuestionCircleO;
diff --git a/types/react-icons/lib/fa/question-circle.d.ts b/types/react-icons/lib/fa/question-circle.d.ts
deleted file mode 100644
index c822c62d7e..0000000000
--- a/types/react-icons/lib/fa/question-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaQuestionCircle extends React.Component<IconBaseProps> { }
-export = FaQuestionCircle;
diff --git a/types/react-icons/lib/fa/question.d.ts b/types/react-icons/lib/fa/question.d.ts
deleted file mode 100644
index 0d0756e81f..0000000000
--- a/types/react-icons/lib/fa/question.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaQuestion extends React.Component<IconBaseProps> { }
-export = FaQuestion;
diff --git a/types/react-icons/lib/fa/quote-left.d.ts b/types/react-icons/lib/fa/quote-left.d.ts
deleted file mode 100644
index ca59dc3f83..0000000000
--- a/types/react-icons/lib/fa/quote-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaQuoteLeft extends React.Component<IconBaseProps> { }
-export = FaQuoteLeft;
diff --git a/types/react-icons/lib/fa/quote-right.d.ts b/types/react-icons/lib/fa/quote-right.d.ts
deleted file mode 100644
index fa325866d1..0000000000
--- a/types/react-icons/lib/fa/quote-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaQuoteRight extends React.Component<IconBaseProps> { }
-export = FaQuoteRight;
diff --git a/types/react-icons/lib/fa/ra.d.ts b/types/react-icons/lib/fa/ra.d.ts
deleted file mode 100644
index bf436d8019..0000000000
--- a/types/react-icons/lib/fa/ra.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaRa extends React.Component<IconBaseProps> { }
-export = FaRa;
diff --git a/types/react-icons/lib/fa/random.d.ts b/types/react-icons/lib/fa/random.d.ts
deleted file mode 100644
index c3864a6f9a..0000000000
--- a/types/react-icons/lib/fa/random.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaRandom extends React.Component<IconBaseProps> { }
-export = FaRandom;
diff --git a/types/react-icons/lib/fa/recycle.d.ts b/types/react-icons/lib/fa/recycle.d.ts
deleted file mode 100644
index 476931ca9a..0000000000
--- a/types/react-icons/lib/fa/recycle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaRecycle extends React.Component<IconBaseProps> { }
-export = FaRecycle;
diff --git a/types/react-icons/lib/fa/reddit-alien.d.ts b/types/react-icons/lib/fa/reddit-alien.d.ts
deleted file mode 100644
index 27808c318d..0000000000
--- a/types/react-icons/lib/fa/reddit-alien.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaRedditAlien extends React.Component<IconBaseProps> { }
-export = FaRedditAlien;
diff --git a/types/react-icons/lib/fa/reddit-square.d.ts b/types/react-icons/lib/fa/reddit-square.d.ts
deleted file mode 100644
index 2938b4cd05..0000000000
--- a/types/react-icons/lib/fa/reddit-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaRedditSquare extends React.Component<IconBaseProps> { }
-export = FaRedditSquare;
diff --git a/types/react-icons/lib/fa/reddit.d.ts b/types/react-icons/lib/fa/reddit.d.ts
deleted file mode 100644
index 51ba88dbb0..0000000000
--- a/types/react-icons/lib/fa/reddit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaReddit extends React.Component<IconBaseProps> { }
-export = FaReddit;
diff --git a/types/react-icons/lib/fa/refresh.d.ts b/types/react-icons/lib/fa/refresh.d.ts
deleted file mode 100644
index 57c4e5cc53..0000000000
--- a/types/react-icons/lib/fa/refresh.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaRefresh extends React.Component<IconBaseProps> { }
-export = FaRefresh;
diff --git a/types/react-icons/lib/fa/registered.d.ts b/types/react-icons/lib/fa/registered.d.ts
deleted file mode 100644
index 975627ad01..0000000000
--- a/types/react-icons/lib/fa/registered.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaRegistered extends React.Component<IconBaseProps> { }
-export = FaRegistered;
diff --git a/types/react-icons/lib/fa/renren.d.ts b/types/react-icons/lib/fa/renren.d.ts
deleted file mode 100644
index a608ad598d..0000000000
--- a/types/react-icons/lib/fa/renren.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaRenren extends React.Component<IconBaseProps> { }
-export = FaRenren;
diff --git a/types/react-icons/lib/fa/repeat.d.ts b/types/react-icons/lib/fa/repeat.d.ts
deleted file mode 100644
index 013bfad3b5..0000000000
--- a/types/react-icons/lib/fa/repeat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaRepeat extends React.Component<IconBaseProps> { }
-export = FaRepeat;
diff --git a/types/react-icons/lib/fa/retweet.d.ts b/types/react-icons/lib/fa/retweet.d.ts
deleted file mode 100644
index 9c23c1e433..0000000000
--- a/types/react-icons/lib/fa/retweet.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaRetweet extends React.Component<IconBaseProps> { }
-export = FaRetweet;
diff --git a/types/react-icons/lib/fa/road.d.ts b/types/react-icons/lib/fa/road.d.ts
deleted file mode 100644
index 9a9afb3a9c..0000000000
--- a/types/react-icons/lib/fa/road.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaRoad extends React.Component<IconBaseProps> { }
-export = FaRoad;
diff --git a/types/react-icons/lib/fa/rocket.d.ts b/types/react-icons/lib/fa/rocket.d.ts
deleted file mode 100644
index e559d0008e..0000000000
--- a/types/react-icons/lib/fa/rocket.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaRocket extends React.Component<IconBaseProps> { }
-export = FaRocket;
diff --git a/types/react-icons/lib/fa/rotate-left.d.ts b/types/react-icons/lib/fa/rotate-left.d.ts
deleted file mode 100644
index 429e6f63b4..0000000000
--- a/types/react-icons/lib/fa/rotate-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaRotateLeft extends React.Component<IconBaseProps> { }
-export = FaRotateLeft;
diff --git a/types/react-icons/lib/fa/rouble.d.ts b/types/react-icons/lib/fa/rouble.d.ts
deleted file mode 100644
index af4c0d834a..0000000000
--- a/types/react-icons/lib/fa/rouble.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaRouble extends React.Component<IconBaseProps> { }
-export = FaRouble;
diff --git a/types/react-icons/lib/fa/rss-square.d.ts b/types/react-icons/lib/fa/rss-square.d.ts
deleted file mode 100644
index ed6bad1e0d..0000000000
--- a/types/react-icons/lib/fa/rss-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaRssSquare extends React.Component<IconBaseProps> { }
-export = FaRssSquare;
diff --git a/types/react-icons/lib/fa/safari.d.ts b/types/react-icons/lib/fa/safari.d.ts
deleted file mode 100644
index 0a4f5ffe3c..0000000000
--- a/types/react-icons/lib/fa/safari.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSafari extends React.Component<IconBaseProps> { }
-export = FaSafari;
diff --git a/types/react-icons/lib/fa/scribd.d.ts b/types/react-icons/lib/fa/scribd.d.ts
deleted file mode 100644
index e7be0691fa..0000000000
--- a/types/react-icons/lib/fa/scribd.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaScribd extends React.Component<IconBaseProps> { }
-export = FaScribd;
diff --git a/types/react-icons/lib/fa/search-minus.d.ts b/types/react-icons/lib/fa/search-minus.d.ts
deleted file mode 100644
index 7f94b39768..0000000000
--- a/types/react-icons/lib/fa/search-minus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSearchMinus extends React.Component<IconBaseProps> { }
-export = FaSearchMinus;
diff --git a/types/react-icons/lib/fa/search-plus.d.ts b/types/react-icons/lib/fa/search-plus.d.ts
deleted file mode 100644
index 59f8b7d49f..0000000000
--- a/types/react-icons/lib/fa/search-plus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSearchPlus extends React.Component<IconBaseProps> { }
-export = FaSearchPlus;
diff --git a/types/react-icons/lib/fa/search.d.ts b/types/react-icons/lib/fa/search.d.ts
deleted file mode 100644
index 1223413cc9..0000000000
--- a/types/react-icons/lib/fa/search.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSearch extends React.Component<IconBaseProps> { }
-export = FaSearch;
diff --git a/types/react-icons/lib/fa/sellsy.d.ts b/types/react-icons/lib/fa/sellsy.d.ts
deleted file mode 100644
index 860ba7bfd4..0000000000
--- a/types/react-icons/lib/fa/sellsy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSellsy extends React.Component<IconBaseProps> { }
-export = FaSellsy;
diff --git a/types/react-icons/lib/fa/server.d.ts b/types/react-icons/lib/fa/server.d.ts
deleted file mode 100644
index 6dda352faa..0000000000
--- a/types/react-icons/lib/fa/server.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaServer extends React.Component<IconBaseProps> { }
-export = FaServer;
diff --git a/types/react-icons/lib/fa/share-alt-square.d.ts b/types/react-icons/lib/fa/share-alt-square.d.ts
deleted file mode 100644
index d36315ee1f..0000000000
--- a/types/react-icons/lib/fa/share-alt-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaShareAltSquare extends React.Component<IconBaseProps> { }
-export = FaShareAltSquare;
diff --git a/types/react-icons/lib/fa/share-alt.d.ts b/types/react-icons/lib/fa/share-alt.d.ts
deleted file mode 100644
index 49c3f2ff3b..0000000000
--- a/types/react-icons/lib/fa/share-alt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaShareAlt extends React.Component<IconBaseProps> { }
-export = FaShareAlt;
diff --git a/types/react-icons/lib/fa/share-square-o.d.ts b/types/react-icons/lib/fa/share-square-o.d.ts
deleted file mode 100644
index d23c235045..0000000000
--- a/types/react-icons/lib/fa/share-square-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaShareSquareO extends React.Component<IconBaseProps> { }
-export = FaShareSquareO;
diff --git a/types/react-icons/lib/fa/share-square.d.ts b/types/react-icons/lib/fa/share-square.d.ts
deleted file mode 100644
index 93c6e557f4..0000000000
--- a/types/react-icons/lib/fa/share-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaShareSquare extends React.Component<IconBaseProps> { }
-export = FaShareSquare;
diff --git a/types/react-icons/lib/fa/shield.d.ts b/types/react-icons/lib/fa/shield.d.ts
deleted file mode 100644
index 8ca03c4657..0000000000
--- a/types/react-icons/lib/fa/shield.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaShield extends React.Component<IconBaseProps> { }
-export = FaShield;
diff --git a/types/react-icons/lib/fa/ship.d.ts b/types/react-icons/lib/fa/ship.d.ts
deleted file mode 100644
index 71b61a6e7b..0000000000
--- a/types/react-icons/lib/fa/ship.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaShip extends React.Component<IconBaseProps> { }
-export = FaShip;
diff --git a/types/react-icons/lib/fa/shirtsinbulk.d.ts b/types/react-icons/lib/fa/shirtsinbulk.d.ts
deleted file mode 100644
index 8faaa7e15b..0000000000
--- a/types/react-icons/lib/fa/shirtsinbulk.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaShirtsinbulk extends React.Component<IconBaseProps> { }
-export = FaShirtsinbulk;
diff --git a/types/react-icons/lib/fa/shopping-bag.d.ts b/types/react-icons/lib/fa/shopping-bag.d.ts
deleted file mode 100644
index e9617d3fd4..0000000000
--- a/types/react-icons/lib/fa/shopping-bag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaShoppingBag extends React.Component<IconBaseProps> { }
-export = FaShoppingBag;
diff --git a/types/react-icons/lib/fa/shopping-basket.d.ts b/types/react-icons/lib/fa/shopping-basket.d.ts
deleted file mode 100644
index e479dc7343..0000000000
--- a/types/react-icons/lib/fa/shopping-basket.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaShoppingBasket extends React.Component<IconBaseProps> { }
-export = FaShoppingBasket;
diff --git a/types/react-icons/lib/fa/shopping-cart.d.ts b/types/react-icons/lib/fa/shopping-cart.d.ts
deleted file mode 100644
index 784aa79f93..0000000000
--- a/types/react-icons/lib/fa/shopping-cart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaShoppingCart extends React.Component<IconBaseProps> { }
-export = FaShoppingCart;
diff --git a/types/react-icons/lib/fa/sign-in.d.ts b/types/react-icons/lib/fa/sign-in.d.ts
deleted file mode 100644
index 6761643c9d..0000000000
--- a/types/react-icons/lib/fa/sign-in.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSignIn extends React.Component<IconBaseProps> { }
-export = FaSignIn;
diff --git a/types/react-icons/lib/fa/sign-language.d.ts b/types/react-icons/lib/fa/sign-language.d.ts
deleted file mode 100644
index 0006b1dfab..0000000000
--- a/types/react-icons/lib/fa/sign-language.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSignLanguage extends React.Component<IconBaseProps> { }
-export = FaSignLanguage;
diff --git a/types/react-icons/lib/fa/sign-out.d.ts b/types/react-icons/lib/fa/sign-out.d.ts
deleted file mode 100644
index 8a32ff2252..0000000000
--- a/types/react-icons/lib/fa/sign-out.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSignOut extends React.Component<IconBaseProps> { }
-export = FaSignOut;
diff --git a/types/react-icons/lib/fa/signal.d.ts b/types/react-icons/lib/fa/signal.d.ts
deleted file mode 100644
index 733f27f8b9..0000000000
--- a/types/react-icons/lib/fa/signal.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSignal extends React.Component<IconBaseProps> { }
-export = FaSignal;
diff --git a/types/react-icons/lib/fa/simplybuilt.d.ts b/types/react-icons/lib/fa/simplybuilt.d.ts
deleted file mode 100644
index 91a9058c72..0000000000
--- a/types/react-icons/lib/fa/simplybuilt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSimplybuilt extends React.Component<IconBaseProps> { }
-export = FaSimplybuilt;
diff --git a/types/react-icons/lib/fa/sitemap.d.ts b/types/react-icons/lib/fa/sitemap.d.ts
deleted file mode 100644
index 20c0543ac2..0000000000
--- a/types/react-icons/lib/fa/sitemap.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSitemap extends React.Component<IconBaseProps> { }
-export = FaSitemap;
diff --git a/types/react-icons/lib/fa/skyatlas.d.ts b/types/react-icons/lib/fa/skyatlas.d.ts
deleted file mode 100644
index 13854503aa..0000000000
--- a/types/react-icons/lib/fa/skyatlas.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSkyatlas extends React.Component<IconBaseProps> { }
-export = FaSkyatlas;
diff --git a/types/react-icons/lib/fa/skype.d.ts b/types/react-icons/lib/fa/skype.d.ts
deleted file mode 100644
index ccf59938a6..0000000000
--- a/types/react-icons/lib/fa/skype.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSkype extends React.Component<IconBaseProps> { }
-export = FaSkype;
diff --git a/types/react-icons/lib/fa/slack.d.ts b/types/react-icons/lib/fa/slack.d.ts
deleted file mode 100644
index 6d441ba2d1..0000000000
--- a/types/react-icons/lib/fa/slack.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSlack extends React.Component<IconBaseProps> { }
-export = FaSlack;
diff --git a/types/react-icons/lib/fa/sliders.d.ts b/types/react-icons/lib/fa/sliders.d.ts
deleted file mode 100644
index 6dfda35100..0000000000
--- a/types/react-icons/lib/fa/sliders.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSliders extends React.Component<IconBaseProps> { }
-export = FaSliders;
diff --git a/types/react-icons/lib/fa/slideshare.d.ts b/types/react-icons/lib/fa/slideshare.d.ts
deleted file mode 100644
index 0553b84e9d..0000000000
--- a/types/react-icons/lib/fa/slideshare.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSlideshare extends React.Component<IconBaseProps> { }
-export = FaSlideshare;
diff --git a/types/react-icons/lib/fa/smile-o.d.ts b/types/react-icons/lib/fa/smile-o.d.ts
deleted file mode 100644
index 16b701ab67..0000000000
--- a/types/react-icons/lib/fa/smile-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSmileO extends React.Component<IconBaseProps> { }
-export = FaSmileO;
diff --git a/types/react-icons/lib/fa/snapchat-ghost.d.ts b/types/react-icons/lib/fa/snapchat-ghost.d.ts
deleted file mode 100644
index f1da37daa1..0000000000
--- a/types/react-icons/lib/fa/snapchat-ghost.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSnapchatGhost extends React.Component<IconBaseProps> { }
-export = FaSnapchatGhost;
diff --git a/types/react-icons/lib/fa/snapchat-square.d.ts b/types/react-icons/lib/fa/snapchat-square.d.ts
deleted file mode 100644
index 53ccacd856..0000000000
--- a/types/react-icons/lib/fa/snapchat-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSnapchatSquare extends React.Component<IconBaseProps> { }
-export = FaSnapchatSquare;
diff --git a/types/react-icons/lib/fa/snapchat.d.ts b/types/react-icons/lib/fa/snapchat.d.ts
deleted file mode 100644
index ff7b4adfc1..0000000000
--- a/types/react-icons/lib/fa/snapchat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSnapchat extends React.Component<IconBaseProps> { }
-export = FaSnapchat;
diff --git a/types/react-icons/lib/fa/sort-alpha-asc.d.ts b/types/react-icons/lib/fa/sort-alpha-asc.d.ts
deleted file mode 100644
index f9f29a4c20..0000000000
--- a/types/react-icons/lib/fa/sort-alpha-asc.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSortAlphaAsc extends React.Component<IconBaseProps> { }
-export = FaSortAlphaAsc;
diff --git a/types/react-icons/lib/fa/sort-alpha-desc.d.ts b/types/react-icons/lib/fa/sort-alpha-desc.d.ts
deleted file mode 100644
index 2c9d8f7b86..0000000000
--- a/types/react-icons/lib/fa/sort-alpha-desc.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSortAlphaDesc extends React.Component<IconBaseProps> { }
-export = FaSortAlphaDesc;
diff --git a/types/react-icons/lib/fa/sort-amount-asc.d.ts b/types/react-icons/lib/fa/sort-amount-asc.d.ts
deleted file mode 100644
index f665f0ff3a..0000000000
--- a/types/react-icons/lib/fa/sort-amount-asc.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSortAmountAsc extends React.Component<IconBaseProps> { }
-export = FaSortAmountAsc;
diff --git a/types/react-icons/lib/fa/sort-amount-desc.d.ts b/types/react-icons/lib/fa/sort-amount-desc.d.ts
deleted file mode 100644
index ba40b6eb2f..0000000000
--- a/types/react-icons/lib/fa/sort-amount-desc.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSortAmountDesc extends React.Component<IconBaseProps> { }
-export = FaSortAmountDesc;
diff --git a/types/react-icons/lib/fa/sort-asc.d.ts b/types/react-icons/lib/fa/sort-asc.d.ts
deleted file mode 100644
index 51b442d7c6..0000000000
--- a/types/react-icons/lib/fa/sort-asc.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSortAsc extends React.Component<IconBaseProps> { }
-export = FaSortAsc;
diff --git a/types/react-icons/lib/fa/sort-desc.d.ts b/types/react-icons/lib/fa/sort-desc.d.ts
deleted file mode 100644
index 17888aae25..0000000000
--- a/types/react-icons/lib/fa/sort-desc.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSortDesc extends React.Component<IconBaseProps> { }
-export = FaSortDesc;
diff --git a/types/react-icons/lib/fa/sort-numeric-asc.d.ts b/types/react-icons/lib/fa/sort-numeric-asc.d.ts
deleted file mode 100644
index 1778101b1b..0000000000
--- a/types/react-icons/lib/fa/sort-numeric-asc.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSortNumericAsc extends React.Component<IconBaseProps> { }
-export = FaSortNumericAsc;
diff --git a/types/react-icons/lib/fa/sort-numeric-desc.d.ts b/types/react-icons/lib/fa/sort-numeric-desc.d.ts
deleted file mode 100644
index 4ab06a613e..0000000000
--- a/types/react-icons/lib/fa/sort-numeric-desc.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSortNumericDesc extends React.Component<IconBaseProps> { }
-export = FaSortNumericDesc;
diff --git a/types/react-icons/lib/fa/sort.d.ts b/types/react-icons/lib/fa/sort.d.ts
deleted file mode 100644
index 6b5e9ec071..0000000000
--- a/types/react-icons/lib/fa/sort.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSort extends React.Component<IconBaseProps> { }
-export = FaSort;
diff --git a/types/react-icons/lib/fa/soundcloud.d.ts b/types/react-icons/lib/fa/soundcloud.d.ts
deleted file mode 100644
index 774a3a60a7..0000000000
--- a/types/react-icons/lib/fa/soundcloud.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSoundcloud extends React.Component<IconBaseProps> { }
-export = FaSoundcloud;
diff --git a/types/react-icons/lib/fa/space-shuttle.d.ts b/types/react-icons/lib/fa/space-shuttle.d.ts
deleted file mode 100644
index a637be5956..0000000000
--- a/types/react-icons/lib/fa/space-shuttle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSpaceShuttle extends React.Component<IconBaseProps> { }
-export = FaSpaceShuttle;
diff --git a/types/react-icons/lib/fa/spinner.d.ts b/types/react-icons/lib/fa/spinner.d.ts
deleted file mode 100644
index dbd8124bca..0000000000
--- a/types/react-icons/lib/fa/spinner.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSpinner extends React.Component<IconBaseProps> { }
-export = FaSpinner;
diff --git a/types/react-icons/lib/fa/spoon.d.ts b/types/react-icons/lib/fa/spoon.d.ts
deleted file mode 100644
index e11b2b3df5..0000000000
--- a/types/react-icons/lib/fa/spoon.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSpoon extends React.Component<IconBaseProps> { }
-export = FaSpoon;
diff --git a/types/react-icons/lib/fa/spotify.d.ts b/types/react-icons/lib/fa/spotify.d.ts
deleted file mode 100644
index 1e643eaa82..0000000000
--- a/types/react-icons/lib/fa/spotify.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSpotify extends React.Component<IconBaseProps> { }
-export = FaSpotify;
diff --git a/types/react-icons/lib/fa/square-o.d.ts b/types/react-icons/lib/fa/square-o.d.ts
deleted file mode 100644
index 2ec8731877..0000000000
--- a/types/react-icons/lib/fa/square-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSquareO extends React.Component<IconBaseProps> { }
-export = FaSquareO;
diff --git a/types/react-icons/lib/fa/square.d.ts b/types/react-icons/lib/fa/square.d.ts
deleted file mode 100644
index c8c55b3742..0000000000
--- a/types/react-icons/lib/fa/square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSquare extends React.Component<IconBaseProps> { }
-export = FaSquare;
diff --git a/types/react-icons/lib/fa/stack-exchange.d.ts b/types/react-icons/lib/fa/stack-exchange.d.ts
deleted file mode 100644
index 9633c68c60..0000000000
--- a/types/react-icons/lib/fa/stack-exchange.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStackExchange extends React.Component<IconBaseProps> { }
-export = FaStackExchange;
diff --git a/types/react-icons/lib/fa/stack-overflow.d.ts b/types/react-icons/lib/fa/stack-overflow.d.ts
deleted file mode 100644
index d2abb6200e..0000000000
--- a/types/react-icons/lib/fa/stack-overflow.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStackOverflow extends React.Component<IconBaseProps> { }
-export = FaStackOverflow;
diff --git a/types/react-icons/lib/fa/star-half-empty.d.ts b/types/react-icons/lib/fa/star-half-empty.d.ts
deleted file mode 100644
index 6e43aa720b..0000000000
--- a/types/react-icons/lib/fa/star-half-empty.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStarHalfEmpty extends React.Component<IconBaseProps> { }
-export = FaStarHalfEmpty;
diff --git a/types/react-icons/lib/fa/star-half.d.ts b/types/react-icons/lib/fa/star-half.d.ts
deleted file mode 100644
index 4bfe025587..0000000000
--- a/types/react-icons/lib/fa/star-half.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStarHalf extends React.Component<IconBaseProps> { }
-export = FaStarHalf;
diff --git a/types/react-icons/lib/fa/star-o.d.ts b/types/react-icons/lib/fa/star-o.d.ts
deleted file mode 100644
index 1b23442802..0000000000
--- a/types/react-icons/lib/fa/star-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStarO extends React.Component<IconBaseProps> { }
-export = FaStarO;
diff --git a/types/react-icons/lib/fa/star.d.ts b/types/react-icons/lib/fa/star.d.ts
deleted file mode 100644
index a966cea689..0000000000
--- a/types/react-icons/lib/fa/star.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStar extends React.Component<IconBaseProps> { }
-export = FaStar;
diff --git a/types/react-icons/lib/fa/steam-square.d.ts b/types/react-icons/lib/fa/steam-square.d.ts
deleted file mode 100644
index 0beeef5491..0000000000
--- a/types/react-icons/lib/fa/steam-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSteamSquare extends React.Component<IconBaseProps> { }
-export = FaSteamSquare;
diff --git a/types/react-icons/lib/fa/steam.d.ts b/types/react-icons/lib/fa/steam.d.ts
deleted file mode 100644
index deebcf4ba4..0000000000
--- a/types/react-icons/lib/fa/steam.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSteam extends React.Component<IconBaseProps> { }
-export = FaSteam;
diff --git a/types/react-icons/lib/fa/step-backward.d.ts b/types/react-icons/lib/fa/step-backward.d.ts
deleted file mode 100644
index c2fd350405..0000000000
--- a/types/react-icons/lib/fa/step-backward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStepBackward extends React.Component<IconBaseProps> { }
-export = FaStepBackward;
diff --git a/types/react-icons/lib/fa/step-forward.d.ts b/types/react-icons/lib/fa/step-forward.d.ts
deleted file mode 100644
index efc7eca537..0000000000
--- a/types/react-icons/lib/fa/step-forward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStepForward extends React.Component<IconBaseProps> { }
-export = FaStepForward;
diff --git a/types/react-icons/lib/fa/stethoscope.d.ts b/types/react-icons/lib/fa/stethoscope.d.ts
deleted file mode 100644
index be5295c3f6..0000000000
--- a/types/react-icons/lib/fa/stethoscope.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStethoscope extends React.Component<IconBaseProps> { }
-export = FaStethoscope;
diff --git a/types/react-icons/lib/fa/sticky-note-o.d.ts b/types/react-icons/lib/fa/sticky-note-o.d.ts
deleted file mode 100644
index d3a5e10c9c..0000000000
--- a/types/react-icons/lib/fa/sticky-note-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStickyNoteO extends React.Component<IconBaseProps> { }
-export = FaStickyNoteO;
diff --git a/types/react-icons/lib/fa/sticky-note.d.ts b/types/react-icons/lib/fa/sticky-note.d.ts
deleted file mode 100644
index 6055d0e9a1..0000000000
--- a/types/react-icons/lib/fa/sticky-note.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStickyNote extends React.Component<IconBaseProps> { }
-export = FaStickyNote;
diff --git a/types/react-icons/lib/fa/stop-circle-o.d.ts b/types/react-icons/lib/fa/stop-circle-o.d.ts
deleted file mode 100644
index a8ef0eabdd..0000000000
--- a/types/react-icons/lib/fa/stop-circle-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStopCircleO extends React.Component<IconBaseProps> { }
-export = FaStopCircleO;
diff --git a/types/react-icons/lib/fa/stop-circle.d.ts b/types/react-icons/lib/fa/stop-circle.d.ts
deleted file mode 100644
index 20139906d9..0000000000
--- a/types/react-icons/lib/fa/stop-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStopCircle extends React.Component<IconBaseProps> { }
-export = FaStopCircle;
diff --git a/types/react-icons/lib/fa/stop.d.ts b/types/react-icons/lib/fa/stop.d.ts
deleted file mode 100644
index 1b249e5195..0000000000
--- a/types/react-icons/lib/fa/stop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStop extends React.Component<IconBaseProps> { }
-export = FaStop;
diff --git a/types/react-icons/lib/fa/street-view.d.ts b/types/react-icons/lib/fa/street-view.d.ts
deleted file mode 100644
index 18e5bae2b5..0000000000
--- a/types/react-icons/lib/fa/street-view.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStreetView extends React.Component<IconBaseProps> { }
-export = FaStreetView;
diff --git a/types/react-icons/lib/fa/strikethrough.d.ts b/types/react-icons/lib/fa/strikethrough.d.ts
deleted file mode 100644
index 46f2e36143..0000000000
--- a/types/react-icons/lib/fa/strikethrough.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStrikethrough extends React.Component<IconBaseProps> { }
-export = FaStrikethrough;
diff --git a/types/react-icons/lib/fa/stumbleupon-circle.d.ts b/types/react-icons/lib/fa/stumbleupon-circle.d.ts
deleted file mode 100644
index 67cdbea5cc..0000000000
--- a/types/react-icons/lib/fa/stumbleupon-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStumbleuponCircle extends React.Component<IconBaseProps> { }
-export = FaStumbleuponCircle;
diff --git a/types/react-icons/lib/fa/stumbleupon.d.ts b/types/react-icons/lib/fa/stumbleupon.d.ts
deleted file mode 100644
index 9585240ca8..0000000000
--- a/types/react-icons/lib/fa/stumbleupon.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaStumbleupon extends React.Component<IconBaseProps> { }
-export = FaStumbleupon;
diff --git a/types/react-icons/lib/fa/subscript.d.ts b/types/react-icons/lib/fa/subscript.d.ts
deleted file mode 100644
index a6c021ed1b..0000000000
--- a/types/react-icons/lib/fa/subscript.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSubscript extends React.Component<IconBaseProps> { }
-export = FaSubscript;
diff --git a/types/react-icons/lib/fa/subway.d.ts b/types/react-icons/lib/fa/subway.d.ts
deleted file mode 100644
index 2be51ef087..0000000000
--- a/types/react-icons/lib/fa/subway.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSubway extends React.Component<IconBaseProps> { }
-export = FaSubway;
diff --git a/types/react-icons/lib/fa/suitcase.d.ts b/types/react-icons/lib/fa/suitcase.d.ts
deleted file mode 100644
index bbf2b116f8..0000000000
--- a/types/react-icons/lib/fa/suitcase.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSuitcase extends React.Component<IconBaseProps> { }
-export = FaSuitcase;
diff --git a/types/react-icons/lib/fa/sun-o.d.ts b/types/react-icons/lib/fa/sun-o.d.ts
deleted file mode 100644
index 1699728fa0..0000000000
--- a/types/react-icons/lib/fa/sun-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSunO extends React.Component<IconBaseProps> { }
-export = FaSunO;
diff --git a/types/react-icons/lib/fa/superscript.d.ts b/types/react-icons/lib/fa/superscript.d.ts
deleted file mode 100644
index 5bce0a3419..0000000000
--- a/types/react-icons/lib/fa/superscript.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaSuperscript extends React.Component<IconBaseProps> { }
-export = FaSuperscript;
diff --git a/types/react-icons/lib/fa/table.d.ts b/types/react-icons/lib/fa/table.d.ts
deleted file mode 100644
index 28afb1a308..0000000000
--- a/types/react-icons/lib/fa/table.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTable extends React.Component<IconBaseProps> { }
-export = FaTable;
diff --git a/types/react-icons/lib/fa/tablet.d.ts b/types/react-icons/lib/fa/tablet.d.ts
deleted file mode 100644
index 5d06494d0f..0000000000
--- a/types/react-icons/lib/fa/tablet.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTablet extends React.Component<IconBaseProps> { }
-export = FaTablet;
diff --git a/types/react-icons/lib/fa/tag.d.ts b/types/react-icons/lib/fa/tag.d.ts
deleted file mode 100644
index 62793c87bd..0000000000
--- a/types/react-icons/lib/fa/tag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTag extends React.Component<IconBaseProps> { }
-export = FaTag;
diff --git a/types/react-icons/lib/fa/tags.d.ts b/types/react-icons/lib/fa/tags.d.ts
deleted file mode 100644
index acf244ad23..0000000000
--- a/types/react-icons/lib/fa/tags.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTags extends React.Component<IconBaseProps> { }
-export = FaTags;
diff --git a/types/react-icons/lib/fa/tasks.d.ts b/types/react-icons/lib/fa/tasks.d.ts
deleted file mode 100644
index 8b789168d7..0000000000
--- a/types/react-icons/lib/fa/tasks.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTasks extends React.Component<IconBaseProps> { }
-export = FaTasks;
diff --git a/types/react-icons/lib/fa/television.d.ts b/types/react-icons/lib/fa/television.d.ts
deleted file mode 100644
index 46612f202e..0000000000
--- a/types/react-icons/lib/fa/television.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTelevision extends React.Component<IconBaseProps> { }
-export = FaTelevision;
diff --git a/types/react-icons/lib/fa/tencent-weibo.d.ts b/types/react-icons/lib/fa/tencent-weibo.d.ts
deleted file mode 100644
index 294778fdf7..0000000000
--- a/types/react-icons/lib/fa/tencent-weibo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTencentWeibo extends React.Component<IconBaseProps> { }
-export = FaTencentWeibo;
diff --git a/types/react-icons/lib/fa/terminal.d.ts b/types/react-icons/lib/fa/terminal.d.ts
deleted file mode 100644
index 3dd4de7d08..0000000000
--- a/types/react-icons/lib/fa/terminal.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTerminal extends React.Component<IconBaseProps> { }
-export = FaTerminal;
diff --git a/types/react-icons/lib/fa/text-height.d.ts b/types/react-icons/lib/fa/text-height.d.ts
deleted file mode 100644
index ec3593b58c..0000000000
--- a/types/react-icons/lib/fa/text-height.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTextHeight extends React.Component<IconBaseProps> { }
-export = FaTextHeight;
diff --git a/types/react-icons/lib/fa/text-width.d.ts b/types/react-icons/lib/fa/text-width.d.ts
deleted file mode 100644
index 7bd6e24937..0000000000
--- a/types/react-icons/lib/fa/text-width.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTextWidth extends React.Component<IconBaseProps> { }
-export = FaTextWidth;
diff --git a/types/react-icons/lib/fa/th-large.d.ts b/types/react-icons/lib/fa/th-large.d.ts
deleted file mode 100644
index bb2e218190..0000000000
--- a/types/react-icons/lib/fa/th-large.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaThLarge extends React.Component<IconBaseProps> { }
-export = FaThLarge;
diff --git a/types/react-icons/lib/fa/th-list.d.ts b/types/react-icons/lib/fa/th-list.d.ts
deleted file mode 100644
index 1fad0c7ba2..0000000000
--- a/types/react-icons/lib/fa/th-list.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaThList extends React.Component<IconBaseProps> { }
-export = FaThList;
diff --git a/types/react-icons/lib/fa/th.d.ts b/types/react-icons/lib/fa/th.d.ts
deleted file mode 100644
index f9694f9e41..0000000000
--- a/types/react-icons/lib/fa/th.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTh extends React.Component<IconBaseProps> { }
-export = FaTh;
diff --git a/types/react-icons/lib/fa/thumb-tack.d.ts b/types/react-icons/lib/fa/thumb-tack.d.ts
deleted file mode 100644
index 6b89d609ea..0000000000
--- a/types/react-icons/lib/fa/thumb-tack.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaThumbTack extends React.Component<IconBaseProps> { }
-export = FaThumbTack;
diff --git a/types/react-icons/lib/fa/thumbs-down.d.ts b/types/react-icons/lib/fa/thumbs-down.d.ts
deleted file mode 100644
index 8aebed82ca..0000000000
--- a/types/react-icons/lib/fa/thumbs-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaThumbsDown extends React.Component<IconBaseProps> { }
-export = FaThumbsDown;
diff --git a/types/react-icons/lib/fa/thumbs-o-down.d.ts b/types/react-icons/lib/fa/thumbs-o-down.d.ts
deleted file mode 100644
index 734b175192..0000000000
--- a/types/react-icons/lib/fa/thumbs-o-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaThumbsODown extends React.Component<IconBaseProps> { }
-export = FaThumbsODown;
diff --git a/types/react-icons/lib/fa/thumbs-o-up.d.ts b/types/react-icons/lib/fa/thumbs-o-up.d.ts
deleted file mode 100644
index f01dc5e4c7..0000000000
--- a/types/react-icons/lib/fa/thumbs-o-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaThumbsOUp extends React.Component<IconBaseProps> { }
-export = FaThumbsOUp;
diff --git a/types/react-icons/lib/fa/thumbs-up.d.ts b/types/react-icons/lib/fa/thumbs-up.d.ts
deleted file mode 100644
index 0ffa122424..0000000000
--- a/types/react-icons/lib/fa/thumbs-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaThumbsUp extends React.Component<IconBaseProps> { }
-export = FaThumbsUp;
diff --git a/types/react-icons/lib/fa/ticket.d.ts b/types/react-icons/lib/fa/ticket.d.ts
deleted file mode 100644
index 897c6bdd5b..0000000000
--- a/types/react-icons/lib/fa/ticket.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTicket extends React.Component<IconBaseProps> { }
-export = FaTicket;
diff --git a/types/react-icons/lib/fa/times-circle-o.d.ts b/types/react-icons/lib/fa/times-circle-o.d.ts
deleted file mode 100644
index 66cf92eb25..0000000000
--- a/types/react-icons/lib/fa/times-circle-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTimesCircleO extends React.Component<IconBaseProps> { }
-export = FaTimesCircleO;
diff --git a/types/react-icons/lib/fa/times-circle.d.ts b/types/react-icons/lib/fa/times-circle.d.ts
deleted file mode 100644
index 6a278a7af7..0000000000
--- a/types/react-icons/lib/fa/times-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTimesCircle extends React.Component<IconBaseProps> { }
-export = FaTimesCircle;
diff --git a/types/react-icons/lib/fa/tint.d.ts b/types/react-icons/lib/fa/tint.d.ts
deleted file mode 100644
index 0c072a94d0..0000000000
--- a/types/react-icons/lib/fa/tint.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTint extends React.Component<IconBaseProps> { }
-export = FaTint;
diff --git a/types/react-icons/lib/fa/toggle-off.d.ts b/types/react-icons/lib/fa/toggle-off.d.ts
deleted file mode 100644
index f40e8262b0..0000000000
--- a/types/react-icons/lib/fa/toggle-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaToggleOff extends React.Component<IconBaseProps> { }
-export = FaToggleOff;
diff --git a/types/react-icons/lib/fa/toggle-on.d.ts b/types/react-icons/lib/fa/toggle-on.d.ts
deleted file mode 100644
index facfa825d0..0000000000
--- a/types/react-icons/lib/fa/toggle-on.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaToggleOn extends React.Component<IconBaseProps> { }
-export = FaToggleOn;
diff --git a/types/react-icons/lib/fa/trademark.d.ts b/types/react-icons/lib/fa/trademark.d.ts
deleted file mode 100644
index 19f3053e1b..0000000000
--- a/types/react-icons/lib/fa/trademark.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTrademark extends React.Component<IconBaseProps> { }
-export = FaTrademark;
diff --git a/types/react-icons/lib/fa/train.d.ts b/types/react-icons/lib/fa/train.d.ts
deleted file mode 100644
index d6220f152e..0000000000
--- a/types/react-icons/lib/fa/train.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTrain extends React.Component<IconBaseProps> { }
-export = FaTrain;
diff --git a/types/react-icons/lib/fa/transgender-alt.d.ts b/types/react-icons/lib/fa/transgender-alt.d.ts
deleted file mode 100644
index 9908511cfa..0000000000
--- a/types/react-icons/lib/fa/transgender-alt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTransgenderAlt extends React.Component<IconBaseProps> { }
-export = FaTransgenderAlt;
diff --git a/types/react-icons/lib/fa/trash-o.d.ts b/types/react-icons/lib/fa/trash-o.d.ts
deleted file mode 100644
index c4feb2f96e..0000000000
--- a/types/react-icons/lib/fa/trash-o.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTrashO extends React.Component<IconBaseProps> { }
-export = FaTrashO;
diff --git a/types/react-icons/lib/fa/trash.d.ts b/types/react-icons/lib/fa/trash.d.ts
deleted file mode 100644
index 81360b601d..0000000000
--- a/types/react-icons/lib/fa/trash.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTrash extends React.Component<IconBaseProps> { }
-export = FaTrash;
diff --git a/types/react-icons/lib/fa/tree.d.ts b/types/react-icons/lib/fa/tree.d.ts
deleted file mode 100644
index 60ef0e51dd..0000000000
--- a/types/react-icons/lib/fa/tree.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTree extends React.Component<IconBaseProps> { }
-export = FaTree;
diff --git a/types/react-icons/lib/fa/trello.d.ts b/types/react-icons/lib/fa/trello.d.ts
deleted file mode 100644
index 8cdf39ce46..0000000000
--- a/types/react-icons/lib/fa/trello.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTrello extends React.Component<IconBaseProps> { }
-export = FaTrello;
diff --git a/types/react-icons/lib/fa/tripadvisor.d.ts b/types/react-icons/lib/fa/tripadvisor.d.ts
deleted file mode 100644
index 2d3787a549..0000000000
--- a/types/react-icons/lib/fa/tripadvisor.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTripadvisor extends React.Component<IconBaseProps> { }
-export = FaTripadvisor;
diff --git a/types/react-icons/lib/fa/trophy.d.ts b/types/react-icons/lib/fa/trophy.d.ts
deleted file mode 100644
index 24833b8bdc..0000000000
--- a/types/react-icons/lib/fa/trophy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTrophy extends React.Component<IconBaseProps> { }
-export = FaTrophy;
diff --git a/types/react-icons/lib/fa/truck.d.ts b/types/react-icons/lib/fa/truck.d.ts
deleted file mode 100644
index a2e0768d49..0000000000
--- a/types/react-icons/lib/fa/truck.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTruck extends React.Component<IconBaseProps> { }
-export = FaTruck;
diff --git a/types/react-icons/lib/fa/try.d.ts b/types/react-icons/lib/fa/try.d.ts
deleted file mode 100644
index 1af849b3d9..0000000000
--- a/types/react-icons/lib/fa/try.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTry extends React.Component<IconBaseProps> { }
-export = FaTry;
diff --git a/types/react-icons/lib/fa/tty.d.ts b/types/react-icons/lib/fa/tty.d.ts
deleted file mode 100644
index ff3436e8ef..0000000000
--- a/types/react-icons/lib/fa/tty.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTty extends React.Component<IconBaseProps> { }
-export = FaTty;
diff --git a/types/react-icons/lib/fa/tumblr-square.d.ts b/types/react-icons/lib/fa/tumblr-square.d.ts
deleted file mode 100644
index a83b269822..0000000000
--- a/types/react-icons/lib/fa/tumblr-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTumblrSquare extends React.Component<IconBaseProps> { }
-export = FaTumblrSquare;
diff --git a/types/react-icons/lib/fa/tumblr.d.ts b/types/react-icons/lib/fa/tumblr.d.ts
deleted file mode 100644
index 57c62ede41..0000000000
--- a/types/react-icons/lib/fa/tumblr.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTumblr extends React.Component<IconBaseProps> { }
-export = FaTumblr;
diff --git a/types/react-icons/lib/fa/twitch.d.ts b/types/react-icons/lib/fa/twitch.d.ts
deleted file mode 100644
index 7bb9fb61f2..0000000000
--- a/types/react-icons/lib/fa/twitch.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTwitch extends React.Component<IconBaseProps> { }
-export = FaTwitch;
diff --git a/types/react-icons/lib/fa/twitter-square.d.ts b/types/react-icons/lib/fa/twitter-square.d.ts
deleted file mode 100644
index 3d1eea2b7a..0000000000
--- a/types/react-icons/lib/fa/twitter-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTwitterSquare extends React.Component<IconBaseProps> { }
-export = FaTwitterSquare;
diff --git a/types/react-icons/lib/fa/twitter.d.ts b/types/react-icons/lib/fa/twitter.d.ts
deleted file mode 100644
index 99d6f50e59..0000000000
--- a/types/react-icons/lib/fa/twitter.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaTwitter extends React.Component<IconBaseProps> { }
-export = FaTwitter;
diff --git a/types/react-icons/lib/fa/umbrella.d.ts b/types/react-icons/lib/fa/umbrella.d.ts
deleted file mode 100644
index 9f693678b6..0000000000
--- a/types/react-icons/lib/fa/umbrella.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaUmbrella extends React.Component<IconBaseProps> { }
-export = FaUmbrella;
diff --git a/types/react-icons/lib/fa/underline.d.ts b/types/react-icons/lib/fa/underline.d.ts
deleted file mode 100644
index 9ed692f7ee..0000000000
--- a/types/react-icons/lib/fa/underline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaUnderline extends React.Component<IconBaseProps> { }
-export = FaUnderline;
diff --git a/types/react-icons/lib/fa/universal-access.d.ts b/types/react-icons/lib/fa/universal-access.d.ts
deleted file mode 100644
index 5faf0a08df..0000000000
--- a/types/react-icons/lib/fa/universal-access.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaUniversalAccess extends React.Component<IconBaseProps> { }
-export = FaUniversalAccess;
diff --git a/types/react-icons/lib/fa/unlock-alt.d.ts b/types/react-icons/lib/fa/unlock-alt.d.ts
deleted file mode 100644
index a611a062ec..0000000000
--- a/types/react-icons/lib/fa/unlock-alt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaUnlockAlt extends React.Component<IconBaseProps> { }
-export = FaUnlockAlt;
diff --git a/types/react-icons/lib/fa/unlock.d.ts b/types/react-icons/lib/fa/unlock.d.ts
deleted file mode 100644
index c1ecdfe0b4..0000000000
--- a/types/react-icons/lib/fa/unlock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaUnlock extends React.Component<IconBaseProps> { }
-export = FaUnlock;
diff --git a/types/react-icons/lib/fa/upload.d.ts b/types/react-icons/lib/fa/upload.d.ts
deleted file mode 100644
index 56b379f32c..0000000000
--- a/types/react-icons/lib/fa/upload.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaUpload extends React.Component<IconBaseProps> { }
-export = FaUpload;
diff --git a/types/react-icons/lib/fa/usb.d.ts b/types/react-icons/lib/fa/usb.d.ts
deleted file mode 100644
index dcf434b5e3..0000000000
--- a/types/react-icons/lib/fa/usb.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaUsb extends React.Component<IconBaseProps> { }
-export = FaUsb;
diff --git a/types/react-icons/lib/fa/user-md.d.ts b/types/react-icons/lib/fa/user-md.d.ts
deleted file mode 100644
index 4250285358..0000000000
--- a/types/react-icons/lib/fa/user-md.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaUserMd extends React.Component<IconBaseProps> { }
-export = FaUserMd;
diff --git a/types/react-icons/lib/fa/user-plus.d.ts b/types/react-icons/lib/fa/user-plus.d.ts
deleted file mode 100644
index 90fc8b99da..0000000000
--- a/types/react-icons/lib/fa/user-plus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaUserPlus extends React.Component<IconBaseProps> { }
-export = FaUserPlus;
diff --git a/types/react-icons/lib/fa/user-secret.d.ts b/types/react-icons/lib/fa/user-secret.d.ts
deleted file mode 100644
index 154cf32bf3..0000000000
--- a/types/react-icons/lib/fa/user-secret.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaUserSecret extends React.Component<IconBaseProps> { }
-export = FaUserSecret;
diff --git a/types/react-icons/lib/fa/user-times.d.ts b/types/react-icons/lib/fa/user-times.d.ts
deleted file mode 100644
index c317fd3c0f..0000000000
--- a/types/react-icons/lib/fa/user-times.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaUserTimes extends React.Component<IconBaseProps> { }
-export = FaUserTimes;
diff --git a/types/react-icons/lib/fa/user.d.ts b/types/react-icons/lib/fa/user.d.ts
deleted file mode 100644
index 9267b99851..0000000000
--- a/types/react-icons/lib/fa/user.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaUser extends React.Component<IconBaseProps> { }
-export = FaUser;
diff --git a/types/react-icons/lib/fa/venus-double.d.ts b/types/react-icons/lib/fa/venus-double.d.ts
deleted file mode 100644
index 303aa8e94f..0000000000
--- a/types/react-icons/lib/fa/venus-double.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaVenusDouble extends React.Component<IconBaseProps> { }
-export = FaVenusDouble;
diff --git a/types/react-icons/lib/fa/venus-mars.d.ts b/types/react-icons/lib/fa/venus-mars.d.ts
deleted file mode 100644
index 528d6fb07d..0000000000
--- a/types/react-icons/lib/fa/venus-mars.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaVenusMars extends React.Component<IconBaseProps> { }
-export = FaVenusMars;
diff --git a/types/react-icons/lib/fa/venus.d.ts b/types/react-icons/lib/fa/venus.d.ts
deleted file mode 100644
index a36a82d280..0000000000
--- a/types/react-icons/lib/fa/venus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaVenus extends React.Component<IconBaseProps> { }
-export = FaVenus;
diff --git a/types/react-icons/lib/fa/viacoin.d.ts b/types/react-icons/lib/fa/viacoin.d.ts
deleted file mode 100644
index aef66b99c0..0000000000
--- a/types/react-icons/lib/fa/viacoin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaViacoin extends React.Component<IconBaseProps> { }
-export = FaViacoin;
diff --git a/types/react-icons/lib/fa/viadeo-square.d.ts b/types/react-icons/lib/fa/viadeo-square.d.ts
deleted file mode 100644
index 1e48563584..0000000000
--- a/types/react-icons/lib/fa/viadeo-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaViadeoSquare extends React.Component<IconBaseProps> { }
-export = FaViadeoSquare;
diff --git a/types/react-icons/lib/fa/viadeo.d.ts b/types/react-icons/lib/fa/viadeo.d.ts
deleted file mode 100644
index dd10eb198e..0000000000
--- a/types/react-icons/lib/fa/viadeo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaViadeo extends React.Component<IconBaseProps> { }
-export = FaViadeo;
diff --git a/types/react-icons/lib/fa/video-camera.d.ts b/types/react-icons/lib/fa/video-camera.d.ts
deleted file mode 100644
index 48830c332c..0000000000
--- a/types/react-icons/lib/fa/video-camera.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaVideoCamera extends React.Component<IconBaseProps> { }
-export = FaVideoCamera;
diff --git a/types/react-icons/lib/fa/vimeo-square.d.ts b/types/react-icons/lib/fa/vimeo-square.d.ts
deleted file mode 100644
index c9d881981d..0000000000
--- a/types/react-icons/lib/fa/vimeo-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaVimeoSquare extends React.Component<IconBaseProps> { }
-export = FaVimeoSquare;
diff --git a/types/react-icons/lib/fa/vimeo.d.ts b/types/react-icons/lib/fa/vimeo.d.ts
deleted file mode 100644
index a4928a0abc..0000000000
--- a/types/react-icons/lib/fa/vimeo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaVimeo extends React.Component<IconBaseProps> { }
-export = FaVimeo;
diff --git a/types/react-icons/lib/fa/vine.d.ts b/types/react-icons/lib/fa/vine.d.ts
deleted file mode 100644
index b99a2d39e8..0000000000
--- a/types/react-icons/lib/fa/vine.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaVine extends React.Component<IconBaseProps> { }
-export = FaVine;
diff --git a/types/react-icons/lib/fa/vk.d.ts b/types/react-icons/lib/fa/vk.d.ts
deleted file mode 100644
index 7851cdc69d..0000000000
--- a/types/react-icons/lib/fa/vk.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaVk extends React.Component<IconBaseProps> { }
-export = FaVk;
diff --git a/types/react-icons/lib/fa/volume-control-phone.d.ts b/types/react-icons/lib/fa/volume-control-phone.d.ts
deleted file mode 100644
index 6d23707c00..0000000000
--- a/types/react-icons/lib/fa/volume-control-phone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaVolumeControlPhone extends React.Component<IconBaseProps> { }
-export = FaVolumeControlPhone;
diff --git a/types/react-icons/lib/fa/volume-down.d.ts b/types/react-icons/lib/fa/volume-down.d.ts
deleted file mode 100644
index 7ccbf7d5f2..0000000000
--- a/types/react-icons/lib/fa/volume-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaVolumeDown extends React.Component<IconBaseProps> { }
-export = FaVolumeDown;
diff --git a/types/react-icons/lib/fa/volume-off.d.ts b/types/react-icons/lib/fa/volume-off.d.ts
deleted file mode 100644
index e51c9049b9..0000000000
--- a/types/react-icons/lib/fa/volume-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaVolumeOff extends React.Component<IconBaseProps> { }
-export = FaVolumeOff;
diff --git a/types/react-icons/lib/fa/volume-up.d.ts b/types/react-icons/lib/fa/volume-up.d.ts
deleted file mode 100644
index 645bb02c6e..0000000000
--- a/types/react-icons/lib/fa/volume-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaVolumeUp extends React.Component<IconBaseProps> { }
-export = FaVolumeUp;
diff --git a/types/react-icons/lib/fa/wechat.d.ts b/types/react-icons/lib/fa/wechat.d.ts
deleted file mode 100644
index 717b59bcac..0000000000
--- a/types/react-icons/lib/fa/wechat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaWechat extends React.Component<IconBaseProps> { }
-export = FaWechat;
diff --git a/types/react-icons/lib/fa/weibo.d.ts b/types/react-icons/lib/fa/weibo.d.ts
deleted file mode 100644
index 3025097a79..0000000000
--- a/types/react-icons/lib/fa/weibo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaWeibo extends React.Component<IconBaseProps> { }
-export = FaWeibo;
diff --git a/types/react-icons/lib/fa/whatsapp.d.ts b/types/react-icons/lib/fa/whatsapp.d.ts
deleted file mode 100644
index 0e6bda62ea..0000000000
--- a/types/react-icons/lib/fa/whatsapp.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaWhatsapp extends React.Component<IconBaseProps> { }
-export = FaWhatsapp;
diff --git a/types/react-icons/lib/fa/wheelchair-alt.d.ts b/types/react-icons/lib/fa/wheelchair-alt.d.ts
deleted file mode 100644
index dc1abda0b6..0000000000
--- a/types/react-icons/lib/fa/wheelchair-alt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaWheelchairAlt extends React.Component<IconBaseProps> { }
-export = FaWheelchairAlt;
diff --git a/types/react-icons/lib/fa/wheelchair.d.ts b/types/react-icons/lib/fa/wheelchair.d.ts
deleted file mode 100644
index ddbb4b4ac3..0000000000
--- a/types/react-icons/lib/fa/wheelchair.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaWheelchair extends React.Component<IconBaseProps> { }
-export = FaWheelchair;
diff --git a/types/react-icons/lib/fa/wifi.d.ts b/types/react-icons/lib/fa/wifi.d.ts
deleted file mode 100644
index 588ada2e51..0000000000
--- a/types/react-icons/lib/fa/wifi.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaWifi extends React.Component<IconBaseProps> { }
-export = FaWifi;
diff --git a/types/react-icons/lib/fa/wikipedia-w.d.ts b/types/react-icons/lib/fa/wikipedia-w.d.ts
deleted file mode 100644
index 6403e0d3d5..0000000000
--- a/types/react-icons/lib/fa/wikipedia-w.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaWikipediaW extends React.Component<IconBaseProps> { }
-export = FaWikipediaW;
diff --git a/types/react-icons/lib/fa/windows.d.ts b/types/react-icons/lib/fa/windows.d.ts
deleted file mode 100644
index 7f753ad855..0000000000
--- a/types/react-icons/lib/fa/windows.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaWindows extends React.Component<IconBaseProps> { }
-export = FaWindows;
diff --git a/types/react-icons/lib/fa/wordpress.d.ts b/types/react-icons/lib/fa/wordpress.d.ts
deleted file mode 100644
index 8233d1d08c..0000000000
--- a/types/react-icons/lib/fa/wordpress.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaWordpress extends React.Component<IconBaseProps> { }
-export = FaWordpress;
diff --git a/types/react-icons/lib/fa/wpbeginner.d.ts b/types/react-icons/lib/fa/wpbeginner.d.ts
deleted file mode 100644
index 153271dd71..0000000000
--- a/types/react-icons/lib/fa/wpbeginner.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaWpbeginner extends React.Component<IconBaseProps> { }
-export = FaWpbeginner;
diff --git a/types/react-icons/lib/fa/wpforms.d.ts b/types/react-icons/lib/fa/wpforms.d.ts
deleted file mode 100644
index a832827f4f..0000000000
--- a/types/react-icons/lib/fa/wpforms.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaWpforms extends React.Component<IconBaseProps> { }
-export = FaWpforms;
diff --git a/types/react-icons/lib/fa/wrench.d.ts b/types/react-icons/lib/fa/wrench.d.ts
deleted file mode 100644
index 8e0c85b7d1..0000000000
--- a/types/react-icons/lib/fa/wrench.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaWrench extends React.Component<IconBaseProps> { }
-export = FaWrench;
diff --git a/types/react-icons/lib/fa/xing-square.d.ts b/types/react-icons/lib/fa/xing-square.d.ts
deleted file mode 100644
index 91b9a2c908..0000000000
--- a/types/react-icons/lib/fa/xing-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaXingSquare extends React.Component<IconBaseProps> { }
-export = FaXingSquare;
diff --git a/types/react-icons/lib/fa/xing.d.ts b/types/react-icons/lib/fa/xing.d.ts
deleted file mode 100644
index a01172d7fe..0000000000
--- a/types/react-icons/lib/fa/xing.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaXing extends React.Component<IconBaseProps> { }
-export = FaXing;
diff --git a/types/react-icons/lib/fa/y-combinator.d.ts b/types/react-icons/lib/fa/y-combinator.d.ts
deleted file mode 100644
index f1df30eaa6..0000000000
--- a/types/react-icons/lib/fa/y-combinator.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaYCombinator extends React.Component<IconBaseProps> { }
-export = FaYCombinator;
diff --git a/types/react-icons/lib/fa/yahoo.d.ts b/types/react-icons/lib/fa/yahoo.d.ts
deleted file mode 100644
index 9012569101..0000000000
--- a/types/react-icons/lib/fa/yahoo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaYahoo extends React.Component<IconBaseProps> { }
-export = FaYahoo;
diff --git a/types/react-icons/lib/fa/yelp.d.ts b/types/react-icons/lib/fa/yelp.d.ts
deleted file mode 100644
index d0f6add472..0000000000
--- a/types/react-icons/lib/fa/yelp.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaYelp extends React.Component<IconBaseProps> { }
-export = FaYelp;
diff --git a/types/react-icons/lib/fa/youtube-play.d.ts b/types/react-icons/lib/fa/youtube-play.d.ts
deleted file mode 100644
index 91a5d66658..0000000000
--- a/types/react-icons/lib/fa/youtube-play.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaYoutubePlay extends React.Component<IconBaseProps> { }
-export = FaYoutubePlay;
diff --git a/types/react-icons/lib/fa/youtube-square.d.ts b/types/react-icons/lib/fa/youtube-square.d.ts
deleted file mode 100644
index 81ad16b87c..0000000000
--- a/types/react-icons/lib/fa/youtube-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaYoutubeSquare extends React.Component<IconBaseProps> { }
-export = FaYoutubeSquare;
diff --git a/types/react-icons/lib/fa/youtube.d.ts b/types/react-icons/lib/fa/youtube.d.ts
deleted file mode 100644
index 0c683aea91..0000000000
--- a/types/react-icons/lib/fa/youtube.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class FaYoutube extends React.Component<IconBaseProps> { }
-export = FaYoutube;
diff --git a/types/react-icons/lib/go/alert.d.ts b/types/react-icons/lib/go/alert.d.ts
deleted file mode 100644
index 8aef8e961b..0000000000
--- a/types/react-icons/lib/go/alert.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoAlert extends React.Component<IconBaseProps> { }
-export = GoAlert;
diff --git a/types/react-icons/lib/go/alignment-align.d.ts b/types/react-icons/lib/go/alignment-align.d.ts
deleted file mode 100644
index 43132f6c6a..0000000000
--- a/types/react-icons/lib/go/alignment-align.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoAlignmentAlign extends React.Component<IconBaseProps> { }
-export = GoAlignmentAlign;
diff --git a/types/react-icons/lib/go/alignment-aligned-to.d.ts b/types/react-icons/lib/go/alignment-aligned-to.d.ts
deleted file mode 100644
index 9aad06232d..0000000000
--- a/types/react-icons/lib/go/alignment-aligned-to.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoAlignmentAlignedTo extends React.Component<IconBaseProps> { }
-export = GoAlignmentAlignedTo;
diff --git a/types/react-icons/lib/go/alignment-unalign.d.ts b/types/react-icons/lib/go/alignment-unalign.d.ts
deleted file mode 100644
index 76e3d0701b..0000000000
--- a/types/react-icons/lib/go/alignment-unalign.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoAlignmentUnalign extends React.Component<IconBaseProps> { }
-export = GoAlignmentUnalign;
diff --git a/types/react-icons/lib/go/arrow-down.d.ts b/types/react-icons/lib/go/arrow-down.d.ts
deleted file mode 100644
index 065d81a32c..0000000000
--- a/types/react-icons/lib/go/arrow-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoArrowDown extends React.Component<IconBaseProps> { }
-export = GoArrowDown;
diff --git a/types/react-icons/lib/go/arrow-left.d.ts b/types/react-icons/lib/go/arrow-left.d.ts
deleted file mode 100644
index 341cada9b5..0000000000
--- a/types/react-icons/lib/go/arrow-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoArrowLeft extends React.Component<IconBaseProps> { }
-export = GoArrowLeft;
diff --git a/types/react-icons/lib/go/arrow-right.d.ts b/types/react-icons/lib/go/arrow-right.d.ts
deleted file mode 100644
index f3329ea8f5..0000000000
--- a/types/react-icons/lib/go/arrow-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoArrowRight extends React.Component<IconBaseProps> { }
-export = GoArrowRight;
diff --git a/types/react-icons/lib/go/arrow-small-down.d.ts b/types/react-icons/lib/go/arrow-small-down.d.ts
deleted file mode 100644
index 764e8a0445..0000000000
--- a/types/react-icons/lib/go/arrow-small-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoArrowSmallDown extends React.Component<IconBaseProps> { }
-export = GoArrowSmallDown;
diff --git a/types/react-icons/lib/go/arrow-small-left.d.ts b/types/react-icons/lib/go/arrow-small-left.d.ts
deleted file mode 100644
index 2df8a30523..0000000000
--- a/types/react-icons/lib/go/arrow-small-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoArrowSmallLeft extends React.Component<IconBaseProps> { }
-export = GoArrowSmallLeft;
diff --git a/types/react-icons/lib/go/arrow-small-right.d.ts b/types/react-icons/lib/go/arrow-small-right.d.ts
deleted file mode 100644
index 5d8ff51263..0000000000
--- a/types/react-icons/lib/go/arrow-small-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoArrowSmallRight extends React.Component<IconBaseProps> { }
-export = GoArrowSmallRight;
diff --git a/types/react-icons/lib/go/arrow-small-up.d.ts b/types/react-icons/lib/go/arrow-small-up.d.ts
deleted file mode 100644
index cdcf14f8b5..0000000000
--- a/types/react-icons/lib/go/arrow-small-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoArrowSmallUp extends React.Component<IconBaseProps> { }
-export = GoArrowSmallUp;
diff --git a/types/react-icons/lib/go/arrow-up.d.ts b/types/react-icons/lib/go/arrow-up.d.ts
deleted file mode 100644
index 7fc9d7b6f7..0000000000
--- a/types/react-icons/lib/go/arrow-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoArrowUp extends React.Component<IconBaseProps> { }
-export = GoArrowUp;
diff --git a/types/react-icons/lib/go/beer.d.ts b/types/react-icons/lib/go/beer.d.ts
deleted file mode 100644
index 1bd6a0bcea..0000000000
--- a/types/react-icons/lib/go/beer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoBeer extends React.Component<IconBaseProps> { }
-export = GoBeer;
diff --git a/types/react-icons/lib/go/book.d.ts b/types/react-icons/lib/go/book.d.ts
deleted file mode 100644
index 51a7772680..0000000000
--- a/types/react-icons/lib/go/book.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoBook extends React.Component<IconBaseProps> { }
-export = GoBook;
diff --git a/types/react-icons/lib/go/bookmark.d.ts b/types/react-icons/lib/go/bookmark.d.ts
deleted file mode 100644
index 8fa0cd40fa..0000000000
--- a/types/react-icons/lib/go/bookmark.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoBookmark extends React.Component<IconBaseProps> { }
-export = GoBookmark;
diff --git a/types/react-icons/lib/go/briefcase.d.ts b/types/react-icons/lib/go/briefcase.d.ts
deleted file mode 100644
index 3079133875..0000000000
--- a/types/react-icons/lib/go/briefcase.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoBriefcase extends React.Component<IconBaseProps> { }
-export = GoBriefcase;
diff --git a/types/react-icons/lib/go/broadcast.d.ts b/types/react-icons/lib/go/broadcast.d.ts
deleted file mode 100644
index 084c84f78c..0000000000
--- a/types/react-icons/lib/go/broadcast.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoBroadcast extends React.Component<IconBaseProps> { }
-export = GoBroadcast;
diff --git a/types/react-icons/lib/go/browser.d.ts b/types/react-icons/lib/go/browser.d.ts
deleted file mode 100644
index beca5e62c5..0000000000
--- a/types/react-icons/lib/go/browser.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoBrowser extends React.Component<IconBaseProps> { }
-export = GoBrowser;
diff --git a/types/react-icons/lib/go/bug.d.ts b/types/react-icons/lib/go/bug.d.ts
deleted file mode 100644
index 22adaa0d16..0000000000
--- a/types/react-icons/lib/go/bug.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoBug extends React.Component<IconBaseProps> { }
-export = GoBug;
diff --git a/types/react-icons/lib/go/calendar.d.ts b/types/react-icons/lib/go/calendar.d.ts
deleted file mode 100644
index 120a146e51..0000000000
--- a/types/react-icons/lib/go/calendar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoCalendar extends React.Component<IconBaseProps> { }
-export = GoCalendar;
diff --git a/types/react-icons/lib/go/check.d.ts b/types/react-icons/lib/go/check.d.ts
deleted file mode 100644
index 9222f5e01c..0000000000
--- a/types/react-icons/lib/go/check.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoCheck extends React.Component<IconBaseProps> { }
-export = GoCheck;
diff --git a/types/react-icons/lib/go/checklist.d.ts b/types/react-icons/lib/go/checklist.d.ts
deleted file mode 100644
index f94396328b..0000000000
--- a/types/react-icons/lib/go/checklist.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoChecklist extends React.Component<IconBaseProps> { }
-export = GoChecklist;
diff --git a/types/react-icons/lib/go/chevron-down.d.ts b/types/react-icons/lib/go/chevron-down.d.ts
deleted file mode 100644
index 8e2e05efc0..0000000000
--- a/types/react-icons/lib/go/chevron-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoChevronDown extends React.Component<IconBaseProps> { }
-export = GoChevronDown;
diff --git a/types/react-icons/lib/go/chevron-left.d.ts b/types/react-icons/lib/go/chevron-left.d.ts
deleted file mode 100644
index 2d35c85701..0000000000
--- a/types/react-icons/lib/go/chevron-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoChevronLeft extends React.Component<IconBaseProps> { }
-export = GoChevronLeft;
diff --git a/types/react-icons/lib/go/chevron-right.d.ts b/types/react-icons/lib/go/chevron-right.d.ts
deleted file mode 100644
index 785db2e7df..0000000000
--- a/types/react-icons/lib/go/chevron-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoChevronRight extends React.Component<IconBaseProps> { }
-export = GoChevronRight;
diff --git a/types/react-icons/lib/go/chevron-up.d.ts b/types/react-icons/lib/go/chevron-up.d.ts
deleted file mode 100644
index 3e2a2fba3f..0000000000
--- a/types/react-icons/lib/go/chevron-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoChevronUp extends React.Component<IconBaseProps> { }
-export = GoChevronUp;
diff --git a/types/react-icons/lib/go/circle-slash.d.ts b/types/react-icons/lib/go/circle-slash.d.ts
deleted file mode 100644
index f600dddd01..0000000000
--- a/types/react-icons/lib/go/circle-slash.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoCircleSlash extends React.Component<IconBaseProps> { }
-export = GoCircleSlash;
diff --git a/types/react-icons/lib/go/circuit-board.d.ts b/types/react-icons/lib/go/circuit-board.d.ts
deleted file mode 100644
index ca480fbb1e..0000000000
--- a/types/react-icons/lib/go/circuit-board.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoCircuitBoard extends React.Component<IconBaseProps> { }
-export = GoCircuitBoard;
diff --git a/types/react-icons/lib/go/clippy.d.ts b/types/react-icons/lib/go/clippy.d.ts
deleted file mode 100644
index 56be220e23..0000000000
--- a/types/react-icons/lib/go/clippy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoClippy extends React.Component<IconBaseProps> { }
-export = GoClippy;
diff --git a/types/react-icons/lib/go/clock.d.ts b/types/react-icons/lib/go/clock.d.ts
deleted file mode 100644
index a17c01626d..0000000000
--- a/types/react-icons/lib/go/clock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoClock extends React.Component<IconBaseProps> { }
-export = GoClock;
diff --git a/types/react-icons/lib/go/cloud-download.d.ts b/types/react-icons/lib/go/cloud-download.d.ts
deleted file mode 100644
index d494af7071..0000000000
--- a/types/react-icons/lib/go/cloud-download.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoCloudDownload extends React.Component<IconBaseProps> { }
-export = GoCloudDownload;
diff --git a/types/react-icons/lib/go/cloud-upload.d.ts b/types/react-icons/lib/go/cloud-upload.d.ts
deleted file mode 100644
index 8d0ea325a5..0000000000
--- a/types/react-icons/lib/go/cloud-upload.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoCloudUpload extends React.Component<IconBaseProps> { }
-export = GoCloudUpload;
diff --git a/types/react-icons/lib/go/code.d.ts b/types/react-icons/lib/go/code.d.ts
deleted file mode 100644
index 38a49e3638..0000000000
--- a/types/react-icons/lib/go/code.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoCode extends React.Component<IconBaseProps> { }
-export = GoCode;
diff --git a/types/react-icons/lib/go/color-mode.d.ts b/types/react-icons/lib/go/color-mode.d.ts
deleted file mode 100644
index c5e8ef618b..0000000000
--- a/types/react-icons/lib/go/color-mode.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoColorMode extends React.Component<IconBaseProps> { }
-export = GoColorMode;
diff --git a/types/react-icons/lib/go/comment-discussion.d.ts b/types/react-icons/lib/go/comment-discussion.d.ts
deleted file mode 100644
index ef8f85bade..0000000000
--- a/types/react-icons/lib/go/comment-discussion.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoCommentDiscussion extends React.Component<IconBaseProps> { }
-export = GoCommentDiscussion;
diff --git a/types/react-icons/lib/go/comment.d.ts b/types/react-icons/lib/go/comment.d.ts
deleted file mode 100644
index 2560216eed..0000000000
--- a/types/react-icons/lib/go/comment.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoComment extends React.Component<IconBaseProps> { }
-export = GoComment;
diff --git a/types/react-icons/lib/go/credit-card.d.ts b/types/react-icons/lib/go/credit-card.d.ts
deleted file mode 100644
index c312d533de..0000000000
--- a/types/react-icons/lib/go/credit-card.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoCreditCard extends React.Component<IconBaseProps> { }
-export = GoCreditCard;
diff --git a/types/react-icons/lib/go/dash.d.ts b/types/react-icons/lib/go/dash.d.ts
deleted file mode 100644
index f80213934e..0000000000
--- a/types/react-icons/lib/go/dash.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoDash extends React.Component<IconBaseProps> { }
-export = GoDash;
diff --git a/types/react-icons/lib/go/dashboard.d.ts b/types/react-icons/lib/go/dashboard.d.ts
deleted file mode 100644
index d1eae63855..0000000000
--- a/types/react-icons/lib/go/dashboard.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoDashboard extends React.Component<IconBaseProps> { }
-export = GoDashboard;
diff --git a/types/react-icons/lib/go/database.d.ts b/types/react-icons/lib/go/database.d.ts
deleted file mode 100644
index 2a02e50ff8..0000000000
--- a/types/react-icons/lib/go/database.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoDatabase extends React.Component<IconBaseProps> { }
-export = GoDatabase;
diff --git a/types/react-icons/lib/go/device-camera-video.d.ts b/types/react-icons/lib/go/device-camera-video.d.ts
deleted file mode 100644
index a397108cd8..0000000000
--- a/types/react-icons/lib/go/device-camera-video.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoDeviceCameraVideo extends React.Component<IconBaseProps> { }
-export = GoDeviceCameraVideo;
diff --git a/types/react-icons/lib/go/device-camera.d.ts b/types/react-icons/lib/go/device-camera.d.ts
deleted file mode 100644
index deffd102d3..0000000000
--- a/types/react-icons/lib/go/device-camera.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoDeviceCamera extends React.Component<IconBaseProps> { }
-export = GoDeviceCamera;
diff --git a/types/react-icons/lib/go/device-desktop.d.ts b/types/react-icons/lib/go/device-desktop.d.ts
deleted file mode 100644
index 8f371a1599..0000000000
--- a/types/react-icons/lib/go/device-desktop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoDeviceDesktop extends React.Component<IconBaseProps> { }
-export = GoDeviceDesktop;
diff --git a/types/react-icons/lib/go/device-mobile.d.ts b/types/react-icons/lib/go/device-mobile.d.ts
deleted file mode 100644
index 8a83aea856..0000000000
--- a/types/react-icons/lib/go/device-mobile.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoDeviceMobile extends React.Component<IconBaseProps> { }
-export = GoDeviceMobile;
diff --git a/types/react-icons/lib/go/diff-added.d.ts b/types/react-icons/lib/go/diff-added.d.ts
deleted file mode 100644
index 3c6b5773af..0000000000
--- a/types/react-icons/lib/go/diff-added.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoDiffAdded extends React.Component<IconBaseProps> { }
-export = GoDiffAdded;
diff --git a/types/react-icons/lib/go/diff-ignored.d.ts b/types/react-icons/lib/go/diff-ignored.d.ts
deleted file mode 100644
index a51e557b1f..0000000000
--- a/types/react-icons/lib/go/diff-ignored.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoDiffIgnored extends React.Component<IconBaseProps> { }
-export = GoDiffIgnored;
diff --git a/types/react-icons/lib/go/diff-modified.d.ts b/types/react-icons/lib/go/diff-modified.d.ts
deleted file mode 100644
index 731b2479a0..0000000000
--- a/types/react-icons/lib/go/diff-modified.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoDiffModified extends React.Component<IconBaseProps> { }
-export = GoDiffModified;
diff --git a/types/react-icons/lib/go/diff-removed.d.ts b/types/react-icons/lib/go/diff-removed.d.ts
deleted file mode 100644
index 87c2edc408..0000000000
--- a/types/react-icons/lib/go/diff-removed.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoDiffRemoved extends React.Component<IconBaseProps> { }
-export = GoDiffRemoved;
diff --git a/types/react-icons/lib/go/diff-renamed.d.ts b/types/react-icons/lib/go/diff-renamed.d.ts
deleted file mode 100644
index 9681af78b4..0000000000
--- a/types/react-icons/lib/go/diff-renamed.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoDiffRenamed extends React.Component<IconBaseProps> { }
-export = GoDiffRenamed;
diff --git a/types/react-icons/lib/go/diff.d.ts b/types/react-icons/lib/go/diff.d.ts
deleted file mode 100644
index 0198d4eea2..0000000000
--- a/types/react-icons/lib/go/diff.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoDiff extends React.Component<IconBaseProps> { }
-export = GoDiff;
diff --git a/types/react-icons/lib/go/ellipsis.d.ts b/types/react-icons/lib/go/ellipsis.d.ts
deleted file mode 100644
index 4723501dd1..0000000000
--- a/types/react-icons/lib/go/ellipsis.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoEllipsis extends React.Component<IconBaseProps> { }
-export = GoEllipsis;
diff --git a/types/react-icons/lib/go/eye.d.ts b/types/react-icons/lib/go/eye.d.ts
deleted file mode 100644
index 7938360f17..0000000000
--- a/types/react-icons/lib/go/eye.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoEye extends React.Component<IconBaseProps> { }
-export = GoEye;
diff --git a/types/react-icons/lib/go/file-binary.d.ts b/types/react-icons/lib/go/file-binary.d.ts
deleted file mode 100644
index 52ac8d832f..0000000000
--- a/types/react-icons/lib/go/file-binary.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoFileBinary extends React.Component<IconBaseProps> { }
-export = GoFileBinary;
diff --git a/types/react-icons/lib/go/file-code.d.ts b/types/react-icons/lib/go/file-code.d.ts
deleted file mode 100644
index e951dd2902..0000000000
--- a/types/react-icons/lib/go/file-code.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoFileCode extends React.Component<IconBaseProps> { }
-export = GoFileCode;
diff --git a/types/react-icons/lib/go/file-directory.d.ts b/types/react-icons/lib/go/file-directory.d.ts
deleted file mode 100644
index 209cff3957..0000000000
--- a/types/react-icons/lib/go/file-directory.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoFileDirectory extends React.Component<IconBaseProps> { }
-export = GoFileDirectory;
diff --git a/types/react-icons/lib/go/file-media.d.ts b/types/react-icons/lib/go/file-media.d.ts
deleted file mode 100644
index d8e1153b32..0000000000
--- a/types/react-icons/lib/go/file-media.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoFileMedia extends React.Component<IconBaseProps> { }
-export = GoFileMedia;
diff --git a/types/react-icons/lib/go/file-pdf.d.ts b/types/react-icons/lib/go/file-pdf.d.ts
deleted file mode 100644
index afedc960c7..0000000000
--- a/types/react-icons/lib/go/file-pdf.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoFilePdf extends React.Component<IconBaseProps> { }
-export = GoFilePdf;
diff --git a/types/react-icons/lib/go/file-submodule.d.ts b/types/react-icons/lib/go/file-submodule.d.ts
deleted file mode 100644
index d043de364d..0000000000
--- a/types/react-icons/lib/go/file-submodule.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoFileSubmodule extends React.Component<IconBaseProps> { }
-export = GoFileSubmodule;
diff --git a/types/react-icons/lib/go/file-symlink-directory.d.ts b/types/react-icons/lib/go/file-symlink-directory.d.ts
deleted file mode 100644
index 3065c11ecc..0000000000
--- a/types/react-icons/lib/go/file-symlink-directory.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoFileSymlinkDirectory extends React.Component<IconBaseProps> { }
-export = GoFileSymlinkDirectory;
diff --git a/types/react-icons/lib/go/file-symlink-file.d.ts b/types/react-icons/lib/go/file-symlink-file.d.ts
deleted file mode 100644
index d3fefe9e42..0000000000
--- a/types/react-icons/lib/go/file-symlink-file.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoFileSymlinkFile extends React.Component<IconBaseProps> { }
-export = GoFileSymlinkFile;
diff --git a/types/react-icons/lib/go/file-text.d.ts b/types/react-icons/lib/go/file-text.d.ts
deleted file mode 100644
index c478a383b6..0000000000
--- a/types/react-icons/lib/go/file-text.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoFileText extends React.Component<IconBaseProps> { }
-export = GoFileText;
diff --git a/types/react-icons/lib/go/file-zip.d.ts b/types/react-icons/lib/go/file-zip.d.ts
deleted file mode 100644
index c264cf3645..0000000000
--- a/types/react-icons/lib/go/file-zip.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoFileZip extends React.Component<IconBaseProps> { }
-export = GoFileZip;
diff --git a/types/react-icons/lib/go/flame.d.ts b/types/react-icons/lib/go/flame.d.ts
deleted file mode 100644
index d4e3186919..0000000000
--- a/types/react-icons/lib/go/flame.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoFlame extends React.Component<IconBaseProps> { }
-export = GoFlame;
diff --git a/types/react-icons/lib/go/fold.d.ts b/types/react-icons/lib/go/fold.d.ts
deleted file mode 100644
index 4b3c9758e7..0000000000
--- a/types/react-icons/lib/go/fold.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoFold extends React.Component<IconBaseProps> { }
-export = GoFold;
diff --git a/types/react-icons/lib/go/gear.d.ts b/types/react-icons/lib/go/gear.d.ts
deleted file mode 100644
index 6b6cdecc08..0000000000
--- a/types/react-icons/lib/go/gear.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoGear extends React.Component<IconBaseProps> { }
-export = GoGear;
diff --git a/types/react-icons/lib/go/gift.d.ts b/types/react-icons/lib/go/gift.d.ts
deleted file mode 100644
index ff70fb3c03..0000000000
--- a/types/react-icons/lib/go/gift.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoGift extends React.Component<IconBaseProps> { }
-export = GoGift;
diff --git a/types/react-icons/lib/go/gist-secret.d.ts b/types/react-icons/lib/go/gist-secret.d.ts
deleted file mode 100644
index 6118caaefe..0000000000
--- a/types/react-icons/lib/go/gist-secret.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoGistSecret extends React.Component<IconBaseProps> { }
-export = GoGistSecret;
diff --git a/types/react-icons/lib/go/gist.d.ts b/types/react-icons/lib/go/gist.d.ts
deleted file mode 100644
index 0575839e9c..0000000000
--- a/types/react-icons/lib/go/gist.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoGist extends React.Component<IconBaseProps> { }
-export = GoGist;
diff --git a/types/react-icons/lib/go/git-branch.d.ts b/types/react-icons/lib/go/git-branch.d.ts
deleted file mode 100644
index b6eea2dd39..0000000000
--- a/types/react-icons/lib/go/git-branch.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoGitBranch extends React.Component<IconBaseProps> { }
-export = GoGitBranch;
diff --git a/types/react-icons/lib/go/git-commit.d.ts b/types/react-icons/lib/go/git-commit.d.ts
deleted file mode 100644
index 920abef608..0000000000
--- a/types/react-icons/lib/go/git-commit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoGitCommit extends React.Component<IconBaseProps> { }
-export = GoGitCommit;
diff --git a/types/react-icons/lib/go/git-compare.d.ts b/types/react-icons/lib/go/git-compare.d.ts
deleted file mode 100644
index a114d0e6ab..0000000000
--- a/types/react-icons/lib/go/git-compare.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoGitCompare extends React.Component<IconBaseProps> { }
-export = GoGitCompare;
diff --git a/types/react-icons/lib/go/git-merge.d.ts b/types/react-icons/lib/go/git-merge.d.ts
deleted file mode 100644
index 0773f55a13..0000000000
--- a/types/react-icons/lib/go/git-merge.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoGitMerge extends React.Component<IconBaseProps> { }
-export = GoGitMerge;
diff --git a/types/react-icons/lib/go/git-pull-request.d.ts b/types/react-icons/lib/go/git-pull-request.d.ts
deleted file mode 100644
index c956d9dff7..0000000000
--- a/types/react-icons/lib/go/git-pull-request.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoGitPullRequest extends React.Component<IconBaseProps> { }
-export = GoGitPullRequest;
diff --git a/types/react-icons/lib/go/globe.d.ts b/types/react-icons/lib/go/globe.d.ts
deleted file mode 100644
index 7f3ed7047a..0000000000
--- a/types/react-icons/lib/go/globe.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoGlobe extends React.Component<IconBaseProps> { }
-export = GoGlobe;
diff --git a/types/react-icons/lib/go/graph.d.ts b/types/react-icons/lib/go/graph.d.ts
deleted file mode 100644
index 8b2f64778b..0000000000
--- a/types/react-icons/lib/go/graph.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoGraph extends React.Component<IconBaseProps> { }
-export = GoGraph;
diff --git a/types/react-icons/lib/go/heart.d.ts b/types/react-icons/lib/go/heart.d.ts
deleted file mode 100644
index 8184dfc37d..0000000000
--- a/types/react-icons/lib/go/heart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoHeart extends React.Component<IconBaseProps> { }
-export = GoHeart;
diff --git a/types/react-icons/lib/go/history.d.ts b/types/react-icons/lib/go/history.d.ts
deleted file mode 100644
index e53a70ca2c..0000000000
--- a/types/react-icons/lib/go/history.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoHistory extends React.Component<IconBaseProps> { }
-export = GoHistory;
diff --git a/types/react-icons/lib/go/home.d.ts b/types/react-icons/lib/go/home.d.ts
deleted file mode 100644
index a5141130b3..0000000000
--- a/types/react-icons/lib/go/home.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoHome extends React.Component<IconBaseProps> { }
-export = GoHome;
diff --git a/types/react-icons/lib/go/horizontal-rule.d.ts b/types/react-icons/lib/go/horizontal-rule.d.ts
deleted file mode 100644
index 543cf60a21..0000000000
--- a/types/react-icons/lib/go/horizontal-rule.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoHorizontalRule extends React.Component<IconBaseProps> { }
-export = GoHorizontalRule;
diff --git a/types/react-icons/lib/go/hourglass.d.ts b/types/react-icons/lib/go/hourglass.d.ts
deleted file mode 100644
index e922565bbe..0000000000
--- a/types/react-icons/lib/go/hourglass.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoHourglass extends React.Component<IconBaseProps> { }
-export = GoHourglass;
diff --git a/types/react-icons/lib/go/hubot.d.ts b/types/react-icons/lib/go/hubot.d.ts
deleted file mode 100644
index f465aa1993..0000000000
--- a/types/react-icons/lib/go/hubot.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoHubot extends React.Component<IconBaseProps> { }
-export = GoHubot;
diff --git a/types/react-icons/lib/go/inbox.d.ts b/types/react-icons/lib/go/inbox.d.ts
deleted file mode 100644
index 5e8d3432c4..0000000000
--- a/types/react-icons/lib/go/inbox.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoInbox extends React.Component<IconBaseProps> { }
-export = GoInbox;
diff --git a/types/react-icons/lib/go/index.d.ts b/types/react-icons/lib/go/index.d.ts
deleted file mode 100644
index 8248b9cfc9..0000000000
--- a/types/react-icons/lib/go/index.d.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-export { default as GoAlert } from "../../go/alert";
-export { default as GoAlignmentAlign } from "../../go/alignment-align";
-export { default as GoAlignmentAlignedTo } from "../../go/alignment-aligned-to";
-export { default as GoAlignmentUnalign } from "../../go/alignment-unalign";
-export { default as GoArrowDown } from "../../go/arrow-down";
-export { default as GoArrowLeft } from "../../go/arrow-left";
-export { default as GoArrowRight } from "../../go/arrow-right";
-export { default as GoArrowSmallDown } from "../../go/arrow-small-down";
-export { default as GoArrowSmallLeft } from "../../go/arrow-small-left";
-export { default as GoArrowSmallRight } from "../../go/arrow-small-right";
-export { default as GoArrowSmallUp } from "../../go/arrow-small-up";
-export { default as GoArrowUp } from "../../go/arrow-up";
-export { default as GoBeer } from "../../go/beer";
-export { default as GoBook } from "../../go/book";
-export { default as GoBookmark } from "../../go/bookmark";
-export { default as GoBriefcase } from "../../go/briefcase";
-export { default as GoBroadcast } from "../../go/broadcast";
-export { default as GoBrowser } from "../../go/browser";
-export { default as GoBug } from "../../go/bug";
-export { default as GoCalendar } from "../../go/calendar";
-export { default as GoCheck } from "../../go/check";
-export { default as GoChecklist } from "../../go/checklist";
-export { default as GoChevronDown } from "../../go/chevron-down";
-export { default as GoChevronLeft } from "../../go/chevron-left";
-export { default as GoChevronRight } from "../../go/chevron-right";
-export { default as GoChevronUp } from "../../go/chevron-up";
-export { default as GoCircleSlash } from "../../go/circle-slash";
-export { default as GoCircuitBoard } from "../../go/circuit-board";
-export { default as GoClippy } from "../../go/clippy";
-export { default as GoClock } from "../../go/clock";
-export { default as GoCloudDownload } from "../../go/cloud-download";
-export { default as GoCloudUpload } from "../../go/cloud-upload";
-export { default as GoCode } from "../../go/code";
-export { default as GoColorMode } from "../../go/color-mode";
-export { default as GoCommentDiscussion } from "../../go/comment-discussion";
-export { default as GoComment } from "../../go/comment";
-export { default as GoCreditCard } from "../../go/credit-card";
-export { default as GoDash } from "../../go/dash";
-export { default as GoDashboard } from "../../go/dashboard";
-export { default as GoDatabase } from "../../go/database";
-export { default as GoDeviceCameraVideo } from "../../go/device-camera-video";
-export { default as GoDeviceCamera } from "../../go/device-camera";
-export { default as GoDeviceDesktop } from "../../go/device-desktop";
-export { default as GoDeviceMobile } from "../../go/device-mobile";
-export { default as GoDiffAdded } from "../../go/diff-added";
-export { default as GoDiffIgnored } from "../../go/diff-ignored";
-export { default as GoDiffModified } from "../../go/diff-modified";
-export { default as GoDiffRemoved } from "../../go/diff-removed";
-export { default as GoDiffRenamed } from "../../go/diff-renamed";
-export { default as GoDiff } from "../../go/diff";
-export { default as GoEllipsis } from "../../go/ellipsis";
-export { default as GoEye } from "../../go/eye";
-export { default as GoFileBinary } from "../../go/file-binary";
-export { default as GoFileCode } from "../../go/file-code";
-export { default as GoFileDirectory } from "../../go/file-directory";
-export { default as GoFileMedia } from "../../go/file-media";
-export { default as GoFilePdf } from "../../go/file-pdf";
-export { default as GoFileSubmodule } from "../../go/file-submodule";
-export { default as GoFileSymlinkDirectory } from "../../go/file-symlink-directory";
-export { default as GoFileSymlinkFile } from "../../go/file-symlink-file";
-export { default as GoFileText } from "../../go/file-text";
-export { default as GoFileZip } from "../../go/file-zip";
-export { default as GoFlame } from "../../go/flame";
-export { default as GoFold } from "../../go/fold";
-export { default as GoGear } from "../../go/gear";
-export { default as GoGift } from "../../go/gift";
-export { default as GoGistSecret } from "../../go/gist-secret";
-export { default as GoGist } from "../../go/gist";
-export { default as GoGitBranch } from "../../go/git-branch";
-export { default as GoGitCommit } from "../../go/git-commit";
-export { default as GoGitCompare } from "../../go/git-compare";
-export { default as GoGitMerge } from "../../go/git-merge";
-export { default as GoGitPullRequest } from "../../go/git-pull-request";
-export { default as GoGlobe } from "../../go/globe";
-export { default as GoGraph } from "../../go/graph";
-export { default as GoHeart } from "../../go/heart";
-export { default as GoHistory } from "../../go/history";
-export { default as GoHome } from "../../go/home";
-export { default as GoHorizontalRule } from "../../go/horizontal-rule";
-export { default as GoHourglass } from "../../go/hourglass";
-export { default as GoHubot } from "../../go/hubot";
-export { default as GoInbox } from "../../go/inbox";
-export { default as GoInfo } from "../../go/info";
-export { default as GoIssueClosed } from "../../go/issue-closed";
-export { default as GoIssueOpened } from "../../go/issue-opened";
-export { default as GoIssueReopened } from "../../go/issue-reopened";
-export { default as GoJersey } from "../../go/jersey";
-export { default as GoJumpDown } from "../../go/jump-down";
-export { default as GoJumpLeft } from "../../go/jump-left";
-export { default as GoJumpRight } from "../../go/jump-right";
-export { default as GoJumpUp } from "../../go/jump-up";
-export { default as GoKey } from "../../go/key";
-export { default as GoKeyboard } from "../../go/keyboard";
-export { default as GoLaw } from "../../go/law";
-export { default as GoLightBulb } from "../../go/light-bulb";
-export { default as GoLinkExternal } from "../../go/link-external";
-export { default as GoLink } from "../../go/link";
-export { default as GoListOrdered } from "../../go/list-ordered";
-export { default as GoListUnordered } from "../../go/list-unordered";
-export { default as GoLocation } from "../../go/location";
-export { default as GoLock } from "../../go/lock";
-export { default as GoLogoGithub } from "../../go/logo-github";
-export { default as GoMailRead } from "../../go/mail-read";
-export { default as GoMailReply } from "../../go/mail-reply";
-export { default as GoMail } from "../../go/mail";
-export { default as GoMarkGithub } from "../../go/mark-github";
-export { default as GoMarkdown } from "../../go/markdown";
-export { default as GoMegaphone } from "../../go/megaphone";
-export { default as GoMention } from "../../go/mention";
-export { default as GoMicroscope } from "../../go/microscope";
-export { default as GoMilestone } from "../../go/milestone";
-export { default as GoMirror } from "../../go/mirror";
-export { default as GoMortarBoard } from "../../go/mortar-board";
-export { default as GoMoveDown } from "../../go/move-down";
-export { default as GoMoveLeft } from "../../go/move-left";
-export { default as GoMoveRight } from "../../go/move-right";
-export { default as GoMoveUp } from "../../go/move-up";
-export { default as GoMute } from "../../go/mute";
-export { default as GoNoNewline } from "../../go/no-newline";
-export { default as GoOctoface } from "../../go/octoface";
-export { default as GoOrganization } from "../../go/organization";
-export { default as GoPackage } from "../../go/package";
-export { default as GoPaintcan } from "../../go/paintcan";
-export { default as GoPencil } from "../../go/pencil";
-export { default as GoPerson } from "../../go/person";
-export { default as GoPin } from "../../go/pin";
-export { default as GoPlaybackFastForward } from "../../go/playback-fast-forward";
-export { default as GoPlaybackPause } from "../../go/playback-pause";
-export { default as GoPlaybackPlay } from "../../go/playback-play";
-export { default as GoPlaybackRewind } from "../../go/playback-rewind";
-export { default as GoPlug } from "../../go/plug";
-export { default as GoPlus } from "../../go/plus";
-export { default as GoPodium } from "../../go/podium";
-export { default as GoPrimitiveDot } from "../../go/primitive-dot";
-export { default as GoPrimitiveSquare } from "../../go/primitive-square";
-export { default as GoPulse } from "../../go/pulse";
-export { default as GoPuzzle } from "../../go/puzzle";
-export { default as GoQuestion } from "../../go/question";
-export { default as GoQuote } from "../../go/quote";
-export { default as GoRadioTower } from "../../go/radio-tower";
-export { default as GoRepoClone } from "../../go/repo-clone";
-export { default as GoRepoForcePush } from "../../go/repo-force-push";
-export { default as GoRepoForked } from "../../go/repo-forked";
-export { default as GoRepoPull } from "../../go/repo-pull";
-export { default as GoRepoPush } from "../../go/repo-push";
-export { default as GoRepo } from "../../go/repo";
-export { default as GoRocket } from "../../go/rocket";
-export { default as GoRss } from "../../go/rss";
-export { default as GoRuby } from "../../go/ruby";
-export { default as GoScreenFull } from "../../go/screen-full";
-export { default as GoScreenNormal } from "../../go/screen-normal";
-export { default as GoSearch } from "../../go/search";
-export { default as GoServer } from "../../go/server";
-export { default as GoSettings } from "../../go/settings";
-export { default as GoSignIn } from "../../go/sign-in";
-export { default as GoSignOut } from "../../go/sign-out";
-export { default as GoSplit } from "../../go/split";
-export { default as GoSquirrel } from "../../go/squirrel";
-export { default as GoStar } from "../../go/star";
-export { default as GoSteps } from "../../go/steps";
-export { default as GoStop } from "../../go/stop";
-export { default as GoSync } from "../../go/sync";
-export { default as GoTag } from "../../go/tag";
-export { default as GoTelescope } from "../../go/telescope";
-export { default as GoTerminal } from "../../go/terminal";
-export { default as GoThreeBars } from "../../go/three-bars";
-export { default as GoTools } from "../../go/tools";
-export { default as GoTrashcan } from "../../go/trashcan";
-export { default as GoTriangleDown } from "../../go/triangle-down";
-export { default as GoTriangleLeft } from "../../go/triangle-left";
-export { default as GoTriangleRight } from "../../go/triangle-right";
-export { default as GoTriangleUp } from "../../go/triangle-up";
-export { default as GoUnfold } from "../../go/unfold";
-export { default as GoUnmute } from "../../go/unmute";
-export { default as GoVersions } from "../../go/versions";
-export { default as GoX } from "../../go/x";
-export { default as GoZap } from "../../go/zap";
diff --git a/types/react-icons/lib/go/info.d.ts b/types/react-icons/lib/go/info.d.ts
deleted file mode 100644
index 76a01cf7f8..0000000000
--- a/types/react-icons/lib/go/info.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoInfo extends React.Component<IconBaseProps> { }
-export = GoInfo;
diff --git a/types/react-icons/lib/go/issue-closed.d.ts b/types/react-icons/lib/go/issue-closed.d.ts
deleted file mode 100644
index d2754f369a..0000000000
--- a/types/react-icons/lib/go/issue-closed.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoIssueClosed extends React.Component<IconBaseProps> { }
-export = GoIssueClosed;
diff --git a/types/react-icons/lib/go/issue-opened.d.ts b/types/react-icons/lib/go/issue-opened.d.ts
deleted file mode 100644
index d4eee6c362..0000000000
--- a/types/react-icons/lib/go/issue-opened.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoIssueOpened extends React.Component<IconBaseProps> { }
-export = GoIssueOpened;
diff --git a/types/react-icons/lib/go/issue-reopened.d.ts b/types/react-icons/lib/go/issue-reopened.d.ts
deleted file mode 100644
index d976356a2d..0000000000
--- a/types/react-icons/lib/go/issue-reopened.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoIssueReopened extends React.Component<IconBaseProps> { }
-export = GoIssueReopened;
diff --git a/types/react-icons/lib/go/jersey.d.ts b/types/react-icons/lib/go/jersey.d.ts
deleted file mode 100644
index 654f119755..0000000000
--- a/types/react-icons/lib/go/jersey.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoJersey extends React.Component<IconBaseProps> { }
-export = GoJersey;
diff --git a/types/react-icons/lib/go/jump-down.d.ts b/types/react-icons/lib/go/jump-down.d.ts
deleted file mode 100644
index ae6ad27ac3..0000000000
--- a/types/react-icons/lib/go/jump-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoJumpDown extends React.Component<IconBaseProps> { }
-export = GoJumpDown;
diff --git a/types/react-icons/lib/go/jump-left.d.ts b/types/react-icons/lib/go/jump-left.d.ts
deleted file mode 100644
index 14ebccb8c8..0000000000
--- a/types/react-icons/lib/go/jump-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoJumpLeft extends React.Component<IconBaseProps> { }
-export = GoJumpLeft;
diff --git a/types/react-icons/lib/go/jump-right.d.ts b/types/react-icons/lib/go/jump-right.d.ts
deleted file mode 100644
index 9f23d34e2f..0000000000
--- a/types/react-icons/lib/go/jump-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoJumpRight extends React.Component<IconBaseProps> { }
-export = GoJumpRight;
diff --git a/types/react-icons/lib/go/jump-up.d.ts b/types/react-icons/lib/go/jump-up.d.ts
deleted file mode 100644
index 02617bd211..0000000000
--- a/types/react-icons/lib/go/jump-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoJumpUp extends React.Component<IconBaseProps> { }
-export = GoJumpUp;
diff --git a/types/react-icons/lib/go/key.d.ts b/types/react-icons/lib/go/key.d.ts
deleted file mode 100644
index 7a3c114038..0000000000
--- a/types/react-icons/lib/go/key.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoKey extends React.Component<IconBaseProps> { }
-export = GoKey;
diff --git a/types/react-icons/lib/go/keyboard.d.ts b/types/react-icons/lib/go/keyboard.d.ts
deleted file mode 100644
index 0e4b588ae8..0000000000
--- a/types/react-icons/lib/go/keyboard.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoKeyboard extends React.Component<IconBaseProps> { }
-export = GoKeyboard;
diff --git a/types/react-icons/lib/go/law.d.ts b/types/react-icons/lib/go/law.d.ts
deleted file mode 100644
index 1e8869c457..0000000000
--- a/types/react-icons/lib/go/law.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoLaw extends React.Component<IconBaseProps> { }
-export = GoLaw;
diff --git a/types/react-icons/lib/go/light-bulb.d.ts b/types/react-icons/lib/go/light-bulb.d.ts
deleted file mode 100644
index 713bad1011..0000000000
--- a/types/react-icons/lib/go/light-bulb.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoLightBulb extends React.Component<IconBaseProps> { }
-export = GoLightBulb;
diff --git a/types/react-icons/lib/go/link-external.d.ts b/types/react-icons/lib/go/link-external.d.ts
deleted file mode 100644
index 3e564c8593..0000000000
--- a/types/react-icons/lib/go/link-external.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoLinkExternal extends React.Component<IconBaseProps> { }
-export = GoLinkExternal;
diff --git a/types/react-icons/lib/go/link.d.ts b/types/react-icons/lib/go/link.d.ts
deleted file mode 100644
index 7959f5c753..0000000000
--- a/types/react-icons/lib/go/link.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoLink extends React.Component<IconBaseProps> { }
-export = GoLink;
diff --git a/types/react-icons/lib/go/list-ordered.d.ts b/types/react-icons/lib/go/list-ordered.d.ts
deleted file mode 100644
index b44bcc47df..0000000000
--- a/types/react-icons/lib/go/list-ordered.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoListOrdered extends React.Component<IconBaseProps> { }
-export = GoListOrdered;
diff --git a/types/react-icons/lib/go/list-unordered.d.ts b/types/react-icons/lib/go/list-unordered.d.ts
deleted file mode 100644
index fd7cbd5584..0000000000
--- a/types/react-icons/lib/go/list-unordered.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoListUnordered extends React.Component<IconBaseProps> { }
-export = GoListUnordered;
diff --git a/types/react-icons/lib/go/location.d.ts b/types/react-icons/lib/go/location.d.ts
deleted file mode 100644
index bde5fb84db..0000000000
--- a/types/react-icons/lib/go/location.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoLocation extends React.Component<IconBaseProps> { }
-export = GoLocation;
diff --git a/types/react-icons/lib/go/lock.d.ts b/types/react-icons/lib/go/lock.d.ts
deleted file mode 100644
index 80dc012968..0000000000
--- a/types/react-icons/lib/go/lock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoLock extends React.Component<IconBaseProps> { }
-export = GoLock;
diff --git a/types/react-icons/lib/go/logo-github.d.ts b/types/react-icons/lib/go/logo-github.d.ts
deleted file mode 100644
index 9458204c5d..0000000000
--- a/types/react-icons/lib/go/logo-github.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoLogoGithub extends React.Component<IconBaseProps> { }
-export = GoLogoGithub;
diff --git a/types/react-icons/lib/go/mail-read.d.ts b/types/react-icons/lib/go/mail-read.d.ts
deleted file mode 100644
index e64ee6e5d1..0000000000
--- a/types/react-icons/lib/go/mail-read.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMailRead extends React.Component<IconBaseProps> { }
-export = GoMailRead;
diff --git a/types/react-icons/lib/go/mail-reply.d.ts b/types/react-icons/lib/go/mail-reply.d.ts
deleted file mode 100644
index 3a0e8d5eed..0000000000
--- a/types/react-icons/lib/go/mail-reply.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMailReply extends React.Component<IconBaseProps> { }
-export = GoMailReply;
diff --git a/types/react-icons/lib/go/mail.d.ts b/types/react-icons/lib/go/mail.d.ts
deleted file mode 100644
index fc209fa3a5..0000000000
--- a/types/react-icons/lib/go/mail.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMail extends React.Component<IconBaseProps> { }
-export = GoMail;
diff --git a/types/react-icons/lib/go/mark-github.d.ts b/types/react-icons/lib/go/mark-github.d.ts
deleted file mode 100644
index 9f98e3a09e..0000000000
--- a/types/react-icons/lib/go/mark-github.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMarkGithub extends React.Component<IconBaseProps> { }
-export = GoMarkGithub;
diff --git a/types/react-icons/lib/go/markdown.d.ts b/types/react-icons/lib/go/markdown.d.ts
deleted file mode 100644
index 389bdbea07..0000000000
--- a/types/react-icons/lib/go/markdown.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMarkdown extends React.Component<IconBaseProps> { }
-export = GoMarkdown;
diff --git a/types/react-icons/lib/go/megaphone.d.ts b/types/react-icons/lib/go/megaphone.d.ts
deleted file mode 100644
index 17341d4a48..0000000000
--- a/types/react-icons/lib/go/megaphone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMegaphone extends React.Component<IconBaseProps> { }
-export = GoMegaphone;
diff --git a/types/react-icons/lib/go/mention.d.ts b/types/react-icons/lib/go/mention.d.ts
deleted file mode 100644
index 9e9bda7554..0000000000
--- a/types/react-icons/lib/go/mention.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMention extends React.Component<IconBaseProps> { }
-export = GoMention;
diff --git a/types/react-icons/lib/go/microscope.d.ts b/types/react-icons/lib/go/microscope.d.ts
deleted file mode 100644
index fe37fac38f..0000000000
--- a/types/react-icons/lib/go/microscope.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMicroscope extends React.Component<IconBaseProps> { }
-export = GoMicroscope;
diff --git a/types/react-icons/lib/go/milestone.d.ts b/types/react-icons/lib/go/milestone.d.ts
deleted file mode 100644
index dbcee6ba5c..0000000000
--- a/types/react-icons/lib/go/milestone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMilestone extends React.Component<IconBaseProps> { }
-export = GoMilestone;
diff --git a/types/react-icons/lib/go/mirror.d.ts b/types/react-icons/lib/go/mirror.d.ts
deleted file mode 100644
index 8ebefa09ce..0000000000
--- a/types/react-icons/lib/go/mirror.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMirror extends React.Component<IconBaseProps> { }
-export = GoMirror;
diff --git a/types/react-icons/lib/go/mortar-board.d.ts b/types/react-icons/lib/go/mortar-board.d.ts
deleted file mode 100644
index e0f7816128..0000000000
--- a/types/react-icons/lib/go/mortar-board.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMortarBoard extends React.Component<IconBaseProps> { }
-export = GoMortarBoard;
diff --git a/types/react-icons/lib/go/move-down.d.ts b/types/react-icons/lib/go/move-down.d.ts
deleted file mode 100644
index 6cf46433f8..0000000000
--- a/types/react-icons/lib/go/move-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMoveDown extends React.Component<IconBaseProps> { }
-export = GoMoveDown;
diff --git a/types/react-icons/lib/go/move-left.d.ts b/types/react-icons/lib/go/move-left.d.ts
deleted file mode 100644
index 03d1b9e7af..0000000000
--- a/types/react-icons/lib/go/move-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMoveLeft extends React.Component<IconBaseProps> { }
-export = GoMoveLeft;
diff --git a/types/react-icons/lib/go/move-right.d.ts b/types/react-icons/lib/go/move-right.d.ts
deleted file mode 100644
index c59d02e53e..0000000000
--- a/types/react-icons/lib/go/move-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMoveRight extends React.Component<IconBaseProps> { }
-export = GoMoveRight;
diff --git a/types/react-icons/lib/go/move-up.d.ts b/types/react-icons/lib/go/move-up.d.ts
deleted file mode 100644
index 323a440aa2..0000000000
--- a/types/react-icons/lib/go/move-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMoveUp extends React.Component<IconBaseProps> { }
-export = GoMoveUp;
diff --git a/types/react-icons/lib/go/mute.d.ts b/types/react-icons/lib/go/mute.d.ts
deleted file mode 100644
index 2c80d9b279..0000000000
--- a/types/react-icons/lib/go/mute.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoMute extends React.Component<IconBaseProps> { }
-export = GoMute;
diff --git a/types/react-icons/lib/go/no-newline.d.ts b/types/react-icons/lib/go/no-newline.d.ts
deleted file mode 100644
index 10a616941d..0000000000
--- a/types/react-icons/lib/go/no-newline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoNoNewline extends React.Component<IconBaseProps> { }
-export = GoNoNewline;
diff --git a/types/react-icons/lib/go/octoface.d.ts b/types/react-icons/lib/go/octoface.d.ts
deleted file mode 100644
index 3f7b80ae04..0000000000
--- a/types/react-icons/lib/go/octoface.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoOctoface extends React.Component<IconBaseProps> { }
-export = GoOctoface;
diff --git a/types/react-icons/lib/go/organization.d.ts b/types/react-icons/lib/go/organization.d.ts
deleted file mode 100644
index 8f52ca1022..0000000000
--- a/types/react-icons/lib/go/organization.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoOrganization extends React.Component<IconBaseProps> { }
-export = GoOrganization;
diff --git a/types/react-icons/lib/go/package.d.ts b/types/react-icons/lib/go/package.d.ts
deleted file mode 100644
index 06688e276c..0000000000
--- a/types/react-icons/lib/go/package.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPackage extends React.Component<IconBaseProps> { }
-export = GoPackage;
diff --git a/types/react-icons/lib/go/paintcan.d.ts b/types/react-icons/lib/go/paintcan.d.ts
deleted file mode 100644
index 630fa3e367..0000000000
--- a/types/react-icons/lib/go/paintcan.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPaintcan extends React.Component<IconBaseProps> { }
-export = GoPaintcan;
diff --git a/types/react-icons/lib/go/pencil.d.ts b/types/react-icons/lib/go/pencil.d.ts
deleted file mode 100644
index 4a02f3c400..0000000000
--- a/types/react-icons/lib/go/pencil.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPencil extends React.Component<IconBaseProps> { }
-export = GoPencil;
diff --git a/types/react-icons/lib/go/person.d.ts b/types/react-icons/lib/go/person.d.ts
deleted file mode 100644
index 2949b9d660..0000000000
--- a/types/react-icons/lib/go/person.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPerson extends React.Component<IconBaseProps> { }
-export = GoPerson;
diff --git a/types/react-icons/lib/go/pin.d.ts b/types/react-icons/lib/go/pin.d.ts
deleted file mode 100644
index 901b36a91f..0000000000
--- a/types/react-icons/lib/go/pin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPin extends React.Component<IconBaseProps> { }
-export = GoPin;
diff --git a/types/react-icons/lib/go/playback-fast-forward.d.ts b/types/react-icons/lib/go/playback-fast-forward.d.ts
deleted file mode 100644
index 65348b544f..0000000000
--- a/types/react-icons/lib/go/playback-fast-forward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPlaybackFastForward extends React.Component<IconBaseProps> { }
-export = GoPlaybackFastForward;
diff --git a/types/react-icons/lib/go/playback-pause.d.ts b/types/react-icons/lib/go/playback-pause.d.ts
deleted file mode 100644
index 50f1cacef1..0000000000
--- a/types/react-icons/lib/go/playback-pause.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPlaybackPause extends React.Component<IconBaseProps> { }
-export = GoPlaybackPause;
diff --git a/types/react-icons/lib/go/playback-play.d.ts b/types/react-icons/lib/go/playback-play.d.ts
deleted file mode 100644
index 68a8dab132..0000000000
--- a/types/react-icons/lib/go/playback-play.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPlaybackPlay extends React.Component<IconBaseProps> { }
-export = GoPlaybackPlay;
diff --git a/types/react-icons/lib/go/playback-rewind.d.ts b/types/react-icons/lib/go/playback-rewind.d.ts
deleted file mode 100644
index a742b47fb6..0000000000
--- a/types/react-icons/lib/go/playback-rewind.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPlaybackRewind extends React.Component<IconBaseProps> { }
-export = GoPlaybackRewind;
diff --git a/types/react-icons/lib/go/plug.d.ts b/types/react-icons/lib/go/plug.d.ts
deleted file mode 100644
index 8265b0a4b1..0000000000
--- a/types/react-icons/lib/go/plug.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPlug extends React.Component<IconBaseProps> { }
-export = GoPlug;
diff --git a/types/react-icons/lib/go/plus.d.ts b/types/react-icons/lib/go/plus.d.ts
deleted file mode 100644
index e8c290d841..0000000000
--- a/types/react-icons/lib/go/plus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPlus extends React.Component<IconBaseProps> { }
-export = GoPlus;
diff --git a/types/react-icons/lib/go/podium.d.ts b/types/react-icons/lib/go/podium.d.ts
deleted file mode 100644
index 228759200d..0000000000
--- a/types/react-icons/lib/go/podium.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPodium extends React.Component<IconBaseProps> { }
-export = GoPodium;
diff --git a/types/react-icons/lib/go/primitive-dot.d.ts b/types/react-icons/lib/go/primitive-dot.d.ts
deleted file mode 100644
index 279fa40d18..0000000000
--- a/types/react-icons/lib/go/primitive-dot.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPrimitiveDot extends React.Component<IconBaseProps> { }
-export = GoPrimitiveDot;
diff --git a/types/react-icons/lib/go/primitive-square.d.ts b/types/react-icons/lib/go/primitive-square.d.ts
deleted file mode 100644
index d3e5ab1072..0000000000
--- a/types/react-icons/lib/go/primitive-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPrimitiveSquare extends React.Component<IconBaseProps> { }
-export = GoPrimitiveSquare;
diff --git a/types/react-icons/lib/go/pulse.d.ts b/types/react-icons/lib/go/pulse.d.ts
deleted file mode 100644
index 946e7e1eaa..0000000000
--- a/types/react-icons/lib/go/pulse.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPulse extends React.Component<IconBaseProps> { }
-export = GoPulse;
diff --git a/types/react-icons/lib/go/puzzle.d.ts b/types/react-icons/lib/go/puzzle.d.ts
deleted file mode 100644
index d684b5837c..0000000000
--- a/types/react-icons/lib/go/puzzle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoPuzzle extends React.Component<IconBaseProps> { }
-export = GoPuzzle;
diff --git a/types/react-icons/lib/go/question.d.ts b/types/react-icons/lib/go/question.d.ts
deleted file mode 100644
index 57824568fa..0000000000
--- a/types/react-icons/lib/go/question.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoQuestion extends React.Component<IconBaseProps> { }
-export = GoQuestion;
diff --git a/types/react-icons/lib/go/quote.d.ts b/types/react-icons/lib/go/quote.d.ts
deleted file mode 100644
index 13f1e5b5e7..0000000000
--- a/types/react-icons/lib/go/quote.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoQuote extends React.Component<IconBaseProps> { }
-export = GoQuote;
diff --git a/types/react-icons/lib/go/radio-tower.d.ts b/types/react-icons/lib/go/radio-tower.d.ts
deleted file mode 100644
index 81184f0449..0000000000
--- a/types/react-icons/lib/go/radio-tower.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoRadioTower extends React.Component<IconBaseProps> { }
-export = GoRadioTower;
diff --git a/types/react-icons/lib/go/repo-clone.d.ts b/types/react-icons/lib/go/repo-clone.d.ts
deleted file mode 100644
index 420126bd91..0000000000
--- a/types/react-icons/lib/go/repo-clone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoRepoClone extends React.Component<IconBaseProps> { }
-export = GoRepoClone;
diff --git a/types/react-icons/lib/go/repo-force-push.d.ts b/types/react-icons/lib/go/repo-force-push.d.ts
deleted file mode 100644
index 402458e84f..0000000000
--- a/types/react-icons/lib/go/repo-force-push.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoRepoForcePush extends React.Component<IconBaseProps> { }
-export = GoRepoForcePush;
diff --git a/types/react-icons/lib/go/repo-forked.d.ts b/types/react-icons/lib/go/repo-forked.d.ts
deleted file mode 100644
index 6f74430b17..0000000000
--- a/types/react-icons/lib/go/repo-forked.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoRepoForked extends React.Component<IconBaseProps> { }
-export = GoRepoForked;
diff --git a/types/react-icons/lib/go/repo-pull.d.ts b/types/react-icons/lib/go/repo-pull.d.ts
deleted file mode 100644
index d850692812..0000000000
--- a/types/react-icons/lib/go/repo-pull.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoRepoPull extends React.Component<IconBaseProps> { }
-export = GoRepoPull;
diff --git a/types/react-icons/lib/go/repo-push.d.ts b/types/react-icons/lib/go/repo-push.d.ts
deleted file mode 100644
index 13969c2624..0000000000
--- a/types/react-icons/lib/go/repo-push.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoRepoPush extends React.Component<IconBaseProps> { }
-export = GoRepoPush;
diff --git a/types/react-icons/lib/go/repo.d.ts b/types/react-icons/lib/go/repo.d.ts
deleted file mode 100644
index 88447bb207..0000000000
--- a/types/react-icons/lib/go/repo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoRepo extends React.Component<IconBaseProps> { }
-export = GoRepo;
diff --git a/types/react-icons/lib/go/rocket.d.ts b/types/react-icons/lib/go/rocket.d.ts
deleted file mode 100644
index 598924cb0b..0000000000
--- a/types/react-icons/lib/go/rocket.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoRocket extends React.Component<IconBaseProps> { }
-export = GoRocket;
diff --git a/types/react-icons/lib/go/rss.d.ts b/types/react-icons/lib/go/rss.d.ts
deleted file mode 100644
index 589f26cd86..0000000000
--- a/types/react-icons/lib/go/rss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoRss extends React.Component<IconBaseProps> { }
-export = GoRss;
diff --git a/types/react-icons/lib/go/ruby.d.ts b/types/react-icons/lib/go/ruby.d.ts
deleted file mode 100644
index bf16a7cefe..0000000000
--- a/types/react-icons/lib/go/ruby.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoRuby extends React.Component<IconBaseProps> { }
-export = GoRuby;
diff --git a/types/react-icons/lib/go/screen-full.d.ts b/types/react-icons/lib/go/screen-full.d.ts
deleted file mode 100644
index 4f324d4e81..0000000000
--- a/types/react-icons/lib/go/screen-full.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoScreenFull extends React.Component<IconBaseProps> { }
-export = GoScreenFull;
diff --git a/types/react-icons/lib/go/screen-normal.d.ts b/types/react-icons/lib/go/screen-normal.d.ts
deleted file mode 100644
index 433d928425..0000000000
--- a/types/react-icons/lib/go/screen-normal.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoScreenNormal extends React.Component<IconBaseProps> { }
-export = GoScreenNormal;
diff --git a/types/react-icons/lib/go/search.d.ts b/types/react-icons/lib/go/search.d.ts
deleted file mode 100644
index 9cb93f69d8..0000000000
--- a/types/react-icons/lib/go/search.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoSearch extends React.Component<IconBaseProps> { }
-export = GoSearch;
diff --git a/types/react-icons/lib/go/server.d.ts b/types/react-icons/lib/go/server.d.ts
deleted file mode 100644
index c421874095..0000000000
--- a/types/react-icons/lib/go/server.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoServer extends React.Component<IconBaseProps> { }
-export = GoServer;
diff --git a/types/react-icons/lib/go/settings.d.ts b/types/react-icons/lib/go/settings.d.ts
deleted file mode 100644
index 9baafba18d..0000000000
--- a/types/react-icons/lib/go/settings.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoSettings extends React.Component<IconBaseProps> { }
-export = GoSettings;
diff --git a/types/react-icons/lib/go/sign-in.d.ts b/types/react-icons/lib/go/sign-in.d.ts
deleted file mode 100644
index 68f20f5c22..0000000000
--- a/types/react-icons/lib/go/sign-in.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoSignIn extends React.Component<IconBaseProps> { }
-export = GoSignIn;
diff --git a/types/react-icons/lib/go/sign-out.d.ts b/types/react-icons/lib/go/sign-out.d.ts
deleted file mode 100644
index 44fb263813..0000000000
--- a/types/react-icons/lib/go/sign-out.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoSignOut extends React.Component<IconBaseProps> { }
-export = GoSignOut;
diff --git a/types/react-icons/lib/go/split.d.ts b/types/react-icons/lib/go/split.d.ts
deleted file mode 100644
index 66cf541941..0000000000
--- a/types/react-icons/lib/go/split.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoSplit extends React.Component<IconBaseProps> { }
-export = GoSplit;
diff --git a/types/react-icons/lib/go/squirrel.d.ts b/types/react-icons/lib/go/squirrel.d.ts
deleted file mode 100644
index fdbc692970..0000000000
--- a/types/react-icons/lib/go/squirrel.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoSquirrel extends React.Component<IconBaseProps> { }
-export = GoSquirrel;
diff --git a/types/react-icons/lib/go/star.d.ts b/types/react-icons/lib/go/star.d.ts
deleted file mode 100644
index 14d2ce7f4f..0000000000
--- a/types/react-icons/lib/go/star.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoStar extends React.Component<IconBaseProps> { }
-export = GoStar;
diff --git a/types/react-icons/lib/go/steps.d.ts b/types/react-icons/lib/go/steps.d.ts
deleted file mode 100644
index 493e4aa6d0..0000000000
--- a/types/react-icons/lib/go/steps.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoSteps extends React.Component<IconBaseProps> { }
-export = GoSteps;
diff --git a/types/react-icons/lib/go/stop.d.ts b/types/react-icons/lib/go/stop.d.ts
deleted file mode 100644
index 06ac2310bc..0000000000
--- a/types/react-icons/lib/go/stop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoStop extends React.Component<IconBaseProps> { }
-export = GoStop;
diff --git a/types/react-icons/lib/go/sync.d.ts b/types/react-icons/lib/go/sync.d.ts
deleted file mode 100644
index b882bc2575..0000000000
--- a/types/react-icons/lib/go/sync.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoSync extends React.Component<IconBaseProps> { }
-export = GoSync;
diff --git a/types/react-icons/lib/go/tag.d.ts b/types/react-icons/lib/go/tag.d.ts
deleted file mode 100644
index e24939fe9f..0000000000
--- a/types/react-icons/lib/go/tag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoTag extends React.Component<IconBaseProps> { }
-export = GoTag;
diff --git a/types/react-icons/lib/go/telescope.d.ts b/types/react-icons/lib/go/telescope.d.ts
deleted file mode 100644
index 5a4f2783d7..0000000000
--- a/types/react-icons/lib/go/telescope.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoTelescope extends React.Component<IconBaseProps> { }
-export = GoTelescope;
diff --git a/types/react-icons/lib/go/terminal.d.ts b/types/react-icons/lib/go/terminal.d.ts
deleted file mode 100644
index 3cf73c9c48..0000000000
--- a/types/react-icons/lib/go/terminal.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoTerminal extends React.Component<IconBaseProps> { }
-export = GoTerminal;
diff --git a/types/react-icons/lib/go/three-bars.d.ts b/types/react-icons/lib/go/three-bars.d.ts
deleted file mode 100644
index 6404d8df5a..0000000000
--- a/types/react-icons/lib/go/three-bars.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoThreeBars extends React.Component<IconBaseProps> { }
-export = GoThreeBars;
diff --git a/types/react-icons/lib/go/tools.d.ts b/types/react-icons/lib/go/tools.d.ts
deleted file mode 100644
index f5521eddd2..0000000000
--- a/types/react-icons/lib/go/tools.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoTools extends React.Component<IconBaseProps> { }
-export = GoTools;
diff --git a/types/react-icons/lib/go/trashcan.d.ts b/types/react-icons/lib/go/trashcan.d.ts
deleted file mode 100644
index f0fb6102fd..0000000000
--- a/types/react-icons/lib/go/trashcan.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoTrashcan extends React.Component<IconBaseProps> { }
-export = GoTrashcan;
diff --git a/types/react-icons/lib/go/triangle-down.d.ts b/types/react-icons/lib/go/triangle-down.d.ts
deleted file mode 100644
index faa8bad17c..0000000000
--- a/types/react-icons/lib/go/triangle-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoTriangleDown extends React.Component<IconBaseProps> { }
-export = GoTriangleDown;
diff --git a/types/react-icons/lib/go/triangle-left.d.ts b/types/react-icons/lib/go/triangle-left.d.ts
deleted file mode 100644
index 7597f35cf4..0000000000
--- a/types/react-icons/lib/go/triangle-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoTriangleLeft extends React.Component<IconBaseProps> { }
-export = GoTriangleLeft;
diff --git a/types/react-icons/lib/go/triangle-right.d.ts b/types/react-icons/lib/go/triangle-right.d.ts
deleted file mode 100644
index 78038cb7fa..0000000000
--- a/types/react-icons/lib/go/triangle-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoTriangleRight extends React.Component<IconBaseProps> { }
-export = GoTriangleRight;
diff --git a/types/react-icons/lib/go/triangle-up.d.ts b/types/react-icons/lib/go/triangle-up.d.ts
deleted file mode 100644
index 36d850dddf..0000000000
--- a/types/react-icons/lib/go/triangle-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoTriangleUp extends React.Component<IconBaseProps> { }
-export = GoTriangleUp;
diff --git a/types/react-icons/lib/go/unfold.d.ts b/types/react-icons/lib/go/unfold.d.ts
deleted file mode 100644
index 20945933b9..0000000000
--- a/types/react-icons/lib/go/unfold.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoUnfold extends React.Component<IconBaseProps> { }
-export = GoUnfold;
diff --git a/types/react-icons/lib/go/unmute.d.ts b/types/react-icons/lib/go/unmute.d.ts
deleted file mode 100644
index 99c79e0b3f..0000000000
--- a/types/react-icons/lib/go/unmute.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoUnmute extends React.Component<IconBaseProps> { }
-export = GoUnmute;
diff --git a/types/react-icons/lib/go/versions.d.ts b/types/react-icons/lib/go/versions.d.ts
deleted file mode 100644
index d1935af3ec..0000000000
--- a/types/react-icons/lib/go/versions.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoVersions extends React.Component<IconBaseProps> { }
-export = GoVersions;
diff --git a/types/react-icons/lib/go/x.d.ts b/types/react-icons/lib/go/x.d.ts
deleted file mode 100644
index 3b2e98de7e..0000000000
--- a/types/react-icons/lib/go/x.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoX extends React.Component<IconBaseProps> { }
-export = GoX;
diff --git a/types/react-icons/lib/go/zap.d.ts b/types/react-icons/lib/go/zap.d.ts
deleted file mode 100644
index 811445fa12..0000000000
--- a/types/react-icons/lib/go/zap.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class GoZap extends React.Component<IconBaseProps> { }
-export = GoZap;
diff --git a/types/react-icons/lib/io/alert-circled.d.ts b/types/react-icons/lib/io/alert-circled.d.ts
deleted file mode 100644
index 5f5151f700..0000000000
--- a/types/react-icons/lib/io/alert-circled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAlertCircled extends React.Component<IconBaseProps> { }
-export = IoAlertCircled;
diff --git a/types/react-icons/lib/io/alert.d.ts b/types/react-icons/lib/io/alert.d.ts
deleted file mode 100644
index c30dcde318..0000000000
--- a/types/react-icons/lib/io/alert.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAlert extends React.Component<IconBaseProps> { }
-export = IoAlert;
diff --git a/types/react-icons/lib/io/android-add-circle.d.ts b/types/react-icons/lib/io/android-add-circle.d.ts
deleted file mode 100644
index 2f2e549c01..0000000000
--- a/types/react-icons/lib/io/android-add-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidAddCircle extends React.Component<IconBaseProps> { }
-export = IoAndroidAddCircle;
diff --git a/types/react-icons/lib/io/android-add.d.ts b/types/react-icons/lib/io/android-add.d.ts
deleted file mode 100644
index f96f955ae1..0000000000
--- a/types/react-icons/lib/io/android-add.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidAdd extends React.Component<IconBaseProps> { }
-export = IoAndroidAdd;
diff --git a/types/react-icons/lib/io/android-alarm-clock.d.ts b/types/react-icons/lib/io/android-alarm-clock.d.ts
deleted file mode 100644
index 6a168fddec..0000000000
--- a/types/react-icons/lib/io/android-alarm-clock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidAlarmClock extends React.Component<IconBaseProps> { }
-export = IoAndroidAlarmClock;
diff --git a/types/react-icons/lib/io/android-alert.d.ts b/types/react-icons/lib/io/android-alert.d.ts
deleted file mode 100644
index 0f59d0103c..0000000000
--- a/types/react-icons/lib/io/android-alert.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidAlert extends React.Component<IconBaseProps> { }
-export = IoAndroidAlert;
diff --git a/types/react-icons/lib/io/android-apps.d.ts b/types/react-icons/lib/io/android-apps.d.ts
deleted file mode 100644
index 92be14083e..0000000000
--- a/types/react-icons/lib/io/android-apps.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidApps extends React.Component<IconBaseProps> { }
-export = IoAndroidApps;
diff --git a/types/react-icons/lib/io/android-archive.d.ts b/types/react-icons/lib/io/android-archive.d.ts
deleted file mode 100644
index d108a68ce1..0000000000
--- a/types/react-icons/lib/io/android-archive.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidArchive extends React.Component<IconBaseProps> { }
-export = IoAndroidArchive;
diff --git a/types/react-icons/lib/io/android-arrow-back.d.ts b/types/react-icons/lib/io/android-arrow-back.d.ts
deleted file mode 100644
index 2263310de6..0000000000
--- a/types/react-icons/lib/io/android-arrow-back.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidArrowBack extends React.Component<IconBaseProps> { }
-export = IoAndroidArrowBack;
diff --git a/types/react-icons/lib/io/android-arrow-down.d.ts b/types/react-icons/lib/io/android-arrow-down.d.ts
deleted file mode 100644
index febd414373..0000000000
--- a/types/react-icons/lib/io/android-arrow-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidArrowDown extends React.Component<IconBaseProps> { }
-export = IoAndroidArrowDown;
diff --git a/types/react-icons/lib/io/android-arrow-dropdown-circle.d.ts b/types/react-icons/lib/io/android-arrow-dropdown-circle.d.ts
deleted file mode 100644
index c74ce4befc..0000000000
--- a/types/react-icons/lib/io/android-arrow-dropdown-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidArrowDropdownCircle extends React.Component<IconBaseProps> { }
-export = IoAndroidArrowDropdownCircle;
diff --git a/types/react-icons/lib/io/android-arrow-dropdown.d.ts b/types/react-icons/lib/io/android-arrow-dropdown.d.ts
deleted file mode 100644
index a11298f79e..0000000000
--- a/types/react-icons/lib/io/android-arrow-dropdown.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidArrowDropdown extends React.Component<IconBaseProps> { }
-export = IoAndroidArrowDropdown;
diff --git a/types/react-icons/lib/io/android-arrow-dropleft-circle.d.ts b/types/react-icons/lib/io/android-arrow-dropleft-circle.d.ts
deleted file mode 100644
index ba18e42e00..0000000000
--- a/types/react-icons/lib/io/android-arrow-dropleft-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidArrowDropleftCircle extends React.Component<IconBaseProps> { }
-export = IoAndroidArrowDropleftCircle;
diff --git a/types/react-icons/lib/io/android-arrow-dropleft.d.ts b/types/react-icons/lib/io/android-arrow-dropleft.d.ts
deleted file mode 100644
index 4e67f8ec1c..0000000000
--- a/types/react-icons/lib/io/android-arrow-dropleft.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidArrowDropleft extends React.Component<IconBaseProps> { }
-export = IoAndroidArrowDropleft;
diff --git a/types/react-icons/lib/io/android-arrow-dropright-circle.d.ts b/types/react-icons/lib/io/android-arrow-dropright-circle.d.ts
deleted file mode 100644
index 6282d02d58..0000000000
--- a/types/react-icons/lib/io/android-arrow-dropright-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidArrowDroprightCircle extends React.Component<IconBaseProps> { }
-export = IoAndroidArrowDroprightCircle;
diff --git a/types/react-icons/lib/io/android-arrow-dropright.d.ts b/types/react-icons/lib/io/android-arrow-dropright.d.ts
deleted file mode 100644
index 0f6f702c6c..0000000000
--- a/types/react-icons/lib/io/android-arrow-dropright.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidArrowDropright extends React.Component<IconBaseProps> { }
-export = IoAndroidArrowDropright;
diff --git a/types/react-icons/lib/io/android-arrow-dropup-circle.d.ts b/types/react-icons/lib/io/android-arrow-dropup-circle.d.ts
deleted file mode 100644
index 0e4ed173e7..0000000000
--- a/types/react-icons/lib/io/android-arrow-dropup-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidArrowDropupCircle extends React.Component<IconBaseProps> { }
-export = IoAndroidArrowDropupCircle;
diff --git a/types/react-icons/lib/io/android-arrow-dropup.d.ts b/types/react-icons/lib/io/android-arrow-dropup.d.ts
deleted file mode 100644
index 548a6503dc..0000000000
--- a/types/react-icons/lib/io/android-arrow-dropup.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidArrowDropup extends React.Component<IconBaseProps> { }
-export = IoAndroidArrowDropup;
diff --git a/types/react-icons/lib/io/android-arrow-forward.d.ts b/types/react-icons/lib/io/android-arrow-forward.d.ts
deleted file mode 100644
index e2c44b78e6..0000000000
--- a/types/react-icons/lib/io/android-arrow-forward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidArrowForward extends React.Component<IconBaseProps> { }
-export = IoAndroidArrowForward;
diff --git a/types/react-icons/lib/io/android-arrow-up.d.ts b/types/react-icons/lib/io/android-arrow-up.d.ts
deleted file mode 100644
index 67a5f46f6c..0000000000
--- a/types/react-icons/lib/io/android-arrow-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidArrowUp extends React.Component<IconBaseProps> { }
-export = IoAndroidArrowUp;
diff --git a/types/react-icons/lib/io/android-attach.d.ts b/types/react-icons/lib/io/android-attach.d.ts
deleted file mode 100644
index 3f1e724664..0000000000
--- a/types/react-icons/lib/io/android-attach.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidAttach extends React.Component<IconBaseProps> { }
-export = IoAndroidAttach;
diff --git a/types/react-icons/lib/io/android-bar.d.ts b/types/react-icons/lib/io/android-bar.d.ts
deleted file mode 100644
index ed6e223e2b..0000000000
--- a/types/react-icons/lib/io/android-bar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidBar extends React.Component<IconBaseProps> { }
-export = IoAndroidBar;
diff --git a/types/react-icons/lib/io/android-bicycle.d.ts b/types/react-icons/lib/io/android-bicycle.d.ts
deleted file mode 100644
index 9d12e783cb..0000000000
--- a/types/react-icons/lib/io/android-bicycle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidBicycle extends React.Component<IconBaseProps> { }
-export = IoAndroidBicycle;
diff --git a/types/react-icons/lib/io/android-boat.d.ts b/types/react-icons/lib/io/android-boat.d.ts
deleted file mode 100644
index 61c5a805d3..0000000000
--- a/types/react-icons/lib/io/android-boat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidBoat extends React.Component<IconBaseProps> { }
-export = IoAndroidBoat;
diff --git a/types/react-icons/lib/io/android-bookmark.d.ts b/types/react-icons/lib/io/android-bookmark.d.ts
deleted file mode 100644
index 02286d994a..0000000000
--- a/types/react-icons/lib/io/android-bookmark.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidBookmark extends React.Component<IconBaseProps> { }
-export = IoAndroidBookmark;
diff --git a/types/react-icons/lib/io/android-bulb.d.ts b/types/react-icons/lib/io/android-bulb.d.ts
deleted file mode 100644
index c8658f0f8a..0000000000
--- a/types/react-icons/lib/io/android-bulb.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidBulb extends React.Component<IconBaseProps> { }
-export = IoAndroidBulb;
diff --git a/types/react-icons/lib/io/android-bus.d.ts b/types/react-icons/lib/io/android-bus.d.ts
deleted file mode 100644
index f4e7c8742e..0000000000
--- a/types/react-icons/lib/io/android-bus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidBus extends React.Component<IconBaseProps> { }
-export = IoAndroidBus;
diff --git a/types/react-icons/lib/io/android-calendar.d.ts b/types/react-icons/lib/io/android-calendar.d.ts
deleted file mode 100644
index 28331ff9ac..0000000000
--- a/types/react-icons/lib/io/android-calendar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCalendar extends React.Component<IconBaseProps> { }
-export = IoAndroidCalendar;
diff --git a/types/react-icons/lib/io/android-call.d.ts b/types/react-icons/lib/io/android-call.d.ts
deleted file mode 100644
index 130ab96563..0000000000
--- a/types/react-icons/lib/io/android-call.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCall extends React.Component<IconBaseProps> { }
-export = IoAndroidCall;
diff --git a/types/react-icons/lib/io/android-camera.d.ts b/types/react-icons/lib/io/android-camera.d.ts
deleted file mode 100644
index 8ec2f9732a..0000000000
--- a/types/react-icons/lib/io/android-camera.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCamera extends React.Component<IconBaseProps> { }
-export = IoAndroidCamera;
diff --git a/types/react-icons/lib/io/android-cancel.d.ts b/types/react-icons/lib/io/android-cancel.d.ts
deleted file mode 100644
index cce87b95f0..0000000000
--- a/types/react-icons/lib/io/android-cancel.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCancel extends React.Component<IconBaseProps> { }
-export = IoAndroidCancel;
diff --git a/types/react-icons/lib/io/android-car.d.ts b/types/react-icons/lib/io/android-car.d.ts
deleted file mode 100644
index 5b808e2ee3..0000000000
--- a/types/react-icons/lib/io/android-car.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCar extends React.Component<IconBaseProps> { }
-export = IoAndroidCar;
diff --git a/types/react-icons/lib/io/android-cart.d.ts b/types/react-icons/lib/io/android-cart.d.ts
deleted file mode 100644
index d821947f1a..0000000000
--- a/types/react-icons/lib/io/android-cart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCart extends React.Component<IconBaseProps> { }
-export = IoAndroidCart;
diff --git a/types/react-icons/lib/io/android-chat.d.ts b/types/react-icons/lib/io/android-chat.d.ts
deleted file mode 100644
index ac3d6d6d84..0000000000
--- a/types/react-icons/lib/io/android-chat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidChat extends React.Component<IconBaseProps> { }
-export = IoAndroidChat;
diff --git a/types/react-icons/lib/io/android-checkbox-blank.d.ts b/types/react-icons/lib/io/android-checkbox-blank.d.ts
deleted file mode 100644
index ea35930cd8..0000000000
--- a/types/react-icons/lib/io/android-checkbox-blank.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCheckboxBlank extends React.Component<IconBaseProps> { }
-export = IoAndroidCheckboxBlank;
diff --git a/types/react-icons/lib/io/android-checkbox-outline-blank.d.ts b/types/react-icons/lib/io/android-checkbox-outline-blank.d.ts
deleted file mode 100644
index 493db386e4..0000000000
--- a/types/react-icons/lib/io/android-checkbox-outline-blank.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCheckboxOutlineBlank extends React.Component<IconBaseProps> { }
-export = IoAndroidCheckboxOutlineBlank;
diff --git a/types/react-icons/lib/io/android-checkbox-outline.d.ts b/types/react-icons/lib/io/android-checkbox-outline.d.ts
deleted file mode 100644
index 8b27d97a12..0000000000
--- a/types/react-icons/lib/io/android-checkbox-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCheckboxOutline extends React.Component<IconBaseProps> { }
-export = IoAndroidCheckboxOutline;
diff --git a/types/react-icons/lib/io/android-checkbox.d.ts b/types/react-icons/lib/io/android-checkbox.d.ts
deleted file mode 100644
index 743201b816..0000000000
--- a/types/react-icons/lib/io/android-checkbox.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCheckbox extends React.Component<IconBaseProps> { }
-export = IoAndroidCheckbox;
diff --git a/types/react-icons/lib/io/android-checkmark-circle.d.ts b/types/react-icons/lib/io/android-checkmark-circle.d.ts
deleted file mode 100644
index b8bbf317e3..0000000000
--- a/types/react-icons/lib/io/android-checkmark-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCheckmarkCircle extends React.Component<IconBaseProps> { }
-export = IoAndroidCheckmarkCircle;
diff --git a/types/react-icons/lib/io/android-clipboard.d.ts b/types/react-icons/lib/io/android-clipboard.d.ts
deleted file mode 100644
index 78c0a197fc..0000000000
--- a/types/react-icons/lib/io/android-clipboard.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidClipboard extends React.Component<IconBaseProps> { }
-export = IoAndroidClipboard;
diff --git a/types/react-icons/lib/io/android-close.d.ts b/types/react-icons/lib/io/android-close.d.ts
deleted file mode 100644
index 4e9797dbb8..0000000000
--- a/types/react-icons/lib/io/android-close.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidClose extends React.Component<IconBaseProps> { }
-export = IoAndroidClose;
diff --git a/types/react-icons/lib/io/android-cloud-circle.d.ts b/types/react-icons/lib/io/android-cloud-circle.d.ts
deleted file mode 100644
index 976a7730e8..0000000000
--- a/types/react-icons/lib/io/android-cloud-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCloudCircle extends React.Component<IconBaseProps> { }
-export = IoAndroidCloudCircle;
diff --git a/types/react-icons/lib/io/android-cloud-done.d.ts b/types/react-icons/lib/io/android-cloud-done.d.ts
deleted file mode 100644
index 38baf11c4b..0000000000
--- a/types/react-icons/lib/io/android-cloud-done.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCloudDone extends React.Component<IconBaseProps> { }
-export = IoAndroidCloudDone;
diff --git a/types/react-icons/lib/io/android-cloud-outline.d.ts b/types/react-icons/lib/io/android-cloud-outline.d.ts
deleted file mode 100644
index 390718504b..0000000000
--- a/types/react-icons/lib/io/android-cloud-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCloudOutline extends React.Component<IconBaseProps> { }
-export = IoAndroidCloudOutline;
diff --git a/types/react-icons/lib/io/android-cloud.d.ts b/types/react-icons/lib/io/android-cloud.d.ts
deleted file mode 100644
index 276dde52c4..0000000000
--- a/types/react-icons/lib/io/android-cloud.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCloud extends React.Component<IconBaseProps> { }
-export = IoAndroidCloud;
diff --git a/types/react-icons/lib/io/android-color-palette.d.ts b/types/react-icons/lib/io/android-color-palette.d.ts
deleted file mode 100644
index d27a8c686a..0000000000
--- a/types/react-icons/lib/io/android-color-palette.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidColorPalette extends React.Component<IconBaseProps> { }
-export = IoAndroidColorPalette;
diff --git a/types/react-icons/lib/io/android-compass.d.ts b/types/react-icons/lib/io/android-compass.d.ts
deleted file mode 100644
index 0e09fa8b02..0000000000
--- a/types/react-icons/lib/io/android-compass.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCompass extends React.Component<IconBaseProps> { }
-export = IoAndroidCompass;
diff --git a/types/react-icons/lib/io/android-contact.d.ts b/types/react-icons/lib/io/android-contact.d.ts
deleted file mode 100644
index ee5ac203e7..0000000000
--- a/types/react-icons/lib/io/android-contact.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidContact extends React.Component<IconBaseProps> { }
-export = IoAndroidContact;
diff --git a/types/react-icons/lib/io/android-contacts.d.ts b/types/react-icons/lib/io/android-contacts.d.ts
deleted file mode 100644
index f7ad32a1c6..0000000000
--- a/types/react-icons/lib/io/android-contacts.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidContacts extends React.Component<IconBaseProps> { }
-export = IoAndroidContacts;
diff --git a/types/react-icons/lib/io/android-contract.d.ts b/types/react-icons/lib/io/android-contract.d.ts
deleted file mode 100644
index f5ee526460..0000000000
--- a/types/react-icons/lib/io/android-contract.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidContract extends React.Component<IconBaseProps> { }
-export = IoAndroidContract;
diff --git a/types/react-icons/lib/io/android-create.d.ts b/types/react-icons/lib/io/android-create.d.ts
deleted file mode 100644
index 7974150c7b..0000000000
--- a/types/react-icons/lib/io/android-create.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidCreate extends React.Component<IconBaseProps> { }
-export = IoAndroidCreate;
diff --git a/types/react-icons/lib/io/android-delete.d.ts b/types/react-icons/lib/io/android-delete.d.ts
deleted file mode 100644
index 3f4c83aa20..0000000000
--- a/types/react-icons/lib/io/android-delete.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidDelete extends React.Component<IconBaseProps> { }
-export = IoAndroidDelete;
diff --git a/types/react-icons/lib/io/android-desktop.d.ts b/types/react-icons/lib/io/android-desktop.d.ts
deleted file mode 100644
index f826e3735a..0000000000
--- a/types/react-icons/lib/io/android-desktop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidDesktop extends React.Component<IconBaseProps> { }
-export = IoAndroidDesktop;
diff --git a/types/react-icons/lib/io/android-document.d.ts b/types/react-icons/lib/io/android-document.d.ts
deleted file mode 100644
index e24e4ddb2c..0000000000
--- a/types/react-icons/lib/io/android-document.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidDocument extends React.Component<IconBaseProps> { }
-export = IoAndroidDocument;
diff --git a/types/react-icons/lib/io/android-done-all.d.ts b/types/react-icons/lib/io/android-done-all.d.ts
deleted file mode 100644
index 55ec050491..0000000000
--- a/types/react-icons/lib/io/android-done-all.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidDoneAll extends React.Component<IconBaseProps> { }
-export = IoAndroidDoneAll;
diff --git a/types/react-icons/lib/io/android-done.d.ts b/types/react-icons/lib/io/android-done.d.ts
deleted file mode 100644
index 5252d05cf6..0000000000
--- a/types/react-icons/lib/io/android-done.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidDone extends React.Component<IconBaseProps> { }
-export = IoAndroidDone;
diff --git a/types/react-icons/lib/io/android-download.d.ts b/types/react-icons/lib/io/android-download.d.ts
deleted file mode 100644
index cec9c411ca..0000000000
--- a/types/react-icons/lib/io/android-download.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidDownload extends React.Component<IconBaseProps> { }
-export = IoAndroidDownload;
diff --git a/types/react-icons/lib/io/android-drafts.d.ts b/types/react-icons/lib/io/android-drafts.d.ts
deleted file mode 100644
index 18be5b128c..0000000000
--- a/types/react-icons/lib/io/android-drafts.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidDrafts extends React.Component<IconBaseProps> { }
-export = IoAndroidDrafts;
diff --git a/types/react-icons/lib/io/android-exit.d.ts b/types/react-icons/lib/io/android-exit.d.ts
deleted file mode 100644
index f2d97ecdc5..0000000000
--- a/types/react-icons/lib/io/android-exit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidExit extends React.Component<IconBaseProps> { }
-export = IoAndroidExit;
diff --git a/types/react-icons/lib/io/android-expand.d.ts b/types/react-icons/lib/io/android-expand.d.ts
deleted file mode 100644
index e4d957b4f0..0000000000
--- a/types/react-icons/lib/io/android-expand.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidExpand extends React.Component<IconBaseProps> { }
-export = IoAndroidExpand;
diff --git a/types/react-icons/lib/io/android-favorite-outline.d.ts b/types/react-icons/lib/io/android-favorite-outline.d.ts
deleted file mode 100644
index b8736afb6b..0000000000
--- a/types/react-icons/lib/io/android-favorite-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidFavoriteOutline extends React.Component<IconBaseProps> { }
-export = IoAndroidFavoriteOutline;
diff --git a/types/react-icons/lib/io/android-favorite.d.ts b/types/react-icons/lib/io/android-favorite.d.ts
deleted file mode 100644
index 727facbe52..0000000000
--- a/types/react-icons/lib/io/android-favorite.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidFavorite extends React.Component<IconBaseProps> { }
-export = IoAndroidFavorite;
diff --git a/types/react-icons/lib/io/android-film.d.ts b/types/react-icons/lib/io/android-film.d.ts
deleted file mode 100644
index 66b52ca996..0000000000
--- a/types/react-icons/lib/io/android-film.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidFilm extends React.Component<IconBaseProps> { }
-export = IoAndroidFilm;
diff --git a/types/react-icons/lib/io/android-folder-open.d.ts b/types/react-icons/lib/io/android-folder-open.d.ts
deleted file mode 100644
index f718448caa..0000000000
--- a/types/react-icons/lib/io/android-folder-open.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidFolderOpen extends React.Component<IconBaseProps> { }
-export = IoAndroidFolderOpen;
diff --git a/types/react-icons/lib/io/android-folder.d.ts b/types/react-icons/lib/io/android-folder.d.ts
deleted file mode 100644
index 378a96e3cd..0000000000
--- a/types/react-icons/lib/io/android-folder.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidFolder extends React.Component<IconBaseProps> { }
-export = IoAndroidFolder;
diff --git a/types/react-icons/lib/io/android-funnel.d.ts b/types/react-icons/lib/io/android-funnel.d.ts
deleted file mode 100644
index d831baf36e..0000000000
--- a/types/react-icons/lib/io/android-funnel.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidFunnel extends React.Component<IconBaseProps> { }
-export = IoAndroidFunnel;
diff --git a/types/react-icons/lib/io/android-globe.d.ts b/types/react-icons/lib/io/android-globe.d.ts
deleted file mode 100644
index 5e8ce6c9d1..0000000000
--- a/types/react-icons/lib/io/android-globe.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidGlobe extends React.Component<IconBaseProps> { }
-export = IoAndroidGlobe;
diff --git a/types/react-icons/lib/io/android-hand.d.ts b/types/react-icons/lib/io/android-hand.d.ts
deleted file mode 100644
index 7f875b0c47..0000000000
--- a/types/react-icons/lib/io/android-hand.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidHand extends React.Component<IconBaseProps> { }
-export = IoAndroidHand;
diff --git a/types/react-icons/lib/io/android-hangout.d.ts b/types/react-icons/lib/io/android-hangout.d.ts
deleted file mode 100644
index fa4c4dc137..0000000000
--- a/types/react-icons/lib/io/android-hangout.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidHangout extends React.Component<IconBaseProps> { }
-export = IoAndroidHangout;
diff --git a/types/react-icons/lib/io/android-happy.d.ts b/types/react-icons/lib/io/android-happy.d.ts
deleted file mode 100644
index 0d81a84b94..0000000000
--- a/types/react-icons/lib/io/android-happy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidHappy extends React.Component<IconBaseProps> { }
-export = IoAndroidHappy;
diff --git a/types/react-icons/lib/io/android-home.d.ts b/types/react-icons/lib/io/android-home.d.ts
deleted file mode 100644
index 267c85c98e..0000000000
--- a/types/react-icons/lib/io/android-home.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidHome extends React.Component<IconBaseProps> { }
-export = IoAndroidHome;
diff --git a/types/react-icons/lib/io/android-image.d.ts b/types/react-icons/lib/io/android-image.d.ts
deleted file mode 100644
index 8972e43e07..0000000000
--- a/types/react-icons/lib/io/android-image.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidImage extends React.Component<IconBaseProps> { }
-export = IoAndroidImage;
diff --git a/types/react-icons/lib/io/android-laptop.d.ts b/types/react-icons/lib/io/android-laptop.d.ts
deleted file mode 100644
index d5e07af8d4..0000000000
--- a/types/react-icons/lib/io/android-laptop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidLaptop extends React.Component<IconBaseProps> { }
-export = IoAndroidLaptop;
diff --git a/types/react-icons/lib/io/android-list.d.ts b/types/react-icons/lib/io/android-list.d.ts
deleted file mode 100644
index ce01a34854..0000000000
--- a/types/react-icons/lib/io/android-list.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidList extends React.Component<IconBaseProps> { }
-export = IoAndroidList;
diff --git a/types/react-icons/lib/io/android-locate.d.ts b/types/react-icons/lib/io/android-locate.d.ts
deleted file mode 100644
index a5e54836d9..0000000000
--- a/types/react-icons/lib/io/android-locate.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidLocate extends React.Component<IconBaseProps> { }
-export = IoAndroidLocate;
diff --git a/types/react-icons/lib/io/android-lock.d.ts b/types/react-icons/lib/io/android-lock.d.ts
deleted file mode 100644
index d15e9dde78..0000000000
--- a/types/react-icons/lib/io/android-lock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidLock extends React.Component<IconBaseProps> { }
-export = IoAndroidLock;
diff --git a/types/react-icons/lib/io/android-mail.d.ts b/types/react-icons/lib/io/android-mail.d.ts
deleted file mode 100644
index 2465408b77..0000000000
--- a/types/react-icons/lib/io/android-mail.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidMail extends React.Component<IconBaseProps> { }
-export = IoAndroidMail;
diff --git a/types/react-icons/lib/io/android-map.d.ts b/types/react-icons/lib/io/android-map.d.ts
deleted file mode 100644
index 3066749134..0000000000
--- a/types/react-icons/lib/io/android-map.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidMap extends React.Component<IconBaseProps> { }
-export = IoAndroidMap;
diff --git a/types/react-icons/lib/io/android-menu.d.ts b/types/react-icons/lib/io/android-menu.d.ts
deleted file mode 100644
index 868ad478ff..0000000000
--- a/types/react-icons/lib/io/android-menu.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidMenu extends React.Component<IconBaseProps> { }
-export = IoAndroidMenu;
diff --git a/types/react-icons/lib/io/android-microphone-off.d.ts b/types/react-icons/lib/io/android-microphone-off.d.ts
deleted file mode 100644
index b3df997b00..0000000000
--- a/types/react-icons/lib/io/android-microphone-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidMicrophoneOff extends React.Component<IconBaseProps> { }
-export = IoAndroidMicrophoneOff;
diff --git a/types/react-icons/lib/io/android-microphone.d.ts b/types/react-icons/lib/io/android-microphone.d.ts
deleted file mode 100644
index 0ea8dc5a3f..0000000000
--- a/types/react-icons/lib/io/android-microphone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidMicrophone extends React.Component<IconBaseProps> { }
-export = IoAndroidMicrophone;
diff --git a/types/react-icons/lib/io/android-more-horizontal.d.ts b/types/react-icons/lib/io/android-more-horizontal.d.ts
deleted file mode 100644
index 231574bf5d..0000000000
--- a/types/react-icons/lib/io/android-more-horizontal.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidMoreHorizontal extends React.Component<IconBaseProps> { }
-export = IoAndroidMoreHorizontal;
diff --git a/types/react-icons/lib/io/android-more-vertical.d.ts b/types/react-icons/lib/io/android-more-vertical.d.ts
deleted file mode 100644
index aead3ae9fd..0000000000
--- a/types/react-icons/lib/io/android-more-vertical.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidMoreVertical extends React.Component<IconBaseProps> { }
-export = IoAndroidMoreVertical;
diff --git a/types/react-icons/lib/io/android-navigate.d.ts b/types/react-icons/lib/io/android-navigate.d.ts
deleted file mode 100644
index fdf359e643..0000000000
--- a/types/react-icons/lib/io/android-navigate.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidNavigate extends React.Component<IconBaseProps> { }
-export = IoAndroidNavigate;
diff --git a/types/react-icons/lib/io/android-notifications-none.d.ts b/types/react-icons/lib/io/android-notifications-none.d.ts
deleted file mode 100644
index 67894b2bca..0000000000
--- a/types/react-icons/lib/io/android-notifications-none.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidNotificationsNone extends React.Component<IconBaseProps> { }
-export = IoAndroidNotificationsNone;
diff --git a/types/react-icons/lib/io/android-notifications-off.d.ts b/types/react-icons/lib/io/android-notifications-off.d.ts
deleted file mode 100644
index 2bfa60b253..0000000000
--- a/types/react-icons/lib/io/android-notifications-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidNotificationsOff extends React.Component<IconBaseProps> { }
-export = IoAndroidNotificationsOff;
diff --git a/types/react-icons/lib/io/android-notifications.d.ts b/types/react-icons/lib/io/android-notifications.d.ts
deleted file mode 100644
index 21f92ed397..0000000000
--- a/types/react-icons/lib/io/android-notifications.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidNotifications extends React.Component<IconBaseProps> { }
-export = IoAndroidNotifications;
diff --git a/types/react-icons/lib/io/android-open.d.ts b/types/react-icons/lib/io/android-open.d.ts
deleted file mode 100644
index 186053e4fe..0000000000
--- a/types/react-icons/lib/io/android-open.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidOpen extends React.Component<IconBaseProps> { }
-export = IoAndroidOpen;
diff --git a/types/react-icons/lib/io/android-options.d.ts b/types/react-icons/lib/io/android-options.d.ts
deleted file mode 100644
index 1a02e94789..0000000000
--- a/types/react-icons/lib/io/android-options.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidOptions extends React.Component<IconBaseProps> { }
-export = IoAndroidOptions;
diff --git a/types/react-icons/lib/io/android-people.d.ts b/types/react-icons/lib/io/android-people.d.ts
deleted file mode 100644
index f2ee5547f1..0000000000
--- a/types/react-icons/lib/io/android-people.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidPeople extends React.Component<IconBaseProps> { }
-export = IoAndroidPeople;
diff --git a/types/react-icons/lib/io/android-person-add.d.ts b/types/react-icons/lib/io/android-person-add.d.ts
deleted file mode 100644
index 1a81999f85..0000000000
--- a/types/react-icons/lib/io/android-person-add.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidPersonAdd extends React.Component<IconBaseProps> { }
-export = IoAndroidPersonAdd;
diff --git a/types/react-icons/lib/io/android-person.d.ts b/types/react-icons/lib/io/android-person.d.ts
deleted file mode 100644
index 5ef1b2d2d5..0000000000
--- a/types/react-icons/lib/io/android-person.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidPerson extends React.Component<IconBaseProps> { }
-export = IoAndroidPerson;
diff --git a/types/react-icons/lib/io/android-phone-landscape.d.ts b/types/react-icons/lib/io/android-phone-landscape.d.ts
deleted file mode 100644
index ba076c50df..0000000000
--- a/types/react-icons/lib/io/android-phone-landscape.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidPhoneLandscape extends React.Component<IconBaseProps> { }
-export = IoAndroidPhoneLandscape;
diff --git a/types/react-icons/lib/io/android-phone-portrait.d.ts b/types/react-icons/lib/io/android-phone-portrait.d.ts
deleted file mode 100644
index c0e8363ed5..0000000000
--- a/types/react-icons/lib/io/android-phone-portrait.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidPhonePortrait extends React.Component<IconBaseProps> { }
-export = IoAndroidPhonePortrait;
diff --git a/types/react-icons/lib/io/android-pin.d.ts b/types/react-icons/lib/io/android-pin.d.ts
deleted file mode 100644
index 928bd7247c..0000000000
--- a/types/react-icons/lib/io/android-pin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidPin extends React.Component<IconBaseProps> { }
-export = IoAndroidPin;
diff --git a/types/react-icons/lib/io/android-plane.d.ts b/types/react-icons/lib/io/android-plane.d.ts
deleted file mode 100644
index 98704916c8..0000000000
--- a/types/react-icons/lib/io/android-plane.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidPlane extends React.Component<IconBaseProps> { }
-export = IoAndroidPlane;
diff --git a/types/react-icons/lib/io/android-playstore.d.ts b/types/react-icons/lib/io/android-playstore.d.ts
deleted file mode 100644
index 26f14fea70..0000000000
--- a/types/react-icons/lib/io/android-playstore.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidPlaystore extends React.Component<IconBaseProps> { }
-export = IoAndroidPlaystore;
diff --git a/types/react-icons/lib/io/android-print.d.ts b/types/react-icons/lib/io/android-print.d.ts
deleted file mode 100644
index 40c6cc7631..0000000000
--- a/types/react-icons/lib/io/android-print.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidPrint extends React.Component<IconBaseProps> { }
-export = IoAndroidPrint;
diff --git a/types/react-icons/lib/io/android-radio-button-off.d.ts b/types/react-icons/lib/io/android-radio-button-off.d.ts
deleted file mode 100644
index d5e637b6c6..0000000000
--- a/types/react-icons/lib/io/android-radio-button-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidRadioButtonOff extends React.Component<IconBaseProps> { }
-export = IoAndroidRadioButtonOff;
diff --git a/types/react-icons/lib/io/android-radio-button-on.d.ts b/types/react-icons/lib/io/android-radio-button-on.d.ts
deleted file mode 100644
index 9ad7514123..0000000000
--- a/types/react-icons/lib/io/android-radio-button-on.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidRadioButtonOn extends React.Component<IconBaseProps> { }
-export = IoAndroidRadioButtonOn;
diff --git a/types/react-icons/lib/io/android-refresh.d.ts b/types/react-icons/lib/io/android-refresh.d.ts
deleted file mode 100644
index deeb3fe43b..0000000000
--- a/types/react-icons/lib/io/android-refresh.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidRefresh extends React.Component<IconBaseProps> { }
-export = IoAndroidRefresh;
diff --git a/types/react-icons/lib/io/android-remove-circle.d.ts b/types/react-icons/lib/io/android-remove-circle.d.ts
deleted file mode 100644
index 80d0dfef57..0000000000
--- a/types/react-icons/lib/io/android-remove-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidRemoveCircle extends React.Component<IconBaseProps> { }
-export = IoAndroidRemoveCircle;
diff --git a/types/react-icons/lib/io/android-remove.d.ts b/types/react-icons/lib/io/android-remove.d.ts
deleted file mode 100644
index 9255e5e859..0000000000
--- a/types/react-icons/lib/io/android-remove.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidRemove extends React.Component<IconBaseProps> { }
-export = IoAndroidRemove;
diff --git a/types/react-icons/lib/io/android-restaurant.d.ts b/types/react-icons/lib/io/android-restaurant.d.ts
deleted file mode 100644
index 492c12f5d0..0000000000
--- a/types/react-icons/lib/io/android-restaurant.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidRestaurant extends React.Component<IconBaseProps> { }
-export = IoAndroidRestaurant;
diff --git a/types/react-icons/lib/io/android-sad.d.ts b/types/react-icons/lib/io/android-sad.d.ts
deleted file mode 100644
index 1ed6bf48e8..0000000000
--- a/types/react-icons/lib/io/android-sad.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidSad extends React.Component<IconBaseProps> { }
-export = IoAndroidSad;
diff --git a/types/react-icons/lib/io/android-search.d.ts b/types/react-icons/lib/io/android-search.d.ts
deleted file mode 100644
index e237357e4d..0000000000
--- a/types/react-icons/lib/io/android-search.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidSearch extends React.Component<IconBaseProps> { }
-export = IoAndroidSearch;
diff --git a/types/react-icons/lib/io/android-send.d.ts b/types/react-icons/lib/io/android-send.d.ts
deleted file mode 100644
index ee0efa2097..0000000000
--- a/types/react-icons/lib/io/android-send.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidSend extends React.Component<IconBaseProps> { }
-export = IoAndroidSend;
diff --git a/types/react-icons/lib/io/android-settings.d.ts b/types/react-icons/lib/io/android-settings.d.ts
deleted file mode 100644
index ab7b4d2da1..0000000000
--- a/types/react-icons/lib/io/android-settings.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidSettings extends React.Component<IconBaseProps> { }
-export = IoAndroidSettings;
diff --git a/types/react-icons/lib/io/android-share-alt.d.ts b/types/react-icons/lib/io/android-share-alt.d.ts
deleted file mode 100644
index b833a5ea78..0000000000
--- a/types/react-icons/lib/io/android-share-alt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidShareAlt extends React.Component<IconBaseProps> { }
-export = IoAndroidShareAlt;
diff --git a/types/react-icons/lib/io/android-share.d.ts b/types/react-icons/lib/io/android-share.d.ts
deleted file mode 100644
index 045317149c..0000000000
--- a/types/react-icons/lib/io/android-share.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidShare extends React.Component<IconBaseProps> { }
-export = IoAndroidShare;
diff --git a/types/react-icons/lib/io/android-star-half.d.ts b/types/react-icons/lib/io/android-star-half.d.ts
deleted file mode 100644
index 607b5f5035..0000000000
--- a/types/react-icons/lib/io/android-star-half.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidStarHalf extends React.Component<IconBaseProps> { }
-export = IoAndroidStarHalf;
diff --git a/types/react-icons/lib/io/android-star-outline.d.ts b/types/react-icons/lib/io/android-star-outline.d.ts
deleted file mode 100644
index ba99643a3e..0000000000
--- a/types/react-icons/lib/io/android-star-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidStarOutline extends React.Component<IconBaseProps> { }
-export = IoAndroidStarOutline;
diff --git a/types/react-icons/lib/io/android-star.d.ts b/types/react-icons/lib/io/android-star.d.ts
deleted file mode 100644
index 830503a5dc..0000000000
--- a/types/react-icons/lib/io/android-star.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidStar extends React.Component<IconBaseProps> { }
-export = IoAndroidStar;
diff --git a/types/react-icons/lib/io/android-stopwatch.d.ts b/types/react-icons/lib/io/android-stopwatch.d.ts
deleted file mode 100644
index fab66e6072..0000000000
--- a/types/react-icons/lib/io/android-stopwatch.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidStopwatch extends React.Component<IconBaseProps> { }
-export = IoAndroidStopwatch;
diff --git a/types/react-icons/lib/io/android-subway.d.ts b/types/react-icons/lib/io/android-subway.d.ts
deleted file mode 100644
index 19adba3f4b..0000000000
--- a/types/react-icons/lib/io/android-subway.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidSubway extends React.Component<IconBaseProps> { }
-export = IoAndroidSubway;
diff --git a/types/react-icons/lib/io/android-sunny.d.ts b/types/react-icons/lib/io/android-sunny.d.ts
deleted file mode 100644
index 5cc49715d8..0000000000
--- a/types/react-icons/lib/io/android-sunny.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidSunny extends React.Component<IconBaseProps> { }
-export = IoAndroidSunny;
diff --git a/types/react-icons/lib/io/android-sync.d.ts b/types/react-icons/lib/io/android-sync.d.ts
deleted file mode 100644
index e96dbf6b3d..0000000000
--- a/types/react-icons/lib/io/android-sync.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidSync extends React.Component<IconBaseProps> { }
-export = IoAndroidSync;
diff --git a/types/react-icons/lib/io/android-textsms.d.ts b/types/react-icons/lib/io/android-textsms.d.ts
deleted file mode 100644
index 06c59d582b..0000000000
--- a/types/react-icons/lib/io/android-textsms.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidTextsms extends React.Component<IconBaseProps> { }
-export = IoAndroidTextsms;
diff --git a/types/react-icons/lib/io/android-time.d.ts b/types/react-icons/lib/io/android-time.d.ts
deleted file mode 100644
index 934829c7db..0000000000
--- a/types/react-icons/lib/io/android-time.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidTime extends React.Component<IconBaseProps> { }
-export = IoAndroidTime;
diff --git a/types/react-icons/lib/io/android-train.d.ts b/types/react-icons/lib/io/android-train.d.ts
deleted file mode 100644
index a37d8f8402..0000000000
--- a/types/react-icons/lib/io/android-train.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidTrain extends React.Component<IconBaseProps> { }
-export = IoAndroidTrain;
diff --git a/types/react-icons/lib/io/android-unlock.d.ts b/types/react-icons/lib/io/android-unlock.d.ts
deleted file mode 100644
index 4ee8e33508..0000000000
--- a/types/react-icons/lib/io/android-unlock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidUnlock extends React.Component<IconBaseProps> { }
-export = IoAndroidUnlock;
diff --git a/types/react-icons/lib/io/android-upload.d.ts b/types/react-icons/lib/io/android-upload.d.ts
deleted file mode 100644
index e0643362b5..0000000000
--- a/types/react-icons/lib/io/android-upload.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidUpload extends React.Component<IconBaseProps> { }
-export = IoAndroidUpload;
diff --git a/types/react-icons/lib/io/android-volume-down.d.ts b/types/react-icons/lib/io/android-volume-down.d.ts
deleted file mode 100644
index 9ec7c47caf..0000000000
--- a/types/react-icons/lib/io/android-volume-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidVolumeDown extends React.Component<IconBaseProps> { }
-export = IoAndroidVolumeDown;
diff --git a/types/react-icons/lib/io/android-volume-mute.d.ts b/types/react-icons/lib/io/android-volume-mute.d.ts
deleted file mode 100644
index 86dbdd1ca9..0000000000
--- a/types/react-icons/lib/io/android-volume-mute.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidVolumeMute extends React.Component<IconBaseProps> { }
-export = IoAndroidVolumeMute;
diff --git a/types/react-icons/lib/io/android-volume-off.d.ts b/types/react-icons/lib/io/android-volume-off.d.ts
deleted file mode 100644
index dd077d1d06..0000000000
--- a/types/react-icons/lib/io/android-volume-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidVolumeOff extends React.Component<IconBaseProps> { }
-export = IoAndroidVolumeOff;
diff --git a/types/react-icons/lib/io/android-volume-up.d.ts b/types/react-icons/lib/io/android-volume-up.d.ts
deleted file mode 100644
index 11ea99a2ae..0000000000
--- a/types/react-icons/lib/io/android-volume-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidVolumeUp extends React.Component<IconBaseProps> { }
-export = IoAndroidVolumeUp;
diff --git a/types/react-icons/lib/io/android-walk.d.ts b/types/react-icons/lib/io/android-walk.d.ts
deleted file mode 100644
index df56fc72c7..0000000000
--- a/types/react-icons/lib/io/android-walk.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidWalk extends React.Component<IconBaseProps> { }
-export = IoAndroidWalk;
diff --git a/types/react-icons/lib/io/android-warning.d.ts b/types/react-icons/lib/io/android-warning.d.ts
deleted file mode 100644
index 54dee71508..0000000000
--- a/types/react-icons/lib/io/android-warning.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidWarning extends React.Component<IconBaseProps> { }
-export = IoAndroidWarning;
diff --git a/types/react-icons/lib/io/android-watch.d.ts b/types/react-icons/lib/io/android-watch.d.ts
deleted file mode 100644
index 5df467fbda..0000000000
--- a/types/react-icons/lib/io/android-watch.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidWatch extends React.Component<IconBaseProps> { }
-export = IoAndroidWatch;
diff --git a/types/react-icons/lib/io/android-wifi.d.ts b/types/react-icons/lib/io/android-wifi.d.ts
deleted file mode 100644
index c9faee16ba..0000000000
--- a/types/react-icons/lib/io/android-wifi.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAndroidWifi extends React.Component<IconBaseProps> { }
-export = IoAndroidWifi;
diff --git a/types/react-icons/lib/io/aperture.d.ts b/types/react-icons/lib/io/aperture.d.ts
deleted file mode 100644
index bae5242d92..0000000000
--- a/types/react-icons/lib/io/aperture.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAperture extends React.Component<IconBaseProps> { }
-export = IoAperture;
diff --git a/types/react-icons/lib/io/archive.d.ts b/types/react-icons/lib/io/archive.d.ts
deleted file mode 100644
index 0408f86352..0000000000
--- a/types/react-icons/lib/io/archive.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArchive extends React.Component<IconBaseProps> { }
-export = IoArchive;
diff --git a/types/react-icons/lib/io/arrow-down-a.d.ts b/types/react-icons/lib/io/arrow-down-a.d.ts
deleted file mode 100644
index 1dedc57504..0000000000
--- a/types/react-icons/lib/io/arrow-down-a.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowDownA extends React.Component<IconBaseProps> { }
-export = IoArrowDownA;
diff --git a/types/react-icons/lib/io/arrow-down-b.d.ts b/types/react-icons/lib/io/arrow-down-b.d.ts
deleted file mode 100644
index 2317676b0d..0000000000
--- a/types/react-icons/lib/io/arrow-down-b.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowDownB extends React.Component<IconBaseProps> { }
-export = IoArrowDownB;
diff --git a/types/react-icons/lib/io/arrow-down-c.d.ts b/types/react-icons/lib/io/arrow-down-c.d.ts
deleted file mode 100644
index 9ff6bff0d2..0000000000
--- a/types/react-icons/lib/io/arrow-down-c.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowDownC extends React.Component<IconBaseProps> { }
-export = IoArrowDownC;
diff --git a/types/react-icons/lib/io/arrow-expand.d.ts b/types/react-icons/lib/io/arrow-expand.d.ts
deleted file mode 100644
index 043d2e18a4..0000000000
--- a/types/react-icons/lib/io/arrow-expand.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowExpand extends React.Component<IconBaseProps> { }
-export = IoArrowExpand;
diff --git a/types/react-icons/lib/io/arrow-graph-down-left.d.ts b/types/react-icons/lib/io/arrow-graph-down-left.d.ts
deleted file mode 100644
index e90bc57702..0000000000
--- a/types/react-icons/lib/io/arrow-graph-down-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowGraphDownLeft extends React.Component<IconBaseProps> { }
-export = IoArrowGraphDownLeft;
diff --git a/types/react-icons/lib/io/arrow-graph-down-right.d.ts b/types/react-icons/lib/io/arrow-graph-down-right.d.ts
deleted file mode 100644
index bdbb62bcc3..0000000000
--- a/types/react-icons/lib/io/arrow-graph-down-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowGraphDownRight extends React.Component<IconBaseProps> { }
-export = IoArrowGraphDownRight;
diff --git a/types/react-icons/lib/io/arrow-graph-up-left.d.ts b/types/react-icons/lib/io/arrow-graph-up-left.d.ts
deleted file mode 100644
index d664e9b362..0000000000
--- a/types/react-icons/lib/io/arrow-graph-up-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowGraphUpLeft extends React.Component<IconBaseProps> { }
-export = IoArrowGraphUpLeft;
diff --git a/types/react-icons/lib/io/arrow-graph-up-right.d.ts b/types/react-icons/lib/io/arrow-graph-up-right.d.ts
deleted file mode 100644
index 4a2c256739..0000000000
--- a/types/react-icons/lib/io/arrow-graph-up-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowGraphUpRight extends React.Component<IconBaseProps> { }
-export = IoArrowGraphUpRight;
diff --git a/types/react-icons/lib/io/arrow-left-a.d.ts b/types/react-icons/lib/io/arrow-left-a.d.ts
deleted file mode 100644
index b89b682227..0000000000
--- a/types/react-icons/lib/io/arrow-left-a.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowLeftA extends React.Component<IconBaseProps> { }
-export = IoArrowLeftA;
diff --git a/types/react-icons/lib/io/arrow-left-b.d.ts b/types/react-icons/lib/io/arrow-left-b.d.ts
deleted file mode 100644
index 30af2945b4..0000000000
--- a/types/react-icons/lib/io/arrow-left-b.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowLeftB extends React.Component<IconBaseProps> { }
-export = IoArrowLeftB;
diff --git a/types/react-icons/lib/io/arrow-left-c.d.ts b/types/react-icons/lib/io/arrow-left-c.d.ts
deleted file mode 100644
index 8cfe94b64b..0000000000
--- a/types/react-icons/lib/io/arrow-left-c.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowLeftC extends React.Component<IconBaseProps> { }
-export = IoArrowLeftC;
diff --git a/types/react-icons/lib/io/arrow-move.d.ts b/types/react-icons/lib/io/arrow-move.d.ts
deleted file mode 100644
index 9f777b2fcc..0000000000
--- a/types/react-icons/lib/io/arrow-move.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowMove extends React.Component<IconBaseProps> { }
-export = IoArrowMove;
diff --git a/types/react-icons/lib/io/arrow-resize.d.ts b/types/react-icons/lib/io/arrow-resize.d.ts
deleted file mode 100644
index af774ee064..0000000000
--- a/types/react-icons/lib/io/arrow-resize.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowResize extends React.Component<IconBaseProps> { }
-export = IoArrowResize;
diff --git a/types/react-icons/lib/io/arrow-return-left.d.ts b/types/react-icons/lib/io/arrow-return-left.d.ts
deleted file mode 100644
index 7e94317274..0000000000
--- a/types/react-icons/lib/io/arrow-return-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowReturnLeft extends React.Component<IconBaseProps> { }
-export = IoArrowReturnLeft;
diff --git a/types/react-icons/lib/io/arrow-return-right.d.ts b/types/react-icons/lib/io/arrow-return-right.d.ts
deleted file mode 100644
index 13fd74b5e4..0000000000
--- a/types/react-icons/lib/io/arrow-return-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowReturnRight extends React.Component<IconBaseProps> { }
-export = IoArrowReturnRight;
diff --git a/types/react-icons/lib/io/arrow-right-a.d.ts b/types/react-icons/lib/io/arrow-right-a.d.ts
deleted file mode 100644
index 5644440a01..0000000000
--- a/types/react-icons/lib/io/arrow-right-a.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowRightA extends React.Component<IconBaseProps> { }
-export = IoArrowRightA;
diff --git a/types/react-icons/lib/io/arrow-right-b.d.ts b/types/react-icons/lib/io/arrow-right-b.d.ts
deleted file mode 100644
index ca3ede5d9f..0000000000
--- a/types/react-icons/lib/io/arrow-right-b.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowRightB extends React.Component<IconBaseProps> { }
-export = IoArrowRightB;
diff --git a/types/react-icons/lib/io/arrow-right-c.d.ts b/types/react-icons/lib/io/arrow-right-c.d.ts
deleted file mode 100644
index 5fe6a6febb..0000000000
--- a/types/react-icons/lib/io/arrow-right-c.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowRightC extends React.Component<IconBaseProps> { }
-export = IoArrowRightC;
diff --git a/types/react-icons/lib/io/arrow-shrink.d.ts b/types/react-icons/lib/io/arrow-shrink.d.ts
deleted file mode 100644
index 92ae49b26a..0000000000
--- a/types/react-icons/lib/io/arrow-shrink.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowShrink extends React.Component<IconBaseProps> { }
-export = IoArrowShrink;
diff --git a/types/react-icons/lib/io/arrow-swap.d.ts b/types/react-icons/lib/io/arrow-swap.d.ts
deleted file mode 100644
index 731f96350b..0000000000
--- a/types/react-icons/lib/io/arrow-swap.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowSwap extends React.Component<IconBaseProps> { }
-export = IoArrowSwap;
diff --git a/types/react-icons/lib/io/arrow-up-a.d.ts b/types/react-icons/lib/io/arrow-up-a.d.ts
deleted file mode 100644
index 0c77386594..0000000000
--- a/types/react-icons/lib/io/arrow-up-a.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowUpA extends React.Component<IconBaseProps> { }
-export = IoArrowUpA;
diff --git a/types/react-icons/lib/io/arrow-up-b.d.ts b/types/react-icons/lib/io/arrow-up-b.d.ts
deleted file mode 100644
index 7f72760763..0000000000
--- a/types/react-icons/lib/io/arrow-up-b.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowUpB extends React.Component<IconBaseProps> { }
-export = IoArrowUpB;
diff --git a/types/react-icons/lib/io/arrow-up-c.d.ts b/types/react-icons/lib/io/arrow-up-c.d.ts
deleted file mode 100644
index 7d7c51f6bb..0000000000
--- a/types/react-icons/lib/io/arrow-up-c.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoArrowUpC extends React.Component<IconBaseProps> { }
-export = IoArrowUpC;
diff --git a/types/react-icons/lib/io/asterisk.d.ts b/types/react-icons/lib/io/asterisk.d.ts
deleted file mode 100644
index 240751b3f6..0000000000
--- a/types/react-icons/lib/io/asterisk.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAsterisk extends React.Component<IconBaseProps> { }
-export = IoAsterisk;
diff --git a/types/react-icons/lib/io/at.d.ts b/types/react-icons/lib/io/at.d.ts
deleted file mode 100644
index d6790f610c..0000000000
--- a/types/react-icons/lib/io/at.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoAt extends React.Component<IconBaseProps> { }
-export = IoAt;
diff --git a/types/react-icons/lib/io/backspace-outline.d.ts b/types/react-icons/lib/io/backspace-outline.d.ts
deleted file mode 100644
index c990c421b2..0000000000
--- a/types/react-icons/lib/io/backspace-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBackspaceOutline extends React.Component<IconBaseProps> { }
-export = IoBackspaceOutline;
diff --git a/types/react-icons/lib/io/backspace.d.ts b/types/react-icons/lib/io/backspace.d.ts
deleted file mode 100644
index fbb75f30d2..0000000000
--- a/types/react-icons/lib/io/backspace.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBackspace extends React.Component<IconBaseProps> { }
-export = IoBackspace;
diff --git a/types/react-icons/lib/io/bag.d.ts b/types/react-icons/lib/io/bag.d.ts
deleted file mode 100644
index a6533db865..0000000000
--- a/types/react-icons/lib/io/bag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBag extends React.Component<IconBaseProps> { }
-export = IoBag;
diff --git a/types/react-icons/lib/io/battery-charging.d.ts b/types/react-icons/lib/io/battery-charging.d.ts
deleted file mode 100644
index 1e0d59b846..0000000000
--- a/types/react-icons/lib/io/battery-charging.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBatteryCharging extends React.Component<IconBaseProps> { }
-export = IoBatteryCharging;
diff --git a/types/react-icons/lib/io/battery-empty.d.ts b/types/react-icons/lib/io/battery-empty.d.ts
deleted file mode 100644
index 6ab2c64d9b..0000000000
--- a/types/react-icons/lib/io/battery-empty.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBatteryEmpty extends React.Component<IconBaseProps> { }
-export = IoBatteryEmpty;
diff --git a/types/react-icons/lib/io/battery-full.d.ts b/types/react-icons/lib/io/battery-full.d.ts
deleted file mode 100644
index 613a0f5859..0000000000
--- a/types/react-icons/lib/io/battery-full.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBatteryFull extends React.Component<IconBaseProps> { }
-export = IoBatteryFull;
diff --git a/types/react-icons/lib/io/battery-half.d.ts b/types/react-icons/lib/io/battery-half.d.ts
deleted file mode 100644
index 3a850063a3..0000000000
--- a/types/react-icons/lib/io/battery-half.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBatteryHalf extends React.Component<IconBaseProps> { }
-export = IoBatteryHalf;
diff --git a/types/react-icons/lib/io/battery-low.d.ts b/types/react-icons/lib/io/battery-low.d.ts
deleted file mode 100644
index 105b1275e1..0000000000
--- a/types/react-icons/lib/io/battery-low.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBatteryLow extends React.Component<IconBaseProps> { }
-export = IoBatteryLow;
diff --git a/types/react-icons/lib/io/beaker.d.ts b/types/react-icons/lib/io/beaker.d.ts
deleted file mode 100644
index dd335ba0fa..0000000000
--- a/types/react-icons/lib/io/beaker.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBeaker extends React.Component<IconBaseProps> { }
-export = IoBeaker;
diff --git a/types/react-icons/lib/io/beer.d.ts b/types/react-icons/lib/io/beer.d.ts
deleted file mode 100644
index 7328e0f20f..0000000000
--- a/types/react-icons/lib/io/beer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBeer extends React.Component<IconBaseProps> { }
-export = IoBeer;
diff --git a/types/react-icons/lib/io/bluetooth.d.ts b/types/react-icons/lib/io/bluetooth.d.ts
deleted file mode 100644
index 7b3138b4ab..0000000000
--- a/types/react-icons/lib/io/bluetooth.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBluetooth extends React.Component<IconBaseProps> { }
-export = IoBluetooth;
diff --git a/types/react-icons/lib/io/bonfire.d.ts b/types/react-icons/lib/io/bonfire.d.ts
deleted file mode 100644
index 8a41727ffe..0000000000
--- a/types/react-icons/lib/io/bonfire.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBonfire extends React.Component<IconBaseProps> { }
-export = IoBonfire;
diff --git a/types/react-icons/lib/io/bookmark.d.ts b/types/react-icons/lib/io/bookmark.d.ts
deleted file mode 100644
index acece4e02d..0000000000
--- a/types/react-icons/lib/io/bookmark.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBookmark extends React.Component<IconBaseProps> { }
-export = IoBookmark;
diff --git a/types/react-icons/lib/io/bowtie.d.ts b/types/react-icons/lib/io/bowtie.d.ts
deleted file mode 100644
index 8c7e9724ef..0000000000
--- a/types/react-icons/lib/io/bowtie.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBowtie extends React.Component<IconBaseProps> { }
-export = IoBowtie;
diff --git a/types/react-icons/lib/io/briefcase.d.ts b/types/react-icons/lib/io/briefcase.d.ts
deleted file mode 100644
index b5f1877923..0000000000
--- a/types/react-icons/lib/io/briefcase.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBriefcase extends React.Component<IconBaseProps> { }
-export = IoBriefcase;
diff --git a/types/react-icons/lib/io/bug.d.ts b/types/react-icons/lib/io/bug.d.ts
deleted file mode 100644
index 600b179fe1..0000000000
--- a/types/react-icons/lib/io/bug.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoBug extends React.Component<IconBaseProps> { }
-export = IoBug;
diff --git a/types/react-icons/lib/io/calculator.d.ts b/types/react-icons/lib/io/calculator.d.ts
deleted file mode 100644
index 3b6747e607..0000000000
--- a/types/react-icons/lib/io/calculator.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCalculator extends React.Component<IconBaseProps> { }
-export = IoCalculator;
diff --git a/types/react-icons/lib/io/calendar.d.ts b/types/react-icons/lib/io/calendar.d.ts
deleted file mode 100644
index 9bf379847e..0000000000
--- a/types/react-icons/lib/io/calendar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCalendar extends React.Component<IconBaseProps> { }
-export = IoCalendar;
diff --git a/types/react-icons/lib/io/camera.d.ts b/types/react-icons/lib/io/camera.d.ts
deleted file mode 100644
index b64c47fede..0000000000
--- a/types/react-icons/lib/io/camera.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCamera extends React.Component<IconBaseProps> { }
-export = IoCamera;
diff --git a/types/react-icons/lib/io/card.d.ts b/types/react-icons/lib/io/card.d.ts
deleted file mode 100644
index 411c4a2157..0000000000
--- a/types/react-icons/lib/io/card.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCard extends React.Component<IconBaseProps> { }
-export = IoCard;
diff --git a/types/react-icons/lib/io/cash.d.ts b/types/react-icons/lib/io/cash.d.ts
deleted file mode 100644
index 5877b0db9b..0000000000
--- a/types/react-icons/lib/io/cash.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCash extends React.Component<IconBaseProps> { }
-export = IoCash;
diff --git a/types/react-icons/lib/io/chatbox-working.d.ts b/types/react-icons/lib/io/chatbox-working.d.ts
deleted file mode 100644
index 01b5873626..0000000000
--- a/types/react-icons/lib/io/chatbox-working.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoChatboxWorking extends React.Component<IconBaseProps> { }
-export = IoChatboxWorking;
diff --git a/types/react-icons/lib/io/chatbox.d.ts b/types/react-icons/lib/io/chatbox.d.ts
deleted file mode 100644
index ad62e34582..0000000000
--- a/types/react-icons/lib/io/chatbox.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoChatbox extends React.Component<IconBaseProps> { }
-export = IoChatbox;
diff --git a/types/react-icons/lib/io/chatboxes.d.ts b/types/react-icons/lib/io/chatboxes.d.ts
deleted file mode 100644
index 83cb79b9a6..0000000000
--- a/types/react-icons/lib/io/chatboxes.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoChatboxes extends React.Component<IconBaseProps> { }
-export = IoChatboxes;
diff --git a/types/react-icons/lib/io/chatbubble-working.d.ts b/types/react-icons/lib/io/chatbubble-working.d.ts
deleted file mode 100644
index 84c5601b9a..0000000000
--- a/types/react-icons/lib/io/chatbubble-working.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoChatbubbleWorking extends React.Component<IconBaseProps> { }
-export = IoChatbubbleWorking;
diff --git a/types/react-icons/lib/io/chatbubble.d.ts b/types/react-icons/lib/io/chatbubble.d.ts
deleted file mode 100644
index 424f84e125..0000000000
--- a/types/react-icons/lib/io/chatbubble.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoChatbubble extends React.Component<IconBaseProps> { }
-export = IoChatbubble;
diff --git a/types/react-icons/lib/io/chatbubbles.d.ts b/types/react-icons/lib/io/chatbubbles.d.ts
deleted file mode 100644
index 9d529047ae..0000000000
--- a/types/react-icons/lib/io/chatbubbles.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoChatbubbles extends React.Component<IconBaseProps> { }
-export = IoChatbubbles;
diff --git a/types/react-icons/lib/io/checkmark-circled.d.ts b/types/react-icons/lib/io/checkmark-circled.d.ts
deleted file mode 100644
index e0f02e8dd0..0000000000
--- a/types/react-icons/lib/io/checkmark-circled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCheckmarkCircled extends React.Component<IconBaseProps> { }
-export = IoCheckmarkCircled;
diff --git a/types/react-icons/lib/io/checkmark-round.d.ts b/types/react-icons/lib/io/checkmark-round.d.ts
deleted file mode 100644
index 49ac0d7325..0000000000
--- a/types/react-icons/lib/io/checkmark-round.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCheckmarkRound extends React.Component<IconBaseProps> { }
-export = IoCheckmarkRound;
diff --git a/types/react-icons/lib/io/checkmark.d.ts b/types/react-icons/lib/io/checkmark.d.ts
deleted file mode 100644
index 7be9e5dbd7..0000000000
--- a/types/react-icons/lib/io/checkmark.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCheckmark extends React.Component<IconBaseProps> { }
-export = IoCheckmark;
diff --git a/types/react-icons/lib/io/chevron-down.d.ts b/types/react-icons/lib/io/chevron-down.d.ts
deleted file mode 100644
index 8f6050fe52..0000000000
--- a/types/react-icons/lib/io/chevron-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoChevronDown extends React.Component<IconBaseProps> { }
-export = IoChevronDown;
diff --git a/types/react-icons/lib/io/chevron-left.d.ts b/types/react-icons/lib/io/chevron-left.d.ts
deleted file mode 100644
index bcd78417b8..0000000000
--- a/types/react-icons/lib/io/chevron-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoChevronLeft extends React.Component<IconBaseProps> { }
-export = IoChevronLeft;
diff --git a/types/react-icons/lib/io/chevron-right.d.ts b/types/react-icons/lib/io/chevron-right.d.ts
deleted file mode 100644
index 4b19891516..0000000000
--- a/types/react-icons/lib/io/chevron-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoChevronRight extends React.Component<IconBaseProps> { }
-export = IoChevronRight;
diff --git a/types/react-icons/lib/io/chevron-up.d.ts b/types/react-icons/lib/io/chevron-up.d.ts
deleted file mode 100644
index f36ac3a678..0000000000
--- a/types/react-icons/lib/io/chevron-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoChevronUp extends React.Component<IconBaseProps> { }
-export = IoChevronUp;
diff --git a/types/react-icons/lib/io/clipboard.d.ts b/types/react-icons/lib/io/clipboard.d.ts
deleted file mode 100644
index bd491a79ea..0000000000
--- a/types/react-icons/lib/io/clipboard.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoClipboard extends React.Component<IconBaseProps> { }
-export = IoClipboard;
diff --git a/types/react-icons/lib/io/clock.d.ts b/types/react-icons/lib/io/clock.d.ts
deleted file mode 100644
index 1a74b43880..0000000000
--- a/types/react-icons/lib/io/clock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoClock extends React.Component<IconBaseProps> { }
-export = IoClock;
diff --git a/types/react-icons/lib/io/close-circled.d.ts b/types/react-icons/lib/io/close-circled.d.ts
deleted file mode 100644
index 73bc493bef..0000000000
--- a/types/react-icons/lib/io/close-circled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCloseCircled extends React.Component<IconBaseProps> { }
-export = IoCloseCircled;
diff --git a/types/react-icons/lib/io/close-round.d.ts b/types/react-icons/lib/io/close-round.d.ts
deleted file mode 100644
index a0a2647cfe..0000000000
--- a/types/react-icons/lib/io/close-round.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCloseRound extends React.Component<IconBaseProps> { }
-export = IoCloseRound;
diff --git a/types/react-icons/lib/io/close.d.ts b/types/react-icons/lib/io/close.d.ts
deleted file mode 100644
index e63ad69a50..0000000000
--- a/types/react-icons/lib/io/close.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoClose extends React.Component<IconBaseProps> { }
-export = IoClose;
diff --git a/types/react-icons/lib/io/closed-captioning.d.ts b/types/react-icons/lib/io/closed-captioning.d.ts
deleted file mode 100644
index 6989aecb2f..0000000000
--- a/types/react-icons/lib/io/closed-captioning.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoClosedCaptioning extends React.Component<IconBaseProps> { }
-export = IoClosedCaptioning;
diff --git a/types/react-icons/lib/io/cloud.d.ts b/types/react-icons/lib/io/cloud.d.ts
deleted file mode 100644
index 529f05f5fa..0000000000
--- a/types/react-icons/lib/io/cloud.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCloud extends React.Component<IconBaseProps> { }
-export = IoCloud;
diff --git a/types/react-icons/lib/io/code-download.d.ts b/types/react-icons/lib/io/code-download.d.ts
deleted file mode 100644
index 7d63a84630..0000000000
--- a/types/react-icons/lib/io/code-download.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCodeDownload extends React.Component<IconBaseProps> { }
-export = IoCodeDownload;
diff --git a/types/react-icons/lib/io/code-working.d.ts b/types/react-icons/lib/io/code-working.d.ts
deleted file mode 100644
index c014c9fb3b..0000000000
--- a/types/react-icons/lib/io/code-working.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCodeWorking extends React.Component<IconBaseProps> { }
-export = IoCodeWorking;
diff --git a/types/react-icons/lib/io/code.d.ts b/types/react-icons/lib/io/code.d.ts
deleted file mode 100644
index 15f8af880b..0000000000
--- a/types/react-icons/lib/io/code.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCode extends React.Component<IconBaseProps> { }
-export = IoCode;
diff --git a/types/react-icons/lib/io/coffee.d.ts b/types/react-icons/lib/io/coffee.d.ts
deleted file mode 100644
index ff96c293fd..0000000000
--- a/types/react-icons/lib/io/coffee.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCoffee extends React.Component<IconBaseProps> { }
-export = IoCoffee;
diff --git a/types/react-icons/lib/io/compass.d.ts b/types/react-icons/lib/io/compass.d.ts
deleted file mode 100644
index d96268517f..0000000000
--- a/types/react-icons/lib/io/compass.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCompass extends React.Component<IconBaseProps> { }
-export = IoCompass;
diff --git a/types/react-icons/lib/io/compose.d.ts b/types/react-icons/lib/io/compose.d.ts
deleted file mode 100644
index cd104c86e4..0000000000
--- a/types/react-icons/lib/io/compose.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCompose extends React.Component<IconBaseProps> { }
-export = IoCompose;
diff --git a/types/react-icons/lib/io/connectbars.d.ts b/types/react-icons/lib/io/connectbars.d.ts
deleted file mode 100644
index e9c503f259..0000000000
--- a/types/react-icons/lib/io/connectbars.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoConnectbars extends React.Component<IconBaseProps> { }
-export = IoConnectbars;
diff --git a/types/react-icons/lib/io/contrast.d.ts b/types/react-icons/lib/io/contrast.d.ts
deleted file mode 100644
index aea50a362f..0000000000
--- a/types/react-icons/lib/io/contrast.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoContrast extends React.Component<IconBaseProps> { }
-export = IoContrast;
diff --git a/types/react-icons/lib/io/crop.d.ts b/types/react-icons/lib/io/crop.d.ts
deleted file mode 100644
index 6fca72b89d..0000000000
--- a/types/react-icons/lib/io/crop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCrop extends React.Component<IconBaseProps> { }
-export = IoCrop;
diff --git a/types/react-icons/lib/io/cube.d.ts b/types/react-icons/lib/io/cube.d.ts
deleted file mode 100644
index 87a041844d..0000000000
--- a/types/react-icons/lib/io/cube.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoCube extends React.Component<IconBaseProps> { }
-export = IoCube;
diff --git a/types/react-icons/lib/io/disc.d.ts b/types/react-icons/lib/io/disc.d.ts
deleted file mode 100644
index ba1c411354..0000000000
--- a/types/react-icons/lib/io/disc.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoDisc extends React.Component<IconBaseProps> { }
-export = IoDisc;
diff --git a/types/react-icons/lib/io/document-text.d.ts b/types/react-icons/lib/io/document-text.d.ts
deleted file mode 100644
index d77721e7c5..0000000000
--- a/types/react-icons/lib/io/document-text.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoDocumentText extends React.Component<IconBaseProps> { }
-export = IoDocumentText;
diff --git a/types/react-icons/lib/io/document.d.ts b/types/react-icons/lib/io/document.d.ts
deleted file mode 100644
index 58dcac1802..0000000000
--- a/types/react-icons/lib/io/document.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoDocument extends React.Component<IconBaseProps> { }
-export = IoDocument;
diff --git a/types/react-icons/lib/io/drag.d.ts b/types/react-icons/lib/io/drag.d.ts
deleted file mode 100644
index fc7e0809a5..0000000000
--- a/types/react-icons/lib/io/drag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoDrag extends React.Component<IconBaseProps> { }
-export = IoDrag;
diff --git a/types/react-icons/lib/io/earth.d.ts b/types/react-icons/lib/io/earth.d.ts
deleted file mode 100644
index 7a37407511..0000000000
--- a/types/react-icons/lib/io/earth.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoEarth extends React.Component<IconBaseProps> { }
-export = IoEarth;
diff --git a/types/react-icons/lib/io/easel.d.ts b/types/react-icons/lib/io/easel.d.ts
deleted file mode 100644
index 07f4eb9c1d..0000000000
--- a/types/react-icons/lib/io/easel.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoEasel extends React.Component<IconBaseProps> { }
-export = IoEasel;
diff --git a/types/react-icons/lib/io/edit.d.ts b/types/react-icons/lib/io/edit.d.ts
deleted file mode 100644
index b226390e6b..0000000000
--- a/types/react-icons/lib/io/edit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoEdit extends React.Component<IconBaseProps> { }
-export = IoEdit;
diff --git a/types/react-icons/lib/io/egg.d.ts b/types/react-icons/lib/io/egg.d.ts
deleted file mode 100644
index 7443c8e7c6..0000000000
--- a/types/react-icons/lib/io/egg.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoEgg extends React.Component<IconBaseProps> { }
-export = IoEgg;
diff --git a/types/react-icons/lib/io/eject.d.ts b/types/react-icons/lib/io/eject.d.ts
deleted file mode 100644
index 4621d76261..0000000000
--- a/types/react-icons/lib/io/eject.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoEject extends React.Component<IconBaseProps> { }
-export = IoEject;
diff --git a/types/react-icons/lib/io/email-unread.d.ts b/types/react-icons/lib/io/email-unread.d.ts
deleted file mode 100644
index 76d66d544a..0000000000
--- a/types/react-icons/lib/io/email-unread.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoEmailUnread extends React.Component<IconBaseProps> { }
-export = IoEmailUnread;
diff --git a/types/react-icons/lib/io/email.d.ts b/types/react-icons/lib/io/email.d.ts
deleted file mode 100644
index 5551df730a..0000000000
--- a/types/react-icons/lib/io/email.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoEmail extends React.Component<IconBaseProps> { }
-export = IoEmail;
diff --git a/types/react-icons/lib/io/erlenmeyer-flask-bubbles.d.ts b/types/react-icons/lib/io/erlenmeyer-flask-bubbles.d.ts
deleted file mode 100644
index 8075f8880b..0000000000
--- a/types/react-icons/lib/io/erlenmeyer-flask-bubbles.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoErlenmeyerFlaskBubbles extends React.Component<IconBaseProps> { }
-export = IoErlenmeyerFlaskBubbles;
diff --git a/types/react-icons/lib/io/erlenmeyer-flask.d.ts b/types/react-icons/lib/io/erlenmeyer-flask.d.ts
deleted file mode 100644
index c7ac237769..0000000000
--- a/types/react-icons/lib/io/erlenmeyer-flask.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoErlenmeyerFlask extends React.Component<IconBaseProps> { }
-export = IoErlenmeyerFlask;
diff --git a/types/react-icons/lib/io/eye-disabled.d.ts b/types/react-icons/lib/io/eye-disabled.d.ts
deleted file mode 100644
index 8950fa85cc..0000000000
--- a/types/react-icons/lib/io/eye-disabled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoEyeDisabled extends React.Component<IconBaseProps> { }
-export = IoEyeDisabled;
diff --git a/types/react-icons/lib/io/eye.d.ts b/types/react-icons/lib/io/eye.d.ts
deleted file mode 100644
index bc243f9ed5..0000000000
--- a/types/react-icons/lib/io/eye.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoEye extends React.Component<IconBaseProps> { }
-export = IoEye;
diff --git a/types/react-icons/lib/io/female.d.ts b/types/react-icons/lib/io/female.d.ts
deleted file mode 100644
index 363f225e45..0000000000
--- a/types/react-icons/lib/io/female.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoFemale extends React.Component<IconBaseProps> { }
-export = IoFemale;
diff --git a/types/react-icons/lib/io/filing.d.ts b/types/react-icons/lib/io/filing.d.ts
deleted file mode 100644
index 73e1fe47b1..0000000000
--- a/types/react-icons/lib/io/filing.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoFiling extends React.Component<IconBaseProps> { }
-export = IoFiling;
diff --git a/types/react-icons/lib/io/film-marker.d.ts b/types/react-icons/lib/io/film-marker.d.ts
deleted file mode 100644
index 419dc10730..0000000000
--- a/types/react-icons/lib/io/film-marker.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoFilmMarker extends React.Component<IconBaseProps> { }
-export = IoFilmMarker;
diff --git a/types/react-icons/lib/io/fireball.d.ts b/types/react-icons/lib/io/fireball.d.ts
deleted file mode 100644
index 761f0f74db..0000000000
--- a/types/react-icons/lib/io/fireball.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoFireball extends React.Component<IconBaseProps> { }
-export = IoFireball;
diff --git a/types/react-icons/lib/io/flag.d.ts b/types/react-icons/lib/io/flag.d.ts
deleted file mode 100644
index 604aa212da..0000000000
--- a/types/react-icons/lib/io/flag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoFlag extends React.Component<IconBaseProps> { }
-export = IoFlag;
diff --git a/types/react-icons/lib/io/flame.d.ts b/types/react-icons/lib/io/flame.d.ts
deleted file mode 100644
index bf3a40331a..0000000000
--- a/types/react-icons/lib/io/flame.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoFlame extends React.Component<IconBaseProps> { }
-export = IoFlame;
diff --git a/types/react-icons/lib/io/flash-off.d.ts b/types/react-icons/lib/io/flash-off.d.ts
deleted file mode 100644
index 2a25f11369..0000000000
--- a/types/react-icons/lib/io/flash-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoFlashOff extends React.Component<IconBaseProps> { }
-export = IoFlashOff;
diff --git a/types/react-icons/lib/io/flash.d.ts b/types/react-icons/lib/io/flash.d.ts
deleted file mode 100644
index 11e4b408c1..0000000000
--- a/types/react-icons/lib/io/flash.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoFlash extends React.Component<IconBaseProps> { }
-export = IoFlash;
diff --git a/types/react-icons/lib/io/folder.d.ts b/types/react-icons/lib/io/folder.d.ts
deleted file mode 100644
index 2f9eeabc0c..0000000000
--- a/types/react-icons/lib/io/folder.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoFolder extends React.Component<IconBaseProps> { }
-export = IoFolder;
diff --git a/types/react-icons/lib/io/fork-repo.d.ts b/types/react-icons/lib/io/fork-repo.d.ts
deleted file mode 100644
index 91707b054e..0000000000
--- a/types/react-icons/lib/io/fork-repo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoForkRepo extends React.Component<IconBaseProps> { }
-export = IoForkRepo;
diff --git a/types/react-icons/lib/io/fork.d.ts b/types/react-icons/lib/io/fork.d.ts
deleted file mode 100644
index c25327c58f..0000000000
--- a/types/react-icons/lib/io/fork.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoFork extends React.Component<IconBaseProps> { }
-export = IoFork;
diff --git a/types/react-icons/lib/io/forward.d.ts b/types/react-icons/lib/io/forward.d.ts
deleted file mode 100644
index 5f8db1eb0a..0000000000
--- a/types/react-icons/lib/io/forward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoForward extends React.Component<IconBaseProps> { }
-export = IoForward;
diff --git a/types/react-icons/lib/io/funnel.d.ts b/types/react-icons/lib/io/funnel.d.ts
deleted file mode 100644
index 564d37b5dd..0000000000
--- a/types/react-icons/lib/io/funnel.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoFunnel extends React.Component<IconBaseProps> { }
-export = IoFunnel;
diff --git a/types/react-icons/lib/io/gear-a.d.ts b/types/react-icons/lib/io/gear-a.d.ts
deleted file mode 100644
index cac36e86a6..0000000000
--- a/types/react-icons/lib/io/gear-a.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoGearA extends React.Component<IconBaseProps> { }
-export = IoGearA;
diff --git a/types/react-icons/lib/io/gear-b.d.ts b/types/react-icons/lib/io/gear-b.d.ts
deleted file mode 100644
index 85d2ec806a..0000000000
--- a/types/react-icons/lib/io/gear-b.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoGearB extends React.Component<IconBaseProps> { }
-export = IoGearB;
diff --git a/types/react-icons/lib/io/grid.d.ts b/types/react-icons/lib/io/grid.d.ts
deleted file mode 100644
index 77f0971fc2..0000000000
--- a/types/react-icons/lib/io/grid.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoGrid extends React.Component<IconBaseProps> { }
-export = IoGrid;
diff --git a/types/react-icons/lib/io/hammer.d.ts b/types/react-icons/lib/io/hammer.d.ts
deleted file mode 100644
index cb96449ad8..0000000000
--- a/types/react-icons/lib/io/hammer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoHammer extends React.Component<IconBaseProps> { }
-export = IoHammer;
diff --git a/types/react-icons/lib/io/happy-outline.d.ts b/types/react-icons/lib/io/happy-outline.d.ts
deleted file mode 100644
index cd4ae57ef0..0000000000
--- a/types/react-icons/lib/io/happy-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoHappyOutline extends React.Component<IconBaseProps> { }
-export = IoHappyOutline;
diff --git a/types/react-icons/lib/io/happy.d.ts b/types/react-icons/lib/io/happy.d.ts
deleted file mode 100644
index 3ab43dca46..0000000000
--- a/types/react-icons/lib/io/happy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoHappy extends React.Component<IconBaseProps> { }
-export = IoHappy;
diff --git a/types/react-icons/lib/io/headphone.d.ts b/types/react-icons/lib/io/headphone.d.ts
deleted file mode 100644
index 2165a1ce1d..0000000000
--- a/types/react-icons/lib/io/headphone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoHeadphone extends React.Component<IconBaseProps> { }
-export = IoHeadphone;
diff --git a/types/react-icons/lib/io/heart-broken.d.ts b/types/react-icons/lib/io/heart-broken.d.ts
deleted file mode 100644
index 3dcef8a454..0000000000
--- a/types/react-icons/lib/io/heart-broken.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoHeartBroken extends React.Component<IconBaseProps> { }
-export = IoHeartBroken;
diff --git a/types/react-icons/lib/io/heart.d.ts b/types/react-icons/lib/io/heart.d.ts
deleted file mode 100644
index 09596470cf..0000000000
--- a/types/react-icons/lib/io/heart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoHeart extends React.Component<IconBaseProps> { }
-export = IoHeart;
diff --git a/types/react-icons/lib/io/help-buoy.d.ts b/types/react-icons/lib/io/help-buoy.d.ts
deleted file mode 100644
index 2d7596c318..0000000000
--- a/types/react-icons/lib/io/help-buoy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoHelpBuoy extends React.Component<IconBaseProps> { }
-export = IoHelpBuoy;
diff --git a/types/react-icons/lib/io/help-circled.d.ts b/types/react-icons/lib/io/help-circled.d.ts
deleted file mode 100644
index 51ff2fa62a..0000000000
--- a/types/react-icons/lib/io/help-circled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoHelpCircled extends React.Component<IconBaseProps> { }
-export = IoHelpCircled;
diff --git a/types/react-icons/lib/io/help.d.ts b/types/react-icons/lib/io/help.d.ts
deleted file mode 100644
index ba7fc4f358..0000000000
--- a/types/react-icons/lib/io/help.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoHelp extends React.Component<IconBaseProps> { }
-export = IoHelp;
diff --git a/types/react-icons/lib/io/home.d.ts b/types/react-icons/lib/io/home.d.ts
deleted file mode 100644
index 17990b7afa..0000000000
--- a/types/react-icons/lib/io/home.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoHome extends React.Component<IconBaseProps> { }
-export = IoHome;
diff --git a/types/react-icons/lib/io/icecream.d.ts b/types/react-icons/lib/io/icecream.d.ts
deleted file mode 100644
index d766170158..0000000000
--- a/types/react-icons/lib/io/icecream.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIcecream extends React.Component<IconBaseProps> { }
-export = IoIcecream;
diff --git a/types/react-icons/lib/io/image.d.ts b/types/react-icons/lib/io/image.d.ts
deleted file mode 100644
index 960fbd8e35..0000000000
--- a/types/react-icons/lib/io/image.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoImage extends React.Component<IconBaseProps> { }
-export = IoImage;
diff --git a/types/react-icons/lib/io/images.d.ts b/types/react-icons/lib/io/images.d.ts
deleted file mode 100644
index 562288e5b8..0000000000
--- a/types/react-icons/lib/io/images.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoImages extends React.Component<IconBaseProps> { }
-export = IoImages;
diff --git a/types/react-icons/lib/io/index.d.ts b/types/react-icons/lib/io/index.d.ts
deleted file mode 100644
index 340f0a0cea..0000000000
--- a/types/react-icons/lib/io/index.d.ts
+++ /dev/null
@@ -1,733 +0,0 @@
-export { default as IoAlertCircled } from "../../io/alert-circled";
-export { default as IoAlert } from "../../io/alert";
-export { default as IoAndroidAddCircle } from "../../io/android-add-circle";
-export { default as IoAndroidAdd } from "../../io/android-add";
-export { default as IoAndroidAlarmClock } from "../../io/android-alarm-clock";
-export { default as IoAndroidAlert } from "../../io/android-alert";
-export { default as IoAndroidApps } from "../../io/android-apps";
-export { default as IoAndroidArchive } from "../../io/android-archive";
-export { default as IoAndroidArrowBack } from "../../io/android-arrow-back";
-export { default as IoAndroidArrowDown } from "../../io/android-arrow-down";
-export { default as IoAndroidArrowDropdownCircle } from "../../io/android-arrow-dropdown-circle";
-export { default as IoAndroidArrowDropdown } from "../../io/android-arrow-dropdown";
-export { default as IoAndroidArrowDropleftCircle } from "../../io/android-arrow-dropleft-circle";
-export { default as IoAndroidArrowDropleft } from "../../io/android-arrow-dropleft";
-export { default as IoAndroidArrowDroprightCircle } from "../../io/android-arrow-dropright-circle";
-export { default as IoAndroidArrowDropright } from "../../io/android-arrow-dropright";
-export { default as IoAndroidArrowDropupCircle } from "../../io/android-arrow-dropup-circle";
-export { default as IoAndroidArrowDropup } from "../../io/android-arrow-dropup";
-export { default as IoAndroidArrowForward } from "../../io/android-arrow-forward";
-export { default as IoAndroidArrowUp } from "../../io/android-arrow-up";
-export { default as IoAndroidAttach } from "../../io/android-attach";
-export { default as IoAndroidBar } from "../../io/android-bar";
-export { default as IoAndroidBicycle } from "../../io/android-bicycle";
-export { default as IoAndroidBoat } from "../../io/android-boat";
-export { default as IoAndroidBookmark } from "../../io/android-bookmark";
-export { default as IoAndroidBulb } from "../../io/android-bulb";
-export { default as IoAndroidBus } from "../../io/android-bus";
-export { default as IoAndroidCalendar } from "../../io/android-calendar";
-export { default as IoAndroidCall } from "../../io/android-call";
-export { default as IoAndroidCamera } from "../../io/android-camera";
-export { default as IoAndroidCancel } from "../../io/android-cancel";
-export { default as IoAndroidCar } from "../../io/android-car";
-export { default as IoAndroidCart } from "../../io/android-cart";
-export { default as IoAndroidChat } from "../../io/android-chat";
-export { default as IoAndroidCheckboxBlank } from "../../io/android-checkbox-blank";
-export { default as IoAndroidCheckboxOutlineBlank } from "../../io/android-checkbox-outline-blank";
-export { default as IoAndroidCheckboxOutline } from "../../io/android-checkbox-outline";
-export { default as IoAndroidCheckbox } from "../../io/android-checkbox";
-export { default as IoAndroidCheckmarkCircle } from "../../io/android-checkmark-circle";
-export { default as IoAndroidClipboard } from "../../io/android-clipboard";
-export { default as IoAndroidClose } from "../../io/android-close";
-export { default as IoAndroidCloudCircle } from "../../io/android-cloud-circle";
-export { default as IoAndroidCloudDone } from "../../io/android-cloud-done";
-export { default as IoAndroidCloudOutline } from "../../io/android-cloud-outline";
-export { default as IoAndroidCloud } from "../../io/android-cloud";
-export { default as IoAndroidColorPalette } from "../../io/android-color-palette";
-export { default as IoAndroidCompass } from "../../io/android-compass";
-export { default as IoAndroidContact } from "../../io/android-contact";
-export { default as IoAndroidContacts } from "../../io/android-contacts";
-export { default as IoAndroidContract } from "../../io/android-contract";
-export { default as IoAndroidCreate } from "../../io/android-create";
-export { default as IoAndroidDelete } from "../../io/android-delete";
-export { default as IoAndroidDesktop } from "../../io/android-desktop";
-export { default as IoAndroidDocument } from "../../io/android-document";
-export { default as IoAndroidDoneAll } from "../../io/android-done-all";
-export { default as IoAndroidDone } from "../../io/android-done";
-export { default as IoAndroidDownload } from "../../io/android-download";
-export { default as IoAndroidDrafts } from "../../io/android-drafts";
-export { default as IoAndroidExit } from "../../io/android-exit";
-export { default as IoAndroidExpand } from "../../io/android-expand";
-export { default as IoAndroidFavoriteOutline } from "../../io/android-favorite-outline";
-export { default as IoAndroidFavorite } from "../../io/android-favorite";
-export { default as IoAndroidFilm } from "../../io/android-film";
-export { default as IoAndroidFolderOpen } from "../../io/android-folder-open";
-export { default as IoAndroidFolder } from "../../io/android-folder";
-export { default as IoAndroidFunnel } from "../../io/android-funnel";
-export { default as IoAndroidGlobe } from "../../io/android-globe";
-export { default as IoAndroidHand } from "../../io/android-hand";
-export { default as IoAndroidHangout } from "../../io/android-hangout";
-export { default as IoAndroidHappy } from "../../io/android-happy";
-export { default as IoAndroidHome } from "../../io/android-home";
-export { default as IoAndroidImage } from "../../io/android-image";
-export { default as IoAndroidLaptop } from "../../io/android-laptop";
-export { default as IoAndroidList } from "../../io/android-list";
-export { default as IoAndroidLocate } from "../../io/android-locate";
-export { default as IoAndroidLock } from "../../io/android-lock";
-export { default as IoAndroidMail } from "../../io/android-mail";
-export { default as IoAndroidMap } from "../../io/android-map";
-export { default as IoAndroidMenu } from "../../io/android-menu";
-export { default as IoAndroidMicrophoneOff } from "../../io/android-microphone-off";
-export { default as IoAndroidMicrophone } from "../../io/android-microphone";
-export { default as IoAndroidMoreHorizontal } from "../../io/android-more-horizontal";
-export { default as IoAndroidMoreVertical } from "../../io/android-more-vertical";
-export { default as IoAndroidNavigate } from "../../io/android-navigate";
-export { default as IoAndroidNotificationsNone } from "../../io/android-notifications-none";
-export { default as IoAndroidNotificationsOff } from "../../io/android-notifications-off";
-export { default as IoAndroidNotifications } from "../../io/android-notifications";
-export { default as IoAndroidOpen } from "../../io/android-open";
-export { default as IoAndroidOptions } from "../../io/android-options";
-export { default as IoAndroidPeople } from "../../io/android-people";
-export { default as IoAndroidPersonAdd } from "../../io/android-person-add";
-export { default as IoAndroidPerson } from "../../io/android-person";
-export { default as IoAndroidPhoneLandscape } from "../../io/android-phone-landscape";
-export { default as IoAndroidPhonePortrait } from "../../io/android-phone-portrait";
-export { default as IoAndroidPin } from "../../io/android-pin";
-export { default as IoAndroidPlane } from "../../io/android-plane";
-export { default as IoAndroidPlaystore } from "../../io/android-playstore";
-export { default as IoAndroidPrint } from "../../io/android-print";
-export { default as IoAndroidRadioButtonOff } from "../../io/android-radio-button-off";
-export { default as IoAndroidRadioButtonOn } from "../../io/android-radio-button-on";
-export { default as IoAndroidRefresh } from "../../io/android-refresh";
-export { default as IoAndroidRemoveCircle } from "../../io/android-remove-circle";
-export { default as IoAndroidRemove } from "../../io/android-remove";
-export { default as IoAndroidRestaurant } from "../../io/android-restaurant";
-export { default as IoAndroidSad } from "../../io/android-sad";
-export { default as IoAndroidSearch } from "../../io/android-search";
-export { default as IoAndroidSend } from "../../io/android-send";
-export { default as IoAndroidSettings } from "../../io/android-settings";
-export { default as IoAndroidShareAlt } from "../../io/android-share-alt";
-export { default as IoAndroidShare } from "../../io/android-share";
-export { default as IoAndroidStarHalf } from "../../io/android-star-half";
-export { default as IoAndroidStarOutline } from "../../io/android-star-outline";
-export { default as IoAndroidStar } from "../../io/android-star";
-export { default as IoAndroidStopwatch } from "../../io/android-stopwatch";
-export { default as IoAndroidSubway } from "../../io/android-subway";
-export { default as IoAndroidSunny } from "../../io/android-sunny";
-export { default as IoAndroidSync } from "../../io/android-sync";
-export { default as IoAndroidTextsms } from "../../io/android-textsms";
-export { default as IoAndroidTime } from "../../io/android-time";
-export { default as IoAndroidTrain } from "../../io/android-train";
-export { default as IoAndroidUnlock } from "../../io/android-unlock";
-export { default as IoAndroidUpload } from "../../io/android-upload";
-export { default as IoAndroidVolumeDown } from "../../io/android-volume-down";
-export { default as IoAndroidVolumeMute } from "../../io/android-volume-mute";
-export { default as IoAndroidVolumeOff } from "../../io/android-volume-off";
-export { default as IoAndroidVolumeUp } from "../../io/android-volume-up";
-export { default as IoAndroidWalk } from "../../io/android-walk";
-export { default as IoAndroidWarning } from "../../io/android-warning";
-export { default as IoAndroidWatch } from "../../io/android-watch";
-export { default as IoAndroidWifi } from "../../io/android-wifi";
-export { default as IoAperture } from "../../io/aperture";
-export { default as IoArchive } from "../../io/archive";
-export { default as IoArrowDownA } from "../../io/arrow-down-a";
-export { default as IoArrowDownB } from "../../io/arrow-down-b";
-export { default as IoArrowDownC } from "../../io/arrow-down-c";
-export { default as IoArrowExpand } from "../../io/arrow-expand";
-export { default as IoArrowGraphDownLeft } from "../../io/arrow-graph-down-left";
-export { default as IoArrowGraphDownRight } from "../../io/arrow-graph-down-right";
-export { default as IoArrowGraphUpLeft } from "../../io/arrow-graph-up-left";
-export { default as IoArrowGraphUpRight } from "../../io/arrow-graph-up-right";
-export { default as IoArrowLeftA } from "../../io/arrow-left-a";
-export { default as IoArrowLeftB } from "../../io/arrow-left-b";
-export { default as IoArrowLeftC } from "../../io/arrow-left-c";
-export { default as IoArrowMove } from "../../io/arrow-move";
-export { default as IoArrowResize } from "../../io/arrow-resize";
-export { default as IoArrowReturnLeft } from "../../io/arrow-return-left";
-export { default as IoArrowReturnRight } from "../../io/arrow-return-right";
-export { default as IoArrowRightA } from "../../io/arrow-right-a";
-export { default as IoArrowRightB } from "../../io/arrow-right-b";
-export { default as IoArrowRightC } from "../../io/arrow-right-c";
-export { default as IoArrowShrink } from "../../io/arrow-shrink";
-export { default as IoArrowSwap } from "../../io/arrow-swap";
-export { default as IoArrowUpA } from "../../io/arrow-up-a";
-export { default as IoArrowUpB } from "../../io/arrow-up-b";
-export { default as IoArrowUpC } from "../../io/arrow-up-c";
-export { default as IoAsterisk } from "../../io/asterisk";
-export { default as IoAt } from "../../io/at";
-export { default as IoBackspaceOutline } from "../../io/backspace-outline";
-export { default as IoBackspace } from "../../io/backspace";
-export { default as IoBag } from "../../io/bag";
-export { default as IoBatteryCharging } from "../../io/battery-charging";
-export { default as IoBatteryEmpty } from "../../io/battery-empty";
-export { default as IoBatteryFull } from "../../io/battery-full";
-export { default as IoBatteryHalf } from "../../io/battery-half";
-export { default as IoBatteryLow } from "../../io/battery-low";
-export { default as IoBeaker } from "../../io/beaker";
-export { default as IoBeer } from "../../io/beer";
-export { default as IoBluetooth } from "../../io/bluetooth";
-export { default as IoBonfire } from "../../io/bonfire";
-export { default as IoBookmark } from "../../io/bookmark";
-export { default as IoBowtie } from "../../io/bowtie";
-export { default as IoBriefcase } from "../../io/briefcase";
-export { default as IoBug } from "../../io/bug";
-export { default as IoCalculator } from "../../io/calculator";
-export { default as IoCalendar } from "../../io/calendar";
-export { default as IoCamera } from "../../io/camera";
-export { default as IoCard } from "../../io/card";
-export { default as IoCash } from "../../io/cash";
-export { default as IoChatboxWorking } from "../../io/chatbox-working";
-export { default as IoChatbox } from "../../io/chatbox";
-export { default as IoChatboxes } from "../../io/chatboxes";
-export { default as IoChatbubbleWorking } from "../../io/chatbubble-working";
-export { default as IoChatbubble } from "../../io/chatbubble";
-export { default as IoChatbubbles } from "../../io/chatbubbles";
-export { default as IoCheckmarkCircled } from "../../io/checkmark-circled";
-export { default as IoCheckmarkRound } from "../../io/checkmark-round";
-export { default as IoCheckmark } from "../../io/checkmark";
-export { default as IoChevronDown } from "../../io/chevron-down";
-export { default as IoChevronLeft } from "../../io/chevron-left";
-export { default as IoChevronRight } from "../../io/chevron-right";
-export { default as IoChevronUp } from "../../io/chevron-up";
-export { default as IoClipboard } from "../../io/clipboard";
-export { default as IoClock } from "../../io/clock";
-export { default as IoCloseCircled } from "../../io/close-circled";
-export { default as IoCloseRound } from "../../io/close-round";
-export { default as IoClose } from "../../io/close";
-export { default as IoClosedCaptioning } from "../../io/closed-captioning";
-export { default as IoCloud } from "../../io/cloud";
-export { default as IoCodeDownload } from "../../io/code-download";
-export { default as IoCodeWorking } from "../../io/code-working";
-export { default as IoCode } from "../../io/code";
-export { default as IoCoffee } from "../../io/coffee";
-export { default as IoCompass } from "../../io/compass";
-export { default as IoCompose } from "../../io/compose";
-export { default as IoConnectbars } from "../../io/connectbars";
-export { default as IoContrast } from "../../io/contrast";
-export { default as IoCrop } from "../../io/crop";
-export { default as IoCube } from "../../io/cube";
-export { default as IoDisc } from "../../io/disc";
-export { default as IoDocumentText } from "../../io/document-text";
-export { default as IoDocument } from "../../io/document";
-export { default as IoDrag } from "../../io/drag";
-export { default as IoEarth } from "../../io/earth";
-export { default as IoEasel } from "../../io/easel";
-export { default as IoEdit } from "../../io/edit";
-export { default as IoEgg } from "../../io/egg";
-export { default as IoEject } from "../../io/eject";
-export { default as IoEmailUnread } from "../../io/email-unread";
-export { default as IoEmail } from "../../io/email";
-export { default as IoErlenmeyerFlaskBubbles } from "../../io/erlenmeyer-flask-bubbles";
-export { default as IoErlenmeyerFlask } from "../../io/erlenmeyer-flask";
-export { default as IoEyeDisabled } from "../../io/eye-disabled";
-export { default as IoEye } from "../../io/eye";
-export { default as IoFemale } from "../../io/female";
-export { default as IoFiling } from "../../io/filing";
-export { default as IoFilmMarker } from "../../io/film-marker";
-export { default as IoFireball } from "../../io/fireball";
-export { default as IoFlag } from "../../io/flag";
-export { default as IoFlame } from "../../io/flame";
-export { default as IoFlashOff } from "../../io/flash-off";
-export { default as IoFlash } from "../../io/flash";
-export { default as IoFolder } from "../../io/folder";
-export { default as IoForkRepo } from "../../io/fork-repo";
-export { default as IoFork } from "../../io/fork";
-export { default as IoForward } from "../../io/forward";
-export { default as IoFunnel } from "../../io/funnel";
-export { default as IoGearA } from "../../io/gear-a";
-export { default as IoGearB } from "../../io/gear-b";
-export { default as IoGrid } from "../../io/grid";
-export { default as IoHammer } from "../../io/hammer";
-export { default as IoHappyOutline } from "../../io/happy-outline";
-export { default as IoHappy } from "../../io/happy";
-export { default as IoHeadphone } from "../../io/headphone";
-export { default as IoHeartBroken } from "../../io/heart-broken";
-export { default as IoHeart } from "../../io/heart";
-export { default as IoHelpBuoy } from "../../io/help-buoy";
-export { default as IoHelpCircled } from "../../io/help-circled";
-export { default as IoHelp } from "../../io/help";
-export { default as IoHome } from "../../io/home";
-export { default as IoIcecream } from "../../io/icecream";
-export { default as IoImage } from "../../io/image";
-export { default as IoImages } from "../../io/images";
-export { default as IoInformatcircled } from "../../io/informatcircled";
-export { default as IoInformation } from "../../io/information";
-export { default as IoIonic } from "../../io/ionic";
-export { default as IoIosAlarmOutline } from "../../io/ios-alarm-outline";
-export { default as IoIosAlarm } from "../../io/ios-alarm";
-export { default as IoIosAlbumsOutline } from "../../io/ios-albums-outline";
-export { default as IoIosAlbums } from "../../io/ios-albums";
-export { default as IoIosAmericanfootballOutline } from "../../io/ios-americanfootball-outline";
-export { default as IoIosAmericanfootball } from "../../io/ios-americanfootball";
-export { default as IoIosAnalyticsOutline } from "../../io/ios-analytics-outline";
-export { default as IoIosAnalytics } from "../../io/ios-analytics";
-export { default as IoIosArrowBack } from "../../io/ios-arrow-back";
-export { default as IoIosArrowDown } from "../../io/ios-arrow-down";
-export { default as IoIosArrowForward } from "../../io/ios-arrow-forward";
-export { default as IoIosArrowLeft } from "../../io/ios-arrow-left";
-export { default as IoIosArrowRight } from "../../io/ios-arrow-right";
-export { default as IoIosArrowThinDown } from "../../io/ios-arrow-thin-down";
-export { default as IoIosArrowThinLeft } from "../../io/ios-arrow-thin-left";
-export { default as IoIosArrowThinRight } from "../../io/ios-arrow-thin-right";
-export { default as IoIosArrowThinUp } from "../../io/ios-arrow-thin-up";
-export { default as IoIosArrowUp } from "../../io/ios-arrow-up";
-export { default as IoIosAtOutline } from "../../io/ios-at-outline";
-export { default as IoIosAt } from "../../io/ios-at";
-export { default as IoIosBarcodeOutline } from "../../io/ios-barcode-outline";
-export { default as IoIosBarcode } from "../../io/ios-barcode";
-export { default as IoIosBaseballOutline } from "../../io/ios-baseball-outline";
-export { default as IoIosBaseball } from "../../io/ios-baseball";
-export { default as IoIosBasketballOutline } from "../../io/ios-basketball-outline";
-export { default as IoIosBasketball } from "../../io/ios-basketball";
-export { default as IoIosBellOutline } from "../../io/ios-bell-outline";
-export { default as IoIosBell } from "../../io/ios-bell";
-export { default as IoIosBodyOutline } from "../../io/ios-body-outline";
-export { default as IoIosBody } from "../../io/ios-body";
-export { default as IoIosBoltOutline } from "../../io/ios-bolt-outline";
-export { default as IoIosBolt } from "../../io/ios-bolt";
-export { default as IoIosBookOutline } from "../../io/ios-book-outline";
-export { default as IoIosBook } from "../../io/ios-book";
-export { default as IoIosBookmarksOutline } from "../../io/ios-bookmarks-outline";
-export { default as IoIosBookmarks } from "../../io/ios-bookmarks";
-export { default as IoIosBoxOutline } from "../../io/ios-box-outline";
-export { default as IoIosBox } from "../../io/ios-box";
-export { default as IoIosBriefcaseOutline } from "../../io/ios-briefcase-outline";
-export { default as IoIosBriefcase } from "../../io/ios-briefcase";
-export { default as IoIosBrowsersOutline } from "../../io/ios-browsers-outline";
-export { default as IoIosBrowsers } from "../../io/ios-browsers";
-export { default as IoIosCalculatorOutline } from "../../io/ios-calculator-outline";
-export { default as IoIosCalculator } from "../../io/ios-calculator";
-export { default as IoIosCalendarOutline } from "../../io/ios-calendar-outline";
-export { default as IoIosCalendar } from "../../io/ios-calendar";
-export { default as IoIosCameraOutline } from "../../io/ios-camera-outline";
-export { default as IoIosCamera } from "../../io/ios-camera";
-export { default as IoIosCartOutline } from "../../io/ios-cart-outline";
-export { default as IoIosCart } from "../../io/ios-cart";
-export { default as IoIosChatboxesOutline } from "../../io/ios-chatboxes-outline";
-export { default as IoIosChatboxes } from "../../io/ios-chatboxes";
-export { default as IoIosChatbubbleOutline } from "../../io/ios-chatbubble-outline";
-export { default as IoIosChatbubble } from "../../io/ios-chatbubble";
-export { default as IoIosCheckmarkEmpty } from "../../io/ios-checkmark-empty";
-export { default as IoIosCheckmarkOutline } from "../../io/ios-checkmark-outline";
-export { default as IoIosCheckmark } from "../../io/ios-checkmark";
-export { default as IoIosCircleFilled } from "../../io/ios-circle-filled";
-export { default as IoIosCircleOutline } from "../../io/ios-circle-outline";
-export { default as IoIosClockOutline } from "../../io/ios-clock-outline";
-export { default as IoIosClock } from "../../io/ios-clock";
-export { default as IoIosCloseEmpty } from "../../io/ios-close-empty";
-export { default as IoIosCloseOutline } from "../../io/ios-close-outline";
-export { default as IoIosClose } from "../../io/ios-close";
-export { default as IoIosCloudDownloadOutline } from "../../io/ios-cloud-download-outline";
-export { default as IoIosCloudDownload } from "../../io/ios-cloud-download";
-export { default as IoIosCloudOutline } from "../../io/ios-cloud-outline";
-export { default as IoIosCloudUploadOutline } from "../../io/ios-cloud-upload-outline";
-export { default as IoIosCloudUpload } from "../../io/ios-cloud-upload";
-export { default as IoIosCloud } from "../../io/ios-cloud";
-export { default as IoIosCloudyNightOutline } from "../../io/ios-cloudy-night-outline";
-export { default as IoIosCloudyNight } from "../../io/ios-cloudy-night";
-export { default as IoIosCloudyOutline } from "../../io/ios-cloudy-outline";
-export { default as IoIosCloudy } from "../../io/ios-cloudy";
-export { default as IoIosCogOutline } from "../../io/ios-cog-outline";
-export { default as IoIosCog } from "../../io/ios-cog";
-export { default as IoIosColorFilterOutline } from "../../io/ios-color-filter-outline";
-export { default as IoIosColorFilter } from "../../io/ios-color-filter";
-export { default as IoIosColorWandOutline } from "../../io/ios-color-wand-outline";
-export { default as IoIosColorWand } from "../../io/ios-color-wand";
-export { default as IoIosComposeOutline } from "../../io/ios-compose-outline";
-export { default as IoIosCompose } from "../../io/ios-compose";
-export { default as IoIosContactOutline } from "../../io/ios-contact-outline";
-export { default as IoIosContact } from "../../io/ios-contact";
-export { default as IoIosCopyOutline } from "../../io/ios-copy-outline";
-export { default as IoIosCopy } from "../../io/ios-copy";
-export { default as IoIosCropStrong } from "../../io/ios-crop-strong";
-export { default as IoIosCrop } from "../../io/ios-crop";
-export { default as IoIosDownloadOutline } from "../../io/ios-download-outline";
-export { default as IoIosDownload } from "../../io/ios-download";
-export { default as IoIosDrag } from "../../io/ios-drag";
-export { default as IoIosEmailOutline } from "../../io/ios-email-outline";
-export { default as IoIosEmail } from "../../io/ios-email";
-export { default as IoIosEyeOutline } from "../../io/ios-eye-outline";
-export { default as IoIosEye } from "../../io/ios-eye";
-export { default as IoIosFastforwardOutline } from "../../io/ios-fastforward-outline";
-export { default as IoIosFastforward } from "../../io/ios-fastforward";
-export { default as IoIosFilingOutline } from "../../io/ios-filing-outline";
-export { default as IoIosFiling } from "../../io/ios-filing";
-export { default as IoIosFilmOutline } from "../../io/ios-film-outline";
-export { default as IoIosFilm } from "../../io/ios-film";
-export { default as IoIosFlagOutline } from "../../io/ios-flag-outline";
-export { default as IoIosFlag } from "../../io/ios-flag";
-export { default as IoIosFlameOutline } from "../../io/ios-flame-outline";
-export { default as IoIosFlame } from "../../io/ios-flame";
-export { default as IoIosFlaskOutline } from "../../io/ios-flask-outline";
-export { default as IoIosFlask } from "../../io/ios-flask";
-export { default as IoIosFlowerOutline } from "../../io/ios-flower-outline";
-export { default as IoIosFlower } from "../../io/ios-flower";
-export { default as IoIosFolderOutline } from "../../io/ios-folder-outline";
-export { default as IoIosFolder } from "../../io/ios-folder";
-export { default as IoIosFootballOutline } from "../../io/ios-football-outline";
-export { default as IoIosFootball } from "../../io/ios-football";
-export { default as IoIosGameControllerAOutline } from "../../io/ios-game-controller-a-outline";
-export { default as IoIosGameControllerA } from "../../io/ios-game-controller-a";
-export { default as IoIosGameControllerBOutline } from "../../io/ios-game-controller-b-outline";
-export { default as IoIosGameControllerB } from "../../io/ios-game-controller-b";
-export { default as IoIosGearOutline } from "../../io/ios-gear-outline";
-export { default as IoIosGear } from "../../io/ios-gear";
-export { default as IoIosGlassesOutline } from "../../io/ios-glasses-outline";
-export { default as IoIosGlasses } from "../../io/ios-glasses";
-export { default as IoIosGridViewOutline } from "../../io/ios-grid-view-outline";
-export { default as IoIosGridView } from "../../io/ios-grid-view";
-export { default as IoIosHeartOutline } from "../../io/ios-heart-outline";
-export { default as IoIosHeart } from "../../io/ios-heart";
-export { default as IoIosHelpEmpty } from "../../io/ios-help-empty";
-export { default as IoIosHelpOutline } from "../../io/ios-help-outline";
-export { default as IoIosHelp } from "../../io/ios-help";
-export { default as IoIosHomeOutline } from "../../io/ios-home-outline";
-export { default as IoIosHome } from "../../io/ios-home";
-export { default as IoIosInfiniteOutline } from "../../io/ios-infinite-outline";
-export { default as IoIosInfinite } from "../../io/ios-infinite";
-export { default as IoIosInformatempty } from "../../io/ios-informatempty";
-export { default as IoIosInformation } from "../../io/ios-information";
-export { default as IoIosInformatoutline } from "../../io/ios-informatoutline";
-export { default as IoIosIonicOutline } from "../../io/ios-ionic-outline";
-export { default as IoIosKeypadOutline } from "../../io/ios-keypad-outline";
-export { default as IoIosKeypad } from "../../io/ios-keypad";
-export { default as IoIosLightbulbOutline } from "../../io/ios-lightbulb-outline";
-export { default as IoIosLightbulb } from "../../io/ios-lightbulb";
-export { default as IoIosListOutline } from "../../io/ios-list-outline";
-export { default as IoIosList } from "../../io/ios-list";
-export { default as IoIosLocation } from "../../io/ios-location";
-export { default as IoIosLocatoutline } from "../../io/ios-locatoutline";
-export { default as IoIosLockedOutline } from "../../io/ios-locked-outline";
-export { default as IoIosLocked } from "../../io/ios-locked";
-export { default as IoIosLoopStrong } from "../../io/ios-loop-strong";
-export { default as IoIosLoop } from "../../io/ios-loop";
-export { default as IoIosMedicalOutline } from "../../io/ios-medical-outline";
-export { default as IoIosMedical } from "../../io/ios-medical";
-export { default as IoIosMedkitOutline } from "../../io/ios-medkit-outline";
-export { default as IoIosMedkit } from "../../io/ios-medkit";
-export { default as IoIosMicOff } from "../../io/ios-mic-off";
-export { default as IoIosMicOutline } from "../../io/ios-mic-outline";
-export { default as IoIosMic } from "../../io/ios-mic";
-export { default as IoIosMinusEmpty } from "../../io/ios-minus-empty";
-export { default as IoIosMinusOutline } from "../../io/ios-minus-outline";
-export { default as IoIosMinus } from "../../io/ios-minus";
-export { default as IoIosMonitorOutline } from "../../io/ios-monitor-outline";
-export { default as IoIosMonitor } from "../../io/ios-monitor";
-export { default as IoIosMoonOutline } from "../../io/ios-moon-outline";
-export { default as IoIosMoon } from "../../io/ios-moon";
-export { default as IoIosMoreOutline } from "../../io/ios-more-outline";
-export { default as IoIosMore } from "../../io/ios-more";
-export { default as IoIosMusicalNote } from "../../io/ios-musical-note";
-export { default as IoIosMusicalNotes } from "../../io/ios-musical-notes";
-export { default as IoIosNavigateOutline } from "../../io/ios-navigate-outline";
-export { default as IoIosNavigate } from "../../io/ios-navigate";
-export { default as IoIosNutrition } from "../../io/ios-nutrition";
-export { default as IoIosNutritoutline } from "../../io/ios-nutritoutline";
-export { default as IoIosPaperOutline } from "../../io/ios-paper-outline";
-export { default as IoIosPaper } from "../../io/ios-paper";
-export { default as IoIosPaperplaneOutline } from "../../io/ios-paperplane-outline";
-export { default as IoIosPaperplane } from "../../io/ios-paperplane";
-export { default as IoIosPartlysunnyOutline } from "../../io/ios-partlysunny-outline";
-export { default as IoIosPartlysunny } from "../../io/ios-partlysunny";
-export { default as IoIosPauseOutline } from "../../io/ios-pause-outline";
-export { default as IoIosPause } from "../../io/ios-pause";
-export { default as IoIosPawOutline } from "../../io/ios-paw-outline";
-export { default as IoIosPaw } from "../../io/ios-paw";
-export { default as IoIosPeopleOutline } from "../../io/ios-people-outline";
-export { default as IoIosPeople } from "../../io/ios-people";
-export { default as IoIosPersonOutline } from "../../io/ios-person-outline";
-export { default as IoIosPerson } from "../../io/ios-person";
-export { default as IoIosPersonaddOutline } from "../../io/ios-personadd-outline";
-export { default as IoIosPersonadd } from "../../io/ios-personadd";
-export { default as IoIosPhotosOutline } from "../../io/ios-photos-outline";
-export { default as IoIosPhotos } from "../../io/ios-photos";
-export { default as IoIosPieOutline } from "../../io/ios-pie-outline";
-export { default as IoIosPie } from "../../io/ios-pie";
-export { default as IoIosPintOutline } from "../../io/ios-pint-outline";
-export { default as IoIosPint } from "../../io/ios-pint";
-export { default as IoIosPlayOutline } from "../../io/ios-play-outline";
-export { default as IoIosPlay } from "../../io/ios-play";
-export { default as IoIosPlusEmpty } from "../../io/ios-plus-empty";
-export { default as IoIosPlusOutline } from "../../io/ios-plus-outline";
-export { default as IoIosPlus } from "../../io/ios-plus";
-export { default as IoIosPricetagOutline } from "../../io/ios-pricetag-outline";
-export { default as IoIosPricetag } from "../../io/ios-pricetag";
-export { default as IoIosPricetagsOutline } from "../../io/ios-pricetags-outline";
-export { default as IoIosPricetags } from "../../io/ios-pricetags";
-export { default as IoIosPrinterOutline } from "../../io/ios-printer-outline";
-export { default as IoIosPrinter } from "../../io/ios-printer";
-export { default as IoIosPulseStrong } from "../../io/ios-pulse-strong";
-export { default as IoIosPulse } from "../../io/ios-pulse";
-export { default as IoIosRainyOutline } from "../../io/ios-rainy-outline";
-export { default as IoIosRainy } from "../../io/ios-rainy";
-export { default as IoIosRecordingOutline } from "../../io/ios-recording-outline";
-export { default as IoIosRecording } from "../../io/ios-recording";
-export { default as IoIosRedoOutline } from "../../io/ios-redo-outline";
-export { default as IoIosRedo } from "../../io/ios-redo";
-export { default as IoIosRefreshEmpty } from "../../io/ios-refresh-empty";
-export { default as IoIosRefreshOutline } from "../../io/ios-refresh-outline";
-export { default as IoIosRefresh } from "../../io/ios-refresh";
-export { default as IoIosReload } from "../../io/ios-reload";
-export { default as IoIosReverseCameraOutline } from "../../io/ios-reverse-camera-outline";
-export { default as IoIosReverseCamera } from "../../io/ios-reverse-camera";
-export { default as IoIosRewindOutline } from "../../io/ios-rewind-outline";
-export { default as IoIosRewind } from "../../io/ios-rewind";
-export { default as IoIosRoseOutline } from "../../io/ios-rose-outline";
-export { default as IoIosRose } from "../../io/ios-rose";
-export { default as IoIosSearchStrong } from "../../io/ios-search-strong";
-export { default as IoIosSearch } from "../../io/ios-search";
-export { default as IoIosSettingsStrong } from "../../io/ios-settings-strong";
-export { default as IoIosSettings } from "../../io/ios-settings";
-export { default as IoIosShuffleStrong } from "../../io/ios-shuffle-strong";
-export { default as IoIosShuffle } from "../../io/ios-shuffle";
-export { default as IoIosSkipbackwardOutline } from "../../io/ios-skipbackward-outline";
-export { default as IoIosSkipbackward } from "../../io/ios-skipbackward";
-export { default as IoIosSkipforwardOutline } from "../../io/ios-skipforward-outline";
-export { default as IoIosSkipforward } from "../../io/ios-skipforward";
-export { default as IoIosSnowy } from "../../io/ios-snowy";
-export { default as IoIosSpeedometerOutline } from "../../io/ios-speedometer-outline";
-export { default as IoIosSpeedometer } from "../../io/ios-speedometer";
-export { default as IoIosStarHalf } from "../../io/ios-star-half";
-export { default as IoIosStarOutline } from "../../io/ios-star-outline";
-export { default as IoIosStar } from "../../io/ios-star";
-export { default as IoIosStopwatchOutline } from "../../io/ios-stopwatch-outline";
-export { default as IoIosStopwatch } from "../../io/ios-stopwatch";
-export { default as IoIosSunnyOutline } from "../../io/ios-sunny-outline";
-export { default as IoIosSunny } from "../../io/ios-sunny";
-export { default as IoIosTelephoneOutline } from "../../io/ios-telephone-outline";
-export { default as IoIosTelephone } from "../../io/ios-telephone";
-export { default as IoIosTennisballOutline } from "../../io/ios-tennisball-outline";
-export { default as IoIosTennisball } from "../../io/ios-tennisball";
-export { default as IoIosThunderstormOutline } from "../../io/ios-thunderstorm-outline";
-export { default as IoIosThunderstorm } from "../../io/ios-thunderstorm";
-export { default as IoIosTimeOutline } from "../../io/ios-time-outline";
-export { default as IoIosTime } from "../../io/ios-time";
-export { default as IoIosTimerOutline } from "../../io/ios-timer-outline";
-export { default as IoIosTimer } from "../../io/ios-timer";
-export { default as IoIosToggleOutline } from "../../io/ios-toggle-outline";
-export { default as IoIosToggle } from "../../io/ios-toggle";
-export { default as IoIosTrashOutline } from "../../io/ios-trash-outline";
-export { default as IoIosTrash } from "../../io/ios-trash";
-export { default as IoIosUndoOutline } from "../../io/ios-undo-outline";
-export { default as IoIosUndo } from "../../io/ios-undo";
-export { default as IoIosUnlockedOutline } from "../../io/ios-unlocked-outline";
-export { default as IoIosUnlocked } from "../../io/ios-unlocked";
-export { default as IoIosUploadOutline } from "../../io/ios-upload-outline";
-export { default as IoIosUpload } from "../../io/ios-upload";
-export { default as IoIosVideocamOutline } from "../../io/ios-videocam-outline";
-export { default as IoIosVideocam } from "../../io/ios-videocam";
-export { default as IoIosVolumeHigh } from "../../io/ios-volume-high";
-export { default as IoIosVolumeLow } from "../../io/ios-volume-low";
-export { default as IoIosWineglassOutline } from "../../io/ios-wineglass-outline";
-export { default as IoIosWineglass } from "../../io/ios-wineglass";
-export { default as IoIosWorldOutline } from "../../io/ios-world-outline";
-export { default as IoIosWorld } from "../../io/ios-world";
-export { default as IoIpad } from "../../io/ipad";
-export { default as IoIphone } from "../../io/iphone";
-export { default as IoIpod } from "../../io/ipod";
-export { default as IoJet } from "../../io/jet";
-export { default as IoKey } from "../../io/key";
-export { default as IoKnife } from "../../io/knife";
-export { default as IoLaptop } from "../../io/laptop";
-export { default as IoLeaf } from "../../io/leaf";
-export { default as IoLevels } from "../../io/levels";
-export { default as IoLightbulb } from "../../io/lightbulb";
-export { default as IoLink } from "../../io/link";
-export { default as IoLoadA } from "../../io/load-a";
-export { default as IoLoadB } from "../../io/load-b";
-export { default as IoLoadC } from "../../io/load-c";
-export { default as IoLoadD } from "../../io/load-d";
-export { default as IoLocation } from "../../io/location";
-export { default as IoLockCombination } from "../../io/lock-combination";
-export { default as IoLocked } from "../../io/locked";
-export { default as IoLogIn } from "../../io/log-in";
-export { default as IoLogOut } from "../../io/log-out";
-export { default as IoLoop } from "../../io/loop";
-export { default as IoMagnet } from "../../io/magnet";
-export { default as IoMale } from "../../io/male";
-export { default as IoMan } from "../../io/man";
-export { default as IoMap } from "../../io/map";
-export { default as IoMedkit } from "../../io/medkit";
-export { default as IoMerge } from "../../io/merge";
-export { default as IoMicA } from "../../io/mic-a";
-export { default as IoMicB } from "../../io/mic-b";
-export { default as IoMicC } from "../../io/mic-c";
-export { default as IoMinusCircled } from "../../io/minus-circled";
-export { default as IoMinusRound } from "../../io/minus-round";
-export { default as IoMinus } from "../../io/minus";
-export { default as IoModelS } from "../../io/model-s";
-export { default as IoMonitor } from "../../io/monitor";
-export { default as IoMore } from "../../io/more";
-export { default as IoMouse } from "../../io/mouse";
-export { default as IoMusicNote } from "../../io/music-note";
-export { default as IoNaviconRound } from "../../io/navicon-round";
-export { default as IoNavicon } from "../../io/navicon";
-export { default as IoNavigate } from "../../io/navigate";
-export { default as IoNetwork } from "../../io/network";
-export { default as IoNoSmoking } from "../../io/no-smoking";
-export { default as IoNuclear } from "../../io/nuclear";
-export { default as IoOutlet } from "../../io/outlet";
-export { default as IoPaintbrush } from "../../io/paintbrush";
-export { default as IoPaintbucket } from "../../io/paintbucket";
-export { default as IoPaperAirplane } from "../../io/paper-airplane";
-export { default as IoPaperclip } from "../../io/paperclip";
-export { default as IoPause } from "../../io/pause";
-export { default as IoPersonAdd } from "../../io/person-add";
-export { default as IoPersonStalker } from "../../io/person-stalker";
-export { default as IoPerson } from "../../io/person";
-export { default as IoPieGraph } from "../../io/pie-graph";
-export { default as IoPin } from "../../io/pin";
-export { default as IoPinpoint } from "../../io/pinpoint";
-export { default as IoPizza } from "../../io/pizza";
-export { default as IoPlane } from "../../io/plane";
-export { default as IoPlanet } from "../../io/planet";
-export { default as IoPlay } from "../../io/play";
-export { default as IoPlaystation } from "../../io/playstation";
-export { default as IoPlusCircled } from "../../io/plus-circled";
-export { default as IoPlusRound } from "../../io/plus-round";
-export { default as IoPlus } from "../../io/plus";
-export { default as IoPodium } from "../../io/podium";
-export { default as IoPound } from "../../io/pound";
-export { default as IoPower } from "../../io/power";
-export { default as IoPricetag } from "../../io/pricetag";
-export { default as IoPricetags } from "../../io/pricetags";
-export { default as IoPrinter } from "../../io/printer";
-export { default as IoPullRequest } from "../../io/pull-request";
-export { default as IoQrScanner } from "../../io/qr-scanner";
-export { default as IoQuote } from "../../io/quote";
-export { default as IoRadioWaves } from "../../io/radio-waves";
-export { default as IoRecord } from "../../io/record";
-export { default as IoRefresh } from "../../io/refresh";
-export { default as IoReplyAll } from "../../io/reply-all";
-export { default as IoReply } from "../../io/reply";
-export { default as IoRibbonA } from "../../io/ribbon-a";
-export { default as IoRibbonB } from "../../io/ribbon-b";
-export { default as IoSadOutline } from "../../io/sad-outline";
-export { default as IoSad } from "../../io/sad";
-export { default as IoScissors } from "../../io/scissors";
-export { default as IoSearch } from "../../io/search";
-export { default as IoSettings } from "../../io/settings";
-export { default as IoShare } from "../../io/share";
-export { default as IoShuffle } from "../../io/shuffle";
-export { default as IoSkipBackward } from "../../io/skip-backward";
-export { default as IoSkipForward } from "../../io/skip-forward";
-export { default as IoSocialAndroidOutline } from "../../io/social-android-outline";
-export { default as IoSocialAndroid } from "../../io/social-android";
-export { default as IoSocialAngularOutline } from "../../io/social-angular-outline";
-export { default as IoSocialAngular } from "../../io/social-angular";
-export { default as IoSocialAppleOutline } from "../../io/social-apple-outline";
-export { default as IoSocialApple } from "../../io/social-apple";
-export { default as IoSocialBitcoinOutline } from "../../io/social-bitcoin-outline";
-export { default as IoSocialBitcoin } from "../../io/social-bitcoin";
-export { default as IoSocialBufferOutline } from "../../io/social-buffer-outline";
-export { default as IoSocialBuffer } from "../../io/social-buffer";
-export { default as IoSocialChromeOutline } from "../../io/social-chrome-outline";
-export { default as IoSocialChrome } from "../../io/social-chrome";
-export { default as IoSocialCodepenOutline } from "../../io/social-codepen-outline";
-export { default as IoSocialCodepen } from "../../io/social-codepen";
-export { default as IoSocialCss3Outline } from "../../io/social-css3-outline";
-export { default as IoSocialCss3 } from "../../io/social-css3";
-export { default as IoSocialDesignernewsOutline } from "../../io/social-designernews-outline";
-export { default as IoSocialDesignernews } from "../../io/social-designernews";
-export { default as IoSocialDribbbleOutline } from "../../io/social-dribbble-outline";
-export { default as IoSocialDribbble } from "../../io/social-dribbble";
-export { default as IoSocialDropboxOutline } from "../../io/social-dropbox-outline";
-export { default as IoSocialDropbox } from "../../io/social-dropbox";
-export { default as IoSocialEuroOutline } from "../../io/social-euro-outline";
-export { default as IoSocialEuro } from "../../io/social-euro";
-export { default as IoSocialFacebookOutline } from "../../io/social-facebook-outline";
-export { default as IoSocialFacebook } from "../../io/social-facebook";
-export { default as IoSocialFoursquareOutline } from "../../io/social-foursquare-outline";
-export { default as IoSocialFoursquare } from "../../io/social-foursquare";
-export { default as IoSocialFreebsdDevil } from "../../io/social-freebsd-devil";
-export { default as IoSocialGithubOutline } from "../../io/social-github-outline";
-export { default as IoSocialGithub } from "../../io/social-github";
-export { default as IoSocialGoogleOutline } from "../../io/social-google-outline";
-export { default as IoSocialGoogle } from "../../io/social-google";
-export { default as IoSocialGoogleplusOutline } from "../../io/social-googleplus-outline";
-export { default as IoSocialGoogleplus } from "../../io/social-googleplus";
-export { default as IoSocialHackernewsOutline } from "../../io/social-hackernews-outline";
-export { default as IoSocialHackernews } from "../../io/social-hackernews";
-export { default as IoSocialHtml5Outline } from "../../io/social-html5-outline";
-export { default as IoSocialHtml5 } from "../../io/social-html5";
-export { default as IoSocialInstagramOutline } from "../../io/social-instagram-outline";
-export { default as IoSocialInstagram } from "../../io/social-instagram";
-export { default as IoSocialJavascriptOutline } from "../../io/social-javascript-outline";
-export { default as IoSocialJavascript } from "../../io/social-javascript";
-export { default as IoSocialLinkedinOutline } from "../../io/social-linkedin-outline";
-export { default as IoSocialLinkedin } from "../../io/social-linkedin";
-export { default as IoSocialMarkdown } from "../../io/social-markdown";
-export { default as IoSocialNodejs } from "../../io/social-nodejs";
-export { default as IoSocialOctocat } from "../../io/social-octocat";
-export { default as IoSocialPinterestOutline } from "../../io/social-pinterest-outline";
-export { default as IoSocialPinterest } from "../../io/social-pinterest";
-export { default as IoSocialPython } from "../../io/social-python";
-export { default as IoSocialRedditOutline } from "../../io/social-reddit-outline";
-export { default as IoSocialReddit } from "../../io/social-reddit";
-export { default as IoSocialRssOutline } from "../../io/social-rss-outline";
-export { default as IoSocialRss } from "../../io/social-rss";
-export { default as IoSocialSass } from "../../io/social-sass";
-export { default as IoSocialSkypeOutline } from "../../io/social-skype-outline";
-export { default as IoSocialSkype } from "../../io/social-skype";
-export { default as IoSocialSnapchatOutline } from "../../io/social-snapchat-outline";
-export { default as IoSocialSnapchat } from "../../io/social-snapchat";
-export { default as IoSocialTumblrOutline } from "../../io/social-tumblr-outline";
-export { default as IoSocialTumblr } from "../../io/social-tumblr";
-export { default as IoSocialTux } from "../../io/social-tux";
-export { default as IoSocialTwitchOutline } from "../../io/social-twitch-outline";
-export { default as IoSocialTwitch } from "../../io/social-twitch";
-export { default as IoSocialTwitterOutline } from "../../io/social-twitter-outline";
-export { default as IoSocialTwitter } from "../../io/social-twitter";
-export { default as IoSocialUsdOutline } from "../../io/social-usd-outline";
-export { default as IoSocialUsd } from "../../io/social-usd";
-export { default as IoSocialVimeoOutline } from "../../io/social-vimeo-outline";
-export { default as IoSocialVimeo } from "../../io/social-vimeo";
-export { default as IoSocialWhatsappOutline } from "../../io/social-whatsapp-outline";
-export { default as IoSocialWhatsapp } from "../../io/social-whatsapp";
-export { default as IoSocialWindowsOutline } from "../../io/social-windows-outline";
-export { default as IoSocialWindows } from "../../io/social-windows";
-export { default as IoSocialWordpressOutline } from "../../io/social-wordpress-outline";
-export { default as IoSocialWordpress } from "../../io/social-wordpress";
-export { default as IoSocialYahooOutline } from "../../io/social-yahoo-outline";
-export { default as IoSocialYahoo } from "../../io/social-yahoo";
-export { default as IoSocialYenOutline } from "../../io/social-yen-outline";
-export { default as IoSocialYen } from "../../io/social-yen";
-export { default as IoSocialYoutubeOutline } from "../../io/social-youtube-outline";
-export { default as IoSocialYoutube } from "../../io/social-youtube";
-export { default as IoSoupCanOutline } from "../../io/soup-can-outline";
-export { default as IoSoupCan } from "../../io/soup-can";
-export { default as IoSpeakerphone } from "../../io/speakerphone";
-export { default as IoSpeedometer } from "../../io/speedometer";
-export { default as IoSpoon } from "../../io/spoon";
-export { default as IoStar } from "../../io/star";
-export { default as IoStatsBars } from "../../io/stats-bars";
-export { default as IoSteam } from "../../io/steam";
-export { default as IoStop } from "../../io/stop";
-export { default as IoThermometer } from "../../io/thermometer";
-export { default as IoThumbsdown } from "../../io/thumbsdown";
-export { default as IoThumbsup } from "../../io/thumbsup";
-export { default as IoToggleFilled } from "../../io/toggle-filled";
-export { default as IoToggle } from "../../io/toggle";
-export { default as IoTransgender } from "../../io/transgender";
-export { default as IoTrashA } from "../../io/trash-a";
-export { default as IoTrashB } from "../../io/trash-b";
-export { default as IoTrophy } from "../../io/trophy";
-export { default as IoTshirtOutline } from "../../io/tshirt-outline";
-export { default as IoTshirt } from "../../io/tshirt";
-export { default as IoUmbrella } from "../../io/umbrella";
-export { default as IoUniversity } from "../../io/university";
-export { default as IoUnlocked } from "../../io/unlocked";
-export { default as IoUpload } from "../../io/upload";
-export { default as IoUsb } from "../../io/usb";
-export { default as IoVideocamera } from "../../io/videocamera";
-export { default as IoVolumeHigh } from "../../io/volume-high";
-export { default as IoVolumeLow } from "../../io/volume-low";
-export { default as IoVolumeMedium } from "../../io/volume-medium";
-export { default as IoVolumeMute } from "../../io/volume-mute";
-export { default as IoWand } from "../../io/wand";
-export { default as IoWaterdrop } from "../../io/waterdrop";
-export { default as IoWifi } from "../../io/wifi";
-export { default as IoWineglass } from "../../io/wineglass";
-export { default as IoWoman } from "../../io/woman";
-export { default as IoWrench } from "../../io/wrench";
-export { default as IoXbox } from "../../io/xbox";
diff --git a/types/react-icons/lib/io/informatcircled.d.ts b/types/react-icons/lib/io/informatcircled.d.ts
deleted file mode 100644
index 829ad4b409..0000000000
--- a/types/react-icons/lib/io/informatcircled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoInformatcircled extends React.Component<IconBaseProps> { }
-export = IoInformatcircled;
diff --git a/types/react-icons/lib/io/information.d.ts b/types/react-icons/lib/io/information.d.ts
deleted file mode 100644
index eceb48a8c3..0000000000
--- a/types/react-icons/lib/io/information.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoInformation extends React.Component<IconBaseProps> { }
-export = IoInformation;
diff --git a/types/react-icons/lib/io/ionic.d.ts b/types/react-icons/lib/io/ionic.d.ts
deleted file mode 100644
index dcf5655c61..0000000000
--- a/types/react-icons/lib/io/ionic.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIonic extends React.Component<IconBaseProps> { }
-export = IoIonic;
diff --git a/types/react-icons/lib/io/ios-alarm-outline.d.ts b/types/react-icons/lib/io/ios-alarm-outline.d.ts
deleted file mode 100644
index b6b321d531..0000000000
--- a/types/react-icons/lib/io/ios-alarm-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosAlarmOutline extends React.Component<IconBaseProps> { }
-export = IoIosAlarmOutline;
diff --git a/types/react-icons/lib/io/ios-alarm.d.ts b/types/react-icons/lib/io/ios-alarm.d.ts
deleted file mode 100644
index a343e709e3..0000000000
--- a/types/react-icons/lib/io/ios-alarm.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosAlarm extends React.Component<IconBaseProps> { }
-export = IoIosAlarm;
diff --git a/types/react-icons/lib/io/ios-albums-outline.d.ts b/types/react-icons/lib/io/ios-albums-outline.d.ts
deleted file mode 100644
index dba1c52063..0000000000
--- a/types/react-icons/lib/io/ios-albums-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosAlbumsOutline extends React.Component<IconBaseProps> { }
-export = IoIosAlbumsOutline;
diff --git a/types/react-icons/lib/io/ios-albums.d.ts b/types/react-icons/lib/io/ios-albums.d.ts
deleted file mode 100644
index 70e77f84aa..0000000000
--- a/types/react-icons/lib/io/ios-albums.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosAlbums extends React.Component<IconBaseProps> { }
-export = IoIosAlbums;
diff --git a/types/react-icons/lib/io/ios-americanfootball-outline.d.ts b/types/react-icons/lib/io/ios-americanfootball-outline.d.ts
deleted file mode 100644
index 0d3f7105e4..0000000000
--- a/types/react-icons/lib/io/ios-americanfootball-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosAmericanfootballOutline extends React.Component<IconBaseProps> { }
-export = IoIosAmericanfootballOutline;
diff --git a/types/react-icons/lib/io/ios-americanfootball.d.ts b/types/react-icons/lib/io/ios-americanfootball.d.ts
deleted file mode 100644
index a3502d9745..0000000000
--- a/types/react-icons/lib/io/ios-americanfootball.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosAmericanfootball extends React.Component<IconBaseProps> { }
-export = IoIosAmericanfootball;
diff --git a/types/react-icons/lib/io/ios-analytics-outline.d.ts b/types/react-icons/lib/io/ios-analytics-outline.d.ts
deleted file mode 100644
index 52d3b2a664..0000000000
--- a/types/react-icons/lib/io/ios-analytics-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosAnalyticsOutline extends React.Component<IconBaseProps> { }
-export = IoIosAnalyticsOutline;
diff --git a/types/react-icons/lib/io/ios-analytics.d.ts b/types/react-icons/lib/io/ios-analytics.d.ts
deleted file mode 100644
index da9c6b9d91..0000000000
--- a/types/react-icons/lib/io/ios-analytics.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosAnalytics extends React.Component<IconBaseProps> { }
-export = IoIosAnalytics;
diff --git a/types/react-icons/lib/io/ios-arrow-back.d.ts b/types/react-icons/lib/io/ios-arrow-back.d.ts
deleted file mode 100644
index d673fc84ba..0000000000
--- a/types/react-icons/lib/io/ios-arrow-back.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosArrowBack extends React.Component<IconBaseProps> { }
-export = IoIosArrowBack;
diff --git a/types/react-icons/lib/io/ios-arrow-down.d.ts b/types/react-icons/lib/io/ios-arrow-down.d.ts
deleted file mode 100644
index 3e206b984c..0000000000
--- a/types/react-icons/lib/io/ios-arrow-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosArrowDown extends React.Component<IconBaseProps> { }
-export = IoIosArrowDown;
diff --git a/types/react-icons/lib/io/ios-arrow-forward.d.ts b/types/react-icons/lib/io/ios-arrow-forward.d.ts
deleted file mode 100644
index d67662f144..0000000000
--- a/types/react-icons/lib/io/ios-arrow-forward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosArrowForward extends React.Component<IconBaseProps> { }
-export = IoIosArrowForward;
diff --git a/types/react-icons/lib/io/ios-arrow-left.d.ts b/types/react-icons/lib/io/ios-arrow-left.d.ts
deleted file mode 100644
index 93f66481cf..0000000000
--- a/types/react-icons/lib/io/ios-arrow-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosArrowLeft extends React.Component<IconBaseProps> { }
-export = IoIosArrowLeft;
diff --git a/types/react-icons/lib/io/ios-arrow-right.d.ts b/types/react-icons/lib/io/ios-arrow-right.d.ts
deleted file mode 100644
index cea88a4483..0000000000
--- a/types/react-icons/lib/io/ios-arrow-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosArrowRight extends React.Component<IconBaseProps> { }
-export = IoIosArrowRight;
diff --git a/types/react-icons/lib/io/ios-arrow-thin-down.d.ts b/types/react-icons/lib/io/ios-arrow-thin-down.d.ts
deleted file mode 100644
index 7d38c834a7..0000000000
--- a/types/react-icons/lib/io/ios-arrow-thin-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosArrowThinDown extends React.Component<IconBaseProps> { }
-export = IoIosArrowThinDown;
diff --git a/types/react-icons/lib/io/ios-arrow-thin-left.d.ts b/types/react-icons/lib/io/ios-arrow-thin-left.d.ts
deleted file mode 100644
index 6ca695d67f..0000000000
--- a/types/react-icons/lib/io/ios-arrow-thin-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosArrowThinLeft extends React.Component<IconBaseProps> { }
-export = IoIosArrowThinLeft;
diff --git a/types/react-icons/lib/io/ios-arrow-thin-right.d.ts b/types/react-icons/lib/io/ios-arrow-thin-right.d.ts
deleted file mode 100644
index 5fa30f116d..0000000000
--- a/types/react-icons/lib/io/ios-arrow-thin-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosArrowThinRight extends React.Component<IconBaseProps> { }
-export = IoIosArrowThinRight;
diff --git a/types/react-icons/lib/io/ios-arrow-thin-up.d.ts b/types/react-icons/lib/io/ios-arrow-thin-up.d.ts
deleted file mode 100644
index 6e3168d95d..0000000000
--- a/types/react-icons/lib/io/ios-arrow-thin-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosArrowThinUp extends React.Component<IconBaseProps> { }
-export = IoIosArrowThinUp;
diff --git a/types/react-icons/lib/io/ios-arrow-up.d.ts b/types/react-icons/lib/io/ios-arrow-up.d.ts
deleted file mode 100644
index e140f1c883..0000000000
--- a/types/react-icons/lib/io/ios-arrow-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosArrowUp extends React.Component<IconBaseProps> { }
-export = IoIosArrowUp;
diff --git a/types/react-icons/lib/io/ios-at-outline.d.ts b/types/react-icons/lib/io/ios-at-outline.d.ts
deleted file mode 100644
index 568676c927..0000000000
--- a/types/react-icons/lib/io/ios-at-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosAtOutline extends React.Component<IconBaseProps> { }
-export = IoIosAtOutline;
diff --git a/types/react-icons/lib/io/ios-at.d.ts b/types/react-icons/lib/io/ios-at.d.ts
deleted file mode 100644
index bb359ef077..0000000000
--- a/types/react-icons/lib/io/ios-at.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosAt extends React.Component<IconBaseProps> { }
-export = IoIosAt;
diff --git a/types/react-icons/lib/io/ios-barcode-outline.d.ts b/types/react-icons/lib/io/ios-barcode-outline.d.ts
deleted file mode 100644
index 0e733f7426..0000000000
--- a/types/react-icons/lib/io/ios-barcode-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBarcodeOutline extends React.Component<IconBaseProps> { }
-export = IoIosBarcodeOutline;
diff --git a/types/react-icons/lib/io/ios-barcode.d.ts b/types/react-icons/lib/io/ios-barcode.d.ts
deleted file mode 100644
index 170a0c1458..0000000000
--- a/types/react-icons/lib/io/ios-barcode.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBarcode extends React.Component<IconBaseProps> { }
-export = IoIosBarcode;
diff --git a/types/react-icons/lib/io/ios-baseball-outline.d.ts b/types/react-icons/lib/io/ios-baseball-outline.d.ts
deleted file mode 100644
index 8893ad7e66..0000000000
--- a/types/react-icons/lib/io/ios-baseball-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBaseballOutline extends React.Component<IconBaseProps> { }
-export = IoIosBaseballOutline;
diff --git a/types/react-icons/lib/io/ios-baseball.d.ts b/types/react-icons/lib/io/ios-baseball.d.ts
deleted file mode 100644
index 06626537a4..0000000000
--- a/types/react-icons/lib/io/ios-baseball.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBaseball extends React.Component<IconBaseProps> { }
-export = IoIosBaseball;
diff --git a/types/react-icons/lib/io/ios-basketball-outline.d.ts b/types/react-icons/lib/io/ios-basketball-outline.d.ts
deleted file mode 100644
index e2387f5695..0000000000
--- a/types/react-icons/lib/io/ios-basketball-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBasketballOutline extends React.Component<IconBaseProps> { }
-export = IoIosBasketballOutline;
diff --git a/types/react-icons/lib/io/ios-basketball.d.ts b/types/react-icons/lib/io/ios-basketball.d.ts
deleted file mode 100644
index 17c4d6fd5f..0000000000
--- a/types/react-icons/lib/io/ios-basketball.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBasketball extends React.Component<IconBaseProps> { }
-export = IoIosBasketball;
diff --git a/types/react-icons/lib/io/ios-bell-outline.d.ts b/types/react-icons/lib/io/ios-bell-outline.d.ts
deleted file mode 100644
index e346d2754a..0000000000
--- a/types/react-icons/lib/io/ios-bell-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBellOutline extends React.Component<IconBaseProps> { }
-export = IoIosBellOutline;
diff --git a/types/react-icons/lib/io/ios-bell.d.ts b/types/react-icons/lib/io/ios-bell.d.ts
deleted file mode 100644
index a899c4f941..0000000000
--- a/types/react-icons/lib/io/ios-bell.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBell extends React.Component<IconBaseProps> { }
-export = IoIosBell;
diff --git a/types/react-icons/lib/io/ios-body-outline.d.ts b/types/react-icons/lib/io/ios-body-outline.d.ts
deleted file mode 100644
index 5850273998..0000000000
--- a/types/react-icons/lib/io/ios-body-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBodyOutline extends React.Component<IconBaseProps> { }
-export = IoIosBodyOutline;
diff --git a/types/react-icons/lib/io/ios-body.d.ts b/types/react-icons/lib/io/ios-body.d.ts
deleted file mode 100644
index fc8b1ecc9f..0000000000
--- a/types/react-icons/lib/io/ios-body.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBody extends React.Component<IconBaseProps> { }
-export = IoIosBody;
diff --git a/types/react-icons/lib/io/ios-bolt-outline.d.ts b/types/react-icons/lib/io/ios-bolt-outline.d.ts
deleted file mode 100644
index 86ec284228..0000000000
--- a/types/react-icons/lib/io/ios-bolt-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBoltOutline extends React.Component<IconBaseProps> { }
-export = IoIosBoltOutline;
diff --git a/types/react-icons/lib/io/ios-bolt.d.ts b/types/react-icons/lib/io/ios-bolt.d.ts
deleted file mode 100644
index 74e19bba18..0000000000
--- a/types/react-icons/lib/io/ios-bolt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBolt extends React.Component<IconBaseProps> { }
-export = IoIosBolt;
diff --git a/types/react-icons/lib/io/ios-book-outline.d.ts b/types/react-icons/lib/io/ios-book-outline.d.ts
deleted file mode 100644
index 87ed84a220..0000000000
--- a/types/react-icons/lib/io/ios-book-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBookOutline extends React.Component<IconBaseProps> { }
-export = IoIosBookOutline;
diff --git a/types/react-icons/lib/io/ios-book.d.ts b/types/react-icons/lib/io/ios-book.d.ts
deleted file mode 100644
index 401fadbe2e..0000000000
--- a/types/react-icons/lib/io/ios-book.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBook extends React.Component<IconBaseProps> { }
-export = IoIosBook;
diff --git a/types/react-icons/lib/io/ios-bookmarks-outline.d.ts b/types/react-icons/lib/io/ios-bookmarks-outline.d.ts
deleted file mode 100644
index 1a3428a1d5..0000000000
--- a/types/react-icons/lib/io/ios-bookmarks-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBookmarksOutline extends React.Component<IconBaseProps> { }
-export = IoIosBookmarksOutline;
diff --git a/types/react-icons/lib/io/ios-bookmarks.d.ts b/types/react-icons/lib/io/ios-bookmarks.d.ts
deleted file mode 100644
index 8910a86f2b..0000000000
--- a/types/react-icons/lib/io/ios-bookmarks.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBookmarks extends React.Component<IconBaseProps> { }
-export = IoIosBookmarks;
diff --git a/types/react-icons/lib/io/ios-box-outline.d.ts b/types/react-icons/lib/io/ios-box-outline.d.ts
deleted file mode 100644
index d7b4985041..0000000000
--- a/types/react-icons/lib/io/ios-box-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBoxOutline extends React.Component<IconBaseProps> { }
-export = IoIosBoxOutline;
diff --git a/types/react-icons/lib/io/ios-box.d.ts b/types/react-icons/lib/io/ios-box.d.ts
deleted file mode 100644
index 7dd3759007..0000000000
--- a/types/react-icons/lib/io/ios-box.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBox extends React.Component<IconBaseProps> { }
-export = IoIosBox;
diff --git a/types/react-icons/lib/io/ios-briefcase-outline.d.ts b/types/react-icons/lib/io/ios-briefcase-outline.d.ts
deleted file mode 100644
index e778987aa3..0000000000
--- a/types/react-icons/lib/io/ios-briefcase-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBriefcaseOutline extends React.Component<IconBaseProps> { }
-export = IoIosBriefcaseOutline;
diff --git a/types/react-icons/lib/io/ios-briefcase.d.ts b/types/react-icons/lib/io/ios-briefcase.d.ts
deleted file mode 100644
index ec269077a8..0000000000
--- a/types/react-icons/lib/io/ios-briefcase.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBriefcase extends React.Component<IconBaseProps> { }
-export = IoIosBriefcase;
diff --git a/types/react-icons/lib/io/ios-browsers-outline.d.ts b/types/react-icons/lib/io/ios-browsers-outline.d.ts
deleted file mode 100644
index 5f011531e3..0000000000
--- a/types/react-icons/lib/io/ios-browsers-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBrowsersOutline extends React.Component<IconBaseProps> { }
-export = IoIosBrowsersOutline;
diff --git a/types/react-icons/lib/io/ios-browsers.d.ts b/types/react-icons/lib/io/ios-browsers.d.ts
deleted file mode 100644
index dbadb14b0a..0000000000
--- a/types/react-icons/lib/io/ios-browsers.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosBrowsers extends React.Component<IconBaseProps> { }
-export = IoIosBrowsers;
diff --git a/types/react-icons/lib/io/ios-calculator-outline.d.ts b/types/react-icons/lib/io/ios-calculator-outline.d.ts
deleted file mode 100644
index b3a0eb7f5c..0000000000
--- a/types/react-icons/lib/io/ios-calculator-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCalculatorOutline extends React.Component<IconBaseProps> { }
-export = IoIosCalculatorOutline;
diff --git a/types/react-icons/lib/io/ios-calculator.d.ts b/types/react-icons/lib/io/ios-calculator.d.ts
deleted file mode 100644
index 5237308ae6..0000000000
--- a/types/react-icons/lib/io/ios-calculator.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCalculator extends React.Component<IconBaseProps> { }
-export = IoIosCalculator;
diff --git a/types/react-icons/lib/io/ios-calendar-outline.d.ts b/types/react-icons/lib/io/ios-calendar-outline.d.ts
deleted file mode 100644
index 2f38e2977b..0000000000
--- a/types/react-icons/lib/io/ios-calendar-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCalendarOutline extends React.Component<IconBaseProps> { }
-export = IoIosCalendarOutline;
diff --git a/types/react-icons/lib/io/ios-calendar.d.ts b/types/react-icons/lib/io/ios-calendar.d.ts
deleted file mode 100644
index fdfc45ecaa..0000000000
--- a/types/react-icons/lib/io/ios-calendar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCalendar extends React.Component<IconBaseProps> { }
-export = IoIosCalendar;
diff --git a/types/react-icons/lib/io/ios-camera-outline.d.ts b/types/react-icons/lib/io/ios-camera-outline.d.ts
deleted file mode 100644
index 6cafe009b2..0000000000
--- a/types/react-icons/lib/io/ios-camera-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCameraOutline extends React.Component<IconBaseProps> { }
-export = IoIosCameraOutline;
diff --git a/types/react-icons/lib/io/ios-camera.d.ts b/types/react-icons/lib/io/ios-camera.d.ts
deleted file mode 100644
index e909b8e2b5..0000000000
--- a/types/react-icons/lib/io/ios-camera.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCamera extends React.Component<IconBaseProps> { }
-export = IoIosCamera;
diff --git a/types/react-icons/lib/io/ios-cart-outline.d.ts b/types/react-icons/lib/io/ios-cart-outline.d.ts
deleted file mode 100644
index affa96342b..0000000000
--- a/types/react-icons/lib/io/ios-cart-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCartOutline extends React.Component<IconBaseProps> { }
-export = IoIosCartOutline;
diff --git a/types/react-icons/lib/io/ios-cart.d.ts b/types/react-icons/lib/io/ios-cart.d.ts
deleted file mode 100644
index 2336583666..0000000000
--- a/types/react-icons/lib/io/ios-cart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCart extends React.Component<IconBaseProps> { }
-export = IoIosCart;
diff --git a/types/react-icons/lib/io/ios-chatboxes-outline.d.ts b/types/react-icons/lib/io/ios-chatboxes-outline.d.ts
deleted file mode 100644
index 3cb365f247..0000000000
--- a/types/react-icons/lib/io/ios-chatboxes-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosChatboxesOutline extends React.Component<IconBaseProps> { }
-export = IoIosChatboxesOutline;
diff --git a/types/react-icons/lib/io/ios-chatboxes.d.ts b/types/react-icons/lib/io/ios-chatboxes.d.ts
deleted file mode 100644
index 3fb39f6ee1..0000000000
--- a/types/react-icons/lib/io/ios-chatboxes.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosChatboxes extends React.Component<IconBaseProps> { }
-export = IoIosChatboxes;
diff --git a/types/react-icons/lib/io/ios-chatbubble-outline.d.ts b/types/react-icons/lib/io/ios-chatbubble-outline.d.ts
deleted file mode 100644
index 3b45250dda..0000000000
--- a/types/react-icons/lib/io/ios-chatbubble-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosChatbubbleOutline extends React.Component<IconBaseProps> { }
-export = IoIosChatbubbleOutline;
diff --git a/types/react-icons/lib/io/ios-chatbubble.d.ts b/types/react-icons/lib/io/ios-chatbubble.d.ts
deleted file mode 100644
index 62bad0c4aa..0000000000
--- a/types/react-icons/lib/io/ios-chatbubble.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosChatbubble extends React.Component<IconBaseProps> { }
-export = IoIosChatbubble;
diff --git a/types/react-icons/lib/io/ios-checkmark-empty.d.ts b/types/react-icons/lib/io/ios-checkmark-empty.d.ts
deleted file mode 100644
index a474963f5d..0000000000
--- a/types/react-icons/lib/io/ios-checkmark-empty.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCheckmarkEmpty extends React.Component<IconBaseProps> { }
-export = IoIosCheckmarkEmpty;
diff --git a/types/react-icons/lib/io/ios-checkmark-outline.d.ts b/types/react-icons/lib/io/ios-checkmark-outline.d.ts
deleted file mode 100644
index 5f700d3698..0000000000
--- a/types/react-icons/lib/io/ios-checkmark-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCheckmarkOutline extends React.Component<IconBaseProps> { }
-export = IoIosCheckmarkOutline;
diff --git a/types/react-icons/lib/io/ios-checkmark.d.ts b/types/react-icons/lib/io/ios-checkmark.d.ts
deleted file mode 100644
index dd5fe54c42..0000000000
--- a/types/react-icons/lib/io/ios-checkmark.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCheckmark extends React.Component<IconBaseProps> { }
-export = IoIosCheckmark;
diff --git a/types/react-icons/lib/io/ios-circle-filled.d.ts b/types/react-icons/lib/io/ios-circle-filled.d.ts
deleted file mode 100644
index f9cb3574c6..0000000000
--- a/types/react-icons/lib/io/ios-circle-filled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCircleFilled extends React.Component<IconBaseProps> { }
-export = IoIosCircleFilled;
diff --git a/types/react-icons/lib/io/ios-circle-outline.d.ts b/types/react-icons/lib/io/ios-circle-outline.d.ts
deleted file mode 100644
index 85165c8f58..0000000000
--- a/types/react-icons/lib/io/ios-circle-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCircleOutline extends React.Component<IconBaseProps> { }
-export = IoIosCircleOutline;
diff --git a/types/react-icons/lib/io/ios-clock-outline.d.ts b/types/react-icons/lib/io/ios-clock-outline.d.ts
deleted file mode 100644
index 5d6466efe1..0000000000
--- a/types/react-icons/lib/io/ios-clock-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosClockOutline extends React.Component<IconBaseProps> { }
-export = IoIosClockOutline;
diff --git a/types/react-icons/lib/io/ios-clock.d.ts b/types/react-icons/lib/io/ios-clock.d.ts
deleted file mode 100644
index 7ea19dbd7b..0000000000
--- a/types/react-icons/lib/io/ios-clock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosClock extends React.Component<IconBaseProps> { }
-export = IoIosClock;
diff --git a/types/react-icons/lib/io/ios-close-empty.d.ts b/types/react-icons/lib/io/ios-close-empty.d.ts
deleted file mode 100644
index 4e71a33216..0000000000
--- a/types/react-icons/lib/io/ios-close-empty.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCloseEmpty extends React.Component<IconBaseProps> { }
-export = IoIosCloseEmpty;
diff --git a/types/react-icons/lib/io/ios-close-outline.d.ts b/types/react-icons/lib/io/ios-close-outline.d.ts
deleted file mode 100644
index 91e3af7f9e..0000000000
--- a/types/react-icons/lib/io/ios-close-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCloseOutline extends React.Component<IconBaseProps> { }
-export = IoIosCloseOutline;
diff --git a/types/react-icons/lib/io/ios-close.d.ts b/types/react-icons/lib/io/ios-close.d.ts
deleted file mode 100644
index 2599814819..0000000000
--- a/types/react-icons/lib/io/ios-close.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosClose extends React.Component<IconBaseProps> { }
-export = IoIosClose;
diff --git a/types/react-icons/lib/io/ios-cloud-download-outline.d.ts b/types/react-icons/lib/io/ios-cloud-download-outline.d.ts
deleted file mode 100644
index d62d37296e..0000000000
--- a/types/react-icons/lib/io/ios-cloud-download-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCloudDownloadOutline extends React.Component<IconBaseProps> { }
-export = IoIosCloudDownloadOutline;
diff --git a/types/react-icons/lib/io/ios-cloud-download.d.ts b/types/react-icons/lib/io/ios-cloud-download.d.ts
deleted file mode 100644
index ea75ea90cf..0000000000
--- a/types/react-icons/lib/io/ios-cloud-download.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCloudDownload extends React.Component<IconBaseProps> { }
-export = IoIosCloudDownload;
diff --git a/types/react-icons/lib/io/ios-cloud-outline.d.ts b/types/react-icons/lib/io/ios-cloud-outline.d.ts
deleted file mode 100644
index 34ef0e3bd6..0000000000
--- a/types/react-icons/lib/io/ios-cloud-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCloudOutline extends React.Component<IconBaseProps> { }
-export = IoIosCloudOutline;
diff --git a/types/react-icons/lib/io/ios-cloud-upload-outline.d.ts b/types/react-icons/lib/io/ios-cloud-upload-outline.d.ts
deleted file mode 100644
index 1a2ec79df1..0000000000
--- a/types/react-icons/lib/io/ios-cloud-upload-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCloudUploadOutline extends React.Component<IconBaseProps> { }
-export = IoIosCloudUploadOutline;
diff --git a/types/react-icons/lib/io/ios-cloud-upload.d.ts b/types/react-icons/lib/io/ios-cloud-upload.d.ts
deleted file mode 100644
index 75bbd1d136..0000000000
--- a/types/react-icons/lib/io/ios-cloud-upload.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCloudUpload extends React.Component<IconBaseProps> { }
-export = IoIosCloudUpload;
diff --git a/types/react-icons/lib/io/ios-cloud.d.ts b/types/react-icons/lib/io/ios-cloud.d.ts
deleted file mode 100644
index 1327ad5865..0000000000
--- a/types/react-icons/lib/io/ios-cloud.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCloud extends React.Component<IconBaseProps> { }
-export = IoIosCloud;
diff --git a/types/react-icons/lib/io/ios-cloudy-night-outline.d.ts b/types/react-icons/lib/io/ios-cloudy-night-outline.d.ts
deleted file mode 100644
index 9a998a4f3d..0000000000
--- a/types/react-icons/lib/io/ios-cloudy-night-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCloudyNightOutline extends React.Component<IconBaseProps> { }
-export = IoIosCloudyNightOutline;
diff --git a/types/react-icons/lib/io/ios-cloudy-night.d.ts b/types/react-icons/lib/io/ios-cloudy-night.d.ts
deleted file mode 100644
index ce8505d3fd..0000000000
--- a/types/react-icons/lib/io/ios-cloudy-night.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCloudyNight extends React.Component<IconBaseProps> { }
-export = IoIosCloudyNight;
diff --git a/types/react-icons/lib/io/ios-cloudy-outline.d.ts b/types/react-icons/lib/io/ios-cloudy-outline.d.ts
deleted file mode 100644
index e6bdfa8ca4..0000000000
--- a/types/react-icons/lib/io/ios-cloudy-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCloudyOutline extends React.Component<IconBaseProps> { }
-export = IoIosCloudyOutline;
diff --git a/types/react-icons/lib/io/ios-cloudy.d.ts b/types/react-icons/lib/io/ios-cloudy.d.ts
deleted file mode 100644
index 10cb92b074..0000000000
--- a/types/react-icons/lib/io/ios-cloudy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCloudy extends React.Component<IconBaseProps> { }
-export = IoIosCloudy;
diff --git a/types/react-icons/lib/io/ios-cog-outline.d.ts b/types/react-icons/lib/io/ios-cog-outline.d.ts
deleted file mode 100644
index 4153320627..0000000000
--- a/types/react-icons/lib/io/ios-cog-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCogOutline extends React.Component<IconBaseProps> { }
-export = IoIosCogOutline;
diff --git a/types/react-icons/lib/io/ios-cog.d.ts b/types/react-icons/lib/io/ios-cog.d.ts
deleted file mode 100644
index dc35f2908c..0000000000
--- a/types/react-icons/lib/io/ios-cog.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCog extends React.Component<IconBaseProps> { }
-export = IoIosCog;
diff --git a/types/react-icons/lib/io/ios-color-filter-outline.d.ts b/types/react-icons/lib/io/ios-color-filter-outline.d.ts
deleted file mode 100644
index 3efb45b3e8..0000000000
--- a/types/react-icons/lib/io/ios-color-filter-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosColorFilterOutline extends React.Component<IconBaseProps> { }
-export = IoIosColorFilterOutline;
diff --git a/types/react-icons/lib/io/ios-color-filter.d.ts b/types/react-icons/lib/io/ios-color-filter.d.ts
deleted file mode 100644
index b06b0178e1..0000000000
--- a/types/react-icons/lib/io/ios-color-filter.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosColorFilter extends React.Component<IconBaseProps> { }
-export = IoIosColorFilter;
diff --git a/types/react-icons/lib/io/ios-color-wand-outline.d.ts b/types/react-icons/lib/io/ios-color-wand-outline.d.ts
deleted file mode 100644
index c16dcb880c..0000000000
--- a/types/react-icons/lib/io/ios-color-wand-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosColorWandOutline extends React.Component<IconBaseProps> { }
-export = IoIosColorWandOutline;
diff --git a/types/react-icons/lib/io/ios-color-wand.d.ts b/types/react-icons/lib/io/ios-color-wand.d.ts
deleted file mode 100644
index 901482ab4d..0000000000
--- a/types/react-icons/lib/io/ios-color-wand.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosColorWand extends React.Component<IconBaseProps> { }
-export = IoIosColorWand;
diff --git a/types/react-icons/lib/io/ios-compose-outline.d.ts b/types/react-icons/lib/io/ios-compose-outline.d.ts
deleted file mode 100644
index 56213af99b..0000000000
--- a/types/react-icons/lib/io/ios-compose-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosComposeOutline extends React.Component<IconBaseProps> { }
-export = IoIosComposeOutline;
diff --git a/types/react-icons/lib/io/ios-compose.d.ts b/types/react-icons/lib/io/ios-compose.d.ts
deleted file mode 100644
index 700acd9df0..0000000000
--- a/types/react-icons/lib/io/ios-compose.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCompose extends React.Component<IconBaseProps> { }
-export = IoIosCompose;
diff --git a/types/react-icons/lib/io/ios-contact-outline.d.ts b/types/react-icons/lib/io/ios-contact-outline.d.ts
deleted file mode 100644
index b6c3c9256f..0000000000
--- a/types/react-icons/lib/io/ios-contact-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosContactOutline extends React.Component<IconBaseProps> { }
-export = IoIosContactOutline;
diff --git a/types/react-icons/lib/io/ios-contact.d.ts b/types/react-icons/lib/io/ios-contact.d.ts
deleted file mode 100644
index b84fc3d06c..0000000000
--- a/types/react-icons/lib/io/ios-contact.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosContact extends React.Component<IconBaseProps> { }
-export = IoIosContact;
diff --git a/types/react-icons/lib/io/ios-copy-outline.d.ts b/types/react-icons/lib/io/ios-copy-outline.d.ts
deleted file mode 100644
index a10a0de758..0000000000
--- a/types/react-icons/lib/io/ios-copy-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCopyOutline extends React.Component<IconBaseProps> { }
-export = IoIosCopyOutline;
diff --git a/types/react-icons/lib/io/ios-copy.d.ts b/types/react-icons/lib/io/ios-copy.d.ts
deleted file mode 100644
index 17210fcf39..0000000000
--- a/types/react-icons/lib/io/ios-copy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCopy extends React.Component<IconBaseProps> { }
-export = IoIosCopy;
diff --git a/types/react-icons/lib/io/ios-crop-strong.d.ts b/types/react-icons/lib/io/ios-crop-strong.d.ts
deleted file mode 100644
index 1d22950da5..0000000000
--- a/types/react-icons/lib/io/ios-crop-strong.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCropStrong extends React.Component<IconBaseProps> { }
-export = IoIosCropStrong;
diff --git a/types/react-icons/lib/io/ios-crop.d.ts b/types/react-icons/lib/io/ios-crop.d.ts
deleted file mode 100644
index d3dfb5e071..0000000000
--- a/types/react-icons/lib/io/ios-crop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosCrop extends React.Component<IconBaseProps> { }
-export = IoIosCrop;
diff --git a/types/react-icons/lib/io/ios-download-outline.d.ts b/types/react-icons/lib/io/ios-download-outline.d.ts
deleted file mode 100644
index c02ba7586d..0000000000
--- a/types/react-icons/lib/io/ios-download-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosDownloadOutline extends React.Component<IconBaseProps> { }
-export = IoIosDownloadOutline;
diff --git a/types/react-icons/lib/io/ios-download.d.ts b/types/react-icons/lib/io/ios-download.d.ts
deleted file mode 100644
index 3550abd427..0000000000
--- a/types/react-icons/lib/io/ios-download.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosDownload extends React.Component<IconBaseProps> { }
-export = IoIosDownload;
diff --git a/types/react-icons/lib/io/ios-drag.d.ts b/types/react-icons/lib/io/ios-drag.d.ts
deleted file mode 100644
index 22be50c994..0000000000
--- a/types/react-icons/lib/io/ios-drag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosDrag extends React.Component<IconBaseProps> { }
-export = IoIosDrag;
diff --git a/types/react-icons/lib/io/ios-email-outline.d.ts b/types/react-icons/lib/io/ios-email-outline.d.ts
deleted file mode 100644
index b4708c7cc9..0000000000
--- a/types/react-icons/lib/io/ios-email-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosEmailOutline extends React.Component<IconBaseProps> { }
-export = IoIosEmailOutline;
diff --git a/types/react-icons/lib/io/ios-email.d.ts b/types/react-icons/lib/io/ios-email.d.ts
deleted file mode 100644
index 419a9e90da..0000000000
--- a/types/react-icons/lib/io/ios-email.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosEmail extends React.Component<IconBaseProps> { }
-export = IoIosEmail;
diff --git a/types/react-icons/lib/io/ios-eye-outline.d.ts b/types/react-icons/lib/io/ios-eye-outline.d.ts
deleted file mode 100644
index bdb78dd911..0000000000
--- a/types/react-icons/lib/io/ios-eye-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosEyeOutline extends React.Component<IconBaseProps> { }
-export = IoIosEyeOutline;
diff --git a/types/react-icons/lib/io/ios-eye.d.ts b/types/react-icons/lib/io/ios-eye.d.ts
deleted file mode 100644
index 7910e77eb5..0000000000
--- a/types/react-icons/lib/io/ios-eye.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosEye extends React.Component<IconBaseProps> { }
-export = IoIosEye;
diff --git a/types/react-icons/lib/io/ios-fastforward-outline.d.ts b/types/react-icons/lib/io/ios-fastforward-outline.d.ts
deleted file mode 100644
index b2f8ad2c63..0000000000
--- a/types/react-icons/lib/io/ios-fastforward-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFastforwardOutline extends React.Component<IconBaseProps> { }
-export = IoIosFastforwardOutline;
diff --git a/types/react-icons/lib/io/ios-fastforward.d.ts b/types/react-icons/lib/io/ios-fastforward.d.ts
deleted file mode 100644
index 3318050327..0000000000
--- a/types/react-icons/lib/io/ios-fastforward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFastforward extends React.Component<IconBaseProps> { }
-export = IoIosFastforward;
diff --git a/types/react-icons/lib/io/ios-filing-outline.d.ts b/types/react-icons/lib/io/ios-filing-outline.d.ts
deleted file mode 100644
index be70683001..0000000000
--- a/types/react-icons/lib/io/ios-filing-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFilingOutline extends React.Component<IconBaseProps> { }
-export = IoIosFilingOutline;
diff --git a/types/react-icons/lib/io/ios-filing.d.ts b/types/react-icons/lib/io/ios-filing.d.ts
deleted file mode 100644
index c152ce0a54..0000000000
--- a/types/react-icons/lib/io/ios-filing.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFiling extends React.Component<IconBaseProps> { }
-export = IoIosFiling;
diff --git a/types/react-icons/lib/io/ios-film-outline.d.ts b/types/react-icons/lib/io/ios-film-outline.d.ts
deleted file mode 100644
index 2ee7168846..0000000000
--- a/types/react-icons/lib/io/ios-film-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFilmOutline extends React.Component<IconBaseProps> { }
-export = IoIosFilmOutline;
diff --git a/types/react-icons/lib/io/ios-film.d.ts b/types/react-icons/lib/io/ios-film.d.ts
deleted file mode 100644
index 6d5738e4a3..0000000000
--- a/types/react-icons/lib/io/ios-film.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFilm extends React.Component<IconBaseProps> { }
-export = IoIosFilm;
diff --git a/types/react-icons/lib/io/ios-flag-outline.d.ts b/types/react-icons/lib/io/ios-flag-outline.d.ts
deleted file mode 100644
index 33066e4133..0000000000
--- a/types/react-icons/lib/io/ios-flag-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFlagOutline extends React.Component<IconBaseProps> { }
-export = IoIosFlagOutline;
diff --git a/types/react-icons/lib/io/ios-flag.d.ts b/types/react-icons/lib/io/ios-flag.d.ts
deleted file mode 100644
index c6ed11469c..0000000000
--- a/types/react-icons/lib/io/ios-flag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFlag extends React.Component<IconBaseProps> { }
-export = IoIosFlag;
diff --git a/types/react-icons/lib/io/ios-flame-outline.d.ts b/types/react-icons/lib/io/ios-flame-outline.d.ts
deleted file mode 100644
index 55c2c3bc85..0000000000
--- a/types/react-icons/lib/io/ios-flame-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFlameOutline extends React.Component<IconBaseProps> { }
-export = IoIosFlameOutline;
diff --git a/types/react-icons/lib/io/ios-flame.d.ts b/types/react-icons/lib/io/ios-flame.d.ts
deleted file mode 100644
index c538dca10c..0000000000
--- a/types/react-icons/lib/io/ios-flame.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFlame extends React.Component<IconBaseProps> { }
-export = IoIosFlame;
diff --git a/types/react-icons/lib/io/ios-flask-outline.d.ts b/types/react-icons/lib/io/ios-flask-outline.d.ts
deleted file mode 100644
index 3f746b4a81..0000000000
--- a/types/react-icons/lib/io/ios-flask-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFlaskOutline extends React.Component<IconBaseProps> { }
-export = IoIosFlaskOutline;
diff --git a/types/react-icons/lib/io/ios-flask.d.ts b/types/react-icons/lib/io/ios-flask.d.ts
deleted file mode 100644
index 721abe351c..0000000000
--- a/types/react-icons/lib/io/ios-flask.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFlask extends React.Component<IconBaseProps> { }
-export = IoIosFlask;
diff --git a/types/react-icons/lib/io/ios-flower-outline.d.ts b/types/react-icons/lib/io/ios-flower-outline.d.ts
deleted file mode 100644
index 4f7133078e..0000000000
--- a/types/react-icons/lib/io/ios-flower-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFlowerOutline extends React.Component<IconBaseProps> { }
-export = IoIosFlowerOutline;
diff --git a/types/react-icons/lib/io/ios-flower.d.ts b/types/react-icons/lib/io/ios-flower.d.ts
deleted file mode 100644
index 3f016b41e3..0000000000
--- a/types/react-icons/lib/io/ios-flower.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFlower extends React.Component<IconBaseProps> { }
-export = IoIosFlower;
diff --git a/types/react-icons/lib/io/ios-folder-outline.d.ts b/types/react-icons/lib/io/ios-folder-outline.d.ts
deleted file mode 100644
index a081df582e..0000000000
--- a/types/react-icons/lib/io/ios-folder-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFolderOutline extends React.Component<IconBaseProps> { }
-export = IoIosFolderOutline;
diff --git a/types/react-icons/lib/io/ios-folder.d.ts b/types/react-icons/lib/io/ios-folder.d.ts
deleted file mode 100644
index 6060787ea9..0000000000
--- a/types/react-icons/lib/io/ios-folder.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFolder extends React.Component<IconBaseProps> { }
-export = IoIosFolder;
diff --git a/types/react-icons/lib/io/ios-football-outline.d.ts b/types/react-icons/lib/io/ios-football-outline.d.ts
deleted file mode 100644
index eb888637dd..0000000000
--- a/types/react-icons/lib/io/ios-football-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFootballOutline extends React.Component<IconBaseProps> { }
-export = IoIosFootballOutline;
diff --git a/types/react-icons/lib/io/ios-football.d.ts b/types/react-icons/lib/io/ios-football.d.ts
deleted file mode 100644
index 8683cbbfe5..0000000000
--- a/types/react-icons/lib/io/ios-football.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosFootball extends React.Component<IconBaseProps> { }
-export = IoIosFootball;
diff --git a/types/react-icons/lib/io/ios-game-controller-a-outline.d.ts b/types/react-icons/lib/io/ios-game-controller-a-outline.d.ts
deleted file mode 100644
index 175d7980de..0000000000
--- a/types/react-icons/lib/io/ios-game-controller-a-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosGameControllerAOutline extends React.Component<IconBaseProps> { }
-export = IoIosGameControllerAOutline;
diff --git a/types/react-icons/lib/io/ios-game-controller-a.d.ts b/types/react-icons/lib/io/ios-game-controller-a.d.ts
deleted file mode 100644
index 4476bd0887..0000000000
--- a/types/react-icons/lib/io/ios-game-controller-a.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosGameControllerA extends React.Component<IconBaseProps> { }
-export = IoIosGameControllerA;
diff --git a/types/react-icons/lib/io/ios-game-controller-b-outline.d.ts b/types/react-icons/lib/io/ios-game-controller-b-outline.d.ts
deleted file mode 100644
index b7bca018ab..0000000000
--- a/types/react-icons/lib/io/ios-game-controller-b-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosGameControllerBOutline extends React.Component<IconBaseProps> { }
-export = IoIosGameControllerBOutline;
diff --git a/types/react-icons/lib/io/ios-game-controller-b.d.ts b/types/react-icons/lib/io/ios-game-controller-b.d.ts
deleted file mode 100644
index 59cefc38a8..0000000000
--- a/types/react-icons/lib/io/ios-game-controller-b.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosGameControllerB extends React.Component<IconBaseProps> { }
-export = IoIosGameControllerB;
diff --git a/types/react-icons/lib/io/ios-gear-outline.d.ts b/types/react-icons/lib/io/ios-gear-outline.d.ts
deleted file mode 100644
index a442d8731e..0000000000
--- a/types/react-icons/lib/io/ios-gear-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosGearOutline extends React.Component<IconBaseProps> { }
-export = IoIosGearOutline;
diff --git a/types/react-icons/lib/io/ios-gear.d.ts b/types/react-icons/lib/io/ios-gear.d.ts
deleted file mode 100644
index 25211de0c8..0000000000
--- a/types/react-icons/lib/io/ios-gear.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosGear extends React.Component<IconBaseProps> { }
-export = IoIosGear;
diff --git a/types/react-icons/lib/io/ios-glasses-outline.d.ts b/types/react-icons/lib/io/ios-glasses-outline.d.ts
deleted file mode 100644
index e49413038b..0000000000
--- a/types/react-icons/lib/io/ios-glasses-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosGlassesOutline extends React.Component<IconBaseProps> { }
-export = IoIosGlassesOutline;
diff --git a/types/react-icons/lib/io/ios-glasses.d.ts b/types/react-icons/lib/io/ios-glasses.d.ts
deleted file mode 100644
index 0b8a7ec4d0..0000000000
--- a/types/react-icons/lib/io/ios-glasses.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosGlasses extends React.Component<IconBaseProps> { }
-export = IoIosGlasses;
diff --git a/types/react-icons/lib/io/ios-grid-view-outline.d.ts b/types/react-icons/lib/io/ios-grid-view-outline.d.ts
deleted file mode 100644
index 705beee99d..0000000000
--- a/types/react-icons/lib/io/ios-grid-view-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosGridViewOutline extends React.Component<IconBaseProps> { }
-export = IoIosGridViewOutline;
diff --git a/types/react-icons/lib/io/ios-grid-view.d.ts b/types/react-icons/lib/io/ios-grid-view.d.ts
deleted file mode 100644
index 9331805663..0000000000
--- a/types/react-icons/lib/io/ios-grid-view.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosGridView extends React.Component<IconBaseProps> { }
-export = IoIosGridView;
diff --git a/types/react-icons/lib/io/ios-heart-outline.d.ts b/types/react-icons/lib/io/ios-heart-outline.d.ts
deleted file mode 100644
index 35398f9c6a..0000000000
--- a/types/react-icons/lib/io/ios-heart-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosHeartOutline extends React.Component<IconBaseProps> { }
-export = IoIosHeartOutline;
diff --git a/types/react-icons/lib/io/ios-heart.d.ts b/types/react-icons/lib/io/ios-heart.d.ts
deleted file mode 100644
index b9aa1e9f0e..0000000000
--- a/types/react-icons/lib/io/ios-heart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosHeart extends React.Component<IconBaseProps> { }
-export = IoIosHeart;
diff --git a/types/react-icons/lib/io/ios-help-empty.d.ts b/types/react-icons/lib/io/ios-help-empty.d.ts
deleted file mode 100644
index 66bf6aae72..0000000000
--- a/types/react-icons/lib/io/ios-help-empty.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosHelpEmpty extends React.Component<IconBaseProps> { }
-export = IoIosHelpEmpty;
diff --git a/types/react-icons/lib/io/ios-help-outline.d.ts b/types/react-icons/lib/io/ios-help-outline.d.ts
deleted file mode 100644
index 0dd7359a78..0000000000
--- a/types/react-icons/lib/io/ios-help-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosHelpOutline extends React.Component<IconBaseProps> { }
-export = IoIosHelpOutline;
diff --git a/types/react-icons/lib/io/ios-help.d.ts b/types/react-icons/lib/io/ios-help.d.ts
deleted file mode 100644
index e62f96ad19..0000000000
--- a/types/react-icons/lib/io/ios-help.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosHelp extends React.Component<IconBaseProps> { }
-export = IoIosHelp;
diff --git a/types/react-icons/lib/io/ios-home-outline.d.ts b/types/react-icons/lib/io/ios-home-outline.d.ts
deleted file mode 100644
index 6b5123859e..0000000000
--- a/types/react-icons/lib/io/ios-home-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosHomeOutline extends React.Component<IconBaseProps> { }
-export = IoIosHomeOutline;
diff --git a/types/react-icons/lib/io/ios-home.d.ts b/types/react-icons/lib/io/ios-home.d.ts
deleted file mode 100644
index acd8d81c24..0000000000
--- a/types/react-icons/lib/io/ios-home.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosHome extends React.Component<IconBaseProps> { }
-export = IoIosHome;
diff --git a/types/react-icons/lib/io/ios-infinite-outline.d.ts b/types/react-icons/lib/io/ios-infinite-outline.d.ts
deleted file mode 100644
index b860546ab4..0000000000
--- a/types/react-icons/lib/io/ios-infinite-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosInfiniteOutline extends React.Component<IconBaseProps> { }
-export = IoIosInfiniteOutline;
diff --git a/types/react-icons/lib/io/ios-infinite.d.ts b/types/react-icons/lib/io/ios-infinite.d.ts
deleted file mode 100644
index 042c5afee0..0000000000
--- a/types/react-icons/lib/io/ios-infinite.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosInfinite extends React.Component<IconBaseProps> { }
-export = IoIosInfinite;
diff --git a/types/react-icons/lib/io/ios-informatempty.d.ts b/types/react-icons/lib/io/ios-informatempty.d.ts
deleted file mode 100644
index 5de872ba67..0000000000
--- a/types/react-icons/lib/io/ios-informatempty.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosInformatempty extends React.Component<IconBaseProps> { }
-export = IoIosInformatempty;
diff --git a/types/react-icons/lib/io/ios-information.d.ts b/types/react-icons/lib/io/ios-information.d.ts
deleted file mode 100644
index 16fe378595..0000000000
--- a/types/react-icons/lib/io/ios-information.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosInformation extends React.Component<IconBaseProps> { }
-export = IoIosInformation;
diff --git a/types/react-icons/lib/io/ios-informatoutline.d.ts b/types/react-icons/lib/io/ios-informatoutline.d.ts
deleted file mode 100644
index 836c4124cf..0000000000
--- a/types/react-icons/lib/io/ios-informatoutline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosInformatoutline extends React.Component<IconBaseProps> { }
-export = IoIosInformatoutline;
diff --git a/types/react-icons/lib/io/ios-ionic-outline.d.ts b/types/react-icons/lib/io/ios-ionic-outline.d.ts
deleted file mode 100644
index 54f711ed77..0000000000
--- a/types/react-icons/lib/io/ios-ionic-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosIonicOutline extends React.Component<IconBaseProps> { }
-export = IoIosIonicOutline;
diff --git a/types/react-icons/lib/io/ios-keypad-outline.d.ts b/types/react-icons/lib/io/ios-keypad-outline.d.ts
deleted file mode 100644
index eeafb0c854..0000000000
--- a/types/react-icons/lib/io/ios-keypad-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosKeypadOutline extends React.Component<IconBaseProps> { }
-export = IoIosKeypadOutline;
diff --git a/types/react-icons/lib/io/ios-keypad.d.ts b/types/react-icons/lib/io/ios-keypad.d.ts
deleted file mode 100644
index 6e92f86ed6..0000000000
--- a/types/react-icons/lib/io/ios-keypad.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosKeypad extends React.Component<IconBaseProps> { }
-export = IoIosKeypad;
diff --git a/types/react-icons/lib/io/ios-lightbulb-outline.d.ts b/types/react-icons/lib/io/ios-lightbulb-outline.d.ts
deleted file mode 100644
index 70985fda1c..0000000000
--- a/types/react-icons/lib/io/ios-lightbulb-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosLightbulbOutline extends React.Component<IconBaseProps> { }
-export = IoIosLightbulbOutline;
diff --git a/types/react-icons/lib/io/ios-lightbulb.d.ts b/types/react-icons/lib/io/ios-lightbulb.d.ts
deleted file mode 100644
index da9af32ea4..0000000000
--- a/types/react-icons/lib/io/ios-lightbulb.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosLightbulb extends React.Component<IconBaseProps> { }
-export = IoIosLightbulb;
diff --git a/types/react-icons/lib/io/ios-list-outline.d.ts b/types/react-icons/lib/io/ios-list-outline.d.ts
deleted file mode 100644
index 5988c619a3..0000000000
--- a/types/react-icons/lib/io/ios-list-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosListOutline extends React.Component<IconBaseProps> { }
-export = IoIosListOutline;
diff --git a/types/react-icons/lib/io/ios-list.d.ts b/types/react-icons/lib/io/ios-list.d.ts
deleted file mode 100644
index 931104f063..0000000000
--- a/types/react-icons/lib/io/ios-list.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosList extends React.Component<IconBaseProps> { }
-export = IoIosList;
diff --git a/types/react-icons/lib/io/ios-location.d.ts b/types/react-icons/lib/io/ios-location.d.ts
deleted file mode 100644
index c8082c6164..0000000000
--- a/types/react-icons/lib/io/ios-location.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosLocation extends React.Component<IconBaseProps> { }
-export = IoIosLocation;
diff --git a/types/react-icons/lib/io/ios-locatoutline.d.ts b/types/react-icons/lib/io/ios-locatoutline.d.ts
deleted file mode 100644
index 52c091939f..0000000000
--- a/types/react-icons/lib/io/ios-locatoutline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosLocatoutline extends React.Component<IconBaseProps> { }
-export = IoIosLocatoutline;
diff --git a/types/react-icons/lib/io/ios-locked-outline.d.ts b/types/react-icons/lib/io/ios-locked-outline.d.ts
deleted file mode 100644
index c4724ffbda..0000000000
--- a/types/react-icons/lib/io/ios-locked-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosLockedOutline extends React.Component<IconBaseProps> { }
-export = IoIosLockedOutline;
diff --git a/types/react-icons/lib/io/ios-locked.d.ts b/types/react-icons/lib/io/ios-locked.d.ts
deleted file mode 100644
index a5cf385852..0000000000
--- a/types/react-icons/lib/io/ios-locked.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosLocked extends React.Component<IconBaseProps> { }
-export = IoIosLocked;
diff --git a/types/react-icons/lib/io/ios-loop-strong.d.ts b/types/react-icons/lib/io/ios-loop-strong.d.ts
deleted file mode 100644
index 3d4939fdc7..0000000000
--- a/types/react-icons/lib/io/ios-loop-strong.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosLoopStrong extends React.Component<IconBaseProps> { }
-export = IoIosLoopStrong;
diff --git a/types/react-icons/lib/io/ios-loop.d.ts b/types/react-icons/lib/io/ios-loop.d.ts
deleted file mode 100644
index 9055d01a4a..0000000000
--- a/types/react-icons/lib/io/ios-loop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosLoop extends React.Component<IconBaseProps> { }
-export = IoIosLoop;
diff --git a/types/react-icons/lib/io/ios-medical-outline.d.ts b/types/react-icons/lib/io/ios-medical-outline.d.ts
deleted file mode 100644
index 63cf7215ea..0000000000
--- a/types/react-icons/lib/io/ios-medical-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMedicalOutline extends React.Component<IconBaseProps> { }
-export = IoIosMedicalOutline;
diff --git a/types/react-icons/lib/io/ios-medical.d.ts b/types/react-icons/lib/io/ios-medical.d.ts
deleted file mode 100644
index 2772059c0d..0000000000
--- a/types/react-icons/lib/io/ios-medical.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMedical extends React.Component<IconBaseProps> { }
-export = IoIosMedical;
diff --git a/types/react-icons/lib/io/ios-medkit-outline.d.ts b/types/react-icons/lib/io/ios-medkit-outline.d.ts
deleted file mode 100644
index 00492e10aa..0000000000
--- a/types/react-icons/lib/io/ios-medkit-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMedkitOutline extends React.Component<IconBaseProps> { }
-export = IoIosMedkitOutline;
diff --git a/types/react-icons/lib/io/ios-medkit.d.ts b/types/react-icons/lib/io/ios-medkit.d.ts
deleted file mode 100644
index 72255a3bbe..0000000000
--- a/types/react-icons/lib/io/ios-medkit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMedkit extends React.Component<IconBaseProps> { }
-export = IoIosMedkit;
diff --git a/types/react-icons/lib/io/ios-mic-off.d.ts b/types/react-icons/lib/io/ios-mic-off.d.ts
deleted file mode 100644
index d12dd27d16..0000000000
--- a/types/react-icons/lib/io/ios-mic-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMicOff extends React.Component<IconBaseProps> { }
-export = IoIosMicOff;
diff --git a/types/react-icons/lib/io/ios-mic-outline.d.ts b/types/react-icons/lib/io/ios-mic-outline.d.ts
deleted file mode 100644
index a115747ba9..0000000000
--- a/types/react-icons/lib/io/ios-mic-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMicOutline extends React.Component<IconBaseProps> { }
-export = IoIosMicOutline;
diff --git a/types/react-icons/lib/io/ios-mic.d.ts b/types/react-icons/lib/io/ios-mic.d.ts
deleted file mode 100644
index f017a3e55a..0000000000
--- a/types/react-icons/lib/io/ios-mic.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMic extends React.Component<IconBaseProps> { }
-export = IoIosMic;
diff --git a/types/react-icons/lib/io/ios-minus-empty.d.ts b/types/react-icons/lib/io/ios-minus-empty.d.ts
deleted file mode 100644
index a7e6545790..0000000000
--- a/types/react-icons/lib/io/ios-minus-empty.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMinusEmpty extends React.Component<IconBaseProps> { }
-export = IoIosMinusEmpty;
diff --git a/types/react-icons/lib/io/ios-minus-outline.d.ts b/types/react-icons/lib/io/ios-minus-outline.d.ts
deleted file mode 100644
index b49b0d3293..0000000000
--- a/types/react-icons/lib/io/ios-minus-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMinusOutline extends React.Component<IconBaseProps> { }
-export = IoIosMinusOutline;
diff --git a/types/react-icons/lib/io/ios-minus.d.ts b/types/react-icons/lib/io/ios-minus.d.ts
deleted file mode 100644
index 8b5b596a71..0000000000
--- a/types/react-icons/lib/io/ios-minus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMinus extends React.Component<IconBaseProps> { }
-export = IoIosMinus;
diff --git a/types/react-icons/lib/io/ios-monitor-outline.d.ts b/types/react-icons/lib/io/ios-monitor-outline.d.ts
deleted file mode 100644
index a12e192cc2..0000000000
--- a/types/react-icons/lib/io/ios-monitor-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMonitorOutline extends React.Component<IconBaseProps> { }
-export = IoIosMonitorOutline;
diff --git a/types/react-icons/lib/io/ios-monitor.d.ts b/types/react-icons/lib/io/ios-monitor.d.ts
deleted file mode 100644
index 5c15845b90..0000000000
--- a/types/react-icons/lib/io/ios-monitor.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMonitor extends React.Component<IconBaseProps> { }
-export = IoIosMonitor;
diff --git a/types/react-icons/lib/io/ios-moon-outline.d.ts b/types/react-icons/lib/io/ios-moon-outline.d.ts
deleted file mode 100644
index 969a448406..0000000000
--- a/types/react-icons/lib/io/ios-moon-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMoonOutline extends React.Component<IconBaseProps> { }
-export = IoIosMoonOutline;
diff --git a/types/react-icons/lib/io/ios-moon.d.ts b/types/react-icons/lib/io/ios-moon.d.ts
deleted file mode 100644
index b980bf0579..0000000000
--- a/types/react-icons/lib/io/ios-moon.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMoon extends React.Component<IconBaseProps> { }
-export = IoIosMoon;
diff --git a/types/react-icons/lib/io/ios-more-outline.d.ts b/types/react-icons/lib/io/ios-more-outline.d.ts
deleted file mode 100644
index 225f87ad5e..0000000000
--- a/types/react-icons/lib/io/ios-more-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMoreOutline extends React.Component<IconBaseProps> { }
-export = IoIosMoreOutline;
diff --git a/types/react-icons/lib/io/ios-more.d.ts b/types/react-icons/lib/io/ios-more.d.ts
deleted file mode 100644
index 0f980fc024..0000000000
--- a/types/react-icons/lib/io/ios-more.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMore extends React.Component<IconBaseProps> { }
-export = IoIosMore;
diff --git a/types/react-icons/lib/io/ios-musical-note.d.ts b/types/react-icons/lib/io/ios-musical-note.d.ts
deleted file mode 100644
index 1558f0f2cb..0000000000
--- a/types/react-icons/lib/io/ios-musical-note.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMusicalNote extends React.Component<IconBaseProps> { }
-export = IoIosMusicalNote;
diff --git a/types/react-icons/lib/io/ios-musical-notes.d.ts b/types/react-icons/lib/io/ios-musical-notes.d.ts
deleted file mode 100644
index 5669628bea..0000000000
--- a/types/react-icons/lib/io/ios-musical-notes.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosMusicalNotes extends React.Component<IconBaseProps> { }
-export = IoIosMusicalNotes;
diff --git a/types/react-icons/lib/io/ios-navigate-outline.d.ts b/types/react-icons/lib/io/ios-navigate-outline.d.ts
deleted file mode 100644
index 7fef63a930..0000000000
--- a/types/react-icons/lib/io/ios-navigate-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosNavigateOutline extends React.Component<IconBaseProps> { }
-export = IoIosNavigateOutline;
diff --git a/types/react-icons/lib/io/ios-navigate.d.ts b/types/react-icons/lib/io/ios-navigate.d.ts
deleted file mode 100644
index 499f1712a5..0000000000
--- a/types/react-icons/lib/io/ios-navigate.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosNavigate extends React.Component<IconBaseProps> { }
-export = IoIosNavigate;
diff --git a/types/react-icons/lib/io/ios-nutrition.d.ts b/types/react-icons/lib/io/ios-nutrition.d.ts
deleted file mode 100644
index ee8c95bfd7..0000000000
--- a/types/react-icons/lib/io/ios-nutrition.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosNutrition extends React.Component<IconBaseProps> { }
-export = IoIosNutrition;
diff --git a/types/react-icons/lib/io/ios-nutritoutline.d.ts b/types/react-icons/lib/io/ios-nutritoutline.d.ts
deleted file mode 100644
index 5942c17ae5..0000000000
--- a/types/react-icons/lib/io/ios-nutritoutline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosNutritoutline extends React.Component<IconBaseProps> { }
-export = IoIosNutritoutline;
diff --git a/types/react-icons/lib/io/ios-paper-outline.d.ts b/types/react-icons/lib/io/ios-paper-outline.d.ts
deleted file mode 100644
index d1579a4653..0000000000
--- a/types/react-icons/lib/io/ios-paper-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPaperOutline extends React.Component<IconBaseProps> { }
-export = IoIosPaperOutline;
diff --git a/types/react-icons/lib/io/ios-paper.d.ts b/types/react-icons/lib/io/ios-paper.d.ts
deleted file mode 100644
index 8213cddccb..0000000000
--- a/types/react-icons/lib/io/ios-paper.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPaper extends React.Component<IconBaseProps> { }
-export = IoIosPaper;
diff --git a/types/react-icons/lib/io/ios-paperplane-outline.d.ts b/types/react-icons/lib/io/ios-paperplane-outline.d.ts
deleted file mode 100644
index 5d04a87a3b..0000000000
--- a/types/react-icons/lib/io/ios-paperplane-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPaperplaneOutline extends React.Component<IconBaseProps> { }
-export = IoIosPaperplaneOutline;
diff --git a/types/react-icons/lib/io/ios-paperplane.d.ts b/types/react-icons/lib/io/ios-paperplane.d.ts
deleted file mode 100644
index 180221081d..0000000000
--- a/types/react-icons/lib/io/ios-paperplane.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPaperplane extends React.Component<IconBaseProps> { }
-export = IoIosPaperplane;
diff --git a/types/react-icons/lib/io/ios-partlysunny-outline.d.ts b/types/react-icons/lib/io/ios-partlysunny-outline.d.ts
deleted file mode 100644
index c0f6459de8..0000000000
--- a/types/react-icons/lib/io/ios-partlysunny-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPartlysunnyOutline extends React.Component<IconBaseProps> { }
-export = IoIosPartlysunnyOutline;
diff --git a/types/react-icons/lib/io/ios-partlysunny.d.ts b/types/react-icons/lib/io/ios-partlysunny.d.ts
deleted file mode 100644
index 569d0bc712..0000000000
--- a/types/react-icons/lib/io/ios-partlysunny.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPartlysunny extends React.Component<IconBaseProps> { }
-export = IoIosPartlysunny;
diff --git a/types/react-icons/lib/io/ios-pause-outline.d.ts b/types/react-icons/lib/io/ios-pause-outline.d.ts
deleted file mode 100644
index 97bd9b6790..0000000000
--- a/types/react-icons/lib/io/ios-pause-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPauseOutline extends React.Component<IconBaseProps> { }
-export = IoIosPauseOutline;
diff --git a/types/react-icons/lib/io/ios-pause.d.ts b/types/react-icons/lib/io/ios-pause.d.ts
deleted file mode 100644
index 414c36c5ee..0000000000
--- a/types/react-icons/lib/io/ios-pause.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPause extends React.Component<IconBaseProps> { }
-export = IoIosPause;
diff --git a/types/react-icons/lib/io/ios-paw-outline.d.ts b/types/react-icons/lib/io/ios-paw-outline.d.ts
deleted file mode 100644
index b6dc0e217b..0000000000
--- a/types/react-icons/lib/io/ios-paw-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPawOutline extends React.Component<IconBaseProps> { }
-export = IoIosPawOutline;
diff --git a/types/react-icons/lib/io/ios-paw.d.ts b/types/react-icons/lib/io/ios-paw.d.ts
deleted file mode 100644
index 80db78ab15..0000000000
--- a/types/react-icons/lib/io/ios-paw.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPaw extends React.Component<IconBaseProps> { }
-export = IoIosPaw;
diff --git a/types/react-icons/lib/io/ios-people-outline.d.ts b/types/react-icons/lib/io/ios-people-outline.d.ts
deleted file mode 100644
index d7b2d3b21b..0000000000
--- a/types/react-icons/lib/io/ios-people-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPeopleOutline extends React.Component<IconBaseProps> { }
-export = IoIosPeopleOutline;
diff --git a/types/react-icons/lib/io/ios-people.d.ts b/types/react-icons/lib/io/ios-people.d.ts
deleted file mode 100644
index d80eb07bea..0000000000
--- a/types/react-icons/lib/io/ios-people.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPeople extends React.Component<IconBaseProps> { }
-export = IoIosPeople;
diff --git a/types/react-icons/lib/io/ios-person-outline.d.ts b/types/react-icons/lib/io/ios-person-outline.d.ts
deleted file mode 100644
index d3418bba82..0000000000
--- a/types/react-icons/lib/io/ios-person-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPersonOutline extends React.Component<IconBaseProps> { }
-export = IoIosPersonOutline;
diff --git a/types/react-icons/lib/io/ios-person.d.ts b/types/react-icons/lib/io/ios-person.d.ts
deleted file mode 100644
index 742a75f87f..0000000000
--- a/types/react-icons/lib/io/ios-person.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPerson extends React.Component<IconBaseProps> { }
-export = IoIosPerson;
diff --git a/types/react-icons/lib/io/ios-personadd-outline.d.ts b/types/react-icons/lib/io/ios-personadd-outline.d.ts
deleted file mode 100644
index da6f7ad817..0000000000
--- a/types/react-icons/lib/io/ios-personadd-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPersonaddOutline extends React.Component<IconBaseProps> { }
-export = IoIosPersonaddOutline;
diff --git a/types/react-icons/lib/io/ios-personadd.d.ts b/types/react-icons/lib/io/ios-personadd.d.ts
deleted file mode 100644
index 2c2312066b..0000000000
--- a/types/react-icons/lib/io/ios-personadd.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPersonadd extends React.Component<IconBaseProps> { }
-export = IoIosPersonadd;
diff --git a/types/react-icons/lib/io/ios-photos-outline.d.ts b/types/react-icons/lib/io/ios-photos-outline.d.ts
deleted file mode 100644
index 95625f46dc..0000000000
--- a/types/react-icons/lib/io/ios-photos-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPhotosOutline extends React.Component<IconBaseProps> { }
-export = IoIosPhotosOutline;
diff --git a/types/react-icons/lib/io/ios-photos.d.ts b/types/react-icons/lib/io/ios-photos.d.ts
deleted file mode 100644
index 938e0fc00b..0000000000
--- a/types/react-icons/lib/io/ios-photos.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPhotos extends React.Component<IconBaseProps> { }
-export = IoIosPhotos;
diff --git a/types/react-icons/lib/io/ios-pie-outline.d.ts b/types/react-icons/lib/io/ios-pie-outline.d.ts
deleted file mode 100644
index cbe879f3a3..0000000000
--- a/types/react-icons/lib/io/ios-pie-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPieOutline extends React.Component<IconBaseProps> { }
-export = IoIosPieOutline;
diff --git a/types/react-icons/lib/io/ios-pie.d.ts b/types/react-icons/lib/io/ios-pie.d.ts
deleted file mode 100644
index 0ac63e3ed9..0000000000
--- a/types/react-icons/lib/io/ios-pie.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPie extends React.Component<IconBaseProps> { }
-export = IoIosPie;
diff --git a/types/react-icons/lib/io/ios-pint-outline.d.ts b/types/react-icons/lib/io/ios-pint-outline.d.ts
deleted file mode 100644
index f32a6650f3..0000000000
--- a/types/react-icons/lib/io/ios-pint-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPintOutline extends React.Component<IconBaseProps> { }
-export = IoIosPintOutline;
diff --git a/types/react-icons/lib/io/ios-pint.d.ts b/types/react-icons/lib/io/ios-pint.d.ts
deleted file mode 100644
index 39f8fea7ba..0000000000
--- a/types/react-icons/lib/io/ios-pint.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPint extends React.Component<IconBaseProps> { }
-export = IoIosPint;
diff --git a/types/react-icons/lib/io/ios-play-outline.d.ts b/types/react-icons/lib/io/ios-play-outline.d.ts
deleted file mode 100644
index 9f2b845a65..0000000000
--- a/types/react-icons/lib/io/ios-play-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPlayOutline extends React.Component<IconBaseProps> { }
-export = IoIosPlayOutline;
diff --git a/types/react-icons/lib/io/ios-play.d.ts b/types/react-icons/lib/io/ios-play.d.ts
deleted file mode 100644
index c4ea5f89df..0000000000
--- a/types/react-icons/lib/io/ios-play.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPlay extends React.Component<IconBaseProps> { }
-export = IoIosPlay;
diff --git a/types/react-icons/lib/io/ios-plus-empty.d.ts b/types/react-icons/lib/io/ios-plus-empty.d.ts
deleted file mode 100644
index 8b84b5fce5..0000000000
--- a/types/react-icons/lib/io/ios-plus-empty.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPlusEmpty extends React.Component<IconBaseProps> { }
-export = IoIosPlusEmpty;
diff --git a/types/react-icons/lib/io/ios-plus-outline.d.ts b/types/react-icons/lib/io/ios-plus-outline.d.ts
deleted file mode 100644
index abe56b67b3..0000000000
--- a/types/react-icons/lib/io/ios-plus-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPlusOutline extends React.Component<IconBaseProps> { }
-export = IoIosPlusOutline;
diff --git a/types/react-icons/lib/io/ios-plus.d.ts b/types/react-icons/lib/io/ios-plus.d.ts
deleted file mode 100644
index a873d41eb9..0000000000
--- a/types/react-icons/lib/io/ios-plus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPlus extends React.Component<IconBaseProps> { }
-export = IoIosPlus;
diff --git a/types/react-icons/lib/io/ios-pricetag-outline.d.ts b/types/react-icons/lib/io/ios-pricetag-outline.d.ts
deleted file mode 100644
index b019c2f832..0000000000
--- a/types/react-icons/lib/io/ios-pricetag-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPricetagOutline extends React.Component<IconBaseProps> { }
-export = IoIosPricetagOutline;
diff --git a/types/react-icons/lib/io/ios-pricetag.d.ts b/types/react-icons/lib/io/ios-pricetag.d.ts
deleted file mode 100644
index e4de3e1503..0000000000
--- a/types/react-icons/lib/io/ios-pricetag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPricetag extends React.Component<IconBaseProps> { }
-export = IoIosPricetag;
diff --git a/types/react-icons/lib/io/ios-pricetags-outline.d.ts b/types/react-icons/lib/io/ios-pricetags-outline.d.ts
deleted file mode 100644
index b138f8dc86..0000000000
--- a/types/react-icons/lib/io/ios-pricetags-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPricetagsOutline extends React.Component<IconBaseProps> { }
-export = IoIosPricetagsOutline;
diff --git a/types/react-icons/lib/io/ios-pricetags.d.ts b/types/react-icons/lib/io/ios-pricetags.d.ts
deleted file mode 100644
index 6587e21167..0000000000
--- a/types/react-icons/lib/io/ios-pricetags.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPricetags extends React.Component<IconBaseProps> { }
-export = IoIosPricetags;
diff --git a/types/react-icons/lib/io/ios-printer-outline.d.ts b/types/react-icons/lib/io/ios-printer-outline.d.ts
deleted file mode 100644
index d6925cf18f..0000000000
--- a/types/react-icons/lib/io/ios-printer-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPrinterOutline extends React.Component<IconBaseProps> { }
-export = IoIosPrinterOutline;
diff --git a/types/react-icons/lib/io/ios-printer.d.ts b/types/react-icons/lib/io/ios-printer.d.ts
deleted file mode 100644
index 463ae865ba..0000000000
--- a/types/react-icons/lib/io/ios-printer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPrinter extends React.Component<IconBaseProps> { }
-export = IoIosPrinter;
diff --git a/types/react-icons/lib/io/ios-pulse-strong.d.ts b/types/react-icons/lib/io/ios-pulse-strong.d.ts
deleted file mode 100644
index c7cb6779bd..0000000000
--- a/types/react-icons/lib/io/ios-pulse-strong.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPulseStrong extends React.Component<IconBaseProps> { }
-export = IoIosPulseStrong;
diff --git a/types/react-icons/lib/io/ios-pulse.d.ts b/types/react-icons/lib/io/ios-pulse.d.ts
deleted file mode 100644
index 28069451ed..0000000000
--- a/types/react-icons/lib/io/ios-pulse.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosPulse extends React.Component<IconBaseProps> { }
-export = IoIosPulse;
diff --git a/types/react-icons/lib/io/ios-rainy-outline.d.ts b/types/react-icons/lib/io/ios-rainy-outline.d.ts
deleted file mode 100644
index 4a41260cc0..0000000000
--- a/types/react-icons/lib/io/ios-rainy-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosRainyOutline extends React.Component<IconBaseProps> { }
-export = IoIosRainyOutline;
diff --git a/types/react-icons/lib/io/ios-rainy.d.ts b/types/react-icons/lib/io/ios-rainy.d.ts
deleted file mode 100644
index ae4c36367e..0000000000
--- a/types/react-icons/lib/io/ios-rainy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosRainy extends React.Component<IconBaseProps> { }
-export = IoIosRainy;
diff --git a/types/react-icons/lib/io/ios-recording-outline.d.ts b/types/react-icons/lib/io/ios-recording-outline.d.ts
deleted file mode 100644
index 9b29082903..0000000000
--- a/types/react-icons/lib/io/ios-recording-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosRecordingOutline extends React.Component<IconBaseProps> { }
-export = IoIosRecordingOutline;
diff --git a/types/react-icons/lib/io/ios-recording.d.ts b/types/react-icons/lib/io/ios-recording.d.ts
deleted file mode 100644
index 41f43eb0d2..0000000000
--- a/types/react-icons/lib/io/ios-recording.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosRecording extends React.Component<IconBaseProps> { }
-export = IoIosRecording;
diff --git a/types/react-icons/lib/io/ios-redo-outline.d.ts b/types/react-icons/lib/io/ios-redo-outline.d.ts
deleted file mode 100644
index 5223876ed7..0000000000
--- a/types/react-icons/lib/io/ios-redo-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosRedoOutline extends React.Component<IconBaseProps> { }
-export = IoIosRedoOutline;
diff --git a/types/react-icons/lib/io/ios-redo.d.ts b/types/react-icons/lib/io/ios-redo.d.ts
deleted file mode 100644
index cd7edf5608..0000000000
--- a/types/react-icons/lib/io/ios-redo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosRedo extends React.Component<IconBaseProps> { }
-export = IoIosRedo;
diff --git a/types/react-icons/lib/io/ios-refresh-empty.d.ts b/types/react-icons/lib/io/ios-refresh-empty.d.ts
deleted file mode 100644
index 52cf8d00f7..0000000000
--- a/types/react-icons/lib/io/ios-refresh-empty.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosRefreshEmpty extends React.Component<IconBaseProps> { }
-export = IoIosRefreshEmpty;
diff --git a/types/react-icons/lib/io/ios-refresh-outline.d.ts b/types/react-icons/lib/io/ios-refresh-outline.d.ts
deleted file mode 100644
index f9678f6488..0000000000
--- a/types/react-icons/lib/io/ios-refresh-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosRefreshOutline extends React.Component<IconBaseProps> { }
-export = IoIosRefreshOutline;
diff --git a/types/react-icons/lib/io/ios-refresh.d.ts b/types/react-icons/lib/io/ios-refresh.d.ts
deleted file mode 100644
index 303ee2a427..0000000000
--- a/types/react-icons/lib/io/ios-refresh.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosRefresh extends React.Component<IconBaseProps> { }
-export = IoIosRefresh;
diff --git a/types/react-icons/lib/io/ios-reload.d.ts b/types/react-icons/lib/io/ios-reload.d.ts
deleted file mode 100644
index 2a82caa3db..0000000000
--- a/types/react-icons/lib/io/ios-reload.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosReload extends React.Component<IconBaseProps> { }
-export = IoIosReload;
diff --git a/types/react-icons/lib/io/ios-reverse-camera-outline.d.ts b/types/react-icons/lib/io/ios-reverse-camera-outline.d.ts
deleted file mode 100644
index 1e3f277186..0000000000
--- a/types/react-icons/lib/io/ios-reverse-camera-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosReverseCameraOutline extends React.Component<IconBaseProps> { }
-export = IoIosReverseCameraOutline;
diff --git a/types/react-icons/lib/io/ios-reverse-camera.d.ts b/types/react-icons/lib/io/ios-reverse-camera.d.ts
deleted file mode 100644
index ea5a99cf35..0000000000
--- a/types/react-icons/lib/io/ios-reverse-camera.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosReverseCamera extends React.Component<IconBaseProps> { }
-export = IoIosReverseCamera;
diff --git a/types/react-icons/lib/io/ios-rewind-outline.d.ts b/types/react-icons/lib/io/ios-rewind-outline.d.ts
deleted file mode 100644
index 8c4435f4e3..0000000000
--- a/types/react-icons/lib/io/ios-rewind-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosRewindOutline extends React.Component<IconBaseProps> { }
-export = IoIosRewindOutline;
diff --git a/types/react-icons/lib/io/ios-rewind.d.ts b/types/react-icons/lib/io/ios-rewind.d.ts
deleted file mode 100644
index 01793439e9..0000000000
--- a/types/react-icons/lib/io/ios-rewind.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosRewind extends React.Component<IconBaseProps> { }
-export = IoIosRewind;
diff --git a/types/react-icons/lib/io/ios-rose-outline.d.ts b/types/react-icons/lib/io/ios-rose-outline.d.ts
deleted file mode 100644
index 5fb990a6e0..0000000000
--- a/types/react-icons/lib/io/ios-rose-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosRoseOutline extends React.Component<IconBaseProps> { }
-export = IoIosRoseOutline;
diff --git a/types/react-icons/lib/io/ios-rose.d.ts b/types/react-icons/lib/io/ios-rose.d.ts
deleted file mode 100644
index d7764d477a..0000000000
--- a/types/react-icons/lib/io/ios-rose.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosRose extends React.Component<IconBaseProps> { }
-export = IoIosRose;
diff --git a/types/react-icons/lib/io/ios-search-strong.d.ts b/types/react-icons/lib/io/ios-search-strong.d.ts
deleted file mode 100644
index b182f713a2..0000000000
--- a/types/react-icons/lib/io/ios-search-strong.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosSearchStrong extends React.Component<IconBaseProps> { }
-export = IoIosSearchStrong;
diff --git a/types/react-icons/lib/io/ios-search.d.ts b/types/react-icons/lib/io/ios-search.d.ts
deleted file mode 100644
index e1a76af33b..0000000000
--- a/types/react-icons/lib/io/ios-search.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosSearch extends React.Component<IconBaseProps> { }
-export = IoIosSearch;
diff --git a/types/react-icons/lib/io/ios-settings-strong.d.ts b/types/react-icons/lib/io/ios-settings-strong.d.ts
deleted file mode 100644
index cdd4bb5c03..0000000000
--- a/types/react-icons/lib/io/ios-settings-strong.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosSettingsStrong extends React.Component<IconBaseProps> { }
-export = IoIosSettingsStrong;
diff --git a/types/react-icons/lib/io/ios-settings.d.ts b/types/react-icons/lib/io/ios-settings.d.ts
deleted file mode 100644
index 76ac7176fb..0000000000
--- a/types/react-icons/lib/io/ios-settings.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosSettings extends React.Component<IconBaseProps> { }
-export = IoIosSettings;
diff --git a/types/react-icons/lib/io/ios-shuffle-strong.d.ts b/types/react-icons/lib/io/ios-shuffle-strong.d.ts
deleted file mode 100644
index 6868edf37d..0000000000
--- a/types/react-icons/lib/io/ios-shuffle-strong.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosShuffleStrong extends React.Component<IconBaseProps> { }
-export = IoIosShuffleStrong;
diff --git a/types/react-icons/lib/io/ios-shuffle.d.ts b/types/react-icons/lib/io/ios-shuffle.d.ts
deleted file mode 100644
index e06f262339..0000000000
--- a/types/react-icons/lib/io/ios-shuffle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosShuffle extends React.Component<IconBaseProps> { }
-export = IoIosShuffle;
diff --git a/types/react-icons/lib/io/ios-skipbackward-outline.d.ts b/types/react-icons/lib/io/ios-skipbackward-outline.d.ts
deleted file mode 100644
index f9a71c7bcf..0000000000
--- a/types/react-icons/lib/io/ios-skipbackward-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosSkipbackwardOutline extends React.Component<IconBaseProps> { }
-export = IoIosSkipbackwardOutline;
diff --git a/types/react-icons/lib/io/ios-skipbackward.d.ts b/types/react-icons/lib/io/ios-skipbackward.d.ts
deleted file mode 100644
index 48e13dc7ad..0000000000
--- a/types/react-icons/lib/io/ios-skipbackward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosSkipbackward extends React.Component<IconBaseProps> { }
-export = IoIosSkipbackward;
diff --git a/types/react-icons/lib/io/ios-skipforward-outline.d.ts b/types/react-icons/lib/io/ios-skipforward-outline.d.ts
deleted file mode 100644
index 3d9f4bbb95..0000000000
--- a/types/react-icons/lib/io/ios-skipforward-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosSkipforwardOutline extends React.Component<IconBaseProps> { }
-export = IoIosSkipforwardOutline;
diff --git a/types/react-icons/lib/io/ios-skipforward.d.ts b/types/react-icons/lib/io/ios-skipforward.d.ts
deleted file mode 100644
index 7ffc3c5e45..0000000000
--- a/types/react-icons/lib/io/ios-skipforward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosSkipforward extends React.Component<IconBaseProps> { }
-export = IoIosSkipforward;
diff --git a/types/react-icons/lib/io/ios-snowy.d.ts b/types/react-icons/lib/io/ios-snowy.d.ts
deleted file mode 100644
index c142557efd..0000000000
--- a/types/react-icons/lib/io/ios-snowy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosSnowy extends React.Component<IconBaseProps> { }
-export = IoIosSnowy;
diff --git a/types/react-icons/lib/io/ios-speedometer-outline.d.ts b/types/react-icons/lib/io/ios-speedometer-outline.d.ts
deleted file mode 100644
index fe30530881..0000000000
--- a/types/react-icons/lib/io/ios-speedometer-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosSpeedometerOutline extends React.Component<IconBaseProps> { }
-export = IoIosSpeedometerOutline;
diff --git a/types/react-icons/lib/io/ios-speedometer.d.ts b/types/react-icons/lib/io/ios-speedometer.d.ts
deleted file mode 100644
index 57bde6cf81..0000000000
--- a/types/react-icons/lib/io/ios-speedometer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosSpeedometer extends React.Component<IconBaseProps> { }
-export = IoIosSpeedometer;
diff --git a/types/react-icons/lib/io/ios-star-half.d.ts b/types/react-icons/lib/io/ios-star-half.d.ts
deleted file mode 100644
index 8654211883..0000000000
--- a/types/react-icons/lib/io/ios-star-half.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosStarHalf extends React.Component<IconBaseProps> { }
-export = IoIosStarHalf;
diff --git a/types/react-icons/lib/io/ios-star-outline.d.ts b/types/react-icons/lib/io/ios-star-outline.d.ts
deleted file mode 100644
index 96a337becf..0000000000
--- a/types/react-icons/lib/io/ios-star-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosStarOutline extends React.Component<IconBaseProps> { }
-export = IoIosStarOutline;
diff --git a/types/react-icons/lib/io/ios-star.d.ts b/types/react-icons/lib/io/ios-star.d.ts
deleted file mode 100644
index 4187ae15ff..0000000000
--- a/types/react-icons/lib/io/ios-star.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosStar extends React.Component<IconBaseProps> { }
-export = IoIosStar;
diff --git a/types/react-icons/lib/io/ios-stopwatch-outline.d.ts b/types/react-icons/lib/io/ios-stopwatch-outline.d.ts
deleted file mode 100644
index 0486f760d2..0000000000
--- a/types/react-icons/lib/io/ios-stopwatch-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosStopwatchOutline extends React.Component<IconBaseProps> { }
-export = IoIosStopwatchOutline;
diff --git a/types/react-icons/lib/io/ios-stopwatch.d.ts b/types/react-icons/lib/io/ios-stopwatch.d.ts
deleted file mode 100644
index b2d9823c11..0000000000
--- a/types/react-icons/lib/io/ios-stopwatch.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosStopwatch extends React.Component<IconBaseProps> { }
-export = IoIosStopwatch;
diff --git a/types/react-icons/lib/io/ios-sunny-outline.d.ts b/types/react-icons/lib/io/ios-sunny-outline.d.ts
deleted file mode 100644
index 8638d5a738..0000000000
--- a/types/react-icons/lib/io/ios-sunny-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosSunnyOutline extends React.Component<IconBaseProps> { }
-export = IoIosSunnyOutline;
diff --git a/types/react-icons/lib/io/ios-sunny.d.ts b/types/react-icons/lib/io/ios-sunny.d.ts
deleted file mode 100644
index 3993cf8f2e..0000000000
--- a/types/react-icons/lib/io/ios-sunny.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosSunny extends React.Component<IconBaseProps> { }
-export = IoIosSunny;
diff --git a/types/react-icons/lib/io/ios-telephone-outline.d.ts b/types/react-icons/lib/io/ios-telephone-outline.d.ts
deleted file mode 100644
index 9566ebbe70..0000000000
--- a/types/react-icons/lib/io/ios-telephone-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosTelephoneOutline extends React.Component<IconBaseProps> { }
-export = IoIosTelephoneOutline;
diff --git a/types/react-icons/lib/io/ios-telephone.d.ts b/types/react-icons/lib/io/ios-telephone.d.ts
deleted file mode 100644
index 6e8b47eacf..0000000000
--- a/types/react-icons/lib/io/ios-telephone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosTelephone extends React.Component<IconBaseProps> { }
-export = IoIosTelephone;
diff --git a/types/react-icons/lib/io/ios-tennisball-outline.d.ts b/types/react-icons/lib/io/ios-tennisball-outline.d.ts
deleted file mode 100644
index 469243b80e..0000000000
--- a/types/react-icons/lib/io/ios-tennisball-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosTennisballOutline extends React.Component<IconBaseProps> { }
-export = IoIosTennisballOutline;
diff --git a/types/react-icons/lib/io/ios-tennisball.d.ts b/types/react-icons/lib/io/ios-tennisball.d.ts
deleted file mode 100644
index eb0fa83b49..0000000000
--- a/types/react-icons/lib/io/ios-tennisball.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosTennisball extends React.Component<IconBaseProps> { }
-export = IoIosTennisball;
diff --git a/types/react-icons/lib/io/ios-thunderstorm-outline.d.ts b/types/react-icons/lib/io/ios-thunderstorm-outline.d.ts
deleted file mode 100644
index 8d977d2ebe..0000000000
--- a/types/react-icons/lib/io/ios-thunderstorm-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosThunderstormOutline extends React.Component<IconBaseProps> { }
-export = IoIosThunderstormOutline;
diff --git a/types/react-icons/lib/io/ios-thunderstorm.d.ts b/types/react-icons/lib/io/ios-thunderstorm.d.ts
deleted file mode 100644
index fee0ea6196..0000000000
--- a/types/react-icons/lib/io/ios-thunderstorm.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosThunderstorm extends React.Component<IconBaseProps> { }
-export = IoIosThunderstorm;
diff --git a/types/react-icons/lib/io/ios-time-outline.d.ts b/types/react-icons/lib/io/ios-time-outline.d.ts
deleted file mode 100644
index cb363cf705..0000000000
--- a/types/react-icons/lib/io/ios-time-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosTimeOutline extends React.Component<IconBaseProps> { }
-export = IoIosTimeOutline;
diff --git a/types/react-icons/lib/io/ios-time.d.ts b/types/react-icons/lib/io/ios-time.d.ts
deleted file mode 100644
index f0695cc3e2..0000000000
--- a/types/react-icons/lib/io/ios-time.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosTime extends React.Component<IconBaseProps> { }
-export = IoIosTime;
diff --git a/types/react-icons/lib/io/ios-timer-outline.d.ts b/types/react-icons/lib/io/ios-timer-outline.d.ts
deleted file mode 100644
index 901b60f19e..0000000000
--- a/types/react-icons/lib/io/ios-timer-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosTimerOutline extends React.Component<IconBaseProps> { }
-export = IoIosTimerOutline;
diff --git a/types/react-icons/lib/io/ios-timer.d.ts b/types/react-icons/lib/io/ios-timer.d.ts
deleted file mode 100644
index 5f1b5b7583..0000000000
--- a/types/react-icons/lib/io/ios-timer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosTimer extends React.Component<IconBaseProps> { }
-export = IoIosTimer;
diff --git a/types/react-icons/lib/io/ios-toggle-outline.d.ts b/types/react-icons/lib/io/ios-toggle-outline.d.ts
deleted file mode 100644
index 9e6db326b7..0000000000
--- a/types/react-icons/lib/io/ios-toggle-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosToggleOutline extends React.Component<IconBaseProps> { }
-export = IoIosToggleOutline;
diff --git a/types/react-icons/lib/io/ios-toggle.d.ts b/types/react-icons/lib/io/ios-toggle.d.ts
deleted file mode 100644
index 0cb2bec203..0000000000
--- a/types/react-icons/lib/io/ios-toggle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosToggle extends React.Component<IconBaseProps> { }
-export = IoIosToggle;
diff --git a/types/react-icons/lib/io/ios-trash-outline.d.ts b/types/react-icons/lib/io/ios-trash-outline.d.ts
deleted file mode 100644
index 87f7970799..0000000000
--- a/types/react-icons/lib/io/ios-trash-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosTrashOutline extends React.Component<IconBaseProps> { }
-export = IoIosTrashOutline;
diff --git a/types/react-icons/lib/io/ios-trash.d.ts b/types/react-icons/lib/io/ios-trash.d.ts
deleted file mode 100644
index 41ae428e61..0000000000
--- a/types/react-icons/lib/io/ios-trash.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosTrash extends React.Component<IconBaseProps> { }
-export = IoIosTrash;
diff --git a/types/react-icons/lib/io/ios-undo-outline.d.ts b/types/react-icons/lib/io/ios-undo-outline.d.ts
deleted file mode 100644
index f4c5958de8..0000000000
--- a/types/react-icons/lib/io/ios-undo-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosUndoOutline extends React.Component<IconBaseProps> { }
-export = IoIosUndoOutline;
diff --git a/types/react-icons/lib/io/ios-undo.d.ts b/types/react-icons/lib/io/ios-undo.d.ts
deleted file mode 100644
index 6f17b7375b..0000000000
--- a/types/react-icons/lib/io/ios-undo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosUndo extends React.Component<IconBaseProps> { }
-export = IoIosUndo;
diff --git a/types/react-icons/lib/io/ios-unlocked-outline.d.ts b/types/react-icons/lib/io/ios-unlocked-outline.d.ts
deleted file mode 100644
index 950ada1a97..0000000000
--- a/types/react-icons/lib/io/ios-unlocked-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosUnlockedOutline extends React.Component<IconBaseProps> { }
-export = IoIosUnlockedOutline;
diff --git a/types/react-icons/lib/io/ios-unlocked.d.ts b/types/react-icons/lib/io/ios-unlocked.d.ts
deleted file mode 100644
index d7c8ac1110..0000000000
--- a/types/react-icons/lib/io/ios-unlocked.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosUnlocked extends React.Component<IconBaseProps> { }
-export = IoIosUnlocked;
diff --git a/types/react-icons/lib/io/ios-upload-outline.d.ts b/types/react-icons/lib/io/ios-upload-outline.d.ts
deleted file mode 100644
index 04dd2108f5..0000000000
--- a/types/react-icons/lib/io/ios-upload-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosUploadOutline extends React.Component<IconBaseProps> { }
-export = IoIosUploadOutline;
diff --git a/types/react-icons/lib/io/ios-upload.d.ts b/types/react-icons/lib/io/ios-upload.d.ts
deleted file mode 100644
index 355a35d459..0000000000
--- a/types/react-icons/lib/io/ios-upload.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosUpload extends React.Component<IconBaseProps> { }
-export = IoIosUpload;
diff --git a/types/react-icons/lib/io/ios-videocam-outline.d.ts b/types/react-icons/lib/io/ios-videocam-outline.d.ts
deleted file mode 100644
index e530729768..0000000000
--- a/types/react-icons/lib/io/ios-videocam-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosVideocamOutline extends React.Component<IconBaseProps> { }
-export = IoIosVideocamOutline;
diff --git a/types/react-icons/lib/io/ios-videocam.d.ts b/types/react-icons/lib/io/ios-videocam.d.ts
deleted file mode 100644
index 816ebb388b..0000000000
--- a/types/react-icons/lib/io/ios-videocam.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosVideocam extends React.Component<IconBaseProps> { }
-export = IoIosVideocam;
diff --git a/types/react-icons/lib/io/ios-volume-high.d.ts b/types/react-icons/lib/io/ios-volume-high.d.ts
deleted file mode 100644
index 9995c03916..0000000000
--- a/types/react-icons/lib/io/ios-volume-high.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosVolumeHigh extends React.Component<IconBaseProps> { }
-export = IoIosVolumeHigh;
diff --git a/types/react-icons/lib/io/ios-volume-low.d.ts b/types/react-icons/lib/io/ios-volume-low.d.ts
deleted file mode 100644
index 829e862b24..0000000000
--- a/types/react-icons/lib/io/ios-volume-low.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosVolumeLow extends React.Component<IconBaseProps> { }
-export = IoIosVolumeLow;
diff --git a/types/react-icons/lib/io/ios-wineglass-outline.d.ts b/types/react-icons/lib/io/ios-wineglass-outline.d.ts
deleted file mode 100644
index f4bf78ca4e..0000000000
--- a/types/react-icons/lib/io/ios-wineglass-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosWineglassOutline extends React.Component<IconBaseProps> { }
-export = IoIosWineglassOutline;
diff --git a/types/react-icons/lib/io/ios-wineglass.d.ts b/types/react-icons/lib/io/ios-wineglass.d.ts
deleted file mode 100644
index af091597cc..0000000000
--- a/types/react-icons/lib/io/ios-wineglass.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosWineglass extends React.Component<IconBaseProps> { }
-export = IoIosWineglass;
diff --git a/types/react-icons/lib/io/ios-world-outline.d.ts b/types/react-icons/lib/io/ios-world-outline.d.ts
deleted file mode 100644
index 55e2b6d7e8..0000000000
--- a/types/react-icons/lib/io/ios-world-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosWorldOutline extends React.Component<IconBaseProps> { }
-export = IoIosWorldOutline;
diff --git a/types/react-icons/lib/io/ios-world.d.ts b/types/react-icons/lib/io/ios-world.d.ts
deleted file mode 100644
index c00b081e91..0000000000
--- a/types/react-icons/lib/io/ios-world.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIosWorld extends React.Component<IconBaseProps> { }
-export = IoIosWorld;
diff --git a/types/react-icons/lib/io/ipad.d.ts b/types/react-icons/lib/io/ipad.d.ts
deleted file mode 100644
index 97ef83ed9f..0000000000
--- a/types/react-icons/lib/io/ipad.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIpad extends React.Component<IconBaseProps> { }
-export = IoIpad;
diff --git a/types/react-icons/lib/io/iphone.d.ts b/types/react-icons/lib/io/iphone.d.ts
deleted file mode 100644
index 068e6d873f..0000000000
--- a/types/react-icons/lib/io/iphone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIphone extends React.Component<IconBaseProps> { }
-export = IoIphone;
diff --git a/types/react-icons/lib/io/ipod.d.ts b/types/react-icons/lib/io/ipod.d.ts
deleted file mode 100644
index d88bcfd2e8..0000000000
--- a/types/react-icons/lib/io/ipod.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoIpod extends React.Component<IconBaseProps> { }
-export = IoIpod;
diff --git a/types/react-icons/lib/io/jet.d.ts b/types/react-icons/lib/io/jet.d.ts
deleted file mode 100644
index c5a5d952d4..0000000000
--- a/types/react-icons/lib/io/jet.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoJet extends React.Component<IconBaseProps> { }
-export = IoJet;
diff --git a/types/react-icons/lib/io/key.d.ts b/types/react-icons/lib/io/key.d.ts
deleted file mode 100644
index 603fe5ce7f..0000000000
--- a/types/react-icons/lib/io/key.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoKey extends React.Component<IconBaseProps> { }
-export = IoKey;
diff --git a/types/react-icons/lib/io/knife.d.ts b/types/react-icons/lib/io/knife.d.ts
deleted file mode 100644
index 9318e4eaef..0000000000
--- a/types/react-icons/lib/io/knife.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoKnife extends React.Component<IconBaseProps> { }
-export = IoKnife;
diff --git a/types/react-icons/lib/io/laptop.d.ts b/types/react-icons/lib/io/laptop.d.ts
deleted file mode 100644
index 51c058f363..0000000000
--- a/types/react-icons/lib/io/laptop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoLaptop extends React.Component<IconBaseProps> { }
-export = IoLaptop;
diff --git a/types/react-icons/lib/io/leaf.d.ts b/types/react-icons/lib/io/leaf.d.ts
deleted file mode 100644
index 19203a67de..0000000000
--- a/types/react-icons/lib/io/leaf.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoLeaf extends React.Component<IconBaseProps> { }
-export = IoLeaf;
diff --git a/types/react-icons/lib/io/levels.d.ts b/types/react-icons/lib/io/levels.d.ts
deleted file mode 100644
index 5638dc6579..0000000000
--- a/types/react-icons/lib/io/levels.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoLevels extends React.Component<IconBaseProps> { }
-export = IoLevels;
diff --git a/types/react-icons/lib/io/lightbulb.d.ts b/types/react-icons/lib/io/lightbulb.d.ts
deleted file mode 100644
index af434a2ba2..0000000000
--- a/types/react-icons/lib/io/lightbulb.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoLightbulb extends React.Component<IconBaseProps> { }
-export = IoLightbulb;
diff --git a/types/react-icons/lib/io/link.d.ts b/types/react-icons/lib/io/link.d.ts
deleted file mode 100644
index fddbe7cb56..0000000000
--- a/types/react-icons/lib/io/link.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoLink extends React.Component<IconBaseProps> { }
-export = IoLink;
diff --git a/types/react-icons/lib/io/load-a.d.ts b/types/react-icons/lib/io/load-a.d.ts
deleted file mode 100644
index f82360e687..0000000000
--- a/types/react-icons/lib/io/load-a.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoLoadA extends React.Component<IconBaseProps> { }
-export = IoLoadA;
diff --git a/types/react-icons/lib/io/load-b.d.ts b/types/react-icons/lib/io/load-b.d.ts
deleted file mode 100644
index 65baa4d442..0000000000
--- a/types/react-icons/lib/io/load-b.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoLoadB extends React.Component<IconBaseProps> { }
-export = IoLoadB;
diff --git a/types/react-icons/lib/io/load-c.d.ts b/types/react-icons/lib/io/load-c.d.ts
deleted file mode 100644
index 7c74e2c274..0000000000
--- a/types/react-icons/lib/io/load-c.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoLoadC extends React.Component<IconBaseProps> { }
-export = IoLoadC;
diff --git a/types/react-icons/lib/io/load-d.d.ts b/types/react-icons/lib/io/load-d.d.ts
deleted file mode 100644
index 36c6555c24..0000000000
--- a/types/react-icons/lib/io/load-d.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoLoadD extends React.Component<IconBaseProps> { }
-export = IoLoadD;
diff --git a/types/react-icons/lib/io/location.d.ts b/types/react-icons/lib/io/location.d.ts
deleted file mode 100644
index 8726374947..0000000000
--- a/types/react-icons/lib/io/location.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoLocation extends React.Component<IconBaseProps> { }
-export = IoLocation;
diff --git a/types/react-icons/lib/io/lock-combination.d.ts b/types/react-icons/lib/io/lock-combination.d.ts
deleted file mode 100644
index b3f04cc24f..0000000000
--- a/types/react-icons/lib/io/lock-combination.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoLockCombination extends React.Component<IconBaseProps> { }
-export = IoLockCombination;
diff --git a/types/react-icons/lib/io/locked.d.ts b/types/react-icons/lib/io/locked.d.ts
deleted file mode 100644
index b3a945c76d..0000000000
--- a/types/react-icons/lib/io/locked.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoLocked extends React.Component<IconBaseProps> { }
-export = IoLocked;
diff --git a/types/react-icons/lib/io/log-in.d.ts b/types/react-icons/lib/io/log-in.d.ts
deleted file mode 100644
index 895a82e0c5..0000000000
--- a/types/react-icons/lib/io/log-in.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoLogIn extends React.Component<IconBaseProps> { }
-export = IoLogIn;
diff --git a/types/react-icons/lib/io/log-out.d.ts b/types/react-icons/lib/io/log-out.d.ts
deleted file mode 100644
index 70c0aa1a31..0000000000
--- a/types/react-icons/lib/io/log-out.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoLogOut extends React.Component<IconBaseProps> { }
-export = IoLogOut;
diff --git a/types/react-icons/lib/io/loop.d.ts b/types/react-icons/lib/io/loop.d.ts
deleted file mode 100644
index 39d3bb6092..0000000000
--- a/types/react-icons/lib/io/loop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoLoop extends React.Component<IconBaseProps> { }
-export = IoLoop;
diff --git a/types/react-icons/lib/io/magnet.d.ts b/types/react-icons/lib/io/magnet.d.ts
deleted file mode 100644
index 8730d8a15e..0000000000
--- a/types/react-icons/lib/io/magnet.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMagnet extends React.Component<IconBaseProps> { }
-export = IoMagnet;
diff --git a/types/react-icons/lib/io/male.d.ts b/types/react-icons/lib/io/male.d.ts
deleted file mode 100644
index 641a13b861..0000000000
--- a/types/react-icons/lib/io/male.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMale extends React.Component<IconBaseProps> { }
-export = IoMale;
diff --git a/types/react-icons/lib/io/man.d.ts b/types/react-icons/lib/io/man.d.ts
deleted file mode 100644
index 5c2f70ac23..0000000000
--- a/types/react-icons/lib/io/man.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMan extends React.Component<IconBaseProps> { }
-export = IoMan;
diff --git a/types/react-icons/lib/io/map.d.ts b/types/react-icons/lib/io/map.d.ts
deleted file mode 100644
index f00ba0c8a7..0000000000
--- a/types/react-icons/lib/io/map.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMap extends React.Component<IconBaseProps> { }
-export = IoMap;
diff --git a/types/react-icons/lib/io/medkit.d.ts b/types/react-icons/lib/io/medkit.d.ts
deleted file mode 100644
index eadeea513f..0000000000
--- a/types/react-icons/lib/io/medkit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMedkit extends React.Component<IconBaseProps> { }
-export = IoMedkit;
diff --git a/types/react-icons/lib/io/merge.d.ts b/types/react-icons/lib/io/merge.d.ts
deleted file mode 100644
index 60cc718787..0000000000
--- a/types/react-icons/lib/io/merge.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMerge extends React.Component<IconBaseProps> { }
-export = IoMerge;
diff --git a/types/react-icons/lib/io/mic-a.d.ts b/types/react-icons/lib/io/mic-a.d.ts
deleted file mode 100644
index ca862a054e..0000000000
--- a/types/react-icons/lib/io/mic-a.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMicA extends React.Component<IconBaseProps> { }
-export = IoMicA;
diff --git a/types/react-icons/lib/io/mic-b.d.ts b/types/react-icons/lib/io/mic-b.d.ts
deleted file mode 100644
index 8c195c04c6..0000000000
--- a/types/react-icons/lib/io/mic-b.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMicB extends React.Component<IconBaseProps> { }
-export = IoMicB;
diff --git a/types/react-icons/lib/io/mic-c.d.ts b/types/react-icons/lib/io/mic-c.d.ts
deleted file mode 100644
index 0f490c8680..0000000000
--- a/types/react-icons/lib/io/mic-c.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMicC extends React.Component<IconBaseProps> { }
-export = IoMicC;
diff --git a/types/react-icons/lib/io/minus-circled.d.ts b/types/react-icons/lib/io/minus-circled.d.ts
deleted file mode 100644
index 2e20d731a1..0000000000
--- a/types/react-icons/lib/io/minus-circled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMinusCircled extends React.Component<IconBaseProps> { }
-export = IoMinusCircled;
diff --git a/types/react-icons/lib/io/minus-round.d.ts b/types/react-icons/lib/io/minus-round.d.ts
deleted file mode 100644
index e6363e0ab7..0000000000
--- a/types/react-icons/lib/io/minus-round.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMinusRound extends React.Component<IconBaseProps> { }
-export = IoMinusRound;
diff --git a/types/react-icons/lib/io/minus.d.ts b/types/react-icons/lib/io/minus.d.ts
deleted file mode 100644
index 5b0202abd2..0000000000
--- a/types/react-icons/lib/io/minus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMinus extends React.Component<IconBaseProps> { }
-export = IoMinus;
diff --git a/types/react-icons/lib/io/model-s.d.ts b/types/react-icons/lib/io/model-s.d.ts
deleted file mode 100644
index 7d9e3b5c77..0000000000
--- a/types/react-icons/lib/io/model-s.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoModelS extends React.Component<IconBaseProps> { }
-export = IoModelS;
diff --git a/types/react-icons/lib/io/monitor.d.ts b/types/react-icons/lib/io/monitor.d.ts
deleted file mode 100644
index 6c639ee9fe..0000000000
--- a/types/react-icons/lib/io/monitor.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMonitor extends React.Component<IconBaseProps> { }
-export = IoMonitor;
diff --git a/types/react-icons/lib/io/more.d.ts b/types/react-icons/lib/io/more.d.ts
deleted file mode 100644
index b13a7f1141..0000000000
--- a/types/react-icons/lib/io/more.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMore extends React.Component<IconBaseProps> { }
-export = IoMore;
diff --git a/types/react-icons/lib/io/mouse.d.ts b/types/react-icons/lib/io/mouse.d.ts
deleted file mode 100644
index 077fe8ddaf..0000000000
--- a/types/react-icons/lib/io/mouse.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMouse extends React.Component<IconBaseProps> { }
-export = IoMouse;
diff --git a/types/react-icons/lib/io/music-note.d.ts b/types/react-icons/lib/io/music-note.d.ts
deleted file mode 100644
index eacac097b2..0000000000
--- a/types/react-icons/lib/io/music-note.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoMusicNote extends React.Component<IconBaseProps> { }
-export = IoMusicNote;
diff --git a/types/react-icons/lib/io/navicon-round.d.ts b/types/react-icons/lib/io/navicon-round.d.ts
deleted file mode 100644
index 6cc6ec5847..0000000000
--- a/types/react-icons/lib/io/navicon-round.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoNaviconRound extends React.Component<IconBaseProps> { }
-export = IoNaviconRound;
diff --git a/types/react-icons/lib/io/navicon.d.ts b/types/react-icons/lib/io/navicon.d.ts
deleted file mode 100644
index 5da09863ba..0000000000
--- a/types/react-icons/lib/io/navicon.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoNavicon extends React.Component<IconBaseProps> { }
-export = IoNavicon;
diff --git a/types/react-icons/lib/io/navigate.d.ts b/types/react-icons/lib/io/navigate.d.ts
deleted file mode 100644
index aef1fb00a3..0000000000
--- a/types/react-icons/lib/io/navigate.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoNavigate extends React.Component<IconBaseProps> { }
-export = IoNavigate;
diff --git a/types/react-icons/lib/io/network.d.ts b/types/react-icons/lib/io/network.d.ts
deleted file mode 100644
index f2d137e6d2..0000000000
--- a/types/react-icons/lib/io/network.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoNetwork extends React.Component<IconBaseProps> { }
-export = IoNetwork;
diff --git a/types/react-icons/lib/io/no-smoking.d.ts b/types/react-icons/lib/io/no-smoking.d.ts
deleted file mode 100644
index eca13e875a..0000000000
--- a/types/react-icons/lib/io/no-smoking.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoNoSmoking extends React.Component<IconBaseProps> { }
-export = IoNoSmoking;
diff --git a/types/react-icons/lib/io/nuclear.d.ts b/types/react-icons/lib/io/nuclear.d.ts
deleted file mode 100644
index f220fd75a6..0000000000
--- a/types/react-icons/lib/io/nuclear.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoNuclear extends React.Component<IconBaseProps> { }
-export = IoNuclear;
diff --git a/types/react-icons/lib/io/outlet.d.ts b/types/react-icons/lib/io/outlet.d.ts
deleted file mode 100644
index 10b9c1c53b..0000000000
--- a/types/react-icons/lib/io/outlet.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoOutlet extends React.Component<IconBaseProps> { }
-export = IoOutlet;
diff --git a/types/react-icons/lib/io/paintbrush.d.ts b/types/react-icons/lib/io/paintbrush.d.ts
deleted file mode 100644
index 798d4ec723..0000000000
--- a/types/react-icons/lib/io/paintbrush.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPaintbrush extends React.Component<IconBaseProps> { }
-export = IoPaintbrush;
diff --git a/types/react-icons/lib/io/paintbucket.d.ts b/types/react-icons/lib/io/paintbucket.d.ts
deleted file mode 100644
index cae729d92e..0000000000
--- a/types/react-icons/lib/io/paintbucket.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPaintbucket extends React.Component<IconBaseProps> { }
-export = IoPaintbucket;
diff --git a/types/react-icons/lib/io/paper-airplane.d.ts b/types/react-icons/lib/io/paper-airplane.d.ts
deleted file mode 100644
index 0cc9963b1e..0000000000
--- a/types/react-icons/lib/io/paper-airplane.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPaperAirplane extends React.Component<IconBaseProps> { }
-export = IoPaperAirplane;
diff --git a/types/react-icons/lib/io/paperclip.d.ts b/types/react-icons/lib/io/paperclip.d.ts
deleted file mode 100644
index fb887470b8..0000000000
--- a/types/react-icons/lib/io/paperclip.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPaperclip extends React.Component<IconBaseProps> { }
-export = IoPaperclip;
diff --git a/types/react-icons/lib/io/pause.d.ts b/types/react-icons/lib/io/pause.d.ts
deleted file mode 100644
index 1c0f437dab..0000000000
--- a/types/react-icons/lib/io/pause.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPause extends React.Component<IconBaseProps> { }
-export = IoPause;
diff --git a/types/react-icons/lib/io/person-add.d.ts b/types/react-icons/lib/io/person-add.d.ts
deleted file mode 100644
index 53ce9e2e41..0000000000
--- a/types/react-icons/lib/io/person-add.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPersonAdd extends React.Component<IconBaseProps> { }
-export = IoPersonAdd;
diff --git a/types/react-icons/lib/io/person-stalker.d.ts b/types/react-icons/lib/io/person-stalker.d.ts
deleted file mode 100644
index 161429c61a..0000000000
--- a/types/react-icons/lib/io/person-stalker.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPersonStalker extends React.Component<IconBaseProps> { }
-export = IoPersonStalker;
diff --git a/types/react-icons/lib/io/person.d.ts b/types/react-icons/lib/io/person.d.ts
deleted file mode 100644
index 838d276698..0000000000
--- a/types/react-icons/lib/io/person.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPerson extends React.Component<IconBaseProps> { }
-export = IoPerson;
diff --git a/types/react-icons/lib/io/pie-graph.d.ts b/types/react-icons/lib/io/pie-graph.d.ts
deleted file mode 100644
index b34d737547..0000000000
--- a/types/react-icons/lib/io/pie-graph.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPieGraph extends React.Component<IconBaseProps> { }
-export = IoPieGraph;
diff --git a/types/react-icons/lib/io/pin.d.ts b/types/react-icons/lib/io/pin.d.ts
deleted file mode 100644
index 8acc70bbe7..0000000000
--- a/types/react-icons/lib/io/pin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPin extends React.Component<IconBaseProps> { }
-export = IoPin;
diff --git a/types/react-icons/lib/io/pinpoint.d.ts b/types/react-icons/lib/io/pinpoint.d.ts
deleted file mode 100644
index 633ebe5f6c..0000000000
--- a/types/react-icons/lib/io/pinpoint.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPinpoint extends React.Component<IconBaseProps> { }
-export = IoPinpoint;
diff --git a/types/react-icons/lib/io/pizza.d.ts b/types/react-icons/lib/io/pizza.d.ts
deleted file mode 100644
index 22b59ea468..0000000000
--- a/types/react-icons/lib/io/pizza.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPizza extends React.Component<IconBaseProps> { }
-export = IoPizza;
diff --git a/types/react-icons/lib/io/plane.d.ts b/types/react-icons/lib/io/plane.d.ts
deleted file mode 100644
index db6117b622..0000000000
--- a/types/react-icons/lib/io/plane.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPlane extends React.Component<IconBaseProps> { }
-export = IoPlane;
diff --git a/types/react-icons/lib/io/planet.d.ts b/types/react-icons/lib/io/planet.d.ts
deleted file mode 100644
index b831ee0adf..0000000000
--- a/types/react-icons/lib/io/planet.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPlanet extends React.Component<IconBaseProps> { }
-export = IoPlanet;
diff --git a/types/react-icons/lib/io/play.d.ts b/types/react-icons/lib/io/play.d.ts
deleted file mode 100644
index 1b4959e9c6..0000000000
--- a/types/react-icons/lib/io/play.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPlay extends React.Component<IconBaseProps> { }
-export = IoPlay;
diff --git a/types/react-icons/lib/io/playstation.d.ts b/types/react-icons/lib/io/playstation.d.ts
deleted file mode 100644
index d10a3ca0ee..0000000000
--- a/types/react-icons/lib/io/playstation.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPlaystation extends React.Component<IconBaseProps> { }
-export = IoPlaystation;
diff --git a/types/react-icons/lib/io/plus-circled.d.ts b/types/react-icons/lib/io/plus-circled.d.ts
deleted file mode 100644
index eb6e1f8d93..0000000000
--- a/types/react-icons/lib/io/plus-circled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPlusCircled extends React.Component<IconBaseProps> { }
-export = IoPlusCircled;
diff --git a/types/react-icons/lib/io/plus-round.d.ts b/types/react-icons/lib/io/plus-round.d.ts
deleted file mode 100644
index ebd92519bf..0000000000
--- a/types/react-icons/lib/io/plus-round.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPlusRound extends React.Component<IconBaseProps> { }
-export = IoPlusRound;
diff --git a/types/react-icons/lib/io/plus.d.ts b/types/react-icons/lib/io/plus.d.ts
deleted file mode 100644
index 1626a1cf05..0000000000
--- a/types/react-icons/lib/io/plus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPlus extends React.Component<IconBaseProps> { }
-export = IoPlus;
diff --git a/types/react-icons/lib/io/podium.d.ts b/types/react-icons/lib/io/podium.d.ts
deleted file mode 100644
index a70d220a19..0000000000
--- a/types/react-icons/lib/io/podium.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPodium extends React.Component<IconBaseProps> { }
-export = IoPodium;
diff --git a/types/react-icons/lib/io/pound.d.ts b/types/react-icons/lib/io/pound.d.ts
deleted file mode 100644
index ba114f6220..0000000000
--- a/types/react-icons/lib/io/pound.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPound extends React.Component<IconBaseProps> { }
-export = IoPound;
diff --git a/types/react-icons/lib/io/power.d.ts b/types/react-icons/lib/io/power.d.ts
deleted file mode 100644
index 72880af810..0000000000
--- a/types/react-icons/lib/io/power.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPower extends React.Component<IconBaseProps> { }
-export = IoPower;
diff --git a/types/react-icons/lib/io/pricetag.d.ts b/types/react-icons/lib/io/pricetag.d.ts
deleted file mode 100644
index c299d0f349..0000000000
--- a/types/react-icons/lib/io/pricetag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPricetag extends React.Component<IconBaseProps> { }
-export = IoPricetag;
diff --git a/types/react-icons/lib/io/pricetags.d.ts b/types/react-icons/lib/io/pricetags.d.ts
deleted file mode 100644
index 5e778059b6..0000000000
--- a/types/react-icons/lib/io/pricetags.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPricetags extends React.Component<IconBaseProps> { }
-export = IoPricetags;
diff --git a/types/react-icons/lib/io/printer.d.ts b/types/react-icons/lib/io/printer.d.ts
deleted file mode 100644
index 66de49844e..0000000000
--- a/types/react-icons/lib/io/printer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPrinter extends React.Component<IconBaseProps> { }
-export = IoPrinter;
diff --git a/types/react-icons/lib/io/pull-request.d.ts b/types/react-icons/lib/io/pull-request.d.ts
deleted file mode 100644
index 2bda8d4ff5..0000000000
--- a/types/react-icons/lib/io/pull-request.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoPullRequest extends React.Component<IconBaseProps> { }
-export = IoPullRequest;
diff --git a/types/react-icons/lib/io/qr-scanner.d.ts b/types/react-icons/lib/io/qr-scanner.d.ts
deleted file mode 100644
index 1734d537a7..0000000000
--- a/types/react-icons/lib/io/qr-scanner.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoQrScanner extends React.Component<IconBaseProps> { }
-export = IoQrScanner;
diff --git a/types/react-icons/lib/io/quote.d.ts b/types/react-icons/lib/io/quote.d.ts
deleted file mode 100644
index 36bb47931e..0000000000
--- a/types/react-icons/lib/io/quote.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoQuote extends React.Component<IconBaseProps> { }
-export = IoQuote;
diff --git a/types/react-icons/lib/io/radio-waves.d.ts b/types/react-icons/lib/io/radio-waves.d.ts
deleted file mode 100644
index a09c89c0bb..0000000000
--- a/types/react-icons/lib/io/radio-waves.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoRadioWaves extends React.Component<IconBaseProps> { }
-export = IoRadioWaves;
diff --git a/types/react-icons/lib/io/record.d.ts b/types/react-icons/lib/io/record.d.ts
deleted file mode 100644
index 9ed9157ee8..0000000000
--- a/types/react-icons/lib/io/record.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoRecord extends React.Component<IconBaseProps> { }
-export = IoRecord;
diff --git a/types/react-icons/lib/io/refresh.d.ts b/types/react-icons/lib/io/refresh.d.ts
deleted file mode 100644
index 5a3668089b..0000000000
--- a/types/react-icons/lib/io/refresh.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoRefresh extends React.Component<IconBaseProps> { }
-export = IoRefresh;
diff --git a/types/react-icons/lib/io/reply-all.d.ts b/types/react-icons/lib/io/reply-all.d.ts
deleted file mode 100644
index 2028b2e6cb..0000000000
--- a/types/react-icons/lib/io/reply-all.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoReplyAll extends React.Component<IconBaseProps> { }
-export = IoReplyAll;
diff --git a/types/react-icons/lib/io/reply.d.ts b/types/react-icons/lib/io/reply.d.ts
deleted file mode 100644
index d17492f2d7..0000000000
--- a/types/react-icons/lib/io/reply.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoReply extends React.Component<IconBaseProps> { }
-export = IoReply;
diff --git a/types/react-icons/lib/io/ribbon-a.d.ts b/types/react-icons/lib/io/ribbon-a.d.ts
deleted file mode 100644
index 16d6520b4a..0000000000
--- a/types/react-icons/lib/io/ribbon-a.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoRibbonA extends React.Component<IconBaseProps> { }
-export = IoRibbonA;
diff --git a/types/react-icons/lib/io/ribbon-b.d.ts b/types/react-icons/lib/io/ribbon-b.d.ts
deleted file mode 100644
index 1bdaef9e6d..0000000000
--- a/types/react-icons/lib/io/ribbon-b.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoRibbonB extends React.Component<IconBaseProps> { }
-export = IoRibbonB;
diff --git a/types/react-icons/lib/io/sad-outline.d.ts b/types/react-icons/lib/io/sad-outline.d.ts
deleted file mode 100644
index edc818e119..0000000000
--- a/types/react-icons/lib/io/sad-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSadOutline extends React.Component<IconBaseProps> { }
-export = IoSadOutline;
diff --git a/types/react-icons/lib/io/sad.d.ts b/types/react-icons/lib/io/sad.d.ts
deleted file mode 100644
index 4faba53e28..0000000000
--- a/types/react-icons/lib/io/sad.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSad extends React.Component<IconBaseProps> { }
-export = IoSad;
diff --git a/types/react-icons/lib/io/scissors.d.ts b/types/react-icons/lib/io/scissors.d.ts
deleted file mode 100644
index 65b7062b84..0000000000
--- a/types/react-icons/lib/io/scissors.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoScissors extends React.Component<IconBaseProps> { }
-export = IoScissors;
diff --git a/types/react-icons/lib/io/search.d.ts b/types/react-icons/lib/io/search.d.ts
deleted file mode 100644
index 0d4e410433..0000000000
--- a/types/react-icons/lib/io/search.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSearch extends React.Component<IconBaseProps> { }
-export = IoSearch;
diff --git a/types/react-icons/lib/io/settings.d.ts b/types/react-icons/lib/io/settings.d.ts
deleted file mode 100644
index 3c592c9f8c..0000000000
--- a/types/react-icons/lib/io/settings.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSettings extends React.Component<IconBaseProps> { }
-export = IoSettings;
diff --git a/types/react-icons/lib/io/share.d.ts b/types/react-icons/lib/io/share.d.ts
deleted file mode 100644
index 24f6f37d6c..0000000000
--- a/types/react-icons/lib/io/share.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoShare extends React.Component<IconBaseProps> { }
-export = IoShare;
diff --git a/types/react-icons/lib/io/shuffle.d.ts b/types/react-icons/lib/io/shuffle.d.ts
deleted file mode 100644
index 736f886ae6..0000000000
--- a/types/react-icons/lib/io/shuffle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoShuffle extends React.Component<IconBaseProps> { }
-export = IoShuffle;
diff --git a/types/react-icons/lib/io/skip-backward.d.ts b/types/react-icons/lib/io/skip-backward.d.ts
deleted file mode 100644
index b7c8e6a960..0000000000
--- a/types/react-icons/lib/io/skip-backward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSkipBackward extends React.Component<IconBaseProps> { }
-export = IoSkipBackward;
diff --git a/types/react-icons/lib/io/skip-forward.d.ts b/types/react-icons/lib/io/skip-forward.d.ts
deleted file mode 100644
index 0c8929e560..0000000000
--- a/types/react-icons/lib/io/skip-forward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSkipForward extends React.Component<IconBaseProps> { }
-export = IoSkipForward;
diff --git a/types/react-icons/lib/io/social-android-outline.d.ts b/types/react-icons/lib/io/social-android-outline.d.ts
deleted file mode 100644
index b770166e4a..0000000000
--- a/types/react-icons/lib/io/social-android-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialAndroidOutline extends React.Component<IconBaseProps> { }
-export = IoSocialAndroidOutline;
diff --git a/types/react-icons/lib/io/social-android.d.ts b/types/react-icons/lib/io/social-android.d.ts
deleted file mode 100644
index 6b03edee68..0000000000
--- a/types/react-icons/lib/io/social-android.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialAndroid extends React.Component<IconBaseProps> { }
-export = IoSocialAndroid;
diff --git a/types/react-icons/lib/io/social-angular-outline.d.ts b/types/react-icons/lib/io/social-angular-outline.d.ts
deleted file mode 100644
index 92bbacb5e4..0000000000
--- a/types/react-icons/lib/io/social-angular-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialAngularOutline extends React.Component<IconBaseProps> { }
-export = IoSocialAngularOutline;
diff --git a/types/react-icons/lib/io/social-angular.d.ts b/types/react-icons/lib/io/social-angular.d.ts
deleted file mode 100644
index 75eaa9c70b..0000000000
--- a/types/react-icons/lib/io/social-angular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialAngular extends React.Component<IconBaseProps> { }
-export = IoSocialAngular;
diff --git a/types/react-icons/lib/io/social-apple-outline.d.ts b/types/react-icons/lib/io/social-apple-outline.d.ts
deleted file mode 100644
index d639a99fcf..0000000000
--- a/types/react-icons/lib/io/social-apple-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialAppleOutline extends React.Component<IconBaseProps> { }
-export = IoSocialAppleOutline;
diff --git a/types/react-icons/lib/io/social-apple.d.ts b/types/react-icons/lib/io/social-apple.d.ts
deleted file mode 100644
index b10067260f..0000000000
--- a/types/react-icons/lib/io/social-apple.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialApple extends React.Component<IconBaseProps> { }
-export = IoSocialApple;
diff --git a/types/react-icons/lib/io/social-bitcoin-outline.d.ts b/types/react-icons/lib/io/social-bitcoin-outline.d.ts
deleted file mode 100644
index de7c72ef7c..0000000000
--- a/types/react-icons/lib/io/social-bitcoin-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialBitcoinOutline extends React.Component<IconBaseProps> { }
-export = IoSocialBitcoinOutline;
diff --git a/types/react-icons/lib/io/social-bitcoin.d.ts b/types/react-icons/lib/io/social-bitcoin.d.ts
deleted file mode 100644
index 3e606a8d6a..0000000000
--- a/types/react-icons/lib/io/social-bitcoin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialBitcoin extends React.Component<IconBaseProps> { }
-export = IoSocialBitcoin;
diff --git a/types/react-icons/lib/io/social-buffer-outline.d.ts b/types/react-icons/lib/io/social-buffer-outline.d.ts
deleted file mode 100644
index 7bdcf075eb..0000000000
--- a/types/react-icons/lib/io/social-buffer-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialBufferOutline extends React.Component<IconBaseProps> { }
-export = IoSocialBufferOutline;
diff --git a/types/react-icons/lib/io/social-buffer.d.ts b/types/react-icons/lib/io/social-buffer.d.ts
deleted file mode 100644
index 93858b6544..0000000000
--- a/types/react-icons/lib/io/social-buffer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialBuffer extends React.Component<IconBaseProps> { }
-export = IoSocialBuffer;
diff --git a/types/react-icons/lib/io/social-chrome-outline.d.ts b/types/react-icons/lib/io/social-chrome-outline.d.ts
deleted file mode 100644
index 3f36d316e1..0000000000
--- a/types/react-icons/lib/io/social-chrome-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialChromeOutline extends React.Component<IconBaseProps> { }
-export = IoSocialChromeOutline;
diff --git a/types/react-icons/lib/io/social-chrome.d.ts b/types/react-icons/lib/io/social-chrome.d.ts
deleted file mode 100644
index bad155a65a..0000000000
--- a/types/react-icons/lib/io/social-chrome.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialChrome extends React.Component<IconBaseProps> { }
-export = IoSocialChrome;
diff --git a/types/react-icons/lib/io/social-codepen-outline.d.ts b/types/react-icons/lib/io/social-codepen-outline.d.ts
deleted file mode 100644
index a4e6ef6f98..0000000000
--- a/types/react-icons/lib/io/social-codepen-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialCodepenOutline extends React.Component<IconBaseProps> { }
-export = IoSocialCodepenOutline;
diff --git a/types/react-icons/lib/io/social-codepen.d.ts b/types/react-icons/lib/io/social-codepen.d.ts
deleted file mode 100644
index ce7a689c2a..0000000000
--- a/types/react-icons/lib/io/social-codepen.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialCodepen extends React.Component<IconBaseProps> { }
-export = IoSocialCodepen;
diff --git a/types/react-icons/lib/io/social-css3-outline.d.ts b/types/react-icons/lib/io/social-css3-outline.d.ts
deleted file mode 100644
index 3a981b6d4c..0000000000
--- a/types/react-icons/lib/io/social-css3-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialCss3Outline extends React.Component<IconBaseProps> { }
-export = IoSocialCss3Outline;
diff --git a/types/react-icons/lib/io/social-css3.d.ts b/types/react-icons/lib/io/social-css3.d.ts
deleted file mode 100644
index df43ca86cf..0000000000
--- a/types/react-icons/lib/io/social-css3.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialCss3 extends React.Component<IconBaseProps> { }
-export = IoSocialCss3;
diff --git a/types/react-icons/lib/io/social-designernews-outline.d.ts b/types/react-icons/lib/io/social-designernews-outline.d.ts
deleted file mode 100644
index d791b282e2..0000000000
--- a/types/react-icons/lib/io/social-designernews-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialDesignernewsOutline extends React.Component<IconBaseProps> { }
-export = IoSocialDesignernewsOutline;
diff --git a/types/react-icons/lib/io/social-designernews.d.ts b/types/react-icons/lib/io/social-designernews.d.ts
deleted file mode 100644
index 0e462c6530..0000000000
--- a/types/react-icons/lib/io/social-designernews.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialDesignernews extends React.Component<IconBaseProps> { }
-export = IoSocialDesignernews;
diff --git a/types/react-icons/lib/io/social-dribbble-outline.d.ts b/types/react-icons/lib/io/social-dribbble-outline.d.ts
deleted file mode 100644
index fd75f5a0c3..0000000000
--- a/types/react-icons/lib/io/social-dribbble-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialDribbbleOutline extends React.Component<IconBaseProps> { }
-export = IoSocialDribbbleOutline;
diff --git a/types/react-icons/lib/io/social-dribbble.d.ts b/types/react-icons/lib/io/social-dribbble.d.ts
deleted file mode 100644
index d239900650..0000000000
--- a/types/react-icons/lib/io/social-dribbble.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialDribbble extends React.Component<IconBaseProps> { }
-export = IoSocialDribbble;
diff --git a/types/react-icons/lib/io/social-dropbox-outline.d.ts b/types/react-icons/lib/io/social-dropbox-outline.d.ts
deleted file mode 100644
index d57fc423a5..0000000000
--- a/types/react-icons/lib/io/social-dropbox-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialDropboxOutline extends React.Component<IconBaseProps> { }
-export = IoSocialDropboxOutline;
diff --git a/types/react-icons/lib/io/social-dropbox.d.ts b/types/react-icons/lib/io/social-dropbox.d.ts
deleted file mode 100644
index d689170efd..0000000000
--- a/types/react-icons/lib/io/social-dropbox.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialDropbox extends React.Component<IconBaseProps> { }
-export = IoSocialDropbox;
diff --git a/types/react-icons/lib/io/social-euro-outline.d.ts b/types/react-icons/lib/io/social-euro-outline.d.ts
deleted file mode 100644
index 6fefc18caa..0000000000
--- a/types/react-icons/lib/io/social-euro-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialEuroOutline extends React.Component<IconBaseProps> { }
-export = IoSocialEuroOutline;
diff --git a/types/react-icons/lib/io/social-euro.d.ts b/types/react-icons/lib/io/social-euro.d.ts
deleted file mode 100644
index 36ae7c5e8b..0000000000
--- a/types/react-icons/lib/io/social-euro.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialEuro extends React.Component<IconBaseProps> { }
-export = IoSocialEuro;
diff --git a/types/react-icons/lib/io/social-facebook-outline.d.ts b/types/react-icons/lib/io/social-facebook-outline.d.ts
deleted file mode 100644
index 69cd8a1a00..0000000000
--- a/types/react-icons/lib/io/social-facebook-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialFacebookOutline extends React.Component<IconBaseProps> { }
-export = IoSocialFacebookOutline;
diff --git a/types/react-icons/lib/io/social-facebook.d.ts b/types/react-icons/lib/io/social-facebook.d.ts
deleted file mode 100644
index 1b2caa8312..0000000000
--- a/types/react-icons/lib/io/social-facebook.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialFacebook extends React.Component<IconBaseProps> { }
-export = IoSocialFacebook;
diff --git a/types/react-icons/lib/io/social-foursquare-outline.d.ts b/types/react-icons/lib/io/social-foursquare-outline.d.ts
deleted file mode 100644
index 536f829ff0..0000000000
--- a/types/react-icons/lib/io/social-foursquare-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialFoursquareOutline extends React.Component<IconBaseProps> { }
-export = IoSocialFoursquareOutline;
diff --git a/types/react-icons/lib/io/social-foursquare.d.ts b/types/react-icons/lib/io/social-foursquare.d.ts
deleted file mode 100644
index c83428b66d..0000000000
--- a/types/react-icons/lib/io/social-foursquare.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialFoursquare extends React.Component<IconBaseProps> { }
-export = IoSocialFoursquare;
diff --git a/types/react-icons/lib/io/social-freebsd-devil.d.ts b/types/react-icons/lib/io/social-freebsd-devil.d.ts
deleted file mode 100644
index 4f614b2950..0000000000
--- a/types/react-icons/lib/io/social-freebsd-devil.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialFreebsdDevil extends React.Component<IconBaseProps> { }
-export = IoSocialFreebsdDevil;
diff --git a/types/react-icons/lib/io/social-github-outline.d.ts b/types/react-icons/lib/io/social-github-outline.d.ts
deleted file mode 100644
index 23f4729b8b..0000000000
--- a/types/react-icons/lib/io/social-github-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialGithubOutline extends React.Component<IconBaseProps> { }
-export = IoSocialGithubOutline;
diff --git a/types/react-icons/lib/io/social-github.d.ts b/types/react-icons/lib/io/social-github.d.ts
deleted file mode 100644
index 037f125cdd..0000000000
--- a/types/react-icons/lib/io/social-github.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialGithub extends React.Component<IconBaseProps> { }
-export = IoSocialGithub;
diff --git a/types/react-icons/lib/io/social-google-outline.d.ts b/types/react-icons/lib/io/social-google-outline.d.ts
deleted file mode 100644
index 42dc6df13b..0000000000
--- a/types/react-icons/lib/io/social-google-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialGoogleOutline extends React.Component<IconBaseProps> { }
-export = IoSocialGoogleOutline;
diff --git a/types/react-icons/lib/io/social-google.d.ts b/types/react-icons/lib/io/social-google.d.ts
deleted file mode 100644
index c6468168bc..0000000000
--- a/types/react-icons/lib/io/social-google.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialGoogle extends React.Component<IconBaseProps> { }
-export = IoSocialGoogle;
diff --git a/types/react-icons/lib/io/social-googleplus-outline.d.ts b/types/react-icons/lib/io/social-googleplus-outline.d.ts
deleted file mode 100644
index 7aed37c1c7..0000000000
--- a/types/react-icons/lib/io/social-googleplus-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialGoogleplusOutline extends React.Component<IconBaseProps> { }
-export = IoSocialGoogleplusOutline;
diff --git a/types/react-icons/lib/io/social-googleplus.d.ts b/types/react-icons/lib/io/social-googleplus.d.ts
deleted file mode 100644
index 563d63e295..0000000000
--- a/types/react-icons/lib/io/social-googleplus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialGoogleplus extends React.Component<IconBaseProps> { }
-export = IoSocialGoogleplus;
diff --git a/types/react-icons/lib/io/social-hackernews-outline.d.ts b/types/react-icons/lib/io/social-hackernews-outline.d.ts
deleted file mode 100644
index 5e39b1b57c..0000000000
--- a/types/react-icons/lib/io/social-hackernews-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialHackernewsOutline extends React.Component<IconBaseProps> { }
-export = IoSocialHackernewsOutline;
diff --git a/types/react-icons/lib/io/social-hackernews.d.ts b/types/react-icons/lib/io/social-hackernews.d.ts
deleted file mode 100644
index af96aadf02..0000000000
--- a/types/react-icons/lib/io/social-hackernews.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialHackernews extends React.Component<IconBaseProps> { }
-export = IoSocialHackernews;
diff --git a/types/react-icons/lib/io/social-html5-outline.d.ts b/types/react-icons/lib/io/social-html5-outline.d.ts
deleted file mode 100644
index c6155c0329..0000000000
--- a/types/react-icons/lib/io/social-html5-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialHtml5Outline extends React.Component<IconBaseProps> { }
-export = IoSocialHtml5Outline;
diff --git a/types/react-icons/lib/io/social-html5.d.ts b/types/react-icons/lib/io/social-html5.d.ts
deleted file mode 100644
index 1a464134d6..0000000000
--- a/types/react-icons/lib/io/social-html5.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialHtml5 extends React.Component<IconBaseProps> { }
-export = IoSocialHtml5;
diff --git a/types/react-icons/lib/io/social-instagram-outline.d.ts b/types/react-icons/lib/io/social-instagram-outline.d.ts
deleted file mode 100644
index 74d5470441..0000000000
--- a/types/react-icons/lib/io/social-instagram-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialInstagramOutline extends React.Component<IconBaseProps> { }
-export = IoSocialInstagramOutline;
diff --git a/types/react-icons/lib/io/social-instagram.d.ts b/types/react-icons/lib/io/social-instagram.d.ts
deleted file mode 100644
index 5bc5559afa..0000000000
--- a/types/react-icons/lib/io/social-instagram.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialInstagram extends React.Component<IconBaseProps> { }
-export = IoSocialInstagram;
diff --git a/types/react-icons/lib/io/social-javascript-outline.d.ts b/types/react-icons/lib/io/social-javascript-outline.d.ts
deleted file mode 100644
index 82e903167b..0000000000
--- a/types/react-icons/lib/io/social-javascript-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialJavascriptOutline extends React.Component<IconBaseProps> { }
-export = IoSocialJavascriptOutline;
diff --git a/types/react-icons/lib/io/social-javascript.d.ts b/types/react-icons/lib/io/social-javascript.d.ts
deleted file mode 100644
index ee2c338e4d..0000000000
--- a/types/react-icons/lib/io/social-javascript.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialJavascript extends React.Component<IconBaseProps> { }
-export = IoSocialJavascript;
diff --git a/types/react-icons/lib/io/social-linkedin-outline.d.ts b/types/react-icons/lib/io/social-linkedin-outline.d.ts
deleted file mode 100644
index 546fd5fb48..0000000000
--- a/types/react-icons/lib/io/social-linkedin-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialLinkedinOutline extends React.Component<IconBaseProps> { }
-export = IoSocialLinkedinOutline;
diff --git a/types/react-icons/lib/io/social-linkedin.d.ts b/types/react-icons/lib/io/social-linkedin.d.ts
deleted file mode 100644
index 495cdcb265..0000000000
--- a/types/react-icons/lib/io/social-linkedin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialLinkedin extends React.Component<IconBaseProps> { }
-export = IoSocialLinkedin;
diff --git a/types/react-icons/lib/io/social-markdown.d.ts b/types/react-icons/lib/io/social-markdown.d.ts
deleted file mode 100644
index 0a24e7e4f2..0000000000
--- a/types/react-icons/lib/io/social-markdown.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialMarkdown extends React.Component<IconBaseProps> { }
-export = IoSocialMarkdown;
diff --git a/types/react-icons/lib/io/social-nodejs.d.ts b/types/react-icons/lib/io/social-nodejs.d.ts
deleted file mode 100644
index f49182ef27..0000000000
--- a/types/react-icons/lib/io/social-nodejs.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialNodejs extends React.Component<IconBaseProps> { }
-export = IoSocialNodejs;
diff --git a/types/react-icons/lib/io/social-octocat.d.ts b/types/react-icons/lib/io/social-octocat.d.ts
deleted file mode 100644
index dbba07c262..0000000000
--- a/types/react-icons/lib/io/social-octocat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialOctocat extends React.Component<IconBaseProps> { }
-export = IoSocialOctocat;
diff --git a/types/react-icons/lib/io/social-pinterest-outline.d.ts b/types/react-icons/lib/io/social-pinterest-outline.d.ts
deleted file mode 100644
index 8890d054cd..0000000000
--- a/types/react-icons/lib/io/social-pinterest-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialPinterestOutline extends React.Component<IconBaseProps> { }
-export = IoSocialPinterestOutline;
diff --git a/types/react-icons/lib/io/social-pinterest.d.ts b/types/react-icons/lib/io/social-pinterest.d.ts
deleted file mode 100644
index 4d678c979e..0000000000
--- a/types/react-icons/lib/io/social-pinterest.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialPinterest extends React.Component<IconBaseProps> { }
-export = IoSocialPinterest;
diff --git a/types/react-icons/lib/io/social-python.d.ts b/types/react-icons/lib/io/social-python.d.ts
deleted file mode 100644
index ad63062786..0000000000
--- a/types/react-icons/lib/io/social-python.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialPython extends React.Component<IconBaseProps> { }
-export = IoSocialPython;
diff --git a/types/react-icons/lib/io/social-reddit-outline.d.ts b/types/react-icons/lib/io/social-reddit-outline.d.ts
deleted file mode 100644
index a02958937d..0000000000
--- a/types/react-icons/lib/io/social-reddit-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialRedditOutline extends React.Component<IconBaseProps> { }
-export = IoSocialRedditOutline;
diff --git a/types/react-icons/lib/io/social-reddit.d.ts b/types/react-icons/lib/io/social-reddit.d.ts
deleted file mode 100644
index f52f5669fb..0000000000
--- a/types/react-icons/lib/io/social-reddit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialReddit extends React.Component<IconBaseProps> { }
-export = IoSocialReddit;
diff --git a/types/react-icons/lib/io/social-rss-outline.d.ts b/types/react-icons/lib/io/social-rss-outline.d.ts
deleted file mode 100644
index f6a65f1868..0000000000
--- a/types/react-icons/lib/io/social-rss-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialRssOutline extends React.Component<IconBaseProps> { }
-export = IoSocialRssOutline;
diff --git a/types/react-icons/lib/io/social-rss.d.ts b/types/react-icons/lib/io/social-rss.d.ts
deleted file mode 100644
index b605db06e4..0000000000
--- a/types/react-icons/lib/io/social-rss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialRss extends React.Component<IconBaseProps> { }
-export = IoSocialRss;
diff --git a/types/react-icons/lib/io/social-sass.d.ts b/types/react-icons/lib/io/social-sass.d.ts
deleted file mode 100644
index 3c5e724877..0000000000
--- a/types/react-icons/lib/io/social-sass.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialSass extends React.Component<IconBaseProps> { }
-export = IoSocialSass;
diff --git a/types/react-icons/lib/io/social-skype-outline.d.ts b/types/react-icons/lib/io/social-skype-outline.d.ts
deleted file mode 100644
index 8a3f01062b..0000000000
--- a/types/react-icons/lib/io/social-skype-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialSkypeOutline extends React.Component<IconBaseProps> { }
-export = IoSocialSkypeOutline;
diff --git a/types/react-icons/lib/io/social-skype.d.ts b/types/react-icons/lib/io/social-skype.d.ts
deleted file mode 100644
index 3c865dfde7..0000000000
--- a/types/react-icons/lib/io/social-skype.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialSkype extends React.Component<IconBaseProps> { }
-export = IoSocialSkype;
diff --git a/types/react-icons/lib/io/social-snapchat-outline.d.ts b/types/react-icons/lib/io/social-snapchat-outline.d.ts
deleted file mode 100644
index 7a9e2ded8f..0000000000
--- a/types/react-icons/lib/io/social-snapchat-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialSnapchatOutline extends React.Component<IconBaseProps> { }
-export = IoSocialSnapchatOutline;
diff --git a/types/react-icons/lib/io/social-snapchat.d.ts b/types/react-icons/lib/io/social-snapchat.d.ts
deleted file mode 100644
index a4485fde56..0000000000
--- a/types/react-icons/lib/io/social-snapchat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialSnapchat extends React.Component<IconBaseProps> { }
-export = IoSocialSnapchat;
diff --git a/types/react-icons/lib/io/social-tumblr-outline.d.ts b/types/react-icons/lib/io/social-tumblr-outline.d.ts
deleted file mode 100644
index 6d7e99cd46..0000000000
--- a/types/react-icons/lib/io/social-tumblr-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialTumblrOutline extends React.Component<IconBaseProps> { }
-export = IoSocialTumblrOutline;
diff --git a/types/react-icons/lib/io/social-tumblr.d.ts b/types/react-icons/lib/io/social-tumblr.d.ts
deleted file mode 100644
index 16485cdbf6..0000000000
--- a/types/react-icons/lib/io/social-tumblr.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialTumblr extends React.Component<IconBaseProps> { }
-export = IoSocialTumblr;
diff --git a/types/react-icons/lib/io/social-tux.d.ts b/types/react-icons/lib/io/social-tux.d.ts
deleted file mode 100644
index 68d6a6787e..0000000000
--- a/types/react-icons/lib/io/social-tux.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialTux extends React.Component<IconBaseProps> { }
-export = IoSocialTux;
diff --git a/types/react-icons/lib/io/social-twitch-outline.d.ts b/types/react-icons/lib/io/social-twitch-outline.d.ts
deleted file mode 100644
index 0639dc5552..0000000000
--- a/types/react-icons/lib/io/social-twitch-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialTwitchOutline extends React.Component<IconBaseProps> { }
-export = IoSocialTwitchOutline;
diff --git a/types/react-icons/lib/io/social-twitch.d.ts b/types/react-icons/lib/io/social-twitch.d.ts
deleted file mode 100644
index e62fbcda60..0000000000
--- a/types/react-icons/lib/io/social-twitch.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialTwitch extends React.Component<IconBaseProps> { }
-export = IoSocialTwitch;
diff --git a/types/react-icons/lib/io/social-twitter-outline.d.ts b/types/react-icons/lib/io/social-twitter-outline.d.ts
deleted file mode 100644
index cc296a9604..0000000000
--- a/types/react-icons/lib/io/social-twitter-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialTwitterOutline extends React.Component<IconBaseProps> { }
-export = IoSocialTwitterOutline;
diff --git a/types/react-icons/lib/io/social-twitter.d.ts b/types/react-icons/lib/io/social-twitter.d.ts
deleted file mode 100644
index 9a6316e86e..0000000000
--- a/types/react-icons/lib/io/social-twitter.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialTwitter extends React.Component<IconBaseProps> { }
-export = IoSocialTwitter;
diff --git a/types/react-icons/lib/io/social-usd-outline.d.ts b/types/react-icons/lib/io/social-usd-outline.d.ts
deleted file mode 100644
index 94a304538b..0000000000
--- a/types/react-icons/lib/io/social-usd-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialUsdOutline extends React.Component<IconBaseProps> { }
-export = IoSocialUsdOutline;
diff --git a/types/react-icons/lib/io/social-usd.d.ts b/types/react-icons/lib/io/social-usd.d.ts
deleted file mode 100644
index 31bff60cbf..0000000000
--- a/types/react-icons/lib/io/social-usd.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialUsd extends React.Component<IconBaseProps> { }
-export = IoSocialUsd;
diff --git a/types/react-icons/lib/io/social-vimeo-outline.d.ts b/types/react-icons/lib/io/social-vimeo-outline.d.ts
deleted file mode 100644
index 3881531895..0000000000
--- a/types/react-icons/lib/io/social-vimeo-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialVimeoOutline extends React.Component<IconBaseProps> { }
-export = IoSocialVimeoOutline;
diff --git a/types/react-icons/lib/io/social-vimeo.d.ts b/types/react-icons/lib/io/social-vimeo.d.ts
deleted file mode 100644
index 2c6f6f91ef..0000000000
--- a/types/react-icons/lib/io/social-vimeo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialVimeo extends React.Component<IconBaseProps> { }
-export = IoSocialVimeo;
diff --git a/types/react-icons/lib/io/social-whatsapp-outline.d.ts b/types/react-icons/lib/io/social-whatsapp-outline.d.ts
deleted file mode 100644
index c6f93dbc26..0000000000
--- a/types/react-icons/lib/io/social-whatsapp-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialWhatsappOutline extends React.Component<IconBaseProps> { }
-export = IoSocialWhatsappOutline;
diff --git a/types/react-icons/lib/io/social-whatsapp.d.ts b/types/react-icons/lib/io/social-whatsapp.d.ts
deleted file mode 100644
index a89d97fb8a..0000000000
--- a/types/react-icons/lib/io/social-whatsapp.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialWhatsapp extends React.Component<IconBaseProps> { }
-export = IoSocialWhatsapp;
diff --git a/types/react-icons/lib/io/social-windows-outline.d.ts b/types/react-icons/lib/io/social-windows-outline.d.ts
deleted file mode 100644
index 59e54299d1..0000000000
--- a/types/react-icons/lib/io/social-windows-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialWindowsOutline extends React.Component<IconBaseProps> { }
-export = IoSocialWindowsOutline;
diff --git a/types/react-icons/lib/io/social-windows.d.ts b/types/react-icons/lib/io/social-windows.d.ts
deleted file mode 100644
index 3ee6ad9bd1..0000000000
--- a/types/react-icons/lib/io/social-windows.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialWindows extends React.Component<IconBaseProps> { }
-export = IoSocialWindows;
diff --git a/types/react-icons/lib/io/social-wordpress-outline.d.ts b/types/react-icons/lib/io/social-wordpress-outline.d.ts
deleted file mode 100644
index 87bb1b446d..0000000000
--- a/types/react-icons/lib/io/social-wordpress-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialWordpressOutline extends React.Component<IconBaseProps> { }
-export = IoSocialWordpressOutline;
diff --git a/types/react-icons/lib/io/social-wordpress.d.ts b/types/react-icons/lib/io/social-wordpress.d.ts
deleted file mode 100644
index 5b0f9037b6..0000000000
--- a/types/react-icons/lib/io/social-wordpress.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialWordpress extends React.Component<IconBaseProps> { }
-export = IoSocialWordpress;
diff --git a/types/react-icons/lib/io/social-yahoo-outline.d.ts b/types/react-icons/lib/io/social-yahoo-outline.d.ts
deleted file mode 100644
index 97fd9f19bd..0000000000
--- a/types/react-icons/lib/io/social-yahoo-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialYahooOutline extends React.Component<IconBaseProps> { }
-export = IoSocialYahooOutline;
diff --git a/types/react-icons/lib/io/social-yahoo.d.ts b/types/react-icons/lib/io/social-yahoo.d.ts
deleted file mode 100644
index 5af9daf8ae..0000000000
--- a/types/react-icons/lib/io/social-yahoo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialYahoo extends React.Component<IconBaseProps> { }
-export = IoSocialYahoo;
diff --git a/types/react-icons/lib/io/social-yen-outline.d.ts b/types/react-icons/lib/io/social-yen-outline.d.ts
deleted file mode 100644
index 7b4afff62d..0000000000
--- a/types/react-icons/lib/io/social-yen-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialYenOutline extends React.Component<IconBaseProps> { }
-export = IoSocialYenOutline;
diff --git a/types/react-icons/lib/io/social-yen.d.ts b/types/react-icons/lib/io/social-yen.d.ts
deleted file mode 100644
index 97909d13f6..0000000000
--- a/types/react-icons/lib/io/social-yen.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialYen extends React.Component<IconBaseProps> { }
-export = IoSocialYen;
diff --git a/types/react-icons/lib/io/social-youtube-outline.d.ts b/types/react-icons/lib/io/social-youtube-outline.d.ts
deleted file mode 100644
index 6395697460..0000000000
--- a/types/react-icons/lib/io/social-youtube-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialYoutubeOutline extends React.Component<IconBaseProps> { }
-export = IoSocialYoutubeOutline;
diff --git a/types/react-icons/lib/io/social-youtube.d.ts b/types/react-icons/lib/io/social-youtube.d.ts
deleted file mode 100644
index 18df52b892..0000000000
--- a/types/react-icons/lib/io/social-youtube.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSocialYoutube extends React.Component<IconBaseProps> { }
-export = IoSocialYoutube;
diff --git a/types/react-icons/lib/io/soup-can-outline.d.ts b/types/react-icons/lib/io/soup-can-outline.d.ts
deleted file mode 100644
index 3f06093398..0000000000
--- a/types/react-icons/lib/io/soup-can-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSoupCanOutline extends React.Component<IconBaseProps> { }
-export = IoSoupCanOutline;
diff --git a/types/react-icons/lib/io/soup-can.d.ts b/types/react-icons/lib/io/soup-can.d.ts
deleted file mode 100644
index c2bf15731b..0000000000
--- a/types/react-icons/lib/io/soup-can.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSoupCan extends React.Component<IconBaseProps> { }
-export = IoSoupCan;
diff --git a/types/react-icons/lib/io/speakerphone.d.ts b/types/react-icons/lib/io/speakerphone.d.ts
deleted file mode 100644
index 780c4002fd..0000000000
--- a/types/react-icons/lib/io/speakerphone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSpeakerphone extends React.Component<IconBaseProps> { }
-export = IoSpeakerphone;
diff --git a/types/react-icons/lib/io/speedometer.d.ts b/types/react-icons/lib/io/speedometer.d.ts
deleted file mode 100644
index cfa16db12d..0000000000
--- a/types/react-icons/lib/io/speedometer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSpeedometer extends React.Component<IconBaseProps> { }
-export = IoSpeedometer;
diff --git a/types/react-icons/lib/io/spoon.d.ts b/types/react-icons/lib/io/spoon.d.ts
deleted file mode 100644
index d3ab8e61d0..0000000000
--- a/types/react-icons/lib/io/spoon.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSpoon extends React.Component<IconBaseProps> { }
-export = IoSpoon;
diff --git a/types/react-icons/lib/io/star.d.ts b/types/react-icons/lib/io/star.d.ts
deleted file mode 100644
index 8db2437a5e..0000000000
--- a/types/react-icons/lib/io/star.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoStar extends React.Component<IconBaseProps> { }
-export = IoStar;
diff --git a/types/react-icons/lib/io/stats-bars.d.ts b/types/react-icons/lib/io/stats-bars.d.ts
deleted file mode 100644
index 0a94f74c65..0000000000
--- a/types/react-icons/lib/io/stats-bars.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoStatsBars extends React.Component<IconBaseProps> { }
-export = IoStatsBars;
diff --git a/types/react-icons/lib/io/steam.d.ts b/types/react-icons/lib/io/steam.d.ts
deleted file mode 100644
index be700cdf00..0000000000
--- a/types/react-icons/lib/io/steam.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoSteam extends React.Component<IconBaseProps> { }
-export = IoSteam;
diff --git a/types/react-icons/lib/io/stop.d.ts b/types/react-icons/lib/io/stop.d.ts
deleted file mode 100644
index c2910f1023..0000000000
--- a/types/react-icons/lib/io/stop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoStop extends React.Component<IconBaseProps> { }
-export = IoStop;
diff --git a/types/react-icons/lib/io/thermometer.d.ts b/types/react-icons/lib/io/thermometer.d.ts
deleted file mode 100644
index 978014255d..0000000000
--- a/types/react-icons/lib/io/thermometer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoThermometer extends React.Component<IconBaseProps> { }
-export = IoThermometer;
diff --git a/types/react-icons/lib/io/thumbsdown.d.ts b/types/react-icons/lib/io/thumbsdown.d.ts
deleted file mode 100644
index c1106f88bc..0000000000
--- a/types/react-icons/lib/io/thumbsdown.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoThumbsdown extends React.Component<IconBaseProps> { }
-export = IoThumbsdown;
diff --git a/types/react-icons/lib/io/thumbsup.d.ts b/types/react-icons/lib/io/thumbsup.d.ts
deleted file mode 100644
index a295066207..0000000000
--- a/types/react-icons/lib/io/thumbsup.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoThumbsup extends React.Component<IconBaseProps> { }
-export = IoThumbsup;
diff --git a/types/react-icons/lib/io/toggle-filled.d.ts b/types/react-icons/lib/io/toggle-filled.d.ts
deleted file mode 100644
index 8a97c60a00..0000000000
--- a/types/react-icons/lib/io/toggle-filled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoToggleFilled extends React.Component<IconBaseProps> { }
-export = IoToggleFilled;
diff --git a/types/react-icons/lib/io/toggle.d.ts b/types/react-icons/lib/io/toggle.d.ts
deleted file mode 100644
index b8c2fdb3ff..0000000000
--- a/types/react-icons/lib/io/toggle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoToggle extends React.Component<IconBaseProps> { }
-export = IoToggle;
diff --git a/types/react-icons/lib/io/transgender.d.ts b/types/react-icons/lib/io/transgender.d.ts
deleted file mode 100644
index c1a45e1897..0000000000
--- a/types/react-icons/lib/io/transgender.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoTransgender extends React.Component<IconBaseProps> { }
-export = IoTransgender;
diff --git a/types/react-icons/lib/io/trash-a.d.ts b/types/react-icons/lib/io/trash-a.d.ts
deleted file mode 100644
index 34ab344936..0000000000
--- a/types/react-icons/lib/io/trash-a.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoTrashA extends React.Component<IconBaseProps> { }
-export = IoTrashA;
diff --git a/types/react-icons/lib/io/trash-b.d.ts b/types/react-icons/lib/io/trash-b.d.ts
deleted file mode 100644
index c05cf3253c..0000000000
--- a/types/react-icons/lib/io/trash-b.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoTrashB extends React.Component<IconBaseProps> { }
-export = IoTrashB;
diff --git a/types/react-icons/lib/io/trophy.d.ts b/types/react-icons/lib/io/trophy.d.ts
deleted file mode 100644
index 6dd8ed7039..0000000000
--- a/types/react-icons/lib/io/trophy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoTrophy extends React.Component<IconBaseProps> { }
-export = IoTrophy;
diff --git a/types/react-icons/lib/io/tshirt-outline.d.ts b/types/react-icons/lib/io/tshirt-outline.d.ts
deleted file mode 100644
index 859fc600ab..0000000000
--- a/types/react-icons/lib/io/tshirt-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoTshirtOutline extends React.Component<IconBaseProps> { }
-export = IoTshirtOutline;
diff --git a/types/react-icons/lib/io/tshirt.d.ts b/types/react-icons/lib/io/tshirt.d.ts
deleted file mode 100644
index 5c889dabfa..0000000000
--- a/types/react-icons/lib/io/tshirt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoTshirt extends React.Component<IconBaseProps> { }
-export = IoTshirt;
diff --git a/types/react-icons/lib/io/umbrella.d.ts b/types/react-icons/lib/io/umbrella.d.ts
deleted file mode 100644
index b9311248eb..0000000000
--- a/types/react-icons/lib/io/umbrella.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoUmbrella extends React.Component<IconBaseProps> { }
-export = IoUmbrella;
diff --git a/types/react-icons/lib/io/university.d.ts b/types/react-icons/lib/io/university.d.ts
deleted file mode 100644
index 7f070ad2a9..0000000000
--- a/types/react-icons/lib/io/university.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoUniversity extends React.Component<IconBaseProps> { }
-export = IoUniversity;
diff --git a/types/react-icons/lib/io/unlocked.d.ts b/types/react-icons/lib/io/unlocked.d.ts
deleted file mode 100644
index d1863717f1..0000000000
--- a/types/react-icons/lib/io/unlocked.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoUnlocked extends React.Component<IconBaseProps> { }
-export = IoUnlocked;
diff --git a/types/react-icons/lib/io/upload.d.ts b/types/react-icons/lib/io/upload.d.ts
deleted file mode 100644
index 2e5dfaf390..0000000000
--- a/types/react-icons/lib/io/upload.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoUpload extends React.Component<IconBaseProps> { }
-export = IoUpload;
diff --git a/types/react-icons/lib/io/usb.d.ts b/types/react-icons/lib/io/usb.d.ts
deleted file mode 100644
index 7e15ce6b91..0000000000
--- a/types/react-icons/lib/io/usb.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoUsb extends React.Component<IconBaseProps> { }
-export = IoUsb;
diff --git a/types/react-icons/lib/io/videocamera.d.ts b/types/react-icons/lib/io/videocamera.d.ts
deleted file mode 100644
index b87a08d27e..0000000000
--- a/types/react-icons/lib/io/videocamera.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoVideocamera extends React.Component<IconBaseProps> { }
-export = IoVideocamera;
diff --git a/types/react-icons/lib/io/volume-high.d.ts b/types/react-icons/lib/io/volume-high.d.ts
deleted file mode 100644
index 3778a4f81a..0000000000
--- a/types/react-icons/lib/io/volume-high.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoVolumeHigh extends React.Component<IconBaseProps> { }
-export = IoVolumeHigh;
diff --git a/types/react-icons/lib/io/volume-low.d.ts b/types/react-icons/lib/io/volume-low.d.ts
deleted file mode 100644
index 0850e7f04b..0000000000
--- a/types/react-icons/lib/io/volume-low.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoVolumeLow extends React.Component<IconBaseProps> { }
-export = IoVolumeLow;
diff --git a/types/react-icons/lib/io/volume-medium.d.ts b/types/react-icons/lib/io/volume-medium.d.ts
deleted file mode 100644
index dd63b5957c..0000000000
--- a/types/react-icons/lib/io/volume-medium.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoVolumeMedium extends React.Component<IconBaseProps> { }
-export = IoVolumeMedium;
diff --git a/types/react-icons/lib/io/volume-mute.d.ts b/types/react-icons/lib/io/volume-mute.d.ts
deleted file mode 100644
index 4d515705cd..0000000000
--- a/types/react-icons/lib/io/volume-mute.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoVolumeMute extends React.Component<IconBaseProps> { }
-export = IoVolumeMute;
diff --git a/types/react-icons/lib/io/wand.d.ts b/types/react-icons/lib/io/wand.d.ts
deleted file mode 100644
index 29428f8a3d..0000000000
--- a/types/react-icons/lib/io/wand.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoWand extends React.Component<IconBaseProps> { }
-export = IoWand;
diff --git a/types/react-icons/lib/io/waterdrop.d.ts b/types/react-icons/lib/io/waterdrop.d.ts
deleted file mode 100644
index 503b4fd799..0000000000
--- a/types/react-icons/lib/io/waterdrop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoWaterdrop extends React.Component<IconBaseProps> { }
-export = IoWaterdrop;
diff --git a/types/react-icons/lib/io/wifi.d.ts b/types/react-icons/lib/io/wifi.d.ts
deleted file mode 100644
index 9c8322487a..0000000000
--- a/types/react-icons/lib/io/wifi.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoWifi extends React.Component<IconBaseProps> { }
-export = IoWifi;
diff --git a/types/react-icons/lib/io/wineglass.d.ts b/types/react-icons/lib/io/wineglass.d.ts
deleted file mode 100644
index a7fb1c5520..0000000000
--- a/types/react-icons/lib/io/wineglass.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoWineglass extends React.Component<IconBaseProps> { }
-export = IoWineglass;
diff --git a/types/react-icons/lib/io/woman.d.ts b/types/react-icons/lib/io/woman.d.ts
deleted file mode 100644
index 4d3651cc4c..0000000000
--- a/types/react-icons/lib/io/woman.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoWoman extends React.Component<IconBaseProps> { }
-export = IoWoman;
diff --git a/types/react-icons/lib/io/wrench.d.ts b/types/react-icons/lib/io/wrench.d.ts
deleted file mode 100644
index 74c56ffaa3..0000000000
--- a/types/react-icons/lib/io/wrench.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoWrench extends React.Component<IconBaseProps> { }
-export = IoWrench;
diff --git a/types/react-icons/lib/io/xbox.d.ts b/types/react-icons/lib/io/xbox.d.ts
deleted file mode 100644
index 857e10a0e4..0000000000
--- a/types/react-icons/lib/io/xbox.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class IoXbox extends React.Component<IconBaseProps> { }
-export = IoXbox;
diff --git a/types/react-icons/lib/md/3d-rotation.d.ts b/types/react-icons/lib/md/3d-rotation.d.ts
deleted file mode 100644
index cd124ed1dd..0000000000
--- a/types/react-icons/lib/md/3d-rotation.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class Md3dRotation extends React.Component<IconBaseProps> { }
-export = Md3dRotation;
diff --git a/types/react-icons/lib/md/ac-unit.d.ts b/types/react-icons/lib/md/ac-unit.d.ts
deleted file mode 100644
index e5da2947aa..0000000000
--- a/types/react-icons/lib/md/ac-unit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAcUnit extends React.Component<IconBaseProps> { }
-export = MdAcUnit;
diff --git a/types/react-icons/lib/md/access-alarm.d.ts b/types/react-icons/lib/md/access-alarm.d.ts
deleted file mode 100644
index 7161430611..0000000000
--- a/types/react-icons/lib/md/access-alarm.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAccessAlarm extends React.Component<IconBaseProps> { }
-export = MdAccessAlarm;
diff --git a/types/react-icons/lib/md/access-alarms.d.ts b/types/react-icons/lib/md/access-alarms.d.ts
deleted file mode 100644
index b984a238a4..0000000000
--- a/types/react-icons/lib/md/access-alarms.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAccessAlarms extends React.Component<IconBaseProps> { }
-export = MdAccessAlarms;
diff --git a/types/react-icons/lib/md/access-time.d.ts b/types/react-icons/lib/md/access-time.d.ts
deleted file mode 100644
index bc39504143..0000000000
--- a/types/react-icons/lib/md/access-time.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAccessTime extends React.Component<IconBaseProps> { }
-export = MdAccessTime;
diff --git a/types/react-icons/lib/md/accessibility.d.ts b/types/react-icons/lib/md/accessibility.d.ts
deleted file mode 100644
index 5ba4fd7f45..0000000000
--- a/types/react-icons/lib/md/accessibility.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAccessibility extends React.Component<IconBaseProps> { }
-export = MdAccessibility;
diff --git a/types/react-icons/lib/md/accessible.d.ts b/types/react-icons/lib/md/accessible.d.ts
deleted file mode 100644
index 8ed1603dcb..0000000000
--- a/types/react-icons/lib/md/accessible.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAccessible extends React.Component<IconBaseProps> { }
-export = MdAccessible;
diff --git a/types/react-icons/lib/md/account-balance-wallet.d.ts b/types/react-icons/lib/md/account-balance-wallet.d.ts
deleted file mode 100644
index a6b7794282..0000000000
--- a/types/react-icons/lib/md/account-balance-wallet.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAccountBalanceWallet extends React.Component<IconBaseProps> { }
-export = MdAccountBalanceWallet;
diff --git a/types/react-icons/lib/md/account-balance.d.ts b/types/react-icons/lib/md/account-balance.d.ts
deleted file mode 100644
index e3677c0060..0000000000
--- a/types/react-icons/lib/md/account-balance.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAccountBalance extends React.Component<IconBaseProps> { }
-export = MdAccountBalance;
diff --git a/types/react-icons/lib/md/account-box.d.ts b/types/react-icons/lib/md/account-box.d.ts
deleted file mode 100644
index 4bda5e52b3..0000000000
--- a/types/react-icons/lib/md/account-box.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAccountBox extends React.Component<IconBaseProps> { }
-export = MdAccountBox;
diff --git a/types/react-icons/lib/md/account-circle.d.ts b/types/react-icons/lib/md/account-circle.d.ts
deleted file mode 100644
index fa6f5bba0b..0000000000
--- a/types/react-icons/lib/md/account-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAccountCircle extends React.Component<IconBaseProps> { }
-export = MdAccountCircle;
diff --git a/types/react-icons/lib/md/adb.d.ts b/types/react-icons/lib/md/adb.d.ts
deleted file mode 100644
index b7d64c1770..0000000000
--- a/types/react-icons/lib/md/adb.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAdb extends React.Component<IconBaseProps> { }
-export = MdAdb;
diff --git a/types/react-icons/lib/md/add-a-photo.d.ts b/types/react-icons/lib/md/add-a-photo.d.ts
deleted file mode 100644
index 6cb5e6913e..0000000000
--- a/types/react-icons/lib/md/add-a-photo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAddAPhoto extends React.Component<IconBaseProps> { }
-export = MdAddAPhoto;
diff --git a/types/react-icons/lib/md/add-alarm.d.ts b/types/react-icons/lib/md/add-alarm.d.ts
deleted file mode 100644
index 9c06d74684..0000000000
--- a/types/react-icons/lib/md/add-alarm.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAddAlarm extends React.Component<IconBaseProps> { }
-export = MdAddAlarm;
diff --git a/types/react-icons/lib/md/add-alert.d.ts b/types/react-icons/lib/md/add-alert.d.ts
deleted file mode 100644
index cbc7689625..0000000000
--- a/types/react-icons/lib/md/add-alert.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAddAlert extends React.Component<IconBaseProps> { }
-export = MdAddAlert;
diff --git a/types/react-icons/lib/md/add-box.d.ts b/types/react-icons/lib/md/add-box.d.ts
deleted file mode 100644
index 4993ca9c42..0000000000
--- a/types/react-icons/lib/md/add-box.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAddBox extends React.Component<IconBaseProps> { }
-export = MdAddBox;
diff --git a/types/react-icons/lib/md/add-circle-outline.d.ts b/types/react-icons/lib/md/add-circle-outline.d.ts
deleted file mode 100644
index 18e3b93a51..0000000000
--- a/types/react-icons/lib/md/add-circle-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAddCircleOutline extends React.Component<IconBaseProps> { }
-export = MdAddCircleOutline;
diff --git a/types/react-icons/lib/md/add-circle.d.ts b/types/react-icons/lib/md/add-circle.d.ts
deleted file mode 100644
index ab9788a759..0000000000
--- a/types/react-icons/lib/md/add-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAddCircle extends React.Component<IconBaseProps> { }
-export = MdAddCircle;
diff --git a/types/react-icons/lib/md/add-location.d.ts b/types/react-icons/lib/md/add-location.d.ts
deleted file mode 100644
index c9daea88b7..0000000000
--- a/types/react-icons/lib/md/add-location.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAddLocation extends React.Component<IconBaseProps> { }
-export = MdAddLocation;
diff --git a/types/react-icons/lib/md/add-shopping-cart.d.ts b/types/react-icons/lib/md/add-shopping-cart.d.ts
deleted file mode 100644
index bdaf9c181a..0000000000
--- a/types/react-icons/lib/md/add-shopping-cart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAddShoppingCart extends React.Component<IconBaseProps> { }
-export = MdAddShoppingCart;
diff --git a/types/react-icons/lib/md/add-to-photos.d.ts b/types/react-icons/lib/md/add-to-photos.d.ts
deleted file mode 100644
index 6d4c39746b..0000000000
--- a/types/react-icons/lib/md/add-to-photos.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAddToPhotos extends React.Component<IconBaseProps> { }
-export = MdAddToPhotos;
diff --git a/types/react-icons/lib/md/add-to-queue.d.ts b/types/react-icons/lib/md/add-to-queue.d.ts
deleted file mode 100644
index fda144a00f..0000000000
--- a/types/react-icons/lib/md/add-to-queue.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAddToQueue extends React.Component<IconBaseProps> { }
-export = MdAddToQueue;
diff --git a/types/react-icons/lib/md/add.d.ts b/types/react-icons/lib/md/add.d.ts
deleted file mode 100644
index 1d69eb0d75..0000000000
--- a/types/react-icons/lib/md/add.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAdd extends React.Component<IconBaseProps> { }
-export = MdAdd;
diff --git a/types/react-icons/lib/md/adjust.d.ts b/types/react-icons/lib/md/adjust.d.ts
deleted file mode 100644
index 3c49edc056..0000000000
--- a/types/react-icons/lib/md/adjust.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAdjust extends React.Component<IconBaseProps> { }
-export = MdAdjust;
diff --git a/types/react-icons/lib/md/airline-seat-flat-angled.d.ts b/types/react-icons/lib/md/airline-seat-flat-angled.d.ts
deleted file mode 100644
index 4437e4979f..0000000000
--- a/types/react-icons/lib/md/airline-seat-flat-angled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAirlineSeatFlatAngled extends React.Component<IconBaseProps> { }
-export = MdAirlineSeatFlatAngled;
diff --git a/types/react-icons/lib/md/airline-seat-flat.d.ts b/types/react-icons/lib/md/airline-seat-flat.d.ts
deleted file mode 100644
index 6b0d949980..0000000000
--- a/types/react-icons/lib/md/airline-seat-flat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAirlineSeatFlat extends React.Component<IconBaseProps> { }
-export = MdAirlineSeatFlat;
diff --git a/types/react-icons/lib/md/airline-seat-individual-suite.d.ts b/types/react-icons/lib/md/airline-seat-individual-suite.d.ts
deleted file mode 100644
index 08ca9b6c60..0000000000
--- a/types/react-icons/lib/md/airline-seat-individual-suite.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAirlineSeatIndividualSuite extends React.Component<IconBaseProps> { }
-export = MdAirlineSeatIndividualSuite;
diff --git a/types/react-icons/lib/md/airline-seat-legroom-extra.d.ts b/types/react-icons/lib/md/airline-seat-legroom-extra.d.ts
deleted file mode 100644
index 3fa5d3da1d..0000000000
--- a/types/react-icons/lib/md/airline-seat-legroom-extra.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAirlineSeatLegroomExtra extends React.Component<IconBaseProps> { }
-export = MdAirlineSeatLegroomExtra;
diff --git a/types/react-icons/lib/md/airline-seat-legroom-normal.d.ts b/types/react-icons/lib/md/airline-seat-legroom-normal.d.ts
deleted file mode 100644
index e164c9cc85..0000000000
--- a/types/react-icons/lib/md/airline-seat-legroom-normal.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAirlineSeatLegroomNormal extends React.Component<IconBaseProps> { }
-export = MdAirlineSeatLegroomNormal;
diff --git a/types/react-icons/lib/md/airline-seat-legroom-reduced.d.ts b/types/react-icons/lib/md/airline-seat-legroom-reduced.d.ts
deleted file mode 100644
index 49c72be865..0000000000
--- a/types/react-icons/lib/md/airline-seat-legroom-reduced.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAirlineSeatLegroomReduced extends React.Component<IconBaseProps> { }
-export = MdAirlineSeatLegroomReduced;
diff --git a/types/react-icons/lib/md/airline-seat-recline-extra.d.ts b/types/react-icons/lib/md/airline-seat-recline-extra.d.ts
deleted file mode 100644
index 62a9044496..0000000000
--- a/types/react-icons/lib/md/airline-seat-recline-extra.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAirlineSeatReclineExtra extends React.Component<IconBaseProps> { }
-export = MdAirlineSeatReclineExtra;
diff --git a/types/react-icons/lib/md/airline-seat-recline-normal.d.ts b/types/react-icons/lib/md/airline-seat-recline-normal.d.ts
deleted file mode 100644
index 785727e347..0000000000
--- a/types/react-icons/lib/md/airline-seat-recline-normal.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAirlineSeatReclineNormal extends React.Component<IconBaseProps> { }
-export = MdAirlineSeatReclineNormal;
diff --git a/types/react-icons/lib/md/airplanemode-active.d.ts b/types/react-icons/lib/md/airplanemode-active.d.ts
deleted file mode 100644
index e7b6ab9c76..0000000000
--- a/types/react-icons/lib/md/airplanemode-active.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAirplanemodeActive extends React.Component<IconBaseProps> { }
-export = MdAirplanemodeActive;
diff --git a/types/react-icons/lib/md/airplanemode-inactive.d.ts b/types/react-icons/lib/md/airplanemode-inactive.d.ts
deleted file mode 100644
index cbcde22bfe..0000000000
--- a/types/react-icons/lib/md/airplanemode-inactive.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAirplanemodeInactive extends React.Component<IconBaseProps> { }
-export = MdAirplanemodeInactive;
diff --git a/types/react-icons/lib/md/airplay.d.ts b/types/react-icons/lib/md/airplay.d.ts
deleted file mode 100644
index 3b840e58a8..0000000000
--- a/types/react-icons/lib/md/airplay.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAirplay extends React.Component<IconBaseProps> { }
-export = MdAirplay;
diff --git a/types/react-icons/lib/md/airport-shuttle.d.ts b/types/react-icons/lib/md/airport-shuttle.d.ts
deleted file mode 100644
index 834d5e6b78..0000000000
--- a/types/react-icons/lib/md/airport-shuttle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAirportShuttle extends React.Component<IconBaseProps> { }
-export = MdAirportShuttle;
diff --git a/types/react-icons/lib/md/alarm-add.d.ts b/types/react-icons/lib/md/alarm-add.d.ts
deleted file mode 100644
index 2a27963c11..0000000000
--- a/types/react-icons/lib/md/alarm-add.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAlarmAdd extends React.Component<IconBaseProps> { }
-export = MdAlarmAdd;
diff --git a/types/react-icons/lib/md/alarm-off.d.ts b/types/react-icons/lib/md/alarm-off.d.ts
deleted file mode 100644
index c00b155183..0000000000
--- a/types/react-icons/lib/md/alarm-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAlarmOff extends React.Component<IconBaseProps> { }
-export = MdAlarmOff;
diff --git a/types/react-icons/lib/md/alarm-on.d.ts b/types/react-icons/lib/md/alarm-on.d.ts
deleted file mode 100644
index 4c80b52859..0000000000
--- a/types/react-icons/lib/md/alarm-on.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAlarmOn extends React.Component<IconBaseProps> { }
-export = MdAlarmOn;
diff --git a/types/react-icons/lib/md/alarm.d.ts b/types/react-icons/lib/md/alarm.d.ts
deleted file mode 100644
index 42fca7a006..0000000000
--- a/types/react-icons/lib/md/alarm.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAlarm extends React.Component<IconBaseProps> { }
-export = MdAlarm;
diff --git a/types/react-icons/lib/md/album.d.ts b/types/react-icons/lib/md/album.d.ts
deleted file mode 100644
index 09c212215c..0000000000
--- a/types/react-icons/lib/md/album.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAlbum extends React.Component<IconBaseProps> { }
-export = MdAlbum;
diff --git a/types/react-icons/lib/md/all-inclusive.d.ts b/types/react-icons/lib/md/all-inclusive.d.ts
deleted file mode 100644
index 42e5cf6007..0000000000
--- a/types/react-icons/lib/md/all-inclusive.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAllInclusive extends React.Component<IconBaseProps> { }
-export = MdAllInclusive;
diff --git a/types/react-icons/lib/md/all-out.d.ts b/types/react-icons/lib/md/all-out.d.ts
deleted file mode 100644
index 2c4a26c76f..0000000000
--- a/types/react-icons/lib/md/all-out.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAllOut extends React.Component<IconBaseProps> { }
-export = MdAllOut;
diff --git a/types/react-icons/lib/md/android.d.ts b/types/react-icons/lib/md/android.d.ts
deleted file mode 100644
index adf4741a7c..0000000000
--- a/types/react-icons/lib/md/android.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAndroid extends React.Component<IconBaseProps> { }
-export = MdAndroid;
diff --git a/types/react-icons/lib/md/announcement.d.ts b/types/react-icons/lib/md/announcement.d.ts
deleted file mode 100644
index 21f51fadcb..0000000000
--- a/types/react-icons/lib/md/announcement.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAnnouncement extends React.Component<IconBaseProps> { }
-export = MdAnnouncement;
diff --git a/types/react-icons/lib/md/apps.d.ts b/types/react-icons/lib/md/apps.d.ts
deleted file mode 100644
index be159c2793..0000000000
--- a/types/react-icons/lib/md/apps.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdApps extends React.Component<IconBaseProps> { }
-export = MdApps;
diff --git a/types/react-icons/lib/md/archive.d.ts b/types/react-icons/lib/md/archive.d.ts
deleted file mode 100644
index 2738255b53..0000000000
--- a/types/react-icons/lib/md/archive.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdArchive extends React.Component<IconBaseProps> { }
-export = MdArchive;
diff --git a/types/react-icons/lib/md/arrow-back.d.ts b/types/react-icons/lib/md/arrow-back.d.ts
deleted file mode 100644
index 0d37103473..0000000000
--- a/types/react-icons/lib/md/arrow-back.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdArrowBack extends React.Component<IconBaseProps> { }
-export = MdArrowBack;
diff --git a/types/react-icons/lib/md/arrow-downward.d.ts b/types/react-icons/lib/md/arrow-downward.d.ts
deleted file mode 100644
index e634a027a4..0000000000
--- a/types/react-icons/lib/md/arrow-downward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdArrowDownward extends React.Component<IconBaseProps> { }
-export = MdArrowDownward;
diff --git a/types/react-icons/lib/md/arrow-drop-down-circle.d.ts b/types/react-icons/lib/md/arrow-drop-down-circle.d.ts
deleted file mode 100644
index 1705ff9b19..0000000000
--- a/types/react-icons/lib/md/arrow-drop-down-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdArrowDropDownCircle extends React.Component<IconBaseProps> { }
-export = MdArrowDropDownCircle;
diff --git a/types/react-icons/lib/md/arrow-drop-down.d.ts b/types/react-icons/lib/md/arrow-drop-down.d.ts
deleted file mode 100644
index 333105147d..0000000000
--- a/types/react-icons/lib/md/arrow-drop-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdArrowDropDown extends React.Component<IconBaseProps> { }
-export = MdArrowDropDown;
diff --git a/types/react-icons/lib/md/arrow-drop-up.d.ts b/types/react-icons/lib/md/arrow-drop-up.d.ts
deleted file mode 100644
index 87d3f77f8d..0000000000
--- a/types/react-icons/lib/md/arrow-drop-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdArrowDropUp extends React.Component<IconBaseProps> { }
-export = MdArrowDropUp;
diff --git a/types/react-icons/lib/md/arrow-forward.d.ts b/types/react-icons/lib/md/arrow-forward.d.ts
deleted file mode 100644
index 1d25c6bafb..0000000000
--- a/types/react-icons/lib/md/arrow-forward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdArrowForward extends React.Component<IconBaseProps> { }
-export = MdArrowForward;
diff --git a/types/react-icons/lib/md/arrow-upward.d.ts b/types/react-icons/lib/md/arrow-upward.d.ts
deleted file mode 100644
index a734eaeaa0..0000000000
--- a/types/react-icons/lib/md/arrow-upward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdArrowUpward extends React.Component<IconBaseProps> { }
-export = MdArrowUpward;
diff --git a/types/react-icons/lib/md/art-track.d.ts b/types/react-icons/lib/md/art-track.d.ts
deleted file mode 100644
index e9015ed4f1..0000000000
--- a/types/react-icons/lib/md/art-track.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdArtTrack extends React.Component<IconBaseProps> { }
-export = MdArtTrack;
diff --git a/types/react-icons/lib/md/aspect-ratio.d.ts b/types/react-icons/lib/md/aspect-ratio.d.ts
deleted file mode 100644
index 8a645fba11..0000000000
--- a/types/react-icons/lib/md/aspect-ratio.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAspectRatio extends React.Component<IconBaseProps> { }
-export = MdAspectRatio;
diff --git a/types/react-icons/lib/md/assessment.d.ts b/types/react-icons/lib/md/assessment.d.ts
deleted file mode 100644
index af6f64a977..0000000000
--- a/types/react-icons/lib/md/assessment.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAssessment extends React.Component<IconBaseProps> { }
-export = MdAssessment;
diff --git a/types/react-icons/lib/md/assignment-ind.d.ts b/types/react-icons/lib/md/assignment-ind.d.ts
deleted file mode 100644
index 8518cf2402..0000000000
--- a/types/react-icons/lib/md/assignment-ind.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAssignmentInd extends React.Component<IconBaseProps> { }
-export = MdAssignmentInd;
diff --git a/types/react-icons/lib/md/assignment-late.d.ts b/types/react-icons/lib/md/assignment-late.d.ts
deleted file mode 100644
index c62da79ac3..0000000000
--- a/types/react-icons/lib/md/assignment-late.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAssignmentLate extends React.Component<IconBaseProps> { }
-export = MdAssignmentLate;
diff --git a/types/react-icons/lib/md/assignment-return.d.ts b/types/react-icons/lib/md/assignment-return.d.ts
deleted file mode 100644
index 3f565dafab..0000000000
--- a/types/react-icons/lib/md/assignment-return.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAssignmentReturn extends React.Component<IconBaseProps> { }
-export = MdAssignmentReturn;
diff --git a/types/react-icons/lib/md/assignment-returned.d.ts b/types/react-icons/lib/md/assignment-returned.d.ts
deleted file mode 100644
index ec35682fdc..0000000000
--- a/types/react-icons/lib/md/assignment-returned.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAssignmentReturned extends React.Component<IconBaseProps> { }
-export = MdAssignmentReturned;
diff --git a/types/react-icons/lib/md/assignment-turned-in.d.ts b/types/react-icons/lib/md/assignment-turned-in.d.ts
deleted file mode 100644
index 013d97808d..0000000000
--- a/types/react-icons/lib/md/assignment-turned-in.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAssignmentTurnedIn extends React.Component<IconBaseProps> { }
-export = MdAssignmentTurnedIn;
diff --git a/types/react-icons/lib/md/assignment.d.ts b/types/react-icons/lib/md/assignment.d.ts
deleted file mode 100644
index daf2f8974c..0000000000
--- a/types/react-icons/lib/md/assignment.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAssignment extends React.Component<IconBaseProps> { }
-export = MdAssignment;
diff --git a/types/react-icons/lib/md/assistant-photo.d.ts b/types/react-icons/lib/md/assistant-photo.d.ts
deleted file mode 100644
index 0e25dc2286..0000000000
--- a/types/react-icons/lib/md/assistant-photo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAssistantPhoto extends React.Component<IconBaseProps> { }
-export = MdAssistantPhoto;
diff --git a/types/react-icons/lib/md/assistant.d.ts b/types/react-icons/lib/md/assistant.d.ts
deleted file mode 100644
index 79968f7c35..0000000000
--- a/types/react-icons/lib/md/assistant.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAssistant extends React.Component<IconBaseProps> { }
-export = MdAssistant;
diff --git a/types/react-icons/lib/md/attach-file.d.ts b/types/react-icons/lib/md/attach-file.d.ts
deleted file mode 100644
index 250c8ef7dd..0000000000
--- a/types/react-icons/lib/md/attach-file.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAttachFile extends React.Component<IconBaseProps> { }
-export = MdAttachFile;
diff --git a/types/react-icons/lib/md/attach-money.d.ts b/types/react-icons/lib/md/attach-money.d.ts
deleted file mode 100644
index 5257e2a068..0000000000
--- a/types/react-icons/lib/md/attach-money.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAttachMoney extends React.Component<IconBaseProps> { }
-export = MdAttachMoney;
diff --git a/types/react-icons/lib/md/attachment.d.ts b/types/react-icons/lib/md/attachment.d.ts
deleted file mode 100644
index b9ee26291e..0000000000
--- a/types/react-icons/lib/md/attachment.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAttachment extends React.Component<IconBaseProps> { }
-export = MdAttachment;
diff --git a/types/react-icons/lib/md/audiotrack.d.ts b/types/react-icons/lib/md/audiotrack.d.ts
deleted file mode 100644
index b36fbee5b7..0000000000
--- a/types/react-icons/lib/md/audiotrack.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAudiotrack extends React.Component<IconBaseProps> { }
-export = MdAudiotrack;
diff --git a/types/react-icons/lib/md/autorenew.d.ts b/types/react-icons/lib/md/autorenew.d.ts
deleted file mode 100644
index 1d1347e4f4..0000000000
--- a/types/react-icons/lib/md/autorenew.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAutorenew extends React.Component<IconBaseProps> { }
-export = MdAutorenew;
diff --git a/types/react-icons/lib/md/av-timer.d.ts b/types/react-icons/lib/md/av-timer.d.ts
deleted file mode 100644
index 2e7d9ff423..0000000000
--- a/types/react-icons/lib/md/av-timer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdAvTimer extends React.Component<IconBaseProps> { }
-export = MdAvTimer;
diff --git a/types/react-icons/lib/md/backspace.d.ts b/types/react-icons/lib/md/backspace.d.ts
deleted file mode 100644
index 2b5144cf4d..0000000000
--- a/types/react-icons/lib/md/backspace.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBackspace extends React.Component<IconBaseProps> { }
-export = MdBackspace;
diff --git a/types/react-icons/lib/md/backup.d.ts b/types/react-icons/lib/md/backup.d.ts
deleted file mode 100644
index cb95ac3dfd..0000000000
--- a/types/react-icons/lib/md/backup.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBackup extends React.Component<IconBaseProps> { }
-export = MdBackup;
diff --git a/types/react-icons/lib/md/battery-alert.d.ts b/types/react-icons/lib/md/battery-alert.d.ts
deleted file mode 100644
index 727e2b83f6..0000000000
--- a/types/react-icons/lib/md/battery-alert.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBatteryAlert extends React.Component<IconBaseProps> { }
-export = MdBatteryAlert;
diff --git a/types/react-icons/lib/md/battery-charging-full.d.ts b/types/react-icons/lib/md/battery-charging-full.d.ts
deleted file mode 100644
index e38bce2394..0000000000
--- a/types/react-icons/lib/md/battery-charging-full.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBatteryChargingFull extends React.Component<IconBaseProps> { }
-export = MdBatteryChargingFull;
diff --git a/types/react-icons/lib/md/battery-full.d.ts b/types/react-icons/lib/md/battery-full.d.ts
deleted file mode 100644
index f4670ad1f7..0000000000
--- a/types/react-icons/lib/md/battery-full.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBatteryFull extends React.Component<IconBaseProps> { }
-export = MdBatteryFull;
diff --git a/types/react-icons/lib/md/battery-std.d.ts b/types/react-icons/lib/md/battery-std.d.ts
deleted file mode 100644
index 0886063916..0000000000
--- a/types/react-icons/lib/md/battery-std.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBatteryStd extends React.Component<IconBaseProps> { }
-export = MdBatteryStd;
diff --git a/types/react-icons/lib/md/battery-unknown.d.ts b/types/react-icons/lib/md/battery-unknown.d.ts
deleted file mode 100644
index 44bae4c72d..0000000000
--- a/types/react-icons/lib/md/battery-unknown.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBatteryUnknown extends React.Component<IconBaseProps> { }
-export = MdBatteryUnknown;
diff --git a/types/react-icons/lib/md/beach-access.d.ts b/types/react-icons/lib/md/beach-access.d.ts
deleted file mode 100644
index df62947d77..0000000000
--- a/types/react-icons/lib/md/beach-access.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBeachAccess extends React.Component<IconBaseProps> { }
-export = MdBeachAccess;
diff --git a/types/react-icons/lib/md/beenhere.d.ts b/types/react-icons/lib/md/beenhere.d.ts
deleted file mode 100644
index 203c154745..0000000000
--- a/types/react-icons/lib/md/beenhere.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBeenhere extends React.Component<IconBaseProps> { }
-export = MdBeenhere;
diff --git a/types/react-icons/lib/md/block.d.ts b/types/react-icons/lib/md/block.d.ts
deleted file mode 100644
index df16af7f26..0000000000
--- a/types/react-icons/lib/md/block.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBlock extends React.Component<IconBaseProps> { }
-export = MdBlock;
diff --git a/types/react-icons/lib/md/bluetooth-audio.d.ts b/types/react-icons/lib/md/bluetooth-audio.d.ts
deleted file mode 100644
index 37d19037e0..0000000000
--- a/types/react-icons/lib/md/bluetooth-audio.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBluetoothAudio extends React.Component<IconBaseProps> { }
-export = MdBluetoothAudio;
diff --git a/types/react-icons/lib/md/bluetooth-connected.d.ts b/types/react-icons/lib/md/bluetooth-connected.d.ts
deleted file mode 100644
index c43382457d..0000000000
--- a/types/react-icons/lib/md/bluetooth-connected.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBluetoothConnected extends React.Component<IconBaseProps> { }
-export = MdBluetoothConnected;
diff --git a/types/react-icons/lib/md/bluetooth-disabled.d.ts b/types/react-icons/lib/md/bluetooth-disabled.d.ts
deleted file mode 100644
index 22dedb5b6f..0000000000
--- a/types/react-icons/lib/md/bluetooth-disabled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBluetoothDisabled extends React.Component<IconBaseProps> { }
-export = MdBluetoothDisabled;
diff --git a/types/react-icons/lib/md/bluetooth-searching.d.ts b/types/react-icons/lib/md/bluetooth-searching.d.ts
deleted file mode 100644
index 1096cc5867..0000000000
--- a/types/react-icons/lib/md/bluetooth-searching.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBluetoothSearching extends React.Component<IconBaseProps> { }
-export = MdBluetoothSearching;
diff --git a/types/react-icons/lib/md/bluetooth.d.ts b/types/react-icons/lib/md/bluetooth.d.ts
deleted file mode 100644
index 26e9b31401..0000000000
--- a/types/react-icons/lib/md/bluetooth.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBluetooth extends React.Component<IconBaseProps> { }
-export = MdBluetooth;
diff --git a/types/react-icons/lib/md/blur-circular.d.ts b/types/react-icons/lib/md/blur-circular.d.ts
deleted file mode 100644
index e391be6aac..0000000000
--- a/types/react-icons/lib/md/blur-circular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBlurCircular extends React.Component<IconBaseProps> { }
-export = MdBlurCircular;
diff --git a/types/react-icons/lib/md/blur-linear.d.ts b/types/react-icons/lib/md/blur-linear.d.ts
deleted file mode 100644
index c7e2ed71b0..0000000000
--- a/types/react-icons/lib/md/blur-linear.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBlurLinear extends React.Component<IconBaseProps> { }
-export = MdBlurLinear;
diff --git a/types/react-icons/lib/md/blur-off.d.ts b/types/react-icons/lib/md/blur-off.d.ts
deleted file mode 100644
index 34bf839572..0000000000
--- a/types/react-icons/lib/md/blur-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBlurOff extends React.Component<IconBaseProps> { }
-export = MdBlurOff;
diff --git a/types/react-icons/lib/md/blur-on.d.ts b/types/react-icons/lib/md/blur-on.d.ts
deleted file mode 100644
index eb427415a6..0000000000
--- a/types/react-icons/lib/md/blur-on.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBlurOn extends React.Component<IconBaseProps> { }
-export = MdBlurOn;
diff --git a/types/react-icons/lib/md/book.d.ts b/types/react-icons/lib/md/book.d.ts
deleted file mode 100644
index 4f026cc906..0000000000
--- a/types/react-icons/lib/md/book.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBook extends React.Component<IconBaseProps> { }
-export = MdBook;
diff --git a/types/react-icons/lib/md/bookmark-outline.d.ts b/types/react-icons/lib/md/bookmark-outline.d.ts
deleted file mode 100644
index 49d5711340..0000000000
--- a/types/react-icons/lib/md/bookmark-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBookmarkOutline extends React.Component<IconBaseProps> { }
-export = MdBookmarkOutline;
diff --git a/types/react-icons/lib/md/bookmark.d.ts b/types/react-icons/lib/md/bookmark.d.ts
deleted file mode 100644
index 1ea3fdef2f..0000000000
--- a/types/react-icons/lib/md/bookmark.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBookmark extends React.Component<IconBaseProps> { }
-export = MdBookmark;
diff --git a/types/react-icons/lib/md/border-all.d.ts b/types/react-icons/lib/md/border-all.d.ts
deleted file mode 100644
index 321dc40acf..0000000000
--- a/types/react-icons/lib/md/border-all.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBorderAll extends React.Component<IconBaseProps> { }
-export = MdBorderAll;
diff --git a/types/react-icons/lib/md/border-bottom.d.ts b/types/react-icons/lib/md/border-bottom.d.ts
deleted file mode 100644
index 4af9bc2a3e..0000000000
--- a/types/react-icons/lib/md/border-bottom.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBorderBottom extends React.Component<IconBaseProps> { }
-export = MdBorderBottom;
diff --git a/types/react-icons/lib/md/border-clear.d.ts b/types/react-icons/lib/md/border-clear.d.ts
deleted file mode 100644
index babade9381..0000000000
--- a/types/react-icons/lib/md/border-clear.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBorderClear extends React.Component<IconBaseProps> { }
-export = MdBorderClear;
diff --git a/types/react-icons/lib/md/border-color.d.ts b/types/react-icons/lib/md/border-color.d.ts
deleted file mode 100644
index 3eb6611e0a..0000000000
--- a/types/react-icons/lib/md/border-color.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBorderColor extends React.Component<IconBaseProps> { }
-export = MdBorderColor;
diff --git a/types/react-icons/lib/md/border-horizontal.d.ts b/types/react-icons/lib/md/border-horizontal.d.ts
deleted file mode 100644
index 642f6f9b14..0000000000
--- a/types/react-icons/lib/md/border-horizontal.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBorderHorizontal extends React.Component<IconBaseProps> { }
-export = MdBorderHorizontal;
diff --git a/types/react-icons/lib/md/border-inner.d.ts b/types/react-icons/lib/md/border-inner.d.ts
deleted file mode 100644
index 318ee29d9c..0000000000
--- a/types/react-icons/lib/md/border-inner.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBorderInner extends React.Component<IconBaseProps> { }
-export = MdBorderInner;
diff --git a/types/react-icons/lib/md/border-left.d.ts b/types/react-icons/lib/md/border-left.d.ts
deleted file mode 100644
index 3d710840c8..0000000000
--- a/types/react-icons/lib/md/border-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBorderLeft extends React.Component<IconBaseProps> { }
-export = MdBorderLeft;
diff --git a/types/react-icons/lib/md/border-outer.d.ts b/types/react-icons/lib/md/border-outer.d.ts
deleted file mode 100644
index ab7a282419..0000000000
--- a/types/react-icons/lib/md/border-outer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBorderOuter extends React.Component<IconBaseProps> { }
-export = MdBorderOuter;
diff --git a/types/react-icons/lib/md/border-right.d.ts b/types/react-icons/lib/md/border-right.d.ts
deleted file mode 100644
index 1a7799213a..0000000000
--- a/types/react-icons/lib/md/border-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBorderRight extends React.Component<IconBaseProps> { }
-export = MdBorderRight;
diff --git a/types/react-icons/lib/md/border-style.d.ts b/types/react-icons/lib/md/border-style.d.ts
deleted file mode 100644
index 04a39727ca..0000000000
--- a/types/react-icons/lib/md/border-style.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBorderStyle extends React.Component<IconBaseProps> { }
-export = MdBorderStyle;
diff --git a/types/react-icons/lib/md/border-top.d.ts b/types/react-icons/lib/md/border-top.d.ts
deleted file mode 100644
index d667315e57..0000000000
--- a/types/react-icons/lib/md/border-top.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBorderTop extends React.Component<IconBaseProps> { }
-export = MdBorderTop;
diff --git a/types/react-icons/lib/md/border-vertical.d.ts b/types/react-icons/lib/md/border-vertical.d.ts
deleted file mode 100644
index 741ac16627..0000000000
--- a/types/react-icons/lib/md/border-vertical.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBorderVertical extends React.Component<IconBaseProps> { }
-export = MdBorderVertical;
diff --git a/types/react-icons/lib/md/branding-watermark.d.ts b/types/react-icons/lib/md/branding-watermark.d.ts
deleted file mode 100644
index b23afbd356..0000000000
--- a/types/react-icons/lib/md/branding-watermark.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBrandingWatermark extends React.Component<IconBaseProps> { }
-export = MdBrandingWatermark;
diff --git a/types/react-icons/lib/md/brightness-1.d.ts b/types/react-icons/lib/md/brightness-1.d.ts
deleted file mode 100644
index e2ca8dc427..0000000000
--- a/types/react-icons/lib/md/brightness-1.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBrightness1 extends React.Component<IconBaseProps> { }
-export = MdBrightness1;
diff --git a/types/react-icons/lib/md/brightness-2.d.ts b/types/react-icons/lib/md/brightness-2.d.ts
deleted file mode 100644
index c47e7defba..0000000000
--- a/types/react-icons/lib/md/brightness-2.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBrightness2 extends React.Component<IconBaseProps> { }
-export = MdBrightness2;
diff --git a/types/react-icons/lib/md/brightness-3.d.ts b/types/react-icons/lib/md/brightness-3.d.ts
deleted file mode 100644
index 9f835bb24e..0000000000
--- a/types/react-icons/lib/md/brightness-3.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBrightness3 extends React.Component<IconBaseProps> { }
-export = MdBrightness3;
diff --git a/types/react-icons/lib/md/brightness-4.d.ts b/types/react-icons/lib/md/brightness-4.d.ts
deleted file mode 100644
index 9e12c4f48b..0000000000
--- a/types/react-icons/lib/md/brightness-4.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBrightness4 extends React.Component<IconBaseProps> { }
-export = MdBrightness4;
diff --git a/types/react-icons/lib/md/brightness-5.d.ts b/types/react-icons/lib/md/brightness-5.d.ts
deleted file mode 100644
index ee98d6a917..0000000000
--- a/types/react-icons/lib/md/brightness-5.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBrightness5 extends React.Component<IconBaseProps> { }
-export = MdBrightness5;
diff --git a/types/react-icons/lib/md/brightness-6.d.ts b/types/react-icons/lib/md/brightness-6.d.ts
deleted file mode 100644
index 0266ba547c..0000000000
--- a/types/react-icons/lib/md/brightness-6.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBrightness6 extends React.Component<IconBaseProps> { }
-export = MdBrightness6;
diff --git a/types/react-icons/lib/md/brightness-7.d.ts b/types/react-icons/lib/md/brightness-7.d.ts
deleted file mode 100644
index 9cf6e0e624..0000000000
--- a/types/react-icons/lib/md/brightness-7.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBrightness7 extends React.Component<IconBaseProps> { }
-export = MdBrightness7;
diff --git a/types/react-icons/lib/md/brightness-auto.d.ts b/types/react-icons/lib/md/brightness-auto.d.ts
deleted file mode 100644
index b9d280fb13..0000000000
--- a/types/react-icons/lib/md/brightness-auto.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBrightnessAuto extends React.Component<IconBaseProps> { }
-export = MdBrightnessAuto;
diff --git a/types/react-icons/lib/md/brightness-high.d.ts b/types/react-icons/lib/md/brightness-high.d.ts
deleted file mode 100644
index cd1fec1341..0000000000
--- a/types/react-icons/lib/md/brightness-high.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBrightnessHigh extends React.Component<IconBaseProps> { }
-export = MdBrightnessHigh;
diff --git a/types/react-icons/lib/md/brightness-low.d.ts b/types/react-icons/lib/md/brightness-low.d.ts
deleted file mode 100644
index fa786e9ec9..0000000000
--- a/types/react-icons/lib/md/brightness-low.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBrightnessLow extends React.Component<IconBaseProps> { }
-export = MdBrightnessLow;
diff --git a/types/react-icons/lib/md/brightness-medium.d.ts b/types/react-icons/lib/md/brightness-medium.d.ts
deleted file mode 100644
index 0dc43fcd6d..0000000000
--- a/types/react-icons/lib/md/brightness-medium.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBrightnessMedium extends React.Component<IconBaseProps> { }
-export = MdBrightnessMedium;
diff --git a/types/react-icons/lib/md/broken-image.d.ts b/types/react-icons/lib/md/broken-image.d.ts
deleted file mode 100644
index e516114b45..0000000000
--- a/types/react-icons/lib/md/broken-image.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBrokenImage extends React.Component<IconBaseProps> { }
-export = MdBrokenImage;
diff --git a/types/react-icons/lib/md/brush.d.ts b/types/react-icons/lib/md/brush.d.ts
deleted file mode 100644
index 757f204994..0000000000
--- a/types/react-icons/lib/md/brush.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBrush extends React.Component<IconBaseProps> { }
-export = MdBrush;
diff --git a/types/react-icons/lib/md/bubble-chart.d.ts b/types/react-icons/lib/md/bubble-chart.d.ts
deleted file mode 100644
index 2bb2a4998e..0000000000
--- a/types/react-icons/lib/md/bubble-chart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBubbleChart extends React.Component<IconBaseProps> { }
-export = MdBubbleChart;
diff --git a/types/react-icons/lib/md/bug-report.d.ts b/types/react-icons/lib/md/bug-report.d.ts
deleted file mode 100644
index dd0aa9b931..0000000000
--- a/types/react-icons/lib/md/bug-report.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBugReport extends React.Component<IconBaseProps> { }
-export = MdBugReport;
diff --git a/types/react-icons/lib/md/build.d.ts b/types/react-icons/lib/md/build.d.ts
deleted file mode 100644
index a0ad5b0c31..0000000000
--- a/types/react-icons/lib/md/build.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBuild extends React.Component<IconBaseProps> { }
-export = MdBuild;
diff --git a/types/react-icons/lib/md/burst-mode.d.ts b/types/react-icons/lib/md/burst-mode.d.ts
deleted file mode 100644
index 4af3aab231..0000000000
--- a/types/react-icons/lib/md/burst-mode.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBurstMode extends React.Component<IconBaseProps> { }
-export = MdBurstMode;
diff --git a/types/react-icons/lib/md/business-center.d.ts b/types/react-icons/lib/md/business-center.d.ts
deleted file mode 100644
index c767118157..0000000000
--- a/types/react-icons/lib/md/business-center.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBusinessCenter extends React.Component<IconBaseProps> { }
-export = MdBusinessCenter;
diff --git a/types/react-icons/lib/md/business.d.ts b/types/react-icons/lib/md/business.d.ts
deleted file mode 100644
index d6ecbe11c2..0000000000
--- a/types/react-icons/lib/md/business.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdBusiness extends React.Component<IconBaseProps> { }
-export = MdBusiness;
diff --git a/types/react-icons/lib/md/cached.d.ts b/types/react-icons/lib/md/cached.d.ts
deleted file mode 100644
index a7ee38490e..0000000000
--- a/types/react-icons/lib/md/cached.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCached extends React.Component<IconBaseProps> { }
-export = MdCached;
diff --git a/types/react-icons/lib/md/cake.d.ts b/types/react-icons/lib/md/cake.d.ts
deleted file mode 100644
index 300197de73..0000000000
--- a/types/react-icons/lib/md/cake.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCake extends React.Component<IconBaseProps> { }
-export = MdCake;
diff --git a/types/react-icons/lib/md/call-end.d.ts b/types/react-icons/lib/md/call-end.d.ts
deleted file mode 100644
index 7a5b08dc29..0000000000
--- a/types/react-icons/lib/md/call-end.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCallEnd extends React.Component<IconBaseProps> { }
-export = MdCallEnd;
diff --git a/types/react-icons/lib/md/call-made.d.ts b/types/react-icons/lib/md/call-made.d.ts
deleted file mode 100644
index e91641574b..0000000000
--- a/types/react-icons/lib/md/call-made.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCallMade extends React.Component<IconBaseProps> { }
-export = MdCallMade;
diff --git a/types/react-icons/lib/md/call-merge.d.ts b/types/react-icons/lib/md/call-merge.d.ts
deleted file mode 100644
index b5b3fa9314..0000000000
--- a/types/react-icons/lib/md/call-merge.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCallMerge extends React.Component<IconBaseProps> { }
-export = MdCallMerge;
diff --git a/types/react-icons/lib/md/call-missed-outgoing.d.ts b/types/react-icons/lib/md/call-missed-outgoing.d.ts
deleted file mode 100644
index 553318d2b2..0000000000
--- a/types/react-icons/lib/md/call-missed-outgoing.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCallMissedOutgoing extends React.Component<IconBaseProps> { }
-export = MdCallMissedOutgoing;
diff --git a/types/react-icons/lib/md/call-missed.d.ts b/types/react-icons/lib/md/call-missed.d.ts
deleted file mode 100644
index 6bd2884ffe..0000000000
--- a/types/react-icons/lib/md/call-missed.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCallMissed extends React.Component<IconBaseProps> { }
-export = MdCallMissed;
diff --git a/types/react-icons/lib/md/call-received.d.ts b/types/react-icons/lib/md/call-received.d.ts
deleted file mode 100644
index fcc1b3f845..0000000000
--- a/types/react-icons/lib/md/call-received.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCallReceived extends React.Component<IconBaseProps> { }
-export = MdCallReceived;
diff --git a/types/react-icons/lib/md/call-split.d.ts b/types/react-icons/lib/md/call-split.d.ts
deleted file mode 100644
index 1f8eefacb2..0000000000
--- a/types/react-icons/lib/md/call-split.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCallSplit extends React.Component<IconBaseProps> { }
-export = MdCallSplit;
diff --git a/types/react-icons/lib/md/call-to-action.d.ts b/types/react-icons/lib/md/call-to-action.d.ts
deleted file mode 100644
index a653748703..0000000000
--- a/types/react-icons/lib/md/call-to-action.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCallToAction extends React.Component<IconBaseProps> { }
-export = MdCallToAction;
diff --git a/types/react-icons/lib/md/call.d.ts b/types/react-icons/lib/md/call.d.ts
deleted file mode 100644
index 4b817c331b..0000000000
--- a/types/react-icons/lib/md/call.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCall extends React.Component<IconBaseProps> { }
-export = MdCall;
diff --git a/types/react-icons/lib/md/camera-alt.d.ts b/types/react-icons/lib/md/camera-alt.d.ts
deleted file mode 100644
index f620a9390e..0000000000
--- a/types/react-icons/lib/md/camera-alt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCameraAlt extends React.Component<IconBaseProps> { }
-export = MdCameraAlt;
diff --git a/types/react-icons/lib/md/camera-enhance.d.ts b/types/react-icons/lib/md/camera-enhance.d.ts
deleted file mode 100644
index 82a1dbcc79..0000000000
--- a/types/react-icons/lib/md/camera-enhance.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCameraEnhance extends React.Component<IconBaseProps> { }
-export = MdCameraEnhance;
diff --git a/types/react-icons/lib/md/camera-front.d.ts b/types/react-icons/lib/md/camera-front.d.ts
deleted file mode 100644
index e8569e18e1..0000000000
--- a/types/react-icons/lib/md/camera-front.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCameraFront extends React.Component<IconBaseProps> { }
-export = MdCameraFront;
diff --git a/types/react-icons/lib/md/camera-rear.d.ts b/types/react-icons/lib/md/camera-rear.d.ts
deleted file mode 100644
index 2cd439976a..0000000000
--- a/types/react-icons/lib/md/camera-rear.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCameraRear extends React.Component<IconBaseProps> { }
-export = MdCameraRear;
diff --git a/types/react-icons/lib/md/camera-roll.d.ts b/types/react-icons/lib/md/camera-roll.d.ts
deleted file mode 100644
index 8d9a659a45..0000000000
--- a/types/react-icons/lib/md/camera-roll.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCameraRoll extends React.Component<IconBaseProps> { }
-export = MdCameraRoll;
diff --git a/types/react-icons/lib/md/camera.d.ts b/types/react-icons/lib/md/camera.d.ts
deleted file mode 100644
index e743236ad7..0000000000
--- a/types/react-icons/lib/md/camera.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCamera extends React.Component<IconBaseProps> { }
-export = MdCamera;
diff --git a/types/react-icons/lib/md/cancel.d.ts b/types/react-icons/lib/md/cancel.d.ts
deleted file mode 100644
index 89e7137dd0..0000000000
--- a/types/react-icons/lib/md/cancel.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCancel extends React.Component<IconBaseProps> { }
-export = MdCancel;
diff --git a/types/react-icons/lib/md/card-giftcard.d.ts b/types/react-icons/lib/md/card-giftcard.d.ts
deleted file mode 100644
index dcfd110e31..0000000000
--- a/types/react-icons/lib/md/card-giftcard.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCardGiftcard extends React.Component<IconBaseProps> { }
-export = MdCardGiftcard;
diff --git a/types/react-icons/lib/md/card-membership.d.ts b/types/react-icons/lib/md/card-membership.d.ts
deleted file mode 100644
index 56d04b7d7f..0000000000
--- a/types/react-icons/lib/md/card-membership.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCardMembership extends React.Component<IconBaseProps> { }
-export = MdCardMembership;
diff --git a/types/react-icons/lib/md/card-travel.d.ts b/types/react-icons/lib/md/card-travel.d.ts
deleted file mode 100644
index 2a024573ff..0000000000
--- a/types/react-icons/lib/md/card-travel.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCardTravel extends React.Component<IconBaseProps> { }
-export = MdCardTravel;
diff --git a/types/react-icons/lib/md/casino.d.ts b/types/react-icons/lib/md/casino.d.ts
deleted file mode 100644
index d99aafd815..0000000000
--- a/types/react-icons/lib/md/casino.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCasino extends React.Component<IconBaseProps> { }
-export = MdCasino;
diff --git a/types/react-icons/lib/md/cast-connected.d.ts b/types/react-icons/lib/md/cast-connected.d.ts
deleted file mode 100644
index 7b3337dec8..0000000000
--- a/types/react-icons/lib/md/cast-connected.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCastConnected extends React.Component<IconBaseProps> { }
-export = MdCastConnected;
diff --git a/types/react-icons/lib/md/cast.d.ts b/types/react-icons/lib/md/cast.d.ts
deleted file mode 100644
index cc471c69f0..0000000000
--- a/types/react-icons/lib/md/cast.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCast extends React.Component<IconBaseProps> { }
-export = MdCast;
diff --git a/types/react-icons/lib/md/center-focus-strong.d.ts b/types/react-icons/lib/md/center-focus-strong.d.ts
deleted file mode 100644
index 609be9f3ca..0000000000
--- a/types/react-icons/lib/md/center-focus-strong.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCenterFocusStrong extends React.Component<IconBaseProps> { }
-export = MdCenterFocusStrong;
diff --git a/types/react-icons/lib/md/center-focus-weak.d.ts b/types/react-icons/lib/md/center-focus-weak.d.ts
deleted file mode 100644
index 5923a863c7..0000000000
--- a/types/react-icons/lib/md/center-focus-weak.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCenterFocusWeak extends React.Component<IconBaseProps> { }
-export = MdCenterFocusWeak;
diff --git a/types/react-icons/lib/md/change-history.d.ts b/types/react-icons/lib/md/change-history.d.ts
deleted file mode 100644
index da490c335a..0000000000
--- a/types/react-icons/lib/md/change-history.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdChangeHistory extends React.Component<IconBaseProps> { }
-export = MdChangeHistory;
diff --git a/types/react-icons/lib/md/chat-bubble-outline.d.ts b/types/react-icons/lib/md/chat-bubble-outline.d.ts
deleted file mode 100644
index 4bbbe1a012..0000000000
--- a/types/react-icons/lib/md/chat-bubble-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdChatBubbleOutline extends React.Component<IconBaseProps> { }
-export = MdChatBubbleOutline;
diff --git a/types/react-icons/lib/md/chat-bubble.d.ts b/types/react-icons/lib/md/chat-bubble.d.ts
deleted file mode 100644
index 7f1bd144b8..0000000000
--- a/types/react-icons/lib/md/chat-bubble.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdChatBubble extends React.Component<IconBaseProps> { }
-export = MdChatBubble;
diff --git a/types/react-icons/lib/md/chat.d.ts b/types/react-icons/lib/md/chat.d.ts
deleted file mode 100644
index c8b48dded0..0000000000
--- a/types/react-icons/lib/md/chat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdChat extends React.Component<IconBaseProps> { }
-export = MdChat;
diff --git a/types/react-icons/lib/md/check-box-outline-blank.d.ts b/types/react-icons/lib/md/check-box-outline-blank.d.ts
deleted file mode 100644
index 9159ef053b..0000000000
--- a/types/react-icons/lib/md/check-box-outline-blank.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCheckBoxOutlineBlank extends React.Component<IconBaseProps> { }
-export = MdCheckBoxOutlineBlank;
diff --git a/types/react-icons/lib/md/check-box.d.ts b/types/react-icons/lib/md/check-box.d.ts
deleted file mode 100644
index 9b0c678b29..0000000000
--- a/types/react-icons/lib/md/check-box.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCheckBox extends React.Component<IconBaseProps> { }
-export = MdCheckBox;
diff --git a/types/react-icons/lib/md/check-circle.d.ts b/types/react-icons/lib/md/check-circle.d.ts
deleted file mode 100644
index ffc011234d..0000000000
--- a/types/react-icons/lib/md/check-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCheckCircle extends React.Component<IconBaseProps> { }
-export = MdCheckCircle;
diff --git a/types/react-icons/lib/md/check.d.ts b/types/react-icons/lib/md/check.d.ts
deleted file mode 100644
index 94b93a031b..0000000000
--- a/types/react-icons/lib/md/check.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCheck extends React.Component<IconBaseProps> { }
-export = MdCheck;
diff --git a/types/react-icons/lib/md/chevron-left.d.ts b/types/react-icons/lib/md/chevron-left.d.ts
deleted file mode 100644
index 3fea15ec21..0000000000
--- a/types/react-icons/lib/md/chevron-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdChevronLeft extends React.Component<IconBaseProps> { }
-export = MdChevronLeft;
diff --git a/types/react-icons/lib/md/chevron-right.d.ts b/types/react-icons/lib/md/chevron-right.d.ts
deleted file mode 100644
index befb8cea98..0000000000
--- a/types/react-icons/lib/md/chevron-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdChevronRight extends React.Component<IconBaseProps> { }
-export = MdChevronRight;
diff --git a/types/react-icons/lib/md/child-care.d.ts b/types/react-icons/lib/md/child-care.d.ts
deleted file mode 100644
index ed581fa911..0000000000
--- a/types/react-icons/lib/md/child-care.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdChildCare extends React.Component<IconBaseProps> { }
-export = MdChildCare;
diff --git a/types/react-icons/lib/md/child-friendly.d.ts b/types/react-icons/lib/md/child-friendly.d.ts
deleted file mode 100644
index c5f658131d..0000000000
--- a/types/react-icons/lib/md/child-friendly.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdChildFriendly extends React.Component<IconBaseProps> { }
-export = MdChildFriendly;
diff --git a/types/react-icons/lib/md/chrome-reader-mode.d.ts b/types/react-icons/lib/md/chrome-reader-mode.d.ts
deleted file mode 100644
index 3737f028fb..0000000000
--- a/types/react-icons/lib/md/chrome-reader-mode.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdChromeReaderMode extends React.Component<IconBaseProps> { }
-export = MdChromeReaderMode;
diff --git a/types/react-icons/lib/md/class.d.ts b/types/react-icons/lib/md/class.d.ts
deleted file mode 100644
index 74a101b1f3..0000000000
--- a/types/react-icons/lib/md/class.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdClass extends React.Component<IconBaseProps> { }
-export = MdClass;
diff --git a/types/react-icons/lib/md/clear-all.d.ts b/types/react-icons/lib/md/clear-all.d.ts
deleted file mode 100644
index 079c95bc0b..0000000000
--- a/types/react-icons/lib/md/clear-all.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdClearAll extends React.Component<IconBaseProps> { }
-export = MdClearAll;
diff --git a/types/react-icons/lib/md/clear.d.ts b/types/react-icons/lib/md/clear.d.ts
deleted file mode 100644
index a30ef11252..0000000000
--- a/types/react-icons/lib/md/clear.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdClear extends React.Component<IconBaseProps> { }
-export = MdClear;
diff --git a/types/react-icons/lib/md/close.d.ts b/types/react-icons/lib/md/close.d.ts
deleted file mode 100644
index 8164e66b7a..0000000000
--- a/types/react-icons/lib/md/close.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdClose extends React.Component<IconBaseProps> { }
-export = MdClose;
diff --git a/types/react-icons/lib/md/closed-caption.d.ts b/types/react-icons/lib/md/closed-caption.d.ts
deleted file mode 100644
index 5807eff5b1..0000000000
--- a/types/react-icons/lib/md/closed-caption.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdClosedCaption extends React.Component<IconBaseProps> { }
-export = MdClosedCaption;
diff --git a/types/react-icons/lib/md/cloud-circle.d.ts b/types/react-icons/lib/md/cloud-circle.d.ts
deleted file mode 100644
index dab82258ba..0000000000
--- a/types/react-icons/lib/md/cloud-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCloudCircle extends React.Component<IconBaseProps> { }
-export = MdCloudCircle;
diff --git a/types/react-icons/lib/md/cloud-done.d.ts b/types/react-icons/lib/md/cloud-done.d.ts
deleted file mode 100644
index 004c6b7f2e..0000000000
--- a/types/react-icons/lib/md/cloud-done.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCloudDone extends React.Component<IconBaseProps> { }
-export = MdCloudDone;
diff --git a/types/react-icons/lib/md/cloud-download.d.ts b/types/react-icons/lib/md/cloud-download.d.ts
deleted file mode 100644
index 861d299855..0000000000
--- a/types/react-icons/lib/md/cloud-download.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCloudDownload extends React.Component<IconBaseProps> { }
-export = MdCloudDownload;
diff --git a/types/react-icons/lib/md/cloud-off.d.ts b/types/react-icons/lib/md/cloud-off.d.ts
deleted file mode 100644
index 11923adffc..0000000000
--- a/types/react-icons/lib/md/cloud-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCloudOff extends React.Component<IconBaseProps> { }
-export = MdCloudOff;
diff --git a/types/react-icons/lib/md/cloud-queue.d.ts b/types/react-icons/lib/md/cloud-queue.d.ts
deleted file mode 100644
index 8057c4f888..0000000000
--- a/types/react-icons/lib/md/cloud-queue.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCloudQueue extends React.Component<IconBaseProps> { }
-export = MdCloudQueue;
diff --git a/types/react-icons/lib/md/cloud-upload.d.ts b/types/react-icons/lib/md/cloud-upload.d.ts
deleted file mode 100644
index 3ff02a9a0e..0000000000
--- a/types/react-icons/lib/md/cloud-upload.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCloudUpload extends React.Component<IconBaseProps> { }
-export = MdCloudUpload;
diff --git a/types/react-icons/lib/md/cloud.d.ts b/types/react-icons/lib/md/cloud.d.ts
deleted file mode 100644
index 0c904ab956..0000000000
--- a/types/react-icons/lib/md/cloud.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCloud extends React.Component<IconBaseProps> { }
-export = MdCloud;
diff --git a/types/react-icons/lib/md/code.d.ts b/types/react-icons/lib/md/code.d.ts
deleted file mode 100644
index ec06a5251e..0000000000
--- a/types/react-icons/lib/md/code.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCode extends React.Component<IconBaseProps> { }
-export = MdCode;
diff --git a/types/react-icons/lib/md/collections-bookmark.d.ts b/types/react-icons/lib/md/collections-bookmark.d.ts
deleted file mode 100644
index 8f21854011..0000000000
--- a/types/react-icons/lib/md/collections-bookmark.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCollectionsBookmark extends React.Component<IconBaseProps> { }
-export = MdCollectionsBookmark;
diff --git a/types/react-icons/lib/md/collections.d.ts b/types/react-icons/lib/md/collections.d.ts
deleted file mode 100644
index 670a27794a..0000000000
--- a/types/react-icons/lib/md/collections.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCollections extends React.Component<IconBaseProps> { }
-export = MdCollections;
diff --git a/types/react-icons/lib/md/color-lens.d.ts b/types/react-icons/lib/md/color-lens.d.ts
deleted file mode 100644
index 93794aafd7..0000000000
--- a/types/react-icons/lib/md/color-lens.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdColorLens extends React.Component<IconBaseProps> { }
-export = MdColorLens;
diff --git a/types/react-icons/lib/md/colorize.d.ts b/types/react-icons/lib/md/colorize.d.ts
deleted file mode 100644
index 7d9c059323..0000000000
--- a/types/react-icons/lib/md/colorize.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdColorize extends React.Component<IconBaseProps> { }
-export = MdColorize;
diff --git a/types/react-icons/lib/md/comment.d.ts b/types/react-icons/lib/md/comment.d.ts
deleted file mode 100644
index 388e899032..0000000000
--- a/types/react-icons/lib/md/comment.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdComment extends React.Component<IconBaseProps> { }
-export = MdComment;
diff --git a/types/react-icons/lib/md/compare-arrows.d.ts b/types/react-icons/lib/md/compare-arrows.d.ts
deleted file mode 100644
index 094d5f9ffb..0000000000
--- a/types/react-icons/lib/md/compare-arrows.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCompareArrows extends React.Component<IconBaseProps> { }
-export = MdCompareArrows;
diff --git a/types/react-icons/lib/md/compare.d.ts b/types/react-icons/lib/md/compare.d.ts
deleted file mode 100644
index a980ef66c5..0000000000
--- a/types/react-icons/lib/md/compare.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCompare extends React.Component<IconBaseProps> { }
-export = MdCompare;
diff --git a/types/react-icons/lib/md/computer.d.ts b/types/react-icons/lib/md/computer.d.ts
deleted file mode 100644
index 9aa010e9f0..0000000000
--- a/types/react-icons/lib/md/computer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdComputer extends React.Component<IconBaseProps> { }
-export = MdComputer;
diff --git a/types/react-icons/lib/md/confirmation-number.d.ts b/types/react-icons/lib/md/confirmation-number.d.ts
deleted file mode 100644
index 6d21269176..0000000000
--- a/types/react-icons/lib/md/confirmation-number.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdConfirmationNumber extends React.Component<IconBaseProps> { }
-export = MdConfirmationNumber;
diff --git a/types/react-icons/lib/md/contact-mail.d.ts b/types/react-icons/lib/md/contact-mail.d.ts
deleted file mode 100644
index 7097c62e6b..0000000000
--- a/types/react-icons/lib/md/contact-mail.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdContactMail extends React.Component<IconBaseProps> { }
-export = MdContactMail;
diff --git a/types/react-icons/lib/md/contact-phone.d.ts b/types/react-icons/lib/md/contact-phone.d.ts
deleted file mode 100644
index 46a15ce303..0000000000
--- a/types/react-icons/lib/md/contact-phone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdContactPhone extends React.Component<IconBaseProps> { }
-export = MdContactPhone;
diff --git a/types/react-icons/lib/md/contacts.d.ts b/types/react-icons/lib/md/contacts.d.ts
deleted file mode 100644
index 356af4ee87..0000000000
--- a/types/react-icons/lib/md/contacts.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdContacts extends React.Component<IconBaseProps> { }
-export = MdContacts;
diff --git a/types/react-icons/lib/md/content-copy.d.ts b/types/react-icons/lib/md/content-copy.d.ts
deleted file mode 100644
index a0be0e9f4f..0000000000
--- a/types/react-icons/lib/md/content-copy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdContentCopy extends React.Component<IconBaseProps> { }
-export = MdContentCopy;
diff --git a/types/react-icons/lib/md/content-cut.d.ts b/types/react-icons/lib/md/content-cut.d.ts
deleted file mode 100644
index 2523e9545f..0000000000
--- a/types/react-icons/lib/md/content-cut.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdContentCut extends React.Component<IconBaseProps> { }
-export = MdContentCut;
diff --git a/types/react-icons/lib/md/content-paste.d.ts b/types/react-icons/lib/md/content-paste.d.ts
deleted file mode 100644
index d4eb4155b0..0000000000
--- a/types/react-icons/lib/md/content-paste.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdContentPaste extends React.Component<IconBaseProps> { }
-export = MdContentPaste;
diff --git a/types/react-icons/lib/md/control-point-duplicate.d.ts b/types/react-icons/lib/md/control-point-duplicate.d.ts
deleted file mode 100644
index 12be0cb5b2..0000000000
--- a/types/react-icons/lib/md/control-point-duplicate.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdControlPointDuplicate extends React.Component<IconBaseProps> { }
-export = MdControlPointDuplicate;
diff --git a/types/react-icons/lib/md/control-point.d.ts b/types/react-icons/lib/md/control-point.d.ts
deleted file mode 100644
index 9ed8996573..0000000000
--- a/types/react-icons/lib/md/control-point.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdControlPoint extends React.Component<IconBaseProps> { }
-export = MdControlPoint;
diff --git a/types/react-icons/lib/md/copyright.d.ts b/types/react-icons/lib/md/copyright.d.ts
deleted file mode 100644
index 6aedb414ac..0000000000
--- a/types/react-icons/lib/md/copyright.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCopyright extends React.Component<IconBaseProps> { }
-export = MdCopyright;
diff --git a/types/react-icons/lib/md/create-new-folder.d.ts b/types/react-icons/lib/md/create-new-folder.d.ts
deleted file mode 100644
index d94d8a1ccb..0000000000
--- a/types/react-icons/lib/md/create-new-folder.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCreateNewFolder extends React.Component<IconBaseProps> { }
-export = MdCreateNewFolder;
diff --git a/types/react-icons/lib/md/create.d.ts b/types/react-icons/lib/md/create.d.ts
deleted file mode 100644
index 2101f81ca0..0000000000
--- a/types/react-icons/lib/md/create.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCreate extends React.Component<IconBaseProps> { }
-export = MdCreate;
diff --git a/types/react-icons/lib/md/credit-card.d.ts b/types/react-icons/lib/md/credit-card.d.ts
deleted file mode 100644
index 7b830a5dec..0000000000
--- a/types/react-icons/lib/md/credit-card.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCreditCard extends React.Component<IconBaseProps> { }
-export = MdCreditCard;
diff --git a/types/react-icons/lib/md/crop-16-9.d.ts b/types/react-icons/lib/md/crop-16-9.d.ts
deleted file mode 100644
index 70fe5e4df2..0000000000
--- a/types/react-icons/lib/md/crop-16-9.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCrop169 extends React.Component<IconBaseProps> { }
-export = MdCrop169;
diff --git a/types/react-icons/lib/md/crop-3-2.d.ts b/types/react-icons/lib/md/crop-3-2.d.ts
deleted file mode 100644
index e3b49cac55..0000000000
--- a/types/react-icons/lib/md/crop-3-2.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCrop32 extends React.Component<IconBaseProps> { }
-export = MdCrop32;
diff --git a/types/react-icons/lib/md/crop-5-4.d.ts b/types/react-icons/lib/md/crop-5-4.d.ts
deleted file mode 100644
index f44ec1dc15..0000000000
--- a/types/react-icons/lib/md/crop-5-4.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCrop54 extends React.Component<IconBaseProps> { }
-export = MdCrop54;
diff --git a/types/react-icons/lib/md/crop-7-5.d.ts b/types/react-icons/lib/md/crop-7-5.d.ts
deleted file mode 100644
index b283e385e4..0000000000
--- a/types/react-icons/lib/md/crop-7-5.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCrop75 extends React.Component<IconBaseProps> { }
-export = MdCrop75;
diff --git a/types/react-icons/lib/md/crop-din.d.ts b/types/react-icons/lib/md/crop-din.d.ts
deleted file mode 100644
index f6c27311d5..0000000000
--- a/types/react-icons/lib/md/crop-din.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCropDin extends React.Component<IconBaseProps> { }
-export = MdCropDin;
diff --git a/types/react-icons/lib/md/crop-free.d.ts b/types/react-icons/lib/md/crop-free.d.ts
deleted file mode 100644
index a526edc6ed..0000000000
--- a/types/react-icons/lib/md/crop-free.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCropFree extends React.Component<IconBaseProps> { }
-export = MdCropFree;
diff --git a/types/react-icons/lib/md/crop-landscape.d.ts b/types/react-icons/lib/md/crop-landscape.d.ts
deleted file mode 100644
index 7c224aff4c..0000000000
--- a/types/react-icons/lib/md/crop-landscape.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCropLandscape extends React.Component<IconBaseProps> { }
-export = MdCropLandscape;
diff --git a/types/react-icons/lib/md/crop-original.d.ts b/types/react-icons/lib/md/crop-original.d.ts
deleted file mode 100644
index 24310372ec..0000000000
--- a/types/react-icons/lib/md/crop-original.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCropOriginal extends React.Component<IconBaseProps> { }
-export = MdCropOriginal;
diff --git a/types/react-icons/lib/md/crop-portrait.d.ts b/types/react-icons/lib/md/crop-portrait.d.ts
deleted file mode 100644
index a9bf07301e..0000000000
--- a/types/react-icons/lib/md/crop-portrait.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCropPortrait extends React.Component<IconBaseProps> { }
-export = MdCropPortrait;
diff --git a/types/react-icons/lib/md/crop-rotate.d.ts b/types/react-icons/lib/md/crop-rotate.d.ts
deleted file mode 100644
index a7363f7798..0000000000
--- a/types/react-icons/lib/md/crop-rotate.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCropRotate extends React.Component<IconBaseProps> { }
-export = MdCropRotate;
diff --git a/types/react-icons/lib/md/crop-square.d.ts b/types/react-icons/lib/md/crop-square.d.ts
deleted file mode 100644
index a33bba56d2..0000000000
--- a/types/react-icons/lib/md/crop-square.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCropSquare extends React.Component<IconBaseProps> { }
-export = MdCropSquare;
diff --git a/types/react-icons/lib/md/crop.d.ts b/types/react-icons/lib/md/crop.d.ts
deleted file mode 100644
index 0375235973..0000000000
--- a/types/react-icons/lib/md/crop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdCrop extends React.Component<IconBaseProps> { }
-export = MdCrop;
diff --git a/types/react-icons/lib/md/dashboard.d.ts b/types/react-icons/lib/md/dashboard.d.ts
deleted file mode 100644
index 741cb37968..0000000000
--- a/types/react-icons/lib/md/dashboard.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDashboard extends React.Component<IconBaseProps> { }
-export = MdDashboard;
diff --git a/types/react-icons/lib/md/data-usage.d.ts b/types/react-icons/lib/md/data-usage.d.ts
deleted file mode 100644
index c51830af57..0000000000
--- a/types/react-icons/lib/md/data-usage.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDataUsage extends React.Component<IconBaseProps> { }
-export = MdDataUsage;
diff --git a/types/react-icons/lib/md/date-range.d.ts b/types/react-icons/lib/md/date-range.d.ts
deleted file mode 100644
index 90a920e81e..0000000000
--- a/types/react-icons/lib/md/date-range.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDateRange extends React.Component<IconBaseProps> { }
-export = MdDateRange;
diff --git a/types/react-icons/lib/md/dehaze.d.ts b/types/react-icons/lib/md/dehaze.d.ts
deleted file mode 100644
index 0c1700f065..0000000000
--- a/types/react-icons/lib/md/dehaze.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDehaze extends React.Component<IconBaseProps> { }
-export = MdDehaze;
diff --git a/types/react-icons/lib/md/delete-forever.d.ts b/types/react-icons/lib/md/delete-forever.d.ts
deleted file mode 100644
index e2d8ce1c53..0000000000
--- a/types/react-icons/lib/md/delete-forever.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDeleteForever extends React.Component<IconBaseProps> { }
-export = MdDeleteForever;
diff --git a/types/react-icons/lib/md/delete-sweep.d.ts b/types/react-icons/lib/md/delete-sweep.d.ts
deleted file mode 100644
index 857d38f6af..0000000000
--- a/types/react-icons/lib/md/delete-sweep.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDeleteSweep extends React.Component<IconBaseProps> { }
-export = MdDeleteSweep;
diff --git a/types/react-icons/lib/md/delete.d.ts b/types/react-icons/lib/md/delete.d.ts
deleted file mode 100644
index 761f230dd9..0000000000
--- a/types/react-icons/lib/md/delete.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDelete extends React.Component<IconBaseProps> { }
-export = MdDelete;
diff --git a/types/react-icons/lib/md/description.d.ts b/types/react-icons/lib/md/description.d.ts
deleted file mode 100644
index da148361f0..0000000000
--- a/types/react-icons/lib/md/description.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDescription extends React.Component<IconBaseProps> { }
-export = MdDescription;
diff --git a/types/react-icons/lib/md/desktop-mac.d.ts b/types/react-icons/lib/md/desktop-mac.d.ts
deleted file mode 100644
index 8bdd624240..0000000000
--- a/types/react-icons/lib/md/desktop-mac.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDesktopMac extends React.Component<IconBaseProps> { }
-export = MdDesktopMac;
diff --git a/types/react-icons/lib/md/desktop-windows.d.ts b/types/react-icons/lib/md/desktop-windows.d.ts
deleted file mode 100644
index 8912843f33..0000000000
--- a/types/react-icons/lib/md/desktop-windows.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDesktopWindows extends React.Component<IconBaseProps> { }
-export = MdDesktopWindows;
diff --git a/types/react-icons/lib/md/details.d.ts b/types/react-icons/lib/md/details.d.ts
deleted file mode 100644
index ea077267ba..0000000000
--- a/types/react-icons/lib/md/details.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDetails extends React.Component<IconBaseProps> { }
-export = MdDetails;
diff --git a/types/react-icons/lib/md/developer-board.d.ts b/types/react-icons/lib/md/developer-board.d.ts
deleted file mode 100644
index a95b8e752d..0000000000
--- a/types/react-icons/lib/md/developer-board.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDeveloperBoard extends React.Component<IconBaseProps> { }
-export = MdDeveloperBoard;
diff --git a/types/react-icons/lib/md/developer-mode.d.ts b/types/react-icons/lib/md/developer-mode.d.ts
deleted file mode 100644
index ef6734a5c2..0000000000
--- a/types/react-icons/lib/md/developer-mode.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDeveloperMode extends React.Component<IconBaseProps> { }
-export = MdDeveloperMode;
diff --git a/types/react-icons/lib/md/device-hub.d.ts b/types/react-icons/lib/md/device-hub.d.ts
deleted file mode 100644
index 015a1b17d9..0000000000
--- a/types/react-icons/lib/md/device-hub.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDeviceHub extends React.Component<IconBaseProps> { }
-export = MdDeviceHub;
diff --git a/types/react-icons/lib/md/devices-other.d.ts b/types/react-icons/lib/md/devices-other.d.ts
deleted file mode 100644
index 4eb8c7937d..0000000000
--- a/types/react-icons/lib/md/devices-other.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDevicesOther extends React.Component<IconBaseProps> { }
-export = MdDevicesOther;
diff --git a/types/react-icons/lib/md/devices.d.ts b/types/react-icons/lib/md/devices.d.ts
deleted file mode 100644
index fc1d0d3521..0000000000
--- a/types/react-icons/lib/md/devices.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDevices extends React.Component<IconBaseProps> { }
-export = MdDevices;
diff --git a/types/react-icons/lib/md/dialer-sip.d.ts b/types/react-icons/lib/md/dialer-sip.d.ts
deleted file mode 100644
index 5e0eec11d8..0000000000
--- a/types/react-icons/lib/md/dialer-sip.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDialerSip extends React.Component<IconBaseProps> { }
-export = MdDialerSip;
diff --git a/types/react-icons/lib/md/dialpad.d.ts b/types/react-icons/lib/md/dialpad.d.ts
deleted file mode 100644
index cdcd0bfe91..0000000000
--- a/types/react-icons/lib/md/dialpad.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDialpad extends React.Component<IconBaseProps> { }
-export = MdDialpad;
diff --git a/types/react-icons/lib/md/directions-bike.d.ts b/types/react-icons/lib/md/directions-bike.d.ts
deleted file mode 100644
index 4b214023fe..0000000000
--- a/types/react-icons/lib/md/directions-bike.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDirectionsBike extends React.Component<IconBaseProps> { }
-export = MdDirectionsBike;
diff --git a/types/react-icons/lib/md/directions-boat.d.ts b/types/react-icons/lib/md/directions-boat.d.ts
deleted file mode 100644
index d0729a199e..0000000000
--- a/types/react-icons/lib/md/directions-boat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDirectionsBoat extends React.Component<IconBaseProps> { }
-export = MdDirectionsBoat;
diff --git a/types/react-icons/lib/md/directions-bus.d.ts b/types/react-icons/lib/md/directions-bus.d.ts
deleted file mode 100644
index 12b9b704d6..0000000000
--- a/types/react-icons/lib/md/directions-bus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDirectionsBus extends React.Component<IconBaseProps> { }
-export = MdDirectionsBus;
diff --git a/types/react-icons/lib/md/directions-car.d.ts b/types/react-icons/lib/md/directions-car.d.ts
deleted file mode 100644
index 3e2313c242..0000000000
--- a/types/react-icons/lib/md/directions-car.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDirectionsCar extends React.Component<IconBaseProps> { }
-export = MdDirectionsCar;
diff --git a/types/react-icons/lib/md/directions-ferry.d.ts b/types/react-icons/lib/md/directions-ferry.d.ts
deleted file mode 100644
index c797e3804d..0000000000
--- a/types/react-icons/lib/md/directions-ferry.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDirectionsFerry extends React.Component<IconBaseProps> { }
-export = MdDirectionsFerry;
diff --git a/types/react-icons/lib/md/directions-railway.d.ts b/types/react-icons/lib/md/directions-railway.d.ts
deleted file mode 100644
index b5895757b9..0000000000
--- a/types/react-icons/lib/md/directions-railway.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDirectionsRailway extends React.Component<IconBaseProps> { }
-export = MdDirectionsRailway;
diff --git a/types/react-icons/lib/md/directions-run.d.ts b/types/react-icons/lib/md/directions-run.d.ts
deleted file mode 100644
index 2c48d943a7..0000000000
--- a/types/react-icons/lib/md/directions-run.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDirectionsRun extends React.Component<IconBaseProps> { }
-export = MdDirectionsRun;
diff --git a/types/react-icons/lib/md/directions-subway.d.ts b/types/react-icons/lib/md/directions-subway.d.ts
deleted file mode 100644
index cc4bf86ea1..0000000000
--- a/types/react-icons/lib/md/directions-subway.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDirectionsSubway extends React.Component<IconBaseProps> { }
-export = MdDirectionsSubway;
diff --git a/types/react-icons/lib/md/directions-transit.d.ts b/types/react-icons/lib/md/directions-transit.d.ts
deleted file mode 100644
index a1cab5be50..0000000000
--- a/types/react-icons/lib/md/directions-transit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDirectionsTransit extends React.Component<IconBaseProps> { }
-export = MdDirectionsTransit;
diff --git a/types/react-icons/lib/md/directions-walk.d.ts b/types/react-icons/lib/md/directions-walk.d.ts
deleted file mode 100644
index 8dd9735db6..0000000000
--- a/types/react-icons/lib/md/directions-walk.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDirectionsWalk extends React.Component<IconBaseProps> { }
-export = MdDirectionsWalk;
diff --git a/types/react-icons/lib/md/directions.d.ts b/types/react-icons/lib/md/directions.d.ts
deleted file mode 100644
index 01ea70a407..0000000000
--- a/types/react-icons/lib/md/directions.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDirections extends React.Component<IconBaseProps> { }
-export = MdDirections;
diff --git a/types/react-icons/lib/md/disc-full.d.ts b/types/react-icons/lib/md/disc-full.d.ts
deleted file mode 100644
index 0f99403824..0000000000
--- a/types/react-icons/lib/md/disc-full.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDiscFull extends React.Component<IconBaseProps> { }
-export = MdDiscFull;
diff --git a/types/react-icons/lib/md/dns.d.ts b/types/react-icons/lib/md/dns.d.ts
deleted file mode 100644
index ac4074dd65..0000000000
--- a/types/react-icons/lib/md/dns.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDns extends React.Component<IconBaseProps> { }
-export = MdDns;
diff --git a/types/react-icons/lib/md/do-not-disturb-alt.d.ts b/types/react-icons/lib/md/do-not-disturb-alt.d.ts
deleted file mode 100644
index 968790ef49..0000000000
--- a/types/react-icons/lib/md/do-not-disturb-alt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDoNotDisturbAlt extends React.Component<IconBaseProps> { }
-export = MdDoNotDisturbAlt;
diff --git a/types/react-icons/lib/md/do-not-disturb-off.d.ts b/types/react-icons/lib/md/do-not-disturb-off.d.ts
deleted file mode 100644
index 191fdbd021..0000000000
--- a/types/react-icons/lib/md/do-not-disturb-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDoNotDisturbOff extends React.Component<IconBaseProps> { }
-export = MdDoNotDisturbOff;
diff --git a/types/react-icons/lib/md/do-not-disturb.d.ts b/types/react-icons/lib/md/do-not-disturb.d.ts
deleted file mode 100644
index bbf62abfa8..0000000000
--- a/types/react-icons/lib/md/do-not-disturb.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDoNotDisturb extends React.Component<IconBaseProps> { }
-export = MdDoNotDisturb;
diff --git a/types/react-icons/lib/md/dock.d.ts b/types/react-icons/lib/md/dock.d.ts
deleted file mode 100644
index a4a7aede1d..0000000000
--- a/types/react-icons/lib/md/dock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDock extends React.Component<IconBaseProps> { }
-export = MdDock;
diff --git a/types/react-icons/lib/md/domain.d.ts b/types/react-icons/lib/md/domain.d.ts
deleted file mode 100644
index 742cce594e..0000000000
--- a/types/react-icons/lib/md/domain.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDomain extends React.Component<IconBaseProps> { }
-export = MdDomain;
diff --git a/types/react-icons/lib/md/done-all.d.ts b/types/react-icons/lib/md/done-all.d.ts
deleted file mode 100644
index 83da2f1ed2..0000000000
--- a/types/react-icons/lib/md/done-all.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDoneAll extends React.Component<IconBaseProps> { }
-export = MdDoneAll;
diff --git a/types/react-icons/lib/md/done.d.ts b/types/react-icons/lib/md/done.d.ts
deleted file mode 100644
index d310efc5fb..0000000000
--- a/types/react-icons/lib/md/done.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDone extends React.Component<IconBaseProps> { }
-export = MdDone;
diff --git a/types/react-icons/lib/md/donut-large.d.ts b/types/react-icons/lib/md/donut-large.d.ts
deleted file mode 100644
index 19aae88f9a..0000000000
--- a/types/react-icons/lib/md/donut-large.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDonutLarge extends React.Component<IconBaseProps> { }
-export = MdDonutLarge;
diff --git a/types/react-icons/lib/md/donut-small.d.ts b/types/react-icons/lib/md/donut-small.d.ts
deleted file mode 100644
index 4006487408..0000000000
--- a/types/react-icons/lib/md/donut-small.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDonutSmall extends React.Component<IconBaseProps> { }
-export = MdDonutSmall;
diff --git a/types/react-icons/lib/md/drafts.d.ts b/types/react-icons/lib/md/drafts.d.ts
deleted file mode 100644
index 47ced0caf3..0000000000
--- a/types/react-icons/lib/md/drafts.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDrafts extends React.Component<IconBaseProps> { }
-export = MdDrafts;
diff --git a/types/react-icons/lib/md/drag-handle.d.ts b/types/react-icons/lib/md/drag-handle.d.ts
deleted file mode 100644
index 7a5507a43d..0000000000
--- a/types/react-icons/lib/md/drag-handle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDragHandle extends React.Component<IconBaseProps> { }
-export = MdDragHandle;
diff --git a/types/react-icons/lib/md/drive-eta.d.ts b/types/react-icons/lib/md/drive-eta.d.ts
deleted file mode 100644
index bbfc19b784..0000000000
--- a/types/react-icons/lib/md/drive-eta.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDriveEta extends React.Component<IconBaseProps> { }
-export = MdDriveEta;
diff --git a/types/react-icons/lib/md/dvr.d.ts b/types/react-icons/lib/md/dvr.d.ts
deleted file mode 100644
index fe06a5720f..0000000000
--- a/types/react-icons/lib/md/dvr.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdDvr extends React.Component<IconBaseProps> { }
-export = MdDvr;
diff --git a/types/react-icons/lib/md/edit-location.d.ts b/types/react-icons/lib/md/edit-location.d.ts
deleted file mode 100644
index b7b5b079c6..0000000000
--- a/types/react-icons/lib/md/edit-location.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdEditLocation extends React.Component<IconBaseProps> { }
-export = MdEditLocation;
diff --git a/types/react-icons/lib/md/edit.d.ts b/types/react-icons/lib/md/edit.d.ts
deleted file mode 100644
index d93921ebed..0000000000
--- a/types/react-icons/lib/md/edit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdEdit extends React.Component<IconBaseProps> { }
-export = MdEdit;
diff --git a/types/react-icons/lib/md/eject.d.ts b/types/react-icons/lib/md/eject.d.ts
deleted file mode 100644
index b0f783c078..0000000000
--- a/types/react-icons/lib/md/eject.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdEject extends React.Component<IconBaseProps> { }
-export = MdEject;
diff --git a/types/react-icons/lib/md/email.d.ts b/types/react-icons/lib/md/email.d.ts
deleted file mode 100644
index 3c6e12207f..0000000000
--- a/types/react-icons/lib/md/email.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdEmail extends React.Component<IconBaseProps> { }
-export = MdEmail;
diff --git a/types/react-icons/lib/md/enhanced-encryption.d.ts b/types/react-icons/lib/md/enhanced-encryption.d.ts
deleted file mode 100644
index 349a860441..0000000000
--- a/types/react-icons/lib/md/enhanced-encryption.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdEnhancedEncryption extends React.Component<IconBaseProps> { }
-export = MdEnhancedEncryption;
diff --git a/types/react-icons/lib/md/equalizer.d.ts b/types/react-icons/lib/md/equalizer.d.ts
deleted file mode 100644
index 7530cf7695..0000000000
--- a/types/react-icons/lib/md/equalizer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdEqualizer extends React.Component<IconBaseProps> { }
-export = MdEqualizer;
diff --git a/types/react-icons/lib/md/error-outline.d.ts b/types/react-icons/lib/md/error-outline.d.ts
deleted file mode 100644
index 4e6e732a4c..0000000000
--- a/types/react-icons/lib/md/error-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdErrorOutline extends React.Component<IconBaseProps> { }
-export = MdErrorOutline;
diff --git a/types/react-icons/lib/md/error.d.ts b/types/react-icons/lib/md/error.d.ts
deleted file mode 100644
index 5b2809e65d..0000000000
--- a/types/react-icons/lib/md/error.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdError extends React.Component<IconBaseProps> { }
-export = MdError;
diff --git a/types/react-icons/lib/md/euro-symbol.d.ts b/types/react-icons/lib/md/euro-symbol.d.ts
deleted file mode 100644
index 9ae12d17be..0000000000
--- a/types/react-icons/lib/md/euro-symbol.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdEuroSymbol extends React.Component<IconBaseProps> { }
-export = MdEuroSymbol;
diff --git a/types/react-icons/lib/md/ev-station.d.ts b/types/react-icons/lib/md/ev-station.d.ts
deleted file mode 100644
index b9620cae5e..0000000000
--- a/types/react-icons/lib/md/ev-station.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdEvStation extends React.Component<IconBaseProps> { }
-export = MdEvStation;
diff --git a/types/react-icons/lib/md/event-available.d.ts b/types/react-icons/lib/md/event-available.d.ts
deleted file mode 100644
index b347743558..0000000000
--- a/types/react-icons/lib/md/event-available.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdEventAvailable extends React.Component<IconBaseProps> { }
-export = MdEventAvailable;
diff --git a/types/react-icons/lib/md/event-busy.d.ts b/types/react-icons/lib/md/event-busy.d.ts
deleted file mode 100644
index 3fc3be1c59..0000000000
--- a/types/react-icons/lib/md/event-busy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdEventBusy extends React.Component<IconBaseProps> { }
-export = MdEventBusy;
diff --git a/types/react-icons/lib/md/event-note.d.ts b/types/react-icons/lib/md/event-note.d.ts
deleted file mode 100644
index 34a6684ae4..0000000000
--- a/types/react-icons/lib/md/event-note.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdEventNote extends React.Component<IconBaseProps> { }
-export = MdEventNote;
diff --git a/types/react-icons/lib/md/event-seat.d.ts b/types/react-icons/lib/md/event-seat.d.ts
deleted file mode 100644
index f45d48eb2e..0000000000
--- a/types/react-icons/lib/md/event-seat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdEventSeat extends React.Component<IconBaseProps> { }
-export = MdEventSeat;
diff --git a/types/react-icons/lib/md/event.d.ts b/types/react-icons/lib/md/event.d.ts
deleted file mode 100644
index 1237aeb777..0000000000
--- a/types/react-icons/lib/md/event.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdEvent extends React.Component<IconBaseProps> { }
-export = MdEvent;
diff --git a/types/react-icons/lib/md/exit-to-app.d.ts b/types/react-icons/lib/md/exit-to-app.d.ts
deleted file mode 100644
index f8de476ba4..0000000000
--- a/types/react-icons/lib/md/exit-to-app.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdExitToApp extends React.Component<IconBaseProps> { }
-export = MdExitToApp;
diff --git a/types/react-icons/lib/md/expand-less.d.ts b/types/react-icons/lib/md/expand-less.d.ts
deleted file mode 100644
index 5706e4bf36..0000000000
--- a/types/react-icons/lib/md/expand-less.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdExpandLess extends React.Component<IconBaseProps> { }
-export = MdExpandLess;
diff --git a/types/react-icons/lib/md/expand-more.d.ts b/types/react-icons/lib/md/expand-more.d.ts
deleted file mode 100644
index e42c0fcebb..0000000000
--- a/types/react-icons/lib/md/expand-more.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdExpandMore extends React.Component<IconBaseProps> { }
-export = MdExpandMore;
diff --git a/types/react-icons/lib/md/explicit.d.ts b/types/react-icons/lib/md/explicit.d.ts
deleted file mode 100644
index 673add9aad..0000000000
--- a/types/react-icons/lib/md/explicit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdExplicit extends React.Component<IconBaseProps> { }
-export = MdExplicit;
diff --git a/types/react-icons/lib/md/explore.d.ts b/types/react-icons/lib/md/explore.d.ts
deleted file mode 100644
index c4a3f09e3f..0000000000
--- a/types/react-icons/lib/md/explore.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdExplore extends React.Component<IconBaseProps> { }
-export = MdExplore;
diff --git a/types/react-icons/lib/md/exposure-minus-1.d.ts b/types/react-icons/lib/md/exposure-minus-1.d.ts
deleted file mode 100644
index 9446fd9e77..0000000000
--- a/types/react-icons/lib/md/exposure-minus-1.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdExposureMinus1 extends React.Component<IconBaseProps> { }
-export = MdExposureMinus1;
diff --git a/types/react-icons/lib/md/exposure-minus-2.d.ts b/types/react-icons/lib/md/exposure-minus-2.d.ts
deleted file mode 100644
index f63ea681dc..0000000000
--- a/types/react-icons/lib/md/exposure-minus-2.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdExposureMinus2 extends React.Component<IconBaseProps> { }
-export = MdExposureMinus2;
diff --git a/types/react-icons/lib/md/exposure-neg-1.d.ts b/types/react-icons/lib/md/exposure-neg-1.d.ts
deleted file mode 100644
index 9adf29cb8e..0000000000
--- a/types/react-icons/lib/md/exposure-neg-1.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdExposureNeg1 extends React.Component<IconBaseProps> { }
-export = MdExposureNeg1;
diff --git a/types/react-icons/lib/md/exposure-neg-2.d.ts b/types/react-icons/lib/md/exposure-neg-2.d.ts
deleted file mode 100644
index e196f110b8..0000000000
--- a/types/react-icons/lib/md/exposure-neg-2.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdExposureNeg2 extends React.Component<IconBaseProps> { }
-export = MdExposureNeg2;
diff --git a/types/react-icons/lib/md/exposure-plus-1.d.ts b/types/react-icons/lib/md/exposure-plus-1.d.ts
deleted file mode 100644
index 2a6be5aa46..0000000000
--- a/types/react-icons/lib/md/exposure-plus-1.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdExposurePlus1 extends React.Component<IconBaseProps> { }
-export = MdExposurePlus1;
diff --git a/types/react-icons/lib/md/exposure-plus-2.d.ts b/types/react-icons/lib/md/exposure-plus-2.d.ts
deleted file mode 100644
index 699dc5c403..0000000000
--- a/types/react-icons/lib/md/exposure-plus-2.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdExposurePlus2 extends React.Component<IconBaseProps> { }
-export = MdExposurePlus2;
diff --git a/types/react-icons/lib/md/exposure-zero.d.ts b/types/react-icons/lib/md/exposure-zero.d.ts
deleted file mode 100644
index a0309b8c9b..0000000000
--- a/types/react-icons/lib/md/exposure-zero.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdExposureZero extends React.Component<IconBaseProps> { }
-export = MdExposureZero;
diff --git a/types/react-icons/lib/md/exposure.d.ts b/types/react-icons/lib/md/exposure.d.ts
deleted file mode 100644
index 308824d04c..0000000000
--- a/types/react-icons/lib/md/exposure.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdExposure extends React.Component<IconBaseProps> { }
-export = MdExposure;
diff --git a/types/react-icons/lib/md/extension.d.ts b/types/react-icons/lib/md/extension.d.ts
deleted file mode 100644
index b472fcea5a..0000000000
--- a/types/react-icons/lib/md/extension.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdExtension extends React.Component<IconBaseProps> { }
-export = MdExtension;
diff --git a/types/react-icons/lib/md/face.d.ts b/types/react-icons/lib/md/face.d.ts
deleted file mode 100644
index bfecdf3a2d..0000000000
--- a/types/react-icons/lib/md/face.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFace extends React.Component<IconBaseProps> { }
-export = MdFace;
diff --git a/types/react-icons/lib/md/fast-forward.d.ts b/types/react-icons/lib/md/fast-forward.d.ts
deleted file mode 100644
index e0364752a4..0000000000
--- a/types/react-icons/lib/md/fast-forward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFastForward extends React.Component<IconBaseProps> { }
-export = MdFastForward;
diff --git a/types/react-icons/lib/md/fast-rewind.d.ts b/types/react-icons/lib/md/fast-rewind.d.ts
deleted file mode 100644
index 8151f3649f..0000000000
--- a/types/react-icons/lib/md/fast-rewind.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFastRewind extends React.Component<IconBaseProps> { }
-export = MdFastRewind;
diff --git a/types/react-icons/lib/md/favorite-border.d.ts b/types/react-icons/lib/md/favorite-border.d.ts
deleted file mode 100644
index d9a6771181..0000000000
--- a/types/react-icons/lib/md/favorite-border.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFavoriteBorder extends React.Component<IconBaseProps> { }
-export = MdFavoriteBorder;
diff --git a/types/react-icons/lib/md/favorite-outline.d.ts b/types/react-icons/lib/md/favorite-outline.d.ts
deleted file mode 100644
index 8eccdcbdf7..0000000000
--- a/types/react-icons/lib/md/favorite-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFavoriteOutline extends React.Component<IconBaseProps> { }
-export = MdFavoriteOutline;
diff --git a/types/react-icons/lib/md/favorite.d.ts b/types/react-icons/lib/md/favorite.d.ts
deleted file mode 100644
index 3bd251bff4..0000000000
--- a/types/react-icons/lib/md/favorite.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFavorite extends React.Component<IconBaseProps> { }
-export = MdFavorite;
diff --git a/types/react-icons/lib/md/featured-play-list.d.ts b/types/react-icons/lib/md/featured-play-list.d.ts
deleted file mode 100644
index 29e8772a70..0000000000
--- a/types/react-icons/lib/md/featured-play-list.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFeaturedPlayList extends React.Component<IconBaseProps> { }
-export = MdFeaturedPlayList;
diff --git a/types/react-icons/lib/md/featured-video.d.ts b/types/react-icons/lib/md/featured-video.d.ts
deleted file mode 100644
index 17db25abb9..0000000000
--- a/types/react-icons/lib/md/featured-video.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFeaturedVideo extends React.Component<IconBaseProps> { }
-export = MdFeaturedVideo;
diff --git a/types/react-icons/lib/md/feedback.d.ts b/types/react-icons/lib/md/feedback.d.ts
deleted file mode 100644
index cee4f3b289..0000000000
--- a/types/react-icons/lib/md/feedback.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFeedback extends React.Component<IconBaseProps> { }
-export = MdFeedback;
diff --git a/types/react-icons/lib/md/fiber-dvr.d.ts b/types/react-icons/lib/md/fiber-dvr.d.ts
deleted file mode 100644
index f9a674481a..0000000000
--- a/types/react-icons/lib/md/fiber-dvr.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFiberDvr extends React.Component<IconBaseProps> { }
-export = MdFiberDvr;
diff --git a/types/react-icons/lib/md/fiber-manual-record.d.ts b/types/react-icons/lib/md/fiber-manual-record.d.ts
deleted file mode 100644
index d89a416618..0000000000
--- a/types/react-icons/lib/md/fiber-manual-record.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFiberManualRecord extends React.Component<IconBaseProps> { }
-export = MdFiberManualRecord;
diff --git a/types/react-icons/lib/md/fiber-new.d.ts b/types/react-icons/lib/md/fiber-new.d.ts
deleted file mode 100644
index 52ce6bee05..0000000000
--- a/types/react-icons/lib/md/fiber-new.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFiberNew extends React.Component<IconBaseProps> { }
-export = MdFiberNew;
diff --git a/types/react-icons/lib/md/fiber-pin.d.ts b/types/react-icons/lib/md/fiber-pin.d.ts
deleted file mode 100644
index c5de78c3f6..0000000000
--- a/types/react-icons/lib/md/fiber-pin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFiberPin extends React.Component<IconBaseProps> { }
-export = MdFiberPin;
diff --git a/types/react-icons/lib/md/fiber-smart-record.d.ts b/types/react-icons/lib/md/fiber-smart-record.d.ts
deleted file mode 100644
index 52ddb3eba4..0000000000
--- a/types/react-icons/lib/md/fiber-smart-record.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFiberSmartRecord extends React.Component<IconBaseProps> { }
-export = MdFiberSmartRecord;
diff --git a/types/react-icons/lib/md/file-download.d.ts b/types/react-icons/lib/md/file-download.d.ts
deleted file mode 100644
index 0b820a99c7..0000000000
--- a/types/react-icons/lib/md/file-download.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFileDownload extends React.Component<IconBaseProps> { }
-export = MdFileDownload;
diff --git a/types/react-icons/lib/md/file-upload.d.ts b/types/react-icons/lib/md/file-upload.d.ts
deleted file mode 100644
index ce06531303..0000000000
--- a/types/react-icons/lib/md/file-upload.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFileUpload extends React.Component<IconBaseProps> { }
-export = MdFileUpload;
diff --git a/types/react-icons/lib/md/filter-1.d.ts b/types/react-icons/lib/md/filter-1.d.ts
deleted file mode 100644
index bed4c717c7..0000000000
--- a/types/react-icons/lib/md/filter-1.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilter1 extends React.Component<IconBaseProps> { }
-export = MdFilter1;
diff --git a/types/react-icons/lib/md/filter-2.d.ts b/types/react-icons/lib/md/filter-2.d.ts
deleted file mode 100644
index bc9d9054c4..0000000000
--- a/types/react-icons/lib/md/filter-2.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilter2 extends React.Component<IconBaseProps> { }
-export = MdFilter2;
diff --git a/types/react-icons/lib/md/filter-3.d.ts b/types/react-icons/lib/md/filter-3.d.ts
deleted file mode 100644
index 5841f94ce8..0000000000
--- a/types/react-icons/lib/md/filter-3.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilter3 extends React.Component<IconBaseProps> { }
-export = MdFilter3;
diff --git a/types/react-icons/lib/md/filter-4.d.ts b/types/react-icons/lib/md/filter-4.d.ts
deleted file mode 100644
index c0e7416e01..0000000000
--- a/types/react-icons/lib/md/filter-4.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilter4 extends React.Component<IconBaseProps> { }
-export = MdFilter4;
diff --git a/types/react-icons/lib/md/filter-5.d.ts b/types/react-icons/lib/md/filter-5.d.ts
deleted file mode 100644
index 2ff87b69ac..0000000000
--- a/types/react-icons/lib/md/filter-5.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilter5 extends React.Component<IconBaseProps> { }
-export = MdFilter5;
diff --git a/types/react-icons/lib/md/filter-6.d.ts b/types/react-icons/lib/md/filter-6.d.ts
deleted file mode 100644
index 8c2e132205..0000000000
--- a/types/react-icons/lib/md/filter-6.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilter6 extends React.Component<IconBaseProps> { }
-export = MdFilter6;
diff --git a/types/react-icons/lib/md/filter-7.d.ts b/types/react-icons/lib/md/filter-7.d.ts
deleted file mode 100644
index 1876e10141..0000000000
--- a/types/react-icons/lib/md/filter-7.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilter7 extends React.Component<IconBaseProps> { }
-export = MdFilter7;
diff --git a/types/react-icons/lib/md/filter-8.d.ts b/types/react-icons/lib/md/filter-8.d.ts
deleted file mode 100644
index 3b8a1ef16b..0000000000
--- a/types/react-icons/lib/md/filter-8.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilter8 extends React.Component<IconBaseProps> { }
-export = MdFilter8;
diff --git a/types/react-icons/lib/md/filter-9-plus.d.ts b/types/react-icons/lib/md/filter-9-plus.d.ts
deleted file mode 100644
index cefab42b95..0000000000
--- a/types/react-icons/lib/md/filter-9-plus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilter9Plus extends React.Component<IconBaseProps> { }
-export = MdFilter9Plus;
diff --git a/types/react-icons/lib/md/filter-9.d.ts b/types/react-icons/lib/md/filter-9.d.ts
deleted file mode 100644
index 41f677c0a4..0000000000
--- a/types/react-icons/lib/md/filter-9.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilter9 extends React.Component<IconBaseProps> { }
-export = MdFilter9;
diff --git a/types/react-icons/lib/md/filter-b-and-w.d.ts b/types/react-icons/lib/md/filter-b-and-w.d.ts
deleted file mode 100644
index 925b5ebe0b..0000000000
--- a/types/react-icons/lib/md/filter-b-and-w.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilterBAndW extends React.Component<IconBaseProps> { }
-export = MdFilterBAndW;
diff --git a/types/react-icons/lib/md/filter-center-focus.d.ts b/types/react-icons/lib/md/filter-center-focus.d.ts
deleted file mode 100644
index 72de58ce3f..0000000000
--- a/types/react-icons/lib/md/filter-center-focus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilterCenterFocus extends React.Component<IconBaseProps> { }
-export = MdFilterCenterFocus;
diff --git a/types/react-icons/lib/md/filter-drama.d.ts b/types/react-icons/lib/md/filter-drama.d.ts
deleted file mode 100644
index 76c44d8431..0000000000
--- a/types/react-icons/lib/md/filter-drama.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilterDrama extends React.Component<IconBaseProps> { }
-export = MdFilterDrama;
diff --git a/types/react-icons/lib/md/filter-frames.d.ts b/types/react-icons/lib/md/filter-frames.d.ts
deleted file mode 100644
index 7484e92211..0000000000
--- a/types/react-icons/lib/md/filter-frames.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilterFrames extends React.Component<IconBaseProps> { }
-export = MdFilterFrames;
diff --git a/types/react-icons/lib/md/filter-hdr.d.ts b/types/react-icons/lib/md/filter-hdr.d.ts
deleted file mode 100644
index c503b594d5..0000000000
--- a/types/react-icons/lib/md/filter-hdr.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilterHdr extends React.Component<IconBaseProps> { }
-export = MdFilterHdr;
diff --git a/types/react-icons/lib/md/filter-list.d.ts b/types/react-icons/lib/md/filter-list.d.ts
deleted file mode 100644
index bf51b71bb3..0000000000
--- a/types/react-icons/lib/md/filter-list.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilterList extends React.Component<IconBaseProps> { }
-export = MdFilterList;
diff --git a/types/react-icons/lib/md/filter-none.d.ts b/types/react-icons/lib/md/filter-none.d.ts
deleted file mode 100644
index 53592bc2ba..0000000000
--- a/types/react-icons/lib/md/filter-none.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilterNone extends React.Component<IconBaseProps> { }
-export = MdFilterNone;
diff --git a/types/react-icons/lib/md/filter-tilt-shift.d.ts b/types/react-icons/lib/md/filter-tilt-shift.d.ts
deleted file mode 100644
index 05bd62ae1d..0000000000
--- a/types/react-icons/lib/md/filter-tilt-shift.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilterTiltShift extends React.Component<IconBaseProps> { }
-export = MdFilterTiltShift;
diff --git a/types/react-icons/lib/md/filter-vintage.d.ts b/types/react-icons/lib/md/filter-vintage.d.ts
deleted file mode 100644
index bbec939c8d..0000000000
--- a/types/react-icons/lib/md/filter-vintage.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilterVintage extends React.Component<IconBaseProps> { }
-export = MdFilterVintage;
diff --git a/types/react-icons/lib/md/filter.d.ts b/types/react-icons/lib/md/filter.d.ts
deleted file mode 100644
index b00d2e5cfc..0000000000
--- a/types/react-icons/lib/md/filter.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFilter extends React.Component<IconBaseProps> { }
-export = MdFilter;
diff --git a/types/react-icons/lib/md/find-in-page.d.ts b/types/react-icons/lib/md/find-in-page.d.ts
deleted file mode 100644
index 379e65cfcb..0000000000
--- a/types/react-icons/lib/md/find-in-page.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFindInPage extends React.Component<IconBaseProps> { }
-export = MdFindInPage;
diff --git a/types/react-icons/lib/md/find-replace.d.ts b/types/react-icons/lib/md/find-replace.d.ts
deleted file mode 100644
index f709db2fbf..0000000000
--- a/types/react-icons/lib/md/find-replace.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFindReplace extends React.Component<IconBaseProps> { }
-export = MdFindReplace;
diff --git a/types/react-icons/lib/md/fingerprint.d.ts b/types/react-icons/lib/md/fingerprint.d.ts
deleted file mode 100644
index ef44e19c98..0000000000
--- a/types/react-icons/lib/md/fingerprint.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFingerprint extends React.Component<IconBaseProps> { }
-export = MdFingerprint;
diff --git a/types/react-icons/lib/md/first-page.d.ts b/types/react-icons/lib/md/first-page.d.ts
deleted file mode 100644
index cd1d3680e0..0000000000
--- a/types/react-icons/lib/md/first-page.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFirstPage extends React.Component<IconBaseProps> { }
-export = MdFirstPage;
diff --git a/types/react-icons/lib/md/fitness-center.d.ts b/types/react-icons/lib/md/fitness-center.d.ts
deleted file mode 100644
index bfcd0ed64c..0000000000
--- a/types/react-icons/lib/md/fitness-center.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFitnessCenter extends React.Component<IconBaseProps> { }
-export = MdFitnessCenter;
diff --git a/types/react-icons/lib/md/flag.d.ts b/types/react-icons/lib/md/flag.d.ts
deleted file mode 100644
index 35aec0014c..0000000000
--- a/types/react-icons/lib/md/flag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFlag extends React.Component<IconBaseProps> { }
-export = MdFlag;
diff --git a/types/react-icons/lib/md/flare.d.ts b/types/react-icons/lib/md/flare.d.ts
deleted file mode 100644
index 89a3e86038..0000000000
--- a/types/react-icons/lib/md/flare.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFlare extends React.Component<IconBaseProps> { }
-export = MdFlare;
diff --git a/types/react-icons/lib/md/flash-auto.d.ts b/types/react-icons/lib/md/flash-auto.d.ts
deleted file mode 100644
index 3fdf942da2..0000000000
--- a/types/react-icons/lib/md/flash-auto.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFlashAuto extends React.Component<IconBaseProps> { }
-export = MdFlashAuto;
diff --git a/types/react-icons/lib/md/flash-off.d.ts b/types/react-icons/lib/md/flash-off.d.ts
deleted file mode 100644
index 2338eeaae1..0000000000
--- a/types/react-icons/lib/md/flash-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFlashOff extends React.Component<IconBaseProps> { }
-export = MdFlashOff;
diff --git a/types/react-icons/lib/md/flash-on.d.ts b/types/react-icons/lib/md/flash-on.d.ts
deleted file mode 100644
index 209f551a6c..0000000000
--- a/types/react-icons/lib/md/flash-on.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFlashOn extends React.Component<IconBaseProps> { }
-export = MdFlashOn;
diff --git a/types/react-icons/lib/md/flight-land.d.ts b/types/react-icons/lib/md/flight-land.d.ts
deleted file mode 100644
index 546ab05d11..0000000000
--- a/types/react-icons/lib/md/flight-land.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFlightLand extends React.Component<IconBaseProps> { }
-export = MdFlightLand;
diff --git a/types/react-icons/lib/md/flight-takeoff.d.ts b/types/react-icons/lib/md/flight-takeoff.d.ts
deleted file mode 100644
index 50f669a9ec..0000000000
--- a/types/react-icons/lib/md/flight-takeoff.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFlightTakeoff extends React.Component<IconBaseProps> { }
-export = MdFlightTakeoff;
diff --git a/types/react-icons/lib/md/flight.d.ts b/types/react-icons/lib/md/flight.d.ts
deleted file mode 100644
index 0850e1e1b3..0000000000
--- a/types/react-icons/lib/md/flight.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFlight extends React.Component<IconBaseProps> { }
-export = MdFlight;
diff --git a/types/react-icons/lib/md/flip-to-back.d.ts b/types/react-icons/lib/md/flip-to-back.d.ts
deleted file mode 100644
index 77c6c084e6..0000000000
--- a/types/react-icons/lib/md/flip-to-back.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFlipToBack extends React.Component<IconBaseProps> { }
-export = MdFlipToBack;
diff --git a/types/react-icons/lib/md/flip-to-front.d.ts b/types/react-icons/lib/md/flip-to-front.d.ts
deleted file mode 100644
index 4f553e292e..0000000000
--- a/types/react-icons/lib/md/flip-to-front.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFlipToFront extends React.Component<IconBaseProps> { }
-export = MdFlipToFront;
diff --git a/types/react-icons/lib/md/flip.d.ts b/types/react-icons/lib/md/flip.d.ts
deleted file mode 100644
index a2919757e4..0000000000
--- a/types/react-icons/lib/md/flip.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFlip extends React.Component<IconBaseProps> { }
-export = MdFlip;
diff --git a/types/react-icons/lib/md/folder-open.d.ts b/types/react-icons/lib/md/folder-open.d.ts
deleted file mode 100644
index 7bdee8f257..0000000000
--- a/types/react-icons/lib/md/folder-open.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFolderOpen extends React.Component<IconBaseProps> { }
-export = MdFolderOpen;
diff --git a/types/react-icons/lib/md/folder-shared.d.ts b/types/react-icons/lib/md/folder-shared.d.ts
deleted file mode 100644
index 26fe5047a6..0000000000
--- a/types/react-icons/lib/md/folder-shared.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFolderShared extends React.Component<IconBaseProps> { }
-export = MdFolderShared;
diff --git a/types/react-icons/lib/md/folder-special.d.ts b/types/react-icons/lib/md/folder-special.d.ts
deleted file mode 100644
index 6315da8a67..0000000000
--- a/types/react-icons/lib/md/folder-special.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFolderSpecial extends React.Component<IconBaseProps> { }
-export = MdFolderSpecial;
diff --git a/types/react-icons/lib/md/folder.d.ts b/types/react-icons/lib/md/folder.d.ts
deleted file mode 100644
index 274d156256..0000000000
--- a/types/react-icons/lib/md/folder.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFolder extends React.Component<IconBaseProps> { }
-export = MdFolder;
diff --git a/types/react-icons/lib/md/font-download.d.ts b/types/react-icons/lib/md/font-download.d.ts
deleted file mode 100644
index baaadab4bf..0000000000
--- a/types/react-icons/lib/md/font-download.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFontDownload extends React.Component<IconBaseProps> { }
-export = MdFontDownload;
diff --git a/types/react-icons/lib/md/format-align-center.d.ts b/types/react-icons/lib/md/format-align-center.d.ts
deleted file mode 100644
index 6678781fab..0000000000
--- a/types/react-icons/lib/md/format-align-center.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatAlignCenter extends React.Component<IconBaseProps> { }
-export = MdFormatAlignCenter;
diff --git a/types/react-icons/lib/md/format-align-justify.d.ts b/types/react-icons/lib/md/format-align-justify.d.ts
deleted file mode 100644
index c169d7d4cf..0000000000
--- a/types/react-icons/lib/md/format-align-justify.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatAlignJustify extends React.Component<IconBaseProps> { }
-export = MdFormatAlignJustify;
diff --git a/types/react-icons/lib/md/format-align-left.d.ts b/types/react-icons/lib/md/format-align-left.d.ts
deleted file mode 100644
index 11fb721bb6..0000000000
--- a/types/react-icons/lib/md/format-align-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatAlignLeft extends React.Component<IconBaseProps> { }
-export = MdFormatAlignLeft;
diff --git a/types/react-icons/lib/md/format-align-right.d.ts b/types/react-icons/lib/md/format-align-right.d.ts
deleted file mode 100644
index ef9444429f..0000000000
--- a/types/react-icons/lib/md/format-align-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatAlignRight extends React.Component<IconBaseProps> { }
-export = MdFormatAlignRight;
diff --git a/types/react-icons/lib/md/format-bold.d.ts b/types/react-icons/lib/md/format-bold.d.ts
deleted file mode 100644
index ebd0027ba8..0000000000
--- a/types/react-icons/lib/md/format-bold.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatBold extends React.Component<IconBaseProps> { }
-export = MdFormatBold;
diff --git a/types/react-icons/lib/md/format-clear.d.ts b/types/react-icons/lib/md/format-clear.d.ts
deleted file mode 100644
index d8350f1916..0000000000
--- a/types/react-icons/lib/md/format-clear.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatClear extends React.Component<IconBaseProps> { }
-export = MdFormatClear;
diff --git a/types/react-icons/lib/md/format-color-fill.d.ts b/types/react-icons/lib/md/format-color-fill.d.ts
deleted file mode 100644
index dac025da7d..0000000000
--- a/types/react-icons/lib/md/format-color-fill.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatColorFill extends React.Component<IconBaseProps> { }
-export = MdFormatColorFill;
diff --git a/types/react-icons/lib/md/format-color-reset.d.ts b/types/react-icons/lib/md/format-color-reset.d.ts
deleted file mode 100644
index 9de4f919d4..0000000000
--- a/types/react-icons/lib/md/format-color-reset.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatColorReset extends React.Component<IconBaseProps> { }
-export = MdFormatColorReset;
diff --git a/types/react-icons/lib/md/format-color-text.d.ts b/types/react-icons/lib/md/format-color-text.d.ts
deleted file mode 100644
index 54d5d3c4fb..0000000000
--- a/types/react-icons/lib/md/format-color-text.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatColorText extends React.Component<IconBaseProps> { }
-export = MdFormatColorText;
diff --git a/types/react-icons/lib/md/format-indent-decrease.d.ts b/types/react-icons/lib/md/format-indent-decrease.d.ts
deleted file mode 100644
index 4eaf1d9537..0000000000
--- a/types/react-icons/lib/md/format-indent-decrease.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatIndentDecrease extends React.Component<IconBaseProps> { }
-export = MdFormatIndentDecrease;
diff --git a/types/react-icons/lib/md/format-indent-increase.d.ts b/types/react-icons/lib/md/format-indent-increase.d.ts
deleted file mode 100644
index f5e0f6008b..0000000000
--- a/types/react-icons/lib/md/format-indent-increase.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatIndentIncrease extends React.Component<IconBaseProps> { }
-export = MdFormatIndentIncrease;
diff --git a/types/react-icons/lib/md/format-italic.d.ts b/types/react-icons/lib/md/format-italic.d.ts
deleted file mode 100644
index c512f7deec..0000000000
--- a/types/react-icons/lib/md/format-italic.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatItalic extends React.Component<IconBaseProps> { }
-export = MdFormatItalic;
diff --git a/types/react-icons/lib/md/format-line-spacing.d.ts b/types/react-icons/lib/md/format-line-spacing.d.ts
deleted file mode 100644
index 8f8317af6a..0000000000
--- a/types/react-icons/lib/md/format-line-spacing.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatLineSpacing extends React.Component<IconBaseProps> { }
-export = MdFormatLineSpacing;
diff --git a/types/react-icons/lib/md/format-list-bulleted.d.ts b/types/react-icons/lib/md/format-list-bulleted.d.ts
deleted file mode 100644
index f658fcb4d3..0000000000
--- a/types/react-icons/lib/md/format-list-bulleted.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatListBulleted extends React.Component<IconBaseProps> { }
-export = MdFormatListBulleted;
diff --git a/types/react-icons/lib/md/format-list-numbered.d.ts b/types/react-icons/lib/md/format-list-numbered.d.ts
deleted file mode 100644
index 3117ab5d31..0000000000
--- a/types/react-icons/lib/md/format-list-numbered.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatListNumbered extends React.Component<IconBaseProps> { }
-export = MdFormatListNumbered;
diff --git a/types/react-icons/lib/md/format-paint.d.ts b/types/react-icons/lib/md/format-paint.d.ts
deleted file mode 100644
index 19111de135..0000000000
--- a/types/react-icons/lib/md/format-paint.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatPaint extends React.Component<IconBaseProps> { }
-export = MdFormatPaint;
diff --git a/types/react-icons/lib/md/format-quote.d.ts b/types/react-icons/lib/md/format-quote.d.ts
deleted file mode 100644
index 921ac98059..0000000000
--- a/types/react-icons/lib/md/format-quote.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatQuote extends React.Component<IconBaseProps> { }
-export = MdFormatQuote;
diff --git a/types/react-icons/lib/md/format-shapes.d.ts b/types/react-icons/lib/md/format-shapes.d.ts
deleted file mode 100644
index 6b60899f89..0000000000
--- a/types/react-icons/lib/md/format-shapes.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatShapes extends React.Component<IconBaseProps> { }
-export = MdFormatShapes;
diff --git a/types/react-icons/lib/md/format-size.d.ts b/types/react-icons/lib/md/format-size.d.ts
deleted file mode 100644
index 05c91f8cde..0000000000
--- a/types/react-icons/lib/md/format-size.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatSize extends React.Component<IconBaseProps> { }
-export = MdFormatSize;
diff --git a/types/react-icons/lib/md/format-strikethrough.d.ts b/types/react-icons/lib/md/format-strikethrough.d.ts
deleted file mode 100644
index 6253769c69..0000000000
--- a/types/react-icons/lib/md/format-strikethrough.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatStrikethrough extends React.Component<IconBaseProps> { }
-export = MdFormatStrikethrough;
diff --git a/types/react-icons/lib/md/format-textdirection-l-to-r.d.ts b/types/react-icons/lib/md/format-textdirection-l-to-r.d.ts
deleted file mode 100644
index 6f33ceb20b..0000000000
--- a/types/react-icons/lib/md/format-textdirection-l-to-r.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatTextdirectionLToR extends React.Component<IconBaseProps> { }
-export = MdFormatTextdirectionLToR;
diff --git a/types/react-icons/lib/md/format-textdirection-r-to-l.d.ts b/types/react-icons/lib/md/format-textdirection-r-to-l.d.ts
deleted file mode 100644
index 2c8c4372f1..0000000000
--- a/types/react-icons/lib/md/format-textdirection-r-to-l.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatTextdirectionRToL extends React.Component<IconBaseProps> { }
-export = MdFormatTextdirectionRToL;
diff --git a/types/react-icons/lib/md/format-underlined.d.ts b/types/react-icons/lib/md/format-underlined.d.ts
deleted file mode 100644
index c721474493..0000000000
--- a/types/react-icons/lib/md/format-underlined.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFormatUnderlined extends React.Component<IconBaseProps> { }
-export = MdFormatUnderlined;
diff --git a/types/react-icons/lib/md/forum.d.ts b/types/react-icons/lib/md/forum.d.ts
deleted file mode 100644
index 16570dcd85..0000000000
--- a/types/react-icons/lib/md/forum.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdForum extends React.Component<IconBaseProps> { }
-export = MdForum;
diff --git a/types/react-icons/lib/md/forward-10.d.ts b/types/react-icons/lib/md/forward-10.d.ts
deleted file mode 100644
index 97dba92f08..0000000000
--- a/types/react-icons/lib/md/forward-10.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdForward10 extends React.Component<IconBaseProps> { }
-export = MdForward10;
diff --git a/types/react-icons/lib/md/forward-30.d.ts b/types/react-icons/lib/md/forward-30.d.ts
deleted file mode 100644
index b23eddab5e..0000000000
--- a/types/react-icons/lib/md/forward-30.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdForward30 extends React.Component<IconBaseProps> { }
-export = MdForward30;
diff --git a/types/react-icons/lib/md/forward-5.d.ts b/types/react-icons/lib/md/forward-5.d.ts
deleted file mode 100644
index 79b4fbd1a3..0000000000
--- a/types/react-icons/lib/md/forward-5.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdForward5 extends React.Component<IconBaseProps> { }
-export = MdForward5;
diff --git a/types/react-icons/lib/md/forward.d.ts b/types/react-icons/lib/md/forward.d.ts
deleted file mode 100644
index caa23aeb8c..0000000000
--- a/types/react-icons/lib/md/forward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdForward extends React.Component<IconBaseProps> { }
-export = MdForward;
diff --git a/types/react-icons/lib/md/free-breakfast.d.ts b/types/react-icons/lib/md/free-breakfast.d.ts
deleted file mode 100644
index ee43389bf5..0000000000
--- a/types/react-icons/lib/md/free-breakfast.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFreeBreakfast extends React.Component<IconBaseProps> { }
-export = MdFreeBreakfast;
diff --git a/types/react-icons/lib/md/fullscreen-exit.d.ts b/types/react-icons/lib/md/fullscreen-exit.d.ts
deleted file mode 100644
index 92bb42ec08..0000000000
--- a/types/react-icons/lib/md/fullscreen-exit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFullscreenExit extends React.Component<IconBaseProps> { }
-export = MdFullscreenExit;
diff --git a/types/react-icons/lib/md/fullscreen.d.ts b/types/react-icons/lib/md/fullscreen.d.ts
deleted file mode 100644
index cf8c2bb4d3..0000000000
--- a/types/react-icons/lib/md/fullscreen.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFullscreen extends React.Component<IconBaseProps> { }
-export = MdFullscreen;
diff --git a/types/react-icons/lib/md/functions.d.ts b/types/react-icons/lib/md/functions.d.ts
deleted file mode 100644
index 1c966bb2c8..0000000000
--- a/types/react-icons/lib/md/functions.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdFunctions extends React.Component<IconBaseProps> { }
-export = MdFunctions;
diff --git a/types/react-icons/lib/md/g-translate.d.ts b/types/react-icons/lib/md/g-translate.d.ts
deleted file mode 100644
index f64d1592ba..0000000000
--- a/types/react-icons/lib/md/g-translate.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGTranslate extends React.Component<IconBaseProps> { }
-export = MdGTranslate;
diff --git a/types/react-icons/lib/md/gamepad.d.ts b/types/react-icons/lib/md/gamepad.d.ts
deleted file mode 100644
index f568ac2428..0000000000
--- a/types/react-icons/lib/md/gamepad.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGamepad extends React.Component<IconBaseProps> { }
-export = MdGamepad;
diff --git a/types/react-icons/lib/md/games.d.ts b/types/react-icons/lib/md/games.d.ts
deleted file mode 100644
index 207af92742..0000000000
--- a/types/react-icons/lib/md/games.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGames extends React.Component<IconBaseProps> { }
-export = MdGames;
diff --git a/types/react-icons/lib/md/gavel.d.ts b/types/react-icons/lib/md/gavel.d.ts
deleted file mode 100644
index fe9199cd4c..0000000000
--- a/types/react-icons/lib/md/gavel.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGavel extends React.Component<IconBaseProps> { }
-export = MdGavel;
diff --git a/types/react-icons/lib/md/gesture.d.ts b/types/react-icons/lib/md/gesture.d.ts
deleted file mode 100644
index 9457643edc..0000000000
--- a/types/react-icons/lib/md/gesture.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGesture extends React.Component<IconBaseProps> { }
-export = MdGesture;
diff --git a/types/react-icons/lib/md/get-app.d.ts b/types/react-icons/lib/md/get-app.d.ts
deleted file mode 100644
index 7695a14938..0000000000
--- a/types/react-icons/lib/md/get-app.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGetApp extends React.Component<IconBaseProps> { }
-export = MdGetApp;
diff --git a/types/react-icons/lib/md/gif.d.ts b/types/react-icons/lib/md/gif.d.ts
deleted file mode 100644
index 3c5642675a..0000000000
--- a/types/react-icons/lib/md/gif.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGif extends React.Component<IconBaseProps> { }
-export = MdGif;
diff --git a/types/react-icons/lib/md/goat.d.ts b/types/react-icons/lib/md/goat.d.ts
deleted file mode 100644
index bc65467fa7..0000000000
--- a/types/react-icons/lib/md/goat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGoat extends React.Component<IconBaseProps> { }
-export = MdGoat;
diff --git a/types/react-icons/lib/md/golf-course.d.ts b/types/react-icons/lib/md/golf-course.d.ts
deleted file mode 100644
index ae70d0da1f..0000000000
--- a/types/react-icons/lib/md/golf-course.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGolfCourse extends React.Component<IconBaseProps> { }
-export = MdGolfCourse;
diff --git a/types/react-icons/lib/md/gps-fixed.d.ts b/types/react-icons/lib/md/gps-fixed.d.ts
deleted file mode 100644
index bb5e80d727..0000000000
--- a/types/react-icons/lib/md/gps-fixed.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGpsFixed extends React.Component<IconBaseProps> { }
-export = MdGpsFixed;
diff --git a/types/react-icons/lib/md/gps-not-fixed.d.ts b/types/react-icons/lib/md/gps-not-fixed.d.ts
deleted file mode 100644
index 2818183742..0000000000
--- a/types/react-icons/lib/md/gps-not-fixed.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGpsNotFixed extends React.Component<IconBaseProps> { }
-export = MdGpsNotFixed;
diff --git a/types/react-icons/lib/md/gps-off.d.ts b/types/react-icons/lib/md/gps-off.d.ts
deleted file mode 100644
index b6ed83e20a..0000000000
--- a/types/react-icons/lib/md/gps-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGpsOff extends React.Component<IconBaseProps> { }
-export = MdGpsOff;
diff --git a/types/react-icons/lib/md/grade.d.ts b/types/react-icons/lib/md/grade.d.ts
deleted file mode 100644
index 6a15e0b7b3..0000000000
--- a/types/react-icons/lib/md/grade.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGrade extends React.Component<IconBaseProps> { }
-export = MdGrade;
diff --git a/types/react-icons/lib/md/gradient.d.ts b/types/react-icons/lib/md/gradient.d.ts
deleted file mode 100644
index b83474defd..0000000000
--- a/types/react-icons/lib/md/gradient.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGradient extends React.Component<IconBaseProps> { }
-export = MdGradient;
diff --git a/types/react-icons/lib/md/grain.d.ts b/types/react-icons/lib/md/grain.d.ts
deleted file mode 100644
index 77edc78659..0000000000
--- a/types/react-icons/lib/md/grain.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGrain extends React.Component<IconBaseProps> { }
-export = MdGrain;
diff --git a/types/react-icons/lib/md/graphic-eq.d.ts b/types/react-icons/lib/md/graphic-eq.d.ts
deleted file mode 100644
index 29d4259b98..0000000000
--- a/types/react-icons/lib/md/graphic-eq.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGraphicEq extends React.Component<IconBaseProps> { }
-export = MdGraphicEq;
diff --git a/types/react-icons/lib/md/grid-off.d.ts b/types/react-icons/lib/md/grid-off.d.ts
deleted file mode 100644
index 9e9a2ff95e..0000000000
--- a/types/react-icons/lib/md/grid-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGridOff extends React.Component<IconBaseProps> { }
-export = MdGridOff;
diff --git a/types/react-icons/lib/md/grid-on.d.ts b/types/react-icons/lib/md/grid-on.d.ts
deleted file mode 100644
index a96a53f50d..0000000000
--- a/types/react-icons/lib/md/grid-on.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGridOn extends React.Component<IconBaseProps> { }
-export = MdGridOn;
diff --git a/types/react-icons/lib/md/group-add.d.ts b/types/react-icons/lib/md/group-add.d.ts
deleted file mode 100644
index f463e09def..0000000000
--- a/types/react-icons/lib/md/group-add.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGroupAdd extends React.Component<IconBaseProps> { }
-export = MdGroupAdd;
diff --git a/types/react-icons/lib/md/group-work.d.ts b/types/react-icons/lib/md/group-work.d.ts
deleted file mode 100644
index 13b822ce96..0000000000
--- a/types/react-icons/lib/md/group-work.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGroupWork extends React.Component<IconBaseProps> { }
-export = MdGroupWork;
diff --git a/types/react-icons/lib/md/group.d.ts b/types/react-icons/lib/md/group.d.ts
deleted file mode 100644
index b382d9d7f1..0000000000
--- a/types/react-icons/lib/md/group.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdGroup extends React.Component<IconBaseProps> { }
-export = MdGroup;
diff --git a/types/react-icons/lib/md/hd.d.ts b/types/react-icons/lib/md/hd.d.ts
deleted file mode 100644
index bcc5b9fa09..0000000000
--- a/types/react-icons/lib/md/hd.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHd extends React.Component<IconBaseProps> { }
-export = MdHd;
diff --git a/types/react-icons/lib/md/hdr-off.d.ts b/types/react-icons/lib/md/hdr-off.d.ts
deleted file mode 100644
index f9376a4371..0000000000
--- a/types/react-icons/lib/md/hdr-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHdrOff extends React.Component<IconBaseProps> { }
-export = MdHdrOff;
diff --git a/types/react-icons/lib/md/hdr-on.d.ts b/types/react-icons/lib/md/hdr-on.d.ts
deleted file mode 100644
index 20004d19ee..0000000000
--- a/types/react-icons/lib/md/hdr-on.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHdrOn extends React.Component<IconBaseProps> { }
-export = MdHdrOn;
diff --git a/types/react-icons/lib/md/hdr-strong.d.ts b/types/react-icons/lib/md/hdr-strong.d.ts
deleted file mode 100644
index a57a064665..0000000000
--- a/types/react-icons/lib/md/hdr-strong.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHdrStrong extends React.Component<IconBaseProps> { }
-export = MdHdrStrong;
diff --git a/types/react-icons/lib/md/hdr-weak.d.ts b/types/react-icons/lib/md/hdr-weak.d.ts
deleted file mode 100644
index 82694c3075..0000000000
--- a/types/react-icons/lib/md/hdr-weak.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHdrWeak extends React.Component<IconBaseProps> { }
-export = MdHdrWeak;
diff --git a/types/react-icons/lib/md/headset-mic.d.ts b/types/react-icons/lib/md/headset-mic.d.ts
deleted file mode 100644
index e168e766a8..0000000000
--- a/types/react-icons/lib/md/headset-mic.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHeadsetMic extends React.Component<IconBaseProps> { }
-export = MdHeadsetMic;
diff --git a/types/react-icons/lib/md/headset.d.ts b/types/react-icons/lib/md/headset.d.ts
deleted file mode 100644
index a0342ce8b0..0000000000
--- a/types/react-icons/lib/md/headset.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHeadset extends React.Component<IconBaseProps> { }
-export = MdHeadset;
diff --git a/types/react-icons/lib/md/healing.d.ts b/types/react-icons/lib/md/healing.d.ts
deleted file mode 100644
index a8c5255d6b..0000000000
--- a/types/react-icons/lib/md/healing.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHealing extends React.Component<IconBaseProps> { }
-export = MdHealing;
diff --git a/types/react-icons/lib/md/hearing.d.ts b/types/react-icons/lib/md/hearing.d.ts
deleted file mode 100644
index d2c41b7011..0000000000
--- a/types/react-icons/lib/md/hearing.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHearing extends React.Component<IconBaseProps> { }
-export = MdHearing;
diff --git a/types/react-icons/lib/md/help-outline.d.ts b/types/react-icons/lib/md/help-outline.d.ts
deleted file mode 100644
index 1a3ffc41f4..0000000000
--- a/types/react-icons/lib/md/help-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHelpOutline extends React.Component<IconBaseProps> { }
-export = MdHelpOutline;
diff --git a/types/react-icons/lib/md/help.d.ts b/types/react-icons/lib/md/help.d.ts
deleted file mode 100644
index 8aa5586697..0000000000
--- a/types/react-icons/lib/md/help.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHelp extends React.Component<IconBaseProps> { }
-export = MdHelp;
diff --git a/types/react-icons/lib/md/high-quality.d.ts b/types/react-icons/lib/md/high-quality.d.ts
deleted file mode 100644
index abf338bc2d..0000000000
--- a/types/react-icons/lib/md/high-quality.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHighQuality extends React.Component<IconBaseProps> { }
-export = MdHighQuality;
diff --git a/types/react-icons/lib/md/highlight-off.d.ts b/types/react-icons/lib/md/highlight-off.d.ts
deleted file mode 100644
index 5876802841..0000000000
--- a/types/react-icons/lib/md/highlight-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHighlightOff extends React.Component<IconBaseProps> { }
-export = MdHighlightOff;
diff --git a/types/react-icons/lib/md/highlight-remove.d.ts b/types/react-icons/lib/md/highlight-remove.d.ts
deleted file mode 100644
index 893ac99c5f..0000000000
--- a/types/react-icons/lib/md/highlight-remove.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHighlightRemove extends React.Component<IconBaseProps> { }
-export = MdHighlightRemove;
diff --git a/types/react-icons/lib/md/highlight.d.ts b/types/react-icons/lib/md/highlight.d.ts
deleted file mode 100644
index 4930407946..0000000000
--- a/types/react-icons/lib/md/highlight.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHighlight extends React.Component<IconBaseProps> { }
-export = MdHighlight;
diff --git a/types/react-icons/lib/md/history.d.ts b/types/react-icons/lib/md/history.d.ts
deleted file mode 100644
index 7f2609892d..0000000000
--- a/types/react-icons/lib/md/history.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHistory extends React.Component<IconBaseProps> { }
-export = MdHistory;
diff --git a/types/react-icons/lib/md/home.d.ts b/types/react-icons/lib/md/home.d.ts
deleted file mode 100644
index 137d98d6c1..0000000000
--- a/types/react-icons/lib/md/home.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHome extends React.Component<IconBaseProps> { }
-export = MdHome;
diff --git a/types/react-icons/lib/md/hot-tub.d.ts b/types/react-icons/lib/md/hot-tub.d.ts
deleted file mode 100644
index 84abc90459..0000000000
--- a/types/react-icons/lib/md/hot-tub.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHotTub extends React.Component<IconBaseProps> { }
-export = MdHotTub;
diff --git a/types/react-icons/lib/md/hotel.d.ts b/types/react-icons/lib/md/hotel.d.ts
deleted file mode 100644
index 86643009a3..0000000000
--- a/types/react-icons/lib/md/hotel.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHotel extends React.Component<IconBaseProps> { }
-export = MdHotel;
diff --git a/types/react-icons/lib/md/hourglass-empty.d.ts b/types/react-icons/lib/md/hourglass-empty.d.ts
deleted file mode 100644
index 3598c1045c..0000000000
--- a/types/react-icons/lib/md/hourglass-empty.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHourglassEmpty extends React.Component<IconBaseProps> { }
-export = MdHourglassEmpty;
diff --git a/types/react-icons/lib/md/hourglass-full.d.ts b/types/react-icons/lib/md/hourglass-full.d.ts
deleted file mode 100644
index 316d99a7d9..0000000000
--- a/types/react-icons/lib/md/hourglass-full.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHourglassFull extends React.Component<IconBaseProps> { }
-export = MdHourglassFull;
diff --git a/types/react-icons/lib/md/http.d.ts b/types/react-icons/lib/md/http.d.ts
deleted file mode 100644
index 0bb5db017a..0000000000
--- a/types/react-icons/lib/md/http.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHttp extends React.Component<IconBaseProps> { }
-export = MdHttp;
diff --git a/types/react-icons/lib/md/https.d.ts b/types/react-icons/lib/md/https.d.ts
deleted file mode 100644
index b696b59968..0000000000
--- a/types/react-icons/lib/md/https.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdHttps extends React.Component<IconBaseProps> { }
-export = MdHttps;
diff --git a/types/react-icons/lib/md/image-aspect-ratio.d.ts b/types/react-icons/lib/md/image-aspect-ratio.d.ts
deleted file mode 100644
index 67cc6951bd..0000000000
--- a/types/react-icons/lib/md/image-aspect-ratio.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdImageAspectRatio extends React.Component<IconBaseProps> { }
-export = MdImageAspectRatio;
diff --git a/types/react-icons/lib/md/image.d.ts b/types/react-icons/lib/md/image.d.ts
deleted file mode 100644
index 3fe545db51..0000000000
--- a/types/react-icons/lib/md/image.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdImage extends React.Component<IconBaseProps> { }
-export = MdImage;
diff --git a/types/react-icons/lib/md/import-contacts.d.ts b/types/react-icons/lib/md/import-contacts.d.ts
deleted file mode 100644
index 790267421e..0000000000
--- a/types/react-icons/lib/md/import-contacts.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdImportContacts extends React.Component<IconBaseProps> { }
-export = MdImportContacts;
diff --git a/types/react-icons/lib/md/import-export.d.ts b/types/react-icons/lib/md/import-export.d.ts
deleted file mode 100644
index c15ca8f709..0000000000
--- a/types/react-icons/lib/md/import-export.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdImportExport extends React.Component<IconBaseProps> { }
-export = MdImportExport;
diff --git a/types/react-icons/lib/md/important-devices.d.ts b/types/react-icons/lib/md/important-devices.d.ts
deleted file mode 100644
index b5ff654e98..0000000000
--- a/types/react-icons/lib/md/important-devices.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdImportantDevices extends React.Component<IconBaseProps> { }
-export = MdImportantDevices;
diff --git a/types/react-icons/lib/md/inbox.d.ts b/types/react-icons/lib/md/inbox.d.ts
deleted file mode 100644
index bd4f22bc83..0000000000
--- a/types/react-icons/lib/md/inbox.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdInbox extends React.Component<IconBaseProps> { }
-export = MdInbox;
diff --git a/types/react-icons/lib/md/indeterminate-check-box.d.ts b/types/react-icons/lib/md/indeterminate-check-box.d.ts
deleted file mode 100644
index bb3fd56252..0000000000
--- a/types/react-icons/lib/md/indeterminate-check-box.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdIndeterminateCheckBox extends React.Component<IconBaseProps> { }
-export = MdIndeterminateCheckBox;
diff --git a/types/react-icons/lib/md/index.d.ts b/types/react-icons/lib/md/index.d.ts
deleted file mode 100644
index f850df8f58..0000000000
--- a/types/react-icons/lib/md/index.d.ts
+++ /dev/null
@@ -1,946 +0,0 @@
-export { default as Md3dRotation } from "../../md/3d-rotation";
-export { default as MdAcUnit } from "../../md/ac-unit";
-export { default as MdAccessAlarm } from "../../md/access-alarm";
-export { default as MdAccessAlarms } from "../../md/access-alarms";
-export { default as MdAccessTime } from "../../md/access-time";
-export { default as MdAccessibility } from "../../md/accessibility";
-export { default as MdAccessible } from "../../md/accessible";
-export { default as MdAccountBalanceWallet } from "../../md/account-balance-wallet";
-export { default as MdAccountBalance } from "../../md/account-balance";
-export { default as MdAccountBox } from "../../md/account-box";
-export { default as MdAccountCircle } from "../../md/account-circle";
-export { default as MdAdb } from "../../md/adb";
-export { default as MdAddAPhoto } from "../../md/add-a-photo";
-export { default as MdAddAlarm } from "../../md/add-alarm";
-export { default as MdAddAlert } from "../../md/add-alert";
-export { default as MdAddBox } from "../../md/add-box";
-export { default as MdAddCircleOutline } from "../../md/add-circle-outline";
-export { default as MdAddCircle } from "../../md/add-circle";
-export { default as MdAddLocation } from "../../md/add-location";
-export { default as MdAddShoppingCart } from "../../md/add-shopping-cart";
-export { default as MdAddToPhotos } from "../../md/add-to-photos";
-export { default as MdAddToQueue } from "../../md/add-to-queue";
-export { default as MdAdd } from "../../md/add";
-export { default as MdAdjust } from "../../md/adjust";
-export { default as MdAirlineSeatFlatAngled } from "../../md/airline-seat-flat-angled";
-export { default as MdAirlineSeatFlat } from "../../md/airline-seat-flat";
-export { default as MdAirlineSeatIndividualSuite } from "../../md/airline-seat-individual-suite";
-export { default as MdAirlineSeatLegroomExtra } from "../../md/airline-seat-legroom-extra";
-export { default as MdAirlineSeatLegroomNormal } from "../../md/airline-seat-legroom-normal";
-export { default as MdAirlineSeatLegroomReduced } from "../../md/airline-seat-legroom-reduced";
-export { default as MdAirlineSeatReclineExtra } from "../../md/airline-seat-recline-extra";
-export { default as MdAirlineSeatReclineNormal } from "../../md/airline-seat-recline-normal";
-export { default as MdAirplanemodeActive } from "../../md/airplanemode-active";
-export { default as MdAirplanemodeInactive } from "../../md/airplanemode-inactive";
-export { default as MdAirplay } from "../../md/airplay";
-export { default as MdAirportShuttle } from "../../md/airport-shuttle";
-export { default as MdAlarmAdd } from "../../md/alarm-add";
-export { default as MdAlarmOff } from "../../md/alarm-off";
-export { default as MdAlarmOn } from "../../md/alarm-on";
-export { default as MdAlarm } from "../../md/alarm";
-export { default as MdAlbum } from "../../md/album";
-export { default as MdAllInclusive } from "../../md/all-inclusive";
-export { default as MdAllOut } from "../../md/all-out";
-export { default as MdAndroid } from "../../md/android";
-export { default as MdAnnouncement } from "../../md/announcement";
-export { default as MdApps } from "../../md/apps";
-export { default as MdArchive } from "../../md/archive";
-export { default as MdArrowBack } from "../../md/arrow-back";
-export { default as MdArrowDownward } from "../../md/arrow-downward";
-export { default as MdArrowDropDownCircle } from "../../md/arrow-drop-down-circle";
-export { default as MdArrowDropDown } from "../../md/arrow-drop-down";
-export { default as MdArrowDropUp } from "../../md/arrow-drop-up";
-export { default as MdArrowForward } from "../../md/arrow-forward";
-export { default as MdArrowUpward } from "../../md/arrow-upward";
-export { default as MdArtTrack } from "../../md/art-track";
-export { default as MdAspectRatio } from "../../md/aspect-ratio";
-export { default as MdAssessment } from "../../md/assessment";
-export { default as MdAssignmentInd } from "../../md/assignment-ind";
-export { default as MdAssignmentLate } from "../../md/assignment-late";
-export { default as MdAssignmentReturn } from "../../md/assignment-return";
-export { default as MdAssignmentReturned } from "../../md/assignment-returned";
-export { default as MdAssignmentTurnedIn } from "../../md/assignment-turned-in";
-export { default as MdAssignment } from "../../md/assignment";
-export { default as MdAssistantPhoto } from "../../md/assistant-photo";
-export { default as MdAssistant } from "../../md/assistant";
-export { default as MdAttachFile } from "../../md/attach-file";
-export { default as MdAttachMoney } from "../../md/attach-money";
-export { default as MdAttachment } from "../../md/attachment";
-export { default as MdAudiotrack } from "../../md/audiotrack";
-export { default as MdAutorenew } from "../../md/autorenew";
-export { default as MdAvTimer } from "../../md/av-timer";
-export { default as MdBackspace } from "../../md/backspace";
-export { default as MdBackup } from "../../md/backup";
-export { default as MdBatteryAlert } from "../../md/battery-alert";
-export { default as MdBatteryChargingFull } from "../../md/battery-charging-full";
-export { default as MdBatteryFull } from "../../md/battery-full";
-export { default as MdBatteryStd } from "../../md/battery-std";
-export { default as MdBatteryUnknown } from "../../md/battery-unknown";
-export { default as MdBeachAccess } from "../../md/beach-access";
-export { default as MdBeenhere } from "../../md/beenhere";
-export { default as MdBlock } from "../../md/block";
-export { default as MdBluetoothAudio } from "../../md/bluetooth-audio";
-export { default as MdBluetoothConnected } from "../../md/bluetooth-connected";
-export { default as MdBluetoothDisabled } from "../../md/bluetooth-disabled";
-export { default as MdBluetoothSearching } from "../../md/bluetooth-searching";
-export { default as MdBluetooth } from "../../md/bluetooth";
-export { default as MdBlurCircular } from "../../md/blur-circular";
-export { default as MdBlurLinear } from "../../md/blur-linear";
-export { default as MdBlurOff } from "../../md/blur-off";
-export { default as MdBlurOn } from "../../md/blur-on";
-export { default as MdBook } from "../../md/book";
-export { default as MdBookmarkOutline } from "../../md/bookmark-outline";
-export { default as MdBookmark } from "../../md/bookmark";
-export { default as MdBorderAll } from "../../md/border-all";
-export { default as MdBorderBottom } from "../../md/border-bottom";
-export { default as MdBorderClear } from "../../md/border-clear";
-export { default as MdBorderColor } from "../../md/border-color";
-export { default as MdBorderHorizontal } from "../../md/border-horizontal";
-export { default as MdBorderInner } from "../../md/border-inner";
-export { default as MdBorderLeft } from "../../md/border-left";
-export { default as MdBorderOuter } from "../../md/border-outer";
-export { default as MdBorderRight } from "../../md/border-right";
-export { default as MdBorderStyle } from "../../md/border-style";
-export { default as MdBorderTop } from "../../md/border-top";
-export { default as MdBorderVertical } from "../../md/border-vertical";
-export { default as MdBrandingWatermark } from "../../md/branding-watermark";
-export { default as MdBrightness1 } from "../../md/brightness-1";
-export { default as MdBrightness2 } from "../../md/brightness-2";
-export { default as MdBrightness3 } from "../../md/brightness-3";
-export { default as MdBrightness4 } from "../../md/brightness-4";
-export { default as MdBrightness5 } from "../../md/brightness-5";
-export { default as MdBrightness6 } from "../../md/brightness-6";
-export { default as MdBrightness7 } from "../../md/brightness-7";
-export { default as MdBrightnessAuto } from "../../md/brightness-auto";
-export { default as MdBrightnessHigh } from "../../md/brightness-high";
-export { default as MdBrightnessLow } from "../../md/brightness-low";
-export { default as MdBrightnessMedium } from "../../md/brightness-medium";
-export { default as MdBrokenImage } from "../../md/broken-image";
-export { default as MdBrush } from "../../md/brush";
-export { default as MdBubbleChart } from "../../md/bubble-chart";
-export { default as MdBugReport } from "../../md/bug-report";
-export { default as MdBuild } from "../../md/build";
-export { default as MdBurstMode } from "../../md/burst-mode";
-export { default as MdBusinessCenter } from "../../md/business-center";
-export { default as MdBusiness } from "../../md/business";
-export { default as MdCached } from "../../md/cached";
-export { default as MdCake } from "../../md/cake";
-export { default as MdCallEnd } from "../../md/call-end";
-export { default as MdCallMade } from "../../md/call-made";
-export { default as MdCallMerge } from "../../md/call-merge";
-export { default as MdCallMissedOutgoing } from "../../md/call-missed-outgoing";
-export { default as MdCallMissed } from "../../md/call-missed";
-export { default as MdCallReceived } from "../../md/call-received";
-export { default as MdCallSplit } from "../../md/call-split";
-export { default as MdCallToAction } from "../../md/call-to-action";
-export { default as MdCall } from "../../md/call";
-export { default as MdCameraAlt } from "../../md/camera-alt";
-export { default as MdCameraEnhance } from "../../md/camera-enhance";
-export { default as MdCameraFront } from "../../md/camera-front";
-export { default as MdCameraRear } from "../../md/camera-rear";
-export { default as MdCameraRoll } from "../../md/camera-roll";
-export { default as MdCamera } from "../../md/camera";
-export { default as MdCancel } from "../../md/cancel";
-export { default as MdCardGiftcard } from "../../md/card-giftcard";
-export { default as MdCardMembership } from "../../md/card-membership";
-export { default as MdCardTravel } from "../../md/card-travel";
-export { default as MdCasino } from "../../md/casino";
-export { default as MdCastConnected } from "../../md/cast-connected";
-export { default as MdCast } from "../../md/cast";
-export { default as MdCenterFocusStrong } from "../../md/center-focus-strong";
-export { default as MdCenterFocusWeak } from "../../md/center-focus-weak";
-export { default as MdChangeHistory } from "../../md/change-history";
-export { default as MdChatBubbleOutline } from "../../md/chat-bubble-outline";
-export { default as MdChatBubble } from "../../md/chat-bubble";
-export { default as MdChat } from "../../md/chat";
-export { default as MdCheckBoxOutlineBlank } from "../../md/check-box-outline-blank";
-export { default as MdCheckBox } from "../../md/check-box";
-export { default as MdCheckCircle } from "../../md/check-circle";
-export { default as MdCheck } from "../../md/check";
-export { default as MdChevronLeft } from "../../md/chevron-left";
-export { default as MdChevronRight } from "../../md/chevron-right";
-export { default as MdChildCare } from "../../md/child-care";
-export { default as MdChildFriendly } from "../../md/child-friendly";
-export { default as MdChromeReaderMode } from "../../md/chrome-reader-mode";
-export { default as MdClass } from "../../md/class";
-export { default as MdClearAll } from "../../md/clear-all";
-export { default as MdClear } from "../../md/clear";
-export { default as MdClose } from "../../md/close";
-export { default as MdClosedCaption } from "../../md/closed-caption";
-export { default as MdCloudCircle } from "../../md/cloud-circle";
-export { default as MdCloudDone } from "../../md/cloud-done";
-export { default as MdCloudDownload } from "../../md/cloud-download";
-export { default as MdCloudOff } from "../../md/cloud-off";
-export { default as MdCloudQueue } from "../../md/cloud-queue";
-export { default as MdCloudUpload } from "../../md/cloud-upload";
-export { default as MdCloud } from "../../md/cloud";
-export { default as MdCode } from "../../md/code";
-export { default as MdCollectionsBookmark } from "../../md/collections-bookmark";
-export { default as MdCollections } from "../../md/collections";
-export { default as MdColorLens } from "../../md/color-lens";
-export { default as MdColorize } from "../../md/colorize";
-export { default as MdComment } from "../../md/comment";
-export { default as MdCompareArrows } from "../../md/compare-arrows";
-export { default as MdCompare } from "../../md/compare";
-export { default as MdComputer } from "../../md/computer";
-export { default as MdConfirmationNumber } from "../../md/confirmation-number";
-export { default as MdContactMail } from "../../md/contact-mail";
-export { default as MdContactPhone } from "../../md/contact-phone";
-export { default as MdContacts } from "../../md/contacts";
-export { default as MdContentCopy } from "../../md/content-copy";
-export { default as MdContentCut } from "../../md/content-cut";
-export { default as MdContentPaste } from "../../md/content-paste";
-export { default as MdControlPointDuplicate } from "../../md/control-point-duplicate";
-export { default as MdControlPoint } from "../../md/control-point";
-export { default as MdCopyright } from "../../md/copyright";
-export { default as MdCreateNewFolder } from "../../md/create-new-folder";
-export { default as MdCreate } from "../../md/create";
-export { default as MdCreditCard } from "../../md/credit-card";
-export { default as MdCrop169 } from "../../md/crop-16-9";
-export { default as MdCrop32 } from "../../md/crop-3-2";
-export { default as MdCrop54 } from "../../md/crop-5-4";
-export { default as MdCrop75 } from "../../md/crop-7-5";
-export { default as MdCropDin } from "../../md/crop-din";
-export { default as MdCropFree } from "../../md/crop-free";
-export { default as MdCropLandscape } from "../../md/crop-landscape";
-export { default as MdCropOriginal } from "../../md/crop-original";
-export { default as MdCropPortrait } from "../../md/crop-portrait";
-export { default as MdCropRotate } from "../../md/crop-rotate";
-export { default as MdCropSquare } from "../../md/crop-square";
-export { default as MdCrop } from "../../md/crop";
-export { default as MdDashboard } from "../../md/dashboard";
-export { default as MdDataUsage } from "../../md/data-usage";
-export { default as MdDateRange } from "../../md/date-range";
-export { default as MdDehaze } from "../../md/dehaze";
-export { default as MdDeleteForever } from "../../md/delete-forever";
-export { default as MdDeleteSweep } from "../../md/delete-sweep";
-export { default as MdDelete } from "../../md/delete";
-export { default as MdDescription } from "../../md/description";
-export { default as MdDesktopMac } from "../../md/desktop-mac";
-export { default as MdDesktopWindows } from "../../md/desktop-windows";
-export { default as MdDetails } from "../../md/details";
-export { default as MdDeveloperBoard } from "../../md/developer-board";
-export { default as MdDeveloperMode } from "../../md/developer-mode";
-export { default as MdDeviceHub } from "../../md/device-hub";
-export { default as MdDevicesOther } from "../../md/devices-other";
-export { default as MdDevices } from "../../md/devices";
-export { default as MdDialerSip } from "../../md/dialer-sip";
-export { default as MdDialpad } from "../../md/dialpad";
-export { default as MdDirectionsBike } from "../../md/directions-bike";
-export { default as MdDirectionsBoat } from "../../md/directions-boat";
-export { default as MdDirectionsBus } from "../../md/directions-bus";
-export { default as MdDirectionsCar } from "../../md/directions-car";
-export { default as MdDirectionsFerry } from "../../md/directions-ferry";
-export { default as MdDirectionsRailway } from "../../md/directions-railway";
-export { default as MdDirectionsRun } from "../../md/directions-run";
-export { default as MdDirectionsSubway } from "../../md/directions-subway";
-export { default as MdDirectionsTransit } from "../../md/directions-transit";
-export { default as MdDirectionsWalk } from "../../md/directions-walk";
-export { default as MdDirections } from "../../md/directions";
-export { default as MdDiscFull } from "../../md/disc-full";
-export { default as MdDns } from "../../md/dns";
-export { default as MdDoNotDisturbAlt } from "../../md/do-not-disturb-alt";
-export { default as MdDoNotDisturbOff } from "../../md/do-not-disturb-off";
-export { default as MdDoNotDisturb } from "../../md/do-not-disturb";
-export { default as MdDock } from "../../md/dock";
-export { default as MdDomain } from "../../md/domain";
-export { default as MdDoneAll } from "../../md/done-all";
-export { default as MdDone } from "../../md/done";
-export { default as MdDonutLarge } from "../../md/donut-large";
-export { default as MdDonutSmall } from "../../md/donut-small";
-export { default as MdDrafts } from "../../md/drafts";
-export { default as MdDragHandle } from "../../md/drag-handle";
-export { default as MdDriveEta } from "../../md/drive-eta";
-export { default as MdDvr } from "../../md/dvr";
-export { default as MdEditLocation } from "../../md/edit-location";
-export { default as MdEdit } from "../../md/edit";
-export { default as MdEject } from "../../md/eject";
-export { default as MdEmail } from "../../md/email";
-export { default as MdEnhancedEncryption } from "../../md/enhanced-encryption";
-export { default as MdEqualizer } from "../../md/equalizer";
-export { default as MdErrorOutline } from "../../md/error-outline";
-export { default as MdError } from "../../md/error";
-export { default as MdEuroSymbol } from "../../md/euro-symbol";
-export { default as MdEvStation } from "../../md/ev-station";
-export { default as MdEventAvailable } from "../../md/event-available";
-export { default as MdEventBusy } from "../../md/event-busy";
-export { default as MdEventNote } from "../../md/event-note";
-export { default as MdEventSeat } from "../../md/event-seat";
-export { default as MdEvent } from "../../md/event";
-export { default as MdExitToApp } from "../../md/exit-to-app";
-export { default as MdExpandLess } from "../../md/expand-less";
-export { default as MdExpandMore } from "../../md/expand-more";
-export { default as MdExplicit } from "../../md/explicit";
-export { default as MdExplore } from "../../md/explore";
-export { default as MdExposureMinus1 } from "../../md/exposure-minus-1";
-export { default as MdExposureMinus2 } from "../../md/exposure-minus-2";
-export { default as MdExposureNeg1 } from "../../md/exposure-neg-1";
-export { default as MdExposureNeg2 } from "../../md/exposure-neg-2";
-export { default as MdExposurePlus1 } from "../../md/exposure-plus-1";
-export { default as MdExposurePlus2 } from "../../md/exposure-plus-2";
-export { default as MdExposureZero } from "../../md/exposure-zero";
-export { default as MdExposure } from "../../md/exposure";
-export { default as MdExtension } from "../../md/extension";
-export { default as MdFace } from "../../md/face";
-export { default as MdFastForward } from "../../md/fast-forward";
-export { default as MdFastRewind } from "../../md/fast-rewind";
-export { default as MdFavoriteBorder } from "../../md/favorite-border";
-export { default as MdFavoriteOutline } from "../../md/favorite-outline";
-export { default as MdFavorite } from "../../md/favorite";
-export { default as MdFeaturedPlayList } from "../../md/featured-play-list";
-export { default as MdFeaturedVideo } from "../../md/featured-video";
-export { default as MdFeedback } from "../../md/feedback";
-export { default as MdFiberDvr } from "../../md/fiber-dvr";
-export { default as MdFiberManualRecord } from "../../md/fiber-manual-record";
-export { default as MdFiberNew } from "../../md/fiber-new";
-export { default as MdFiberPin } from "../../md/fiber-pin";
-export { default as MdFiberSmartRecord } from "../../md/fiber-smart-record";
-export { default as MdFileDownload } from "../../md/file-download";
-export { default as MdFileUpload } from "../../md/file-upload";
-export { default as MdFilter1 } from "../../md/filter-1";
-export { default as MdFilter2 } from "../../md/filter-2";
-export { default as MdFilter3 } from "../../md/filter-3";
-export { default as MdFilter4 } from "../../md/filter-4";
-export { default as MdFilter5 } from "../../md/filter-5";
-export { default as MdFilter6 } from "../../md/filter-6";
-export { default as MdFilter7 } from "../../md/filter-7";
-export { default as MdFilter8 } from "../../md/filter-8";
-export { default as MdFilter9Plus } from "../../md/filter-9-plus";
-export { default as MdFilter9 } from "../../md/filter-9";
-export { default as MdFilterBAndW } from "../../md/filter-b-and-w";
-export { default as MdFilterCenterFocus } from "../../md/filter-center-focus";
-export { default as MdFilterDrama } from "../../md/filter-drama";
-export { default as MdFilterFrames } from "../../md/filter-frames";
-export { default as MdFilterHdr } from "../../md/filter-hdr";
-export { default as MdFilterList } from "../../md/filter-list";
-export { default as MdFilterNone } from "../../md/filter-none";
-export { default as MdFilterTiltShift } from "../../md/filter-tilt-shift";
-export { default as MdFilterVintage } from "../../md/filter-vintage";
-export { default as MdFilter } from "../../md/filter";
-export { default as MdFindInPage } from "../../md/find-in-page";
-export { default as MdFindReplace } from "../../md/find-replace";
-export { default as MdFingerprint } from "../../md/fingerprint";
-export { default as MdFirstPage } from "../../md/first-page";
-export { default as MdFitnessCenter } from "../../md/fitness-center";
-export { default as MdFlag } from "../../md/flag";
-export { default as MdFlare } from "../../md/flare";
-export { default as MdFlashAuto } from "../../md/flash-auto";
-export { default as MdFlashOff } from "../../md/flash-off";
-export { default as MdFlashOn } from "../../md/flash-on";
-export { default as MdFlightLand } from "../../md/flight-land";
-export { default as MdFlightTakeoff } from "../../md/flight-takeoff";
-export { default as MdFlight } from "../../md/flight";
-export { default as MdFlipToBack } from "../../md/flip-to-back";
-export { default as MdFlipToFront } from "../../md/flip-to-front";
-export { default as MdFlip } from "../../md/flip";
-export { default as MdFolderOpen } from "../../md/folder-open";
-export { default as MdFolderShared } from "../../md/folder-shared";
-export { default as MdFolderSpecial } from "../../md/folder-special";
-export { default as MdFolder } from "../../md/folder";
-export { default as MdFontDownload } from "../../md/font-download";
-export { default as MdFormatAlignCenter } from "../../md/format-align-center";
-export { default as MdFormatAlignJustify } from "../../md/format-align-justify";
-export { default as MdFormatAlignLeft } from "../../md/format-align-left";
-export { default as MdFormatAlignRight } from "../../md/format-align-right";
-export { default as MdFormatBold } from "../../md/format-bold";
-export { default as MdFormatClear } from "../../md/format-clear";
-export { default as MdFormatColorFill } from "../../md/format-color-fill";
-export { default as MdFormatColorReset } from "../../md/format-color-reset";
-export { default as MdFormatColorText } from "../../md/format-color-text";
-export { default as MdFormatIndentDecrease } from "../../md/format-indent-decrease";
-export { default as MdFormatIndentIncrease } from "../../md/format-indent-increase";
-export { default as MdFormatItalic } from "../../md/format-italic";
-export { default as MdFormatLineSpacing } from "../../md/format-line-spacing";
-export { default as MdFormatListBulleted } from "../../md/format-list-bulleted";
-export { default as MdFormatListNumbered } from "../../md/format-list-numbered";
-export { default as MdFormatPaint } from "../../md/format-paint";
-export { default as MdFormatQuote } from "../../md/format-quote";
-export { default as MdFormatShapes } from "../../md/format-shapes";
-export { default as MdFormatSize } from "../../md/format-size";
-export { default as MdFormatStrikethrough } from "../../md/format-strikethrough";
-export { default as MdFormatTextdirectionLToR } from "../../md/format-textdirection-l-to-r";
-export { default as MdFormatTextdirectionRToL } from "../../md/format-textdirection-r-to-l";
-export { default as MdFormatUnderlined } from "../../md/format-underlined";
-export { default as MdForum } from "../../md/forum";
-export { default as MdForward10 } from "../../md/forward-10";
-export { default as MdForward30 } from "../../md/forward-30";
-export { default as MdForward5 } from "../../md/forward-5";
-export { default as MdForward } from "../../md/forward";
-export { default as MdFreeBreakfast } from "../../md/free-breakfast";
-export { default as MdFullscreenExit } from "../../md/fullscreen-exit";
-export { default as MdFullscreen } from "../../md/fullscreen";
-export { default as MdFunctions } from "../../md/functions";
-export { default as MdGTranslate } from "../../md/g-translate";
-export { default as MdGamepad } from "../../md/gamepad";
-export { default as MdGames } from "../../md/games";
-export { default as MdGavel } from "../../md/gavel";
-export { default as MdGesture } from "../../md/gesture";
-export { default as MdGetApp } from "../../md/get-app";
-export { default as MdGif } from "../../md/gif";
-export { default as MdGoat } from "../../md/goat";
-export { default as MdGolfCourse } from "../../md/golf-course";
-export { default as MdGpsFixed } from "../../md/gps-fixed";
-export { default as MdGpsNotFixed } from "../../md/gps-not-fixed";
-export { default as MdGpsOff } from "../../md/gps-off";
-export { default as MdGrade } from "../../md/grade";
-export { default as MdGradient } from "../../md/gradient";
-export { default as MdGrain } from "../../md/grain";
-export { default as MdGraphicEq } from "../../md/graphic-eq";
-export { default as MdGridOff } from "../../md/grid-off";
-export { default as MdGridOn } from "../../md/grid-on";
-export { default as MdGroupAdd } from "../../md/group-add";
-export { default as MdGroupWork } from "../../md/group-work";
-export { default as MdGroup } from "../../md/group";
-export { default as MdHd } from "../../md/hd";
-export { default as MdHdrOff } from "../../md/hdr-off";
-export { default as MdHdrOn } from "../../md/hdr-on";
-export { default as MdHdrStrong } from "../../md/hdr-strong";
-export { default as MdHdrWeak } from "../../md/hdr-weak";
-export { default as MdHeadsetMic } from "../../md/headset-mic";
-export { default as MdHeadset } from "../../md/headset";
-export { default as MdHealing } from "../../md/healing";
-export { default as MdHearing } from "../../md/hearing";
-export { default as MdHelpOutline } from "../../md/help-outline";
-export { default as MdHelp } from "../../md/help";
-export { default as MdHighQuality } from "../../md/high-quality";
-export { default as MdHighlightOff } from "../../md/highlight-off";
-export { default as MdHighlightRemove } from "../../md/highlight-remove";
-export { default as MdHighlight } from "../../md/highlight";
-export { default as MdHistory } from "../../md/history";
-export { default as MdHome } from "../../md/home";
-export { default as MdHotTub } from "../../md/hot-tub";
-export { default as MdHotel } from "../../md/hotel";
-export { default as MdHourglassEmpty } from "../../md/hourglass-empty";
-export { default as MdHourglassFull } from "../../md/hourglass-full";
-export { default as MdHttp } from "../../md/http";
-export { default as MdHttps } from "../../md/https";
-export { default as MdImageAspectRatio } from "../../md/image-aspect-ratio";
-export { default as MdImage } from "../../md/image";
-export { default as MdImportContacts } from "../../md/import-contacts";
-export { default as MdImportExport } from "../../md/import-export";
-export { default as MdImportantDevices } from "../../md/important-devices";
-export { default as MdInbox } from "../../md/inbox";
-export { default as MdIndeterminateCheckBox } from "../../md/indeterminate-check-box";
-export { default as MdInfoOutline } from "../../md/info-outline";
-export { default as MdInfo } from "../../md/info";
-export { default as MdInput } from "../../md/input";
-export { default as MdInsertChart } from "../../md/insert-chart";
-export { default as MdInsertComment } from "../../md/insert-comment";
-export { default as MdInsertDriveFile } from "../../md/insert-drive-file";
-export { default as MdInsertEmoticon } from "../../md/insert-emoticon";
-export { default as MdInsertInvitation } from "../../md/insert-invitation";
-export { default as MdInsertLink } from "../../md/insert-link";
-export { default as MdInsertPhoto } from "../../md/insert-photo";
-export { default as MdInvertColorsOff } from "../../md/invert-colors-off";
-export { default as MdInvertColorsOn } from "../../md/invert-colors-on";
-export { default as MdInvertColors } from "../../md/invert-colors";
-export { default as MdIso } from "../../md/iso";
-export { default as MdKeyboardArrowDown } from "../../md/keyboard-arrow-down";
-export { default as MdKeyboardArrowLeft } from "../../md/keyboard-arrow-left";
-export { default as MdKeyboardArrowRight } from "../../md/keyboard-arrow-right";
-export { default as MdKeyboardArrowUp } from "../../md/keyboard-arrow-up";
-export { default as MdKeyboardBackspace } from "../../md/keyboard-backspace";
-export { default as MdKeyboardCapslock } from "../../md/keyboard-capslock";
-export { default as MdKeyboardControl } from "../../md/keyboard-control";
-export { default as MdKeyboardHide } from "../../md/keyboard-hide";
-export { default as MdKeyboardReturn } from "../../md/keyboard-return";
-export { default as MdKeyboardTab } from "../../md/keyboard-tab";
-export { default as MdKeyboardVoice } from "../../md/keyboard-voice";
-export { default as MdKeyboard } from "../../md/keyboard";
-export { default as MdKitchen } from "../../md/kitchen";
-export { default as MdLabelOutline } from "../../md/label-outline";
-export { default as MdLabel } from "../../md/label";
-export { default as MdLandscape } from "../../md/landscape";
-export { default as MdLanguage } from "../../md/language";
-export { default as MdLaptopChromebook } from "../../md/laptop-chromebook";
-export { default as MdLaptopMac } from "../../md/laptop-mac";
-export { default as MdLaptopWindows } from "../../md/laptop-windows";
-export { default as MdLaptop } from "../../md/laptop";
-export { default as MdLastPage } from "../../md/last-page";
-export { default as MdLaunch } from "../../md/launch";
-export { default as MdLayersClear } from "../../md/layers-clear";
-export { default as MdLayers } from "../../md/layers";
-export { default as MdLeakAdd } from "../../md/leak-add";
-export { default as MdLeakRemove } from "../../md/leak-remove";
-export { default as MdLens } from "../../md/lens";
-export { default as MdLibraryAdd } from "../../md/library-add";
-export { default as MdLibraryBooks } from "../../md/library-books";
-export { default as MdLibraryMusic } from "../../md/library-music";
-export { default as MdLightbulbOutline } from "../../md/lightbulb-outline";
-export { default as MdLineStyle } from "../../md/line-style";
-export { default as MdLineWeight } from "../../md/line-weight";
-export { default as MdLinearScale } from "../../md/linear-scale";
-export { default as MdLink } from "../../md/link";
-export { default as MdLinkedCamera } from "../../md/linked-camera";
-export { default as MdList } from "../../md/list";
-export { default as MdLiveHelp } from "../../md/live-help";
-export { default as MdLiveTv } from "../../md/live-tv";
-export { default as MdLocalAirport } from "../../md/local-airport";
-export { default as MdLocalAtm } from "../../md/local-atm";
-export { default as MdLocalAttraction } from "../../md/local-attraction";
-export { default as MdLocalBar } from "../../md/local-bar";
-export { default as MdLocalCafe } from "../../md/local-cafe";
-export { default as MdLocalCarWash } from "../../md/local-car-wash";
-export { default as MdLocalConvenienceStore } from "../../md/local-convenience-store";
-export { default as MdLocalDrink } from "../../md/local-drink";
-export { default as MdLocalFlorist } from "../../md/local-florist";
-export { default as MdLocalGasStation } from "../../md/local-gas-station";
-export { default as MdLocalGroceryStore } from "../../md/local-grocery-store";
-export { default as MdLocalHospital } from "../../md/local-hospital";
-export { default as MdLocalHotel } from "../../md/local-hotel";
-export { default as MdLocalLaundryService } from "../../md/local-laundry-service";
-export { default as MdLocalLibrary } from "../../md/local-library";
-export { default as MdLocalMall } from "../../md/local-mall";
-export { default as MdLocalMovies } from "../../md/local-movies";
-export { default as MdLocalOffer } from "../../md/local-offer";
-export { default as MdLocalParking } from "../../md/local-parking";
-export { default as MdLocalPharmacy } from "../../md/local-pharmacy";
-export { default as MdLocalPhone } from "../../md/local-phone";
-export { default as MdLocalPizza } from "../../md/local-pizza";
-export { default as MdLocalPlay } from "../../md/local-play";
-export { default as MdLocalPostOffice } from "../../md/local-post-office";
-export { default as MdLocalPrintShop } from "../../md/local-print-shop";
-export { default as MdLocalRestaurant } from "../../md/local-restaurant";
-export { default as MdLocalSee } from "../../md/local-see";
-export { default as MdLocalShipping } from "../../md/local-shipping";
-export { default as MdLocalTaxi } from "../../md/local-taxi";
-export { default as MdLocationCity } from "../../md/location-city";
-export { default as MdLocationDisabled } from "../../md/location-disabled";
-export { default as MdLocationHistory } from "../../md/location-history";
-export { default as MdLocationOff } from "../../md/location-off";
-export { default as MdLocationOn } from "../../md/location-on";
-export { default as MdLocationSearching } from "../../md/location-searching";
-export { default as MdLockOpen } from "../../md/lock-open";
-export { default as MdLockOutline } from "../../md/lock-outline";
-export { default as MdLock } from "../../md/lock";
-export { default as MdLooks3 } from "../../md/looks-3";
-export { default as MdLooks4 } from "../../md/looks-4";
-export { default as MdLooks5 } from "../../md/looks-5";
-export { default as MdLooks6 } from "../../md/looks-6";
-export { default as MdLooksOne } from "../../md/looks-one";
-export { default as MdLooksTwo } from "../../md/looks-two";
-export { default as MdLooks } from "../../md/looks";
-export { default as MdLoop } from "../../md/loop";
-export { default as MdLoupe } from "../../md/loupe";
-export { default as MdLowPriority } from "../../md/low-priority";
-export { default as MdLoyalty } from "../../md/loyalty";
-export { default as MdMailOutline } from "../../md/mail-outline";
-export { default as MdMail } from "../../md/mail";
-export { default as MdMap } from "../../md/map";
-export { default as MdMarkunreadMailbox } from "../../md/markunread-mailbox";
-export { default as MdMarkunread } from "../../md/markunread";
-export { default as MdMemory } from "../../md/memory";
-export { default as MdMenu } from "../../md/menu";
-export { default as MdMergeType } from "../../md/merge-type";
-export { default as MdMessage } from "../../md/message";
-export { default as MdMicNone } from "../../md/mic-none";
-export { default as MdMicOff } from "../../md/mic-off";
-export { default as MdMic } from "../../md/mic";
-export { default as MdMms } from "../../md/mms";
-export { default as MdModeComment } from "../../md/mode-comment";
-export { default as MdModeEdit } from "../../md/mode-edit";
-export { default as MdMonetizationOn } from "../../md/monetization-on";
-export { default as MdMoneyOff } from "../../md/money-off";
-export { default as MdMonochromePhotos } from "../../md/monochrome-photos";
-export { default as MdMoodBad } from "../../md/mood-bad";
-export { default as MdMood } from "../../md/mood";
-export { default as MdMoreHoriz } from "../../md/more-horiz";
-export { default as MdMoreVert } from "../../md/more-vert";
-export { default as MdMore } from "../../md/more";
-export { default as MdMotorcycle } from "../../md/motorcycle";
-export { default as MdMouse } from "../../md/mouse";
-export { default as MdMoveToInbox } from "../../md/move-to-inbox";
-export { default as MdMovieCreation } from "../../md/movie-creation";
-export { default as MdMovieFilter } from "../../md/movie-filter";
-export { default as MdMovie } from "../../md/movie";
-export { default as MdMultilineChart } from "../../md/multiline-chart";
-export { default as MdMusicNote } from "../../md/music-note";
-export { default as MdMusicVideo } from "../../md/music-video";
-export { default as MdMyLocation } from "../../md/my-location";
-export { default as MdNaturePeople } from "../../md/nature-people";
-export { default as MdNature } from "../../md/nature";
-export { default as MdNavigateBefore } from "../../md/navigate-before";
-export { default as MdNavigateNext } from "../../md/navigate-next";
-export { default as MdNavigation } from "../../md/navigation";
-export { default as MdNearMe } from "../../md/near-me";
-export { default as MdNetworkCell } from "../../md/network-cell";
-export { default as MdNetworkCheck } from "../../md/network-check";
-export { default as MdNetworkLocked } from "../../md/network-locked";
-export { default as MdNetworkWifi } from "../../md/network-wifi";
-export { default as MdNewReleases } from "../../md/new-releases";
-export { default as MdNextWeek } from "../../md/next-week";
-export { default as MdNfc } from "../../md/nfc";
-export { default as MdNoEncryption } from "../../md/no-encryption";
-export { default as MdNoSim } from "../../md/no-sim";
-export { default as MdNotInterested } from "../../md/not-interested";
-export { default as MdNoteAdd } from "../../md/note-add";
-export { default as MdNote } from "../../md/note";
-export { default as MdNotificationsActive } from "../../md/notifications-active";
-export { default as MdNotificationsNone } from "../../md/notifications-none";
-export { default as MdNotificationsOff } from "../../md/notifications-off";
-export { default as MdNotificationsPaused } from "../../md/notifications-paused";
-export { default as MdNotifications } from "../../md/notifications";
-export { default as MdNowWallpaper } from "../../md/now-wallpaper";
-export { default as MdNowWidgets } from "../../md/now-widgets";
-export { default as MdOfflinePin } from "../../md/offline-pin";
-export { default as MdOndemandVideo } from "../../md/ondemand-video";
-export { default as MdOpacity } from "../../md/opacity";
-export { default as MdOpenInBrowser } from "../../md/open-in-browser";
-export { default as MdOpenInNew } from "../../md/open-in-new";
-export { default as MdOpenWith } from "../../md/open-with";
-export { default as MdPages } from "../../md/pages";
-export { default as MdPageview } from "../../md/pageview";
-export { default as MdPalette } from "../../md/palette";
-export { default as MdPanTool } from "../../md/pan-tool";
-export { default as MdPanoramaFishEye } from "../../md/panorama-fish-eye";
-export { default as MdPanoramaHorizontal } from "../../md/panorama-horizontal";
-export { default as MdPanoramaVertical } from "../../md/panorama-vertical";
-export { default as MdPanoramaWideAngle } from "../../md/panorama-wide-angle";
-export { default as MdPanorama } from "../../md/panorama";
-export { default as MdPartyMode } from "../../md/party-mode";
-export { default as MdPauseCircleFilled } from "../../md/pause-circle-filled";
-export { default as MdPauseCircleOutline } from "../../md/pause-circle-outline";
-export { default as MdPause } from "../../md/pause";
-export { default as MdPayment } from "../../md/payment";
-export { default as MdPeopleOutline } from "../../md/people-outline";
-export { default as MdPeople } from "../../md/people";
-export { default as MdPermCameraMic } from "../../md/perm-camera-mic";
-export { default as MdPermContactCalendar } from "../../md/perm-contact-calendar";
-export { default as MdPermDataSetting } from "../../md/perm-data-setting";
-export { default as MdPermDeviceInformation } from "../../md/perm-device-information";
-export { default as MdPermIdentity } from "../../md/perm-identity";
-export { default as MdPermMedia } from "../../md/perm-media";
-export { default as MdPermPhoneMsg } from "../../md/perm-phone-msg";
-export { default as MdPermScanWifi } from "../../md/perm-scan-wifi";
-export { default as MdPersonAdd } from "../../md/person-add";
-export { default as MdPersonOutline } from "../../md/person-outline";
-export { default as MdPersonPinCircle } from "../../md/person-pin-circle";
-export { default as MdPersonPin } from "../../md/person-pin";
-export { default as MdPerson } from "../../md/person";
-export { default as MdPersonalVideo } from "../../md/personal-video";
-export { default as MdPets } from "../../md/pets";
-export { default as MdPhoneAndroid } from "../../md/phone-android";
-export { default as MdPhoneBluetoothSpeaker } from "../../md/phone-bluetooth-speaker";
-export { default as MdPhoneForwarded } from "../../md/phone-forwarded";
-export { default as MdPhoneInTalk } from "../../md/phone-in-talk";
-export { default as MdPhoneIphone } from "../../md/phone-iphone";
-export { default as MdPhoneLocked } from "../../md/phone-locked";
-export { default as MdPhoneMissed } from "../../md/phone-missed";
-export { default as MdPhonePaused } from "../../md/phone-paused";
-export { default as MdPhone } from "../../md/phone";
-export { default as MdPhonelinkErase } from "../../md/phonelink-erase";
-export { default as MdPhonelinkLock } from "../../md/phonelink-lock";
-export { default as MdPhonelinkOff } from "../../md/phonelink-off";
-export { default as MdPhonelinkRing } from "../../md/phonelink-ring";
-export { default as MdPhonelinkSetup } from "../../md/phonelink-setup";
-export { default as MdPhonelink } from "../../md/phonelink";
-export { default as MdPhotoAlbum } from "../../md/photo-album";
-export { default as MdPhotoCamera } from "../../md/photo-camera";
-export { default as MdPhotoFilter } from "../../md/photo-filter";
-export { default as MdPhotoLibrary } from "../../md/photo-library";
-export { default as MdPhotoSizeSelectActual } from "../../md/photo-size-select-actual";
-export { default as MdPhotoSizeSelectLarge } from "../../md/photo-size-select-large";
-export { default as MdPhotoSizeSelectSmall } from "../../md/photo-size-select-small";
-export { default as MdPhoto } from "../../md/photo";
-export { default as MdPictureAsPdf } from "../../md/picture-as-pdf";
-export { default as MdPictureInPictureAlt } from "../../md/picture-in-picture-alt";
-export { default as MdPictureInPicture } from "../../md/picture-in-picture";
-export { default as MdPieChartOutlined } from "../../md/pie-chart-outlined";
-export { default as MdPieChart } from "../../md/pie-chart";
-export { default as MdPinDrop } from "../../md/pin-drop";
-export { default as MdPlace } from "../../md/place";
-export { default as MdPlayArrow } from "../../md/play-arrow";
-export { default as MdPlayCircleFilled } from "../../md/play-circle-filled";
-export { default as MdPlayCircleOutline } from "../../md/play-circle-outline";
-export { default as MdPlayForWork } from "../../md/play-for-work";
-export { default as MdPlaylistAddCheck } from "../../md/playlist-add-check";
-export { default as MdPlaylistAdd } from "../../md/playlist-add";
-export { default as MdPlaylistPlay } from "../../md/playlist-play";
-export { default as MdPlusOne } from "../../md/plus-one";
-export { default as MdPoll } from "../../md/poll";
-export { default as MdPolymer } from "../../md/polymer";
-export { default as MdPool } from "../../md/pool";
-export { default as MdPortableWifiOff } from "../../md/portable-wifi-off";
-export { default as MdPortrait } from "../../md/portrait";
-export { default as MdPowerInput } from "../../md/power-input";
-export { default as MdPowerSettingsNew } from "../../md/power-settings-new";
-export { default as MdPower } from "../../md/power";
-export { default as MdPregnantWoman } from "../../md/pregnant-woman";
-export { default as MdPresentToAll } from "../../md/present-to-all";
-export { default as MdPrint } from "../../md/print";
-export { default as MdPriorityHigh } from "../../md/priority-high";
-export { default as MdPublic } from "../../md/public";
-export { default as MdPublish } from "../../md/publish";
-export { default as MdQueryBuilder } from "../../md/query-builder";
-export { default as MdQuestionAnswer } from "../../md/question-answer";
-export { default as MdQueueMusic } from "../../md/queue-music";
-export { default as MdQueuePlayNext } from "../../md/queue-play-next";
-export { default as MdQueue } from "../../md/queue";
-export { default as MdRadioButtonChecked } from "../../md/radio-button-checked";
-export { default as MdRadioButtonUnchecked } from "../../md/radio-button-unchecked";
-export { default as MdRadio } from "../../md/radio";
-export { default as MdRateReview } from "../../md/rate-review";
-export { default as MdReceipt } from "../../md/receipt";
-export { default as MdRecentActors } from "../../md/recent-actors";
-export { default as MdRecordVoiceOver } from "../../md/record-voice-over";
-export { default as MdRedeem } from "../../md/redeem";
-export { default as MdRedo } from "../../md/redo";
-export { default as MdRefresh } from "../../md/refresh";
-export { default as MdRemoveCircleOutline } from "../../md/remove-circle-outline";
-export { default as MdRemoveCircle } from "../../md/remove-circle";
-export { default as MdRemoveFromQueue } from "../../md/remove-from-queue";
-export { default as MdRemoveRedEye } from "../../md/remove-red-eye";
-export { default as MdRemoveShoppingCart } from "../../md/remove-shopping-cart";
-export { default as MdRemove } from "../../md/remove";
-export { default as MdReorder } from "../../md/reorder";
-export { default as MdRepeatOne } from "../../md/repeat-one";
-export { default as MdRepeat } from "../../md/repeat";
-export { default as MdReplay10 } from "../../md/replay-10";
-export { default as MdReplay30 } from "../../md/replay-30";
-export { default as MdReplay5 } from "../../md/replay-5";
-export { default as MdReplay } from "../../md/replay";
-export { default as MdReplyAll } from "../../md/reply-all";
-export { default as MdReply } from "../../md/reply";
-export { default as MdReportProblem } from "../../md/report-problem";
-export { default as MdReport } from "../../md/report";
-export { default as MdRestaurantMenu } from "../../md/restaurant-menu";
-export { default as MdRestaurant } from "../../md/restaurant";
-export { default as MdRestorePage } from "../../md/restore-page";
-export { default as MdRestore } from "../../md/restore";
-export { default as MdRingVolume } from "../../md/ring-volume";
-export { default as MdRoomService } from "../../md/room-service";
-export { default as MdRoom } from "../../md/room";
-export { default as MdRotate90DegreesCcw } from "../../md/rotate-90-degrees-ccw";
-export { default as MdRotateLeft } from "../../md/rotate-left";
-export { default as MdRotateRight } from "../../md/rotate-right";
-export { default as MdRoundedCorner } from "../../md/rounded-corner";
-export { default as MdRouter } from "../../md/router";
-export { default as MdRowing } from "../../md/rowing";
-export { default as MdRssFeed } from "../../md/rss-feed";
-export { default as MdRvHookup } from "../../md/rv-hookup";
-export { default as MdSatellite } from "../../md/satellite";
-export { default as MdSave } from "../../md/save";
-export { default as MdScanner } from "../../md/scanner";
-export { default as MdSchedule } from "../../md/schedule";
-export { default as MdSchool } from "../../md/school";
-export { default as MdScreenLockLandscape } from "../../md/screen-lock-landscape";
-export { default as MdScreenLockPortrait } from "../../md/screen-lock-portrait";
-export { default as MdScreenLockRotation } from "../../md/screen-lock-rotation";
-export { default as MdScreenRotation } from "../../md/screen-rotation";
-export { default as MdScreenShare } from "../../md/screen-share";
-export { default as MdSdCard } from "../../md/sd-card";
-export { default as MdSdStorage } from "../../md/sd-storage";
-export { default as MdSearch } from "../../md/search";
-export { default as MdSecurity } from "../../md/security";
-export { default as MdSelectAll } from "../../md/select-all";
-export { default as MdSend } from "../../md/send";
-export { default as MdSentimentDissatisfied } from "../../md/sentiment-dissatisfied";
-export { default as MdSentimentNeutral } from "../../md/sentiment-neutral";
-export { default as MdSentimentSatisfied } from "../../md/sentiment-satisfied";
-export { default as MdSentimentVeryDissatisfied } from "../../md/sentiment-very-dissatisfied";
-export { default as MdSentimentVerySatisfied } from "../../md/sentiment-very-satisfied";
-export { default as MdSettingsApplications } from "../../md/settings-applications";
-export { default as MdSettingsBackupRestore } from "../../md/settings-backup-restore";
-export { default as MdSettingsBluetooth } from "../../md/settings-bluetooth";
-export { default as MdSettingsBrightness } from "../../md/settings-brightness";
-export { default as MdSettingsCell } from "../../md/settings-cell";
-export { default as MdSettingsEthernet } from "../../md/settings-ethernet";
-export { default as MdSettingsInputAntenna } from "../../md/settings-input-antenna";
-export { default as MdSettingsInputComponent } from "../../md/settings-input-component";
-export { default as MdSettingsInputComposite } from "../../md/settings-input-composite";
-export { default as MdSettingsInputHdmi } from "../../md/settings-input-hdmi";
-export { default as MdSettingsInputSvideo } from "../../md/settings-input-svideo";
-export { default as MdSettingsOverscan } from "../../md/settings-overscan";
-export { default as MdSettingsPhone } from "../../md/settings-phone";
-export { default as MdSettingsPower } from "../../md/settings-power";
-export { default as MdSettingsRemote } from "../../md/settings-remote";
-export { default as MdSettingsSystemDaydream } from "../../md/settings-system-daydream";
-export { default as MdSettingsVoice } from "../../md/settings-voice";
-export { default as MdSettings } from "../../md/settings";
-export { default as MdShare } from "../../md/share";
-export { default as MdShopTwo } from "../../md/shop-two";
-export { default as MdShop } from "../../md/shop";
-export { default as MdShoppingBasket } from "../../md/shopping-basket";
-export { default as MdShoppingCart } from "../../md/shopping-cart";
-export { default as MdShortText } from "../../md/short-text";
-export { default as MdShowChart } from "../../md/show-chart";
-export { default as MdShuffle } from "../../md/shuffle";
-export { default as MdSignalCellular4Bar } from "../../md/signal-cellular-4-bar";
-export { default as MdSignalCellularConnectedNoInternet4Bar } from "../../md/signal-cellular-connected-no-internet-4-bar";
-export { default as MdSignalCellularNoSim } from "../../md/signal-cellular-no-sim";
-export { default as MdSignalCellularNull } from "../../md/signal-cellular-null";
-export { default as MdSignalCellularOff } from "../../md/signal-cellular-off";
-export { default as MdSignalWifi4BarLock } from "../../md/signal-wifi-4-bar-lock";
-export { default as MdSignalWifi4Bar } from "../../md/signal-wifi-4-bar";
-export { default as MdSignalWifiOff } from "../../md/signal-wifi-off";
-export { default as MdSimCardAlert } from "../../md/sim-card-alert";
-export { default as MdSimCard } from "../../md/sim-card";
-export { default as MdSkipNext } from "../../md/skip-next";
-export { default as MdSkipPrevious } from "../../md/skip-previous";
-export { default as MdSlideshow } from "../../md/slideshow";
-export { default as MdSlowMotionVideo } from "../../md/slow-motion-video";
-export { default as MdSmartphone } from "../../md/smartphone";
-export { default as MdSmokeFree } from "../../md/smoke-free";
-export { default as MdSmokingRooms } from "../../md/smoking-rooms";
-export { default as MdSmsFailed } from "../../md/sms-failed";
-export { default as MdSms } from "../../md/sms";
-export { default as MdSnooze } from "../../md/snooze";
-export { default as MdSortByAlpha } from "../../md/sort-by-alpha";
-export { default as MdSort } from "../../md/sort";
-export { default as MdSpa } from "../../md/spa";
-export { default as MdSpaceBar } from "../../md/space-bar";
-export { default as MdSpeakerGroup } from "../../md/speaker-group";
-export { default as MdSpeakerNotesOff } from "../../md/speaker-notes-off";
-export { default as MdSpeakerNotes } from "../../md/speaker-notes";
-export { default as MdSpeakerPhone } from "../../md/speaker-phone";
-export { default as MdSpeaker } from "../../md/speaker";
-export { default as MdSpellcheck } from "../../md/spellcheck";
-export { default as MdStarBorder } from "../../md/star-border";
-export { default as MdStarHalf } from "../../md/star-half";
-export { default as MdStarOutline } from "../../md/star-outline";
-export { default as MdStar } from "../../md/star";
-export { default as MdStars } from "../../md/stars";
-export { default as MdStayCurrentLandscape } from "../../md/stay-current-landscape";
-export { default as MdStayCurrentPortrait } from "../../md/stay-current-portrait";
-export { default as MdStayPrimaryLandscape } from "../../md/stay-primary-landscape";
-export { default as MdStayPrimaryPortrait } from "../../md/stay-primary-portrait";
-export { default as MdStopScreenShare } from "../../md/stop-screen-share";
-export { default as MdStop } from "../../md/stop";
-export { default as MdStorage } from "../../md/storage";
-export { default as MdStoreMallDirectory } from "../../md/store-mall-directory";
-export { default as MdStore } from "../../md/store";
-export { default as MdStraighten } from "../../md/straighten";
-export { default as MdStreetview } from "../../md/streetview";
-export { default as MdStrikethroughS } from "../../md/strikethrough-s";
-export { default as MdStyle } from "../../md/style";
-export { default as MdSubdirectoryArrowLeft } from "../../md/subdirectory-arrow-left";
-export { default as MdSubdirectoryArrowRight } from "../../md/subdirectory-arrow-right";
-export { default as MdSubject } from "../../md/subject";
-export { default as MdSubscriptions } from "../../md/subscriptions";
-export { default as MdSubtitles } from "../../md/subtitles";
-export { default as MdSubway } from "../../md/subway";
-export { default as MdSupervisorAccount } from "../../md/supervisor-account";
-export { default as MdSurroundSound } from "../../md/surround-sound";
-export { default as MdSwapCalls } from "../../md/swap-calls";
-export { default as MdSwapHoriz } from "../../md/swap-horiz";
-export { default as MdSwapVert } from "../../md/swap-vert";
-export { default as MdSwapVerticalCircle } from "../../md/swap-vertical-circle";
-export { default as MdSwitchCamera } from "../../md/switch-camera";
-export { default as MdSwitchVideo } from "../../md/switch-video";
-export { default as MdSyncDisabled } from "../../md/sync-disabled";
-export { default as MdSyncProblem } from "../../md/sync-problem";
-export { default as MdSync } from "../../md/sync";
-export { default as MdSystemUpdateAlt } from "../../md/system-update-alt";
-export { default as MdSystemUpdate } from "../../md/system-update";
-export { default as MdTabUnselected } from "../../md/tab-unselected";
-export { default as MdTab } from "../../md/tab";
-export { default as MdTabletAndroid } from "../../md/tablet-android";
-export { default as MdTabletMac } from "../../md/tablet-mac";
-export { default as MdTablet } from "../../md/tablet";
-export { default as MdTagFaces } from "../../md/tag-faces";
-export { default as MdTapAndPlay } from "../../md/tap-and-play";
-export { default as MdTerrain } from "../../md/terrain";
-export { default as MdTextFields } from "../../md/text-fields";
-export { default as MdTextFormat } from "../../md/text-format";
-export { default as MdTextsms } from "../../md/textsms";
-export { default as MdTexture } from "../../md/texture";
-export { default as MdTheaters } from "../../md/theaters";
-export { default as MdThumbDown } from "../../md/thumb-down";
-export { default as MdThumbUp } from "../../md/thumb-up";
-export { default as MdThumbsUpDown } from "../../md/thumbs-up-down";
-export { default as MdTimeToLeave } from "../../md/time-to-leave";
-export { default as MdTimelapse } from "../../md/timelapse";
-export { default as MdTimeline } from "../../md/timeline";
-export { default as MdTimer10 } from "../../md/timer-10";
-export { default as MdTimer3 } from "../../md/timer-3";
-export { default as MdTimerOff } from "../../md/timer-off";
-export { default as MdTimer } from "../../md/timer";
-export { default as MdTitle } from "../../md/title";
-export { default as MdToc } from "../../md/toc";
-export { default as MdToday } from "../../md/today";
-export { default as MdToll } from "../../md/toll";
-export { default as MdTonality } from "../../md/tonality";
-export { default as MdTouchApp } from "../../md/touch-app";
-export { default as MdToys } from "../../md/toys";
-export { default as MdTrackChanges } from "../../md/track-changes";
-export { default as MdTraffic } from "../../md/traffic";
-export { default as MdTrain } from "../../md/train";
-export { default as MdTram } from "../../md/tram";
-export { default as MdTransferWithinAStation } from "../../md/transfer-within-a-station";
-export { default as MdTransform } from "../../md/transform";
-export { default as MdTranslate } from "../../md/translate";
-export { default as MdTrendingDown } from "../../md/trending-down";
-export { default as MdTrendingFlat } from "../../md/trending-flat";
-export { default as MdTrendingNeutral } from "../../md/trending-neutral";
-export { default as MdTrendingUp } from "../../md/trending-up";
-export { default as MdTune } from "../../md/tune";
-export { default as MdTurnedInNot } from "../../md/turned-in-not";
-export { default as MdTurnedIn } from "../../md/turned-in";
-export { default as MdTv } from "../../md/tv";
-export { default as MdUnarchive } from "../../md/unarchive";
-export { default as MdUndo } from "../../md/undo";
-export { default as MdUnfoldLess } from "../../md/unfold-less";
-export { default as MdUnfoldMore } from "../../md/unfold-more";
-export { default as MdUpdate } from "../../md/update";
-export { default as MdUsb } from "../../md/usb";
-export { default as MdVerifiedUser } from "../../md/verified-user";
-export { default as MdVerticalAlignBottom } from "../../md/vertical-align-bottom";
-export { default as MdVerticalAlignCenter } from "../../md/vertical-align-center";
-export { default as MdVerticalAlignTop } from "../../md/vertical-align-top";
-export { default as MdVibration } from "../../md/vibration";
-export { default as MdVideoCall } from "../../md/video-call";
-export { default as MdVideoCollection } from "../../md/video-collection";
-export { default as MdVideoLabel } from "../../md/video-label";
-export { default as MdVideoLibrary } from "../../md/video-library";
-export { default as MdVideocamOff } from "../../md/videocam-off";
-export { default as MdVideocam } from "../../md/videocam";
-export { default as MdVideogameAsset } from "../../md/videogame-asset";
-export { default as MdViewAgenda } from "../../md/view-agenda";
-export { default as MdViewArray } from "../../md/view-array";
-export { default as MdViewCarousel } from "../../md/view-carousel";
-export { default as MdViewColumn } from "../../md/view-column";
-export { default as MdViewComfortable } from "../../md/view-comfortable";
-export { default as MdViewComfy } from "../../md/view-comfy";
-export { default as MdViewCompact } from "../../md/view-compact";
-export { default as MdViewDay } from "../../md/view-day";
-export { default as MdViewHeadline } from "../../md/view-headline";
-export { default as MdViewList } from "../../md/view-list";
-export { default as MdViewModule } from "../../md/view-module";
-export { default as MdViewQuilt } from "../../md/view-quilt";
-export { default as MdViewStream } from "../../md/view-stream";
-export { default as MdViewWeek } from "../../md/view-week";
-export { default as MdVignette } from "../../md/vignette";
-export { default as MdVisibilityOff } from "../../md/visibility-off";
-export { default as MdVisibility } from "../../md/visibility";
-export { default as MdVoiceChat } from "../../md/voice-chat";
-export { default as MdVoicemail } from "../../md/voicemail";
-export { default as MdVolumeDown } from "../../md/volume-down";
-export { default as MdVolumeMute } from "../../md/volume-mute";
-export { default as MdVolumeOff } from "../../md/volume-off";
-export { default as MdVolumeUp } from "../../md/volume-up";
-export { default as MdVpnKey } from "../../md/vpn-key";
-export { default as MdVpnLock } from "../../md/vpn-lock";
-export { default as MdWallpaper } from "../../md/wallpaper";
-export { default as MdWarning } from "../../md/warning";
-export { default as MdWatchLater } from "../../md/watch-later";
-export { default as MdWatch } from "../../md/watch";
-export { default as MdWbAuto } from "../../md/wb-auto";
-export { default as MdWbCloudy } from "../../md/wb-cloudy";
-export { default as MdWbIncandescent } from "../../md/wb-incandescent";
-export { default as MdWbIridescent } from "../../md/wb-iridescent";
-export { default as MdWbSunny } from "../../md/wb-sunny";
-export { default as MdWc } from "../../md/wc";
-export { default as MdWebAsset } from "../../md/web-asset";
-export { default as MdWeb } from "../../md/web";
-export { default as MdWeekend } from "../../md/weekend";
-export { default as MdWhatshot } from "../../md/whatshot";
-export { default as MdWidgets } from "../../md/widgets";
-export { default as MdWifiLock } from "../../md/wifi-lock";
-export { default as MdWifiTethering } from "../../md/wifi-tethering";
-export { default as MdWifi } from "../../md/wifi";
-export { default as MdWork } from "../../md/work";
-export { default as MdWrapText } from "../../md/wrap-text";
-export { default as MdYoutubeSearchedFor } from "../../md/youtube-searched-for";
-export { default as MdZoomIn } from "../../md/zoom-in";
-export { default as MdZoomOutMap } from "../../md/zoom-out-map";
-export { default as MdZoomOut } from "../../md/zoom-out";
diff --git a/types/react-icons/lib/md/info-outline.d.ts b/types/react-icons/lib/md/info-outline.d.ts
deleted file mode 100644
index 5637358a59..0000000000
--- a/types/react-icons/lib/md/info-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdInfoOutline extends React.Component<IconBaseProps> { }
-export = MdInfoOutline;
diff --git a/types/react-icons/lib/md/info.d.ts b/types/react-icons/lib/md/info.d.ts
deleted file mode 100644
index 4ab7948826..0000000000
--- a/types/react-icons/lib/md/info.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdInfo extends React.Component<IconBaseProps> { }
-export = MdInfo;
diff --git a/types/react-icons/lib/md/input.d.ts b/types/react-icons/lib/md/input.d.ts
deleted file mode 100644
index 8b3f4b415a..0000000000
--- a/types/react-icons/lib/md/input.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdInput extends React.Component<IconBaseProps> { }
-export = MdInput;
diff --git a/types/react-icons/lib/md/insert-chart.d.ts b/types/react-icons/lib/md/insert-chart.d.ts
deleted file mode 100644
index 3b8d6c13e2..0000000000
--- a/types/react-icons/lib/md/insert-chart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdInsertChart extends React.Component<IconBaseProps> { }
-export = MdInsertChart;
diff --git a/types/react-icons/lib/md/insert-comment.d.ts b/types/react-icons/lib/md/insert-comment.d.ts
deleted file mode 100644
index 1d2ad77e16..0000000000
--- a/types/react-icons/lib/md/insert-comment.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdInsertComment extends React.Component<IconBaseProps> { }
-export = MdInsertComment;
diff --git a/types/react-icons/lib/md/insert-drive-file.d.ts b/types/react-icons/lib/md/insert-drive-file.d.ts
deleted file mode 100644
index 7e20744ad2..0000000000
--- a/types/react-icons/lib/md/insert-drive-file.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdInsertDriveFile extends React.Component<IconBaseProps> { }
-export = MdInsertDriveFile;
diff --git a/types/react-icons/lib/md/insert-emoticon.d.ts b/types/react-icons/lib/md/insert-emoticon.d.ts
deleted file mode 100644
index c535f13a36..0000000000
--- a/types/react-icons/lib/md/insert-emoticon.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdInsertEmoticon extends React.Component<IconBaseProps> { }
-export = MdInsertEmoticon;
diff --git a/types/react-icons/lib/md/insert-invitation.d.ts b/types/react-icons/lib/md/insert-invitation.d.ts
deleted file mode 100644
index 04c3e098c6..0000000000
--- a/types/react-icons/lib/md/insert-invitation.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdInsertInvitation extends React.Component<IconBaseProps> { }
-export = MdInsertInvitation;
diff --git a/types/react-icons/lib/md/insert-link.d.ts b/types/react-icons/lib/md/insert-link.d.ts
deleted file mode 100644
index 83e4e38712..0000000000
--- a/types/react-icons/lib/md/insert-link.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdInsertLink extends React.Component<IconBaseProps> { }
-export = MdInsertLink;
diff --git a/types/react-icons/lib/md/insert-photo.d.ts b/types/react-icons/lib/md/insert-photo.d.ts
deleted file mode 100644
index ad583ecebc..0000000000
--- a/types/react-icons/lib/md/insert-photo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdInsertPhoto extends React.Component<IconBaseProps> { }
-export = MdInsertPhoto;
diff --git a/types/react-icons/lib/md/invert-colors-off.d.ts b/types/react-icons/lib/md/invert-colors-off.d.ts
deleted file mode 100644
index 0e0ae7da7f..0000000000
--- a/types/react-icons/lib/md/invert-colors-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdInvertColorsOff extends React.Component<IconBaseProps> { }
-export = MdInvertColorsOff;
diff --git a/types/react-icons/lib/md/invert-colors-on.d.ts b/types/react-icons/lib/md/invert-colors-on.d.ts
deleted file mode 100644
index 318cbdd0b3..0000000000
--- a/types/react-icons/lib/md/invert-colors-on.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdInvertColorsOn extends React.Component<IconBaseProps> { }
-export = MdInvertColorsOn;
diff --git a/types/react-icons/lib/md/invert-colors.d.ts b/types/react-icons/lib/md/invert-colors.d.ts
deleted file mode 100644
index b07fef302d..0000000000
--- a/types/react-icons/lib/md/invert-colors.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdInvertColors extends React.Component<IconBaseProps> { }
-export = MdInvertColors;
diff --git a/types/react-icons/lib/md/iso.d.ts b/types/react-icons/lib/md/iso.d.ts
deleted file mode 100644
index e0dc190337..0000000000
--- a/types/react-icons/lib/md/iso.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdIso extends React.Component<IconBaseProps> { }
-export = MdIso;
diff --git a/types/react-icons/lib/md/keyboard-arrow-down.d.ts b/types/react-icons/lib/md/keyboard-arrow-down.d.ts
deleted file mode 100644
index e1ada8591b..0000000000
--- a/types/react-icons/lib/md/keyboard-arrow-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdKeyboardArrowDown extends React.Component<IconBaseProps> { }
-export = MdKeyboardArrowDown;
diff --git a/types/react-icons/lib/md/keyboard-arrow-left.d.ts b/types/react-icons/lib/md/keyboard-arrow-left.d.ts
deleted file mode 100644
index 9a617de836..0000000000
--- a/types/react-icons/lib/md/keyboard-arrow-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdKeyboardArrowLeft extends React.Component<IconBaseProps> { }
-export = MdKeyboardArrowLeft;
diff --git a/types/react-icons/lib/md/keyboard-arrow-right.d.ts b/types/react-icons/lib/md/keyboard-arrow-right.d.ts
deleted file mode 100644
index e6e5f92245..0000000000
--- a/types/react-icons/lib/md/keyboard-arrow-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdKeyboardArrowRight extends React.Component<IconBaseProps> { }
-export = MdKeyboardArrowRight;
diff --git a/types/react-icons/lib/md/keyboard-arrow-up.d.ts b/types/react-icons/lib/md/keyboard-arrow-up.d.ts
deleted file mode 100644
index 55dc2486e3..0000000000
--- a/types/react-icons/lib/md/keyboard-arrow-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdKeyboardArrowUp extends React.Component<IconBaseProps> { }
-export = MdKeyboardArrowUp;
diff --git a/types/react-icons/lib/md/keyboard-backspace.d.ts b/types/react-icons/lib/md/keyboard-backspace.d.ts
deleted file mode 100644
index 5d04cd78c9..0000000000
--- a/types/react-icons/lib/md/keyboard-backspace.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdKeyboardBackspace extends React.Component<IconBaseProps> { }
-export = MdKeyboardBackspace;
diff --git a/types/react-icons/lib/md/keyboard-capslock.d.ts b/types/react-icons/lib/md/keyboard-capslock.d.ts
deleted file mode 100644
index f4894cc8f5..0000000000
--- a/types/react-icons/lib/md/keyboard-capslock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdKeyboardCapslock extends React.Component<IconBaseProps> { }
-export = MdKeyboardCapslock;
diff --git a/types/react-icons/lib/md/keyboard-control.d.ts b/types/react-icons/lib/md/keyboard-control.d.ts
deleted file mode 100644
index 83404a2333..0000000000
--- a/types/react-icons/lib/md/keyboard-control.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdKeyboardControl extends React.Component<IconBaseProps> { }
-export = MdKeyboardControl;
diff --git a/types/react-icons/lib/md/keyboard-hide.d.ts b/types/react-icons/lib/md/keyboard-hide.d.ts
deleted file mode 100644
index 99b49d804c..0000000000
--- a/types/react-icons/lib/md/keyboard-hide.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdKeyboardHide extends React.Component<IconBaseProps> { }
-export = MdKeyboardHide;
diff --git a/types/react-icons/lib/md/keyboard-return.d.ts b/types/react-icons/lib/md/keyboard-return.d.ts
deleted file mode 100644
index af2ed0a05f..0000000000
--- a/types/react-icons/lib/md/keyboard-return.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdKeyboardReturn extends React.Component<IconBaseProps> { }
-export = MdKeyboardReturn;
diff --git a/types/react-icons/lib/md/keyboard-tab.d.ts b/types/react-icons/lib/md/keyboard-tab.d.ts
deleted file mode 100644
index b28759381a..0000000000
--- a/types/react-icons/lib/md/keyboard-tab.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdKeyboardTab extends React.Component<IconBaseProps> { }
-export = MdKeyboardTab;
diff --git a/types/react-icons/lib/md/keyboard-voice.d.ts b/types/react-icons/lib/md/keyboard-voice.d.ts
deleted file mode 100644
index 6ffefcc90e..0000000000
--- a/types/react-icons/lib/md/keyboard-voice.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdKeyboardVoice extends React.Component<IconBaseProps> { }
-export = MdKeyboardVoice;
diff --git a/types/react-icons/lib/md/keyboard.d.ts b/types/react-icons/lib/md/keyboard.d.ts
deleted file mode 100644
index cc3ea90276..0000000000
--- a/types/react-icons/lib/md/keyboard.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdKeyboard extends React.Component<IconBaseProps> { }
-export = MdKeyboard;
diff --git a/types/react-icons/lib/md/kitchen.d.ts b/types/react-icons/lib/md/kitchen.d.ts
deleted file mode 100644
index 79d8c0fce3..0000000000
--- a/types/react-icons/lib/md/kitchen.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdKitchen extends React.Component<IconBaseProps> { }
-export = MdKitchen;
diff --git a/types/react-icons/lib/md/label-outline.d.ts b/types/react-icons/lib/md/label-outline.d.ts
deleted file mode 100644
index 01ae937f15..0000000000
--- a/types/react-icons/lib/md/label-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLabelOutline extends React.Component<IconBaseProps> { }
-export = MdLabelOutline;
diff --git a/types/react-icons/lib/md/label.d.ts b/types/react-icons/lib/md/label.d.ts
deleted file mode 100644
index 774401589e..0000000000
--- a/types/react-icons/lib/md/label.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLabel extends React.Component<IconBaseProps> { }
-export = MdLabel;
diff --git a/types/react-icons/lib/md/landscape.d.ts b/types/react-icons/lib/md/landscape.d.ts
deleted file mode 100644
index 6682f2674a..0000000000
--- a/types/react-icons/lib/md/landscape.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLandscape extends React.Component<IconBaseProps> { }
-export = MdLandscape;
diff --git a/types/react-icons/lib/md/language.d.ts b/types/react-icons/lib/md/language.d.ts
deleted file mode 100644
index e44dd9b1db..0000000000
--- a/types/react-icons/lib/md/language.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLanguage extends React.Component<IconBaseProps> { }
-export = MdLanguage;
diff --git a/types/react-icons/lib/md/laptop-chromebook.d.ts b/types/react-icons/lib/md/laptop-chromebook.d.ts
deleted file mode 100644
index b61654b7a0..0000000000
--- a/types/react-icons/lib/md/laptop-chromebook.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLaptopChromebook extends React.Component<IconBaseProps> { }
-export = MdLaptopChromebook;
diff --git a/types/react-icons/lib/md/laptop-mac.d.ts b/types/react-icons/lib/md/laptop-mac.d.ts
deleted file mode 100644
index 47f2ea0bc7..0000000000
--- a/types/react-icons/lib/md/laptop-mac.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLaptopMac extends React.Component<IconBaseProps> { }
-export = MdLaptopMac;
diff --git a/types/react-icons/lib/md/laptop-windows.d.ts b/types/react-icons/lib/md/laptop-windows.d.ts
deleted file mode 100644
index 5b4fd277aa..0000000000
--- a/types/react-icons/lib/md/laptop-windows.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLaptopWindows extends React.Component<IconBaseProps> { }
-export = MdLaptopWindows;
diff --git a/types/react-icons/lib/md/laptop.d.ts b/types/react-icons/lib/md/laptop.d.ts
deleted file mode 100644
index adf918c456..0000000000
--- a/types/react-icons/lib/md/laptop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLaptop extends React.Component<IconBaseProps> { }
-export = MdLaptop;
diff --git a/types/react-icons/lib/md/last-page.d.ts b/types/react-icons/lib/md/last-page.d.ts
deleted file mode 100644
index 1b89fbe0b8..0000000000
--- a/types/react-icons/lib/md/last-page.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLastPage extends React.Component<IconBaseProps> { }
-export = MdLastPage;
diff --git a/types/react-icons/lib/md/launch.d.ts b/types/react-icons/lib/md/launch.d.ts
deleted file mode 100644
index 20e5423921..0000000000
--- a/types/react-icons/lib/md/launch.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLaunch extends React.Component<IconBaseProps> { }
-export = MdLaunch;
diff --git a/types/react-icons/lib/md/layers-clear.d.ts b/types/react-icons/lib/md/layers-clear.d.ts
deleted file mode 100644
index 1d9e3d1a79..0000000000
--- a/types/react-icons/lib/md/layers-clear.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLayersClear extends React.Component<IconBaseProps> { }
-export = MdLayersClear;
diff --git a/types/react-icons/lib/md/layers.d.ts b/types/react-icons/lib/md/layers.d.ts
deleted file mode 100644
index 0afbb40d68..0000000000
--- a/types/react-icons/lib/md/layers.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLayers extends React.Component<IconBaseProps> { }
-export = MdLayers;
diff --git a/types/react-icons/lib/md/leak-add.d.ts b/types/react-icons/lib/md/leak-add.d.ts
deleted file mode 100644
index 5a2c27ded3..0000000000
--- a/types/react-icons/lib/md/leak-add.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLeakAdd extends React.Component<IconBaseProps> { }
-export = MdLeakAdd;
diff --git a/types/react-icons/lib/md/leak-remove.d.ts b/types/react-icons/lib/md/leak-remove.d.ts
deleted file mode 100644
index bb39e31d50..0000000000
--- a/types/react-icons/lib/md/leak-remove.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLeakRemove extends React.Component<IconBaseProps> { }
-export = MdLeakRemove;
diff --git a/types/react-icons/lib/md/lens.d.ts b/types/react-icons/lib/md/lens.d.ts
deleted file mode 100644
index 489ca62554..0000000000
--- a/types/react-icons/lib/md/lens.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLens extends React.Component<IconBaseProps> { }
-export = MdLens;
diff --git a/types/react-icons/lib/md/library-add.d.ts b/types/react-icons/lib/md/library-add.d.ts
deleted file mode 100644
index 9e1e8b2501..0000000000
--- a/types/react-icons/lib/md/library-add.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLibraryAdd extends React.Component<IconBaseProps> { }
-export = MdLibraryAdd;
diff --git a/types/react-icons/lib/md/library-books.d.ts b/types/react-icons/lib/md/library-books.d.ts
deleted file mode 100644
index bacbf10d03..0000000000
--- a/types/react-icons/lib/md/library-books.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLibraryBooks extends React.Component<IconBaseProps> { }
-export = MdLibraryBooks;
diff --git a/types/react-icons/lib/md/library-music.d.ts b/types/react-icons/lib/md/library-music.d.ts
deleted file mode 100644
index 11c6c8bf2b..0000000000
--- a/types/react-icons/lib/md/library-music.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLibraryMusic extends React.Component<IconBaseProps> { }
-export = MdLibraryMusic;
diff --git a/types/react-icons/lib/md/lightbulb-outline.d.ts b/types/react-icons/lib/md/lightbulb-outline.d.ts
deleted file mode 100644
index 8a8548dc97..0000000000
--- a/types/react-icons/lib/md/lightbulb-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLightbulbOutline extends React.Component<IconBaseProps> { }
-export = MdLightbulbOutline;
diff --git a/types/react-icons/lib/md/line-style.d.ts b/types/react-icons/lib/md/line-style.d.ts
deleted file mode 100644
index 41264e8a88..0000000000
--- a/types/react-icons/lib/md/line-style.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLineStyle extends React.Component<IconBaseProps> { }
-export = MdLineStyle;
diff --git a/types/react-icons/lib/md/line-weight.d.ts b/types/react-icons/lib/md/line-weight.d.ts
deleted file mode 100644
index b46fd1b8d2..0000000000
--- a/types/react-icons/lib/md/line-weight.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLineWeight extends React.Component<IconBaseProps> { }
-export = MdLineWeight;
diff --git a/types/react-icons/lib/md/linear-scale.d.ts b/types/react-icons/lib/md/linear-scale.d.ts
deleted file mode 100644
index 98fc794688..0000000000
--- a/types/react-icons/lib/md/linear-scale.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLinearScale extends React.Component<IconBaseProps> { }
-export = MdLinearScale;
diff --git a/types/react-icons/lib/md/link.d.ts b/types/react-icons/lib/md/link.d.ts
deleted file mode 100644
index 1611d9af64..0000000000
--- a/types/react-icons/lib/md/link.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLink extends React.Component<IconBaseProps> { }
-export = MdLink;
diff --git a/types/react-icons/lib/md/linked-camera.d.ts b/types/react-icons/lib/md/linked-camera.d.ts
deleted file mode 100644
index 3bd2a1c26d..0000000000
--- a/types/react-icons/lib/md/linked-camera.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLinkedCamera extends React.Component<IconBaseProps> { }
-export = MdLinkedCamera;
diff --git a/types/react-icons/lib/md/list.d.ts b/types/react-icons/lib/md/list.d.ts
deleted file mode 100644
index 2403875d33..0000000000
--- a/types/react-icons/lib/md/list.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdList extends React.Component<IconBaseProps> { }
-export = MdList;
diff --git a/types/react-icons/lib/md/live-help.d.ts b/types/react-icons/lib/md/live-help.d.ts
deleted file mode 100644
index 9b174fe970..0000000000
--- a/types/react-icons/lib/md/live-help.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLiveHelp extends React.Component<IconBaseProps> { }
-export = MdLiveHelp;
diff --git a/types/react-icons/lib/md/live-tv.d.ts b/types/react-icons/lib/md/live-tv.d.ts
deleted file mode 100644
index 86557bb3ce..0000000000
--- a/types/react-icons/lib/md/live-tv.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLiveTv extends React.Component<IconBaseProps> { }
-export = MdLiveTv;
diff --git a/types/react-icons/lib/md/local-airport.d.ts b/types/react-icons/lib/md/local-airport.d.ts
deleted file mode 100644
index 1f5d71515e..0000000000
--- a/types/react-icons/lib/md/local-airport.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalAirport extends React.Component<IconBaseProps> { }
-export = MdLocalAirport;
diff --git a/types/react-icons/lib/md/local-atm.d.ts b/types/react-icons/lib/md/local-atm.d.ts
deleted file mode 100644
index b9396fbddc..0000000000
--- a/types/react-icons/lib/md/local-atm.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalAtm extends React.Component<IconBaseProps> { }
-export = MdLocalAtm;
diff --git a/types/react-icons/lib/md/local-attraction.d.ts b/types/react-icons/lib/md/local-attraction.d.ts
deleted file mode 100644
index 3c6ba7842b..0000000000
--- a/types/react-icons/lib/md/local-attraction.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalAttraction extends React.Component<IconBaseProps> { }
-export = MdLocalAttraction;
diff --git a/types/react-icons/lib/md/local-bar.d.ts b/types/react-icons/lib/md/local-bar.d.ts
deleted file mode 100644
index 63886e78cb..0000000000
--- a/types/react-icons/lib/md/local-bar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalBar extends React.Component<IconBaseProps> { }
-export = MdLocalBar;
diff --git a/types/react-icons/lib/md/local-cafe.d.ts b/types/react-icons/lib/md/local-cafe.d.ts
deleted file mode 100644
index eb9e80ad77..0000000000
--- a/types/react-icons/lib/md/local-cafe.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalCafe extends React.Component<IconBaseProps> { }
-export = MdLocalCafe;
diff --git a/types/react-icons/lib/md/local-car-wash.d.ts b/types/react-icons/lib/md/local-car-wash.d.ts
deleted file mode 100644
index fb4b04b228..0000000000
--- a/types/react-icons/lib/md/local-car-wash.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalCarWash extends React.Component<IconBaseProps> { }
-export = MdLocalCarWash;
diff --git a/types/react-icons/lib/md/local-convenience-store.d.ts b/types/react-icons/lib/md/local-convenience-store.d.ts
deleted file mode 100644
index 926d257832..0000000000
--- a/types/react-icons/lib/md/local-convenience-store.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalConvenienceStore extends React.Component<IconBaseProps> { }
-export = MdLocalConvenienceStore;
diff --git a/types/react-icons/lib/md/local-drink.d.ts b/types/react-icons/lib/md/local-drink.d.ts
deleted file mode 100644
index d175a7f0cf..0000000000
--- a/types/react-icons/lib/md/local-drink.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalDrink extends React.Component<IconBaseProps> { }
-export = MdLocalDrink;
diff --git a/types/react-icons/lib/md/local-florist.d.ts b/types/react-icons/lib/md/local-florist.d.ts
deleted file mode 100644
index 217b879173..0000000000
--- a/types/react-icons/lib/md/local-florist.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalFlorist extends React.Component<IconBaseProps> { }
-export = MdLocalFlorist;
diff --git a/types/react-icons/lib/md/local-gas-station.d.ts b/types/react-icons/lib/md/local-gas-station.d.ts
deleted file mode 100644
index 21a7d020cb..0000000000
--- a/types/react-icons/lib/md/local-gas-station.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalGasStation extends React.Component<IconBaseProps> { }
-export = MdLocalGasStation;
diff --git a/types/react-icons/lib/md/local-grocery-store.d.ts b/types/react-icons/lib/md/local-grocery-store.d.ts
deleted file mode 100644
index ee055fbc1b..0000000000
--- a/types/react-icons/lib/md/local-grocery-store.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalGroceryStore extends React.Component<IconBaseProps> { }
-export = MdLocalGroceryStore;
diff --git a/types/react-icons/lib/md/local-hospital.d.ts b/types/react-icons/lib/md/local-hospital.d.ts
deleted file mode 100644
index acce7088cd..0000000000
--- a/types/react-icons/lib/md/local-hospital.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalHospital extends React.Component<IconBaseProps> { }
-export = MdLocalHospital;
diff --git a/types/react-icons/lib/md/local-hotel.d.ts b/types/react-icons/lib/md/local-hotel.d.ts
deleted file mode 100644
index 378a7557ee..0000000000
--- a/types/react-icons/lib/md/local-hotel.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalHotel extends React.Component<IconBaseProps> { }
-export = MdLocalHotel;
diff --git a/types/react-icons/lib/md/local-laundry-service.d.ts b/types/react-icons/lib/md/local-laundry-service.d.ts
deleted file mode 100644
index 9353692a5c..0000000000
--- a/types/react-icons/lib/md/local-laundry-service.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalLaundryService extends React.Component<IconBaseProps> { }
-export = MdLocalLaundryService;
diff --git a/types/react-icons/lib/md/local-library.d.ts b/types/react-icons/lib/md/local-library.d.ts
deleted file mode 100644
index 1d455aa856..0000000000
--- a/types/react-icons/lib/md/local-library.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalLibrary extends React.Component<IconBaseProps> { }
-export = MdLocalLibrary;
diff --git a/types/react-icons/lib/md/local-mall.d.ts b/types/react-icons/lib/md/local-mall.d.ts
deleted file mode 100644
index 46dbdcb894..0000000000
--- a/types/react-icons/lib/md/local-mall.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalMall extends React.Component<IconBaseProps> { }
-export = MdLocalMall;
diff --git a/types/react-icons/lib/md/local-movies.d.ts b/types/react-icons/lib/md/local-movies.d.ts
deleted file mode 100644
index 58d62b2909..0000000000
--- a/types/react-icons/lib/md/local-movies.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalMovies extends React.Component<IconBaseProps> { }
-export = MdLocalMovies;
diff --git a/types/react-icons/lib/md/local-offer.d.ts b/types/react-icons/lib/md/local-offer.d.ts
deleted file mode 100644
index f137a10bb1..0000000000
--- a/types/react-icons/lib/md/local-offer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalOffer extends React.Component<IconBaseProps> { }
-export = MdLocalOffer;
diff --git a/types/react-icons/lib/md/local-parking.d.ts b/types/react-icons/lib/md/local-parking.d.ts
deleted file mode 100644
index 01d4ff13cf..0000000000
--- a/types/react-icons/lib/md/local-parking.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalParking extends React.Component<IconBaseProps> { }
-export = MdLocalParking;
diff --git a/types/react-icons/lib/md/local-pharmacy.d.ts b/types/react-icons/lib/md/local-pharmacy.d.ts
deleted file mode 100644
index ce2b6d192a..0000000000
--- a/types/react-icons/lib/md/local-pharmacy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalPharmacy extends React.Component<IconBaseProps> { }
-export = MdLocalPharmacy;
diff --git a/types/react-icons/lib/md/local-phone.d.ts b/types/react-icons/lib/md/local-phone.d.ts
deleted file mode 100644
index bd34f480b6..0000000000
--- a/types/react-icons/lib/md/local-phone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalPhone extends React.Component<IconBaseProps> { }
-export = MdLocalPhone;
diff --git a/types/react-icons/lib/md/local-pizza.d.ts b/types/react-icons/lib/md/local-pizza.d.ts
deleted file mode 100644
index d6faf8bcb3..0000000000
--- a/types/react-icons/lib/md/local-pizza.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalPizza extends React.Component<IconBaseProps> { }
-export = MdLocalPizza;
diff --git a/types/react-icons/lib/md/local-play.d.ts b/types/react-icons/lib/md/local-play.d.ts
deleted file mode 100644
index 3efcc87e1b..0000000000
--- a/types/react-icons/lib/md/local-play.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalPlay extends React.Component<IconBaseProps> { }
-export = MdLocalPlay;
diff --git a/types/react-icons/lib/md/local-post-office.d.ts b/types/react-icons/lib/md/local-post-office.d.ts
deleted file mode 100644
index a5f4a8f938..0000000000
--- a/types/react-icons/lib/md/local-post-office.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalPostOffice extends React.Component<IconBaseProps> { }
-export = MdLocalPostOffice;
diff --git a/types/react-icons/lib/md/local-print-shop.d.ts b/types/react-icons/lib/md/local-print-shop.d.ts
deleted file mode 100644
index 3644eaa9cf..0000000000
--- a/types/react-icons/lib/md/local-print-shop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalPrintShop extends React.Component<IconBaseProps> { }
-export = MdLocalPrintShop;
diff --git a/types/react-icons/lib/md/local-restaurant.d.ts b/types/react-icons/lib/md/local-restaurant.d.ts
deleted file mode 100644
index 714a1c2a0e..0000000000
--- a/types/react-icons/lib/md/local-restaurant.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalRestaurant extends React.Component<IconBaseProps> { }
-export = MdLocalRestaurant;
diff --git a/types/react-icons/lib/md/local-see.d.ts b/types/react-icons/lib/md/local-see.d.ts
deleted file mode 100644
index a5b631777d..0000000000
--- a/types/react-icons/lib/md/local-see.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalSee extends React.Component<IconBaseProps> { }
-export = MdLocalSee;
diff --git a/types/react-icons/lib/md/local-shipping.d.ts b/types/react-icons/lib/md/local-shipping.d.ts
deleted file mode 100644
index f08d34f0ef..0000000000
--- a/types/react-icons/lib/md/local-shipping.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalShipping extends React.Component<IconBaseProps> { }
-export = MdLocalShipping;
diff --git a/types/react-icons/lib/md/local-taxi.d.ts b/types/react-icons/lib/md/local-taxi.d.ts
deleted file mode 100644
index d4a9cfe09b..0000000000
--- a/types/react-icons/lib/md/local-taxi.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocalTaxi extends React.Component<IconBaseProps> { }
-export = MdLocalTaxi;
diff --git a/types/react-icons/lib/md/location-city.d.ts b/types/react-icons/lib/md/location-city.d.ts
deleted file mode 100644
index 53c2f14810..0000000000
--- a/types/react-icons/lib/md/location-city.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocationCity extends React.Component<IconBaseProps> { }
-export = MdLocationCity;
diff --git a/types/react-icons/lib/md/location-disabled.d.ts b/types/react-icons/lib/md/location-disabled.d.ts
deleted file mode 100644
index f4af27f5f3..0000000000
--- a/types/react-icons/lib/md/location-disabled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocationDisabled extends React.Component<IconBaseProps> { }
-export = MdLocationDisabled;
diff --git a/types/react-icons/lib/md/location-history.d.ts b/types/react-icons/lib/md/location-history.d.ts
deleted file mode 100644
index 555813d873..0000000000
--- a/types/react-icons/lib/md/location-history.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocationHistory extends React.Component<IconBaseProps> { }
-export = MdLocationHistory;
diff --git a/types/react-icons/lib/md/location-off.d.ts b/types/react-icons/lib/md/location-off.d.ts
deleted file mode 100644
index 193e2a8cf6..0000000000
--- a/types/react-icons/lib/md/location-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocationOff extends React.Component<IconBaseProps> { }
-export = MdLocationOff;
diff --git a/types/react-icons/lib/md/location-on.d.ts b/types/react-icons/lib/md/location-on.d.ts
deleted file mode 100644
index 77094905da..0000000000
--- a/types/react-icons/lib/md/location-on.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocationOn extends React.Component<IconBaseProps> { }
-export = MdLocationOn;
diff --git a/types/react-icons/lib/md/location-searching.d.ts b/types/react-icons/lib/md/location-searching.d.ts
deleted file mode 100644
index de07a33e91..0000000000
--- a/types/react-icons/lib/md/location-searching.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLocationSearching extends React.Component<IconBaseProps> { }
-export = MdLocationSearching;
diff --git a/types/react-icons/lib/md/lock-open.d.ts b/types/react-icons/lib/md/lock-open.d.ts
deleted file mode 100644
index 38cc201800..0000000000
--- a/types/react-icons/lib/md/lock-open.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLockOpen extends React.Component<IconBaseProps> { }
-export = MdLockOpen;
diff --git a/types/react-icons/lib/md/lock-outline.d.ts b/types/react-icons/lib/md/lock-outline.d.ts
deleted file mode 100644
index 201dab5ca3..0000000000
--- a/types/react-icons/lib/md/lock-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLockOutline extends React.Component<IconBaseProps> { }
-export = MdLockOutline;
diff --git a/types/react-icons/lib/md/lock.d.ts b/types/react-icons/lib/md/lock.d.ts
deleted file mode 100644
index 415ddfc886..0000000000
--- a/types/react-icons/lib/md/lock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLock extends React.Component<IconBaseProps> { }
-export = MdLock;
diff --git a/types/react-icons/lib/md/looks-3.d.ts b/types/react-icons/lib/md/looks-3.d.ts
deleted file mode 100644
index 9bf0f8b3d0..0000000000
--- a/types/react-icons/lib/md/looks-3.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLooks3 extends React.Component<IconBaseProps> { }
-export = MdLooks3;
diff --git a/types/react-icons/lib/md/looks-4.d.ts b/types/react-icons/lib/md/looks-4.d.ts
deleted file mode 100644
index 030bd6c730..0000000000
--- a/types/react-icons/lib/md/looks-4.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLooks4 extends React.Component<IconBaseProps> { }
-export = MdLooks4;
diff --git a/types/react-icons/lib/md/looks-5.d.ts b/types/react-icons/lib/md/looks-5.d.ts
deleted file mode 100644
index 02d6aaaab3..0000000000
--- a/types/react-icons/lib/md/looks-5.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLooks5 extends React.Component<IconBaseProps> { }
-export = MdLooks5;
diff --git a/types/react-icons/lib/md/looks-6.d.ts b/types/react-icons/lib/md/looks-6.d.ts
deleted file mode 100644
index 4c35ffd3f5..0000000000
--- a/types/react-icons/lib/md/looks-6.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLooks6 extends React.Component<IconBaseProps> { }
-export = MdLooks6;
diff --git a/types/react-icons/lib/md/looks-one.d.ts b/types/react-icons/lib/md/looks-one.d.ts
deleted file mode 100644
index fd6b6cb6aa..0000000000
--- a/types/react-icons/lib/md/looks-one.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLooksOne extends React.Component<IconBaseProps> { }
-export = MdLooksOne;
diff --git a/types/react-icons/lib/md/looks-two.d.ts b/types/react-icons/lib/md/looks-two.d.ts
deleted file mode 100644
index 8d4dfb2d89..0000000000
--- a/types/react-icons/lib/md/looks-two.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLooksTwo extends React.Component<IconBaseProps> { }
-export = MdLooksTwo;
diff --git a/types/react-icons/lib/md/looks.d.ts b/types/react-icons/lib/md/looks.d.ts
deleted file mode 100644
index 41a1db63fc..0000000000
--- a/types/react-icons/lib/md/looks.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLooks extends React.Component<IconBaseProps> { }
-export = MdLooks;
diff --git a/types/react-icons/lib/md/loop.d.ts b/types/react-icons/lib/md/loop.d.ts
deleted file mode 100644
index 25cff2c482..0000000000
--- a/types/react-icons/lib/md/loop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLoop extends React.Component<IconBaseProps> { }
-export = MdLoop;
diff --git a/types/react-icons/lib/md/loupe.d.ts b/types/react-icons/lib/md/loupe.d.ts
deleted file mode 100644
index dcae9325dd..0000000000
--- a/types/react-icons/lib/md/loupe.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLoupe extends React.Component<IconBaseProps> { }
-export = MdLoupe;
diff --git a/types/react-icons/lib/md/low-priority.d.ts b/types/react-icons/lib/md/low-priority.d.ts
deleted file mode 100644
index 4b0e96dc96..0000000000
--- a/types/react-icons/lib/md/low-priority.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLowPriority extends React.Component<IconBaseProps> { }
-export = MdLowPriority;
diff --git a/types/react-icons/lib/md/loyalty.d.ts b/types/react-icons/lib/md/loyalty.d.ts
deleted file mode 100644
index 86d7de9ec8..0000000000
--- a/types/react-icons/lib/md/loyalty.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdLoyalty extends React.Component<IconBaseProps> { }
-export = MdLoyalty;
diff --git a/types/react-icons/lib/md/mail-outline.d.ts b/types/react-icons/lib/md/mail-outline.d.ts
deleted file mode 100644
index 7cc3fd16e0..0000000000
--- a/types/react-icons/lib/md/mail-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMailOutline extends React.Component<IconBaseProps> { }
-export = MdMailOutline;
diff --git a/types/react-icons/lib/md/mail.d.ts b/types/react-icons/lib/md/mail.d.ts
deleted file mode 100644
index ffe42b4573..0000000000
--- a/types/react-icons/lib/md/mail.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMail extends React.Component<IconBaseProps> { }
-export = MdMail;
diff --git a/types/react-icons/lib/md/map.d.ts b/types/react-icons/lib/md/map.d.ts
deleted file mode 100644
index bf274d2db6..0000000000
--- a/types/react-icons/lib/md/map.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMap extends React.Component<IconBaseProps> { }
-export = MdMap;
diff --git a/types/react-icons/lib/md/markunread-mailbox.d.ts b/types/react-icons/lib/md/markunread-mailbox.d.ts
deleted file mode 100644
index 859f06a03b..0000000000
--- a/types/react-icons/lib/md/markunread-mailbox.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMarkunreadMailbox extends React.Component<IconBaseProps> { }
-export = MdMarkunreadMailbox;
diff --git a/types/react-icons/lib/md/markunread.d.ts b/types/react-icons/lib/md/markunread.d.ts
deleted file mode 100644
index f5783e684c..0000000000
--- a/types/react-icons/lib/md/markunread.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMarkunread extends React.Component<IconBaseProps> { }
-export = MdMarkunread;
diff --git a/types/react-icons/lib/md/memory.d.ts b/types/react-icons/lib/md/memory.d.ts
deleted file mode 100644
index 524f5bee0e..0000000000
--- a/types/react-icons/lib/md/memory.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMemory extends React.Component<IconBaseProps> { }
-export = MdMemory;
diff --git a/types/react-icons/lib/md/menu.d.ts b/types/react-icons/lib/md/menu.d.ts
deleted file mode 100644
index dbd92ed628..0000000000
--- a/types/react-icons/lib/md/menu.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMenu extends React.Component<IconBaseProps> { }
-export = MdMenu;
diff --git a/types/react-icons/lib/md/merge-type.d.ts b/types/react-icons/lib/md/merge-type.d.ts
deleted file mode 100644
index 06a5eef508..0000000000
--- a/types/react-icons/lib/md/merge-type.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMergeType extends React.Component<IconBaseProps> { }
-export = MdMergeType;
diff --git a/types/react-icons/lib/md/message.d.ts b/types/react-icons/lib/md/message.d.ts
deleted file mode 100644
index 9eabdb10f3..0000000000
--- a/types/react-icons/lib/md/message.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMessage extends React.Component<IconBaseProps> { }
-export = MdMessage;
diff --git a/types/react-icons/lib/md/mic-none.d.ts b/types/react-icons/lib/md/mic-none.d.ts
deleted file mode 100644
index 1bab143d2d..0000000000
--- a/types/react-icons/lib/md/mic-none.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMicNone extends React.Component<IconBaseProps> { }
-export = MdMicNone;
diff --git a/types/react-icons/lib/md/mic-off.d.ts b/types/react-icons/lib/md/mic-off.d.ts
deleted file mode 100644
index edbe89b489..0000000000
--- a/types/react-icons/lib/md/mic-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMicOff extends React.Component<IconBaseProps> { }
-export = MdMicOff;
diff --git a/types/react-icons/lib/md/mic.d.ts b/types/react-icons/lib/md/mic.d.ts
deleted file mode 100644
index 45380e54f7..0000000000
--- a/types/react-icons/lib/md/mic.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMic extends React.Component<IconBaseProps> { }
-export = MdMic;
diff --git a/types/react-icons/lib/md/mms.d.ts b/types/react-icons/lib/md/mms.d.ts
deleted file mode 100644
index 19571556ed..0000000000
--- a/types/react-icons/lib/md/mms.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMms extends React.Component<IconBaseProps> { }
-export = MdMms;
diff --git a/types/react-icons/lib/md/mode-comment.d.ts b/types/react-icons/lib/md/mode-comment.d.ts
deleted file mode 100644
index 31aa14d8af..0000000000
--- a/types/react-icons/lib/md/mode-comment.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdModeComment extends React.Component<IconBaseProps> { }
-export = MdModeComment;
diff --git a/types/react-icons/lib/md/mode-edit.d.ts b/types/react-icons/lib/md/mode-edit.d.ts
deleted file mode 100644
index d5e2848413..0000000000
--- a/types/react-icons/lib/md/mode-edit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdModeEdit extends React.Component<IconBaseProps> { }
-export = MdModeEdit;
diff --git a/types/react-icons/lib/md/monetization-on.d.ts b/types/react-icons/lib/md/monetization-on.d.ts
deleted file mode 100644
index 2ee7832cb5..0000000000
--- a/types/react-icons/lib/md/monetization-on.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMonetizationOn extends React.Component<IconBaseProps> { }
-export = MdMonetizationOn;
diff --git a/types/react-icons/lib/md/money-off.d.ts b/types/react-icons/lib/md/money-off.d.ts
deleted file mode 100644
index 545019237c..0000000000
--- a/types/react-icons/lib/md/money-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMoneyOff extends React.Component<IconBaseProps> { }
-export = MdMoneyOff;
diff --git a/types/react-icons/lib/md/monochrome-photos.d.ts b/types/react-icons/lib/md/monochrome-photos.d.ts
deleted file mode 100644
index 8e1ebae6c7..0000000000
--- a/types/react-icons/lib/md/monochrome-photos.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMonochromePhotos extends React.Component<IconBaseProps> { }
-export = MdMonochromePhotos;
diff --git a/types/react-icons/lib/md/mood-bad.d.ts b/types/react-icons/lib/md/mood-bad.d.ts
deleted file mode 100644
index cd4dfc9cbb..0000000000
--- a/types/react-icons/lib/md/mood-bad.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMoodBad extends React.Component<IconBaseProps> { }
-export = MdMoodBad;
diff --git a/types/react-icons/lib/md/mood.d.ts b/types/react-icons/lib/md/mood.d.ts
deleted file mode 100644
index e2829392f6..0000000000
--- a/types/react-icons/lib/md/mood.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMood extends React.Component<IconBaseProps> { }
-export = MdMood;
diff --git a/types/react-icons/lib/md/more-horiz.d.ts b/types/react-icons/lib/md/more-horiz.d.ts
deleted file mode 100644
index 624b97c48d..0000000000
--- a/types/react-icons/lib/md/more-horiz.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMoreHoriz extends React.Component<IconBaseProps> { }
-export = MdMoreHoriz;
diff --git a/types/react-icons/lib/md/more-vert.d.ts b/types/react-icons/lib/md/more-vert.d.ts
deleted file mode 100644
index 4a77a45a48..0000000000
--- a/types/react-icons/lib/md/more-vert.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMoreVert extends React.Component<IconBaseProps> { }
-export = MdMoreVert;
diff --git a/types/react-icons/lib/md/more.d.ts b/types/react-icons/lib/md/more.d.ts
deleted file mode 100644
index c7f3e9c9b1..0000000000
--- a/types/react-icons/lib/md/more.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMore extends React.Component<IconBaseProps> { }
-export = MdMore;
diff --git a/types/react-icons/lib/md/motorcycle.d.ts b/types/react-icons/lib/md/motorcycle.d.ts
deleted file mode 100644
index e776752db9..0000000000
--- a/types/react-icons/lib/md/motorcycle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMotorcycle extends React.Component<IconBaseProps> { }
-export = MdMotorcycle;
diff --git a/types/react-icons/lib/md/mouse.d.ts b/types/react-icons/lib/md/mouse.d.ts
deleted file mode 100644
index e363947b09..0000000000
--- a/types/react-icons/lib/md/mouse.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMouse extends React.Component<IconBaseProps> { }
-export = MdMouse;
diff --git a/types/react-icons/lib/md/move-to-inbox.d.ts b/types/react-icons/lib/md/move-to-inbox.d.ts
deleted file mode 100644
index 12769c55d2..0000000000
--- a/types/react-icons/lib/md/move-to-inbox.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMoveToInbox extends React.Component<IconBaseProps> { }
-export = MdMoveToInbox;
diff --git a/types/react-icons/lib/md/movie-creation.d.ts b/types/react-icons/lib/md/movie-creation.d.ts
deleted file mode 100644
index 75340b3585..0000000000
--- a/types/react-icons/lib/md/movie-creation.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMovieCreation extends React.Component<IconBaseProps> { }
-export = MdMovieCreation;
diff --git a/types/react-icons/lib/md/movie-filter.d.ts b/types/react-icons/lib/md/movie-filter.d.ts
deleted file mode 100644
index 3d66ee011e..0000000000
--- a/types/react-icons/lib/md/movie-filter.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMovieFilter extends React.Component<IconBaseProps> { }
-export = MdMovieFilter;
diff --git a/types/react-icons/lib/md/movie.d.ts b/types/react-icons/lib/md/movie.d.ts
deleted file mode 100644
index d0f2567961..0000000000
--- a/types/react-icons/lib/md/movie.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMovie extends React.Component<IconBaseProps> { }
-export = MdMovie;
diff --git a/types/react-icons/lib/md/multiline-chart.d.ts b/types/react-icons/lib/md/multiline-chart.d.ts
deleted file mode 100644
index 9e1010373d..0000000000
--- a/types/react-icons/lib/md/multiline-chart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMultilineChart extends React.Component<IconBaseProps> { }
-export = MdMultilineChart;
diff --git a/types/react-icons/lib/md/music-note.d.ts b/types/react-icons/lib/md/music-note.d.ts
deleted file mode 100644
index 0851c2f214..0000000000
--- a/types/react-icons/lib/md/music-note.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMusicNote extends React.Component<IconBaseProps> { }
-export = MdMusicNote;
diff --git a/types/react-icons/lib/md/music-video.d.ts b/types/react-icons/lib/md/music-video.d.ts
deleted file mode 100644
index 45b5660c4a..0000000000
--- a/types/react-icons/lib/md/music-video.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMusicVideo extends React.Component<IconBaseProps> { }
-export = MdMusicVideo;
diff --git a/types/react-icons/lib/md/my-location.d.ts b/types/react-icons/lib/md/my-location.d.ts
deleted file mode 100644
index 1860b6ad49..0000000000
--- a/types/react-icons/lib/md/my-location.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdMyLocation extends React.Component<IconBaseProps> { }
-export = MdMyLocation;
diff --git a/types/react-icons/lib/md/nature-people.d.ts b/types/react-icons/lib/md/nature-people.d.ts
deleted file mode 100644
index 45f5c8625b..0000000000
--- a/types/react-icons/lib/md/nature-people.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNaturePeople extends React.Component<IconBaseProps> { }
-export = MdNaturePeople;
diff --git a/types/react-icons/lib/md/nature.d.ts b/types/react-icons/lib/md/nature.d.ts
deleted file mode 100644
index 8391fd3e82..0000000000
--- a/types/react-icons/lib/md/nature.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNature extends React.Component<IconBaseProps> { }
-export = MdNature;
diff --git a/types/react-icons/lib/md/navigate-before.d.ts b/types/react-icons/lib/md/navigate-before.d.ts
deleted file mode 100644
index d771c271f1..0000000000
--- a/types/react-icons/lib/md/navigate-before.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNavigateBefore extends React.Component<IconBaseProps> { }
-export = MdNavigateBefore;
diff --git a/types/react-icons/lib/md/navigate-next.d.ts b/types/react-icons/lib/md/navigate-next.d.ts
deleted file mode 100644
index 96b04c5c81..0000000000
--- a/types/react-icons/lib/md/navigate-next.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNavigateNext extends React.Component<IconBaseProps> { }
-export = MdNavigateNext;
diff --git a/types/react-icons/lib/md/navigation.d.ts b/types/react-icons/lib/md/navigation.d.ts
deleted file mode 100644
index b051ca0962..0000000000
--- a/types/react-icons/lib/md/navigation.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNavigation extends React.Component<IconBaseProps> { }
-export = MdNavigation;
diff --git a/types/react-icons/lib/md/near-me.d.ts b/types/react-icons/lib/md/near-me.d.ts
deleted file mode 100644
index 51fd95dad4..0000000000
--- a/types/react-icons/lib/md/near-me.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNearMe extends React.Component<IconBaseProps> { }
-export = MdNearMe;
diff --git a/types/react-icons/lib/md/network-cell.d.ts b/types/react-icons/lib/md/network-cell.d.ts
deleted file mode 100644
index 6c87d7551b..0000000000
--- a/types/react-icons/lib/md/network-cell.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNetworkCell extends React.Component<IconBaseProps> { }
-export = MdNetworkCell;
diff --git a/types/react-icons/lib/md/network-check.d.ts b/types/react-icons/lib/md/network-check.d.ts
deleted file mode 100644
index 5b50373fa4..0000000000
--- a/types/react-icons/lib/md/network-check.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNetworkCheck extends React.Component<IconBaseProps> { }
-export = MdNetworkCheck;
diff --git a/types/react-icons/lib/md/network-locked.d.ts b/types/react-icons/lib/md/network-locked.d.ts
deleted file mode 100644
index 3cf0e3f075..0000000000
--- a/types/react-icons/lib/md/network-locked.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNetworkLocked extends React.Component<IconBaseProps> { }
-export = MdNetworkLocked;
diff --git a/types/react-icons/lib/md/network-wifi.d.ts b/types/react-icons/lib/md/network-wifi.d.ts
deleted file mode 100644
index c4214d04eb..0000000000
--- a/types/react-icons/lib/md/network-wifi.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNetworkWifi extends React.Component<IconBaseProps> { }
-export = MdNetworkWifi;
diff --git a/types/react-icons/lib/md/new-releases.d.ts b/types/react-icons/lib/md/new-releases.d.ts
deleted file mode 100644
index 2330eee139..0000000000
--- a/types/react-icons/lib/md/new-releases.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNewReleases extends React.Component<IconBaseProps> { }
-export = MdNewReleases;
diff --git a/types/react-icons/lib/md/next-week.d.ts b/types/react-icons/lib/md/next-week.d.ts
deleted file mode 100644
index 7f9635e279..0000000000
--- a/types/react-icons/lib/md/next-week.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNextWeek extends React.Component<IconBaseProps> { }
-export = MdNextWeek;
diff --git a/types/react-icons/lib/md/nfc.d.ts b/types/react-icons/lib/md/nfc.d.ts
deleted file mode 100644
index 646eab86f4..0000000000
--- a/types/react-icons/lib/md/nfc.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNfc extends React.Component<IconBaseProps> { }
-export = MdNfc;
diff --git a/types/react-icons/lib/md/no-encryption.d.ts b/types/react-icons/lib/md/no-encryption.d.ts
deleted file mode 100644
index 87ecaca4b9..0000000000
--- a/types/react-icons/lib/md/no-encryption.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNoEncryption extends React.Component<IconBaseProps> { }
-export = MdNoEncryption;
diff --git a/types/react-icons/lib/md/no-sim.d.ts b/types/react-icons/lib/md/no-sim.d.ts
deleted file mode 100644
index 5a0843d187..0000000000
--- a/types/react-icons/lib/md/no-sim.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNoSim extends React.Component<IconBaseProps> { }
-export = MdNoSim;
diff --git a/types/react-icons/lib/md/not-interested.d.ts b/types/react-icons/lib/md/not-interested.d.ts
deleted file mode 100644
index 4250465b0e..0000000000
--- a/types/react-icons/lib/md/not-interested.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNotInterested extends React.Component<IconBaseProps> { }
-export = MdNotInterested;
diff --git a/types/react-icons/lib/md/note-add.d.ts b/types/react-icons/lib/md/note-add.d.ts
deleted file mode 100644
index 81ee86856d..0000000000
--- a/types/react-icons/lib/md/note-add.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNoteAdd extends React.Component<IconBaseProps> { }
-export = MdNoteAdd;
diff --git a/types/react-icons/lib/md/note.d.ts b/types/react-icons/lib/md/note.d.ts
deleted file mode 100644
index 59819344cf..0000000000
--- a/types/react-icons/lib/md/note.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNote extends React.Component<IconBaseProps> { }
-export = MdNote;
diff --git a/types/react-icons/lib/md/notifications-active.d.ts b/types/react-icons/lib/md/notifications-active.d.ts
deleted file mode 100644
index 1fe1c7709a..0000000000
--- a/types/react-icons/lib/md/notifications-active.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNotificationsActive extends React.Component<IconBaseProps> { }
-export = MdNotificationsActive;
diff --git a/types/react-icons/lib/md/notifications-none.d.ts b/types/react-icons/lib/md/notifications-none.d.ts
deleted file mode 100644
index 734c103da7..0000000000
--- a/types/react-icons/lib/md/notifications-none.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNotificationsNone extends React.Component<IconBaseProps> { }
-export = MdNotificationsNone;
diff --git a/types/react-icons/lib/md/notifications-off.d.ts b/types/react-icons/lib/md/notifications-off.d.ts
deleted file mode 100644
index 59946687a9..0000000000
--- a/types/react-icons/lib/md/notifications-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNotificationsOff extends React.Component<IconBaseProps> { }
-export = MdNotificationsOff;
diff --git a/types/react-icons/lib/md/notifications-paused.d.ts b/types/react-icons/lib/md/notifications-paused.d.ts
deleted file mode 100644
index 0eccf9bc7b..0000000000
--- a/types/react-icons/lib/md/notifications-paused.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNotificationsPaused extends React.Component<IconBaseProps> { }
-export = MdNotificationsPaused;
diff --git a/types/react-icons/lib/md/notifications.d.ts b/types/react-icons/lib/md/notifications.d.ts
deleted file mode 100644
index 2865d4e06a..0000000000
--- a/types/react-icons/lib/md/notifications.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNotifications extends React.Component<IconBaseProps> { }
-export = MdNotifications;
diff --git a/types/react-icons/lib/md/now-wallpaper.d.ts b/types/react-icons/lib/md/now-wallpaper.d.ts
deleted file mode 100644
index ad64b79218..0000000000
--- a/types/react-icons/lib/md/now-wallpaper.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNowWallpaper extends React.Component<IconBaseProps> { }
-export = MdNowWallpaper;
diff --git a/types/react-icons/lib/md/now-widgets.d.ts b/types/react-icons/lib/md/now-widgets.d.ts
deleted file mode 100644
index 18e3df156c..0000000000
--- a/types/react-icons/lib/md/now-widgets.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdNowWidgets extends React.Component<IconBaseProps> { }
-export = MdNowWidgets;
diff --git a/types/react-icons/lib/md/offline-pin.d.ts b/types/react-icons/lib/md/offline-pin.d.ts
deleted file mode 100644
index 46cd8199f9..0000000000
--- a/types/react-icons/lib/md/offline-pin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdOfflinePin extends React.Component<IconBaseProps> { }
-export = MdOfflinePin;
diff --git a/types/react-icons/lib/md/ondemand-video.d.ts b/types/react-icons/lib/md/ondemand-video.d.ts
deleted file mode 100644
index dbf5b14687..0000000000
--- a/types/react-icons/lib/md/ondemand-video.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdOndemandVideo extends React.Component<IconBaseProps> { }
-export = MdOndemandVideo;
diff --git a/types/react-icons/lib/md/opacity.d.ts b/types/react-icons/lib/md/opacity.d.ts
deleted file mode 100644
index 17bad8db6d..0000000000
--- a/types/react-icons/lib/md/opacity.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdOpacity extends React.Component<IconBaseProps> { }
-export = MdOpacity;
diff --git a/types/react-icons/lib/md/open-in-browser.d.ts b/types/react-icons/lib/md/open-in-browser.d.ts
deleted file mode 100644
index 4e9b90b4da..0000000000
--- a/types/react-icons/lib/md/open-in-browser.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdOpenInBrowser extends React.Component<IconBaseProps> { }
-export = MdOpenInBrowser;
diff --git a/types/react-icons/lib/md/open-in-new.d.ts b/types/react-icons/lib/md/open-in-new.d.ts
deleted file mode 100644
index 0a82b41b5a..0000000000
--- a/types/react-icons/lib/md/open-in-new.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdOpenInNew extends React.Component<IconBaseProps> { }
-export = MdOpenInNew;
diff --git a/types/react-icons/lib/md/open-with.d.ts b/types/react-icons/lib/md/open-with.d.ts
deleted file mode 100644
index fbb6f98852..0000000000
--- a/types/react-icons/lib/md/open-with.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdOpenWith extends React.Component<IconBaseProps> { }
-export = MdOpenWith;
diff --git a/types/react-icons/lib/md/pages.d.ts b/types/react-icons/lib/md/pages.d.ts
deleted file mode 100644
index c26e324fb2..0000000000
--- a/types/react-icons/lib/md/pages.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPages extends React.Component<IconBaseProps> { }
-export = MdPages;
diff --git a/types/react-icons/lib/md/pageview.d.ts b/types/react-icons/lib/md/pageview.d.ts
deleted file mode 100644
index 3db2826beb..0000000000
--- a/types/react-icons/lib/md/pageview.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPageview extends React.Component<IconBaseProps> { }
-export = MdPageview;
diff --git a/types/react-icons/lib/md/palette.d.ts b/types/react-icons/lib/md/palette.d.ts
deleted file mode 100644
index eddc488804..0000000000
--- a/types/react-icons/lib/md/palette.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPalette extends React.Component<IconBaseProps> { }
-export = MdPalette;
diff --git a/types/react-icons/lib/md/pan-tool.d.ts b/types/react-icons/lib/md/pan-tool.d.ts
deleted file mode 100644
index cd89c9e107..0000000000
--- a/types/react-icons/lib/md/pan-tool.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPanTool extends React.Component<IconBaseProps> { }
-export = MdPanTool;
diff --git a/types/react-icons/lib/md/panorama-fish-eye.d.ts b/types/react-icons/lib/md/panorama-fish-eye.d.ts
deleted file mode 100644
index 845e5ec82c..0000000000
--- a/types/react-icons/lib/md/panorama-fish-eye.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPanoramaFishEye extends React.Component<IconBaseProps> { }
-export = MdPanoramaFishEye;
diff --git a/types/react-icons/lib/md/panorama-horizontal.d.ts b/types/react-icons/lib/md/panorama-horizontal.d.ts
deleted file mode 100644
index c042c5465f..0000000000
--- a/types/react-icons/lib/md/panorama-horizontal.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPanoramaHorizontal extends React.Component<IconBaseProps> { }
-export = MdPanoramaHorizontal;
diff --git a/types/react-icons/lib/md/panorama-vertical.d.ts b/types/react-icons/lib/md/panorama-vertical.d.ts
deleted file mode 100644
index 23e9930176..0000000000
--- a/types/react-icons/lib/md/panorama-vertical.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPanoramaVertical extends React.Component<IconBaseProps> { }
-export = MdPanoramaVertical;
diff --git a/types/react-icons/lib/md/panorama-wide-angle.d.ts b/types/react-icons/lib/md/panorama-wide-angle.d.ts
deleted file mode 100644
index 4a203d1626..0000000000
--- a/types/react-icons/lib/md/panorama-wide-angle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPanoramaWideAngle extends React.Component<IconBaseProps> { }
-export = MdPanoramaWideAngle;
diff --git a/types/react-icons/lib/md/panorama.d.ts b/types/react-icons/lib/md/panorama.d.ts
deleted file mode 100644
index bd3a7cbd25..0000000000
--- a/types/react-icons/lib/md/panorama.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPanorama extends React.Component<IconBaseProps> { }
-export = MdPanorama;
diff --git a/types/react-icons/lib/md/party-mode.d.ts b/types/react-icons/lib/md/party-mode.d.ts
deleted file mode 100644
index 83b53cea69..0000000000
--- a/types/react-icons/lib/md/party-mode.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPartyMode extends React.Component<IconBaseProps> { }
-export = MdPartyMode;
diff --git a/types/react-icons/lib/md/pause-circle-filled.d.ts b/types/react-icons/lib/md/pause-circle-filled.d.ts
deleted file mode 100644
index 80d0552c2a..0000000000
--- a/types/react-icons/lib/md/pause-circle-filled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPauseCircleFilled extends React.Component<IconBaseProps> { }
-export = MdPauseCircleFilled;
diff --git a/types/react-icons/lib/md/pause-circle-outline.d.ts b/types/react-icons/lib/md/pause-circle-outline.d.ts
deleted file mode 100644
index a7b9df4756..0000000000
--- a/types/react-icons/lib/md/pause-circle-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPauseCircleOutline extends React.Component<IconBaseProps> { }
-export = MdPauseCircleOutline;
diff --git a/types/react-icons/lib/md/pause.d.ts b/types/react-icons/lib/md/pause.d.ts
deleted file mode 100644
index 07da37dbc0..0000000000
--- a/types/react-icons/lib/md/pause.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPause extends React.Component<IconBaseProps> { }
-export = MdPause;
diff --git a/types/react-icons/lib/md/payment.d.ts b/types/react-icons/lib/md/payment.d.ts
deleted file mode 100644
index 62761620a7..0000000000
--- a/types/react-icons/lib/md/payment.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPayment extends React.Component<IconBaseProps> { }
-export = MdPayment;
diff --git a/types/react-icons/lib/md/people-outline.d.ts b/types/react-icons/lib/md/people-outline.d.ts
deleted file mode 100644
index 9285016a5f..0000000000
--- a/types/react-icons/lib/md/people-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPeopleOutline extends React.Component<IconBaseProps> { }
-export = MdPeopleOutline;
diff --git a/types/react-icons/lib/md/people.d.ts b/types/react-icons/lib/md/people.d.ts
deleted file mode 100644
index 5e256d4d2c..0000000000
--- a/types/react-icons/lib/md/people.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPeople extends React.Component<IconBaseProps> { }
-export = MdPeople;
diff --git a/types/react-icons/lib/md/perm-camera-mic.d.ts b/types/react-icons/lib/md/perm-camera-mic.d.ts
deleted file mode 100644
index fc2b9d15bc..0000000000
--- a/types/react-icons/lib/md/perm-camera-mic.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPermCameraMic extends React.Component<IconBaseProps> { }
-export = MdPermCameraMic;
diff --git a/types/react-icons/lib/md/perm-contact-calendar.d.ts b/types/react-icons/lib/md/perm-contact-calendar.d.ts
deleted file mode 100644
index f107c8a8b9..0000000000
--- a/types/react-icons/lib/md/perm-contact-calendar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPermContactCalendar extends React.Component<IconBaseProps> { }
-export = MdPermContactCalendar;
diff --git a/types/react-icons/lib/md/perm-data-setting.d.ts b/types/react-icons/lib/md/perm-data-setting.d.ts
deleted file mode 100644
index eb93566fad..0000000000
--- a/types/react-icons/lib/md/perm-data-setting.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPermDataSetting extends React.Component<IconBaseProps> { }
-export = MdPermDataSetting;
diff --git a/types/react-icons/lib/md/perm-device-information.d.ts b/types/react-icons/lib/md/perm-device-information.d.ts
deleted file mode 100644
index 8b12c216aa..0000000000
--- a/types/react-icons/lib/md/perm-device-information.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPermDeviceInformation extends React.Component<IconBaseProps> { }
-export = MdPermDeviceInformation;
diff --git a/types/react-icons/lib/md/perm-identity.d.ts b/types/react-icons/lib/md/perm-identity.d.ts
deleted file mode 100644
index c3df601924..0000000000
--- a/types/react-icons/lib/md/perm-identity.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPermIdentity extends React.Component<IconBaseProps> { }
-export = MdPermIdentity;
diff --git a/types/react-icons/lib/md/perm-media.d.ts b/types/react-icons/lib/md/perm-media.d.ts
deleted file mode 100644
index cfe25c2672..0000000000
--- a/types/react-icons/lib/md/perm-media.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPermMedia extends React.Component<IconBaseProps> { }
-export = MdPermMedia;
diff --git a/types/react-icons/lib/md/perm-phone-msg.d.ts b/types/react-icons/lib/md/perm-phone-msg.d.ts
deleted file mode 100644
index fca1fb5d82..0000000000
--- a/types/react-icons/lib/md/perm-phone-msg.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPermPhoneMsg extends React.Component<IconBaseProps> { }
-export = MdPermPhoneMsg;
diff --git a/types/react-icons/lib/md/perm-scan-wifi.d.ts b/types/react-icons/lib/md/perm-scan-wifi.d.ts
deleted file mode 100644
index dd857bfc75..0000000000
--- a/types/react-icons/lib/md/perm-scan-wifi.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPermScanWifi extends React.Component<IconBaseProps> { }
-export = MdPermScanWifi;
diff --git a/types/react-icons/lib/md/person-add.d.ts b/types/react-icons/lib/md/person-add.d.ts
deleted file mode 100644
index 05c41837f4..0000000000
--- a/types/react-icons/lib/md/person-add.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPersonAdd extends React.Component<IconBaseProps> { }
-export = MdPersonAdd;
diff --git a/types/react-icons/lib/md/person-outline.d.ts b/types/react-icons/lib/md/person-outline.d.ts
deleted file mode 100644
index 4b0e0859c8..0000000000
--- a/types/react-icons/lib/md/person-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPersonOutline extends React.Component<IconBaseProps> { }
-export = MdPersonOutline;
diff --git a/types/react-icons/lib/md/person-pin-circle.d.ts b/types/react-icons/lib/md/person-pin-circle.d.ts
deleted file mode 100644
index 7e463591c4..0000000000
--- a/types/react-icons/lib/md/person-pin-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPersonPinCircle extends React.Component<IconBaseProps> { }
-export = MdPersonPinCircle;
diff --git a/types/react-icons/lib/md/person-pin.d.ts b/types/react-icons/lib/md/person-pin.d.ts
deleted file mode 100644
index 5731a64ba2..0000000000
--- a/types/react-icons/lib/md/person-pin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPersonPin extends React.Component<IconBaseProps> { }
-export = MdPersonPin;
diff --git a/types/react-icons/lib/md/person.d.ts b/types/react-icons/lib/md/person.d.ts
deleted file mode 100644
index bbaaad66da..0000000000
--- a/types/react-icons/lib/md/person.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPerson extends React.Component<IconBaseProps> { }
-export = MdPerson;
diff --git a/types/react-icons/lib/md/personal-video.d.ts b/types/react-icons/lib/md/personal-video.d.ts
deleted file mode 100644
index f49fb640d1..0000000000
--- a/types/react-icons/lib/md/personal-video.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPersonalVideo extends React.Component<IconBaseProps> { }
-export = MdPersonalVideo;
diff --git a/types/react-icons/lib/md/pets.d.ts b/types/react-icons/lib/md/pets.d.ts
deleted file mode 100644
index 4c9793a129..0000000000
--- a/types/react-icons/lib/md/pets.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPets extends React.Component<IconBaseProps> { }
-export = MdPets;
diff --git a/types/react-icons/lib/md/phone-android.d.ts b/types/react-icons/lib/md/phone-android.d.ts
deleted file mode 100644
index 30c4db75e6..0000000000
--- a/types/react-icons/lib/md/phone-android.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhoneAndroid extends React.Component<IconBaseProps> { }
-export = MdPhoneAndroid;
diff --git a/types/react-icons/lib/md/phone-bluetooth-speaker.d.ts b/types/react-icons/lib/md/phone-bluetooth-speaker.d.ts
deleted file mode 100644
index be75f447df..0000000000
--- a/types/react-icons/lib/md/phone-bluetooth-speaker.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhoneBluetoothSpeaker extends React.Component<IconBaseProps> { }
-export = MdPhoneBluetoothSpeaker;
diff --git a/types/react-icons/lib/md/phone-forwarded.d.ts b/types/react-icons/lib/md/phone-forwarded.d.ts
deleted file mode 100644
index caeb337723..0000000000
--- a/types/react-icons/lib/md/phone-forwarded.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhoneForwarded extends React.Component<IconBaseProps> { }
-export = MdPhoneForwarded;
diff --git a/types/react-icons/lib/md/phone-in-talk.d.ts b/types/react-icons/lib/md/phone-in-talk.d.ts
deleted file mode 100644
index 439fe99a45..0000000000
--- a/types/react-icons/lib/md/phone-in-talk.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhoneInTalk extends React.Component<IconBaseProps> { }
-export = MdPhoneInTalk;
diff --git a/types/react-icons/lib/md/phone-iphone.d.ts b/types/react-icons/lib/md/phone-iphone.d.ts
deleted file mode 100644
index 5a42b35412..0000000000
--- a/types/react-icons/lib/md/phone-iphone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhoneIphone extends React.Component<IconBaseProps> { }
-export = MdPhoneIphone;
diff --git a/types/react-icons/lib/md/phone-locked.d.ts b/types/react-icons/lib/md/phone-locked.d.ts
deleted file mode 100644
index df4bdb68e0..0000000000
--- a/types/react-icons/lib/md/phone-locked.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhoneLocked extends React.Component<IconBaseProps> { }
-export = MdPhoneLocked;
diff --git a/types/react-icons/lib/md/phone-missed.d.ts b/types/react-icons/lib/md/phone-missed.d.ts
deleted file mode 100644
index 57f48c1817..0000000000
--- a/types/react-icons/lib/md/phone-missed.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhoneMissed extends React.Component<IconBaseProps> { }
-export = MdPhoneMissed;
diff --git a/types/react-icons/lib/md/phone-paused.d.ts b/types/react-icons/lib/md/phone-paused.d.ts
deleted file mode 100644
index fded3f9a42..0000000000
--- a/types/react-icons/lib/md/phone-paused.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhonePaused extends React.Component<IconBaseProps> { }
-export = MdPhonePaused;
diff --git a/types/react-icons/lib/md/phone.d.ts b/types/react-icons/lib/md/phone.d.ts
deleted file mode 100644
index e5634b5d20..0000000000
--- a/types/react-icons/lib/md/phone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhone extends React.Component<IconBaseProps> { }
-export = MdPhone;
diff --git a/types/react-icons/lib/md/phonelink-erase.d.ts b/types/react-icons/lib/md/phonelink-erase.d.ts
deleted file mode 100644
index 33787bbd4b..0000000000
--- a/types/react-icons/lib/md/phonelink-erase.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhonelinkErase extends React.Component<IconBaseProps> { }
-export = MdPhonelinkErase;
diff --git a/types/react-icons/lib/md/phonelink-lock.d.ts b/types/react-icons/lib/md/phonelink-lock.d.ts
deleted file mode 100644
index 81d84f10ee..0000000000
--- a/types/react-icons/lib/md/phonelink-lock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhonelinkLock extends React.Component<IconBaseProps> { }
-export = MdPhonelinkLock;
diff --git a/types/react-icons/lib/md/phonelink-off.d.ts b/types/react-icons/lib/md/phonelink-off.d.ts
deleted file mode 100644
index eb8044dcca..0000000000
--- a/types/react-icons/lib/md/phonelink-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhonelinkOff extends React.Component<IconBaseProps> { }
-export = MdPhonelinkOff;
diff --git a/types/react-icons/lib/md/phonelink-ring.d.ts b/types/react-icons/lib/md/phonelink-ring.d.ts
deleted file mode 100644
index fb4829eef1..0000000000
--- a/types/react-icons/lib/md/phonelink-ring.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhonelinkRing extends React.Component<IconBaseProps> { }
-export = MdPhonelinkRing;
diff --git a/types/react-icons/lib/md/phonelink-setup.d.ts b/types/react-icons/lib/md/phonelink-setup.d.ts
deleted file mode 100644
index 0546b0f910..0000000000
--- a/types/react-icons/lib/md/phonelink-setup.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhonelinkSetup extends React.Component<IconBaseProps> { }
-export = MdPhonelinkSetup;
diff --git a/types/react-icons/lib/md/phonelink.d.ts b/types/react-icons/lib/md/phonelink.d.ts
deleted file mode 100644
index 16653325b1..0000000000
--- a/types/react-icons/lib/md/phonelink.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhonelink extends React.Component<IconBaseProps> { }
-export = MdPhonelink;
diff --git a/types/react-icons/lib/md/photo-album.d.ts b/types/react-icons/lib/md/photo-album.d.ts
deleted file mode 100644
index dc21ce961f..0000000000
--- a/types/react-icons/lib/md/photo-album.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhotoAlbum extends React.Component<IconBaseProps> { }
-export = MdPhotoAlbum;
diff --git a/types/react-icons/lib/md/photo-camera.d.ts b/types/react-icons/lib/md/photo-camera.d.ts
deleted file mode 100644
index 01afdf9bc8..0000000000
--- a/types/react-icons/lib/md/photo-camera.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhotoCamera extends React.Component<IconBaseProps> { }
-export = MdPhotoCamera;
diff --git a/types/react-icons/lib/md/photo-filter.d.ts b/types/react-icons/lib/md/photo-filter.d.ts
deleted file mode 100644
index 994d10d5e5..0000000000
--- a/types/react-icons/lib/md/photo-filter.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhotoFilter extends React.Component<IconBaseProps> { }
-export = MdPhotoFilter;
diff --git a/types/react-icons/lib/md/photo-library.d.ts b/types/react-icons/lib/md/photo-library.d.ts
deleted file mode 100644
index 18f6c5a756..0000000000
--- a/types/react-icons/lib/md/photo-library.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhotoLibrary extends React.Component<IconBaseProps> { }
-export = MdPhotoLibrary;
diff --git a/types/react-icons/lib/md/photo-size-select-actual.d.ts b/types/react-icons/lib/md/photo-size-select-actual.d.ts
deleted file mode 100644
index d2c24264f7..0000000000
--- a/types/react-icons/lib/md/photo-size-select-actual.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhotoSizeSelectActual extends React.Component<IconBaseProps> { }
-export = MdPhotoSizeSelectActual;
diff --git a/types/react-icons/lib/md/photo-size-select-large.d.ts b/types/react-icons/lib/md/photo-size-select-large.d.ts
deleted file mode 100644
index d468535f85..0000000000
--- a/types/react-icons/lib/md/photo-size-select-large.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhotoSizeSelectLarge extends React.Component<IconBaseProps> { }
-export = MdPhotoSizeSelectLarge;
diff --git a/types/react-icons/lib/md/photo-size-select-small.d.ts b/types/react-icons/lib/md/photo-size-select-small.d.ts
deleted file mode 100644
index 88d3b699eb..0000000000
--- a/types/react-icons/lib/md/photo-size-select-small.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhotoSizeSelectSmall extends React.Component<IconBaseProps> { }
-export = MdPhotoSizeSelectSmall;
diff --git a/types/react-icons/lib/md/photo.d.ts b/types/react-icons/lib/md/photo.d.ts
deleted file mode 100644
index 7b6a50c063..0000000000
--- a/types/react-icons/lib/md/photo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPhoto extends React.Component<IconBaseProps> { }
-export = MdPhoto;
diff --git a/types/react-icons/lib/md/picture-as-pdf.d.ts b/types/react-icons/lib/md/picture-as-pdf.d.ts
deleted file mode 100644
index f771b781f3..0000000000
--- a/types/react-icons/lib/md/picture-as-pdf.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPictureAsPdf extends React.Component<IconBaseProps> { }
-export = MdPictureAsPdf;
diff --git a/types/react-icons/lib/md/picture-in-picture-alt.d.ts b/types/react-icons/lib/md/picture-in-picture-alt.d.ts
deleted file mode 100644
index 706766c7ee..0000000000
--- a/types/react-icons/lib/md/picture-in-picture-alt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPictureInPictureAlt extends React.Component<IconBaseProps> { }
-export = MdPictureInPictureAlt;
diff --git a/types/react-icons/lib/md/picture-in-picture.d.ts b/types/react-icons/lib/md/picture-in-picture.d.ts
deleted file mode 100644
index fd928d0435..0000000000
--- a/types/react-icons/lib/md/picture-in-picture.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPictureInPicture extends React.Component<IconBaseProps> { }
-export = MdPictureInPicture;
diff --git a/types/react-icons/lib/md/pie-chart-outlined.d.ts b/types/react-icons/lib/md/pie-chart-outlined.d.ts
deleted file mode 100644
index d6124faded..0000000000
--- a/types/react-icons/lib/md/pie-chart-outlined.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPieChartOutlined extends React.Component<IconBaseProps> { }
-export = MdPieChartOutlined;
diff --git a/types/react-icons/lib/md/pie-chart.d.ts b/types/react-icons/lib/md/pie-chart.d.ts
deleted file mode 100644
index 8f7d291715..0000000000
--- a/types/react-icons/lib/md/pie-chart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPieChart extends React.Component<IconBaseProps> { }
-export = MdPieChart;
diff --git a/types/react-icons/lib/md/pin-drop.d.ts b/types/react-icons/lib/md/pin-drop.d.ts
deleted file mode 100644
index 8f05678916..0000000000
--- a/types/react-icons/lib/md/pin-drop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPinDrop extends React.Component<IconBaseProps> { }
-export = MdPinDrop;
diff --git a/types/react-icons/lib/md/place.d.ts b/types/react-icons/lib/md/place.d.ts
deleted file mode 100644
index dd5c14c216..0000000000
--- a/types/react-icons/lib/md/place.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPlace extends React.Component<IconBaseProps> { }
-export = MdPlace;
diff --git a/types/react-icons/lib/md/play-arrow.d.ts b/types/react-icons/lib/md/play-arrow.d.ts
deleted file mode 100644
index 7327a2b319..0000000000
--- a/types/react-icons/lib/md/play-arrow.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPlayArrow extends React.Component<IconBaseProps> { }
-export = MdPlayArrow;
diff --git a/types/react-icons/lib/md/play-circle-filled.d.ts b/types/react-icons/lib/md/play-circle-filled.d.ts
deleted file mode 100644
index 6a7ba9bf9c..0000000000
--- a/types/react-icons/lib/md/play-circle-filled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPlayCircleFilled extends React.Component<IconBaseProps> { }
-export = MdPlayCircleFilled;
diff --git a/types/react-icons/lib/md/play-circle-outline.d.ts b/types/react-icons/lib/md/play-circle-outline.d.ts
deleted file mode 100644
index 6ebd23b062..0000000000
--- a/types/react-icons/lib/md/play-circle-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPlayCircleOutline extends React.Component<IconBaseProps> { }
-export = MdPlayCircleOutline;
diff --git a/types/react-icons/lib/md/play-for-work.d.ts b/types/react-icons/lib/md/play-for-work.d.ts
deleted file mode 100644
index f0873e86fa..0000000000
--- a/types/react-icons/lib/md/play-for-work.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPlayForWork extends React.Component<IconBaseProps> { }
-export = MdPlayForWork;
diff --git a/types/react-icons/lib/md/playlist-add-check.d.ts b/types/react-icons/lib/md/playlist-add-check.d.ts
deleted file mode 100644
index c22eb478a0..0000000000
--- a/types/react-icons/lib/md/playlist-add-check.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPlaylistAddCheck extends React.Component<IconBaseProps> { }
-export = MdPlaylistAddCheck;
diff --git a/types/react-icons/lib/md/playlist-add.d.ts b/types/react-icons/lib/md/playlist-add.d.ts
deleted file mode 100644
index 78bd803be2..0000000000
--- a/types/react-icons/lib/md/playlist-add.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPlaylistAdd extends React.Component<IconBaseProps> { }
-export = MdPlaylistAdd;
diff --git a/types/react-icons/lib/md/playlist-play.d.ts b/types/react-icons/lib/md/playlist-play.d.ts
deleted file mode 100644
index 06dea405bc..0000000000
--- a/types/react-icons/lib/md/playlist-play.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPlaylistPlay extends React.Component<IconBaseProps> { }
-export = MdPlaylistPlay;
diff --git a/types/react-icons/lib/md/plus-one.d.ts b/types/react-icons/lib/md/plus-one.d.ts
deleted file mode 100644
index be10a4d3a3..0000000000
--- a/types/react-icons/lib/md/plus-one.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPlusOne extends React.Component<IconBaseProps> { }
-export = MdPlusOne;
diff --git a/types/react-icons/lib/md/poll.d.ts b/types/react-icons/lib/md/poll.d.ts
deleted file mode 100644
index 40fa12d1c2..0000000000
--- a/types/react-icons/lib/md/poll.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPoll extends React.Component<IconBaseProps> { }
-export = MdPoll;
diff --git a/types/react-icons/lib/md/polymer.d.ts b/types/react-icons/lib/md/polymer.d.ts
deleted file mode 100644
index 7fc5f98fae..0000000000
--- a/types/react-icons/lib/md/polymer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPolymer extends React.Component<IconBaseProps> { }
-export = MdPolymer;
diff --git a/types/react-icons/lib/md/pool.d.ts b/types/react-icons/lib/md/pool.d.ts
deleted file mode 100644
index 6483e03363..0000000000
--- a/types/react-icons/lib/md/pool.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPool extends React.Component<IconBaseProps> { }
-export = MdPool;
diff --git a/types/react-icons/lib/md/portable-wifi-off.d.ts b/types/react-icons/lib/md/portable-wifi-off.d.ts
deleted file mode 100644
index 4fc9ef507c..0000000000
--- a/types/react-icons/lib/md/portable-wifi-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPortableWifiOff extends React.Component<IconBaseProps> { }
-export = MdPortableWifiOff;
diff --git a/types/react-icons/lib/md/portrait.d.ts b/types/react-icons/lib/md/portrait.d.ts
deleted file mode 100644
index a587b96bfc..0000000000
--- a/types/react-icons/lib/md/portrait.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPortrait extends React.Component<IconBaseProps> { }
-export = MdPortrait;
diff --git a/types/react-icons/lib/md/power-input.d.ts b/types/react-icons/lib/md/power-input.d.ts
deleted file mode 100644
index 34a90c855f..0000000000
--- a/types/react-icons/lib/md/power-input.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPowerInput extends React.Component<IconBaseProps> { }
-export = MdPowerInput;
diff --git a/types/react-icons/lib/md/power-settings-new.d.ts b/types/react-icons/lib/md/power-settings-new.d.ts
deleted file mode 100644
index 1d76b0c67e..0000000000
--- a/types/react-icons/lib/md/power-settings-new.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPowerSettingsNew extends React.Component<IconBaseProps> { }
-export = MdPowerSettingsNew;
diff --git a/types/react-icons/lib/md/power.d.ts b/types/react-icons/lib/md/power.d.ts
deleted file mode 100644
index 8839984678..0000000000
--- a/types/react-icons/lib/md/power.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPower extends React.Component<IconBaseProps> { }
-export = MdPower;
diff --git a/types/react-icons/lib/md/pregnant-woman.d.ts b/types/react-icons/lib/md/pregnant-woman.d.ts
deleted file mode 100644
index 7278b215e3..0000000000
--- a/types/react-icons/lib/md/pregnant-woman.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPregnantWoman extends React.Component<IconBaseProps> { }
-export = MdPregnantWoman;
diff --git a/types/react-icons/lib/md/present-to-all.d.ts b/types/react-icons/lib/md/present-to-all.d.ts
deleted file mode 100644
index 93d710de16..0000000000
--- a/types/react-icons/lib/md/present-to-all.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPresentToAll extends React.Component<IconBaseProps> { }
-export = MdPresentToAll;
diff --git a/types/react-icons/lib/md/print.d.ts b/types/react-icons/lib/md/print.d.ts
deleted file mode 100644
index 62b476b9c7..0000000000
--- a/types/react-icons/lib/md/print.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPrint extends React.Component<IconBaseProps> { }
-export = MdPrint;
diff --git a/types/react-icons/lib/md/priority-high.d.ts b/types/react-icons/lib/md/priority-high.d.ts
deleted file mode 100644
index 840ab9c68a..0000000000
--- a/types/react-icons/lib/md/priority-high.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPriorityHigh extends React.Component<IconBaseProps> { }
-export = MdPriorityHigh;
diff --git a/types/react-icons/lib/md/public.d.ts b/types/react-icons/lib/md/public.d.ts
deleted file mode 100644
index 91706fbb9e..0000000000
--- a/types/react-icons/lib/md/public.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPublic extends React.Component<IconBaseProps> { }
-export = MdPublic;
diff --git a/types/react-icons/lib/md/publish.d.ts b/types/react-icons/lib/md/publish.d.ts
deleted file mode 100644
index db437f53be..0000000000
--- a/types/react-icons/lib/md/publish.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdPublish extends React.Component<IconBaseProps> { }
-export = MdPublish;
diff --git a/types/react-icons/lib/md/query-builder.d.ts b/types/react-icons/lib/md/query-builder.d.ts
deleted file mode 100644
index 8dff3909b5..0000000000
--- a/types/react-icons/lib/md/query-builder.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdQueryBuilder extends React.Component<IconBaseProps> { }
-export = MdQueryBuilder;
diff --git a/types/react-icons/lib/md/question-answer.d.ts b/types/react-icons/lib/md/question-answer.d.ts
deleted file mode 100644
index 76423a5ea1..0000000000
--- a/types/react-icons/lib/md/question-answer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdQuestionAnswer extends React.Component<IconBaseProps> { }
-export = MdQuestionAnswer;
diff --git a/types/react-icons/lib/md/queue-music.d.ts b/types/react-icons/lib/md/queue-music.d.ts
deleted file mode 100644
index 0186613977..0000000000
--- a/types/react-icons/lib/md/queue-music.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdQueueMusic extends React.Component<IconBaseProps> { }
-export = MdQueueMusic;
diff --git a/types/react-icons/lib/md/queue-play-next.d.ts b/types/react-icons/lib/md/queue-play-next.d.ts
deleted file mode 100644
index c62528bd30..0000000000
--- a/types/react-icons/lib/md/queue-play-next.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdQueuePlayNext extends React.Component<IconBaseProps> { }
-export = MdQueuePlayNext;
diff --git a/types/react-icons/lib/md/queue.d.ts b/types/react-icons/lib/md/queue.d.ts
deleted file mode 100644
index 0f2250095b..0000000000
--- a/types/react-icons/lib/md/queue.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdQueue extends React.Component<IconBaseProps> { }
-export = MdQueue;
diff --git a/types/react-icons/lib/md/radio-button-checked.d.ts b/types/react-icons/lib/md/radio-button-checked.d.ts
deleted file mode 100644
index f8e479ee43..0000000000
--- a/types/react-icons/lib/md/radio-button-checked.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRadioButtonChecked extends React.Component<IconBaseProps> { }
-export = MdRadioButtonChecked;
diff --git a/types/react-icons/lib/md/radio-button-unchecked.d.ts b/types/react-icons/lib/md/radio-button-unchecked.d.ts
deleted file mode 100644
index 60564b7e28..0000000000
--- a/types/react-icons/lib/md/radio-button-unchecked.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRadioButtonUnchecked extends React.Component<IconBaseProps> { }
-export = MdRadioButtonUnchecked;
diff --git a/types/react-icons/lib/md/radio.d.ts b/types/react-icons/lib/md/radio.d.ts
deleted file mode 100644
index af41f21e68..0000000000
--- a/types/react-icons/lib/md/radio.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRadio extends React.Component<IconBaseProps> { }
-export = MdRadio;
diff --git a/types/react-icons/lib/md/rate-review.d.ts b/types/react-icons/lib/md/rate-review.d.ts
deleted file mode 100644
index 5f1ef5658a..0000000000
--- a/types/react-icons/lib/md/rate-review.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRateReview extends React.Component<IconBaseProps> { }
-export = MdRateReview;
diff --git a/types/react-icons/lib/md/receipt.d.ts b/types/react-icons/lib/md/receipt.d.ts
deleted file mode 100644
index ae345fa152..0000000000
--- a/types/react-icons/lib/md/receipt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdReceipt extends React.Component<IconBaseProps> { }
-export = MdReceipt;
diff --git a/types/react-icons/lib/md/recent-actors.d.ts b/types/react-icons/lib/md/recent-actors.d.ts
deleted file mode 100644
index d347341dc6..0000000000
--- a/types/react-icons/lib/md/recent-actors.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRecentActors extends React.Component<IconBaseProps> { }
-export = MdRecentActors;
diff --git a/types/react-icons/lib/md/record-voice-over.d.ts b/types/react-icons/lib/md/record-voice-over.d.ts
deleted file mode 100644
index 89c019ede6..0000000000
--- a/types/react-icons/lib/md/record-voice-over.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRecordVoiceOver extends React.Component<IconBaseProps> { }
-export = MdRecordVoiceOver;
diff --git a/types/react-icons/lib/md/redeem.d.ts b/types/react-icons/lib/md/redeem.d.ts
deleted file mode 100644
index 05195322b9..0000000000
--- a/types/react-icons/lib/md/redeem.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRedeem extends React.Component<IconBaseProps> { }
-export = MdRedeem;
diff --git a/types/react-icons/lib/md/redo.d.ts b/types/react-icons/lib/md/redo.d.ts
deleted file mode 100644
index 355d6a28e4..0000000000
--- a/types/react-icons/lib/md/redo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRedo extends React.Component<IconBaseProps> { }
-export = MdRedo;
diff --git a/types/react-icons/lib/md/refresh.d.ts b/types/react-icons/lib/md/refresh.d.ts
deleted file mode 100644
index 40213a11ed..0000000000
--- a/types/react-icons/lib/md/refresh.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRefresh extends React.Component<IconBaseProps> { }
-export = MdRefresh;
diff --git a/types/react-icons/lib/md/remove-circle-outline.d.ts b/types/react-icons/lib/md/remove-circle-outline.d.ts
deleted file mode 100644
index 5a06426edf..0000000000
--- a/types/react-icons/lib/md/remove-circle-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRemoveCircleOutline extends React.Component<IconBaseProps> { }
-export = MdRemoveCircleOutline;
diff --git a/types/react-icons/lib/md/remove-circle.d.ts b/types/react-icons/lib/md/remove-circle.d.ts
deleted file mode 100644
index a79189430d..0000000000
--- a/types/react-icons/lib/md/remove-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRemoveCircle extends React.Component<IconBaseProps> { }
-export = MdRemoveCircle;
diff --git a/types/react-icons/lib/md/remove-from-queue.d.ts b/types/react-icons/lib/md/remove-from-queue.d.ts
deleted file mode 100644
index bc4a8b2a60..0000000000
--- a/types/react-icons/lib/md/remove-from-queue.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRemoveFromQueue extends React.Component<IconBaseProps> { }
-export = MdRemoveFromQueue;
diff --git a/types/react-icons/lib/md/remove-red-eye.d.ts b/types/react-icons/lib/md/remove-red-eye.d.ts
deleted file mode 100644
index 08e340824f..0000000000
--- a/types/react-icons/lib/md/remove-red-eye.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRemoveRedEye extends React.Component<IconBaseProps> { }
-export = MdRemoveRedEye;
diff --git a/types/react-icons/lib/md/remove-shopping-cart.d.ts b/types/react-icons/lib/md/remove-shopping-cart.d.ts
deleted file mode 100644
index d0d1a3a063..0000000000
--- a/types/react-icons/lib/md/remove-shopping-cart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRemoveShoppingCart extends React.Component<IconBaseProps> { }
-export = MdRemoveShoppingCart;
diff --git a/types/react-icons/lib/md/remove.d.ts b/types/react-icons/lib/md/remove.d.ts
deleted file mode 100644
index cc473fea9f..0000000000
--- a/types/react-icons/lib/md/remove.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRemove extends React.Component<IconBaseProps> { }
-export = MdRemove;
diff --git a/types/react-icons/lib/md/reorder.d.ts b/types/react-icons/lib/md/reorder.d.ts
deleted file mode 100644
index e9550c664b..0000000000
--- a/types/react-icons/lib/md/reorder.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdReorder extends React.Component<IconBaseProps> { }
-export = MdReorder;
diff --git a/types/react-icons/lib/md/repeat-one.d.ts b/types/react-icons/lib/md/repeat-one.d.ts
deleted file mode 100644
index cb17395670..0000000000
--- a/types/react-icons/lib/md/repeat-one.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRepeatOne extends React.Component<IconBaseProps> { }
-export = MdRepeatOne;
diff --git a/types/react-icons/lib/md/repeat.d.ts b/types/react-icons/lib/md/repeat.d.ts
deleted file mode 100644
index 9de29f628a..0000000000
--- a/types/react-icons/lib/md/repeat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRepeat extends React.Component<IconBaseProps> { }
-export = MdRepeat;
diff --git a/types/react-icons/lib/md/replay-10.d.ts b/types/react-icons/lib/md/replay-10.d.ts
deleted file mode 100644
index d4a6163e66..0000000000
--- a/types/react-icons/lib/md/replay-10.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdReplay10 extends React.Component<IconBaseProps> { }
-export = MdReplay10;
diff --git a/types/react-icons/lib/md/replay-30.d.ts b/types/react-icons/lib/md/replay-30.d.ts
deleted file mode 100644
index 2f7775f226..0000000000
--- a/types/react-icons/lib/md/replay-30.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdReplay30 extends React.Component<IconBaseProps> { }
-export = MdReplay30;
diff --git a/types/react-icons/lib/md/replay-5.d.ts b/types/react-icons/lib/md/replay-5.d.ts
deleted file mode 100644
index 51ee68a11f..0000000000
--- a/types/react-icons/lib/md/replay-5.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdReplay5 extends React.Component<IconBaseProps> { }
-export = MdReplay5;
diff --git a/types/react-icons/lib/md/replay.d.ts b/types/react-icons/lib/md/replay.d.ts
deleted file mode 100644
index 4245bb86b3..0000000000
--- a/types/react-icons/lib/md/replay.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdReplay extends React.Component<IconBaseProps> { }
-export = MdReplay;
diff --git a/types/react-icons/lib/md/reply-all.d.ts b/types/react-icons/lib/md/reply-all.d.ts
deleted file mode 100644
index 4e7fda0551..0000000000
--- a/types/react-icons/lib/md/reply-all.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdReplyAll extends React.Component<IconBaseProps> { }
-export = MdReplyAll;
diff --git a/types/react-icons/lib/md/reply.d.ts b/types/react-icons/lib/md/reply.d.ts
deleted file mode 100644
index e83df14565..0000000000
--- a/types/react-icons/lib/md/reply.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdReply extends React.Component<IconBaseProps> { }
-export = MdReply;
diff --git a/types/react-icons/lib/md/report-problem.d.ts b/types/react-icons/lib/md/report-problem.d.ts
deleted file mode 100644
index d994bf6a19..0000000000
--- a/types/react-icons/lib/md/report-problem.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdReportProblem extends React.Component<IconBaseProps> { }
-export = MdReportProblem;
diff --git a/types/react-icons/lib/md/report.d.ts b/types/react-icons/lib/md/report.d.ts
deleted file mode 100644
index 2b90b6889c..0000000000
--- a/types/react-icons/lib/md/report.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdReport extends React.Component<IconBaseProps> { }
-export = MdReport;
diff --git a/types/react-icons/lib/md/restaurant-menu.d.ts b/types/react-icons/lib/md/restaurant-menu.d.ts
deleted file mode 100644
index ba1f140c85..0000000000
--- a/types/react-icons/lib/md/restaurant-menu.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRestaurantMenu extends React.Component<IconBaseProps> { }
-export = MdRestaurantMenu;
diff --git a/types/react-icons/lib/md/restaurant.d.ts b/types/react-icons/lib/md/restaurant.d.ts
deleted file mode 100644
index c73547557c..0000000000
--- a/types/react-icons/lib/md/restaurant.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRestaurant extends React.Component<IconBaseProps> { }
-export = MdRestaurant;
diff --git a/types/react-icons/lib/md/restore-page.d.ts b/types/react-icons/lib/md/restore-page.d.ts
deleted file mode 100644
index 5f8df2e582..0000000000
--- a/types/react-icons/lib/md/restore-page.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRestorePage extends React.Component<IconBaseProps> { }
-export = MdRestorePage;
diff --git a/types/react-icons/lib/md/restore.d.ts b/types/react-icons/lib/md/restore.d.ts
deleted file mode 100644
index 1e4e89e80e..0000000000
--- a/types/react-icons/lib/md/restore.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRestore extends React.Component<IconBaseProps> { }
-export = MdRestore;
diff --git a/types/react-icons/lib/md/ring-volume.d.ts b/types/react-icons/lib/md/ring-volume.d.ts
deleted file mode 100644
index ad9af1db0f..0000000000
--- a/types/react-icons/lib/md/ring-volume.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRingVolume extends React.Component<IconBaseProps> { }
-export = MdRingVolume;
diff --git a/types/react-icons/lib/md/room-service.d.ts b/types/react-icons/lib/md/room-service.d.ts
deleted file mode 100644
index 3dfd465e03..0000000000
--- a/types/react-icons/lib/md/room-service.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRoomService extends React.Component<IconBaseProps> { }
-export = MdRoomService;
diff --git a/types/react-icons/lib/md/room.d.ts b/types/react-icons/lib/md/room.d.ts
deleted file mode 100644
index 4b6d53a92f..0000000000
--- a/types/react-icons/lib/md/room.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRoom extends React.Component<IconBaseProps> { }
-export = MdRoom;
diff --git a/types/react-icons/lib/md/rotate-90-degrees-ccw.d.ts b/types/react-icons/lib/md/rotate-90-degrees-ccw.d.ts
deleted file mode 100644
index 8e5da4d975..0000000000
--- a/types/react-icons/lib/md/rotate-90-degrees-ccw.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRotate90DegreesCcw extends React.Component<IconBaseProps> { }
-export = MdRotate90DegreesCcw;
diff --git a/types/react-icons/lib/md/rotate-left.d.ts b/types/react-icons/lib/md/rotate-left.d.ts
deleted file mode 100644
index 2bae5dd27a..0000000000
--- a/types/react-icons/lib/md/rotate-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRotateLeft extends React.Component<IconBaseProps> { }
-export = MdRotateLeft;
diff --git a/types/react-icons/lib/md/rotate-right.d.ts b/types/react-icons/lib/md/rotate-right.d.ts
deleted file mode 100644
index 383af61134..0000000000
--- a/types/react-icons/lib/md/rotate-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRotateRight extends React.Component<IconBaseProps> { }
-export = MdRotateRight;
diff --git a/types/react-icons/lib/md/rounded-corner.d.ts b/types/react-icons/lib/md/rounded-corner.d.ts
deleted file mode 100644
index e596f50c2d..0000000000
--- a/types/react-icons/lib/md/rounded-corner.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRoundedCorner extends React.Component<IconBaseProps> { }
-export = MdRoundedCorner;
diff --git a/types/react-icons/lib/md/router.d.ts b/types/react-icons/lib/md/router.d.ts
deleted file mode 100644
index 43947a6a1a..0000000000
--- a/types/react-icons/lib/md/router.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRouter extends React.Component<IconBaseProps> { }
-export = MdRouter;
diff --git a/types/react-icons/lib/md/rowing.d.ts b/types/react-icons/lib/md/rowing.d.ts
deleted file mode 100644
index bc40733522..0000000000
--- a/types/react-icons/lib/md/rowing.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRowing extends React.Component<IconBaseProps> { }
-export = MdRowing;
diff --git a/types/react-icons/lib/md/rss-feed.d.ts b/types/react-icons/lib/md/rss-feed.d.ts
deleted file mode 100644
index a2d809e6a5..0000000000
--- a/types/react-icons/lib/md/rss-feed.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRssFeed extends React.Component<IconBaseProps> { }
-export = MdRssFeed;
diff --git a/types/react-icons/lib/md/rv-hookup.d.ts b/types/react-icons/lib/md/rv-hookup.d.ts
deleted file mode 100644
index 5db1b8b217..0000000000
--- a/types/react-icons/lib/md/rv-hookup.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdRvHookup extends React.Component<IconBaseProps> { }
-export = MdRvHookup;
diff --git a/types/react-icons/lib/md/satellite.d.ts b/types/react-icons/lib/md/satellite.d.ts
deleted file mode 100644
index c75656781c..0000000000
--- a/types/react-icons/lib/md/satellite.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSatellite extends React.Component<IconBaseProps> { }
-export = MdSatellite;
diff --git a/types/react-icons/lib/md/save.d.ts b/types/react-icons/lib/md/save.d.ts
deleted file mode 100644
index 52f76c62fa..0000000000
--- a/types/react-icons/lib/md/save.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSave extends React.Component<IconBaseProps> { }
-export = MdSave;
diff --git a/types/react-icons/lib/md/scanner.d.ts b/types/react-icons/lib/md/scanner.d.ts
deleted file mode 100644
index a948265dae..0000000000
--- a/types/react-icons/lib/md/scanner.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdScanner extends React.Component<IconBaseProps> { }
-export = MdScanner;
diff --git a/types/react-icons/lib/md/schedule.d.ts b/types/react-icons/lib/md/schedule.d.ts
deleted file mode 100644
index ea91abb209..0000000000
--- a/types/react-icons/lib/md/schedule.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSchedule extends React.Component<IconBaseProps> { }
-export = MdSchedule;
diff --git a/types/react-icons/lib/md/school.d.ts b/types/react-icons/lib/md/school.d.ts
deleted file mode 100644
index 8e6db36a55..0000000000
--- a/types/react-icons/lib/md/school.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSchool extends React.Component<IconBaseProps> { }
-export = MdSchool;
diff --git a/types/react-icons/lib/md/screen-lock-landscape.d.ts b/types/react-icons/lib/md/screen-lock-landscape.d.ts
deleted file mode 100644
index 83936e6cf5..0000000000
--- a/types/react-icons/lib/md/screen-lock-landscape.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdScreenLockLandscape extends React.Component<IconBaseProps> { }
-export = MdScreenLockLandscape;
diff --git a/types/react-icons/lib/md/screen-lock-portrait.d.ts b/types/react-icons/lib/md/screen-lock-portrait.d.ts
deleted file mode 100644
index acb9616bf3..0000000000
--- a/types/react-icons/lib/md/screen-lock-portrait.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdScreenLockPortrait extends React.Component<IconBaseProps> { }
-export = MdScreenLockPortrait;
diff --git a/types/react-icons/lib/md/screen-lock-rotation.d.ts b/types/react-icons/lib/md/screen-lock-rotation.d.ts
deleted file mode 100644
index 3b14fad7c3..0000000000
--- a/types/react-icons/lib/md/screen-lock-rotation.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdScreenLockRotation extends React.Component<IconBaseProps> { }
-export = MdScreenLockRotation;
diff --git a/types/react-icons/lib/md/screen-rotation.d.ts b/types/react-icons/lib/md/screen-rotation.d.ts
deleted file mode 100644
index 9fdb432b74..0000000000
--- a/types/react-icons/lib/md/screen-rotation.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdScreenRotation extends React.Component<IconBaseProps> { }
-export = MdScreenRotation;
diff --git a/types/react-icons/lib/md/screen-share.d.ts b/types/react-icons/lib/md/screen-share.d.ts
deleted file mode 100644
index 38f9b890db..0000000000
--- a/types/react-icons/lib/md/screen-share.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdScreenShare extends React.Component<IconBaseProps> { }
-export = MdScreenShare;
diff --git a/types/react-icons/lib/md/sd-card.d.ts b/types/react-icons/lib/md/sd-card.d.ts
deleted file mode 100644
index 894db93bf7..0000000000
--- a/types/react-icons/lib/md/sd-card.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSdCard extends React.Component<IconBaseProps> { }
-export = MdSdCard;
diff --git a/types/react-icons/lib/md/sd-storage.d.ts b/types/react-icons/lib/md/sd-storage.d.ts
deleted file mode 100644
index 5954597cad..0000000000
--- a/types/react-icons/lib/md/sd-storage.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSdStorage extends React.Component<IconBaseProps> { }
-export = MdSdStorage;
diff --git a/types/react-icons/lib/md/search.d.ts b/types/react-icons/lib/md/search.d.ts
deleted file mode 100644
index 10abf14f31..0000000000
--- a/types/react-icons/lib/md/search.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSearch extends React.Component<IconBaseProps> { }
-export = MdSearch;
diff --git a/types/react-icons/lib/md/security.d.ts b/types/react-icons/lib/md/security.d.ts
deleted file mode 100644
index 2c3381cf2e..0000000000
--- a/types/react-icons/lib/md/security.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSecurity extends React.Component<IconBaseProps> { }
-export = MdSecurity;
diff --git a/types/react-icons/lib/md/select-all.d.ts b/types/react-icons/lib/md/select-all.d.ts
deleted file mode 100644
index aacf948922..0000000000
--- a/types/react-icons/lib/md/select-all.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSelectAll extends React.Component<IconBaseProps> { }
-export = MdSelectAll;
diff --git a/types/react-icons/lib/md/send.d.ts b/types/react-icons/lib/md/send.d.ts
deleted file mode 100644
index 162137fb99..0000000000
--- a/types/react-icons/lib/md/send.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSend extends React.Component<IconBaseProps> { }
-export = MdSend;
diff --git a/types/react-icons/lib/md/sentiment-dissatisfied.d.ts b/types/react-icons/lib/md/sentiment-dissatisfied.d.ts
deleted file mode 100644
index a62acf6df6..0000000000
--- a/types/react-icons/lib/md/sentiment-dissatisfied.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSentimentDissatisfied extends React.Component<IconBaseProps> { }
-export = MdSentimentDissatisfied;
diff --git a/types/react-icons/lib/md/sentiment-neutral.d.ts b/types/react-icons/lib/md/sentiment-neutral.d.ts
deleted file mode 100644
index d8091cbc2c..0000000000
--- a/types/react-icons/lib/md/sentiment-neutral.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSentimentNeutral extends React.Component<IconBaseProps> { }
-export = MdSentimentNeutral;
diff --git a/types/react-icons/lib/md/sentiment-satisfied.d.ts b/types/react-icons/lib/md/sentiment-satisfied.d.ts
deleted file mode 100644
index cbe5553524..0000000000
--- a/types/react-icons/lib/md/sentiment-satisfied.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSentimentSatisfied extends React.Component<IconBaseProps> { }
-export = MdSentimentSatisfied;
diff --git a/types/react-icons/lib/md/sentiment-very-dissatisfied.d.ts b/types/react-icons/lib/md/sentiment-very-dissatisfied.d.ts
deleted file mode 100644
index 1ac9808f2f..0000000000
--- a/types/react-icons/lib/md/sentiment-very-dissatisfied.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSentimentVeryDissatisfied extends React.Component<IconBaseProps> { }
-export = MdSentimentVeryDissatisfied;
diff --git a/types/react-icons/lib/md/sentiment-very-satisfied.d.ts b/types/react-icons/lib/md/sentiment-very-satisfied.d.ts
deleted file mode 100644
index ef2aee237a..0000000000
--- a/types/react-icons/lib/md/sentiment-very-satisfied.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSentimentVerySatisfied extends React.Component<IconBaseProps> { }
-export = MdSentimentVerySatisfied;
diff --git a/types/react-icons/lib/md/settings-applications.d.ts b/types/react-icons/lib/md/settings-applications.d.ts
deleted file mode 100644
index d2472f774b..0000000000
--- a/types/react-icons/lib/md/settings-applications.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsApplications extends React.Component<IconBaseProps> { }
-export = MdSettingsApplications;
diff --git a/types/react-icons/lib/md/settings-backup-restore.d.ts b/types/react-icons/lib/md/settings-backup-restore.d.ts
deleted file mode 100644
index ad56096928..0000000000
--- a/types/react-icons/lib/md/settings-backup-restore.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsBackupRestore extends React.Component<IconBaseProps> { }
-export = MdSettingsBackupRestore;
diff --git a/types/react-icons/lib/md/settings-bluetooth.d.ts b/types/react-icons/lib/md/settings-bluetooth.d.ts
deleted file mode 100644
index 0951501e98..0000000000
--- a/types/react-icons/lib/md/settings-bluetooth.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsBluetooth extends React.Component<IconBaseProps> { }
-export = MdSettingsBluetooth;
diff --git a/types/react-icons/lib/md/settings-brightness.d.ts b/types/react-icons/lib/md/settings-brightness.d.ts
deleted file mode 100644
index 78854eb65f..0000000000
--- a/types/react-icons/lib/md/settings-brightness.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsBrightness extends React.Component<IconBaseProps> { }
-export = MdSettingsBrightness;
diff --git a/types/react-icons/lib/md/settings-cell.d.ts b/types/react-icons/lib/md/settings-cell.d.ts
deleted file mode 100644
index a60a8cf1ac..0000000000
--- a/types/react-icons/lib/md/settings-cell.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsCell extends React.Component<IconBaseProps> { }
-export = MdSettingsCell;
diff --git a/types/react-icons/lib/md/settings-ethernet.d.ts b/types/react-icons/lib/md/settings-ethernet.d.ts
deleted file mode 100644
index b6b30b29de..0000000000
--- a/types/react-icons/lib/md/settings-ethernet.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsEthernet extends React.Component<IconBaseProps> { }
-export = MdSettingsEthernet;
diff --git a/types/react-icons/lib/md/settings-input-antenna.d.ts b/types/react-icons/lib/md/settings-input-antenna.d.ts
deleted file mode 100644
index 7099f8a3f2..0000000000
--- a/types/react-icons/lib/md/settings-input-antenna.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsInputAntenna extends React.Component<IconBaseProps> { }
-export = MdSettingsInputAntenna;
diff --git a/types/react-icons/lib/md/settings-input-component.d.ts b/types/react-icons/lib/md/settings-input-component.d.ts
deleted file mode 100644
index 4348ba310e..0000000000
--- a/types/react-icons/lib/md/settings-input-component.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsInputComponent extends React.Component<IconBaseProps> { }
-export = MdSettingsInputComponent;
diff --git a/types/react-icons/lib/md/settings-input-composite.d.ts b/types/react-icons/lib/md/settings-input-composite.d.ts
deleted file mode 100644
index 5ceda7379f..0000000000
--- a/types/react-icons/lib/md/settings-input-composite.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsInputComposite extends React.Component<IconBaseProps> { }
-export = MdSettingsInputComposite;
diff --git a/types/react-icons/lib/md/settings-input-hdmi.d.ts b/types/react-icons/lib/md/settings-input-hdmi.d.ts
deleted file mode 100644
index ceaf5bae19..0000000000
--- a/types/react-icons/lib/md/settings-input-hdmi.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsInputHdmi extends React.Component<IconBaseProps> { }
-export = MdSettingsInputHdmi;
diff --git a/types/react-icons/lib/md/settings-input-svideo.d.ts b/types/react-icons/lib/md/settings-input-svideo.d.ts
deleted file mode 100644
index 38aee4cc5b..0000000000
--- a/types/react-icons/lib/md/settings-input-svideo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsInputSvideo extends React.Component<IconBaseProps> { }
-export = MdSettingsInputSvideo;
diff --git a/types/react-icons/lib/md/settings-overscan.d.ts b/types/react-icons/lib/md/settings-overscan.d.ts
deleted file mode 100644
index c2932f567c..0000000000
--- a/types/react-icons/lib/md/settings-overscan.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsOverscan extends React.Component<IconBaseProps> { }
-export = MdSettingsOverscan;
diff --git a/types/react-icons/lib/md/settings-phone.d.ts b/types/react-icons/lib/md/settings-phone.d.ts
deleted file mode 100644
index fe28d9b8df..0000000000
--- a/types/react-icons/lib/md/settings-phone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsPhone extends React.Component<IconBaseProps> { }
-export = MdSettingsPhone;
diff --git a/types/react-icons/lib/md/settings-power.d.ts b/types/react-icons/lib/md/settings-power.d.ts
deleted file mode 100644
index f36622e144..0000000000
--- a/types/react-icons/lib/md/settings-power.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsPower extends React.Component<IconBaseProps> { }
-export = MdSettingsPower;
diff --git a/types/react-icons/lib/md/settings-remote.d.ts b/types/react-icons/lib/md/settings-remote.d.ts
deleted file mode 100644
index ed8987736c..0000000000
--- a/types/react-icons/lib/md/settings-remote.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsRemote extends React.Component<IconBaseProps> { }
-export = MdSettingsRemote;
diff --git a/types/react-icons/lib/md/settings-system-daydream.d.ts b/types/react-icons/lib/md/settings-system-daydream.d.ts
deleted file mode 100644
index 0ea373ba0d..0000000000
--- a/types/react-icons/lib/md/settings-system-daydream.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsSystemDaydream extends React.Component<IconBaseProps> { }
-export = MdSettingsSystemDaydream;
diff --git a/types/react-icons/lib/md/settings-voice.d.ts b/types/react-icons/lib/md/settings-voice.d.ts
deleted file mode 100644
index 5a7d8c78b3..0000000000
--- a/types/react-icons/lib/md/settings-voice.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettingsVoice extends React.Component<IconBaseProps> { }
-export = MdSettingsVoice;
diff --git a/types/react-icons/lib/md/settings.d.ts b/types/react-icons/lib/md/settings.d.ts
deleted file mode 100644
index e2b820fa0e..0000000000
--- a/types/react-icons/lib/md/settings.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSettings extends React.Component<IconBaseProps> { }
-export = MdSettings;
diff --git a/types/react-icons/lib/md/share.d.ts b/types/react-icons/lib/md/share.d.ts
deleted file mode 100644
index db916b39a9..0000000000
--- a/types/react-icons/lib/md/share.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdShare extends React.Component<IconBaseProps> { }
-export = MdShare;
diff --git a/types/react-icons/lib/md/shop-two.d.ts b/types/react-icons/lib/md/shop-two.d.ts
deleted file mode 100644
index 3b2a284a5c..0000000000
--- a/types/react-icons/lib/md/shop-two.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdShopTwo extends React.Component<IconBaseProps> { }
-export = MdShopTwo;
diff --git a/types/react-icons/lib/md/shop.d.ts b/types/react-icons/lib/md/shop.d.ts
deleted file mode 100644
index ecc1e9ffb9..0000000000
--- a/types/react-icons/lib/md/shop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdShop extends React.Component<IconBaseProps> { }
-export = MdShop;
diff --git a/types/react-icons/lib/md/shopping-basket.d.ts b/types/react-icons/lib/md/shopping-basket.d.ts
deleted file mode 100644
index f71c3ff451..0000000000
--- a/types/react-icons/lib/md/shopping-basket.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdShoppingBasket extends React.Component<IconBaseProps> { }
-export = MdShoppingBasket;
diff --git a/types/react-icons/lib/md/shopping-cart.d.ts b/types/react-icons/lib/md/shopping-cart.d.ts
deleted file mode 100644
index b73baac4e1..0000000000
--- a/types/react-icons/lib/md/shopping-cart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdShoppingCart extends React.Component<IconBaseProps> { }
-export = MdShoppingCart;
diff --git a/types/react-icons/lib/md/short-text.d.ts b/types/react-icons/lib/md/short-text.d.ts
deleted file mode 100644
index f3195b2464..0000000000
--- a/types/react-icons/lib/md/short-text.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdShortText extends React.Component<IconBaseProps> { }
-export = MdShortText;
diff --git a/types/react-icons/lib/md/show-chart.d.ts b/types/react-icons/lib/md/show-chart.d.ts
deleted file mode 100644
index f3f418e848..0000000000
--- a/types/react-icons/lib/md/show-chart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdShowChart extends React.Component<IconBaseProps> { }
-export = MdShowChart;
diff --git a/types/react-icons/lib/md/shuffle.d.ts b/types/react-icons/lib/md/shuffle.d.ts
deleted file mode 100644
index f6410aa683..0000000000
--- a/types/react-icons/lib/md/shuffle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdShuffle extends React.Component<IconBaseProps> { }
-export = MdShuffle;
diff --git a/types/react-icons/lib/md/signal-cellular-4-bar.d.ts b/types/react-icons/lib/md/signal-cellular-4-bar.d.ts
deleted file mode 100644
index 6059ded2d6..0000000000
--- a/types/react-icons/lib/md/signal-cellular-4-bar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSignalCellular4Bar extends React.Component<IconBaseProps> { }
-export = MdSignalCellular4Bar;
diff --git a/types/react-icons/lib/md/signal-cellular-connected-no-internet-4-bar.d.ts b/types/react-icons/lib/md/signal-cellular-connected-no-internet-4-bar.d.ts
deleted file mode 100644
index f8f1431efa..0000000000
--- a/types/react-icons/lib/md/signal-cellular-connected-no-internet-4-bar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSignalCellularConnectedNoInternet4Bar extends React.Component<IconBaseProps> { }
-export = MdSignalCellularConnectedNoInternet4Bar;
diff --git a/types/react-icons/lib/md/signal-cellular-no-sim.d.ts b/types/react-icons/lib/md/signal-cellular-no-sim.d.ts
deleted file mode 100644
index 6892f5cf7d..0000000000
--- a/types/react-icons/lib/md/signal-cellular-no-sim.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSignalCellularNoSim extends React.Component<IconBaseProps> { }
-export = MdSignalCellularNoSim;
diff --git a/types/react-icons/lib/md/signal-cellular-null.d.ts b/types/react-icons/lib/md/signal-cellular-null.d.ts
deleted file mode 100644
index 681570828b..0000000000
--- a/types/react-icons/lib/md/signal-cellular-null.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSignalCellularNull extends React.Component<IconBaseProps> { }
-export = MdSignalCellularNull;
diff --git a/types/react-icons/lib/md/signal-cellular-off.d.ts b/types/react-icons/lib/md/signal-cellular-off.d.ts
deleted file mode 100644
index 09192b3ad7..0000000000
--- a/types/react-icons/lib/md/signal-cellular-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSignalCellularOff extends React.Component<IconBaseProps> { }
-export = MdSignalCellularOff;
diff --git a/types/react-icons/lib/md/signal-wifi-4-bar-lock.d.ts b/types/react-icons/lib/md/signal-wifi-4-bar-lock.d.ts
deleted file mode 100644
index d927b58603..0000000000
--- a/types/react-icons/lib/md/signal-wifi-4-bar-lock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSignalWifi4BarLock extends React.Component<IconBaseProps> { }
-export = MdSignalWifi4BarLock;
diff --git a/types/react-icons/lib/md/signal-wifi-4-bar.d.ts b/types/react-icons/lib/md/signal-wifi-4-bar.d.ts
deleted file mode 100644
index 884c211a81..0000000000
--- a/types/react-icons/lib/md/signal-wifi-4-bar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSignalWifi4Bar extends React.Component<IconBaseProps> { }
-export = MdSignalWifi4Bar;
diff --git a/types/react-icons/lib/md/signal-wifi-off.d.ts b/types/react-icons/lib/md/signal-wifi-off.d.ts
deleted file mode 100644
index cbda299e8b..0000000000
--- a/types/react-icons/lib/md/signal-wifi-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSignalWifiOff extends React.Component<IconBaseProps> { }
-export = MdSignalWifiOff;
diff --git a/types/react-icons/lib/md/sim-card-alert.d.ts b/types/react-icons/lib/md/sim-card-alert.d.ts
deleted file mode 100644
index be845d108d..0000000000
--- a/types/react-icons/lib/md/sim-card-alert.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSimCardAlert extends React.Component<IconBaseProps> { }
-export = MdSimCardAlert;
diff --git a/types/react-icons/lib/md/sim-card.d.ts b/types/react-icons/lib/md/sim-card.d.ts
deleted file mode 100644
index 1b3b765dc7..0000000000
--- a/types/react-icons/lib/md/sim-card.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSimCard extends React.Component<IconBaseProps> { }
-export = MdSimCard;
diff --git a/types/react-icons/lib/md/skip-next.d.ts b/types/react-icons/lib/md/skip-next.d.ts
deleted file mode 100644
index 19737d3978..0000000000
--- a/types/react-icons/lib/md/skip-next.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSkipNext extends React.Component<IconBaseProps> { }
-export = MdSkipNext;
diff --git a/types/react-icons/lib/md/skip-previous.d.ts b/types/react-icons/lib/md/skip-previous.d.ts
deleted file mode 100644
index ae5c25aed6..0000000000
--- a/types/react-icons/lib/md/skip-previous.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSkipPrevious extends React.Component<IconBaseProps> { }
-export = MdSkipPrevious;
diff --git a/types/react-icons/lib/md/slideshow.d.ts b/types/react-icons/lib/md/slideshow.d.ts
deleted file mode 100644
index 26cbf1a3c9..0000000000
--- a/types/react-icons/lib/md/slideshow.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSlideshow extends React.Component<IconBaseProps> { }
-export = MdSlideshow;
diff --git a/types/react-icons/lib/md/slow-motion-video.d.ts b/types/react-icons/lib/md/slow-motion-video.d.ts
deleted file mode 100644
index 03f4d610cb..0000000000
--- a/types/react-icons/lib/md/slow-motion-video.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSlowMotionVideo extends React.Component<IconBaseProps> { }
-export = MdSlowMotionVideo;
diff --git a/types/react-icons/lib/md/smartphone.d.ts b/types/react-icons/lib/md/smartphone.d.ts
deleted file mode 100644
index 697de1117a..0000000000
--- a/types/react-icons/lib/md/smartphone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSmartphone extends React.Component<IconBaseProps> { }
-export = MdSmartphone;
diff --git a/types/react-icons/lib/md/smoke-free.d.ts b/types/react-icons/lib/md/smoke-free.d.ts
deleted file mode 100644
index bd0eed47da..0000000000
--- a/types/react-icons/lib/md/smoke-free.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSmokeFree extends React.Component<IconBaseProps> { }
-export = MdSmokeFree;
diff --git a/types/react-icons/lib/md/smoking-rooms.d.ts b/types/react-icons/lib/md/smoking-rooms.d.ts
deleted file mode 100644
index f42b48f9b6..0000000000
--- a/types/react-icons/lib/md/smoking-rooms.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSmokingRooms extends React.Component<IconBaseProps> { }
-export = MdSmokingRooms;
diff --git a/types/react-icons/lib/md/sms-failed.d.ts b/types/react-icons/lib/md/sms-failed.d.ts
deleted file mode 100644
index c242d6783f..0000000000
--- a/types/react-icons/lib/md/sms-failed.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSmsFailed extends React.Component<IconBaseProps> { }
-export = MdSmsFailed;
diff --git a/types/react-icons/lib/md/sms.d.ts b/types/react-icons/lib/md/sms.d.ts
deleted file mode 100644
index 4d1b01eba0..0000000000
--- a/types/react-icons/lib/md/sms.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSms extends React.Component<IconBaseProps> { }
-export = MdSms;
diff --git a/types/react-icons/lib/md/snooze.d.ts b/types/react-icons/lib/md/snooze.d.ts
deleted file mode 100644
index a3e93311de..0000000000
--- a/types/react-icons/lib/md/snooze.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSnooze extends React.Component<IconBaseProps> { }
-export = MdSnooze;
diff --git a/types/react-icons/lib/md/sort-by-alpha.d.ts b/types/react-icons/lib/md/sort-by-alpha.d.ts
deleted file mode 100644
index 665ed0e19d..0000000000
--- a/types/react-icons/lib/md/sort-by-alpha.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSortByAlpha extends React.Component<IconBaseProps> { }
-export = MdSortByAlpha;
diff --git a/types/react-icons/lib/md/sort.d.ts b/types/react-icons/lib/md/sort.d.ts
deleted file mode 100644
index a0ca8a2d38..0000000000
--- a/types/react-icons/lib/md/sort.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSort extends React.Component<IconBaseProps> { }
-export = MdSort;
diff --git a/types/react-icons/lib/md/spa.d.ts b/types/react-icons/lib/md/spa.d.ts
deleted file mode 100644
index 3b521477c1..0000000000
--- a/types/react-icons/lib/md/spa.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSpa extends React.Component<IconBaseProps> { }
-export = MdSpa;
diff --git a/types/react-icons/lib/md/space-bar.d.ts b/types/react-icons/lib/md/space-bar.d.ts
deleted file mode 100644
index 4f0aee2b42..0000000000
--- a/types/react-icons/lib/md/space-bar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSpaceBar extends React.Component<IconBaseProps> { }
-export = MdSpaceBar;
diff --git a/types/react-icons/lib/md/speaker-group.d.ts b/types/react-icons/lib/md/speaker-group.d.ts
deleted file mode 100644
index 75ce013743..0000000000
--- a/types/react-icons/lib/md/speaker-group.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSpeakerGroup extends React.Component<IconBaseProps> { }
-export = MdSpeakerGroup;
diff --git a/types/react-icons/lib/md/speaker-notes-off.d.ts b/types/react-icons/lib/md/speaker-notes-off.d.ts
deleted file mode 100644
index 2ebed4d42f..0000000000
--- a/types/react-icons/lib/md/speaker-notes-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSpeakerNotesOff extends React.Component<IconBaseProps> { }
-export = MdSpeakerNotesOff;
diff --git a/types/react-icons/lib/md/speaker-notes.d.ts b/types/react-icons/lib/md/speaker-notes.d.ts
deleted file mode 100644
index 61dd9e47c9..0000000000
--- a/types/react-icons/lib/md/speaker-notes.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSpeakerNotes extends React.Component<IconBaseProps> { }
-export = MdSpeakerNotes;
diff --git a/types/react-icons/lib/md/speaker-phone.d.ts b/types/react-icons/lib/md/speaker-phone.d.ts
deleted file mode 100644
index 3a4a35bdd5..0000000000
--- a/types/react-icons/lib/md/speaker-phone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSpeakerPhone extends React.Component<IconBaseProps> { }
-export = MdSpeakerPhone;
diff --git a/types/react-icons/lib/md/speaker.d.ts b/types/react-icons/lib/md/speaker.d.ts
deleted file mode 100644
index 3028b1613f..0000000000
--- a/types/react-icons/lib/md/speaker.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSpeaker extends React.Component<IconBaseProps> { }
-export = MdSpeaker;
diff --git a/types/react-icons/lib/md/spellcheck.d.ts b/types/react-icons/lib/md/spellcheck.d.ts
deleted file mode 100644
index b537efca19..0000000000
--- a/types/react-icons/lib/md/spellcheck.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSpellcheck extends React.Component<IconBaseProps> { }
-export = MdSpellcheck;
diff --git a/types/react-icons/lib/md/star-border.d.ts b/types/react-icons/lib/md/star-border.d.ts
deleted file mode 100644
index 26a466ca5e..0000000000
--- a/types/react-icons/lib/md/star-border.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStarBorder extends React.Component<IconBaseProps> { }
-export = MdStarBorder;
diff --git a/types/react-icons/lib/md/star-half.d.ts b/types/react-icons/lib/md/star-half.d.ts
deleted file mode 100644
index d1e27756c1..0000000000
--- a/types/react-icons/lib/md/star-half.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStarHalf extends React.Component<IconBaseProps> { }
-export = MdStarHalf;
diff --git a/types/react-icons/lib/md/star-outline.d.ts b/types/react-icons/lib/md/star-outline.d.ts
deleted file mode 100644
index 1dcecb15ef..0000000000
--- a/types/react-icons/lib/md/star-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStarOutline extends React.Component<IconBaseProps> { }
-export = MdStarOutline;
diff --git a/types/react-icons/lib/md/star.d.ts b/types/react-icons/lib/md/star.d.ts
deleted file mode 100644
index 292edc345b..0000000000
--- a/types/react-icons/lib/md/star.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStar extends React.Component<IconBaseProps> { }
-export = MdStar;
diff --git a/types/react-icons/lib/md/stars.d.ts b/types/react-icons/lib/md/stars.d.ts
deleted file mode 100644
index 3d30f577df..0000000000
--- a/types/react-icons/lib/md/stars.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStars extends React.Component<IconBaseProps> { }
-export = MdStars;
diff --git a/types/react-icons/lib/md/stay-current-landscape.d.ts b/types/react-icons/lib/md/stay-current-landscape.d.ts
deleted file mode 100644
index 8f141071de..0000000000
--- a/types/react-icons/lib/md/stay-current-landscape.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStayCurrentLandscape extends React.Component<IconBaseProps> { }
-export = MdStayCurrentLandscape;
diff --git a/types/react-icons/lib/md/stay-current-portrait.d.ts b/types/react-icons/lib/md/stay-current-portrait.d.ts
deleted file mode 100644
index d54460b6b1..0000000000
--- a/types/react-icons/lib/md/stay-current-portrait.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStayCurrentPortrait extends React.Component<IconBaseProps> { }
-export = MdStayCurrentPortrait;
diff --git a/types/react-icons/lib/md/stay-primary-landscape.d.ts b/types/react-icons/lib/md/stay-primary-landscape.d.ts
deleted file mode 100644
index c2259234a3..0000000000
--- a/types/react-icons/lib/md/stay-primary-landscape.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStayPrimaryLandscape extends React.Component<IconBaseProps> { }
-export = MdStayPrimaryLandscape;
diff --git a/types/react-icons/lib/md/stay-primary-portrait.d.ts b/types/react-icons/lib/md/stay-primary-portrait.d.ts
deleted file mode 100644
index be1a0d3817..0000000000
--- a/types/react-icons/lib/md/stay-primary-portrait.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStayPrimaryPortrait extends React.Component<IconBaseProps> { }
-export = MdStayPrimaryPortrait;
diff --git a/types/react-icons/lib/md/stop-screen-share.d.ts b/types/react-icons/lib/md/stop-screen-share.d.ts
deleted file mode 100644
index 0c86617ea9..0000000000
--- a/types/react-icons/lib/md/stop-screen-share.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStopScreenShare extends React.Component<IconBaseProps> { }
-export = MdStopScreenShare;
diff --git a/types/react-icons/lib/md/stop.d.ts b/types/react-icons/lib/md/stop.d.ts
deleted file mode 100644
index ea68d49805..0000000000
--- a/types/react-icons/lib/md/stop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStop extends React.Component<IconBaseProps> { }
-export = MdStop;
diff --git a/types/react-icons/lib/md/storage.d.ts b/types/react-icons/lib/md/storage.d.ts
deleted file mode 100644
index 0f4792b3d4..0000000000
--- a/types/react-icons/lib/md/storage.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStorage extends React.Component<IconBaseProps> { }
-export = MdStorage;
diff --git a/types/react-icons/lib/md/store-mall-directory.d.ts b/types/react-icons/lib/md/store-mall-directory.d.ts
deleted file mode 100644
index 2dc34f1f35..0000000000
--- a/types/react-icons/lib/md/store-mall-directory.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStoreMallDirectory extends React.Component<IconBaseProps> { }
-export = MdStoreMallDirectory;
diff --git a/types/react-icons/lib/md/store.d.ts b/types/react-icons/lib/md/store.d.ts
deleted file mode 100644
index 1d95da2946..0000000000
--- a/types/react-icons/lib/md/store.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStore extends React.Component<IconBaseProps> { }
-export = MdStore;
diff --git a/types/react-icons/lib/md/straighten.d.ts b/types/react-icons/lib/md/straighten.d.ts
deleted file mode 100644
index 2e5a378337..0000000000
--- a/types/react-icons/lib/md/straighten.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStraighten extends React.Component<IconBaseProps> { }
-export = MdStraighten;
diff --git a/types/react-icons/lib/md/streetview.d.ts b/types/react-icons/lib/md/streetview.d.ts
deleted file mode 100644
index 1a7a3b45d0..0000000000
--- a/types/react-icons/lib/md/streetview.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStreetview extends React.Component<IconBaseProps> { }
-export = MdStreetview;
diff --git a/types/react-icons/lib/md/strikethrough-s.d.ts b/types/react-icons/lib/md/strikethrough-s.d.ts
deleted file mode 100644
index 87f8a8f0ab..0000000000
--- a/types/react-icons/lib/md/strikethrough-s.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStrikethroughS extends React.Component<IconBaseProps> { }
-export = MdStrikethroughS;
diff --git a/types/react-icons/lib/md/style.d.ts b/types/react-icons/lib/md/style.d.ts
deleted file mode 100644
index 88ee608309..0000000000
--- a/types/react-icons/lib/md/style.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdStyle extends React.Component<IconBaseProps> { }
-export = MdStyle;
diff --git a/types/react-icons/lib/md/subdirectory-arrow-left.d.ts b/types/react-icons/lib/md/subdirectory-arrow-left.d.ts
deleted file mode 100644
index a286039679..0000000000
--- a/types/react-icons/lib/md/subdirectory-arrow-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSubdirectoryArrowLeft extends React.Component<IconBaseProps> { }
-export = MdSubdirectoryArrowLeft;
diff --git a/types/react-icons/lib/md/subdirectory-arrow-right.d.ts b/types/react-icons/lib/md/subdirectory-arrow-right.d.ts
deleted file mode 100644
index ffcfa27371..0000000000
--- a/types/react-icons/lib/md/subdirectory-arrow-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSubdirectoryArrowRight extends React.Component<IconBaseProps> { }
-export = MdSubdirectoryArrowRight;
diff --git a/types/react-icons/lib/md/subject.d.ts b/types/react-icons/lib/md/subject.d.ts
deleted file mode 100644
index 4afd51814a..0000000000
--- a/types/react-icons/lib/md/subject.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSubject extends React.Component<IconBaseProps> { }
-export = MdSubject;
diff --git a/types/react-icons/lib/md/subscriptions.d.ts b/types/react-icons/lib/md/subscriptions.d.ts
deleted file mode 100644
index 9859c711e1..0000000000
--- a/types/react-icons/lib/md/subscriptions.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSubscriptions extends React.Component<IconBaseProps> { }
-export = MdSubscriptions;
diff --git a/types/react-icons/lib/md/subtitles.d.ts b/types/react-icons/lib/md/subtitles.d.ts
deleted file mode 100644
index ffb83e2279..0000000000
--- a/types/react-icons/lib/md/subtitles.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSubtitles extends React.Component<IconBaseProps> { }
-export = MdSubtitles;
diff --git a/types/react-icons/lib/md/subway.d.ts b/types/react-icons/lib/md/subway.d.ts
deleted file mode 100644
index 5e42542c3a..0000000000
--- a/types/react-icons/lib/md/subway.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSubway extends React.Component<IconBaseProps> { }
-export = MdSubway;
diff --git a/types/react-icons/lib/md/supervisor-account.d.ts b/types/react-icons/lib/md/supervisor-account.d.ts
deleted file mode 100644
index 5782506380..0000000000
--- a/types/react-icons/lib/md/supervisor-account.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSupervisorAccount extends React.Component<IconBaseProps> { }
-export = MdSupervisorAccount;
diff --git a/types/react-icons/lib/md/surround-sound.d.ts b/types/react-icons/lib/md/surround-sound.d.ts
deleted file mode 100644
index 657ebe3879..0000000000
--- a/types/react-icons/lib/md/surround-sound.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSurroundSound extends React.Component<IconBaseProps> { }
-export = MdSurroundSound;
diff --git a/types/react-icons/lib/md/swap-calls.d.ts b/types/react-icons/lib/md/swap-calls.d.ts
deleted file mode 100644
index 881b0c264a..0000000000
--- a/types/react-icons/lib/md/swap-calls.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSwapCalls extends React.Component<IconBaseProps> { }
-export = MdSwapCalls;
diff --git a/types/react-icons/lib/md/swap-horiz.d.ts b/types/react-icons/lib/md/swap-horiz.d.ts
deleted file mode 100644
index e4a1771fd4..0000000000
--- a/types/react-icons/lib/md/swap-horiz.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSwapHoriz extends React.Component<IconBaseProps> { }
-export = MdSwapHoriz;
diff --git a/types/react-icons/lib/md/swap-vert.d.ts b/types/react-icons/lib/md/swap-vert.d.ts
deleted file mode 100644
index d9b0f456d9..0000000000
--- a/types/react-icons/lib/md/swap-vert.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSwapVert extends React.Component<IconBaseProps> { }
-export = MdSwapVert;
diff --git a/types/react-icons/lib/md/swap-vertical-circle.d.ts b/types/react-icons/lib/md/swap-vertical-circle.d.ts
deleted file mode 100644
index 4503920d5c..0000000000
--- a/types/react-icons/lib/md/swap-vertical-circle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSwapVerticalCircle extends React.Component<IconBaseProps> { }
-export = MdSwapVerticalCircle;
diff --git a/types/react-icons/lib/md/switch-camera.d.ts b/types/react-icons/lib/md/switch-camera.d.ts
deleted file mode 100644
index cb90ed5e99..0000000000
--- a/types/react-icons/lib/md/switch-camera.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSwitchCamera extends React.Component<IconBaseProps> { }
-export = MdSwitchCamera;
diff --git a/types/react-icons/lib/md/switch-video.d.ts b/types/react-icons/lib/md/switch-video.d.ts
deleted file mode 100644
index cdd65bb1cc..0000000000
--- a/types/react-icons/lib/md/switch-video.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSwitchVideo extends React.Component<IconBaseProps> { }
-export = MdSwitchVideo;
diff --git a/types/react-icons/lib/md/sync-disabled.d.ts b/types/react-icons/lib/md/sync-disabled.d.ts
deleted file mode 100644
index dbf6969ad0..0000000000
--- a/types/react-icons/lib/md/sync-disabled.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSyncDisabled extends React.Component<IconBaseProps> { }
-export = MdSyncDisabled;
diff --git a/types/react-icons/lib/md/sync-problem.d.ts b/types/react-icons/lib/md/sync-problem.d.ts
deleted file mode 100644
index 59f319beba..0000000000
--- a/types/react-icons/lib/md/sync-problem.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSyncProblem extends React.Component<IconBaseProps> { }
-export = MdSyncProblem;
diff --git a/types/react-icons/lib/md/sync.d.ts b/types/react-icons/lib/md/sync.d.ts
deleted file mode 100644
index a5c49d0df3..0000000000
--- a/types/react-icons/lib/md/sync.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSync extends React.Component<IconBaseProps> { }
-export = MdSync;
diff --git a/types/react-icons/lib/md/system-update-alt.d.ts b/types/react-icons/lib/md/system-update-alt.d.ts
deleted file mode 100644
index 18b532e6c3..0000000000
--- a/types/react-icons/lib/md/system-update-alt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSystemUpdateAlt extends React.Component<IconBaseProps> { }
-export = MdSystemUpdateAlt;
diff --git a/types/react-icons/lib/md/system-update.d.ts b/types/react-icons/lib/md/system-update.d.ts
deleted file mode 100644
index f969e6836b..0000000000
--- a/types/react-icons/lib/md/system-update.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdSystemUpdate extends React.Component<IconBaseProps> { }
-export = MdSystemUpdate;
diff --git a/types/react-icons/lib/md/tab-unselected.d.ts b/types/react-icons/lib/md/tab-unselected.d.ts
deleted file mode 100644
index 0b05c2debc..0000000000
--- a/types/react-icons/lib/md/tab-unselected.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTabUnselected extends React.Component<IconBaseProps> { }
-export = MdTabUnselected;
diff --git a/types/react-icons/lib/md/tab.d.ts b/types/react-icons/lib/md/tab.d.ts
deleted file mode 100644
index 789ea85b5a..0000000000
--- a/types/react-icons/lib/md/tab.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTab extends React.Component<IconBaseProps> { }
-export = MdTab;
diff --git a/types/react-icons/lib/md/tablet-android.d.ts b/types/react-icons/lib/md/tablet-android.d.ts
deleted file mode 100644
index d7bf0e19e6..0000000000
--- a/types/react-icons/lib/md/tablet-android.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTabletAndroid extends React.Component<IconBaseProps> { }
-export = MdTabletAndroid;
diff --git a/types/react-icons/lib/md/tablet-mac.d.ts b/types/react-icons/lib/md/tablet-mac.d.ts
deleted file mode 100644
index e9cb6dd950..0000000000
--- a/types/react-icons/lib/md/tablet-mac.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTabletMac extends React.Component<IconBaseProps> { }
-export = MdTabletMac;
diff --git a/types/react-icons/lib/md/tablet.d.ts b/types/react-icons/lib/md/tablet.d.ts
deleted file mode 100644
index b9cac8c14e..0000000000
--- a/types/react-icons/lib/md/tablet.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTablet extends React.Component<IconBaseProps> { }
-export = MdTablet;
diff --git a/types/react-icons/lib/md/tag-faces.d.ts b/types/react-icons/lib/md/tag-faces.d.ts
deleted file mode 100644
index 657eda9788..0000000000
--- a/types/react-icons/lib/md/tag-faces.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTagFaces extends React.Component<IconBaseProps> { }
-export = MdTagFaces;
diff --git a/types/react-icons/lib/md/tap-and-play.d.ts b/types/react-icons/lib/md/tap-and-play.d.ts
deleted file mode 100644
index 547c5676fd..0000000000
--- a/types/react-icons/lib/md/tap-and-play.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTapAndPlay extends React.Component<IconBaseProps> { }
-export = MdTapAndPlay;
diff --git a/types/react-icons/lib/md/terrain.d.ts b/types/react-icons/lib/md/terrain.d.ts
deleted file mode 100644
index faebcb3c1d..0000000000
--- a/types/react-icons/lib/md/terrain.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTerrain extends React.Component<IconBaseProps> { }
-export = MdTerrain;
diff --git a/types/react-icons/lib/md/text-fields.d.ts b/types/react-icons/lib/md/text-fields.d.ts
deleted file mode 100644
index e2f9f057b1..0000000000
--- a/types/react-icons/lib/md/text-fields.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTextFields extends React.Component<IconBaseProps> { }
-export = MdTextFields;
diff --git a/types/react-icons/lib/md/text-format.d.ts b/types/react-icons/lib/md/text-format.d.ts
deleted file mode 100644
index 47ed038438..0000000000
--- a/types/react-icons/lib/md/text-format.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTextFormat extends React.Component<IconBaseProps> { }
-export = MdTextFormat;
diff --git a/types/react-icons/lib/md/textsms.d.ts b/types/react-icons/lib/md/textsms.d.ts
deleted file mode 100644
index 98e6a9b769..0000000000
--- a/types/react-icons/lib/md/textsms.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTextsms extends React.Component<IconBaseProps> { }
-export = MdTextsms;
diff --git a/types/react-icons/lib/md/texture.d.ts b/types/react-icons/lib/md/texture.d.ts
deleted file mode 100644
index c15e591c84..0000000000
--- a/types/react-icons/lib/md/texture.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTexture extends React.Component<IconBaseProps> { }
-export = MdTexture;
diff --git a/types/react-icons/lib/md/theaters.d.ts b/types/react-icons/lib/md/theaters.d.ts
deleted file mode 100644
index c604995528..0000000000
--- a/types/react-icons/lib/md/theaters.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTheaters extends React.Component<IconBaseProps> { }
-export = MdTheaters;
diff --git a/types/react-icons/lib/md/thumb-down.d.ts b/types/react-icons/lib/md/thumb-down.d.ts
deleted file mode 100644
index fc08d83539..0000000000
--- a/types/react-icons/lib/md/thumb-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdThumbDown extends React.Component<IconBaseProps> { }
-export = MdThumbDown;
diff --git a/types/react-icons/lib/md/thumb-up.d.ts b/types/react-icons/lib/md/thumb-up.d.ts
deleted file mode 100644
index 5057fd1814..0000000000
--- a/types/react-icons/lib/md/thumb-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdThumbUp extends React.Component<IconBaseProps> { }
-export = MdThumbUp;
diff --git a/types/react-icons/lib/md/thumbs-up-down.d.ts b/types/react-icons/lib/md/thumbs-up-down.d.ts
deleted file mode 100644
index a445f15a80..0000000000
--- a/types/react-icons/lib/md/thumbs-up-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdThumbsUpDown extends React.Component<IconBaseProps> { }
-export = MdThumbsUpDown;
diff --git a/types/react-icons/lib/md/time-to-leave.d.ts b/types/react-icons/lib/md/time-to-leave.d.ts
deleted file mode 100644
index 50743c05d3..0000000000
--- a/types/react-icons/lib/md/time-to-leave.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTimeToLeave extends React.Component<IconBaseProps> { }
-export = MdTimeToLeave;
diff --git a/types/react-icons/lib/md/timelapse.d.ts b/types/react-icons/lib/md/timelapse.d.ts
deleted file mode 100644
index e9b0763ffd..0000000000
--- a/types/react-icons/lib/md/timelapse.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTimelapse extends React.Component<IconBaseProps> { }
-export = MdTimelapse;
diff --git a/types/react-icons/lib/md/timeline.d.ts b/types/react-icons/lib/md/timeline.d.ts
deleted file mode 100644
index ee9e8b0166..0000000000
--- a/types/react-icons/lib/md/timeline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTimeline extends React.Component<IconBaseProps> { }
-export = MdTimeline;
diff --git a/types/react-icons/lib/md/timer-10.d.ts b/types/react-icons/lib/md/timer-10.d.ts
deleted file mode 100644
index 2e31fb395a..0000000000
--- a/types/react-icons/lib/md/timer-10.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTimer10 extends React.Component<IconBaseProps> { }
-export = MdTimer10;
diff --git a/types/react-icons/lib/md/timer-3.d.ts b/types/react-icons/lib/md/timer-3.d.ts
deleted file mode 100644
index 8c51e54da2..0000000000
--- a/types/react-icons/lib/md/timer-3.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTimer3 extends React.Component<IconBaseProps> { }
-export = MdTimer3;
diff --git a/types/react-icons/lib/md/timer-off.d.ts b/types/react-icons/lib/md/timer-off.d.ts
deleted file mode 100644
index 1a42f31d52..0000000000
--- a/types/react-icons/lib/md/timer-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTimerOff extends React.Component<IconBaseProps> { }
-export = MdTimerOff;
diff --git a/types/react-icons/lib/md/timer.d.ts b/types/react-icons/lib/md/timer.d.ts
deleted file mode 100644
index d3afd39d90..0000000000
--- a/types/react-icons/lib/md/timer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTimer extends React.Component<IconBaseProps> { }
-export = MdTimer;
diff --git a/types/react-icons/lib/md/title.d.ts b/types/react-icons/lib/md/title.d.ts
deleted file mode 100644
index 16992b0ee7..0000000000
--- a/types/react-icons/lib/md/title.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTitle extends React.Component<IconBaseProps> { }
-export = MdTitle;
diff --git a/types/react-icons/lib/md/toc.d.ts b/types/react-icons/lib/md/toc.d.ts
deleted file mode 100644
index 1e1f96bd5d..0000000000
--- a/types/react-icons/lib/md/toc.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdToc extends React.Component<IconBaseProps> { }
-export = MdToc;
diff --git a/types/react-icons/lib/md/today.d.ts b/types/react-icons/lib/md/today.d.ts
deleted file mode 100644
index 8f96a6812c..0000000000
--- a/types/react-icons/lib/md/today.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdToday extends React.Component<IconBaseProps> { }
-export = MdToday;
diff --git a/types/react-icons/lib/md/toll.d.ts b/types/react-icons/lib/md/toll.d.ts
deleted file mode 100644
index a37073a21e..0000000000
--- a/types/react-icons/lib/md/toll.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdToll extends React.Component<IconBaseProps> { }
-export = MdToll;
diff --git a/types/react-icons/lib/md/tonality.d.ts b/types/react-icons/lib/md/tonality.d.ts
deleted file mode 100644
index e685396c61..0000000000
--- a/types/react-icons/lib/md/tonality.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTonality extends React.Component<IconBaseProps> { }
-export = MdTonality;
diff --git a/types/react-icons/lib/md/touch-app.d.ts b/types/react-icons/lib/md/touch-app.d.ts
deleted file mode 100644
index 76f018ca9a..0000000000
--- a/types/react-icons/lib/md/touch-app.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTouchApp extends React.Component<IconBaseProps> { }
-export = MdTouchApp;
diff --git a/types/react-icons/lib/md/toys.d.ts b/types/react-icons/lib/md/toys.d.ts
deleted file mode 100644
index 504755d0a8..0000000000
--- a/types/react-icons/lib/md/toys.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdToys extends React.Component<IconBaseProps> { }
-export = MdToys;
diff --git a/types/react-icons/lib/md/track-changes.d.ts b/types/react-icons/lib/md/track-changes.d.ts
deleted file mode 100644
index a7c1b75a20..0000000000
--- a/types/react-icons/lib/md/track-changes.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTrackChanges extends React.Component<IconBaseProps> { }
-export = MdTrackChanges;
diff --git a/types/react-icons/lib/md/traffic.d.ts b/types/react-icons/lib/md/traffic.d.ts
deleted file mode 100644
index b3a0a6a3a5..0000000000
--- a/types/react-icons/lib/md/traffic.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTraffic extends React.Component<IconBaseProps> { }
-export = MdTraffic;
diff --git a/types/react-icons/lib/md/train.d.ts b/types/react-icons/lib/md/train.d.ts
deleted file mode 100644
index d96eb39965..0000000000
--- a/types/react-icons/lib/md/train.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTrain extends React.Component<IconBaseProps> { }
-export = MdTrain;
diff --git a/types/react-icons/lib/md/tram.d.ts b/types/react-icons/lib/md/tram.d.ts
deleted file mode 100644
index c3a2eec3c2..0000000000
--- a/types/react-icons/lib/md/tram.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTram extends React.Component<IconBaseProps> { }
-export = MdTram;
diff --git a/types/react-icons/lib/md/transfer-within-a-station.d.ts b/types/react-icons/lib/md/transfer-within-a-station.d.ts
deleted file mode 100644
index 2519aeafbc..0000000000
--- a/types/react-icons/lib/md/transfer-within-a-station.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTransferWithinAStation extends React.Component<IconBaseProps> { }
-export = MdTransferWithinAStation;
diff --git a/types/react-icons/lib/md/transform.d.ts b/types/react-icons/lib/md/transform.d.ts
deleted file mode 100644
index 9f9278064e..0000000000
--- a/types/react-icons/lib/md/transform.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTransform extends React.Component<IconBaseProps> { }
-export = MdTransform;
diff --git a/types/react-icons/lib/md/translate.d.ts b/types/react-icons/lib/md/translate.d.ts
deleted file mode 100644
index cc70c04db5..0000000000
--- a/types/react-icons/lib/md/translate.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTranslate extends React.Component<IconBaseProps> { }
-export = MdTranslate;
diff --git a/types/react-icons/lib/md/trending-down.d.ts b/types/react-icons/lib/md/trending-down.d.ts
deleted file mode 100644
index a431260c06..0000000000
--- a/types/react-icons/lib/md/trending-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTrendingDown extends React.Component<IconBaseProps> { }
-export = MdTrendingDown;
diff --git a/types/react-icons/lib/md/trending-flat.d.ts b/types/react-icons/lib/md/trending-flat.d.ts
deleted file mode 100644
index f7539405ae..0000000000
--- a/types/react-icons/lib/md/trending-flat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTrendingFlat extends React.Component<IconBaseProps> { }
-export = MdTrendingFlat;
diff --git a/types/react-icons/lib/md/trending-neutral.d.ts b/types/react-icons/lib/md/trending-neutral.d.ts
deleted file mode 100644
index ca17f924e5..0000000000
--- a/types/react-icons/lib/md/trending-neutral.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTrendingNeutral extends React.Component<IconBaseProps> { }
-export = MdTrendingNeutral;
diff --git a/types/react-icons/lib/md/trending-up.d.ts b/types/react-icons/lib/md/trending-up.d.ts
deleted file mode 100644
index 18ea6f8fdd..0000000000
--- a/types/react-icons/lib/md/trending-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTrendingUp extends React.Component<IconBaseProps> { }
-export = MdTrendingUp;
diff --git a/types/react-icons/lib/md/tune.d.ts b/types/react-icons/lib/md/tune.d.ts
deleted file mode 100644
index ab850a0554..0000000000
--- a/types/react-icons/lib/md/tune.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTune extends React.Component<IconBaseProps> { }
-export = MdTune;
diff --git a/types/react-icons/lib/md/turned-in-not.d.ts b/types/react-icons/lib/md/turned-in-not.d.ts
deleted file mode 100644
index 6a9f029393..0000000000
--- a/types/react-icons/lib/md/turned-in-not.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTurnedInNot extends React.Component<IconBaseProps> { }
-export = MdTurnedInNot;
diff --git a/types/react-icons/lib/md/turned-in.d.ts b/types/react-icons/lib/md/turned-in.d.ts
deleted file mode 100644
index 7e1f6ff237..0000000000
--- a/types/react-icons/lib/md/turned-in.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTurnedIn extends React.Component<IconBaseProps> { }
-export = MdTurnedIn;
diff --git a/types/react-icons/lib/md/tv.d.ts b/types/react-icons/lib/md/tv.d.ts
deleted file mode 100644
index 6f6e2adebf..0000000000
--- a/types/react-icons/lib/md/tv.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdTv extends React.Component<IconBaseProps> { }
-export = MdTv;
diff --git a/types/react-icons/lib/md/unarchive.d.ts b/types/react-icons/lib/md/unarchive.d.ts
deleted file mode 100644
index f165b61f65..0000000000
--- a/types/react-icons/lib/md/unarchive.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdUnarchive extends React.Component<IconBaseProps> { }
-export = MdUnarchive;
diff --git a/types/react-icons/lib/md/undo.d.ts b/types/react-icons/lib/md/undo.d.ts
deleted file mode 100644
index a72def4605..0000000000
--- a/types/react-icons/lib/md/undo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdUndo extends React.Component<IconBaseProps> { }
-export = MdUndo;
diff --git a/types/react-icons/lib/md/unfold-less.d.ts b/types/react-icons/lib/md/unfold-less.d.ts
deleted file mode 100644
index 4c2ab8a745..0000000000
--- a/types/react-icons/lib/md/unfold-less.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdUnfoldLess extends React.Component<IconBaseProps> { }
-export = MdUnfoldLess;
diff --git a/types/react-icons/lib/md/unfold-more.d.ts b/types/react-icons/lib/md/unfold-more.d.ts
deleted file mode 100644
index b776d661f4..0000000000
--- a/types/react-icons/lib/md/unfold-more.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdUnfoldMore extends React.Component<IconBaseProps> { }
-export = MdUnfoldMore;
diff --git a/types/react-icons/lib/md/update.d.ts b/types/react-icons/lib/md/update.d.ts
deleted file mode 100644
index 1a2aa86383..0000000000
--- a/types/react-icons/lib/md/update.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdUpdate extends React.Component<IconBaseProps> { }
-export = MdUpdate;
diff --git a/types/react-icons/lib/md/usb.d.ts b/types/react-icons/lib/md/usb.d.ts
deleted file mode 100644
index 0fd6160e84..0000000000
--- a/types/react-icons/lib/md/usb.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdUsb extends React.Component<IconBaseProps> { }
-export = MdUsb;
diff --git a/types/react-icons/lib/md/verified-user.d.ts b/types/react-icons/lib/md/verified-user.d.ts
deleted file mode 100644
index 59252e57a8..0000000000
--- a/types/react-icons/lib/md/verified-user.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVerifiedUser extends React.Component<IconBaseProps> { }
-export = MdVerifiedUser;
diff --git a/types/react-icons/lib/md/vertical-align-bottom.d.ts b/types/react-icons/lib/md/vertical-align-bottom.d.ts
deleted file mode 100644
index 12c3ec8578..0000000000
--- a/types/react-icons/lib/md/vertical-align-bottom.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVerticalAlignBottom extends React.Component<IconBaseProps> { }
-export = MdVerticalAlignBottom;
diff --git a/types/react-icons/lib/md/vertical-align-center.d.ts b/types/react-icons/lib/md/vertical-align-center.d.ts
deleted file mode 100644
index 82a699826e..0000000000
--- a/types/react-icons/lib/md/vertical-align-center.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVerticalAlignCenter extends React.Component<IconBaseProps> { }
-export = MdVerticalAlignCenter;
diff --git a/types/react-icons/lib/md/vertical-align-top.d.ts b/types/react-icons/lib/md/vertical-align-top.d.ts
deleted file mode 100644
index db6f9b91a0..0000000000
--- a/types/react-icons/lib/md/vertical-align-top.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVerticalAlignTop extends React.Component<IconBaseProps> { }
-export = MdVerticalAlignTop;
diff --git a/types/react-icons/lib/md/vibration.d.ts b/types/react-icons/lib/md/vibration.d.ts
deleted file mode 100644
index f2894c8316..0000000000
--- a/types/react-icons/lib/md/vibration.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVibration extends React.Component<IconBaseProps> { }
-export = MdVibration;
diff --git a/types/react-icons/lib/md/video-call.d.ts b/types/react-icons/lib/md/video-call.d.ts
deleted file mode 100644
index 5db72a0980..0000000000
--- a/types/react-icons/lib/md/video-call.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVideoCall extends React.Component<IconBaseProps> { }
-export = MdVideoCall;
diff --git a/types/react-icons/lib/md/video-collection.d.ts b/types/react-icons/lib/md/video-collection.d.ts
deleted file mode 100644
index 0606a4604a..0000000000
--- a/types/react-icons/lib/md/video-collection.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVideoCollection extends React.Component<IconBaseProps> { }
-export = MdVideoCollection;
diff --git a/types/react-icons/lib/md/video-label.d.ts b/types/react-icons/lib/md/video-label.d.ts
deleted file mode 100644
index 0a2cad4961..0000000000
--- a/types/react-icons/lib/md/video-label.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVideoLabel extends React.Component<IconBaseProps> { }
-export = MdVideoLabel;
diff --git a/types/react-icons/lib/md/video-library.d.ts b/types/react-icons/lib/md/video-library.d.ts
deleted file mode 100644
index f862e3efb5..0000000000
--- a/types/react-icons/lib/md/video-library.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVideoLibrary extends React.Component<IconBaseProps> { }
-export = MdVideoLibrary;
diff --git a/types/react-icons/lib/md/videocam-off.d.ts b/types/react-icons/lib/md/videocam-off.d.ts
deleted file mode 100644
index fe0fb34a6c..0000000000
--- a/types/react-icons/lib/md/videocam-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVideocamOff extends React.Component<IconBaseProps> { }
-export = MdVideocamOff;
diff --git a/types/react-icons/lib/md/videocam.d.ts b/types/react-icons/lib/md/videocam.d.ts
deleted file mode 100644
index 01a77ed2cf..0000000000
--- a/types/react-icons/lib/md/videocam.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVideocam extends React.Component<IconBaseProps> { }
-export = MdVideocam;
diff --git a/types/react-icons/lib/md/videogame-asset.d.ts b/types/react-icons/lib/md/videogame-asset.d.ts
deleted file mode 100644
index e548061de8..0000000000
--- a/types/react-icons/lib/md/videogame-asset.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVideogameAsset extends React.Component<IconBaseProps> { }
-export = MdVideogameAsset;
diff --git a/types/react-icons/lib/md/view-agenda.d.ts b/types/react-icons/lib/md/view-agenda.d.ts
deleted file mode 100644
index 53fac822a9..0000000000
--- a/types/react-icons/lib/md/view-agenda.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdViewAgenda extends React.Component<IconBaseProps> { }
-export = MdViewAgenda;
diff --git a/types/react-icons/lib/md/view-array.d.ts b/types/react-icons/lib/md/view-array.d.ts
deleted file mode 100644
index 61b4beecbf..0000000000
--- a/types/react-icons/lib/md/view-array.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdViewArray extends React.Component<IconBaseProps> { }
-export = MdViewArray;
diff --git a/types/react-icons/lib/md/view-carousel.d.ts b/types/react-icons/lib/md/view-carousel.d.ts
deleted file mode 100644
index 20a02bbfb8..0000000000
--- a/types/react-icons/lib/md/view-carousel.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdViewCarousel extends React.Component<IconBaseProps> { }
-export = MdViewCarousel;
diff --git a/types/react-icons/lib/md/view-column.d.ts b/types/react-icons/lib/md/view-column.d.ts
deleted file mode 100644
index fbaa21ebf0..0000000000
--- a/types/react-icons/lib/md/view-column.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdViewColumn extends React.Component<IconBaseProps> { }
-export = MdViewColumn;
diff --git a/types/react-icons/lib/md/view-comfortable.d.ts b/types/react-icons/lib/md/view-comfortable.d.ts
deleted file mode 100644
index 8181bba3c7..0000000000
--- a/types/react-icons/lib/md/view-comfortable.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdViewComfortable extends React.Component<IconBaseProps> { }
-export = MdViewComfortable;
diff --git a/types/react-icons/lib/md/view-comfy.d.ts b/types/react-icons/lib/md/view-comfy.d.ts
deleted file mode 100644
index 4157bc557e..0000000000
--- a/types/react-icons/lib/md/view-comfy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdViewComfy extends React.Component<IconBaseProps> { }
-export = MdViewComfy;
diff --git a/types/react-icons/lib/md/view-compact.d.ts b/types/react-icons/lib/md/view-compact.d.ts
deleted file mode 100644
index 6f4e159c9d..0000000000
--- a/types/react-icons/lib/md/view-compact.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdViewCompact extends React.Component<IconBaseProps> { }
-export = MdViewCompact;
diff --git a/types/react-icons/lib/md/view-day.d.ts b/types/react-icons/lib/md/view-day.d.ts
deleted file mode 100644
index 934a0b4e69..0000000000
--- a/types/react-icons/lib/md/view-day.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdViewDay extends React.Component<IconBaseProps> { }
-export = MdViewDay;
diff --git a/types/react-icons/lib/md/view-headline.d.ts b/types/react-icons/lib/md/view-headline.d.ts
deleted file mode 100644
index a06b4281ac..0000000000
--- a/types/react-icons/lib/md/view-headline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdViewHeadline extends React.Component<IconBaseProps> { }
-export = MdViewHeadline;
diff --git a/types/react-icons/lib/md/view-list.d.ts b/types/react-icons/lib/md/view-list.d.ts
deleted file mode 100644
index e082fed3a3..0000000000
--- a/types/react-icons/lib/md/view-list.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdViewList extends React.Component<IconBaseProps> { }
-export = MdViewList;
diff --git a/types/react-icons/lib/md/view-module.d.ts b/types/react-icons/lib/md/view-module.d.ts
deleted file mode 100644
index c506509ece..0000000000
--- a/types/react-icons/lib/md/view-module.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdViewModule extends React.Component<IconBaseProps> { }
-export = MdViewModule;
diff --git a/types/react-icons/lib/md/view-quilt.d.ts b/types/react-icons/lib/md/view-quilt.d.ts
deleted file mode 100644
index 164d09766c..0000000000
--- a/types/react-icons/lib/md/view-quilt.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdViewQuilt extends React.Component<IconBaseProps> { }
-export = MdViewQuilt;
diff --git a/types/react-icons/lib/md/view-stream.d.ts b/types/react-icons/lib/md/view-stream.d.ts
deleted file mode 100644
index 8475058133..0000000000
--- a/types/react-icons/lib/md/view-stream.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdViewStream extends React.Component<IconBaseProps> { }
-export = MdViewStream;
diff --git a/types/react-icons/lib/md/view-week.d.ts b/types/react-icons/lib/md/view-week.d.ts
deleted file mode 100644
index 5841c02b24..0000000000
--- a/types/react-icons/lib/md/view-week.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdViewWeek extends React.Component<IconBaseProps> { }
-export = MdViewWeek;
diff --git a/types/react-icons/lib/md/vignette.d.ts b/types/react-icons/lib/md/vignette.d.ts
deleted file mode 100644
index 68828b9c4a..0000000000
--- a/types/react-icons/lib/md/vignette.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVignette extends React.Component<IconBaseProps> { }
-export = MdVignette;
diff --git a/types/react-icons/lib/md/visibility-off.d.ts b/types/react-icons/lib/md/visibility-off.d.ts
deleted file mode 100644
index 264ae51949..0000000000
--- a/types/react-icons/lib/md/visibility-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVisibilityOff extends React.Component<IconBaseProps> { }
-export = MdVisibilityOff;
diff --git a/types/react-icons/lib/md/visibility.d.ts b/types/react-icons/lib/md/visibility.d.ts
deleted file mode 100644
index b264e21de9..0000000000
--- a/types/react-icons/lib/md/visibility.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVisibility extends React.Component<IconBaseProps> { }
-export = MdVisibility;
diff --git a/types/react-icons/lib/md/voice-chat.d.ts b/types/react-icons/lib/md/voice-chat.d.ts
deleted file mode 100644
index 5a734456a1..0000000000
--- a/types/react-icons/lib/md/voice-chat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVoiceChat extends React.Component<IconBaseProps> { }
-export = MdVoiceChat;
diff --git a/types/react-icons/lib/md/voicemail.d.ts b/types/react-icons/lib/md/voicemail.d.ts
deleted file mode 100644
index b91bb52445..0000000000
--- a/types/react-icons/lib/md/voicemail.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVoicemail extends React.Component<IconBaseProps> { }
-export = MdVoicemail;
diff --git a/types/react-icons/lib/md/volume-down.d.ts b/types/react-icons/lib/md/volume-down.d.ts
deleted file mode 100644
index e0acee5522..0000000000
--- a/types/react-icons/lib/md/volume-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVolumeDown extends React.Component<IconBaseProps> { }
-export = MdVolumeDown;
diff --git a/types/react-icons/lib/md/volume-mute.d.ts b/types/react-icons/lib/md/volume-mute.d.ts
deleted file mode 100644
index 9baa94e9d3..0000000000
--- a/types/react-icons/lib/md/volume-mute.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVolumeMute extends React.Component<IconBaseProps> { }
-export = MdVolumeMute;
diff --git a/types/react-icons/lib/md/volume-off.d.ts b/types/react-icons/lib/md/volume-off.d.ts
deleted file mode 100644
index 91482e854b..0000000000
--- a/types/react-icons/lib/md/volume-off.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVolumeOff extends React.Component<IconBaseProps> { }
-export = MdVolumeOff;
diff --git a/types/react-icons/lib/md/volume-up.d.ts b/types/react-icons/lib/md/volume-up.d.ts
deleted file mode 100644
index fae49fd042..0000000000
--- a/types/react-icons/lib/md/volume-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVolumeUp extends React.Component<IconBaseProps> { }
-export = MdVolumeUp;
diff --git a/types/react-icons/lib/md/vpn-key.d.ts b/types/react-icons/lib/md/vpn-key.d.ts
deleted file mode 100644
index aafd41a6b4..0000000000
--- a/types/react-icons/lib/md/vpn-key.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVpnKey extends React.Component<IconBaseProps> { }
-export = MdVpnKey;
diff --git a/types/react-icons/lib/md/vpn-lock.d.ts b/types/react-icons/lib/md/vpn-lock.d.ts
deleted file mode 100644
index 5495b04cd7..0000000000
--- a/types/react-icons/lib/md/vpn-lock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdVpnLock extends React.Component<IconBaseProps> { }
-export = MdVpnLock;
diff --git a/types/react-icons/lib/md/wallpaper.d.ts b/types/react-icons/lib/md/wallpaper.d.ts
deleted file mode 100644
index 66d579f3ee..0000000000
--- a/types/react-icons/lib/md/wallpaper.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWallpaper extends React.Component<IconBaseProps> { }
-export = MdWallpaper;
diff --git a/types/react-icons/lib/md/warning.d.ts b/types/react-icons/lib/md/warning.d.ts
deleted file mode 100644
index a8b475203d..0000000000
--- a/types/react-icons/lib/md/warning.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWarning extends React.Component<IconBaseProps> { }
-export = MdWarning;
diff --git a/types/react-icons/lib/md/watch-later.d.ts b/types/react-icons/lib/md/watch-later.d.ts
deleted file mode 100644
index 21a18dda02..0000000000
--- a/types/react-icons/lib/md/watch-later.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWatchLater extends React.Component<IconBaseProps> { }
-export = MdWatchLater;
diff --git a/types/react-icons/lib/md/watch.d.ts b/types/react-icons/lib/md/watch.d.ts
deleted file mode 100644
index 291523e27c..0000000000
--- a/types/react-icons/lib/md/watch.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWatch extends React.Component<IconBaseProps> { }
-export = MdWatch;
diff --git a/types/react-icons/lib/md/wb-auto.d.ts b/types/react-icons/lib/md/wb-auto.d.ts
deleted file mode 100644
index 6a04f806fa..0000000000
--- a/types/react-icons/lib/md/wb-auto.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWbAuto extends React.Component<IconBaseProps> { }
-export = MdWbAuto;
diff --git a/types/react-icons/lib/md/wb-cloudy.d.ts b/types/react-icons/lib/md/wb-cloudy.d.ts
deleted file mode 100644
index 864fc65090..0000000000
--- a/types/react-icons/lib/md/wb-cloudy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWbCloudy extends React.Component<IconBaseProps> { }
-export = MdWbCloudy;
diff --git a/types/react-icons/lib/md/wb-incandescent.d.ts b/types/react-icons/lib/md/wb-incandescent.d.ts
deleted file mode 100644
index 05fbebfcbb..0000000000
--- a/types/react-icons/lib/md/wb-incandescent.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWbIncandescent extends React.Component<IconBaseProps> { }
-export = MdWbIncandescent;
diff --git a/types/react-icons/lib/md/wb-iridescent.d.ts b/types/react-icons/lib/md/wb-iridescent.d.ts
deleted file mode 100644
index ec599b0fc4..0000000000
--- a/types/react-icons/lib/md/wb-iridescent.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWbIridescent extends React.Component<IconBaseProps> { }
-export = MdWbIridescent;
diff --git a/types/react-icons/lib/md/wb-sunny.d.ts b/types/react-icons/lib/md/wb-sunny.d.ts
deleted file mode 100644
index 14d7d0c115..0000000000
--- a/types/react-icons/lib/md/wb-sunny.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWbSunny extends React.Component<IconBaseProps> { }
-export = MdWbSunny;
diff --git a/types/react-icons/lib/md/wc.d.ts b/types/react-icons/lib/md/wc.d.ts
deleted file mode 100644
index acc9160928..0000000000
--- a/types/react-icons/lib/md/wc.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWc extends React.Component<IconBaseProps> { }
-export = MdWc;
diff --git a/types/react-icons/lib/md/web-asset.d.ts b/types/react-icons/lib/md/web-asset.d.ts
deleted file mode 100644
index 3296ddb2f3..0000000000
--- a/types/react-icons/lib/md/web-asset.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWebAsset extends React.Component<IconBaseProps> { }
-export = MdWebAsset;
diff --git a/types/react-icons/lib/md/web.d.ts b/types/react-icons/lib/md/web.d.ts
deleted file mode 100644
index 93fc4bf2af..0000000000
--- a/types/react-icons/lib/md/web.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWeb extends React.Component<IconBaseProps> { }
-export = MdWeb;
diff --git a/types/react-icons/lib/md/weekend.d.ts b/types/react-icons/lib/md/weekend.d.ts
deleted file mode 100644
index 1e93ea3441..0000000000
--- a/types/react-icons/lib/md/weekend.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWeekend extends React.Component<IconBaseProps> { }
-export = MdWeekend;
diff --git a/types/react-icons/lib/md/whatshot.d.ts b/types/react-icons/lib/md/whatshot.d.ts
deleted file mode 100644
index 8e520abd52..0000000000
--- a/types/react-icons/lib/md/whatshot.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWhatshot extends React.Component<IconBaseProps> { }
-export = MdWhatshot;
diff --git a/types/react-icons/lib/md/widgets.d.ts b/types/react-icons/lib/md/widgets.d.ts
deleted file mode 100644
index b45a27f5ba..0000000000
--- a/types/react-icons/lib/md/widgets.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWidgets extends React.Component<IconBaseProps> { }
-export = MdWidgets;
diff --git a/types/react-icons/lib/md/wifi-lock.d.ts b/types/react-icons/lib/md/wifi-lock.d.ts
deleted file mode 100644
index ed1338f365..0000000000
--- a/types/react-icons/lib/md/wifi-lock.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWifiLock extends React.Component<IconBaseProps> { }
-export = MdWifiLock;
diff --git a/types/react-icons/lib/md/wifi-tethering.d.ts b/types/react-icons/lib/md/wifi-tethering.d.ts
deleted file mode 100644
index 8757a657b7..0000000000
--- a/types/react-icons/lib/md/wifi-tethering.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWifiTethering extends React.Component<IconBaseProps> { }
-export = MdWifiTethering;
diff --git a/types/react-icons/lib/md/wifi.d.ts b/types/react-icons/lib/md/wifi.d.ts
deleted file mode 100644
index 2e5f681b39..0000000000
--- a/types/react-icons/lib/md/wifi.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWifi extends React.Component<IconBaseProps> { }
-export = MdWifi;
diff --git a/types/react-icons/lib/md/work.d.ts b/types/react-icons/lib/md/work.d.ts
deleted file mode 100644
index af2a4e42e5..0000000000
--- a/types/react-icons/lib/md/work.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWork extends React.Component<IconBaseProps> { }
-export = MdWork;
diff --git a/types/react-icons/lib/md/wrap-text.d.ts b/types/react-icons/lib/md/wrap-text.d.ts
deleted file mode 100644
index bc2554bf0e..0000000000
--- a/types/react-icons/lib/md/wrap-text.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdWrapText extends React.Component<IconBaseProps> { }
-export = MdWrapText;
diff --git a/types/react-icons/lib/md/youtube-searched-for.d.ts b/types/react-icons/lib/md/youtube-searched-for.d.ts
deleted file mode 100644
index 05c2c2c706..0000000000
--- a/types/react-icons/lib/md/youtube-searched-for.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdYoutubeSearchedFor extends React.Component<IconBaseProps> { }
-export = MdYoutubeSearchedFor;
diff --git a/types/react-icons/lib/md/zoom-in.d.ts b/types/react-icons/lib/md/zoom-in.d.ts
deleted file mode 100644
index 2bba2417c0..0000000000
--- a/types/react-icons/lib/md/zoom-in.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdZoomIn extends React.Component<IconBaseProps> { }
-export = MdZoomIn;
diff --git a/types/react-icons/lib/md/zoom-out-map.d.ts b/types/react-icons/lib/md/zoom-out-map.d.ts
deleted file mode 100644
index 4b79de0d14..0000000000
--- a/types/react-icons/lib/md/zoom-out-map.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdZoomOutMap extends React.Component<IconBaseProps> { }
-export = MdZoomOutMap;
diff --git a/types/react-icons/lib/md/zoom-out.d.ts b/types/react-icons/lib/md/zoom-out.d.ts
deleted file mode 100644
index 630db0d75c..0000000000
--- a/types/react-icons/lib/md/zoom-out.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class MdZoomOut extends React.Component<IconBaseProps> { }
-export = MdZoomOut;
diff --git a/types/react-icons/lib/ti/adjust-brightness.d.ts b/types/react-icons/lib/ti/adjust-brightness.d.ts
deleted file mode 100644
index 4f581f784b..0000000000
--- a/types/react-icons/lib/ti/adjust-brightness.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiAdjustBrightness extends React.Component<IconBaseProps> { }
-export = TiAdjustBrightness;
diff --git a/types/react-icons/lib/ti/adjust-contrast.d.ts b/types/react-icons/lib/ti/adjust-contrast.d.ts
deleted file mode 100644
index e85f43a11f..0000000000
--- a/types/react-icons/lib/ti/adjust-contrast.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiAdjustContrast extends React.Component<IconBaseProps> { }
-export = TiAdjustContrast;
diff --git a/types/react-icons/lib/ti/anchor-outline.d.ts b/types/react-icons/lib/ti/anchor-outline.d.ts
deleted file mode 100644
index fb0b412883..0000000000
--- a/types/react-icons/lib/ti/anchor-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiAnchorOutline extends React.Component<IconBaseProps> { }
-export = TiAnchorOutline;
diff --git a/types/react-icons/lib/ti/anchor.d.ts b/types/react-icons/lib/ti/anchor.d.ts
deleted file mode 100644
index ac2d26168c..0000000000
--- a/types/react-icons/lib/ti/anchor.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiAnchor extends React.Component<IconBaseProps> { }
-export = TiAnchor;
diff --git a/types/react-icons/lib/ti/archive.d.ts b/types/react-icons/lib/ti/archive.d.ts
deleted file mode 100644
index 1019b6d92a..0000000000
--- a/types/react-icons/lib/ti/archive.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArchive extends React.Component<IconBaseProps> { }
-export = TiArchive;
diff --git a/types/react-icons/lib/ti/arrow-back-outline.d.ts b/types/react-icons/lib/ti/arrow-back-outline.d.ts
deleted file mode 100644
index 6f675bcea3..0000000000
--- a/types/react-icons/lib/ti/arrow-back-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowBackOutline extends React.Component<IconBaseProps> { }
-export = TiArrowBackOutline;
diff --git a/types/react-icons/lib/ti/arrow-back.d.ts b/types/react-icons/lib/ti/arrow-back.d.ts
deleted file mode 100644
index 8611134a00..0000000000
--- a/types/react-icons/lib/ti/arrow-back.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowBack extends React.Component<IconBaseProps> { }
-export = TiArrowBack;
diff --git a/types/react-icons/lib/ti/arrow-down-outline.d.ts b/types/react-icons/lib/ti/arrow-down-outline.d.ts
deleted file mode 100644
index a86d68da84..0000000000
--- a/types/react-icons/lib/ti/arrow-down-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowDownOutline extends React.Component<IconBaseProps> { }
-export = TiArrowDownOutline;
diff --git a/types/react-icons/lib/ti/arrow-down-thick.d.ts b/types/react-icons/lib/ti/arrow-down-thick.d.ts
deleted file mode 100644
index e7a17aafb5..0000000000
--- a/types/react-icons/lib/ti/arrow-down-thick.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowDownThick extends React.Component<IconBaseProps> { }
-export = TiArrowDownThick;
diff --git a/types/react-icons/lib/ti/arrow-down.d.ts b/types/react-icons/lib/ti/arrow-down.d.ts
deleted file mode 100644
index 58a7f75bc3..0000000000
--- a/types/react-icons/lib/ti/arrow-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowDown extends React.Component<IconBaseProps> { }
-export = TiArrowDown;
diff --git a/types/react-icons/lib/ti/arrow-forward-outline.d.ts b/types/react-icons/lib/ti/arrow-forward-outline.d.ts
deleted file mode 100644
index 6075344eba..0000000000
--- a/types/react-icons/lib/ti/arrow-forward-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowForwardOutline extends React.Component<IconBaseProps> { }
-export = TiArrowForwardOutline;
diff --git a/types/react-icons/lib/ti/arrow-forward.d.ts b/types/react-icons/lib/ti/arrow-forward.d.ts
deleted file mode 100644
index f2729f5d2c..0000000000
--- a/types/react-icons/lib/ti/arrow-forward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowForward extends React.Component<IconBaseProps> { }
-export = TiArrowForward;
diff --git a/types/react-icons/lib/ti/arrow-left-outline.d.ts b/types/react-icons/lib/ti/arrow-left-outline.d.ts
deleted file mode 100644
index 033e464649..0000000000
--- a/types/react-icons/lib/ti/arrow-left-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowLeftOutline extends React.Component<IconBaseProps> { }
-export = TiArrowLeftOutline;
diff --git a/types/react-icons/lib/ti/arrow-left-thick.d.ts b/types/react-icons/lib/ti/arrow-left-thick.d.ts
deleted file mode 100644
index e3a016cb1f..0000000000
--- a/types/react-icons/lib/ti/arrow-left-thick.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowLeftThick extends React.Component<IconBaseProps> { }
-export = TiArrowLeftThick;
diff --git a/types/react-icons/lib/ti/arrow-left.d.ts b/types/react-icons/lib/ti/arrow-left.d.ts
deleted file mode 100644
index 0555a99412..0000000000
--- a/types/react-icons/lib/ti/arrow-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowLeft extends React.Component<IconBaseProps> { }
-export = TiArrowLeft;
diff --git a/types/react-icons/lib/ti/arrow-loop-outline.d.ts b/types/react-icons/lib/ti/arrow-loop-outline.d.ts
deleted file mode 100644
index fdbbb8fa42..0000000000
--- a/types/react-icons/lib/ti/arrow-loop-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowLoopOutline extends React.Component<IconBaseProps> { }
-export = TiArrowLoopOutline;
diff --git a/types/react-icons/lib/ti/arrow-loop.d.ts b/types/react-icons/lib/ti/arrow-loop.d.ts
deleted file mode 100644
index 40fee9ff24..0000000000
--- a/types/react-icons/lib/ti/arrow-loop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowLoop extends React.Component<IconBaseProps> { }
-export = TiArrowLoop;
diff --git a/types/react-icons/lib/ti/arrow-maximise-outline.d.ts b/types/react-icons/lib/ti/arrow-maximise-outline.d.ts
deleted file mode 100644
index 431e6599f7..0000000000
--- a/types/react-icons/lib/ti/arrow-maximise-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowMaximiseOutline extends React.Component<IconBaseProps> { }
-export = TiArrowMaximiseOutline;
diff --git a/types/react-icons/lib/ti/arrow-maximise.d.ts b/types/react-icons/lib/ti/arrow-maximise.d.ts
deleted file mode 100644
index f3521df247..0000000000
--- a/types/react-icons/lib/ti/arrow-maximise.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowMaximise extends React.Component<IconBaseProps> { }
-export = TiArrowMaximise;
diff --git a/types/react-icons/lib/ti/arrow-minimise-outline.d.ts b/types/react-icons/lib/ti/arrow-minimise-outline.d.ts
deleted file mode 100644
index 93cfee26c2..0000000000
--- a/types/react-icons/lib/ti/arrow-minimise-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowMinimiseOutline extends React.Component<IconBaseProps> { }
-export = TiArrowMinimiseOutline;
diff --git a/types/react-icons/lib/ti/arrow-minimise.d.ts b/types/react-icons/lib/ti/arrow-minimise.d.ts
deleted file mode 100644
index 531d6414e7..0000000000
--- a/types/react-icons/lib/ti/arrow-minimise.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowMinimise extends React.Component<IconBaseProps> { }
-export = TiArrowMinimise;
diff --git a/types/react-icons/lib/ti/arrow-move-outline.d.ts b/types/react-icons/lib/ti/arrow-move-outline.d.ts
deleted file mode 100644
index 510ae78ebe..0000000000
--- a/types/react-icons/lib/ti/arrow-move-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowMoveOutline extends React.Component<IconBaseProps> { }
-export = TiArrowMoveOutline;
diff --git a/types/react-icons/lib/ti/arrow-move.d.ts b/types/react-icons/lib/ti/arrow-move.d.ts
deleted file mode 100644
index ee02e3d91d..0000000000
--- a/types/react-icons/lib/ti/arrow-move.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowMove extends React.Component<IconBaseProps> { }
-export = TiArrowMove;
diff --git a/types/react-icons/lib/ti/arrow-repeat-outline.d.ts b/types/react-icons/lib/ti/arrow-repeat-outline.d.ts
deleted file mode 100644
index 94eebe9c04..0000000000
--- a/types/react-icons/lib/ti/arrow-repeat-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowRepeatOutline extends React.Component<IconBaseProps> { }
-export = TiArrowRepeatOutline;
diff --git a/types/react-icons/lib/ti/arrow-repeat.d.ts b/types/react-icons/lib/ti/arrow-repeat.d.ts
deleted file mode 100644
index 0010ebcab4..0000000000
--- a/types/react-icons/lib/ti/arrow-repeat.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowRepeat extends React.Component<IconBaseProps> { }
-export = TiArrowRepeat;
diff --git a/types/react-icons/lib/ti/arrow-right-outline.d.ts b/types/react-icons/lib/ti/arrow-right-outline.d.ts
deleted file mode 100644
index 04269a4ea9..0000000000
--- a/types/react-icons/lib/ti/arrow-right-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowRightOutline extends React.Component<IconBaseProps> { }
-export = TiArrowRightOutline;
diff --git a/types/react-icons/lib/ti/arrow-right-thick.d.ts b/types/react-icons/lib/ti/arrow-right-thick.d.ts
deleted file mode 100644
index 322875500b..0000000000
--- a/types/react-icons/lib/ti/arrow-right-thick.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowRightThick extends React.Component<IconBaseProps> { }
-export = TiArrowRightThick;
diff --git a/types/react-icons/lib/ti/arrow-right.d.ts b/types/react-icons/lib/ti/arrow-right.d.ts
deleted file mode 100644
index ae7fd5ad05..0000000000
--- a/types/react-icons/lib/ti/arrow-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowRight extends React.Component<IconBaseProps> { }
-export = TiArrowRight;
diff --git a/types/react-icons/lib/ti/arrow-shuffle.d.ts b/types/react-icons/lib/ti/arrow-shuffle.d.ts
deleted file mode 100644
index 506b10aa81..0000000000
--- a/types/react-icons/lib/ti/arrow-shuffle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowShuffle extends React.Component<IconBaseProps> { }
-export = TiArrowShuffle;
diff --git a/types/react-icons/lib/ti/arrow-sorted-down.d.ts b/types/react-icons/lib/ti/arrow-sorted-down.d.ts
deleted file mode 100644
index a9f86a80af..0000000000
--- a/types/react-icons/lib/ti/arrow-sorted-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowSortedDown extends React.Component<IconBaseProps> { }
-export = TiArrowSortedDown;
diff --git a/types/react-icons/lib/ti/arrow-sorted-up.d.ts b/types/react-icons/lib/ti/arrow-sorted-up.d.ts
deleted file mode 100644
index 849fe84ff4..0000000000
--- a/types/react-icons/lib/ti/arrow-sorted-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowSortedUp extends React.Component<IconBaseProps> { }
-export = TiArrowSortedUp;
diff --git a/types/react-icons/lib/ti/arrow-sync-outline.d.ts b/types/react-icons/lib/ti/arrow-sync-outline.d.ts
deleted file mode 100644
index b2577282e7..0000000000
--- a/types/react-icons/lib/ti/arrow-sync-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowSyncOutline extends React.Component<IconBaseProps> { }
-export = TiArrowSyncOutline;
diff --git a/types/react-icons/lib/ti/arrow-sync.d.ts b/types/react-icons/lib/ti/arrow-sync.d.ts
deleted file mode 100644
index 35b9b2e05a..0000000000
--- a/types/react-icons/lib/ti/arrow-sync.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowSync extends React.Component<IconBaseProps> { }
-export = TiArrowSync;
diff --git a/types/react-icons/lib/ti/arrow-unsorted.d.ts b/types/react-icons/lib/ti/arrow-unsorted.d.ts
deleted file mode 100644
index 4c453df45a..0000000000
--- a/types/react-icons/lib/ti/arrow-unsorted.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowUnsorted extends React.Component<IconBaseProps> { }
-export = TiArrowUnsorted;
diff --git a/types/react-icons/lib/ti/arrow-up-outline.d.ts b/types/react-icons/lib/ti/arrow-up-outline.d.ts
deleted file mode 100644
index b25077cee2..0000000000
--- a/types/react-icons/lib/ti/arrow-up-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowUpOutline extends React.Component<IconBaseProps> { }
-export = TiArrowUpOutline;
diff --git a/types/react-icons/lib/ti/arrow-up-thick.d.ts b/types/react-icons/lib/ti/arrow-up-thick.d.ts
deleted file mode 100644
index 6a5c487bbb..0000000000
--- a/types/react-icons/lib/ti/arrow-up-thick.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowUpThick extends React.Component<IconBaseProps> { }
-export = TiArrowUpThick;
diff --git a/types/react-icons/lib/ti/arrow-up.d.ts b/types/react-icons/lib/ti/arrow-up.d.ts
deleted file mode 100644
index c20aa6fab9..0000000000
--- a/types/react-icons/lib/ti/arrow-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiArrowUp extends React.Component<IconBaseProps> { }
-export = TiArrowUp;
diff --git a/types/react-icons/lib/ti/at.d.ts b/types/react-icons/lib/ti/at.d.ts
deleted file mode 100644
index a22becc6cc..0000000000
--- a/types/react-icons/lib/ti/at.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiAt extends React.Component<IconBaseProps> { }
-export = TiAt;
diff --git a/types/react-icons/lib/ti/attachment-outline.d.ts b/types/react-icons/lib/ti/attachment-outline.d.ts
deleted file mode 100644
index af0ea4f5fb..0000000000
--- a/types/react-icons/lib/ti/attachment-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiAttachmentOutline extends React.Component<IconBaseProps> { }
-export = TiAttachmentOutline;
diff --git a/types/react-icons/lib/ti/attachment.d.ts b/types/react-icons/lib/ti/attachment.d.ts
deleted file mode 100644
index 089f1b1817..0000000000
--- a/types/react-icons/lib/ti/attachment.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiAttachment extends React.Component<IconBaseProps> { }
-export = TiAttachment;
diff --git a/types/react-icons/lib/ti/backspace-outline.d.ts b/types/react-icons/lib/ti/backspace-outline.d.ts
deleted file mode 100644
index fa59aa01cd..0000000000
--- a/types/react-icons/lib/ti/backspace-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiBackspaceOutline extends React.Component<IconBaseProps> { }
-export = TiBackspaceOutline;
diff --git a/types/react-icons/lib/ti/backspace.d.ts b/types/react-icons/lib/ti/backspace.d.ts
deleted file mode 100644
index 062be7f345..0000000000
--- a/types/react-icons/lib/ti/backspace.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiBackspace extends React.Component<IconBaseProps> { }
-export = TiBackspace;
diff --git a/types/react-icons/lib/ti/battery-charge.d.ts b/types/react-icons/lib/ti/battery-charge.d.ts
deleted file mode 100644
index b81192220a..0000000000
--- a/types/react-icons/lib/ti/battery-charge.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiBatteryCharge extends React.Component<IconBaseProps> { }
-export = TiBatteryCharge;
diff --git a/types/react-icons/lib/ti/battery-full.d.ts b/types/react-icons/lib/ti/battery-full.d.ts
deleted file mode 100644
index 85b775dee9..0000000000
--- a/types/react-icons/lib/ti/battery-full.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiBatteryFull extends React.Component<IconBaseProps> { }
-export = TiBatteryFull;
diff --git a/types/react-icons/lib/ti/battery-high.d.ts b/types/react-icons/lib/ti/battery-high.d.ts
deleted file mode 100644
index 05af45979f..0000000000
--- a/types/react-icons/lib/ti/battery-high.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiBatteryHigh extends React.Component<IconBaseProps> { }
-export = TiBatteryHigh;
diff --git a/types/react-icons/lib/ti/battery-low.d.ts b/types/react-icons/lib/ti/battery-low.d.ts
deleted file mode 100644
index fbbc4afcfe..0000000000
--- a/types/react-icons/lib/ti/battery-low.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiBatteryLow extends React.Component<IconBaseProps> { }
-export = TiBatteryLow;
diff --git a/types/react-icons/lib/ti/battery-mid.d.ts b/types/react-icons/lib/ti/battery-mid.d.ts
deleted file mode 100644
index a4b1bac2a4..0000000000
--- a/types/react-icons/lib/ti/battery-mid.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiBatteryMid extends React.Component<IconBaseProps> { }
-export = TiBatteryMid;
diff --git a/types/react-icons/lib/ti/beaker.d.ts b/types/react-icons/lib/ti/beaker.d.ts
deleted file mode 100644
index 088105c80e..0000000000
--- a/types/react-icons/lib/ti/beaker.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiBeaker extends React.Component<IconBaseProps> { }
-export = TiBeaker;
diff --git a/types/react-icons/lib/ti/beer.d.ts b/types/react-icons/lib/ti/beer.d.ts
deleted file mode 100644
index 6525266217..0000000000
--- a/types/react-icons/lib/ti/beer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiBeer extends React.Component<IconBaseProps> { }
-export = TiBeer;
diff --git a/types/react-icons/lib/ti/bell.d.ts b/types/react-icons/lib/ti/bell.d.ts
deleted file mode 100644
index 15728d828f..0000000000
--- a/types/react-icons/lib/ti/bell.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiBell extends React.Component<IconBaseProps> { }
-export = TiBell;
diff --git a/types/react-icons/lib/ti/book.d.ts b/types/react-icons/lib/ti/book.d.ts
deleted file mode 100644
index be301cf8bd..0000000000
--- a/types/react-icons/lib/ti/book.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiBook extends React.Component<IconBaseProps> { }
-export = TiBook;
diff --git a/types/react-icons/lib/ti/bookmark.d.ts b/types/react-icons/lib/ti/bookmark.d.ts
deleted file mode 100644
index a5b1244aee..0000000000
--- a/types/react-icons/lib/ti/bookmark.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiBookmark extends React.Component<IconBaseProps> { }
-export = TiBookmark;
diff --git a/types/react-icons/lib/ti/briefcase.d.ts b/types/react-icons/lib/ti/briefcase.d.ts
deleted file mode 100644
index 76635d9763..0000000000
--- a/types/react-icons/lib/ti/briefcase.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiBriefcase extends React.Component<IconBaseProps> { }
-export = TiBriefcase;
diff --git a/types/react-icons/lib/ti/brush.d.ts b/types/react-icons/lib/ti/brush.d.ts
deleted file mode 100644
index 596b8c1778..0000000000
--- a/types/react-icons/lib/ti/brush.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiBrush extends React.Component<IconBaseProps> { }
-export = TiBrush;
diff --git a/types/react-icons/lib/ti/business-card.d.ts b/types/react-icons/lib/ti/business-card.d.ts
deleted file mode 100644
index 9e5b6a6657..0000000000
--- a/types/react-icons/lib/ti/business-card.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiBusinessCard extends React.Component<IconBaseProps> { }
-export = TiBusinessCard;
diff --git a/types/react-icons/lib/ti/calculator.d.ts b/types/react-icons/lib/ti/calculator.d.ts
deleted file mode 100644
index 159507d0f5..0000000000
--- a/types/react-icons/lib/ti/calculator.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCalculator extends React.Component<IconBaseProps> { }
-export = TiCalculator;
diff --git a/types/react-icons/lib/ti/calendar-outline.d.ts b/types/react-icons/lib/ti/calendar-outline.d.ts
deleted file mode 100644
index feb064e20a..0000000000
--- a/types/react-icons/lib/ti/calendar-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCalendarOutline extends React.Component<IconBaseProps> { }
-export = TiCalendarOutline;
diff --git a/types/react-icons/lib/ti/calendar.d.ts b/types/react-icons/lib/ti/calendar.d.ts
deleted file mode 100644
index 85814900ba..0000000000
--- a/types/react-icons/lib/ti/calendar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCalendar extends React.Component<IconBaseProps> { }
-export = TiCalendar;
diff --git a/types/react-icons/lib/ti/calender-outline.d.ts b/types/react-icons/lib/ti/calender-outline.d.ts
deleted file mode 100644
index 677982952a..0000000000
--- a/types/react-icons/lib/ti/calender-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCalenderOutline extends React.Component<IconBaseProps> { }
-export = TiCalenderOutline;
diff --git a/types/react-icons/lib/ti/calender.d.ts b/types/react-icons/lib/ti/calender.d.ts
deleted file mode 100644
index 17361d332e..0000000000
--- a/types/react-icons/lib/ti/calender.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCalender extends React.Component<IconBaseProps> { }
-export = TiCalender;
diff --git a/types/react-icons/lib/ti/camera-outline.d.ts b/types/react-icons/lib/ti/camera-outline.d.ts
deleted file mode 100644
index 9b7f91566e..0000000000
--- a/types/react-icons/lib/ti/camera-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCameraOutline extends React.Component<IconBaseProps> { }
-export = TiCameraOutline;
diff --git a/types/react-icons/lib/ti/camera.d.ts b/types/react-icons/lib/ti/camera.d.ts
deleted file mode 100644
index ce19562cd3..0000000000
--- a/types/react-icons/lib/ti/camera.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCamera extends React.Component<IconBaseProps> { }
-export = TiCamera;
diff --git a/types/react-icons/lib/ti/cancel-outline.d.ts b/types/react-icons/lib/ti/cancel-outline.d.ts
deleted file mode 100644
index 3348e9084f..0000000000
--- a/types/react-icons/lib/ti/cancel-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCancelOutline extends React.Component<IconBaseProps> { }
-export = TiCancelOutline;
diff --git a/types/react-icons/lib/ti/cancel.d.ts b/types/react-icons/lib/ti/cancel.d.ts
deleted file mode 100644
index b03938e450..0000000000
--- a/types/react-icons/lib/ti/cancel.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCancel extends React.Component<IconBaseProps> { }
-export = TiCancel;
diff --git a/types/react-icons/lib/ti/chart-area-outline.d.ts b/types/react-icons/lib/ti/chart-area-outline.d.ts
deleted file mode 100644
index ce75645beb..0000000000
--- a/types/react-icons/lib/ti/chart-area-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiChartAreaOutline extends React.Component<IconBaseProps> { }
-export = TiChartAreaOutline;
diff --git a/types/react-icons/lib/ti/chart-area.d.ts b/types/react-icons/lib/ti/chart-area.d.ts
deleted file mode 100644
index 027f2c9c82..0000000000
--- a/types/react-icons/lib/ti/chart-area.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiChartArea extends React.Component<IconBaseProps> { }
-export = TiChartArea;
diff --git a/types/react-icons/lib/ti/chart-bar-outline.d.ts b/types/react-icons/lib/ti/chart-bar-outline.d.ts
deleted file mode 100644
index 393e0e0423..0000000000
--- a/types/react-icons/lib/ti/chart-bar-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiChartBarOutline extends React.Component<IconBaseProps> { }
-export = TiChartBarOutline;
diff --git a/types/react-icons/lib/ti/chart-bar.d.ts b/types/react-icons/lib/ti/chart-bar.d.ts
deleted file mode 100644
index 7fa03c097e..0000000000
--- a/types/react-icons/lib/ti/chart-bar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiChartBar extends React.Component<IconBaseProps> { }
-export = TiChartBar;
diff --git a/types/react-icons/lib/ti/chart-line-outline.d.ts b/types/react-icons/lib/ti/chart-line-outline.d.ts
deleted file mode 100644
index 6b8b6bc7b6..0000000000
--- a/types/react-icons/lib/ti/chart-line-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiChartLineOutline extends React.Component<IconBaseProps> { }
-export = TiChartLineOutline;
diff --git a/types/react-icons/lib/ti/chart-line.d.ts b/types/react-icons/lib/ti/chart-line.d.ts
deleted file mode 100644
index 15f6f776e9..0000000000
--- a/types/react-icons/lib/ti/chart-line.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiChartLine extends React.Component<IconBaseProps> { }
-export = TiChartLine;
diff --git a/types/react-icons/lib/ti/chart-pie-outline.d.ts b/types/react-icons/lib/ti/chart-pie-outline.d.ts
deleted file mode 100644
index 556c2055ff..0000000000
--- a/types/react-icons/lib/ti/chart-pie-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiChartPieOutline extends React.Component<IconBaseProps> { }
-export = TiChartPieOutline;
diff --git a/types/react-icons/lib/ti/chart-pie.d.ts b/types/react-icons/lib/ti/chart-pie.d.ts
deleted file mode 100644
index 98481fb073..0000000000
--- a/types/react-icons/lib/ti/chart-pie.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiChartPie extends React.Component<IconBaseProps> { }
-export = TiChartPie;
diff --git a/types/react-icons/lib/ti/chevron-left-outline.d.ts b/types/react-icons/lib/ti/chevron-left-outline.d.ts
deleted file mode 100644
index 186347dc7c..0000000000
--- a/types/react-icons/lib/ti/chevron-left-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiChevronLeftOutline extends React.Component<IconBaseProps> { }
-export = TiChevronLeftOutline;
diff --git a/types/react-icons/lib/ti/chevron-left.d.ts b/types/react-icons/lib/ti/chevron-left.d.ts
deleted file mode 100644
index ed66b40517..0000000000
--- a/types/react-icons/lib/ti/chevron-left.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiChevronLeft extends React.Component<IconBaseProps> { }
-export = TiChevronLeft;
diff --git a/types/react-icons/lib/ti/chevron-right-outline.d.ts b/types/react-icons/lib/ti/chevron-right-outline.d.ts
deleted file mode 100644
index f07fdf42a0..0000000000
--- a/types/react-icons/lib/ti/chevron-right-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiChevronRightOutline extends React.Component<IconBaseProps> { }
-export = TiChevronRightOutline;
diff --git a/types/react-icons/lib/ti/chevron-right.d.ts b/types/react-icons/lib/ti/chevron-right.d.ts
deleted file mode 100644
index 7241aad18d..0000000000
--- a/types/react-icons/lib/ti/chevron-right.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiChevronRight extends React.Component<IconBaseProps> { }
-export = TiChevronRight;
diff --git a/types/react-icons/lib/ti/clipboard.d.ts b/types/react-icons/lib/ti/clipboard.d.ts
deleted file mode 100644
index 62288a86d3..0000000000
--- a/types/react-icons/lib/ti/clipboard.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiClipboard extends React.Component<IconBaseProps> { }
-export = TiClipboard;
diff --git a/types/react-icons/lib/ti/cloud-storage-outline.d.ts b/types/react-icons/lib/ti/cloud-storage-outline.d.ts
deleted file mode 100644
index 64b3ac5957..0000000000
--- a/types/react-icons/lib/ti/cloud-storage-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCloudStorageOutline extends React.Component<IconBaseProps> { }
-export = TiCloudStorageOutline;
diff --git a/types/react-icons/lib/ti/cloud-storage.d.ts b/types/react-icons/lib/ti/cloud-storage.d.ts
deleted file mode 100644
index 0d31048b85..0000000000
--- a/types/react-icons/lib/ti/cloud-storage.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCloudStorage extends React.Component<IconBaseProps> { }
-export = TiCloudStorage;
diff --git a/types/react-icons/lib/ti/code-outline.d.ts b/types/react-icons/lib/ti/code-outline.d.ts
deleted file mode 100644
index 21dbe7a108..0000000000
--- a/types/react-icons/lib/ti/code-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCodeOutline extends React.Component<IconBaseProps> { }
-export = TiCodeOutline;
diff --git a/types/react-icons/lib/ti/code.d.ts b/types/react-icons/lib/ti/code.d.ts
deleted file mode 100644
index 4c23671d20..0000000000
--- a/types/react-icons/lib/ti/code.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCode extends React.Component<IconBaseProps> { }
-export = TiCode;
diff --git a/types/react-icons/lib/ti/coffee.d.ts b/types/react-icons/lib/ti/coffee.d.ts
deleted file mode 100644
index af57c5d5ee..0000000000
--- a/types/react-icons/lib/ti/coffee.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCoffee extends React.Component<IconBaseProps> { }
-export = TiCoffee;
diff --git a/types/react-icons/lib/ti/cog-outline.d.ts b/types/react-icons/lib/ti/cog-outline.d.ts
deleted file mode 100644
index 9d528d69a6..0000000000
--- a/types/react-icons/lib/ti/cog-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCogOutline extends React.Component<IconBaseProps> { }
-export = TiCogOutline;
diff --git a/types/react-icons/lib/ti/cog.d.ts b/types/react-icons/lib/ti/cog.d.ts
deleted file mode 100644
index 5f93130bf6..0000000000
--- a/types/react-icons/lib/ti/cog.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCog extends React.Component<IconBaseProps> { }
-export = TiCog;
diff --git a/types/react-icons/lib/ti/compass.d.ts b/types/react-icons/lib/ti/compass.d.ts
deleted file mode 100644
index 82578c6f74..0000000000
--- a/types/react-icons/lib/ti/compass.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCompass extends React.Component<IconBaseProps> { }
-export = TiCompass;
diff --git a/types/react-icons/lib/ti/contacts.d.ts b/types/react-icons/lib/ti/contacts.d.ts
deleted file mode 100644
index 0637be6296..0000000000
--- a/types/react-icons/lib/ti/contacts.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiContacts extends React.Component<IconBaseProps> { }
-export = TiContacts;
diff --git a/types/react-icons/lib/ti/credit-card.d.ts b/types/react-icons/lib/ti/credit-card.d.ts
deleted file mode 100644
index 42f823b564..0000000000
--- a/types/react-icons/lib/ti/credit-card.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCreditCard extends React.Component<IconBaseProps> { }
-export = TiCreditCard;
diff --git a/types/react-icons/lib/ti/cross.d.ts b/types/react-icons/lib/ti/cross.d.ts
deleted file mode 100644
index 4243dc886f..0000000000
--- a/types/react-icons/lib/ti/cross.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCross extends React.Component<IconBaseProps> { }
-export = TiCross;
diff --git a/types/react-icons/lib/ti/css3.d.ts b/types/react-icons/lib/ti/css3.d.ts
deleted file mode 100644
index 32febf6f6b..0000000000
--- a/types/react-icons/lib/ti/css3.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiCss3 extends React.Component<IconBaseProps> { }
-export = TiCss3;
diff --git a/types/react-icons/lib/ti/database.d.ts b/types/react-icons/lib/ti/database.d.ts
deleted file mode 100644
index 68373db2cf..0000000000
--- a/types/react-icons/lib/ti/database.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDatabase extends React.Component<IconBaseProps> { }
-export = TiDatabase;
diff --git a/types/react-icons/lib/ti/delete-outline.d.ts b/types/react-icons/lib/ti/delete-outline.d.ts
deleted file mode 100644
index 04cd5ed456..0000000000
--- a/types/react-icons/lib/ti/delete-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDeleteOutline extends React.Component<IconBaseProps> { }
-export = TiDeleteOutline;
diff --git a/types/react-icons/lib/ti/delete.d.ts b/types/react-icons/lib/ti/delete.d.ts
deleted file mode 100644
index 8979d845c3..0000000000
--- a/types/react-icons/lib/ti/delete.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDelete extends React.Component<IconBaseProps> { }
-export = TiDelete;
diff --git a/types/react-icons/lib/ti/device-desktop.d.ts b/types/react-icons/lib/ti/device-desktop.d.ts
deleted file mode 100644
index e4243a2c7e..0000000000
--- a/types/react-icons/lib/ti/device-desktop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDeviceDesktop extends React.Component<IconBaseProps> { }
-export = TiDeviceDesktop;
diff --git a/types/react-icons/lib/ti/device-laptop.d.ts b/types/react-icons/lib/ti/device-laptop.d.ts
deleted file mode 100644
index 09b5e11260..0000000000
--- a/types/react-icons/lib/ti/device-laptop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDeviceLaptop extends React.Component<IconBaseProps> { }
-export = TiDeviceLaptop;
diff --git a/types/react-icons/lib/ti/device-phone.d.ts b/types/react-icons/lib/ti/device-phone.d.ts
deleted file mode 100644
index 4f926184c3..0000000000
--- a/types/react-icons/lib/ti/device-phone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDevicePhone extends React.Component<IconBaseProps> { }
-export = TiDevicePhone;
diff --git a/types/react-icons/lib/ti/device-tablet.d.ts b/types/react-icons/lib/ti/device-tablet.d.ts
deleted file mode 100644
index 6a3a636ca0..0000000000
--- a/types/react-icons/lib/ti/device-tablet.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDeviceTablet extends React.Component<IconBaseProps> { }
-export = TiDeviceTablet;
diff --git a/types/react-icons/lib/ti/directions.d.ts b/types/react-icons/lib/ti/directions.d.ts
deleted file mode 100644
index f7cc86becb..0000000000
--- a/types/react-icons/lib/ti/directions.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDirections extends React.Component<IconBaseProps> { }
-export = TiDirections;
diff --git a/types/react-icons/lib/ti/divide-outline.d.ts b/types/react-icons/lib/ti/divide-outline.d.ts
deleted file mode 100644
index e19ab3654b..0000000000
--- a/types/react-icons/lib/ti/divide-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDivideOutline extends React.Component<IconBaseProps> { }
-export = TiDivideOutline;
diff --git a/types/react-icons/lib/ti/divide.d.ts b/types/react-icons/lib/ti/divide.d.ts
deleted file mode 100644
index c82f0439fe..0000000000
--- a/types/react-icons/lib/ti/divide.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDivide extends React.Component<IconBaseProps> { }
-export = TiDivide;
diff --git a/types/react-icons/lib/ti/document-add.d.ts b/types/react-icons/lib/ti/document-add.d.ts
deleted file mode 100644
index 68bc331e15..0000000000
--- a/types/react-icons/lib/ti/document-add.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDocumentAdd extends React.Component<IconBaseProps> { }
-export = TiDocumentAdd;
diff --git a/types/react-icons/lib/ti/document-delete.d.ts b/types/react-icons/lib/ti/document-delete.d.ts
deleted file mode 100644
index a3d444052e..0000000000
--- a/types/react-icons/lib/ti/document-delete.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDocumentDelete extends React.Component<IconBaseProps> { }
-export = TiDocumentDelete;
diff --git a/types/react-icons/lib/ti/document-text.d.ts b/types/react-icons/lib/ti/document-text.d.ts
deleted file mode 100644
index 3cad0fe733..0000000000
--- a/types/react-icons/lib/ti/document-text.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDocumentText extends React.Component<IconBaseProps> { }
-export = TiDocumentText;
diff --git a/types/react-icons/lib/ti/document.d.ts b/types/react-icons/lib/ti/document.d.ts
deleted file mode 100644
index 749a51cde8..0000000000
--- a/types/react-icons/lib/ti/document.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDocument extends React.Component<IconBaseProps> { }
-export = TiDocument;
diff --git a/types/react-icons/lib/ti/download-outline.d.ts b/types/react-icons/lib/ti/download-outline.d.ts
deleted file mode 100644
index cc0849bce2..0000000000
--- a/types/react-icons/lib/ti/download-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDownloadOutline extends React.Component<IconBaseProps> { }
-export = TiDownloadOutline;
diff --git a/types/react-icons/lib/ti/download.d.ts b/types/react-icons/lib/ti/download.d.ts
deleted file mode 100644
index 6563ae7a26..0000000000
--- a/types/react-icons/lib/ti/download.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDownload extends React.Component<IconBaseProps> { }
-export = TiDownload;
diff --git a/types/react-icons/lib/ti/dropbox.d.ts b/types/react-icons/lib/ti/dropbox.d.ts
deleted file mode 100644
index 8850b30638..0000000000
--- a/types/react-icons/lib/ti/dropbox.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiDropbox extends React.Component<IconBaseProps> { }
-export = TiDropbox;
diff --git a/types/react-icons/lib/ti/edit.d.ts b/types/react-icons/lib/ti/edit.d.ts
deleted file mode 100644
index cb3548a8d7..0000000000
--- a/types/react-icons/lib/ti/edit.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiEdit extends React.Component<IconBaseProps> { }
-export = TiEdit;
diff --git a/types/react-icons/lib/ti/eject-outline.d.ts b/types/react-icons/lib/ti/eject-outline.d.ts
deleted file mode 100644
index 995b0223ed..0000000000
--- a/types/react-icons/lib/ti/eject-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiEjectOutline extends React.Component<IconBaseProps> { }
-export = TiEjectOutline;
diff --git a/types/react-icons/lib/ti/eject.d.ts b/types/react-icons/lib/ti/eject.d.ts
deleted file mode 100644
index ce559832ff..0000000000
--- a/types/react-icons/lib/ti/eject.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiEject extends React.Component<IconBaseProps> { }
-export = TiEject;
diff --git a/types/react-icons/lib/ti/equals-outline.d.ts b/types/react-icons/lib/ti/equals-outline.d.ts
deleted file mode 100644
index 838e47165e..0000000000
--- a/types/react-icons/lib/ti/equals-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiEqualsOutline extends React.Component<IconBaseProps> { }
-export = TiEqualsOutline;
diff --git a/types/react-icons/lib/ti/equals.d.ts b/types/react-icons/lib/ti/equals.d.ts
deleted file mode 100644
index 9b4f2fabeb..0000000000
--- a/types/react-icons/lib/ti/equals.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiEquals extends React.Component<IconBaseProps> { }
-export = TiEquals;
diff --git a/types/react-icons/lib/ti/export-outline.d.ts b/types/react-icons/lib/ti/export-outline.d.ts
deleted file mode 100644
index ba24ea3d30..0000000000
--- a/types/react-icons/lib/ti/export-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiExportOutline extends React.Component<IconBaseProps> { }
-export = TiExportOutline;
diff --git a/types/react-icons/lib/ti/export.d.ts b/types/react-icons/lib/ti/export.d.ts
deleted file mode 100644
index 62d2335260..0000000000
--- a/types/react-icons/lib/ti/export.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiExport extends React.Component<IconBaseProps> { }
-export = TiExport;
diff --git a/types/react-icons/lib/ti/eye-outline.d.ts b/types/react-icons/lib/ti/eye-outline.d.ts
deleted file mode 100644
index 201e798391..0000000000
--- a/types/react-icons/lib/ti/eye-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiEyeOutline extends React.Component<IconBaseProps> { }
-export = TiEyeOutline;
diff --git a/types/react-icons/lib/ti/eye.d.ts b/types/react-icons/lib/ti/eye.d.ts
deleted file mode 100644
index 0c6a684b88..0000000000
--- a/types/react-icons/lib/ti/eye.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiEye extends React.Component<IconBaseProps> { }
-export = TiEye;
diff --git a/types/react-icons/lib/ti/feather.d.ts b/types/react-icons/lib/ti/feather.d.ts
deleted file mode 100644
index 4e6c4e1080..0000000000
--- a/types/react-icons/lib/ti/feather.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiFeather extends React.Component<IconBaseProps> { }
-export = TiFeather;
diff --git a/types/react-icons/lib/ti/film.d.ts b/types/react-icons/lib/ti/film.d.ts
deleted file mode 100644
index f039b84056..0000000000
--- a/types/react-icons/lib/ti/film.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiFilm extends React.Component<IconBaseProps> { }
-export = TiFilm;
diff --git a/types/react-icons/lib/ti/filter.d.ts b/types/react-icons/lib/ti/filter.d.ts
deleted file mode 100644
index 9e42eece1f..0000000000
--- a/types/react-icons/lib/ti/filter.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiFilter extends React.Component<IconBaseProps> { }
-export = TiFilter;
diff --git a/types/react-icons/lib/ti/flag-outline.d.ts b/types/react-icons/lib/ti/flag-outline.d.ts
deleted file mode 100644
index 64a4c81bdd..0000000000
--- a/types/react-icons/lib/ti/flag-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiFlagOutline extends React.Component<IconBaseProps> { }
-export = TiFlagOutline;
diff --git a/types/react-icons/lib/ti/flag.d.ts b/types/react-icons/lib/ti/flag.d.ts
deleted file mode 100644
index dab92b561d..0000000000
--- a/types/react-icons/lib/ti/flag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiFlag extends React.Component<IconBaseProps> { }
-export = TiFlag;
diff --git a/types/react-icons/lib/ti/flash-outline.d.ts b/types/react-icons/lib/ti/flash-outline.d.ts
deleted file mode 100644
index 8889cf52ba..0000000000
--- a/types/react-icons/lib/ti/flash-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiFlashOutline extends React.Component<IconBaseProps> { }
-export = TiFlashOutline;
diff --git a/types/react-icons/lib/ti/flash.d.ts b/types/react-icons/lib/ti/flash.d.ts
deleted file mode 100644
index 15a2371754..0000000000
--- a/types/react-icons/lib/ti/flash.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiFlash extends React.Component<IconBaseProps> { }
-export = TiFlash;
diff --git a/types/react-icons/lib/ti/flow-children.d.ts b/types/react-icons/lib/ti/flow-children.d.ts
deleted file mode 100644
index f46b1c165a..0000000000
--- a/types/react-icons/lib/ti/flow-children.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiFlowChildren extends React.Component<IconBaseProps> { }
-export = TiFlowChildren;
diff --git a/types/react-icons/lib/ti/flow-merge.d.ts b/types/react-icons/lib/ti/flow-merge.d.ts
deleted file mode 100644
index 05a81557f6..0000000000
--- a/types/react-icons/lib/ti/flow-merge.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiFlowMerge extends React.Component<IconBaseProps> { }
-export = TiFlowMerge;
diff --git a/types/react-icons/lib/ti/flow-parallel.d.ts b/types/react-icons/lib/ti/flow-parallel.d.ts
deleted file mode 100644
index fa1cd1c5e7..0000000000
--- a/types/react-icons/lib/ti/flow-parallel.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiFlowParallel extends React.Component<IconBaseProps> { }
-export = TiFlowParallel;
diff --git a/types/react-icons/lib/ti/flow-switch.d.ts b/types/react-icons/lib/ti/flow-switch.d.ts
deleted file mode 100644
index a8930e363e..0000000000
--- a/types/react-icons/lib/ti/flow-switch.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiFlowSwitch extends React.Component<IconBaseProps> { }
-export = TiFlowSwitch;
diff --git a/types/react-icons/lib/ti/folder-add.d.ts b/types/react-icons/lib/ti/folder-add.d.ts
deleted file mode 100644
index 82ec1b52ef..0000000000
--- a/types/react-icons/lib/ti/folder-add.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiFolderAdd extends React.Component<IconBaseProps> { }
-export = TiFolderAdd;
diff --git a/types/react-icons/lib/ti/folder-delete.d.ts b/types/react-icons/lib/ti/folder-delete.d.ts
deleted file mode 100644
index 5792a710ef..0000000000
--- a/types/react-icons/lib/ti/folder-delete.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiFolderDelete extends React.Component<IconBaseProps> { }
-export = TiFolderDelete;
diff --git a/types/react-icons/lib/ti/folder-open.d.ts b/types/react-icons/lib/ti/folder-open.d.ts
deleted file mode 100644
index 3cc472d927..0000000000
--- a/types/react-icons/lib/ti/folder-open.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiFolderOpen extends React.Component<IconBaseProps> { }
-export = TiFolderOpen;
diff --git a/types/react-icons/lib/ti/folder.d.ts b/types/react-icons/lib/ti/folder.d.ts
deleted file mode 100644
index 2adf29f6cb..0000000000
--- a/types/react-icons/lib/ti/folder.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiFolder extends React.Component<IconBaseProps> { }
-export = TiFolder;
diff --git a/types/react-icons/lib/ti/gift.d.ts b/types/react-icons/lib/ti/gift.d.ts
deleted file mode 100644
index adf2047b6e..0000000000
--- a/types/react-icons/lib/ti/gift.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiGift extends React.Component<IconBaseProps> { }
-export = TiGift;
diff --git a/types/react-icons/lib/ti/globe-outline.d.ts b/types/react-icons/lib/ti/globe-outline.d.ts
deleted file mode 100644
index 9fbd792aa0..0000000000
--- a/types/react-icons/lib/ti/globe-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiGlobeOutline extends React.Component<IconBaseProps> { }
-export = TiGlobeOutline;
diff --git a/types/react-icons/lib/ti/globe.d.ts b/types/react-icons/lib/ti/globe.d.ts
deleted file mode 100644
index 65fcd995e4..0000000000
--- a/types/react-icons/lib/ti/globe.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiGlobe extends React.Component<IconBaseProps> { }
-export = TiGlobe;
diff --git a/types/react-icons/lib/ti/group-outline.d.ts b/types/react-icons/lib/ti/group-outline.d.ts
deleted file mode 100644
index ca11421d20..0000000000
--- a/types/react-icons/lib/ti/group-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiGroupOutline extends React.Component<IconBaseProps> { }
-export = TiGroupOutline;
diff --git a/types/react-icons/lib/ti/group.d.ts b/types/react-icons/lib/ti/group.d.ts
deleted file mode 100644
index ee7b592305..0000000000
--- a/types/react-icons/lib/ti/group.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiGroup extends React.Component<IconBaseProps> { }
-export = TiGroup;
diff --git a/types/react-icons/lib/ti/headphones.d.ts b/types/react-icons/lib/ti/headphones.d.ts
deleted file mode 100644
index 372afd24ba..0000000000
--- a/types/react-icons/lib/ti/headphones.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiHeadphones extends React.Component<IconBaseProps> { }
-export = TiHeadphones;
diff --git a/types/react-icons/lib/ti/heart-full-outline.d.ts b/types/react-icons/lib/ti/heart-full-outline.d.ts
deleted file mode 100644
index 959500f330..0000000000
--- a/types/react-icons/lib/ti/heart-full-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiHeartFullOutline extends React.Component<IconBaseProps> { }
-export = TiHeartFullOutline;
diff --git a/types/react-icons/lib/ti/heart-half-outline.d.ts b/types/react-icons/lib/ti/heart-half-outline.d.ts
deleted file mode 100644
index d071493105..0000000000
--- a/types/react-icons/lib/ti/heart-half-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiHeartHalfOutline extends React.Component<IconBaseProps> { }
-export = TiHeartHalfOutline;
diff --git a/types/react-icons/lib/ti/heart-outline.d.ts b/types/react-icons/lib/ti/heart-outline.d.ts
deleted file mode 100644
index dc19876c98..0000000000
--- a/types/react-icons/lib/ti/heart-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiHeartOutline extends React.Component<IconBaseProps> { }
-export = TiHeartOutline;
diff --git a/types/react-icons/lib/ti/heart.d.ts b/types/react-icons/lib/ti/heart.d.ts
deleted file mode 100644
index 1c16a9e4d7..0000000000
--- a/types/react-icons/lib/ti/heart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiHeart extends React.Component<IconBaseProps> { }
-export = TiHeart;
diff --git a/types/react-icons/lib/ti/home-outline.d.ts b/types/react-icons/lib/ti/home-outline.d.ts
deleted file mode 100644
index c8caac4085..0000000000
--- a/types/react-icons/lib/ti/home-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiHomeOutline extends React.Component<IconBaseProps> { }
-export = TiHomeOutline;
diff --git a/types/react-icons/lib/ti/home.d.ts b/types/react-icons/lib/ti/home.d.ts
deleted file mode 100644
index 0f26a83396..0000000000
--- a/types/react-icons/lib/ti/home.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiHome extends React.Component<IconBaseProps> { }
-export = TiHome;
diff --git a/types/react-icons/lib/ti/html5.d.ts b/types/react-icons/lib/ti/html5.d.ts
deleted file mode 100644
index 9e3002c65e..0000000000
--- a/types/react-icons/lib/ti/html5.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiHtml5 extends React.Component<IconBaseProps> { }
-export = TiHtml5;
diff --git a/types/react-icons/lib/ti/image-outline.d.ts b/types/react-icons/lib/ti/image-outline.d.ts
deleted file mode 100644
index 478d9a15e4..0000000000
--- a/types/react-icons/lib/ti/image-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiImageOutline extends React.Component<IconBaseProps> { }
-export = TiImageOutline;
diff --git a/types/react-icons/lib/ti/image.d.ts b/types/react-icons/lib/ti/image.d.ts
deleted file mode 100644
index abe02ba9d1..0000000000
--- a/types/react-icons/lib/ti/image.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiImage extends React.Component<IconBaseProps> { }
-export = TiImage;
diff --git a/types/react-icons/lib/ti/index.d.ts b/types/react-icons/lib/ti/index.d.ts
deleted file mode 100644
index 42e1bff681..0000000000
--- a/types/react-icons/lib/ti/index.d.ts
+++ /dev/null
@@ -1,339 +0,0 @@
-export { default as TiAdjustBrightness } from "../../ti/adjust-brightness";
-export { default as TiAdjustContrast } from "../../ti/adjust-contrast";
-export { default as TiAnchorOutline } from "../../ti/anchor-outline";
-export { default as TiAnchor } from "../../ti/anchor";
-export { default as TiArchive } from "../../ti/archive";
-export { default as TiArrowBackOutline } from "../../ti/arrow-back-outline";
-export { default as TiArrowBack } from "../../ti/arrow-back";
-export { default as TiArrowDownOutline } from "../../ti/arrow-down-outline";
-export { default as TiArrowDownThick } from "../../ti/arrow-down-thick";
-export { default as TiArrowDown } from "../../ti/arrow-down";
-export { default as TiArrowForwardOutline } from "../../ti/arrow-forward-outline";
-export { default as TiArrowForward } from "../../ti/arrow-forward";
-export { default as TiArrowLeftOutline } from "../../ti/arrow-left-outline";
-export { default as TiArrowLeftThick } from "../../ti/arrow-left-thick";
-export { default as TiArrowLeft } from "../../ti/arrow-left";
-export { default as TiArrowLoopOutline } from "../../ti/arrow-loop-outline";
-export { default as TiArrowLoop } from "../../ti/arrow-loop";
-export { default as TiArrowMaximiseOutline } from "../../ti/arrow-maximise-outline";
-export { default as TiArrowMaximise } from "../../ti/arrow-maximise";
-export { default as TiArrowMinimiseOutline } from "../../ti/arrow-minimise-outline";
-export { default as TiArrowMinimise } from "../../ti/arrow-minimise";
-export { default as TiArrowMoveOutline } from "../../ti/arrow-move-outline";
-export { default as TiArrowMove } from "../../ti/arrow-move";
-export { default as TiArrowRepeatOutline } from "../../ti/arrow-repeat-outline";
-export { default as TiArrowRepeat } from "../../ti/arrow-repeat";
-export { default as TiArrowRightOutline } from "../../ti/arrow-right-outline";
-export { default as TiArrowRightThick } from "../../ti/arrow-right-thick";
-export { default as TiArrowRight } from "../../ti/arrow-right";
-export { default as TiArrowShuffle } from "../../ti/arrow-shuffle";
-export { default as TiArrowSortedDown } from "../../ti/arrow-sorted-down";
-export { default as TiArrowSortedUp } from "../../ti/arrow-sorted-up";
-export { default as TiArrowSyncOutline } from "../../ti/arrow-sync-outline";
-export { default as TiArrowSync } from "../../ti/arrow-sync";
-export { default as TiArrowUnsorted } from "../../ti/arrow-unsorted";
-export { default as TiArrowUpOutline } from "../../ti/arrow-up-outline";
-export { default as TiArrowUpThick } from "../../ti/arrow-up-thick";
-export { default as TiArrowUp } from "../../ti/arrow-up";
-export { default as TiAt } from "../../ti/at";
-export { default as TiAttachmentOutline } from "../../ti/attachment-outline";
-export { default as TiAttachment } from "../../ti/attachment";
-export { default as TiBackspaceOutline } from "../../ti/backspace-outline";
-export { default as TiBackspace } from "../../ti/backspace";
-export { default as TiBatteryCharge } from "../../ti/battery-charge";
-export { default as TiBatteryFull } from "../../ti/battery-full";
-export { default as TiBatteryHigh } from "../../ti/battery-high";
-export { default as TiBatteryLow } from "../../ti/battery-low";
-export { default as TiBatteryMid } from "../../ti/battery-mid";
-export { default as TiBeaker } from "../../ti/beaker";
-export { default as TiBeer } from "../../ti/beer";
-export { default as TiBell } from "../../ti/bell";
-export { default as TiBook } from "../../ti/book";
-export { default as TiBookmark } from "../../ti/bookmark";
-export { default as TiBriefcase } from "../../ti/briefcase";
-export { default as TiBrush } from "../../ti/brush";
-export { default as TiBusinessCard } from "../../ti/business-card";
-export { default as TiCalculator } from "../../ti/calculator";
-export { default as TiCalendarOutline } from "../../ti/calendar-outline";
-export { default as TiCalendar } from "../../ti/calendar";
-export { default as TiCalenderOutline } from "../../ti/calender-outline";
-export { default as TiCalender } from "../../ti/calender";
-export { default as TiCameraOutline } from "../../ti/camera-outline";
-export { default as TiCamera } from "../../ti/camera";
-export { default as TiCancelOutline } from "../../ti/cancel-outline";
-export { default as TiCancel } from "../../ti/cancel";
-export { default as TiChartAreaOutline } from "../../ti/chart-area-outline";
-export { default as TiChartArea } from "../../ti/chart-area";
-export { default as TiChartBarOutline } from "../../ti/chart-bar-outline";
-export { default as TiChartBar } from "../../ti/chart-bar";
-export { default as TiChartLineOutline } from "../../ti/chart-line-outline";
-export { default as TiChartLine } from "../../ti/chart-line";
-export { default as TiChartPieOutline } from "../../ti/chart-pie-outline";
-export { default as TiChartPie } from "../../ti/chart-pie";
-export { default as TiChevronLeftOutline } from "../../ti/chevron-left-outline";
-export { default as TiChevronLeft } from "../../ti/chevron-left";
-export { default as TiChevronRightOutline } from "../../ti/chevron-right-outline";
-export { default as TiChevronRight } from "../../ti/chevron-right";
-export { default as TiClipboard } from "../../ti/clipboard";
-export { default as TiCloudStorageOutline } from "../../ti/cloud-storage-outline";
-export { default as TiCloudStorage } from "../../ti/cloud-storage";
-export { default as TiCodeOutline } from "../../ti/code-outline";
-export { default as TiCode } from "../../ti/code";
-export { default as TiCoffee } from "../../ti/coffee";
-export { default as TiCogOutline } from "../../ti/cog-outline";
-export { default as TiCog } from "../../ti/cog";
-export { default as TiCompass } from "../../ti/compass";
-export { default as TiContacts } from "../../ti/contacts";
-export { default as TiCreditCard } from "../../ti/credit-card";
-export { default as TiCross } from "../../ti/cross";
-export { default as TiCss3 } from "../../ti/css3";
-export { default as TiDatabase } from "../../ti/database";
-export { default as TiDeleteOutline } from "../../ti/delete-outline";
-export { default as TiDelete } from "../../ti/delete";
-export { default as TiDeviceDesktop } from "../../ti/device-desktop";
-export { default as TiDeviceLaptop } from "../../ti/device-laptop";
-export { default as TiDevicePhone } from "../../ti/device-phone";
-export { default as TiDeviceTablet } from "../../ti/device-tablet";
-export { default as TiDirections } from "../../ti/directions";
-export { default as TiDivideOutline } from "../../ti/divide-outline";
-export { default as TiDivide } from "../../ti/divide";
-export { default as TiDocumentAdd } from "../../ti/document-add";
-export { default as TiDocumentDelete } from "../../ti/document-delete";
-export { default as TiDocumentText } from "../../ti/document-text";
-export { default as TiDocument } from "../../ti/document";
-export { default as TiDownloadOutline } from "../../ti/download-outline";
-export { default as TiDownload } from "../../ti/download";
-export { default as TiDropbox } from "../../ti/dropbox";
-export { default as TiEdit } from "../../ti/edit";
-export { default as TiEjectOutline } from "../../ti/eject-outline";
-export { default as TiEject } from "../../ti/eject";
-export { default as TiEqualsOutline } from "../../ti/equals-outline";
-export { default as TiEquals } from "../../ti/equals";
-export { default as TiExportOutline } from "../../ti/export-outline";
-export { default as TiExport } from "../../ti/export";
-export { default as TiEyeOutline } from "../../ti/eye-outline";
-export { default as TiEye } from "../../ti/eye";
-export { default as TiFeather } from "../../ti/feather";
-export { default as TiFilm } from "../../ti/film";
-export { default as TiFilter } from "../../ti/filter";
-export { default as TiFlagOutline } from "../../ti/flag-outline";
-export { default as TiFlag } from "../../ti/flag";
-export { default as TiFlashOutline } from "../../ti/flash-outline";
-export { default as TiFlash } from "../../ti/flash";
-export { default as TiFlowChildren } from "../../ti/flow-children";
-export { default as TiFlowMerge } from "../../ti/flow-merge";
-export { default as TiFlowParallel } from "../../ti/flow-parallel";
-export { default as TiFlowSwitch } from "../../ti/flow-switch";
-export { default as TiFolderAdd } from "../../ti/folder-add";
-export { default as TiFolderDelete } from "../../ti/folder-delete";
-export { default as TiFolderOpen } from "../../ti/folder-open";
-export { default as TiFolder } from "../../ti/folder";
-export { default as TiGift } from "../../ti/gift";
-export { default as TiGlobeOutline } from "../../ti/globe-outline";
-export { default as TiGlobe } from "../../ti/globe";
-export { default as TiGroupOutline } from "../../ti/group-outline";
-export { default as TiGroup } from "../../ti/group";
-export { default as TiHeadphones } from "../../ti/headphones";
-export { default as TiHeartFullOutline } from "../../ti/heart-full-outline";
-export { default as TiHeartHalfOutline } from "../../ti/heart-half-outline";
-export { default as TiHeartOutline } from "../../ti/heart-outline";
-export { default as TiHeart } from "../../ti/heart";
-export { default as TiHomeOutline } from "../../ti/home-outline";
-export { default as TiHome } from "../../ti/home";
-export { default as TiHtml5 } from "../../ti/html5";
-export { default as TiImageOutline } from "../../ti/image-outline";
-export { default as TiImage } from "../../ti/image";
-export { default as TiInfinityOutline } from "../../ti/infinity-outline";
-export { default as TiInfinity } from "../../ti/infinity";
-export { default as TiInfoLargeOutline } from "../../ti/info-large-outline";
-export { default as TiInfoLarge } from "../../ti/info-large";
-export { default as TiInfoOutline } from "../../ti/info-outline";
-export { default as TiInfo } from "../../ti/info";
-export { default as TiInputCheckedOutline } from "../../ti/input-checked-outline";
-export { default as TiInputChecked } from "../../ti/input-checked";
-export { default as TiKeyOutline } from "../../ti/key-outline";
-export { default as TiKey } from "../../ti/key";
-export { default as TiKeyboard } from "../../ti/keyboard";
-export { default as TiLeaf } from "../../ti/leaf";
-export { default as TiLightbulb } from "../../ti/lightbulb";
-export { default as TiLinkOutline } from "../../ti/link-outline";
-export { default as TiLink } from "../../ti/link";
-export { default as TiLocationArrowOutline } from "../../ti/location-arrow-outline";
-export { default as TiLocationArrow } from "../../ti/location-arrow";
-export { default as TiLocationOutline } from "../../ti/location-outline";
-export { default as TiLocation } from "../../ti/location";
-export { default as TiLockClosedOutline } from "../../ti/lock-closed-outline";
-export { default as TiLockClosed } from "../../ti/lock-closed";
-export { default as TiLockOpenOutline } from "../../ti/lock-open-outline";
-export { default as TiLockOpen } from "../../ti/lock-open";
-export { default as TiMail } from "../../ti/mail";
-export { default as TiMap } from "../../ti/map";
-export { default as TiMediaEjectOutline } from "../../ti/media-eject-outline";
-export { default as TiMediaEject } from "../../ti/media-eject";
-export { default as TiMediaFastForwardOutline } from "../../ti/media-fast-forward-outline";
-export { default as TiMediaFastForward } from "../../ti/media-fast-forward";
-export { default as TiMediaPauseOutline } from "../../ti/media-pause-outline";
-export { default as TiMediaPause } from "../../ti/media-pause";
-export { default as TiMediaPlayOutline } from "../../ti/media-play-outline";
-export { default as TiMediaPlayReverseOutline } from "../../ti/media-play-reverse-outline";
-export { default as TiMediaPlayReverse } from "../../ti/media-play-reverse";
-export { default as TiMediaPlay } from "../../ti/media-play";
-export { default as TiMediaRecordOutline } from "../../ti/media-record-outline";
-export { default as TiMediaRecord } from "../../ti/media-record";
-export { default as TiMediaRewindOutline } from "../../ti/media-rewind-outline";
-export { default as TiMediaRewind } from "../../ti/media-rewind";
-export { default as TiMediaStopOutline } from "../../ti/media-stop-outline";
-export { default as TiMediaStop } from "../../ti/media-stop";
-export { default as TiMessageTyping } from "../../ti/message-typing";
-export { default as TiMessage } from "../../ti/message";
-export { default as TiMessages } from "../../ti/messages";
-export { default as TiMicrophoneOutline } from "../../ti/microphone-outline";
-export { default as TiMicrophone } from "../../ti/microphone";
-export { default as TiMinusOutline } from "../../ti/minus-outline";
-export { default as TiMinus } from "../../ti/minus";
-export { default as TiMortarBoard } from "../../ti/mortar-board";
-export { default as TiNews } from "../../ti/news";
-export { default as TiNotesOutline } from "../../ti/notes-outline";
-export { default as TiNotes } from "../../ti/notes";
-export { default as TiPen } from "../../ti/pen";
-export { default as TiPencil } from "../../ti/pencil";
-export { default as TiPhoneOutline } from "../../ti/phone-outline";
-export { default as TiPhone } from "../../ti/phone";
-export { default as TiPiOutline } from "../../ti/pi-outline";
-export { default as TiPi } from "../../ti/pi";
-export { default as TiPinOutline } from "../../ti/pin-outline";
-export { default as TiPin } from "../../ti/pin";
-export { default as TiPipette } from "../../ti/pipette";
-export { default as TiPlaneOutline } from "../../ti/plane-outline";
-export { default as TiPlane } from "../../ti/plane";
-export { default as TiPlug } from "../../ti/plug";
-export { default as TiPlusOutline } from "../../ti/plus-outline";
-export { default as TiPlus } from "../../ti/plus";
-export { default as TiPointOfInterestOutline } from "../../ti/point-of-interest-outline";
-export { default as TiPointOfInterest } from "../../ti/point-of-interest";
-export { default as TiPowerOutline } from "../../ti/power-outline";
-export { default as TiPower } from "../../ti/power";
-export { default as TiPrinter } from "../../ti/printer";
-export { default as TiPuzzleOutline } from "../../ti/puzzle-outline";
-export { default as TiPuzzle } from "../../ti/puzzle";
-export { default as TiRadarOutline } from "../../ti/radar-outline";
-export { default as TiRadar } from "../../ti/radar";
-export { default as TiRefreshOutline } from "../../ti/refresh-outline";
-export { default as TiRefresh } from "../../ti/refresh";
-export { default as TiRssOutline } from "../../ti/rss-outline";
-export { default as TiRss } from "../../ti/rss";
-export { default as TiScissorsOutline } from "../../ti/scissors-outline";
-export { default as TiScissors } from "../../ti/scissors";
-export { default as TiShoppingBag } from "../../ti/shopping-bag";
-export { default as TiShoppingCart } from "../../ti/shopping-cart";
-export { default as TiSocialAtCircular } from "../../ti/social-at-circular";
-export { default as TiSocialDribbbleCircular } from "../../ti/social-dribbble-circular";
-export { default as TiSocialDribbble } from "../../ti/social-dribbble";
-export { default as TiSocialFacebookCircular } from "../../ti/social-facebook-circular";
-export { default as TiSocialFacebook } from "../../ti/social-facebook";
-export { default as TiSocialFlickrCircular } from "../../ti/social-flickr-circular";
-export { default as TiSocialFlickr } from "../../ti/social-flickr";
-export { default as TiSocialGithubCircular } from "../../ti/social-github-circular";
-export { default as TiSocialGithub } from "../../ti/social-github";
-export { default as TiSocialGooglePlusCircular } from "../../ti/social-google-plus-circular";
-export { default as TiSocialGooglePlus } from "../../ti/social-google-plus";
-export { default as TiSocialInstagramCircular } from "../../ti/social-instagram-circular";
-export { default as TiSocialInstagram } from "../../ti/social-instagram";
-export { default as TiSocialLastFmCircular } from "../../ti/social-last-fm-circular";
-export { default as TiSocialLastFm } from "../../ti/social-last-fm";
-export { default as TiSocialLinkedinCircular } from "../../ti/social-linkedin-circular";
-export { default as TiSocialLinkedin } from "../../ti/social-linkedin";
-export { default as TiSocialPinterestCircular } from "../../ti/social-pinterest-circular";
-export { default as TiSocialPinterest } from "../../ti/social-pinterest";
-export { default as TiSocialSkypeOutline } from "../../ti/social-skype-outline";
-export { default as TiSocialSkype } from "../../ti/social-skype";
-export { default as TiSocialTumblerCircular } from "../../ti/social-tumbler-circular";
-export { default as TiSocialTumbler } from "../../ti/social-tumbler";
-export { default as TiSocialTwitterCircular } from "../../ti/social-twitter-circular";
-export { default as TiSocialTwitter } from "../../ti/social-twitter";
-export { default as TiSocialVimeoCircular } from "../../ti/social-vimeo-circular";
-export { default as TiSocialVimeo } from "../../ti/social-vimeo";
-export { default as TiSocialYoutubeCircular } from "../../ti/social-youtube-circular";
-export { default as TiSocialYoutube } from "../../ti/social-youtube";
-export { default as TiSortAlphabeticallyOutline } from "../../ti/sort-alphabetically-outline";
-export { default as TiSortAlphabetically } from "../../ti/sort-alphabetically";
-export { default as TiSortNumericallyOutline } from "../../ti/sort-numerically-outline";
-export { default as TiSortNumerically } from "../../ti/sort-numerically";
-export { default as TiSpannerOutline } from "../../ti/spanner-outline";
-export { default as TiSpanner } from "../../ti/spanner";
-export { default as TiSpiral } from "../../ti/spiral";
-export { default as TiStarFullOutline } from "../../ti/star-full-outline";
-export { default as TiStarHalfOutline } from "../../ti/star-half-outline";
-export { default as TiStarHalf } from "../../ti/star-half";
-export { default as TiStarOutline } from "../../ti/star-outline";
-export { default as TiStar } from "../../ti/star";
-export { default as TiStarburstOutline } from "../../ti/starburst-outline";
-export { default as TiStarburst } from "../../ti/starburst";
-export { default as TiStopwatch } from "../../ti/stopwatch";
-export { default as TiSupport } from "../../ti/support";
-export { default as TiTabsOutline } from "../../ti/tabs-outline";
-export { default as TiTag } from "../../ti/tag";
-export { default as TiTags } from "../../ti/tags";
-export { default as TiThLargeOutline } from "../../ti/th-large-outline";
-export { default as TiThLarge } from "../../ti/th-large";
-export { default as TiThListOutline } from "../../ti/th-list-outline";
-export { default as TiThList } from "../../ti/th-list";
-export { default as TiThMenuOutline } from "../../ti/th-menu-outline";
-export { default as TiThMenu } from "../../ti/th-menu";
-export { default as TiThSmallOutline } from "../../ti/th-small-outline";
-export { default as TiThSmall } from "../../ti/th-small";
-export { default as TiThermometer } from "../../ti/thermometer";
-export { default as TiThumbsDown } from "../../ti/thumbs-down";
-export { default as TiThumbsOk } from "../../ti/thumbs-ok";
-export { default as TiThumbsUp } from "../../ti/thumbs-up";
-export { default as TiTickOutline } from "../../ti/tick-outline";
-export { default as TiTick } from "../../ti/tick";
-export { default as TiTicket } from "../../ti/ticket";
-export { default as TiTime } from "../../ti/time";
-export { default as TiTimesOutline } from "../../ti/times-outline";
-export { default as TiTimes } from "../../ti/times";
-export { default as TiTrash } from "../../ti/trash";
-export { default as TiTree } from "../../ti/tree";
-export { default as TiUploadOutline } from "../../ti/upload-outline";
-export { default as TiUpload } from "../../ti/upload";
-export { default as TiUserAddOutline } from "../../ti/user-add-outline";
-export { default as TiUserAdd } from "../../ti/user-add";
-export { default as TiUserDeleteOutline } from "../../ti/user-delete-outline";
-export { default as TiUserDelete } from "../../ti/user-delete";
-export { default as TiUserOutline } from "../../ti/user-outline";
-export { default as TiUser } from "../../ti/user";
-export { default as TiVendorAndroid } from "../../ti/vendor-android";
-export { default as TiVendorApple } from "../../ti/vendor-apple";
-export { default as TiVendorMicrosoft } from "../../ti/vendor-microsoft";
-export { default as TiVideoOutline } from "../../ti/video-outline";
-export { default as TiVideo } from "../../ti/video";
-export { default as TiVolumeDown } from "../../ti/volume-down";
-export { default as TiVolumeMute } from "../../ti/volume-mute";
-export { default as TiVolumeUp } from "../../ti/volume-up";
-export { default as TiVolume } from "../../ti/volume";
-export { default as TiWarningOutline } from "../../ti/warning-outline";
-export { default as TiWarning } from "../../ti/warning";
-export { default as TiWatch } from "../../ti/watch";
-export { default as TiWavesOutline } from "../../ti/waves-outline";
-export { default as TiWaves } from "../../ti/waves";
-export { default as TiWeatherCloudy } from "../../ti/weather-cloudy";
-export { default as TiWeatherDownpour } from "../../ti/weather-downpour";
-export { default as TiWeatherNight } from "../../ti/weather-night";
-export { default as TiWeatherPartlySunny } from "../../ti/weather-partly-sunny";
-export { default as TiWeatherShower } from "../../ti/weather-shower";
-export { default as TiWeatherSnow } from "../../ti/weather-snow";
-export { default as TiWeatherStormy } from "../../ti/weather-stormy";
-export { default as TiWeatherSunny } from "../../ti/weather-sunny";
-export { default as TiWeatherWindyCloudy } from "../../ti/weather-windy-cloudy";
-export { default as TiWeatherWindy } from "../../ti/weather-windy";
-export { default as TiWiFiOutline } from "../../ti/wi-fi-outline";
-export { default as TiWiFi } from "../../ti/wi-fi";
-export { default as TiWine } from "../../ti/wine";
-export { default as TiWorldOutline } from "../../ti/world-outline";
-export { default as TiWorld } from "../../ti/world";
-export { default as TiZoomInOutline } from "../../ti/zoom-in-outline";
-export { default as TiZoomIn } from "../../ti/zoom-in";
-export { default as TiZoomOutOutline } from "../../ti/zoom-out-outline";
-export { default as TiZoomOut } from "../../ti/zoom-out";
-export { default as TiZoomOutline } from "../../ti/zoom-outline";
-export { default as TiZoom } from "../../ti/zoom";
diff --git a/types/react-icons/lib/ti/infinity-outline.d.ts b/types/react-icons/lib/ti/infinity-outline.d.ts
deleted file mode 100644
index acf82acb79..0000000000
--- a/types/react-icons/lib/ti/infinity-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiInfinityOutline extends React.Component<IconBaseProps> { }
-export = TiInfinityOutline;
diff --git a/types/react-icons/lib/ti/infinity.d.ts b/types/react-icons/lib/ti/infinity.d.ts
deleted file mode 100644
index 2a770bd4ae..0000000000
--- a/types/react-icons/lib/ti/infinity.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiInfinity extends React.Component<IconBaseProps> { }
-export = TiInfinity;
diff --git a/types/react-icons/lib/ti/info-large-outline.d.ts b/types/react-icons/lib/ti/info-large-outline.d.ts
deleted file mode 100644
index 95a74ab971..0000000000
--- a/types/react-icons/lib/ti/info-large-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiInfoLargeOutline extends React.Component<IconBaseProps> { }
-export = TiInfoLargeOutline;
diff --git a/types/react-icons/lib/ti/info-large.d.ts b/types/react-icons/lib/ti/info-large.d.ts
deleted file mode 100644
index ab649a9807..0000000000
--- a/types/react-icons/lib/ti/info-large.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiInfoLarge extends React.Component<IconBaseProps> { }
-export = TiInfoLarge;
diff --git a/types/react-icons/lib/ti/info-outline.d.ts b/types/react-icons/lib/ti/info-outline.d.ts
deleted file mode 100644
index 1dbe44f7e2..0000000000
--- a/types/react-icons/lib/ti/info-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiInfoOutline extends React.Component<IconBaseProps> { }
-export = TiInfoOutline;
diff --git a/types/react-icons/lib/ti/info.d.ts b/types/react-icons/lib/ti/info.d.ts
deleted file mode 100644
index b536268bc5..0000000000
--- a/types/react-icons/lib/ti/info.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiInfo extends React.Component<IconBaseProps> { }
-export = TiInfo;
diff --git a/types/react-icons/lib/ti/input-checked-outline.d.ts b/types/react-icons/lib/ti/input-checked-outline.d.ts
deleted file mode 100644
index 09598d7f9c..0000000000
--- a/types/react-icons/lib/ti/input-checked-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiInputCheckedOutline extends React.Component<IconBaseProps> { }
-export = TiInputCheckedOutline;
diff --git a/types/react-icons/lib/ti/input-checked.d.ts b/types/react-icons/lib/ti/input-checked.d.ts
deleted file mode 100644
index 4a0d3f49e1..0000000000
--- a/types/react-icons/lib/ti/input-checked.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiInputChecked extends React.Component<IconBaseProps> { }
-export = TiInputChecked;
diff --git a/types/react-icons/lib/ti/key-outline.d.ts b/types/react-icons/lib/ti/key-outline.d.ts
deleted file mode 100644
index 3915d81fdc..0000000000
--- a/types/react-icons/lib/ti/key-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiKeyOutline extends React.Component<IconBaseProps> { }
-export = TiKeyOutline;
diff --git a/types/react-icons/lib/ti/key.d.ts b/types/react-icons/lib/ti/key.d.ts
deleted file mode 100644
index 1e5229dd96..0000000000
--- a/types/react-icons/lib/ti/key.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiKey extends React.Component<IconBaseProps> { }
-export = TiKey;
diff --git a/types/react-icons/lib/ti/keyboard.d.ts b/types/react-icons/lib/ti/keyboard.d.ts
deleted file mode 100644
index dbd41ee813..0000000000
--- a/types/react-icons/lib/ti/keyboard.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiKeyboard extends React.Component<IconBaseProps> { }
-export = TiKeyboard;
diff --git a/types/react-icons/lib/ti/leaf.d.ts b/types/react-icons/lib/ti/leaf.d.ts
deleted file mode 100644
index 3548464823..0000000000
--- a/types/react-icons/lib/ti/leaf.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiLeaf extends React.Component<IconBaseProps> { }
-export = TiLeaf;
diff --git a/types/react-icons/lib/ti/lightbulb.d.ts b/types/react-icons/lib/ti/lightbulb.d.ts
deleted file mode 100644
index 7a77c36eb3..0000000000
--- a/types/react-icons/lib/ti/lightbulb.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiLightbulb extends React.Component<IconBaseProps> { }
-export = TiLightbulb;
diff --git a/types/react-icons/lib/ti/link-outline.d.ts b/types/react-icons/lib/ti/link-outline.d.ts
deleted file mode 100644
index 2de0ad9ea8..0000000000
--- a/types/react-icons/lib/ti/link-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiLinkOutline extends React.Component<IconBaseProps> { }
-export = TiLinkOutline;
diff --git a/types/react-icons/lib/ti/link.d.ts b/types/react-icons/lib/ti/link.d.ts
deleted file mode 100644
index f018f05df1..0000000000
--- a/types/react-icons/lib/ti/link.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiLink extends React.Component<IconBaseProps> { }
-export = TiLink;
diff --git a/types/react-icons/lib/ti/location-arrow-outline.d.ts b/types/react-icons/lib/ti/location-arrow-outline.d.ts
deleted file mode 100644
index fa052ba27e..0000000000
--- a/types/react-icons/lib/ti/location-arrow-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiLocationArrowOutline extends React.Component<IconBaseProps> { }
-export = TiLocationArrowOutline;
diff --git a/types/react-icons/lib/ti/location-arrow.d.ts b/types/react-icons/lib/ti/location-arrow.d.ts
deleted file mode 100644
index 17b35056fc..0000000000
--- a/types/react-icons/lib/ti/location-arrow.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiLocationArrow extends React.Component<IconBaseProps> { }
-export = TiLocationArrow;
diff --git a/types/react-icons/lib/ti/location-outline.d.ts b/types/react-icons/lib/ti/location-outline.d.ts
deleted file mode 100644
index 7d31d353d6..0000000000
--- a/types/react-icons/lib/ti/location-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiLocationOutline extends React.Component<IconBaseProps> { }
-export = TiLocationOutline;
diff --git a/types/react-icons/lib/ti/location.d.ts b/types/react-icons/lib/ti/location.d.ts
deleted file mode 100644
index 159dadd5cb..0000000000
--- a/types/react-icons/lib/ti/location.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiLocation extends React.Component<IconBaseProps> { }
-export = TiLocation;
diff --git a/types/react-icons/lib/ti/lock-closed-outline.d.ts b/types/react-icons/lib/ti/lock-closed-outline.d.ts
deleted file mode 100644
index 1c40232eb1..0000000000
--- a/types/react-icons/lib/ti/lock-closed-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiLockClosedOutline extends React.Component<IconBaseProps> { }
-export = TiLockClosedOutline;
diff --git a/types/react-icons/lib/ti/lock-closed.d.ts b/types/react-icons/lib/ti/lock-closed.d.ts
deleted file mode 100644
index 0d45e2e4f5..0000000000
--- a/types/react-icons/lib/ti/lock-closed.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiLockClosed extends React.Component<IconBaseProps> { }
-export = TiLockClosed;
diff --git a/types/react-icons/lib/ti/lock-open-outline.d.ts b/types/react-icons/lib/ti/lock-open-outline.d.ts
deleted file mode 100644
index f2d018becf..0000000000
--- a/types/react-icons/lib/ti/lock-open-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiLockOpenOutline extends React.Component<IconBaseProps> { }
-export = TiLockOpenOutline;
diff --git a/types/react-icons/lib/ti/lock-open.d.ts b/types/react-icons/lib/ti/lock-open.d.ts
deleted file mode 100644
index 710cdb44d8..0000000000
--- a/types/react-icons/lib/ti/lock-open.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiLockOpen extends React.Component<IconBaseProps> { }
-export = TiLockOpen;
diff --git a/types/react-icons/lib/ti/mail.d.ts b/types/react-icons/lib/ti/mail.d.ts
deleted file mode 100644
index 9ee04f24e0..0000000000
--- a/types/react-icons/lib/ti/mail.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMail extends React.Component<IconBaseProps> { }
-export = TiMail;
diff --git a/types/react-icons/lib/ti/map.d.ts b/types/react-icons/lib/ti/map.d.ts
deleted file mode 100644
index 7fe15fa575..0000000000
--- a/types/react-icons/lib/ti/map.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMap extends React.Component<IconBaseProps> { }
-export = TiMap;
diff --git a/types/react-icons/lib/ti/media-eject-outline.d.ts b/types/react-icons/lib/ti/media-eject-outline.d.ts
deleted file mode 100644
index 9351fc551b..0000000000
--- a/types/react-icons/lib/ti/media-eject-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaEjectOutline extends React.Component<IconBaseProps> { }
-export = TiMediaEjectOutline;
diff --git a/types/react-icons/lib/ti/media-eject.d.ts b/types/react-icons/lib/ti/media-eject.d.ts
deleted file mode 100644
index 98aa88f232..0000000000
--- a/types/react-icons/lib/ti/media-eject.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaEject extends React.Component<IconBaseProps> { }
-export = TiMediaEject;
diff --git a/types/react-icons/lib/ti/media-fast-forward-outline.d.ts b/types/react-icons/lib/ti/media-fast-forward-outline.d.ts
deleted file mode 100644
index 42bf3e8957..0000000000
--- a/types/react-icons/lib/ti/media-fast-forward-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaFastForwardOutline extends React.Component<IconBaseProps> { }
-export = TiMediaFastForwardOutline;
diff --git a/types/react-icons/lib/ti/media-fast-forward.d.ts b/types/react-icons/lib/ti/media-fast-forward.d.ts
deleted file mode 100644
index 8793b9f4ef..0000000000
--- a/types/react-icons/lib/ti/media-fast-forward.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaFastForward extends React.Component<IconBaseProps> { }
-export = TiMediaFastForward;
diff --git a/types/react-icons/lib/ti/media-pause-outline.d.ts b/types/react-icons/lib/ti/media-pause-outline.d.ts
deleted file mode 100644
index 9773cb8afe..0000000000
--- a/types/react-icons/lib/ti/media-pause-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaPauseOutline extends React.Component<IconBaseProps> { }
-export = TiMediaPauseOutline;
diff --git a/types/react-icons/lib/ti/media-pause.d.ts b/types/react-icons/lib/ti/media-pause.d.ts
deleted file mode 100644
index 4a81a0a0e5..0000000000
--- a/types/react-icons/lib/ti/media-pause.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaPause extends React.Component<IconBaseProps> { }
-export = TiMediaPause;
diff --git a/types/react-icons/lib/ti/media-play-outline.d.ts b/types/react-icons/lib/ti/media-play-outline.d.ts
deleted file mode 100644
index 4b615f35f1..0000000000
--- a/types/react-icons/lib/ti/media-play-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaPlayOutline extends React.Component<IconBaseProps> { }
-export = TiMediaPlayOutline;
diff --git a/types/react-icons/lib/ti/media-play-reverse-outline.d.ts b/types/react-icons/lib/ti/media-play-reverse-outline.d.ts
deleted file mode 100644
index 2d7a77bb40..0000000000
--- a/types/react-icons/lib/ti/media-play-reverse-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaPlayReverseOutline extends React.Component<IconBaseProps> { }
-export = TiMediaPlayReverseOutline;
diff --git a/types/react-icons/lib/ti/media-play-reverse.d.ts b/types/react-icons/lib/ti/media-play-reverse.d.ts
deleted file mode 100644
index d7d528e46a..0000000000
--- a/types/react-icons/lib/ti/media-play-reverse.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaPlayReverse extends React.Component<IconBaseProps> { }
-export = TiMediaPlayReverse;
diff --git a/types/react-icons/lib/ti/media-play.d.ts b/types/react-icons/lib/ti/media-play.d.ts
deleted file mode 100644
index 8dd20765e2..0000000000
--- a/types/react-icons/lib/ti/media-play.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaPlay extends React.Component<IconBaseProps> { }
-export = TiMediaPlay;
diff --git a/types/react-icons/lib/ti/media-record-outline.d.ts b/types/react-icons/lib/ti/media-record-outline.d.ts
deleted file mode 100644
index f59288ac3c..0000000000
--- a/types/react-icons/lib/ti/media-record-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaRecordOutline extends React.Component<IconBaseProps> { }
-export = TiMediaRecordOutline;
diff --git a/types/react-icons/lib/ti/media-record.d.ts b/types/react-icons/lib/ti/media-record.d.ts
deleted file mode 100644
index 36c9fc9dde..0000000000
--- a/types/react-icons/lib/ti/media-record.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaRecord extends React.Component<IconBaseProps> { }
-export = TiMediaRecord;
diff --git a/types/react-icons/lib/ti/media-rewind-outline.d.ts b/types/react-icons/lib/ti/media-rewind-outline.d.ts
deleted file mode 100644
index 8a27d06c5e..0000000000
--- a/types/react-icons/lib/ti/media-rewind-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaRewindOutline extends React.Component<IconBaseProps> { }
-export = TiMediaRewindOutline;
diff --git a/types/react-icons/lib/ti/media-rewind.d.ts b/types/react-icons/lib/ti/media-rewind.d.ts
deleted file mode 100644
index 48aff4f77f..0000000000
--- a/types/react-icons/lib/ti/media-rewind.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaRewind extends React.Component<IconBaseProps> { }
-export = TiMediaRewind;
diff --git a/types/react-icons/lib/ti/media-stop-outline.d.ts b/types/react-icons/lib/ti/media-stop-outline.d.ts
deleted file mode 100644
index 75aefbad11..0000000000
--- a/types/react-icons/lib/ti/media-stop-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaStopOutline extends React.Component<IconBaseProps> { }
-export = TiMediaStopOutline;
diff --git a/types/react-icons/lib/ti/media-stop.d.ts b/types/react-icons/lib/ti/media-stop.d.ts
deleted file mode 100644
index abd4b9476a..0000000000
--- a/types/react-icons/lib/ti/media-stop.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMediaStop extends React.Component<IconBaseProps> { }
-export = TiMediaStop;
diff --git a/types/react-icons/lib/ti/message-typing.d.ts b/types/react-icons/lib/ti/message-typing.d.ts
deleted file mode 100644
index 56bad96be8..0000000000
--- a/types/react-icons/lib/ti/message-typing.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMessageTyping extends React.Component<IconBaseProps> { }
-export = TiMessageTyping;
diff --git a/types/react-icons/lib/ti/message.d.ts b/types/react-icons/lib/ti/message.d.ts
deleted file mode 100644
index 35cf9dd7fc..0000000000
--- a/types/react-icons/lib/ti/message.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMessage extends React.Component<IconBaseProps> { }
-export = TiMessage;
diff --git a/types/react-icons/lib/ti/messages.d.ts b/types/react-icons/lib/ti/messages.d.ts
deleted file mode 100644
index 8c3df81714..0000000000
--- a/types/react-icons/lib/ti/messages.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMessages extends React.Component<IconBaseProps> { }
-export = TiMessages;
diff --git a/types/react-icons/lib/ti/microphone-outline.d.ts b/types/react-icons/lib/ti/microphone-outline.d.ts
deleted file mode 100644
index 09a858951f..0000000000
--- a/types/react-icons/lib/ti/microphone-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMicrophoneOutline extends React.Component<IconBaseProps> { }
-export = TiMicrophoneOutline;
diff --git a/types/react-icons/lib/ti/microphone.d.ts b/types/react-icons/lib/ti/microphone.d.ts
deleted file mode 100644
index 5cf090cf45..0000000000
--- a/types/react-icons/lib/ti/microphone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMicrophone extends React.Component<IconBaseProps> { }
-export = TiMicrophone;
diff --git a/types/react-icons/lib/ti/minus-outline.d.ts b/types/react-icons/lib/ti/minus-outline.d.ts
deleted file mode 100644
index 0400f00b05..0000000000
--- a/types/react-icons/lib/ti/minus-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMinusOutline extends React.Component<IconBaseProps> { }
-export = TiMinusOutline;
diff --git a/types/react-icons/lib/ti/minus.d.ts b/types/react-icons/lib/ti/minus.d.ts
deleted file mode 100644
index 756e8e77fa..0000000000
--- a/types/react-icons/lib/ti/minus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMinus extends React.Component<IconBaseProps> { }
-export = TiMinus;
diff --git a/types/react-icons/lib/ti/mortar-board.d.ts b/types/react-icons/lib/ti/mortar-board.d.ts
deleted file mode 100644
index b6a130c61a..0000000000
--- a/types/react-icons/lib/ti/mortar-board.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiMortarBoard extends React.Component<IconBaseProps> { }
-export = TiMortarBoard;
diff --git a/types/react-icons/lib/ti/news.d.ts b/types/react-icons/lib/ti/news.d.ts
deleted file mode 100644
index 299b87df70..0000000000
--- a/types/react-icons/lib/ti/news.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiNews extends React.Component<IconBaseProps> { }
-export = TiNews;
diff --git a/types/react-icons/lib/ti/notes-outline.d.ts b/types/react-icons/lib/ti/notes-outline.d.ts
deleted file mode 100644
index 4c88666fd1..0000000000
--- a/types/react-icons/lib/ti/notes-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiNotesOutline extends React.Component<IconBaseProps> { }
-export = TiNotesOutline;
diff --git a/types/react-icons/lib/ti/notes.d.ts b/types/react-icons/lib/ti/notes.d.ts
deleted file mode 100644
index cc14b2a42c..0000000000
--- a/types/react-icons/lib/ti/notes.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiNotes extends React.Component<IconBaseProps> { }
-export = TiNotes;
diff --git a/types/react-icons/lib/ti/pen.d.ts b/types/react-icons/lib/ti/pen.d.ts
deleted file mode 100644
index dca4bfb317..0000000000
--- a/types/react-icons/lib/ti/pen.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPen extends React.Component<IconBaseProps> { }
-export = TiPen;
diff --git a/types/react-icons/lib/ti/pencil.d.ts b/types/react-icons/lib/ti/pencil.d.ts
deleted file mode 100644
index eec2177732..0000000000
--- a/types/react-icons/lib/ti/pencil.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPencil extends React.Component<IconBaseProps> { }
-export = TiPencil;
diff --git a/types/react-icons/lib/ti/phone-outline.d.ts b/types/react-icons/lib/ti/phone-outline.d.ts
deleted file mode 100644
index c4e2f27934..0000000000
--- a/types/react-icons/lib/ti/phone-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPhoneOutline extends React.Component<IconBaseProps> { }
-export = TiPhoneOutline;
diff --git a/types/react-icons/lib/ti/phone.d.ts b/types/react-icons/lib/ti/phone.d.ts
deleted file mode 100644
index b2b26a0ab6..0000000000
--- a/types/react-icons/lib/ti/phone.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPhone extends React.Component<IconBaseProps> { }
-export = TiPhone;
diff --git a/types/react-icons/lib/ti/pi-outline.d.ts b/types/react-icons/lib/ti/pi-outline.d.ts
deleted file mode 100644
index ea31a037be..0000000000
--- a/types/react-icons/lib/ti/pi-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPiOutline extends React.Component<IconBaseProps> { }
-export = TiPiOutline;
diff --git a/types/react-icons/lib/ti/pi.d.ts b/types/react-icons/lib/ti/pi.d.ts
deleted file mode 100644
index f1636e20cb..0000000000
--- a/types/react-icons/lib/ti/pi.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPi extends React.Component<IconBaseProps> { }
-export = TiPi;
diff --git a/types/react-icons/lib/ti/pin-outline.d.ts b/types/react-icons/lib/ti/pin-outline.d.ts
deleted file mode 100644
index 9cdc09aecc..0000000000
--- a/types/react-icons/lib/ti/pin-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPinOutline extends React.Component<IconBaseProps> { }
-export = TiPinOutline;
diff --git a/types/react-icons/lib/ti/pin.d.ts b/types/react-icons/lib/ti/pin.d.ts
deleted file mode 100644
index f1f8a47e48..0000000000
--- a/types/react-icons/lib/ti/pin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPin extends React.Component<IconBaseProps> { }
-export = TiPin;
diff --git a/types/react-icons/lib/ti/pipette.d.ts b/types/react-icons/lib/ti/pipette.d.ts
deleted file mode 100644
index 4c64322983..0000000000
--- a/types/react-icons/lib/ti/pipette.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPipette extends React.Component<IconBaseProps> { }
-export = TiPipette;
diff --git a/types/react-icons/lib/ti/plane-outline.d.ts b/types/react-icons/lib/ti/plane-outline.d.ts
deleted file mode 100644
index 5cb48aff97..0000000000
--- a/types/react-icons/lib/ti/plane-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPlaneOutline extends React.Component<IconBaseProps> { }
-export = TiPlaneOutline;
diff --git a/types/react-icons/lib/ti/plane.d.ts b/types/react-icons/lib/ti/plane.d.ts
deleted file mode 100644
index e1e7a0b826..0000000000
--- a/types/react-icons/lib/ti/plane.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPlane extends React.Component<IconBaseProps> { }
-export = TiPlane;
diff --git a/types/react-icons/lib/ti/plug.d.ts b/types/react-icons/lib/ti/plug.d.ts
deleted file mode 100644
index bda51c16e7..0000000000
--- a/types/react-icons/lib/ti/plug.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPlug extends React.Component<IconBaseProps> { }
-export = TiPlug;
diff --git a/types/react-icons/lib/ti/plus-outline.d.ts b/types/react-icons/lib/ti/plus-outline.d.ts
deleted file mode 100644
index cbda5e05ae..0000000000
--- a/types/react-icons/lib/ti/plus-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPlusOutline extends React.Component<IconBaseProps> { }
-export = TiPlusOutline;
diff --git a/types/react-icons/lib/ti/plus.d.ts b/types/react-icons/lib/ti/plus.d.ts
deleted file mode 100644
index ebe8bd4f33..0000000000
--- a/types/react-icons/lib/ti/plus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPlus extends React.Component<IconBaseProps> { }
-export = TiPlus;
diff --git a/types/react-icons/lib/ti/point-of-interest-outline.d.ts b/types/react-icons/lib/ti/point-of-interest-outline.d.ts
deleted file mode 100644
index e74bd4f576..0000000000
--- a/types/react-icons/lib/ti/point-of-interest-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPointOfInterestOutline extends React.Component<IconBaseProps> { }
-export = TiPointOfInterestOutline;
diff --git a/types/react-icons/lib/ti/point-of-interest.d.ts b/types/react-icons/lib/ti/point-of-interest.d.ts
deleted file mode 100644
index eb92fad9cb..0000000000
--- a/types/react-icons/lib/ti/point-of-interest.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPointOfInterest extends React.Component<IconBaseProps> { }
-export = TiPointOfInterest;
diff --git a/types/react-icons/lib/ti/power-outline.d.ts b/types/react-icons/lib/ti/power-outline.d.ts
deleted file mode 100644
index 36327686e5..0000000000
--- a/types/react-icons/lib/ti/power-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPowerOutline extends React.Component<IconBaseProps> { }
-export = TiPowerOutline;
diff --git a/types/react-icons/lib/ti/power.d.ts b/types/react-icons/lib/ti/power.d.ts
deleted file mode 100644
index 6ad63f6bb4..0000000000
--- a/types/react-icons/lib/ti/power.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPower extends React.Component<IconBaseProps> { }
-export = TiPower;
diff --git a/types/react-icons/lib/ti/printer.d.ts b/types/react-icons/lib/ti/printer.d.ts
deleted file mode 100644
index 7acd512291..0000000000
--- a/types/react-icons/lib/ti/printer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPrinter extends React.Component<IconBaseProps> { }
-export = TiPrinter;
diff --git a/types/react-icons/lib/ti/puzzle-outline.d.ts b/types/react-icons/lib/ti/puzzle-outline.d.ts
deleted file mode 100644
index 24c8a7c3de..0000000000
--- a/types/react-icons/lib/ti/puzzle-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPuzzleOutline extends React.Component<IconBaseProps> { }
-export = TiPuzzleOutline;
diff --git a/types/react-icons/lib/ti/puzzle.d.ts b/types/react-icons/lib/ti/puzzle.d.ts
deleted file mode 100644
index 7a70e99f24..0000000000
--- a/types/react-icons/lib/ti/puzzle.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiPuzzle extends React.Component<IconBaseProps> { }
-export = TiPuzzle;
diff --git a/types/react-icons/lib/ti/radar-outline.d.ts b/types/react-icons/lib/ti/radar-outline.d.ts
deleted file mode 100644
index 2721968675..0000000000
--- a/types/react-icons/lib/ti/radar-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiRadarOutline extends React.Component<IconBaseProps> { }
-export = TiRadarOutline;
diff --git a/types/react-icons/lib/ti/radar.d.ts b/types/react-icons/lib/ti/radar.d.ts
deleted file mode 100644
index eecdf8ed65..0000000000
--- a/types/react-icons/lib/ti/radar.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiRadar extends React.Component<IconBaseProps> { }
-export = TiRadar;
diff --git a/types/react-icons/lib/ti/refresh-outline.d.ts b/types/react-icons/lib/ti/refresh-outline.d.ts
deleted file mode 100644
index 3f63f94c3b..0000000000
--- a/types/react-icons/lib/ti/refresh-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiRefreshOutline extends React.Component<IconBaseProps> { }
-export = TiRefreshOutline;
diff --git a/types/react-icons/lib/ti/refresh.d.ts b/types/react-icons/lib/ti/refresh.d.ts
deleted file mode 100644
index 52fd0e1a43..0000000000
--- a/types/react-icons/lib/ti/refresh.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiRefresh extends React.Component<IconBaseProps> { }
-export = TiRefresh;
diff --git a/types/react-icons/lib/ti/rss-outline.d.ts b/types/react-icons/lib/ti/rss-outline.d.ts
deleted file mode 100644
index 005c3db586..0000000000
--- a/types/react-icons/lib/ti/rss-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiRssOutline extends React.Component<IconBaseProps> { }
-export = TiRssOutline;
diff --git a/types/react-icons/lib/ti/rss.d.ts b/types/react-icons/lib/ti/rss.d.ts
deleted file mode 100644
index bd0b7a7202..0000000000
--- a/types/react-icons/lib/ti/rss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiRss extends React.Component<IconBaseProps> { }
-export = TiRss;
diff --git a/types/react-icons/lib/ti/scissors-outline.d.ts b/types/react-icons/lib/ti/scissors-outline.d.ts
deleted file mode 100644
index 7a51af29a1..0000000000
--- a/types/react-icons/lib/ti/scissors-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiScissorsOutline extends React.Component<IconBaseProps> { }
-export = TiScissorsOutline;
diff --git a/types/react-icons/lib/ti/scissors.d.ts b/types/react-icons/lib/ti/scissors.d.ts
deleted file mode 100644
index 546ec0f5e6..0000000000
--- a/types/react-icons/lib/ti/scissors.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiScissors extends React.Component<IconBaseProps> { }
-export = TiScissors;
diff --git a/types/react-icons/lib/ti/shopping-bag.d.ts b/types/react-icons/lib/ti/shopping-bag.d.ts
deleted file mode 100644
index 4510fcf68f..0000000000
--- a/types/react-icons/lib/ti/shopping-bag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiShoppingBag extends React.Component<IconBaseProps> { }
-export = TiShoppingBag;
diff --git a/types/react-icons/lib/ti/shopping-cart.d.ts b/types/react-icons/lib/ti/shopping-cart.d.ts
deleted file mode 100644
index 29887be2dc..0000000000
--- a/types/react-icons/lib/ti/shopping-cart.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiShoppingCart extends React.Component<IconBaseProps> { }
-export = TiShoppingCart;
diff --git a/types/react-icons/lib/ti/social-at-circular.d.ts b/types/react-icons/lib/ti/social-at-circular.d.ts
deleted file mode 100644
index d361885a4e..0000000000
--- a/types/react-icons/lib/ti/social-at-circular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialAtCircular extends React.Component<IconBaseProps> { }
-export = TiSocialAtCircular;
diff --git a/types/react-icons/lib/ti/social-dribbble-circular.d.ts b/types/react-icons/lib/ti/social-dribbble-circular.d.ts
deleted file mode 100644
index cfc66cd9cb..0000000000
--- a/types/react-icons/lib/ti/social-dribbble-circular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialDribbbleCircular extends React.Component<IconBaseProps> { }
-export = TiSocialDribbbleCircular;
diff --git a/types/react-icons/lib/ti/social-dribbble.d.ts b/types/react-icons/lib/ti/social-dribbble.d.ts
deleted file mode 100644
index 4c7f64be5b..0000000000
--- a/types/react-icons/lib/ti/social-dribbble.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialDribbble extends React.Component<IconBaseProps> { }
-export = TiSocialDribbble;
diff --git a/types/react-icons/lib/ti/social-facebook-circular.d.ts b/types/react-icons/lib/ti/social-facebook-circular.d.ts
deleted file mode 100644
index 056fdc5d33..0000000000
--- a/types/react-icons/lib/ti/social-facebook-circular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialFacebookCircular extends React.Component<IconBaseProps> { }
-export = TiSocialFacebookCircular;
diff --git a/types/react-icons/lib/ti/social-facebook.d.ts b/types/react-icons/lib/ti/social-facebook.d.ts
deleted file mode 100644
index 79f2801b96..0000000000
--- a/types/react-icons/lib/ti/social-facebook.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialFacebook extends React.Component<IconBaseProps> { }
-export = TiSocialFacebook;
diff --git a/types/react-icons/lib/ti/social-flickr-circular.d.ts b/types/react-icons/lib/ti/social-flickr-circular.d.ts
deleted file mode 100644
index 40e5ff2f28..0000000000
--- a/types/react-icons/lib/ti/social-flickr-circular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialFlickrCircular extends React.Component<IconBaseProps> { }
-export = TiSocialFlickrCircular;
diff --git a/types/react-icons/lib/ti/social-flickr.d.ts b/types/react-icons/lib/ti/social-flickr.d.ts
deleted file mode 100644
index a48b8940ee..0000000000
--- a/types/react-icons/lib/ti/social-flickr.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialFlickr extends React.Component<IconBaseProps> { }
-export = TiSocialFlickr;
diff --git a/types/react-icons/lib/ti/social-github-circular.d.ts b/types/react-icons/lib/ti/social-github-circular.d.ts
deleted file mode 100644
index 8649071280..0000000000
--- a/types/react-icons/lib/ti/social-github-circular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialGithubCircular extends React.Component<IconBaseProps> { }
-export = TiSocialGithubCircular;
diff --git a/types/react-icons/lib/ti/social-github.d.ts b/types/react-icons/lib/ti/social-github.d.ts
deleted file mode 100644
index a8506883c5..0000000000
--- a/types/react-icons/lib/ti/social-github.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialGithub extends React.Component<IconBaseProps> { }
-export = TiSocialGithub;
diff --git a/types/react-icons/lib/ti/social-google-plus-circular.d.ts b/types/react-icons/lib/ti/social-google-plus-circular.d.ts
deleted file mode 100644
index 0cf3b77126..0000000000
--- a/types/react-icons/lib/ti/social-google-plus-circular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialGooglePlusCircular extends React.Component<IconBaseProps> { }
-export = TiSocialGooglePlusCircular;
diff --git a/types/react-icons/lib/ti/social-google-plus.d.ts b/types/react-icons/lib/ti/social-google-plus.d.ts
deleted file mode 100644
index 6c23799c8b..0000000000
--- a/types/react-icons/lib/ti/social-google-plus.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialGooglePlus extends React.Component<IconBaseProps> { }
-export = TiSocialGooglePlus;
diff --git a/types/react-icons/lib/ti/social-instagram-circular.d.ts b/types/react-icons/lib/ti/social-instagram-circular.d.ts
deleted file mode 100644
index 842e587a5f..0000000000
--- a/types/react-icons/lib/ti/social-instagram-circular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialInstagramCircular extends React.Component<IconBaseProps> { }
-export = TiSocialInstagramCircular;
diff --git a/types/react-icons/lib/ti/social-instagram.d.ts b/types/react-icons/lib/ti/social-instagram.d.ts
deleted file mode 100644
index 316e5f3eca..0000000000
--- a/types/react-icons/lib/ti/social-instagram.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialInstagram extends React.Component<IconBaseProps> { }
-export = TiSocialInstagram;
diff --git a/types/react-icons/lib/ti/social-last-fm-circular.d.ts b/types/react-icons/lib/ti/social-last-fm-circular.d.ts
deleted file mode 100644
index 55c95c368f..0000000000
--- a/types/react-icons/lib/ti/social-last-fm-circular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialLastFmCircular extends React.Component<IconBaseProps> { }
-export = TiSocialLastFmCircular;
diff --git a/types/react-icons/lib/ti/social-last-fm.d.ts b/types/react-icons/lib/ti/social-last-fm.d.ts
deleted file mode 100644
index 9a5a0cb6b6..0000000000
--- a/types/react-icons/lib/ti/social-last-fm.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialLastFm extends React.Component<IconBaseProps> { }
-export = TiSocialLastFm;
diff --git a/types/react-icons/lib/ti/social-linkedin-circular.d.ts b/types/react-icons/lib/ti/social-linkedin-circular.d.ts
deleted file mode 100644
index 9bddd861a6..0000000000
--- a/types/react-icons/lib/ti/social-linkedin-circular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialLinkedinCircular extends React.Component<IconBaseProps> { }
-export = TiSocialLinkedinCircular;
diff --git a/types/react-icons/lib/ti/social-linkedin.d.ts b/types/react-icons/lib/ti/social-linkedin.d.ts
deleted file mode 100644
index 70b5faa800..0000000000
--- a/types/react-icons/lib/ti/social-linkedin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialLinkedin extends React.Component<IconBaseProps> { }
-export = TiSocialLinkedin;
diff --git a/types/react-icons/lib/ti/social-pinterest-circular.d.ts b/types/react-icons/lib/ti/social-pinterest-circular.d.ts
deleted file mode 100644
index 114f038f36..0000000000
--- a/types/react-icons/lib/ti/social-pinterest-circular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialPinterestCircular extends React.Component<IconBaseProps> { }
-export = TiSocialPinterestCircular;
diff --git a/types/react-icons/lib/ti/social-pinterest.d.ts b/types/react-icons/lib/ti/social-pinterest.d.ts
deleted file mode 100644
index 0d887417e1..0000000000
--- a/types/react-icons/lib/ti/social-pinterest.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialPinterest extends React.Component<IconBaseProps> { }
-export = TiSocialPinterest;
diff --git a/types/react-icons/lib/ti/social-skype-outline.d.ts b/types/react-icons/lib/ti/social-skype-outline.d.ts
deleted file mode 100644
index 33c5d07b8a..0000000000
--- a/types/react-icons/lib/ti/social-skype-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialSkypeOutline extends React.Component<IconBaseProps> { }
-export = TiSocialSkypeOutline;
diff --git a/types/react-icons/lib/ti/social-skype.d.ts b/types/react-icons/lib/ti/social-skype.d.ts
deleted file mode 100644
index 43e9185d3a..0000000000
--- a/types/react-icons/lib/ti/social-skype.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialSkype extends React.Component<IconBaseProps> { }
-export = TiSocialSkype;
diff --git a/types/react-icons/lib/ti/social-tumbler-circular.d.ts b/types/react-icons/lib/ti/social-tumbler-circular.d.ts
deleted file mode 100644
index 5dbf8a7f14..0000000000
--- a/types/react-icons/lib/ti/social-tumbler-circular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialTumblerCircular extends React.Component<IconBaseProps> { }
-export = TiSocialTumblerCircular;
diff --git a/types/react-icons/lib/ti/social-tumbler.d.ts b/types/react-icons/lib/ti/social-tumbler.d.ts
deleted file mode 100644
index 151a8b0edd..0000000000
--- a/types/react-icons/lib/ti/social-tumbler.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialTumbler extends React.Component<IconBaseProps> { }
-export = TiSocialTumbler;
diff --git a/types/react-icons/lib/ti/social-twitter-circular.d.ts b/types/react-icons/lib/ti/social-twitter-circular.d.ts
deleted file mode 100644
index 3ba0fd3df3..0000000000
--- a/types/react-icons/lib/ti/social-twitter-circular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialTwitterCircular extends React.Component<IconBaseProps> { }
-export = TiSocialTwitterCircular;
diff --git a/types/react-icons/lib/ti/social-twitter.d.ts b/types/react-icons/lib/ti/social-twitter.d.ts
deleted file mode 100644
index 27e930ba85..0000000000
--- a/types/react-icons/lib/ti/social-twitter.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialTwitter extends React.Component<IconBaseProps> { }
-export = TiSocialTwitter;
diff --git a/types/react-icons/lib/ti/social-vimeo-circular.d.ts b/types/react-icons/lib/ti/social-vimeo-circular.d.ts
deleted file mode 100644
index bb11c7ae22..0000000000
--- a/types/react-icons/lib/ti/social-vimeo-circular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialVimeoCircular extends React.Component<IconBaseProps> { }
-export = TiSocialVimeoCircular;
diff --git a/types/react-icons/lib/ti/social-vimeo.d.ts b/types/react-icons/lib/ti/social-vimeo.d.ts
deleted file mode 100644
index 2ac061e928..0000000000
--- a/types/react-icons/lib/ti/social-vimeo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialVimeo extends React.Component<IconBaseProps> { }
-export = TiSocialVimeo;
diff --git a/types/react-icons/lib/ti/social-youtube-circular.d.ts b/types/react-icons/lib/ti/social-youtube-circular.d.ts
deleted file mode 100644
index c89a5225c9..0000000000
--- a/types/react-icons/lib/ti/social-youtube-circular.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialYoutubeCircular extends React.Component<IconBaseProps> { }
-export = TiSocialYoutubeCircular;
diff --git a/types/react-icons/lib/ti/social-youtube.d.ts b/types/react-icons/lib/ti/social-youtube.d.ts
deleted file mode 100644
index e8316ce870..0000000000
--- a/types/react-icons/lib/ti/social-youtube.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSocialYoutube extends React.Component<IconBaseProps> { }
-export = TiSocialYoutube;
diff --git a/types/react-icons/lib/ti/sort-alphabetically-outline.d.ts b/types/react-icons/lib/ti/sort-alphabetically-outline.d.ts
deleted file mode 100644
index 65a5887ff5..0000000000
--- a/types/react-icons/lib/ti/sort-alphabetically-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSortAlphabeticallyOutline extends React.Component<IconBaseProps> { }
-export = TiSortAlphabeticallyOutline;
diff --git a/types/react-icons/lib/ti/sort-alphabetically.d.ts b/types/react-icons/lib/ti/sort-alphabetically.d.ts
deleted file mode 100644
index 0ffb8c6a56..0000000000
--- a/types/react-icons/lib/ti/sort-alphabetically.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSortAlphabetically extends React.Component<IconBaseProps> { }
-export = TiSortAlphabetically;
diff --git a/types/react-icons/lib/ti/sort-numerically-outline.d.ts b/types/react-icons/lib/ti/sort-numerically-outline.d.ts
deleted file mode 100644
index d6de6bd6b3..0000000000
--- a/types/react-icons/lib/ti/sort-numerically-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSortNumericallyOutline extends React.Component<IconBaseProps> { }
-export = TiSortNumericallyOutline;
diff --git a/types/react-icons/lib/ti/sort-numerically.d.ts b/types/react-icons/lib/ti/sort-numerically.d.ts
deleted file mode 100644
index 25f11dd093..0000000000
--- a/types/react-icons/lib/ti/sort-numerically.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSortNumerically extends React.Component<IconBaseProps> { }
-export = TiSortNumerically;
diff --git a/types/react-icons/lib/ti/spanner-outline.d.ts b/types/react-icons/lib/ti/spanner-outline.d.ts
deleted file mode 100644
index eb560945b1..0000000000
--- a/types/react-icons/lib/ti/spanner-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSpannerOutline extends React.Component<IconBaseProps> { }
-export = TiSpannerOutline;
diff --git a/types/react-icons/lib/ti/spanner.d.ts b/types/react-icons/lib/ti/spanner.d.ts
deleted file mode 100644
index 7603d7dae8..0000000000
--- a/types/react-icons/lib/ti/spanner.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSpanner extends React.Component<IconBaseProps> { }
-export = TiSpanner;
diff --git a/types/react-icons/lib/ti/spiral.d.ts b/types/react-icons/lib/ti/spiral.d.ts
deleted file mode 100644
index c3c9eb04d0..0000000000
--- a/types/react-icons/lib/ti/spiral.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSpiral extends React.Component<IconBaseProps> { }
-export = TiSpiral;
diff --git a/types/react-icons/lib/ti/star-full-outline.d.ts b/types/react-icons/lib/ti/star-full-outline.d.ts
deleted file mode 100644
index 9e67992135..0000000000
--- a/types/react-icons/lib/ti/star-full-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiStarFullOutline extends React.Component<IconBaseProps> { }
-export = TiStarFullOutline;
diff --git a/types/react-icons/lib/ti/star-half-outline.d.ts b/types/react-icons/lib/ti/star-half-outline.d.ts
deleted file mode 100644
index 4e0da3b6b2..0000000000
--- a/types/react-icons/lib/ti/star-half-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiStarHalfOutline extends React.Component<IconBaseProps> { }
-export = TiStarHalfOutline;
diff --git a/types/react-icons/lib/ti/star-half.d.ts b/types/react-icons/lib/ti/star-half.d.ts
deleted file mode 100644
index cd469744f6..0000000000
--- a/types/react-icons/lib/ti/star-half.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiStarHalf extends React.Component<IconBaseProps> { }
-export = TiStarHalf;
diff --git a/types/react-icons/lib/ti/star-outline.d.ts b/types/react-icons/lib/ti/star-outline.d.ts
deleted file mode 100644
index 1478f12335..0000000000
--- a/types/react-icons/lib/ti/star-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiStarOutline extends React.Component<IconBaseProps> { }
-export = TiStarOutline;
diff --git a/types/react-icons/lib/ti/star.d.ts b/types/react-icons/lib/ti/star.d.ts
deleted file mode 100644
index c0002aca9e..0000000000
--- a/types/react-icons/lib/ti/star.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiStar extends React.Component<IconBaseProps> { }
-export = TiStar;
diff --git a/types/react-icons/lib/ti/starburst-outline.d.ts b/types/react-icons/lib/ti/starburst-outline.d.ts
deleted file mode 100644
index 1291dfdfaf..0000000000
--- a/types/react-icons/lib/ti/starburst-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiStarburstOutline extends React.Component<IconBaseProps> { }
-export = TiStarburstOutline;
diff --git a/types/react-icons/lib/ti/starburst.d.ts b/types/react-icons/lib/ti/starburst.d.ts
deleted file mode 100644
index 84ddfdcda0..0000000000
--- a/types/react-icons/lib/ti/starburst.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiStarburst extends React.Component<IconBaseProps> { }
-export = TiStarburst;
diff --git a/types/react-icons/lib/ti/stopwatch.d.ts b/types/react-icons/lib/ti/stopwatch.d.ts
deleted file mode 100644
index 06dea660b4..0000000000
--- a/types/react-icons/lib/ti/stopwatch.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiStopwatch extends React.Component<IconBaseProps> { }
-export = TiStopwatch;
diff --git a/types/react-icons/lib/ti/support.d.ts b/types/react-icons/lib/ti/support.d.ts
deleted file mode 100644
index e5721d0795..0000000000
--- a/types/react-icons/lib/ti/support.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiSupport extends React.Component<IconBaseProps> { }
-export = TiSupport;
diff --git a/types/react-icons/lib/ti/tabs-outline.d.ts b/types/react-icons/lib/ti/tabs-outline.d.ts
deleted file mode 100644
index c9a1fb6f1c..0000000000
--- a/types/react-icons/lib/ti/tabs-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiTabsOutline extends React.Component<IconBaseProps> { }
-export = TiTabsOutline;
diff --git a/types/react-icons/lib/ti/tag.d.ts b/types/react-icons/lib/ti/tag.d.ts
deleted file mode 100644
index 98fd85c456..0000000000
--- a/types/react-icons/lib/ti/tag.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiTag extends React.Component<IconBaseProps> { }
-export = TiTag;
diff --git a/types/react-icons/lib/ti/tags.d.ts b/types/react-icons/lib/ti/tags.d.ts
deleted file mode 100644
index dd7602c55b..0000000000
--- a/types/react-icons/lib/ti/tags.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiTags extends React.Component<IconBaseProps> { }
-export = TiTags;
diff --git a/types/react-icons/lib/ti/th-large-outline.d.ts b/types/react-icons/lib/ti/th-large-outline.d.ts
deleted file mode 100644
index 4d35e315af..0000000000
--- a/types/react-icons/lib/ti/th-large-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiThLargeOutline extends React.Component<IconBaseProps> { }
-export = TiThLargeOutline;
diff --git a/types/react-icons/lib/ti/th-large.d.ts b/types/react-icons/lib/ti/th-large.d.ts
deleted file mode 100644
index 140da5c2e8..0000000000
--- a/types/react-icons/lib/ti/th-large.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiThLarge extends React.Component<IconBaseProps> { }
-export = TiThLarge;
diff --git a/types/react-icons/lib/ti/th-list-outline.d.ts b/types/react-icons/lib/ti/th-list-outline.d.ts
deleted file mode 100644
index 7b7b0b60cd..0000000000
--- a/types/react-icons/lib/ti/th-list-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiThListOutline extends React.Component<IconBaseProps> { }
-export = TiThListOutline;
diff --git a/types/react-icons/lib/ti/th-list.d.ts b/types/react-icons/lib/ti/th-list.d.ts
deleted file mode 100644
index 115fba8852..0000000000
--- a/types/react-icons/lib/ti/th-list.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiThList extends React.Component<IconBaseProps> { }
-export = TiThList;
diff --git a/types/react-icons/lib/ti/th-menu-outline.d.ts b/types/react-icons/lib/ti/th-menu-outline.d.ts
deleted file mode 100644
index 95133b9279..0000000000
--- a/types/react-icons/lib/ti/th-menu-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiThMenuOutline extends React.Component<IconBaseProps> { }
-export = TiThMenuOutline;
diff --git a/types/react-icons/lib/ti/th-menu.d.ts b/types/react-icons/lib/ti/th-menu.d.ts
deleted file mode 100644
index 86cdbe68a6..0000000000
--- a/types/react-icons/lib/ti/th-menu.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiThMenu extends React.Component<IconBaseProps> { }
-export = TiThMenu;
diff --git a/types/react-icons/lib/ti/th-small-outline.d.ts b/types/react-icons/lib/ti/th-small-outline.d.ts
deleted file mode 100644
index 5698e7d2da..0000000000
--- a/types/react-icons/lib/ti/th-small-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiThSmallOutline extends React.Component<IconBaseProps> { }
-export = TiThSmallOutline;
diff --git a/types/react-icons/lib/ti/th-small.d.ts b/types/react-icons/lib/ti/th-small.d.ts
deleted file mode 100644
index a62a010fb5..0000000000
--- a/types/react-icons/lib/ti/th-small.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiThSmall extends React.Component<IconBaseProps> { }
-export = TiThSmall;
diff --git a/types/react-icons/lib/ti/thermometer.d.ts b/types/react-icons/lib/ti/thermometer.d.ts
deleted file mode 100644
index 215ed0b25f..0000000000
--- a/types/react-icons/lib/ti/thermometer.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiThermometer extends React.Component<IconBaseProps> { }
-export = TiThermometer;
diff --git a/types/react-icons/lib/ti/thumbs-down.d.ts b/types/react-icons/lib/ti/thumbs-down.d.ts
deleted file mode 100644
index 4c9dfec4db..0000000000
--- a/types/react-icons/lib/ti/thumbs-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiThumbsDown extends React.Component<IconBaseProps> { }
-export = TiThumbsDown;
diff --git a/types/react-icons/lib/ti/thumbs-ok.d.ts b/types/react-icons/lib/ti/thumbs-ok.d.ts
deleted file mode 100644
index fa1dc24674..0000000000
--- a/types/react-icons/lib/ti/thumbs-ok.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiThumbsOk extends React.Component<IconBaseProps> { }
-export = TiThumbsOk;
diff --git a/types/react-icons/lib/ti/thumbs-up.d.ts b/types/react-icons/lib/ti/thumbs-up.d.ts
deleted file mode 100644
index 30f7d307c9..0000000000
--- a/types/react-icons/lib/ti/thumbs-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiThumbsUp extends React.Component<IconBaseProps> { }
-export = TiThumbsUp;
diff --git a/types/react-icons/lib/ti/tick-outline.d.ts b/types/react-icons/lib/ti/tick-outline.d.ts
deleted file mode 100644
index a5e042c11f..0000000000
--- a/types/react-icons/lib/ti/tick-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiTickOutline extends React.Component<IconBaseProps> { }
-export = TiTickOutline;
diff --git a/types/react-icons/lib/ti/tick.d.ts b/types/react-icons/lib/ti/tick.d.ts
deleted file mode 100644
index 3d87851d21..0000000000
--- a/types/react-icons/lib/ti/tick.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiTick extends React.Component<IconBaseProps> { }
-export = TiTick;
diff --git a/types/react-icons/lib/ti/ticket.d.ts b/types/react-icons/lib/ti/ticket.d.ts
deleted file mode 100644
index 3dae38b765..0000000000
--- a/types/react-icons/lib/ti/ticket.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiTicket extends React.Component<IconBaseProps> { }
-export = TiTicket;
diff --git a/types/react-icons/lib/ti/time.d.ts b/types/react-icons/lib/ti/time.d.ts
deleted file mode 100644
index 8fa833fac0..0000000000
--- a/types/react-icons/lib/ti/time.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiTime extends React.Component<IconBaseProps> { }
-export = TiTime;
diff --git a/types/react-icons/lib/ti/times-outline.d.ts b/types/react-icons/lib/ti/times-outline.d.ts
deleted file mode 100644
index e5f1c26992..0000000000
--- a/types/react-icons/lib/ti/times-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiTimesOutline extends React.Component<IconBaseProps> { }
-export = TiTimesOutline;
diff --git a/types/react-icons/lib/ti/times.d.ts b/types/react-icons/lib/ti/times.d.ts
deleted file mode 100644
index b919d26cd6..0000000000
--- a/types/react-icons/lib/ti/times.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiTimes extends React.Component<IconBaseProps> { }
-export = TiTimes;
diff --git a/types/react-icons/lib/ti/trash.d.ts b/types/react-icons/lib/ti/trash.d.ts
deleted file mode 100644
index fead6b7a52..0000000000
--- a/types/react-icons/lib/ti/trash.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiTrash extends React.Component<IconBaseProps> { }
-export = TiTrash;
diff --git a/types/react-icons/lib/ti/tree.d.ts b/types/react-icons/lib/ti/tree.d.ts
deleted file mode 100644
index 7e65d3b2b3..0000000000
--- a/types/react-icons/lib/ti/tree.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiTree extends React.Component<IconBaseProps> { }
-export = TiTree;
diff --git a/types/react-icons/lib/ti/upload-outline.d.ts b/types/react-icons/lib/ti/upload-outline.d.ts
deleted file mode 100644
index 6231ad1817..0000000000
--- a/types/react-icons/lib/ti/upload-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiUploadOutline extends React.Component<IconBaseProps> { }
-export = TiUploadOutline;
diff --git a/types/react-icons/lib/ti/upload.d.ts b/types/react-icons/lib/ti/upload.d.ts
deleted file mode 100644
index 9e8cef54e6..0000000000
--- a/types/react-icons/lib/ti/upload.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiUpload extends React.Component<IconBaseProps> { }
-export = TiUpload;
diff --git a/types/react-icons/lib/ti/user-add-outline.d.ts b/types/react-icons/lib/ti/user-add-outline.d.ts
deleted file mode 100644
index a645e140a5..0000000000
--- a/types/react-icons/lib/ti/user-add-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiUserAddOutline extends React.Component<IconBaseProps> { }
-export = TiUserAddOutline;
diff --git a/types/react-icons/lib/ti/user-add.d.ts b/types/react-icons/lib/ti/user-add.d.ts
deleted file mode 100644
index 86c405e8ca..0000000000
--- a/types/react-icons/lib/ti/user-add.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiUserAdd extends React.Component<IconBaseProps> { }
-export = TiUserAdd;
diff --git a/types/react-icons/lib/ti/user-delete-outline.d.ts b/types/react-icons/lib/ti/user-delete-outline.d.ts
deleted file mode 100644
index 4410e4f2b4..0000000000
--- a/types/react-icons/lib/ti/user-delete-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiUserDeleteOutline extends React.Component<IconBaseProps> { }
-export = TiUserDeleteOutline;
diff --git a/types/react-icons/lib/ti/user-delete.d.ts b/types/react-icons/lib/ti/user-delete.d.ts
deleted file mode 100644
index 19908d00c4..0000000000
--- a/types/react-icons/lib/ti/user-delete.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiUserDelete extends React.Component<IconBaseProps> { }
-export = TiUserDelete;
diff --git a/types/react-icons/lib/ti/user-outline.d.ts b/types/react-icons/lib/ti/user-outline.d.ts
deleted file mode 100644
index 39ec3a974c..0000000000
--- a/types/react-icons/lib/ti/user-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiUserOutline extends React.Component<IconBaseProps> { }
-export = TiUserOutline;
diff --git a/types/react-icons/lib/ti/user.d.ts b/types/react-icons/lib/ti/user.d.ts
deleted file mode 100644
index ce655bf6a2..0000000000
--- a/types/react-icons/lib/ti/user.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiUser extends React.Component<IconBaseProps> { }
-export = TiUser;
diff --git a/types/react-icons/lib/ti/vendor-android.d.ts b/types/react-icons/lib/ti/vendor-android.d.ts
deleted file mode 100644
index 19874afcdf..0000000000
--- a/types/react-icons/lib/ti/vendor-android.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiVendorAndroid extends React.Component<IconBaseProps> { }
-export = TiVendorAndroid;
diff --git a/types/react-icons/lib/ti/vendor-apple.d.ts b/types/react-icons/lib/ti/vendor-apple.d.ts
deleted file mode 100644
index bdd568dfd7..0000000000
--- a/types/react-icons/lib/ti/vendor-apple.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiVendorApple extends React.Component<IconBaseProps> { }
-export = TiVendorApple;
diff --git a/types/react-icons/lib/ti/vendor-microsoft.d.ts b/types/react-icons/lib/ti/vendor-microsoft.d.ts
deleted file mode 100644
index 864b8573b3..0000000000
--- a/types/react-icons/lib/ti/vendor-microsoft.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiVendorMicrosoft extends React.Component<IconBaseProps> { }
-export = TiVendorMicrosoft;
diff --git a/types/react-icons/lib/ti/video-outline.d.ts b/types/react-icons/lib/ti/video-outline.d.ts
deleted file mode 100644
index 128e6dc56a..0000000000
--- a/types/react-icons/lib/ti/video-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiVideoOutline extends React.Component<IconBaseProps> { }
-export = TiVideoOutline;
diff --git a/types/react-icons/lib/ti/video.d.ts b/types/react-icons/lib/ti/video.d.ts
deleted file mode 100644
index 8ade0ec0f8..0000000000
--- a/types/react-icons/lib/ti/video.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiVideo extends React.Component<IconBaseProps> { }
-export = TiVideo;
diff --git a/types/react-icons/lib/ti/volume-down.d.ts b/types/react-icons/lib/ti/volume-down.d.ts
deleted file mode 100644
index 1b6bcb569d..0000000000
--- a/types/react-icons/lib/ti/volume-down.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiVolumeDown extends React.Component<IconBaseProps> { }
-export = TiVolumeDown;
diff --git a/types/react-icons/lib/ti/volume-mute.d.ts b/types/react-icons/lib/ti/volume-mute.d.ts
deleted file mode 100644
index 8d3c6884c0..0000000000
--- a/types/react-icons/lib/ti/volume-mute.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiVolumeMute extends React.Component<IconBaseProps> { }
-export = TiVolumeMute;
diff --git a/types/react-icons/lib/ti/volume-up.d.ts b/types/react-icons/lib/ti/volume-up.d.ts
deleted file mode 100644
index 47aaba1cb8..0000000000
--- a/types/react-icons/lib/ti/volume-up.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiVolumeUp extends React.Component<IconBaseProps> { }
-export = TiVolumeUp;
diff --git a/types/react-icons/lib/ti/volume.d.ts b/types/react-icons/lib/ti/volume.d.ts
deleted file mode 100644
index 51aaf0b33b..0000000000
--- a/types/react-icons/lib/ti/volume.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiVolume extends React.Component<IconBaseProps> { }
-export = TiVolume;
diff --git a/types/react-icons/lib/ti/warning-outline.d.ts b/types/react-icons/lib/ti/warning-outline.d.ts
deleted file mode 100644
index 5e5ebbaa1e..0000000000
--- a/types/react-icons/lib/ti/warning-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWarningOutline extends React.Component<IconBaseProps> { }
-export = TiWarningOutline;
diff --git a/types/react-icons/lib/ti/warning.d.ts b/types/react-icons/lib/ti/warning.d.ts
deleted file mode 100644
index 2aeb57fdda..0000000000
--- a/types/react-icons/lib/ti/warning.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWarning extends React.Component<IconBaseProps> { }
-export = TiWarning;
diff --git a/types/react-icons/lib/ti/watch.d.ts b/types/react-icons/lib/ti/watch.d.ts
deleted file mode 100644
index 4734c5b196..0000000000
--- a/types/react-icons/lib/ti/watch.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWatch extends React.Component<IconBaseProps> { }
-export = TiWatch;
diff --git a/types/react-icons/lib/ti/waves-outline.d.ts b/types/react-icons/lib/ti/waves-outline.d.ts
deleted file mode 100644
index 1557bbc07b..0000000000
--- a/types/react-icons/lib/ti/waves-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWavesOutline extends React.Component<IconBaseProps> { }
-export = TiWavesOutline;
diff --git a/types/react-icons/lib/ti/waves.d.ts b/types/react-icons/lib/ti/waves.d.ts
deleted file mode 100644
index 5a2862cc02..0000000000
--- a/types/react-icons/lib/ti/waves.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWaves extends React.Component<IconBaseProps> { }
-export = TiWaves;
diff --git a/types/react-icons/lib/ti/weather-cloudy.d.ts b/types/react-icons/lib/ti/weather-cloudy.d.ts
deleted file mode 100644
index 198d322ec7..0000000000
--- a/types/react-icons/lib/ti/weather-cloudy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWeatherCloudy extends React.Component<IconBaseProps> { }
-export = TiWeatherCloudy;
diff --git a/types/react-icons/lib/ti/weather-downpour.d.ts b/types/react-icons/lib/ti/weather-downpour.d.ts
deleted file mode 100644
index b7b9b61962..0000000000
--- a/types/react-icons/lib/ti/weather-downpour.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWeatherDownpour extends React.Component<IconBaseProps> { }
-export = TiWeatherDownpour;
diff --git a/types/react-icons/lib/ti/weather-night.d.ts b/types/react-icons/lib/ti/weather-night.d.ts
deleted file mode 100644
index afad50979f..0000000000
--- a/types/react-icons/lib/ti/weather-night.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWeatherNight extends React.Component<IconBaseProps> { }
-export = TiWeatherNight;
diff --git a/types/react-icons/lib/ti/weather-partly-sunny.d.ts b/types/react-icons/lib/ti/weather-partly-sunny.d.ts
deleted file mode 100644
index cb328b5118..0000000000
--- a/types/react-icons/lib/ti/weather-partly-sunny.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWeatherPartlySunny extends React.Component<IconBaseProps> { }
-export = TiWeatherPartlySunny;
diff --git a/types/react-icons/lib/ti/weather-shower.d.ts b/types/react-icons/lib/ti/weather-shower.d.ts
deleted file mode 100644
index 3ec7cc4daf..0000000000
--- a/types/react-icons/lib/ti/weather-shower.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWeatherShower extends React.Component<IconBaseProps> { }
-export = TiWeatherShower;
diff --git a/types/react-icons/lib/ti/weather-snow.d.ts b/types/react-icons/lib/ti/weather-snow.d.ts
deleted file mode 100644
index e859e5994c..0000000000
--- a/types/react-icons/lib/ti/weather-snow.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWeatherSnow extends React.Component<IconBaseProps> { }
-export = TiWeatherSnow;
diff --git a/types/react-icons/lib/ti/weather-stormy.d.ts b/types/react-icons/lib/ti/weather-stormy.d.ts
deleted file mode 100644
index bd7a8efe19..0000000000
--- a/types/react-icons/lib/ti/weather-stormy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWeatherStormy extends React.Component<IconBaseProps> { }
-export = TiWeatherStormy;
diff --git a/types/react-icons/lib/ti/weather-sunny.d.ts b/types/react-icons/lib/ti/weather-sunny.d.ts
deleted file mode 100644
index ce0d40f2a0..0000000000
--- a/types/react-icons/lib/ti/weather-sunny.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWeatherSunny extends React.Component<IconBaseProps> { }
-export = TiWeatherSunny;
diff --git a/types/react-icons/lib/ti/weather-windy-cloudy.d.ts b/types/react-icons/lib/ti/weather-windy-cloudy.d.ts
deleted file mode 100644
index c13e223667..0000000000
--- a/types/react-icons/lib/ti/weather-windy-cloudy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWeatherWindyCloudy extends React.Component<IconBaseProps> { }
-export = TiWeatherWindyCloudy;
diff --git a/types/react-icons/lib/ti/weather-windy.d.ts b/types/react-icons/lib/ti/weather-windy.d.ts
deleted file mode 100644
index ca7cad2b89..0000000000
--- a/types/react-icons/lib/ti/weather-windy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWeatherWindy extends React.Component<IconBaseProps> { }
-export = TiWeatherWindy;
diff --git a/types/react-icons/lib/ti/wi-fi-outline.d.ts b/types/react-icons/lib/ti/wi-fi-outline.d.ts
deleted file mode 100644
index 4095d20411..0000000000
--- a/types/react-icons/lib/ti/wi-fi-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWiFiOutline extends React.Component<IconBaseProps> { }
-export = TiWiFiOutline;
diff --git a/types/react-icons/lib/ti/wi-fi.d.ts b/types/react-icons/lib/ti/wi-fi.d.ts
deleted file mode 100644
index cb4b4e788e..0000000000
--- a/types/react-icons/lib/ti/wi-fi.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWiFi extends React.Component<IconBaseProps> { }
-export = TiWiFi;
diff --git a/types/react-icons/lib/ti/wine.d.ts b/types/react-icons/lib/ti/wine.d.ts
deleted file mode 100644
index fadc412a6b..0000000000
--- a/types/react-icons/lib/ti/wine.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWine extends React.Component<IconBaseProps> { }
-export = TiWine;
diff --git a/types/react-icons/lib/ti/world-outline.d.ts b/types/react-icons/lib/ti/world-outline.d.ts
deleted file mode 100644
index e7b86d925a..0000000000
--- a/types/react-icons/lib/ti/world-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWorldOutline extends React.Component<IconBaseProps> { }
-export = TiWorldOutline;
diff --git a/types/react-icons/lib/ti/world.d.ts b/types/react-icons/lib/ti/world.d.ts
deleted file mode 100644
index 259dbe97a1..0000000000
--- a/types/react-icons/lib/ti/world.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiWorld extends React.Component<IconBaseProps> { }
-export = TiWorld;
diff --git a/types/react-icons/lib/ti/zoom-in-outline.d.ts b/types/react-icons/lib/ti/zoom-in-outline.d.ts
deleted file mode 100644
index b53327ba70..0000000000
--- a/types/react-icons/lib/ti/zoom-in-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiZoomInOutline extends React.Component<IconBaseProps> { }
-export = TiZoomInOutline;
diff --git a/types/react-icons/lib/ti/zoom-in.d.ts b/types/react-icons/lib/ti/zoom-in.d.ts
deleted file mode 100644
index 47645f8cee..0000000000
--- a/types/react-icons/lib/ti/zoom-in.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiZoomIn extends React.Component<IconBaseProps> { }
-export = TiZoomIn;
diff --git a/types/react-icons/lib/ti/zoom-out-outline.d.ts b/types/react-icons/lib/ti/zoom-out-outline.d.ts
deleted file mode 100644
index c5db3791a2..0000000000
--- a/types/react-icons/lib/ti/zoom-out-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiZoomOutOutline extends React.Component<IconBaseProps> { }
-export = TiZoomOutOutline;
diff --git a/types/react-icons/lib/ti/zoom-out.d.ts b/types/react-icons/lib/ti/zoom-out.d.ts
deleted file mode 100644
index 50b5101667..0000000000
--- a/types/react-icons/lib/ti/zoom-out.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiZoomOut extends React.Component<IconBaseProps> { }
-export = TiZoomOut;
diff --git a/types/react-icons/lib/ti/zoom-outline.d.ts b/types/react-icons/lib/ti/zoom-outline.d.ts
deleted file mode 100644
index b1e979f087..0000000000
--- a/types/react-icons/lib/ti/zoom-outline.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiZoomOutline extends React.Component<IconBaseProps> { }
-export = TiZoomOutline;
diff --git a/types/react-icons/lib/ti/zoom.d.ts b/types/react-icons/lib/ti/zoom.d.ts
deleted file mode 100644
index 55283917ac..0000000000
--- a/types/react-icons/lib/ti/zoom.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class TiZoom extends React.Component<IconBaseProps> { }
-export = TiZoom;
diff --git a/types/react-icons/md/3d-rotation.d.ts b/types/react-icons/md/3d-rotation.d.ts
deleted file mode 100644
index 39d7887e16..0000000000
--- a/types/react-icons/md/3d-rotation.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class Md3dRotation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/ac-unit.d.ts b/types/react-icons/md/ac-unit.d.ts
deleted file mode 100644
index 19f6257f61..0000000000
--- a/types/react-icons/md/ac-unit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAcUnit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/access-alarm.d.ts b/types/react-icons/md/access-alarm.d.ts
deleted file mode 100644
index 8bfb8edd91..0000000000
--- a/types/react-icons/md/access-alarm.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAccessAlarm extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/access-alarms.d.ts b/types/react-icons/md/access-alarms.d.ts
deleted file mode 100644
index 0d5b3fa4db..0000000000
--- a/types/react-icons/md/access-alarms.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAccessAlarms extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/access-time.d.ts b/types/react-icons/md/access-time.d.ts
deleted file mode 100644
index 552cf439f3..0000000000
--- a/types/react-icons/md/access-time.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAccessTime extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/accessibility.d.ts b/types/react-icons/md/accessibility.d.ts
deleted file mode 100644
index 4160aa2c69..0000000000
--- a/types/react-icons/md/accessibility.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAccessibility extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/accessible.d.ts b/types/react-icons/md/accessible.d.ts
deleted file mode 100644
index 180d7b0bc5..0000000000
--- a/types/react-icons/md/accessible.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAccessible extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/account-balance-wallet.d.ts b/types/react-icons/md/account-balance-wallet.d.ts
deleted file mode 100644
index 469c3e9876..0000000000
--- a/types/react-icons/md/account-balance-wallet.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAccountBalanceWallet extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/account-balance.d.ts b/types/react-icons/md/account-balance.d.ts
deleted file mode 100644
index 22edcbea9a..0000000000
--- a/types/react-icons/md/account-balance.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAccountBalance extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/account-box.d.ts b/types/react-icons/md/account-box.d.ts
deleted file mode 100644
index c49ee5214e..0000000000
--- a/types/react-icons/md/account-box.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAccountBox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/account-circle.d.ts b/types/react-icons/md/account-circle.d.ts
deleted file mode 100644
index 6c9eab8aaf..0000000000
--- a/types/react-icons/md/account-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAccountCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/adb.d.ts b/types/react-icons/md/adb.d.ts
deleted file mode 100644
index f056821ad5..0000000000
--- a/types/react-icons/md/adb.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAdb extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/add-a-photo.d.ts b/types/react-icons/md/add-a-photo.d.ts
deleted file mode 100644
index 570d26f3da..0000000000
--- a/types/react-icons/md/add-a-photo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAddAPhoto extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/add-alarm.d.ts b/types/react-icons/md/add-alarm.d.ts
deleted file mode 100644
index 6b6f78f4b9..0000000000
--- a/types/react-icons/md/add-alarm.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAddAlarm extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/add-alert.d.ts b/types/react-icons/md/add-alert.d.ts
deleted file mode 100644
index b422649d52..0000000000
--- a/types/react-icons/md/add-alert.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAddAlert extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/add-box.d.ts b/types/react-icons/md/add-box.d.ts
deleted file mode 100644
index 51e1f765c0..0000000000
--- a/types/react-icons/md/add-box.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAddBox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/add-circle-outline.d.ts b/types/react-icons/md/add-circle-outline.d.ts
deleted file mode 100644
index 981d8bb9ce..0000000000
--- a/types/react-icons/md/add-circle-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAddCircleOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/add-circle.d.ts b/types/react-icons/md/add-circle.d.ts
deleted file mode 100644
index a0a0991c0c..0000000000
--- a/types/react-icons/md/add-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAddCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/add-location.d.ts b/types/react-icons/md/add-location.d.ts
deleted file mode 100644
index 98b0f328a3..0000000000
--- a/types/react-icons/md/add-location.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAddLocation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/add-shopping-cart.d.ts b/types/react-icons/md/add-shopping-cart.d.ts
deleted file mode 100644
index 52ad95dd6f..0000000000
--- a/types/react-icons/md/add-shopping-cart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAddShoppingCart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/add-to-photos.d.ts b/types/react-icons/md/add-to-photos.d.ts
deleted file mode 100644
index 0eac8c47b2..0000000000
--- a/types/react-icons/md/add-to-photos.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAddToPhotos extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/add-to-queue.d.ts b/types/react-icons/md/add-to-queue.d.ts
deleted file mode 100644
index 2bf4474037..0000000000
--- a/types/react-icons/md/add-to-queue.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAddToQueue extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/add.d.ts b/types/react-icons/md/add.d.ts
deleted file mode 100644
index 1b7fb63078..0000000000
--- a/types/react-icons/md/add.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAdd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/adjust.d.ts b/types/react-icons/md/adjust.d.ts
deleted file mode 100644
index c511d98a86..0000000000
--- a/types/react-icons/md/adjust.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAdjust extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/airline-seat-flat-angled.d.ts b/types/react-icons/md/airline-seat-flat-angled.d.ts
deleted file mode 100644
index 27306970ac..0000000000
--- a/types/react-icons/md/airline-seat-flat-angled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatFlatAngled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/airline-seat-flat.d.ts b/types/react-icons/md/airline-seat-flat.d.ts
deleted file mode 100644
index 2708f28c19..0000000000
--- a/types/react-icons/md/airline-seat-flat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatFlat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/airline-seat-individual-suite.d.ts b/types/react-icons/md/airline-seat-individual-suite.d.ts
deleted file mode 100644
index 1231fdffbc..0000000000
--- a/types/react-icons/md/airline-seat-individual-suite.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatIndividualSuite extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/airline-seat-legroom-extra.d.ts b/types/react-icons/md/airline-seat-legroom-extra.d.ts
deleted file mode 100644
index 8e48abc5df..0000000000
--- a/types/react-icons/md/airline-seat-legroom-extra.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatLegroomExtra extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/airline-seat-legroom-normal.d.ts b/types/react-icons/md/airline-seat-legroom-normal.d.ts
deleted file mode 100644
index 09cdf92d8a..0000000000
--- a/types/react-icons/md/airline-seat-legroom-normal.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatLegroomNormal extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/airline-seat-legroom-reduced.d.ts b/types/react-icons/md/airline-seat-legroom-reduced.d.ts
deleted file mode 100644
index e969b216a4..0000000000
--- a/types/react-icons/md/airline-seat-legroom-reduced.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatLegroomReduced extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/airline-seat-recline-extra.d.ts b/types/react-icons/md/airline-seat-recline-extra.d.ts
deleted file mode 100644
index f675688c5c..0000000000
--- a/types/react-icons/md/airline-seat-recline-extra.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatReclineExtra extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/airline-seat-recline-normal.d.ts b/types/react-icons/md/airline-seat-recline-normal.d.ts
deleted file mode 100644
index 2d7aeacd54..0000000000
--- a/types/react-icons/md/airline-seat-recline-normal.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatReclineNormal extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/airplanemode-active.d.ts b/types/react-icons/md/airplanemode-active.d.ts
deleted file mode 100644
index 64924f7457..0000000000
--- a/types/react-icons/md/airplanemode-active.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAirplanemodeActive extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/airplanemode-inactive.d.ts b/types/react-icons/md/airplanemode-inactive.d.ts
deleted file mode 100644
index bea28feef8..0000000000
--- a/types/react-icons/md/airplanemode-inactive.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAirplanemodeInactive extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/airplay.d.ts b/types/react-icons/md/airplay.d.ts
deleted file mode 100644
index 0b7d8346dc..0000000000
--- a/types/react-icons/md/airplay.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAirplay extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/airport-shuttle.d.ts b/types/react-icons/md/airport-shuttle.d.ts
deleted file mode 100644
index 4d81dcca74..0000000000
--- a/types/react-icons/md/airport-shuttle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAirportShuttle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/alarm-add.d.ts b/types/react-icons/md/alarm-add.d.ts
deleted file mode 100644
index d54261c71e..0000000000
--- a/types/react-icons/md/alarm-add.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAlarmAdd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/alarm-off.d.ts b/types/react-icons/md/alarm-off.d.ts
deleted file mode 100644
index 637956f31a..0000000000
--- a/types/react-icons/md/alarm-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAlarmOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/alarm-on.d.ts b/types/react-icons/md/alarm-on.d.ts
deleted file mode 100644
index 8ced06b55a..0000000000
--- a/types/react-icons/md/alarm-on.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAlarmOn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/alarm.d.ts b/types/react-icons/md/alarm.d.ts
deleted file mode 100644
index 784b55604a..0000000000
--- a/types/react-icons/md/alarm.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAlarm extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/album.d.ts b/types/react-icons/md/album.d.ts
deleted file mode 100644
index b7c2dedcad..0000000000
--- a/types/react-icons/md/album.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAlbum extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/all-inclusive.d.ts b/types/react-icons/md/all-inclusive.d.ts
deleted file mode 100644
index 121315d268..0000000000
--- a/types/react-icons/md/all-inclusive.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAllInclusive extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/all-out.d.ts b/types/react-icons/md/all-out.d.ts
deleted file mode 100644
index feba801059..0000000000
--- a/types/react-icons/md/all-out.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAllOut extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/android.d.ts b/types/react-icons/md/android.d.ts
deleted file mode 100644
index d5821263bd..0000000000
--- a/types/react-icons/md/android.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAndroid extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/announcement.d.ts b/types/react-icons/md/announcement.d.ts
deleted file mode 100644
index 05af68d6c9..0000000000
--- a/types/react-icons/md/announcement.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAnnouncement extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/apps.d.ts b/types/react-icons/md/apps.d.ts
deleted file mode 100644
index 605c867e9d..0000000000
--- a/types/react-icons/md/apps.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdApps extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/archive.d.ts b/types/react-icons/md/archive.d.ts
deleted file mode 100644
index 00cc76de31..0000000000
--- a/types/react-icons/md/archive.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdArchive extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/arrow-back.d.ts b/types/react-icons/md/arrow-back.d.ts
deleted file mode 100644
index d140fa63a4..0000000000
--- a/types/react-icons/md/arrow-back.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowBack extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/arrow-downward.d.ts b/types/react-icons/md/arrow-downward.d.ts
deleted file mode 100644
index 2d764aa5a0..0000000000
--- a/types/react-icons/md/arrow-downward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowDownward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/arrow-drop-down-circle.d.ts b/types/react-icons/md/arrow-drop-down-circle.d.ts
deleted file mode 100644
index 4a2bae7ded..0000000000
--- a/types/react-icons/md/arrow-drop-down-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowDropDownCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/arrow-drop-down.d.ts b/types/react-icons/md/arrow-drop-down.d.ts
deleted file mode 100644
index 0e99216f42..0000000000
--- a/types/react-icons/md/arrow-drop-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowDropDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/arrow-drop-up.d.ts b/types/react-icons/md/arrow-drop-up.d.ts
deleted file mode 100644
index efa55f2df4..0000000000
--- a/types/react-icons/md/arrow-drop-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowDropUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/arrow-forward.d.ts b/types/react-icons/md/arrow-forward.d.ts
deleted file mode 100644
index 1d3771ddd7..0000000000
--- a/types/react-icons/md/arrow-forward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowForward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/arrow-upward.d.ts b/types/react-icons/md/arrow-upward.d.ts
deleted file mode 100644
index cd8f601ed9..0000000000
--- a/types/react-icons/md/arrow-upward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowUpward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/art-track.d.ts b/types/react-icons/md/art-track.d.ts
deleted file mode 100644
index 9893405dfd..0000000000
--- a/types/react-icons/md/art-track.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdArtTrack extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/aspect-ratio.d.ts b/types/react-icons/md/aspect-ratio.d.ts
deleted file mode 100644
index b0d6311f3e..0000000000
--- a/types/react-icons/md/aspect-ratio.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAspectRatio extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/assessment.d.ts b/types/react-icons/md/assessment.d.ts
deleted file mode 100644
index 1c4979bd1f..0000000000
--- a/types/react-icons/md/assessment.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAssessment extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/assignment-ind.d.ts b/types/react-icons/md/assignment-ind.d.ts
deleted file mode 100644
index 6a0c5f2107..0000000000
--- a/types/react-icons/md/assignment-ind.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignmentInd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/assignment-late.d.ts b/types/react-icons/md/assignment-late.d.ts
deleted file mode 100644
index 5aa4d5dcdd..0000000000
--- a/types/react-icons/md/assignment-late.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignmentLate extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/assignment-return.d.ts b/types/react-icons/md/assignment-return.d.ts
deleted file mode 100644
index e34eea0e8d..0000000000
--- a/types/react-icons/md/assignment-return.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignmentReturn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/assignment-returned.d.ts b/types/react-icons/md/assignment-returned.d.ts
deleted file mode 100644
index 5f3c6039ee..0000000000
--- a/types/react-icons/md/assignment-returned.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignmentReturned extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/assignment-turned-in.d.ts b/types/react-icons/md/assignment-turned-in.d.ts
deleted file mode 100644
index c055e90d7f..0000000000
--- a/types/react-icons/md/assignment-turned-in.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignmentTurnedIn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/assignment.d.ts b/types/react-icons/md/assignment.d.ts
deleted file mode 100644
index dc96f96868..0000000000
--- a/types/react-icons/md/assignment.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignment extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/assistant-photo.d.ts b/types/react-icons/md/assistant-photo.d.ts
deleted file mode 100644
index 2bf4459503..0000000000
--- a/types/react-icons/md/assistant-photo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAssistantPhoto extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/assistant.d.ts b/types/react-icons/md/assistant.d.ts
deleted file mode 100644
index 06007d112b..0000000000
--- a/types/react-icons/md/assistant.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAssistant extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/attach-file.d.ts b/types/react-icons/md/attach-file.d.ts
deleted file mode 100644
index 62aba0f830..0000000000
--- a/types/react-icons/md/attach-file.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAttachFile extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/attach-money.d.ts b/types/react-icons/md/attach-money.d.ts
deleted file mode 100644
index 23dfd03a14..0000000000
--- a/types/react-icons/md/attach-money.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAttachMoney extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/attachment.d.ts b/types/react-icons/md/attachment.d.ts
deleted file mode 100644
index 66a076a0df..0000000000
--- a/types/react-icons/md/attachment.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAttachment extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/audiotrack.d.ts b/types/react-icons/md/audiotrack.d.ts
deleted file mode 100644
index 0fb3a781aa..0000000000
--- a/types/react-icons/md/audiotrack.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAudiotrack extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/autorenew.d.ts b/types/react-icons/md/autorenew.d.ts
deleted file mode 100644
index 3dc1215c35..0000000000
--- a/types/react-icons/md/autorenew.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAutorenew extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/av-timer.d.ts b/types/react-icons/md/av-timer.d.ts
deleted file mode 100644
index d050eb13b6..0000000000
--- a/types/react-icons/md/av-timer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdAvTimer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/backspace.d.ts b/types/react-icons/md/backspace.d.ts
deleted file mode 100644
index c462bc8c5c..0000000000
--- a/types/react-icons/md/backspace.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBackspace extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/backup.d.ts b/types/react-icons/md/backup.d.ts
deleted file mode 100644
index ab43c6934f..0000000000
--- a/types/react-icons/md/backup.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBackup extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/battery-alert.d.ts b/types/react-icons/md/battery-alert.d.ts
deleted file mode 100644
index c19ea98a0b..0000000000
--- a/types/react-icons/md/battery-alert.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBatteryAlert extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/battery-charging-full.d.ts b/types/react-icons/md/battery-charging-full.d.ts
deleted file mode 100644
index c85f75a71a..0000000000
--- a/types/react-icons/md/battery-charging-full.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBatteryChargingFull extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/battery-full.d.ts b/types/react-icons/md/battery-full.d.ts
deleted file mode 100644
index 0aca5efc47..0000000000
--- a/types/react-icons/md/battery-full.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBatteryFull extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/battery-std.d.ts b/types/react-icons/md/battery-std.d.ts
deleted file mode 100644
index 3db6971900..0000000000
--- a/types/react-icons/md/battery-std.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBatteryStd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/battery-unknown.d.ts b/types/react-icons/md/battery-unknown.d.ts
deleted file mode 100644
index 85dc874ccb..0000000000
--- a/types/react-icons/md/battery-unknown.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBatteryUnknown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/beach-access.d.ts b/types/react-icons/md/beach-access.d.ts
deleted file mode 100644
index bb0f5e8d09..0000000000
--- a/types/react-icons/md/beach-access.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBeachAccess extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/beenhere.d.ts b/types/react-icons/md/beenhere.d.ts
deleted file mode 100644
index a428d7199e..0000000000
--- a/types/react-icons/md/beenhere.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBeenhere extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/block.d.ts b/types/react-icons/md/block.d.ts
deleted file mode 100644
index f5496f14bb..0000000000
--- a/types/react-icons/md/block.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBlock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/bluetooth-audio.d.ts b/types/react-icons/md/bluetooth-audio.d.ts
deleted file mode 100644
index 29629f8a81..0000000000
--- a/types/react-icons/md/bluetooth-audio.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBluetoothAudio extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/bluetooth-connected.d.ts b/types/react-icons/md/bluetooth-connected.d.ts
deleted file mode 100644
index 7ea9477b1b..0000000000
--- a/types/react-icons/md/bluetooth-connected.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBluetoothConnected extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/bluetooth-disabled.d.ts b/types/react-icons/md/bluetooth-disabled.d.ts
deleted file mode 100644
index 685074c6eb..0000000000
--- a/types/react-icons/md/bluetooth-disabled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBluetoothDisabled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/bluetooth-searching.d.ts b/types/react-icons/md/bluetooth-searching.d.ts
deleted file mode 100644
index d258e69bd7..0000000000
--- a/types/react-icons/md/bluetooth-searching.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBluetoothSearching extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/bluetooth.d.ts b/types/react-icons/md/bluetooth.d.ts
deleted file mode 100644
index 9343fadbf2..0000000000
--- a/types/react-icons/md/bluetooth.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBluetooth extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/blur-circular.d.ts b/types/react-icons/md/blur-circular.d.ts
deleted file mode 100644
index 27b3bb0ae2..0000000000
--- a/types/react-icons/md/blur-circular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBlurCircular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/blur-linear.d.ts b/types/react-icons/md/blur-linear.d.ts
deleted file mode 100644
index e077a469b1..0000000000
--- a/types/react-icons/md/blur-linear.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBlurLinear extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/blur-off.d.ts b/types/react-icons/md/blur-off.d.ts
deleted file mode 100644
index df3c89e207..0000000000
--- a/types/react-icons/md/blur-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBlurOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/blur-on.d.ts b/types/react-icons/md/blur-on.d.ts
deleted file mode 100644
index ade64f3147..0000000000
--- a/types/react-icons/md/blur-on.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBlurOn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/book.d.ts b/types/react-icons/md/book.d.ts
deleted file mode 100644
index 593fefe912..0000000000
--- a/types/react-icons/md/book.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBook extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/bookmark-outline.d.ts b/types/react-icons/md/bookmark-outline.d.ts
deleted file mode 100644
index 630c78b12b..0000000000
--- a/types/react-icons/md/bookmark-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBookmarkOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/bookmark.d.ts b/types/react-icons/md/bookmark.d.ts
deleted file mode 100644
index b180f81ce4..0000000000
--- a/types/react-icons/md/bookmark.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBookmark extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/border-all.d.ts b/types/react-icons/md/border-all.d.ts
deleted file mode 100644
index 111f24de6b..0000000000
--- a/types/react-icons/md/border-all.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderAll extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/border-bottom.d.ts b/types/react-icons/md/border-bottom.d.ts
deleted file mode 100644
index 979bd252bb..0000000000
--- a/types/react-icons/md/border-bottom.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderBottom extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/border-clear.d.ts b/types/react-icons/md/border-clear.d.ts
deleted file mode 100644
index 2d76f24b12..0000000000
--- a/types/react-icons/md/border-clear.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderClear extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/border-color.d.ts b/types/react-icons/md/border-color.d.ts
deleted file mode 100644
index b9ddd9918c..0000000000
--- a/types/react-icons/md/border-color.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderColor extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/border-horizontal.d.ts b/types/react-icons/md/border-horizontal.d.ts
deleted file mode 100644
index 7f1e473277..0000000000
--- a/types/react-icons/md/border-horizontal.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderHorizontal extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/border-inner.d.ts b/types/react-icons/md/border-inner.d.ts
deleted file mode 100644
index 2a807b9ce2..0000000000
--- a/types/react-icons/md/border-inner.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderInner extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/border-left.d.ts b/types/react-icons/md/border-left.d.ts
deleted file mode 100644
index 062bf7af75..0000000000
--- a/types/react-icons/md/border-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/border-outer.d.ts b/types/react-icons/md/border-outer.d.ts
deleted file mode 100644
index 60e13b29ad..0000000000
--- a/types/react-icons/md/border-outer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderOuter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/border-right.d.ts b/types/react-icons/md/border-right.d.ts
deleted file mode 100644
index 8bb225c8d9..0000000000
--- a/types/react-icons/md/border-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/border-style.d.ts b/types/react-icons/md/border-style.d.ts
deleted file mode 100644
index 92da93bb6d..0000000000
--- a/types/react-icons/md/border-style.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderStyle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/border-top.d.ts b/types/react-icons/md/border-top.d.ts
deleted file mode 100644
index 32a4a828a8..0000000000
--- a/types/react-icons/md/border-top.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderTop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/border-vertical.d.ts b/types/react-icons/md/border-vertical.d.ts
deleted file mode 100644
index dce912d6de..0000000000
--- a/types/react-icons/md/border-vertical.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderVertical extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/branding-watermark.d.ts b/types/react-icons/md/branding-watermark.d.ts
deleted file mode 100644
index 92ae821285..0000000000
--- a/types/react-icons/md/branding-watermark.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBrandingWatermark extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/brightness-1.d.ts b/types/react-icons/md/brightness-1.d.ts
deleted file mode 100644
index 2ac3e1dd25..0000000000
--- a/types/react-icons/md/brightness-1.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness1 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/brightness-2.d.ts b/types/react-icons/md/brightness-2.d.ts
deleted file mode 100644
index ad9eae9cb1..0000000000
--- a/types/react-icons/md/brightness-2.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness2 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/brightness-3.d.ts b/types/react-icons/md/brightness-3.d.ts
deleted file mode 100644
index 929e3196af..0000000000
--- a/types/react-icons/md/brightness-3.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness3 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/brightness-4.d.ts b/types/react-icons/md/brightness-4.d.ts
deleted file mode 100644
index eeac7b21a5..0000000000
--- a/types/react-icons/md/brightness-4.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness4 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/brightness-5.d.ts b/types/react-icons/md/brightness-5.d.ts
deleted file mode 100644
index 26dc5fc08c..0000000000
--- a/types/react-icons/md/brightness-5.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness5 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/brightness-6.d.ts b/types/react-icons/md/brightness-6.d.ts
deleted file mode 100644
index c59e6345b0..0000000000
--- a/types/react-icons/md/brightness-6.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness6 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/brightness-7.d.ts b/types/react-icons/md/brightness-7.d.ts
deleted file mode 100644
index 00510b48a7..0000000000
--- a/types/react-icons/md/brightness-7.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness7 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/brightness-auto.d.ts b/types/react-icons/md/brightness-auto.d.ts
deleted file mode 100644
index 7fd30ba582..0000000000
--- a/types/react-icons/md/brightness-auto.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightnessAuto extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/brightness-high.d.ts b/types/react-icons/md/brightness-high.d.ts
deleted file mode 100644
index 65eb9716e2..0000000000
--- a/types/react-icons/md/brightness-high.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightnessHigh extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/brightness-low.d.ts b/types/react-icons/md/brightness-low.d.ts
deleted file mode 100644
index 7a4220918a..0000000000
--- a/types/react-icons/md/brightness-low.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightnessLow extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/brightness-medium.d.ts b/types/react-icons/md/brightness-medium.d.ts
deleted file mode 100644
index bcae811361..0000000000
--- a/types/react-icons/md/brightness-medium.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightnessMedium extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/broken-image.d.ts b/types/react-icons/md/broken-image.d.ts
deleted file mode 100644
index 26a5256e01..0000000000
--- a/types/react-icons/md/broken-image.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBrokenImage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/brush.d.ts b/types/react-icons/md/brush.d.ts
deleted file mode 100644
index 71e04689f2..0000000000
--- a/types/react-icons/md/brush.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBrush extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/bubble-chart.d.ts b/types/react-icons/md/bubble-chart.d.ts
deleted file mode 100644
index d893d4d2a1..0000000000
--- a/types/react-icons/md/bubble-chart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBubbleChart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/bug-report.d.ts b/types/react-icons/md/bug-report.d.ts
deleted file mode 100644
index 8d5b5f78ef..0000000000
--- a/types/react-icons/md/bug-report.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBugReport extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/build.d.ts b/types/react-icons/md/build.d.ts
deleted file mode 100644
index 3969a9d67d..0000000000
--- a/types/react-icons/md/build.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBuild extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/burst-mode.d.ts b/types/react-icons/md/burst-mode.d.ts
deleted file mode 100644
index 2db0673b64..0000000000
--- a/types/react-icons/md/burst-mode.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBurstMode extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/business-center.d.ts b/types/react-icons/md/business-center.d.ts
deleted file mode 100644
index 019568bc79..0000000000
--- a/types/react-icons/md/business-center.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBusinessCenter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/business.d.ts b/types/react-icons/md/business.d.ts
deleted file mode 100644
index aee4700728..0000000000
--- a/types/react-icons/md/business.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdBusiness extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/cached.d.ts b/types/react-icons/md/cached.d.ts
deleted file mode 100644
index e26b176124..0000000000
--- a/types/react-icons/md/cached.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCached extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/cake.d.ts b/types/react-icons/md/cake.d.ts
deleted file mode 100644
index 757d94fa73..0000000000
--- a/types/react-icons/md/cake.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCake extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/call-end.d.ts b/types/react-icons/md/call-end.d.ts
deleted file mode 100644
index fcb323974c..0000000000
--- a/types/react-icons/md/call-end.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCallEnd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/call-made.d.ts b/types/react-icons/md/call-made.d.ts
deleted file mode 100644
index d7523be94c..0000000000
--- a/types/react-icons/md/call-made.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCallMade extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/call-merge.d.ts b/types/react-icons/md/call-merge.d.ts
deleted file mode 100644
index 9c7369c900..0000000000
--- a/types/react-icons/md/call-merge.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCallMerge extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/call-missed-outgoing.d.ts b/types/react-icons/md/call-missed-outgoing.d.ts
deleted file mode 100644
index f03613faad..0000000000
--- a/types/react-icons/md/call-missed-outgoing.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCallMissedOutgoing extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/call-missed.d.ts b/types/react-icons/md/call-missed.d.ts
deleted file mode 100644
index c999bb5cab..0000000000
--- a/types/react-icons/md/call-missed.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCallMissed extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/call-received.d.ts b/types/react-icons/md/call-received.d.ts
deleted file mode 100644
index 29f503af3f..0000000000
--- a/types/react-icons/md/call-received.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCallReceived extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/call-split.d.ts b/types/react-icons/md/call-split.d.ts
deleted file mode 100644
index 56330a07e8..0000000000
--- a/types/react-icons/md/call-split.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCallSplit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/call-to-action.d.ts b/types/react-icons/md/call-to-action.d.ts
deleted file mode 100644
index f1f8d89d80..0000000000
--- a/types/react-icons/md/call-to-action.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCallToAction extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/call.d.ts b/types/react-icons/md/call.d.ts
deleted file mode 100644
index 2bfec93bfc..0000000000
--- a/types/react-icons/md/call.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCall extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/camera-alt.d.ts b/types/react-icons/md/camera-alt.d.ts
deleted file mode 100644
index 4951b47b34..0000000000
--- a/types/react-icons/md/camera-alt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCameraAlt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/camera-enhance.d.ts b/types/react-icons/md/camera-enhance.d.ts
deleted file mode 100644
index 957b0b30e4..0000000000
--- a/types/react-icons/md/camera-enhance.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCameraEnhance extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/camera-front.d.ts b/types/react-icons/md/camera-front.d.ts
deleted file mode 100644
index c6f2760218..0000000000
--- a/types/react-icons/md/camera-front.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCameraFront extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/camera-rear.d.ts b/types/react-icons/md/camera-rear.d.ts
deleted file mode 100644
index b524f4456c..0000000000
--- a/types/react-icons/md/camera-rear.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCameraRear extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/camera-roll.d.ts b/types/react-icons/md/camera-roll.d.ts
deleted file mode 100644
index b7c7b207e2..0000000000
--- a/types/react-icons/md/camera-roll.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCameraRoll extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/camera.d.ts b/types/react-icons/md/camera.d.ts
deleted file mode 100644
index ca2fbf55e3..0000000000
--- a/types/react-icons/md/camera.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCamera extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/cancel.d.ts b/types/react-icons/md/cancel.d.ts
deleted file mode 100644
index 28248ed4f6..0000000000
--- a/types/react-icons/md/cancel.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCancel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/card-giftcard.d.ts b/types/react-icons/md/card-giftcard.d.ts
deleted file mode 100644
index 67eb5002e6..0000000000
--- a/types/react-icons/md/card-giftcard.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCardGiftcard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/card-membership.d.ts b/types/react-icons/md/card-membership.d.ts
deleted file mode 100644
index 5cb91c641d..0000000000
--- a/types/react-icons/md/card-membership.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCardMembership extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/card-travel.d.ts b/types/react-icons/md/card-travel.d.ts
deleted file mode 100644
index a54e339c09..0000000000
--- a/types/react-icons/md/card-travel.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCardTravel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/casino.d.ts b/types/react-icons/md/casino.d.ts
deleted file mode 100644
index ceb6c0cf04..0000000000
--- a/types/react-icons/md/casino.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCasino extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/cast-connected.d.ts b/types/react-icons/md/cast-connected.d.ts
deleted file mode 100644
index d4d60dcf60..0000000000
--- a/types/react-icons/md/cast-connected.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCastConnected extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/cast.d.ts b/types/react-icons/md/cast.d.ts
deleted file mode 100644
index b014c40b07..0000000000
--- a/types/react-icons/md/cast.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCast extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/center-focus-strong.d.ts b/types/react-icons/md/center-focus-strong.d.ts
deleted file mode 100644
index 6d72ae6a11..0000000000
--- a/types/react-icons/md/center-focus-strong.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCenterFocusStrong extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/center-focus-weak.d.ts b/types/react-icons/md/center-focus-weak.d.ts
deleted file mode 100644
index 5565dd7b63..0000000000
--- a/types/react-icons/md/center-focus-weak.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCenterFocusWeak extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/change-history.d.ts b/types/react-icons/md/change-history.d.ts
deleted file mode 100644
index ed3344df50..0000000000
--- a/types/react-icons/md/change-history.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdChangeHistory extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/chat-bubble-outline.d.ts b/types/react-icons/md/chat-bubble-outline.d.ts
deleted file mode 100644
index ad12c21318..0000000000
--- a/types/react-icons/md/chat-bubble-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdChatBubbleOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/chat-bubble.d.ts b/types/react-icons/md/chat-bubble.d.ts
deleted file mode 100644
index 6322767617..0000000000
--- a/types/react-icons/md/chat-bubble.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdChatBubble extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/chat.d.ts b/types/react-icons/md/chat.d.ts
deleted file mode 100644
index 7fecfed168..0000000000
--- a/types/react-icons/md/chat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdChat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/check-box-outline-blank.d.ts b/types/react-icons/md/check-box-outline-blank.d.ts
deleted file mode 100644
index 984ee8c5b0..0000000000
--- a/types/react-icons/md/check-box-outline-blank.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCheckBoxOutlineBlank extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/check-box.d.ts b/types/react-icons/md/check-box.d.ts
deleted file mode 100644
index 0d131960ee..0000000000
--- a/types/react-icons/md/check-box.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCheckBox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/check-circle.d.ts b/types/react-icons/md/check-circle.d.ts
deleted file mode 100644
index 350ec8918d..0000000000
--- a/types/react-icons/md/check-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCheckCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/check.d.ts b/types/react-icons/md/check.d.ts
deleted file mode 100644
index df809198db..0000000000
--- a/types/react-icons/md/check.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCheck extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/chevron-left.d.ts b/types/react-icons/md/chevron-left.d.ts
deleted file mode 100644
index fd0b4bff5a..0000000000
--- a/types/react-icons/md/chevron-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdChevronLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/chevron-right.d.ts b/types/react-icons/md/chevron-right.d.ts
deleted file mode 100644
index fd902a1348..0000000000
--- a/types/react-icons/md/chevron-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdChevronRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/child-care.d.ts b/types/react-icons/md/child-care.d.ts
deleted file mode 100644
index 133bf02e0e..0000000000
--- a/types/react-icons/md/child-care.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdChildCare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/child-friendly.d.ts b/types/react-icons/md/child-friendly.d.ts
deleted file mode 100644
index 87f9bc1b8e..0000000000
--- a/types/react-icons/md/child-friendly.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdChildFriendly extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/chrome-reader-mode.d.ts b/types/react-icons/md/chrome-reader-mode.d.ts
deleted file mode 100644
index c545db8e9b..0000000000
--- a/types/react-icons/md/chrome-reader-mode.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdChromeReaderMode extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/class.d.ts b/types/react-icons/md/class.d.ts
deleted file mode 100644
index e0e0e88367..0000000000
--- a/types/react-icons/md/class.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdClass extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/clear-all.d.ts b/types/react-icons/md/clear-all.d.ts
deleted file mode 100644
index b73150c14e..0000000000
--- a/types/react-icons/md/clear-all.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdClearAll extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/clear.d.ts b/types/react-icons/md/clear.d.ts
deleted file mode 100644
index 4da44db5b5..0000000000
--- a/types/react-icons/md/clear.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdClear extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/close.d.ts b/types/react-icons/md/close.d.ts
deleted file mode 100644
index 3f693c1eec..0000000000
--- a/types/react-icons/md/close.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdClose extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/closed-caption.d.ts b/types/react-icons/md/closed-caption.d.ts
deleted file mode 100644
index 5adaf8fc91..0000000000
--- a/types/react-icons/md/closed-caption.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdClosedCaption extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/cloud-circle.d.ts b/types/react-icons/md/cloud-circle.d.ts
deleted file mode 100644
index 55a5be23c2..0000000000
--- a/types/react-icons/md/cloud-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/cloud-done.d.ts b/types/react-icons/md/cloud-done.d.ts
deleted file mode 100644
index 49f115ae3d..0000000000
--- a/types/react-icons/md/cloud-done.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudDone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/cloud-download.d.ts b/types/react-icons/md/cloud-download.d.ts
deleted file mode 100644
index c7b6f482bb..0000000000
--- a/types/react-icons/md/cloud-download.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudDownload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/cloud-off.d.ts b/types/react-icons/md/cloud-off.d.ts
deleted file mode 100644
index 2ebe85de9a..0000000000
--- a/types/react-icons/md/cloud-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/cloud-queue.d.ts b/types/react-icons/md/cloud-queue.d.ts
deleted file mode 100644
index 3e7912edb7..0000000000
--- a/types/react-icons/md/cloud-queue.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudQueue extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/cloud-upload.d.ts b/types/react-icons/md/cloud-upload.d.ts
deleted file mode 100644
index 3813bf345b..0000000000
--- a/types/react-icons/md/cloud-upload.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudUpload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/cloud.d.ts b/types/react-icons/md/cloud.d.ts
deleted file mode 100644
index 774dd53424..0000000000
--- a/types/react-icons/md/cloud.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCloud extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/code.d.ts b/types/react-icons/md/code.d.ts
deleted file mode 100644
index 54f942afd1..0000000000
--- a/types/react-icons/md/code.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCode extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/collections-bookmark.d.ts b/types/react-icons/md/collections-bookmark.d.ts
deleted file mode 100644
index 98d8755848..0000000000
--- a/types/react-icons/md/collections-bookmark.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCollectionsBookmark extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/collections.d.ts b/types/react-icons/md/collections.d.ts
deleted file mode 100644
index 7d5cf7fa68..0000000000
--- a/types/react-icons/md/collections.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCollections extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/color-lens.d.ts b/types/react-icons/md/color-lens.d.ts
deleted file mode 100644
index 71a56bc853..0000000000
--- a/types/react-icons/md/color-lens.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdColorLens extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/colorize.d.ts b/types/react-icons/md/colorize.d.ts
deleted file mode 100644
index f345627803..0000000000
--- a/types/react-icons/md/colorize.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdColorize extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/comment.d.ts b/types/react-icons/md/comment.d.ts
deleted file mode 100644
index c81ab4762a..0000000000
--- a/types/react-icons/md/comment.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdComment extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/compare-arrows.d.ts b/types/react-icons/md/compare-arrows.d.ts
deleted file mode 100644
index 727031b8a7..0000000000
--- a/types/react-icons/md/compare-arrows.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCompareArrows extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/compare.d.ts b/types/react-icons/md/compare.d.ts
deleted file mode 100644
index 59338cf7c9..0000000000
--- a/types/react-icons/md/compare.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCompare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/computer.d.ts b/types/react-icons/md/computer.d.ts
deleted file mode 100644
index ef16df598d..0000000000
--- a/types/react-icons/md/computer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdComputer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/confirmation-number.d.ts b/types/react-icons/md/confirmation-number.d.ts
deleted file mode 100644
index 8a3b8fcb8f..0000000000
--- a/types/react-icons/md/confirmation-number.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdConfirmationNumber extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/contact-mail.d.ts b/types/react-icons/md/contact-mail.d.ts
deleted file mode 100644
index b5027ce2da..0000000000
--- a/types/react-icons/md/contact-mail.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdContactMail extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/contact-phone.d.ts b/types/react-icons/md/contact-phone.d.ts
deleted file mode 100644
index df4405a4da..0000000000
--- a/types/react-icons/md/contact-phone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdContactPhone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/contacts.d.ts b/types/react-icons/md/contacts.d.ts
deleted file mode 100644
index e4df5f1c11..0000000000
--- a/types/react-icons/md/contacts.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdContacts extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/content-copy.d.ts b/types/react-icons/md/content-copy.d.ts
deleted file mode 100644
index e069254814..0000000000
--- a/types/react-icons/md/content-copy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdContentCopy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/content-cut.d.ts b/types/react-icons/md/content-cut.d.ts
deleted file mode 100644
index 84d7b36ea0..0000000000
--- a/types/react-icons/md/content-cut.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdContentCut extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/content-paste.d.ts b/types/react-icons/md/content-paste.d.ts
deleted file mode 100644
index d3825ed71f..0000000000
--- a/types/react-icons/md/content-paste.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdContentPaste extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/control-point-duplicate.d.ts b/types/react-icons/md/control-point-duplicate.d.ts
deleted file mode 100644
index 8ba468f7bc..0000000000
--- a/types/react-icons/md/control-point-duplicate.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdControlPointDuplicate extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/control-point.d.ts b/types/react-icons/md/control-point.d.ts
deleted file mode 100644
index aa32c1b7f4..0000000000
--- a/types/react-icons/md/control-point.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdControlPoint extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/copyright.d.ts b/types/react-icons/md/copyright.d.ts
deleted file mode 100644
index d786505dc9..0000000000
--- a/types/react-icons/md/copyright.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCopyright extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/create-new-folder.d.ts b/types/react-icons/md/create-new-folder.d.ts
deleted file mode 100644
index 5f81f01bff..0000000000
--- a/types/react-icons/md/create-new-folder.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCreateNewFolder extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/create.d.ts b/types/react-icons/md/create.d.ts
deleted file mode 100644
index 75c2871644..0000000000
--- a/types/react-icons/md/create.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCreate extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/credit-card.d.ts b/types/react-icons/md/credit-card.d.ts
deleted file mode 100644
index 9515c900d0..0000000000
--- a/types/react-icons/md/credit-card.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCreditCard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/crop-16-9.d.ts b/types/react-icons/md/crop-16-9.d.ts
deleted file mode 100644
index d507bc9db9..0000000000
--- a/types/react-icons/md/crop-16-9.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCrop169 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/crop-3-2.d.ts b/types/react-icons/md/crop-3-2.d.ts
deleted file mode 100644
index 461cf07b2d..0000000000
--- a/types/react-icons/md/crop-3-2.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCrop32 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/crop-5-4.d.ts b/types/react-icons/md/crop-5-4.d.ts
deleted file mode 100644
index 4b0cb6c7fb..0000000000
--- a/types/react-icons/md/crop-5-4.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCrop54 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/crop-7-5.d.ts b/types/react-icons/md/crop-7-5.d.ts
deleted file mode 100644
index 9063520b57..0000000000
--- a/types/react-icons/md/crop-7-5.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCrop75 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/crop-din.d.ts b/types/react-icons/md/crop-din.d.ts
deleted file mode 100644
index 115106ef50..0000000000
--- a/types/react-icons/md/crop-din.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCropDin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/crop-free.d.ts b/types/react-icons/md/crop-free.d.ts
deleted file mode 100644
index e68c930ff9..0000000000
--- a/types/react-icons/md/crop-free.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCropFree extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/crop-landscape.d.ts b/types/react-icons/md/crop-landscape.d.ts
deleted file mode 100644
index 5ef2f2e4dd..0000000000
--- a/types/react-icons/md/crop-landscape.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCropLandscape extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/crop-original.d.ts b/types/react-icons/md/crop-original.d.ts
deleted file mode 100644
index 26733dc24e..0000000000
--- a/types/react-icons/md/crop-original.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCropOriginal extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/crop-portrait.d.ts b/types/react-icons/md/crop-portrait.d.ts
deleted file mode 100644
index 9a43790ec0..0000000000
--- a/types/react-icons/md/crop-portrait.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCropPortrait extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/crop-rotate.d.ts b/types/react-icons/md/crop-rotate.d.ts
deleted file mode 100644
index 7106d1b55b..0000000000
--- a/types/react-icons/md/crop-rotate.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCropRotate extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/crop-square.d.ts b/types/react-icons/md/crop-square.d.ts
deleted file mode 100644
index 62ba826cfc..0000000000
--- a/types/react-icons/md/crop-square.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCropSquare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/crop.d.ts b/types/react-icons/md/crop.d.ts
deleted file mode 100644
index dfd01a2ad8..0000000000
--- a/types/react-icons/md/crop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdCrop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/dashboard.d.ts b/types/react-icons/md/dashboard.d.ts
deleted file mode 100644
index 47f85672c9..0000000000
--- a/types/react-icons/md/dashboard.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDashboard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/data-usage.d.ts b/types/react-icons/md/data-usage.d.ts
deleted file mode 100644
index 013f33ad67..0000000000
--- a/types/react-icons/md/data-usage.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDataUsage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/date-range.d.ts b/types/react-icons/md/date-range.d.ts
deleted file mode 100644
index a9fc01751f..0000000000
--- a/types/react-icons/md/date-range.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDateRange extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/dehaze.d.ts b/types/react-icons/md/dehaze.d.ts
deleted file mode 100644
index 9144d9822f..0000000000
--- a/types/react-icons/md/dehaze.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDehaze extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/delete-forever.d.ts b/types/react-icons/md/delete-forever.d.ts
deleted file mode 100644
index 9820c93b1a..0000000000
--- a/types/react-icons/md/delete-forever.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDeleteForever extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/delete-sweep.d.ts b/types/react-icons/md/delete-sweep.d.ts
deleted file mode 100644
index 965ce9c746..0000000000
--- a/types/react-icons/md/delete-sweep.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDeleteSweep extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/delete.d.ts b/types/react-icons/md/delete.d.ts
deleted file mode 100644
index f47a4b0a59..0000000000
--- a/types/react-icons/md/delete.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDelete extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/description.d.ts b/types/react-icons/md/description.d.ts
deleted file mode 100644
index 76bc0bbf1c..0000000000
--- a/types/react-icons/md/description.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDescription extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/desktop-mac.d.ts b/types/react-icons/md/desktop-mac.d.ts
deleted file mode 100644
index 007f0a5ae1..0000000000
--- a/types/react-icons/md/desktop-mac.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDesktopMac extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/desktop-windows.d.ts b/types/react-icons/md/desktop-windows.d.ts
deleted file mode 100644
index e735a11f72..0000000000
--- a/types/react-icons/md/desktop-windows.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDesktopWindows extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/details.d.ts b/types/react-icons/md/details.d.ts
deleted file mode 100644
index 86ec926d65..0000000000
--- a/types/react-icons/md/details.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDetails extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/developer-board.d.ts b/types/react-icons/md/developer-board.d.ts
deleted file mode 100644
index a3ad5d5b89..0000000000
--- a/types/react-icons/md/developer-board.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDeveloperBoard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/developer-mode.d.ts b/types/react-icons/md/developer-mode.d.ts
deleted file mode 100644
index f2032d8e74..0000000000
--- a/types/react-icons/md/developer-mode.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDeveloperMode extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/device-hub.d.ts b/types/react-icons/md/device-hub.d.ts
deleted file mode 100644
index 38815bce4d..0000000000
--- a/types/react-icons/md/device-hub.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDeviceHub extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/devices-other.d.ts b/types/react-icons/md/devices-other.d.ts
deleted file mode 100644
index 69ed6d847d..0000000000
--- a/types/react-icons/md/devices-other.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDevicesOther extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/devices.d.ts b/types/react-icons/md/devices.d.ts
deleted file mode 100644
index 00163cbb71..0000000000
--- a/types/react-icons/md/devices.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDevices extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/dialer-sip.d.ts b/types/react-icons/md/dialer-sip.d.ts
deleted file mode 100644
index ba4ade0a30..0000000000
--- a/types/react-icons/md/dialer-sip.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDialerSip extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/dialpad.d.ts b/types/react-icons/md/dialpad.d.ts
deleted file mode 100644
index 3d74b7ce08..0000000000
--- a/types/react-icons/md/dialpad.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDialpad extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/directions-bike.d.ts b/types/react-icons/md/directions-bike.d.ts
deleted file mode 100644
index 3ff5b576f2..0000000000
--- a/types/react-icons/md/directions-bike.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsBike extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/directions-boat.d.ts b/types/react-icons/md/directions-boat.d.ts
deleted file mode 100644
index 29cb6f9727..0000000000
--- a/types/react-icons/md/directions-boat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsBoat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/directions-bus.d.ts b/types/react-icons/md/directions-bus.d.ts
deleted file mode 100644
index 12964dd1bf..0000000000
--- a/types/react-icons/md/directions-bus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsBus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/directions-car.d.ts b/types/react-icons/md/directions-car.d.ts
deleted file mode 100644
index 0055e4a7e9..0000000000
--- a/types/react-icons/md/directions-car.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsCar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/directions-ferry.d.ts b/types/react-icons/md/directions-ferry.d.ts
deleted file mode 100644
index fa5f376ab4..0000000000
--- a/types/react-icons/md/directions-ferry.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsFerry extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/directions-railway.d.ts b/types/react-icons/md/directions-railway.d.ts
deleted file mode 100644
index ee241e2f78..0000000000
--- a/types/react-icons/md/directions-railway.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsRailway extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/directions-run.d.ts b/types/react-icons/md/directions-run.d.ts
deleted file mode 100644
index 65fabf028c..0000000000
--- a/types/react-icons/md/directions-run.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsRun extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/directions-subway.d.ts b/types/react-icons/md/directions-subway.d.ts
deleted file mode 100644
index d97b4fd1e2..0000000000
--- a/types/react-icons/md/directions-subway.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsSubway extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/directions-transit.d.ts b/types/react-icons/md/directions-transit.d.ts
deleted file mode 100644
index 0016d21dd1..0000000000
--- a/types/react-icons/md/directions-transit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsTransit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/directions-walk.d.ts b/types/react-icons/md/directions-walk.d.ts
deleted file mode 100644
index 5f02d00296..0000000000
--- a/types/react-icons/md/directions-walk.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsWalk extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/directions.d.ts b/types/react-icons/md/directions.d.ts
deleted file mode 100644
index 14a1dded8e..0000000000
--- a/types/react-icons/md/directions.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDirections extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/disc-full.d.ts b/types/react-icons/md/disc-full.d.ts
deleted file mode 100644
index f23e47b0bd..0000000000
--- a/types/react-icons/md/disc-full.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDiscFull extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/dns.d.ts b/types/react-icons/md/dns.d.ts
deleted file mode 100644
index 42a3e45b84..0000000000
--- a/types/react-icons/md/dns.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDns extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/do-not-disturb-alt.d.ts b/types/react-icons/md/do-not-disturb-alt.d.ts
deleted file mode 100644
index 6bad8e0875..0000000000
--- a/types/react-icons/md/do-not-disturb-alt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDoNotDisturbAlt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/do-not-disturb-off.d.ts b/types/react-icons/md/do-not-disturb-off.d.ts
deleted file mode 100644
index bcbe409363..0000000000
--- a/types/react-icons/md/do-not-disturb-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDoNotDisturbOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/do-not-disturb.d.ts b/types/react-icons/md/do-not-disturb.d.ts
deleted file mode 100644
index bb19ff2e39..0000000000
--- a/types/react-icons/md/do-not-disturb.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDoNotDisturb extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/dock.d.ts b/types/react-icons/md/dock.d.ts
deleted file mode 100644
index 3de11f01a5..0000000000
--- a/types/react-icons/md/dock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/domain.d.ts b/types/react-icons/md/domain.d.ts
deleted file mode 100644
index c9586ff2b5..0000000000
--- a/types/react-icons/md/domain.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDomain extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/done-all.d.ts b/types/react-icons/md/done-all.d.ts
deleted file mode 100644
index 41e8241fcc..0000000000
--- a/types/react-icons/md/done-all.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDoneAll extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/done.d.ts b/types/react-icons/md/done.d.ts
deleted file mode 100644
index 977bc177a5..0000000000
--- a/types/react-icons/md/done.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/donut-large.d.ts b/types/react-icons/md/donut-large.d.ts
deleted file mode 100644
index 01422e1fa5..0000000000
--- a/types/react-icons/md/donut-large.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDonutLarge extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/donut-small.d.ts b/types/react-icons/md/donut-small.d.ts
deleted file mode 100644
index 7475720575..0000000000
--- a/types/react-icons/md/donut-small.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDonutSmall extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/drafts.d.ts b/types/react-icons/md/drafts.d.ts
deleted file mode 100644
index 3a3af21927..0000000000
--- a/types/react-icons/md/drafts.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDrafts extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/drag-handle.d.ts b/types/react-icons/md/drag-handle.d.ts
deleted file mode 100644
index 80ae3229cd..0000000000
--- a/types/react-icons/md/drag-handle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDragHandle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/drive-eta.d.ts b/types/react-icons/md/drive-eta.d.ts
deleted file mode 100644
index 6cecfe8799..0000000000
--- a/types/react-icons/md/drive-eta.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDriveEta extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/dvr.d.ts b/types/react-icons/md/dvr.d.ts
deleted file mode 100644
index c9d3aa8ce5..0000000000
--- a/types/react-icons/md/dvr.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdDvr extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/edit-location.d.ts b/types/react-icons/md/edit-location.d.ts
deleted file mode 100644
index d6e3e2bfb7..0000000000
--- a/types/react-icons/md/edit-location.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdEditLocation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/edit.d.ts b/types/react-icons/md/edit.d.ts
deleted file mode 100644
index aaa97a382a..0000000000
--- a/types/react-icons/md/edit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdEdit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/eject.d.ts b/types/react-icons/md/eject.d.ts
deleted file mode 100644
index 87c366fef5..0000000000
--- a/types/react-icons/md/eject.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdEject extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/email.d.ts b/types/react-icons/md/email.d.ts
deleted file mode 100644
index 1c8b5247ee..0000000000
--- a/types/react-icons/md/email.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdEmail extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/enhanced-encryption.d.ts b/types/react-icons/md/enhanced-encryption.d.ts
deleted file mode 100644
index be651f5c94..0000000000
--- a/types/react-icons/md/enhanced-encryption.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdEnhancedEncryption extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/equalizer.d.ts b/types/react-icons/md/equalizer.d.ts
deleted file mode 100644
index ab7a2f20f9..0000000000
--- a/types/react-icons/md/equalizer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdEqualizer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/error-outline.d.ts b/types/react-icons/md/error-outline.d.ts
deleted file mode 100644
index 0d8a6051a9..0000000000
--- a/types/react-icons/md/error-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdErrorOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/error.d.ts b/types/react-icons/md/error.d.ts
deleted file mode 100644
index c5b9fc8e71..0000000000
--- a/types/react-icons/md/error.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdError extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/euro-symbol.d.ts b/types/react-icons/md/euro-symbol.d.ts
deleted file mode 100644
index 1e5b262514..0000000000
--- a/types/react-icons/md/euro-symbol.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdEuroSymbol extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/ev-station.d.ts b/types/react-icons/md/ev-station.d.ts
deleted file mode 100644
index 4254fe1ebf..0000000000
--- a/types/react-icons/md/ev-station.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdEvStation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/event-available.d.ts b/types/react-icons/md/event-available.d.ts
deleted file mode 100644
index 30722d5a81..0000000000
--- a/types/react-icons/md/event-available.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdEventAvailable extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/event-busy.d.ts b/types/react-icons/md/event-busy.d.ts
deleted file mode 100644
index 6659755bbf..0000000000
--- a/types/react-icons/md/event-busy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdEventBusy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/event-note.d.ts b/types/react-icons/md/event-note.d.ts
deleted file mode 100644
index fb3c3b0279..0000000000
--- a/types/react-icons/md/event-note.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdEventNote extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/event-seat.d.ts b/types/react-icons/md/event-seat.d.ts
deleted file mode 100644
index 53c6fd7c85..0000000000
--- a/types/react-icons/md/event-seat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdEventSeat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/event.d.ts b/types/react-icons/md/event.d.ts
deleted file mode 100644
index a5bba2458a..0000000000
--- a/types/react-icons/md/event.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdEvent extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/exit-to-app.d.ts b/types/react-icons/md/exit-to-app.d.ts
deleted file mode 100644
index 1c12dfc4b7..0000000000
--- a/types/react-icons/md/exit-to-app.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdExitToApp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/expand-less.d.ts b/types/react-icons/md/expand-less.d.ts
deleted file mode 100644
index 766bf8886e..0000000000
--- a/types/react-icons/md/expand-less.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdExpandLess extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/expand-more.d.ts b/types/react-icons/md/expand-more.d.ts
deleted file mode 100644
index bef62424b7..0000000000
--- a/types/react-icons/md/expand-more.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdExpandMore extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/explicit.d.ts b/types/react-icons/md/explicit.d.ts
deleted file mode 100644
index b10026c0af..0000000000
--- a/types/react-icons/md/explicit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdExplicit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/explore.d.ts b/types/react-icons/md/explore.d.ts
deleted file mode 100644
index 79180f608d..0000000000
--- a/types/react-icons/md/explore.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdExplore extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/exposure-minus-1.d.ts b/types/react-icons/md/exposure-minus-1.d.ts
deleted file mode 100644
index f0c9222b4e..0000000000
--- a/types/react-icons/md/exposure-minus-1.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdExposureMinus1 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/exposure-minus-2.d.ts b/types/react-icons/md/exposure-minus-2.d.ts
deleted file mode 100644
index 7b70926bf1..0000000000
--- a/types/react-icons/md/exposure-minus-2.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdExposureMinus2 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/exposure-neg-1.d.ts b/types/react-icons/md/exposure-neg-1.d.ts
deleted file mode 100644
index 136e8abf0e..0000000000
--- a/types/react-icons/md/exposure-neg-1.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdExposureNeg1 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/exposure-neg-2.d.ts b/types/react-icons/md/exposure-neg-2.d.ts
deleted file mode 100644
index ceec854625..0000000000
--- a/types/react-icons/md/exposure-neg-2.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdExposureNeg2 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/exposure-plus-1.d.ts b/types/react-icons/md/exposure-plus-1.d.ts
deleted file mode 100644
index fbb81879c2..0000000000
--- a/types/react-icons/md/exposure-plus-1.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdExposurePlus1 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/exposure-plus-2.d.ts b/types/react-icons/md/exposure-plus-2.d.ts
deleted file mode 100644
index d22a7d3123..0000000000
--- a/types/react-icons/md/exposure-plus-2.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdExposurePlus2 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/exposure-zero.d.ts b/types/react-icons/md/exposure-zero.d.ts
deleted file mode 100644
index 27125daa24..0000000000
--- a/types/react-icons/md/exposure-zero.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdExposureZero extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/exposure.d.ts b/types/react-icons/md/exposure.d.ts
deleted file mode 100644
index 1d04f364e0..0000000000
--- a/types/react-icons/md/exposure.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdExposure extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/extension.d.ts b/types/react-icons/md/extension.d.ts
deleted file mode 100644
index bfb10535b0..0000000000
--- a/types/react-icons/md/extension.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdExtension extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/face.d.ts b/types/react-icons/md/face.d.ts
deleted file mode 100644
index e8042f0b48..0000000000
--- a/types/react-icons/md/face.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFace extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/fast-forward.d.ts b/types/react-icons/md/fast-forward.d.ts
deleted file mode 100644
index 3daeacb97a..0000000000
--- a/types/react-icons/md/fast-forward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFastForward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/fast-rewind.d.ts b/types/react-icons/md/fast-rewind.d.ts
deleted file mode 100644
index 5b34d9c3a6..0000000000
--- a/types/react-icons/md/fast-rewind.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFastRewind extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/favorite-border.d.ts b/types/react-icons/md/favorite-border.d.ts
deleted file mode 100644
index cd66fdc7e2..0000000000
--- a/types/react-icons/md/favorite-border.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFavoriteBorder extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/favorite-outline.d.ts b/types/react-icons/md/favorite-outline.d.ts
deleted file mode 100644
index 7b1df113ba..0000000000
--- a/types/react-icons/md/favorite-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFavoriteOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/favorite.d.ts b/types/react-icons/md/favorite.d.ts
deleted file mode 100644
index 84959194f9..0000000000
--- a/types/react-icons/md/favorite.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFavorite extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/featured-play-list.d.ts b/types/react-icons/md/featured-play-list.d.ts
deleted file mode 100644
index b8a4685778..0000000000
--- a/types/react-icons/md/featured-play-list.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFeaturedPlayList extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/featured-video.d.ts b/types/react-icons/md/featured-video.d.ts
deleted file mode 100644
index 67aa6eb9c5..0000000000
--- a/types/react-icons/md/featured-video.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFeaturedVideo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/feedback.d.ts b/types/react-icons/md/feedback.d.ts
deleted file mode 100644
index b69aff1e22..0000000000
--- a/types/react-icons/md/feedback.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFeedback extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/fiber-dvr.d.ts b/types/react-icons/md/fiber-dvr.d.ts
deleted file mode 100644
index f8c841d7b0..0000000000
--- a/types/react-icons/md/fiber-dvr.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFiberDvr extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/fiber-manual-record.d.ts b/types/react-icons/md/fiber-manual-record.d.ts
deleted file mode 100644
index 886e58432d..0000000000
--- a/types/react-icons/md/fiber-manual-record.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFiberManualRecord extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/fiber-new.d.ts b/types/react-icons/md/fiber-new.d.ts
deleted file mode 100644
index 239b7541af..0000000000
--- a/types/react-icons/md/fiber-new.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFiberNew extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/fiber-pin.d.ts b/types/react-icons/md/fiber-pin.d.ts
deleted file mode 100644
index 327b456570..0000000000
--- a/types/react-icons/md/fiber-pin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFiberPin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/fiber-smart-record.d.ts b/types/react-icons/md/fiber-smart-record.d.ts
deleted file mode 100644
index 0054c9fff7..0000000000
--- a/types/react-icons/md/fiber-smart-record.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFiberSmartRecord extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/file-download.d.ts b/types/react-icons/md/file-download.d.ts
deleted file mode 100644
index 7874143a50..0000000000
--- a/types/react-icons/md/file-download.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFileDownload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/file-upload.d.ts b/types/react-icons/md/file-upload.d.ts
deleted file mode 100644
index 96d2742e3c..0000000000
--- a/types/react-icons/md/file-upload.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFileUpload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-1.d.ts b/types/react-icons/md/filter-1.d.ts
deleted file mode 100644
index 0eab79f7ff..0000000000
--- a/types/react-icons/md/filter-1.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter1 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-2.d.ts b/types/react-icons/md/filter-2.d.ts
deleted file mode 100644
index 7c2ee2aa23..0000000000
--- a/types/react-icons/md/filter-2.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter2 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-3.d.ts b/types/react-icons/md/filter-3.d.ts
deleted file mode 100644
index 3378d361ba..0000000000
--- a/types/react-icons/md/filter-3.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter3 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-4.d.ts b/types/react-icons/md/filter-4.d.ts
deleted file mode 100644
index 9c781a3957..0000000000
--- a/types/react-icons/md/filter-4.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter4 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-5.d.ts b/types/react-icons/md/filter-5.d.ts
deleted file mode 100644
index 0231749f2e..0000000000
--- a/types/react-icons/md/filter-5.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter5 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-6.d.ts b/types/react-icons/md/filter-6.d.ts
deleted file mode 100644
index 2aa32d48cd..0000000000
--- a/types/react-icons/md/filter-6.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter6 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-7.d.ts b/types/react-icons/md/filter-7.d.ts
deleted file mode 100644
index 3a130313a7..0000000000
--- a/types/react-icons/md/filter-7.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter7 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-8.d.ts b/types/react-icons/md/filter-8.d.ts
deleted file mode 100644
index bd2690c793..0000000000
--- a/types/react-icons/md/filter-8.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter8 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-9-plus.d.ts b/types/react-icons/md/filter-9-plus.d.ts
deleted file mode 100644
index 6e11758f2e..0000000000
--- a/types/react-icons/md/filter-9-plus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter9Plus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-9.d.ts b/types/react-icons/md/filter-9.d.ts
deleted file mode 100644
index b4971c93f9..0000000000
--- a/types/react-icons/md/filter-9.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter9 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-b-and-w.d.ts b/types/react-icons/md/filter-b-and-w.d.ts
deleted file mode 100644
index 327d166bae..0000000000
--- a/types/react-icons/md/filter-b-and-w.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterBAndW extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-center-focus.d.ts b/types/react-icons/md/filter-center-focus.d.ts
deleted file mode 100644
index 6001fc45a8..0000000000
--- a/types/react-icons/md/filter-center-focus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterCenterFocus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-drama.d.ts b/types/react-icons/md/filter-drama.d.ts
deleted file mode 100644
index 982c0518d9..0000000000
--- a/types/react-icons/md/filter-drama.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterDrama extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-frames.d.ts b/types/react-icons/md/filter-frames.d.ts
deleted file mode 100644
index daef1b137f..0000000000
--- a/types/react-icons/md/filter-frames.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterFrames extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-hdr.d.ts b/types/react-icons/md/filter-hdr.d.ts
deleted file mode 100644
index 997614833c..0000000000
--- a/types/react-icons/md/filter-hdr.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterHdr extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-list.d.ts b/types/react-icons/md/filter-list.d.ts
deleted file mode 100644
index 546734dff6..0000000000
--- a/types/react-icons/md/filter-list.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterList extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-none.d.ts b/types/react-icons/md/filter-none.d.ts
deleted file mode 100644
index 2e160324d8..0000000000
--- a/types/react-icons/md/filter-none.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterNone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-tilt-shift.d.ts b/types/react-icons/md/filter-tilt-shift.d.ts
deleted file mode 100644
index 0e68c95a0a..0000000000
--- a/types/react-icons/md/filter-tilt-shift.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterTiltShift extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter-vintage.d.ts b/types/react-icons/md/filter-vintage.d.ts
deleted file mode 100644
index af1243b86d..0000000000
--- a/types/react-icons/md/filter-vintage.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterVintage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/filter.d.ts b/types/react-icons/md/filter.d.ts
deleted file mode 100644
index 30fd120a11..0000000000
--- a/types/react-icons/md/filter.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/find-in-page.d.ts b/types/react-icons/md/find-in-page.d.ts
deleted file mode 100644
index 3dbb98ad7d..0000000000
--- a/types/react-icons/md/find-in-page.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFindInPage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/find-replace.d.ts b/types/react-icons/md/find-replace.d.ts
deleted file mode 100644
index 0a066acf85..0000000000
--- a/types/react-icons/md/find-replace.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFindReplace extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/fingerprint.d.ts b/types/react-icons/md/fingerprint.d.ts
deleted file mode 100644
index 1db6d8d427..0000000000
--- a/types/react-icons/md/fingerprint.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFingerprint extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/first-page.d.ts b/types/react-icons/md/first-page.d.ts
deleted file mode 100644
index 95576cd1a2..0000000000
--- a/types/react-icons/md/first-page.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFirstPage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/fitness-center.d.ts b/types/react-icons/md/fitness-center.d.ts
deleted file mode 100644
index 5874b3c1b7..0000000000
--- a/types/react-icons/md/fitness-center.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFitnessCenter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/flag.d.ts b/types/react-icons/md/flag.d.ts
deleted file mode 100644
index 5767d894db..0000000000
--- a/types/react-icons/md/flag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFlag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/flare.d.ts b/types/react-icons/md/flare.d.ts
deleted file mode 100644
index 68715b9a9d..0000000000
--- a/types/react-icons/md/flare.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFlare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/flash-auto.d.ts b/types/react-icons/md/flash-auto.d.ts
deleted file mode 100644
index e119dc247b..0000000000
--- a/types/react-icons/md/flash-auto.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFlashAuto extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/flash-off.d.ts b/types/react-icons/md/flash-off.d.ts
deleted file mode 100644
index fceeadc93a..0000000000
--- a/types/react-icons/md/flash-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFlashOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/flash-on.d.ts b/types/react-icons/md/flash-on.d.ts
deleted file mode 100644
index 8fcec401bc..0000000000
--- a/types/react-icons/md/flash-on.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFlashOn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/flight-land.d.ts b/types/react-icons/md/flight-land.d.ts
deleted file mode 100644
index f0571c691c..0000000000
--- a/types/react-icons/md/flight-land.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFlightLand extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/flight-takeoff.d.ts b/types/react-icons/md/flight-takeoff.d.ts
deleted file mode 100644
index c22f43d504..0000000000
--- a/types/react-icons/md/flight-takeoff.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFlightTakeoff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/flight.d.ts b/types/react-icons/md/flight.d.ts
deleted file mode 100644
index da17781711..0000000000
--- a/types/react-icons/md/flight.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFlight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/flip-to-back.d.ts b/types/react-icons/md/flip-to-back.d.ts
deleted file mode 100644
index a5d426d353..0000000000
--- a/types/react-icons/md/flip-to-back.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFlipToBack extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/flip-to-front.d.ts b/types/react-icons/md/flip-to-front.d.ts
deleted file mode 100644
index 480c1d3466..0000000000
--- a/types/react-icons/md/flip-to-front.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFlipToFront extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/flip.d.ts b/types/react-icons/md/flip.d.ts
deleted file mode 100644
index 990872e643..0000000000
--- a/types/react-icons/md/flip.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFlip extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/folder-open.d.ts b/types/react-icons/md/folder-open.d.ts
deleted file mode 100644
index 813a57abba..0000000000
--- a/types/react-icons/md/folder-open.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFolderOpen extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/folder-shared.d.ts b/types/react-icons/md/folder-shared.d.ts
deleted file mode 100644
index a1734b4440..0000000000
--- a/types/react-icons/md/folder-shared.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFolderShared extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/folder-special.d.ts b/types/react-icons/md/folder-special.d.ts
deleted file mode 100644
index ee62be51ce..0000000000
--- a/types/react-icons/md/folder-special.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFolderSpecial extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/folder.d.ts b/types/react-icons/md/folder.d.ts
deleted file mode 100644
index efde8117c4..0000000000
--- a/types/react-icons/md/folder.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFolder extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/font-download.d.ts b/types/react-icons/md/font-download.d.ts
deleted file mode 100644
index 61c3368b45..0000000000
--- a/types/react-icons/md/font-download.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFontDownload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-align-center.d.ts b/types/react-icons/md/format-align-center.d.ts
deleted file mode 100644
index e601b4115d..0000000000
--- a/types/react-icons/md/format-align-center.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatAlignCenter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-align-justify.d.ts b/types/react-icons/md/format-align-justify.d.ts
deleted file mode 100644
index a35ccd43cf..0000000000
--- a/types/react-icons/md/format-align-justify.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatAlignJustify extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-align-left.d.ts b/types/react-icons/md/format-align-left.d.ts
deleted file mode 100644
index 45443b3013..0000000000
--- a/types/react-icons/md/format-align-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatAlignLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-align-right.d.ts b/types/react-icons/md/format-align-right.d.ts
deleted file mode 100644
index 4c965ed516..0000000000
--- a/types/react-icons/md/format-align-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatAlignRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-bold.d.ts b/types/react-icons/md/format-bold.d.ts
deleted file mode 100644
index 45c6764995..0000000000
--- a/types/react-icons/md/format-bold.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatBold extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-clear.d.ts b/types/react-icons/md/format-clear.d.ts
deleted file mode 100644
index b60b1f0d1c..0000000000
--- a/types/react-icons/md/format-clear.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatClear extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-color-fill.d.ts b/types/react-icons/md/format-color-fill.d.ts
deleted file mode 100644
index c3a17b53ff..0000000000
--- a/types/react-icons/md/format-color-fill.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatColorFill extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-color-reset.d.ts b/types/react-icons/md/format-color-reset.d.ts
deleted file mode 100644
index 399c41d77e..0000000000
--- a/types/react-icons/md/format-color-reset.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatColorReset extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-color-text.d.ts b/types/react-icons/md/format-color-text.d.ts
deleted file mode 100644
index 1a332ab22a..0000000000
--- a/types/react-icons/md/format-color-text.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatColorText extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-indent-decrease.d.ts b/types/react-icons/md/format-indent-decrease.d.ts
deleted file mode 100644
index a89c15275d..0000000000
--- a/types/react-icons/md/format-indent-decrease.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatIndentDecrease extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-indent-increase.d.ts b/types/react-icons/md/format-indent-increase.d.ts
deleted file mode 100644
index 8b2d098b69..0000000000
--- a/types/react-icons/md/format-indent-increase.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatIndentIncrease extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-italic.d.ts b/types/react-icons/md/format-italic.d.ts
deleted file mode 100644
index bbc7df9a3f..0000000000
--- a/types/react-icons/md/format-italic.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatItalic extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-line-spacing.d.ts b/types/react-icons/md/format-line-spacing.d.ts
deleted file mode 100644
index 3731147921..0000000000
--- a/types/react-icons/md/format-line-spacing.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatLineSpacing extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-list-bulleted.d.ts b/types/react-icons/md/format-list-bulleted.d.ts
deleted file mode 100644
index 6813d2e4a4..0000000000
--- a/types/react-icons/md/format-list-bulleted.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatListBulleted extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-list-numbered.d.ts b/types/react-icons/md/format-list-numbered.d.ts
deleted file mode 100644
index 8c241c413f..0000000000
--- a/types/react-icons/md/format-list-numbered.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatListNumbered extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-paint.d.ts b/types/react-icons/md/format-paint.d.ts
deleted file mode 100644
index ebbc520c32..0000000000
--- a/types/react-icons/md/format-paint.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatPaint extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-quote.d.ts b/types/react-icons/md/format-quote.d.ts
deleted file mode 100644
index bd1037ab81..0000000000
--- a/types/react-icons/md/format-quote.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatQuote extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-shapes.d.ts b/types/react-icons/md/format-shapes.d.ts
deleted file mode 100644
index c40f7411dd..0000000000
--- a/types/react-icons/md/format-shapes.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatShapes extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-size.d.ts b/types/react-icons/md/format-size.d.ts
deleted file mode 100644
index 2a9e345a3e..0000000000
--- a/types/react-icons/md/format-size.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatSize extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-strikethrough.d.ts b/types/react-icons/md/format-strikethrough.d.ts
deleted file mode 100644
index fe36f12771..0000000000
--- a/types/react-icons/md/format-strikethrough.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatStrikethrough extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-textdirection-l-to-r.d.ts b/types/react-icons/md/format-textdirection-l-to-r.d.ts
deleted file mode 100644
index 71b083148c..0000000000
--- a/types/react-icons/md/format-textdirection-l-to-r.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatTextdirectionLToR extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-textdirection-r-to-l.d.ts b/types/react-icons/md/format-textdirection-r-to-l.d.ts
deleted file mode 100644
index 58086109e0..0000000000
--- a/types/react-icons/md/format-textdirection-r-to-l.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatTextdirectionRToL extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/format-underlined.d.ts b/types/react-icons/md/format-underlined.d.ts
deleted file mode 100644
index 126df5e540..0000000000
--- a/types/react-icons/md/format-underlined.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatUnderlined extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/forum.d.ts b/types/react-icons/md/forum.d.ts
deleted file mode 100644
index b7bdc2c096..0000000000
--- a/types/react-icons/md/forum.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdForum extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/forward-10.d.ts b/types/react-icons/md/forward-10.d.ts
deleted file mode 100644
index 295d4e89f1..0000000000
--- a/types/react-icons/md/forward-10.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdForward10 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/forward-30.d.ts b/types/react-icons/md/forward-30.d.ts
deleted file mode 100644
index 060517c358..0000000000
--- a/types/react-icons/md/forward-30.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdForward30 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/forward-5.d.ts b/types/react-icons/md/forward-5.d.ts
deleted file mode 100644
index bab1bcea70..0000000000
--- a/types/react-icons/md/forward-5.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdForward5 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/forward.d.ts b/types/react-icons/md/forward.d.ts
deleted file mode 100644
index 5a3c89125d..0000000000
--- a/types/react-icons/md/forward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdForward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/free-breakfast.d.ts b/types/react-icons/md/free-breakfast.d.ts
deleted file mode 100644
index 362b7036e4..0000000000
--- a/types/react-icons/md/free-breakfast.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFreeBreakfast extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/fullscreen-exit.d.ts b/types/react-icons/md/fullscreen-exit.d.ts
deleted file mode 100644
index 0a1e720dc6..0000000000
--- a/types/react-icons/md/fullscreen-exit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFullscreenExit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/fullscreen.d.ts b/types/react-icons/md/fullscreen.d.ts
deleted file mode 100644
index a31a4e460b..0000000000
--- a/types/react-icons/md/fullscreen.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFullscreen extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/functions.d.ts b/types/react-icons/md/functions.d.ts
deleted file mode 100644
index c6b5e4e36f..0000000000
--- a/types/react-icons/md/functions.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdFunctions extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/g-translate.d.ts b/types/react-icons/md/g-translate.d.ts
deleted file mode 100644
index 46b09234a0..0000000000
--- a/types/react-icons/md/g-translate.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGTranslate extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/gamepad.d.ts b/types/react-icons/md/gamepad.d.ts
deleted file mode 100644
index 8596cbd26d..0000000000
--- a/types/react-icons/md/gamepad.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGamepad extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/games.d.ts b/types/react-icons/md/games.d.ts
deleted file mode 100644
index 3a64f429b9..0000000000
--- a/types/react-icons/md/games.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGames extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/gavel.d.ts b/types/react-icons/md/gavel.d.ts
deleted file mode 100644
index 55fd1390e9..0000000000
--- a/types/react-icons/md/gavel.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGavel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/gesture.d.ts b/types/react-icons/md/gesture.d.ts
deleted file mode 100644
index a382f009b4..0000000000
--- a/types/react-icons/md/gesture.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGesture extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/get-app.d.ts b/types/react-icons/md/get-app.d.ts
deleted file mode 100644
index 9fe4a2a003..0000000000
--- a/types/react-icons/md/get-app.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGetApp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/gif.d.ts b/types/react-icons/md/gif.d.ts
deleted file mode 100644
index 60d7666674..0000000000
--- a/types/react-icons/md/gif.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGif extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/goat.d.ts b/types/react-icons/md/goat.d.ts
deleted file mode 100644
index 43610ba2e6..0000000000
--- a/types/react-icons/md/goat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGoat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/golf-course.d.ts b/types/react-icons/md/golf-course.d.ts
deleted file mode 100644
index 301ee1b707..0000000000
--- a/types/react-icons/md/golf-course.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGolfCourse extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/gps-fixed.d.ts b/types/react-icons/md/gps-fixed.d.ts
deleted file mode 100644
index 12443403df..0000000000
--- a/types/react-icons/md/gps-fixed.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGpsFixed extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/gps-not-fixed.d.ts b/types/react-icons/md/gps-not-fixed.d.ts
deleted file mode 100644
index 8af1c95e23..0000000000
--- a/types/react-icons/md/gps-not-fixed.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGpsNotFixed extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/gps-off.d.ts b/types/react-icons/md/gps-off.d.ts
deleted file mode 100644
index c02322b7a4..0000000000
--- a/types/react-icons/md/gps-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGpsOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/grade.d.ts b/types/react-icons/md/grade.d.ts
deleted file mode 100644
index cebbc96aa6..0000000000
--- a/types/react-icons/md/grade.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGrade extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/gradient.d.ts b/types/react-icons/md/gradient.d.ts
deleted file mode 100644
index 32e62169a4..0000000000
--- a/types/react-icons/md/gradient.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGradient extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/grain.d.ts b/types/react-icons/md/grain.d.ts
deleted file mode 100644
index 79a8b9a14d..0000000000
--- a/types/react-icons/md/grain.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGrain extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/graphic-eq.d.ts b/types/react-icons/md/graphic-eq.d.ts
deleted file mode 100644
index 7f59fa3728..0000000000
--- a/types/react-icons/md/graphic-eq.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGraphicEq extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/grid-off.d.ts b/types/react-icons/md/grid-off.d.ts
deleted file mode 100644
index 8b5cf60336..0000000000
--- a/types/react-icons/md/grid-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGridOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/grid-on.d.ts b/types/react-icons/md/grid-on.d.ts
deleted file mode 100644
index 4978f9912e..0000000000
--- a/types/react-icons/md/grid-on.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGridOn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/group-add.d.ts b/types/react-icons/md/group-add.d.ts
deleted file mode 100644
index bacc3ed6cf..0000000000
--- a/types/react-icons/md/group-add.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGroupAdd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/group-work.d.ts b/types/react-icons/md/group-work.d.ts
deleted file mode 100644
index 997b1738f2..0000000000
--- a/types/react-icons/md/group-work.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGroupWork extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/group.d.ts b/types/react-icons/md/group.d.ts
deleted file mode 100644
index af48b3dd81..0000000000
--- a/types/react-icons/md/group.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdGroup extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/hd.d.ts b/types/react-icons/md/hd.d.ts
deleted file mode 100644
index 1698da3a4d..0000000000
--- a/types/react-icons/md/hd.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/hdr-off.d.ts b/types/react-icons/md/hdr-off.d.ts
deleted file mode 100644
index 4a343d8a9b..0000000000
--- a/types/react-icons/md/hdr-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHdrOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/hdr-on.d.ts b/types/react-icons/md/hdr-on.d.ts
deleted file mode 100644
index 129aa05032..0000000000
--- a/types/react-icons/md/hdr-on.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHdrOn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/hdr-strong.d.ts b/types/react-icons/md/hdr-strong.d.ts
deleted file mode 100644
index f1eb6a8c80..0000000000
--- a/types/react-icons/md/hdr-strong.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHdrStrong extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/hdr-weak.d.ts b/types/react-icons/md/hdr-weak.d.ts
deleted file mode 100644
index 43be31c24d..0000000000
--- a/types/react-icons/md/hdr-weak.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHdrWeak extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/headset-mic.d.ts b/types/react-icons/md/headset-mic.d.ts
deleted file mode 100644
index 83c8c0547e..0000000000
--- a/types/react-icons/md/headset-mic.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHeadsetMic extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/headset.d.ts b/types/react-icons/md/headset.d.ts
deleted file mode 100644
index 988ed4b38d..0000000000
--- a/types/react-icons/md/headset.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHeadset extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/healing.d.ts b/types/react-icons/md/healing.d.ts
deleted file mode 100644
index fc914063c2..0000000000
--- a/types/react-icons/md/healing.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHealing extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/hearing.d.ts b/types/react-icons/md/hearing.d.ts
deleted file mode 100644
index 134c7f1863..0000000000
--- a/types/react-icons/md/hearing.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHearing extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/help-outline.d.ts b/types/react-icons/md/help-outline.d.ts
deleted file mode 100644
index 2734400cb9..0000000000
--- a/types/react-icons/md/help-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHelpOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/help.d.ts b/types/react-icons/md/help.d.ts
deleted file mode 100644
index cce20cffd6..0000000000
--- a/types/react-icons/md/help.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHelp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/high-quality.d.ts b/types/react-icons/md/high-quality.d.ts
deleted file mode 100644
index 5676b35cbd..0000000000
--- a/types/react-icons/md/high-quality.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHighQuality extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/highlight-off.d.ts b/types/react-icons/md/highlight-off.d.ts
deleted file mode 100644
index f188f1f9bd..0000000000
--- a/types/react-icons/md/highlight-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHighlightOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/highlight-remove.d.ts b/types/react-icons/md/highlight-remove.d.ts
deleted file mode 100644
index 7a28a3b5ae..0000000000
--- a/types/react-icons/md/highlight-remove.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHighlightRemove extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/highlight.d.ts b/types/react-icons/md/highlight.d.ts
deleted file mode 100644
index 0730ad41da..0000000000
--- a/types/react-icons/md/highlight.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHighlight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/history.d.ts b/types/react-icons/md/history.d.ts
deleted file mode 100644
index d97bca17d4..0000000000
--- a/types/react-icons/md/history.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHistory extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/home.d.ts b/types/react-icons/md/home.d.ts
deleted file mode 100644
index 6defd6933f..0000000000
--- a/types/react-icons/md/home.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHome extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/hot-tub.d.ts b/types/react-icons/md/hot-tub.d.ts
deleted file mode 100644
index 89cf2e0591..0000000000
--- a/types/react-icons/md/hot-tub.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHotTub extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/hotel.d.ts b/types/react-icons/md/hotel.d.ts
deleted file mode 100644
index 198fb2b211..0000000000
--- a/types/react-icons/md/hotel.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHotel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/hourglass-empty.d.ts b/types/react-icons/md/hourglass-empty.d.ts
deleted file mode 100644
index a7e4e25915..0000000000
--- a/types/react-icons/md/hourglass-empty.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHourglassEmpty extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/hourglass-full.d.ts b/types/react-icons/md/hourglass-full.d.ts
deleted file mode 100644
index 2a3e1507a3..0000000000
--- a/types/react-icons/md/hourglass-full.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHourglassFull extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/http.d.ts b/types/react-icons/md/http.d.ts
deleted file mode 100644
index def5a14ec5..0000000000
--- a/types/react-icons/md/http.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHttp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/https.d.ts b/types/react-icons/md/https.d.ts
deleted file mode 100644
index 991ad252b9..0000000000
--- a/types/react-icons/md/https.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdHttps extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/image-aspect-ratio.d.ts b/types/react-icons/md/image-aspect-ratio.d.ts
deleted file mode 100644
index 2cff8927ea..0000000000
--- a/types/react-icons/md/image-aspect-ratio.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdImageAspectRatio extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/image.d.ts b/types/react-icons/md/image.d.ts
deleted file mode 100644
index f4246f01ed..0000000000
--- a/types/react-icons/md/image.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdImage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/import-contacts.d.ts b/types/react-icons/md/import-contacts.d.ts
deleted file mode 100644
index 4012627098..0000000000
--- a/types/react-icons/md/import-contacts.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdImportContacts extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/import-export.d.ts b/types/react-icons/md/import-export.d.ts
deleted file mode 100644
index 9c66e17352..0000000000
--- a/types/react-icons/md/import-export.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdImportExport extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/important-devices.d.ts b/types/react-icons/md/important-devices.d.ts
deleted file mode 100644
index 8795301e43..0000000000
--- a/types/react-icons/md/important-devices.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdImportantDevices extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/inbox.d.ts b/types/react-icons/md/inbox.d.ts
deleted file mode 100644
index 13d401760f..0000000000
--- a/types/react-icons/md/inbox.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdInbox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/indeterminate-check-box.d.ts b/types/react-icons/md/indeterminate-check-box.d.ts
deleted file mode 100644
index 01b0c58730..0000000000
--- a/types/react-icons/md/indeterminate-check-box.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdIndeterminateCheckBox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/index.d.ts b/types/react-icons/md/index.d.ts
deleted file mode 100644
index a3e2e3e929..0000000000
--- a/types/react-icons/md/index.d.ts
+++ /dev/null
@@ -1,946 +0,0 @@
-export { default as Md3dRotation } from "./3d-rotation";
-export { default as MdAcUnit } from "./ac-unit";
-export { default as MdAccessAlarm } from "./access-alarm";
-export { default as MdAccessAlarms } from "./access-alarms";
-export { default as MdAccessTime } from "./access-time";
-export { default as MdAccessibility } from "./accessibility";
-export { default as MdAccessible } from "./accessible";
-export { default as MdAccountBalanceWallet } from "./account-balance-wallet";
-export { default as MdAccountBalance } from "./account-balance";
-export { default as MdAccountBox } from "./account-box";
-export { default as MdAccountCircle } from "./account-circle";
-export { default as MdAdb } from "./adb";
-export { default as MdAddAPhoto } from "./add-a-photo";
-export { default as MdAddAlarm } from "./add-alarm";
-export { default as MdAddAlert } from "./add-alert";
-export { default as MdAddBox } from "./add-box";
-export { default as MdAddCircleOutline } from "./add-circle-outline";
-export { default as MdAddCircle } from "./add-circle";
-export { default as MdAddLocation } from "./add-location";
-export { default as MdAddShoppingCart } from "./add-shopping-cart";
-export { default as MdAddToPhotos } from "./add-to-photos";
-export { default as MdAddToQueue } from "./add-to-queue";
-export { default as MdAdd } from "./add";
-export { default as MdAdjust } from "./adjust";
-export { default as MdAirlineSeatFlatAngled } from "./airline-seat-flat-angled";
-export { default as MdAirlineSeatFlat } from "./airline-seat-flat";
-export { default as MdAirlineSeatIndividualSuite } from "./airline-seat-individual-suite";
-export { default as MdAirlineSeatLegroomExtra } from "./airline-seat-legroom-extra";
-export { default as MdAirlineSeatLegroomNormal } from "./airline-seat-legroom-normal";
-export { default as MdAirlineSeatLegroomReduced } from "./airline-seat-legroom-reduced";
-export { default as MdAirlineSeatReclineExtra } from "./airline-seat-recline-extra";
-export { default as MdAirlineSeatReclineNormal } from "./airline-seat-recline-normal";
-export { default as MdAirplanemodeActive } from "./airplanemode-active";
-export { default as MdAirplanemodeInactive } from "./airplanemode-inactive";
-export { default as MdAirplay } from "./airplay";
-export { default as MdAirportShuttle } from "./airport-shuttle";
-export { default as MdAlarmAdd } from "./alarm-add";
-export { default as MdAlarmOff } from "./alarm-off";
-export { default as MdAlarmOn } from "./alarm-on";
-export { default as MdAlarm } from "./alarm";
-export { default as MdAlbum } from "./album";
-export { default as MdAllInclusive } from "./all-inclusive";
-export { default as MdAllOut } from "./all-out";
-export { default as MdAndroid } from "./android";
-export { default as MdAnnouncement } from "./announcement";
-export { default as MdApps } from "./apps";
-export { default as MdArchive } from "./archive";
-export { default as MdArrowBack } from "./arrow-back";
-export { default as MdArrowDownward } from "./arrow-downward";
-export { default as MdArrowDropDownCircle } from "./arrow-drop-down-circle";
-export { default as MdArrowDropDown } from "./arrow-drop-down";
-export { default as MdArrowDropUp } from "./arrow-drop-up";
-export { default as MdArrowForward } from "./arrow-forward";
-export { default as MdArrowUpward } from "./arrow-upward";
-export { default as MdArtTrack } from "./art-track";
-export { default as MdAspectRatio } from "./aspect-ratio";
-export { default as MdAssessment } from "./assessment";
-export { default as MdAssignmentInd } from "./assignment-ind";
-export { default as MdAssignmentLate } from "./assignment-late";
-export { default as MdAssignmentReturn } from "./assignment-return";
-export { default as MdAssignmentReturned } from "./assignment-returned";
-export { default as MdAssignmentTurnedIn } from "./assignment-turned-in";
-export { default as MdAssignment } from "./assignment";
-export { default as MdAssistantPhoto } from "./assistant-photo";
-export { default as MdAssistant } from "./assistant";
-export { default as MdAttachFile } from "./attach-file";
-export { default as MdAttachMoney } from "./attach-money";
-export { default as MdAttachment } from "./attachment";
-export { default as MdAudiotrack } from "./audiotrack";
-export { default as MdAutorenew } from "./autorenew";
-export { default as MdAvTimer } from "./av-timer";
-export { default as MdBackspace } from "./backspace";
-export { default as MdBackup } from "./backup";
-export { default as MdBatteryAlert } from "./battery-alert";
-export { default as MdBatteryChargingFull } from "./battery-charging-full";
-export { default as MdBatteryFull } from "./battery-full";
-export { default as MdBatteryStd } from "./battery-std";
-export { default as MdBatteryUnknown } from "./battery-unknown";
-export { default as MdBeachAccess } from "./beach-access";
-export { default as MdBeenhere } from "./beenhere";
-export { default as MdBlock } from "./block";
-export { default as MdBluetoothAudio } from "./bluetooth-audio";
-export { default as MdBluetoothConnected } from "./bluetooth-connected";
-export { default as MdBluetoothDisabled } from "./bluetooth-disabled";
-export { default as MdBluetoothSearching } from "./bluetooth-searching";
-export { default as MdBluetooth } from "./bluetooth";
-export { default as MdBlurCircular } from "./blur-circular";
-export { default as MdBlurLinear } from "./blur-linear";
-export { default as MdBlurOff } from "./blur-off";
-export { default as MdBlurOn } from "./blur-on";
-export { default as MdBook } from "./book";
-export { default as MdBookmarkOutline } from "./bookmark-outline";
-export { default as MdBookmark } from "./bookmark";
-export { default as MdBorderAll } from "./border-all";
-export { default as MdBorderBottom } from "./border-bottom";
-export { default as MdBorderClear } from "./border-clear";
-export { default as MdBorderColor } from "./border-color";
-export { default as MdBorderHorizontal } from "./border-horizontal";
-export { default as MdBorderInner } from "./border-inner";
-export { default as MdBorderLeft } from "./border-left";
-export { default as MdBorderOuter } from "./border-outer";
-export { default as MdBorderRight } from "./border-right";
-export { default as MdBorderStyle } from "./border-style";
-export { default as MdBorderTop } from "./border-top";
-export { default as MdBorderVertical } from "./border-vertical";
-export { default as MdBrandingWatermark } from "./branding-watermark";
-export { default as MdBrightness1 } from "./brightness-1";
-export { default as MdBrightness2 } from "./brightness-2";
-export { default as MdBrightness3 } from "./brightness-3";
-export { default as MdBrightness4 } from "./brightness-4";
-export { default as MdBrightness5 } from "./brightness-5";
-export { default as MdBrightness6 } from "./brightness-6";
-export { default as MdBrightness7 } from "./brightness-7";
-export { default as MdBrightnessAuto } from "./brightness-auto";
-export { default as MdBrightnessHigh } from "./brightness-high";
-export { default as MdBrightnessLow } from "./brightness-low";
-export { default as MdBrightnessMedium } from "./brightness-medium";
-export { default as MdBrokenImage } from "./broken-image";
-export { default as MdBrush } from "./brush";
-export { default as MdBubbleChart } from "./bubble-chart";
-export { default as MdBugReport } from "./bug-report";
-export { default as MdBuild } from "./build";
-export { default as MdBurstMode } from "./burst-mode";
-export { default as MdBusinessCenter } from "./business-center";
-export { default as MdBusiness } from "./business";
-export { default as MdCached } from "./cached";
-export { default as MdCake } from "./cake";
-export { default as MdCallEnd } from "./call-end";
-export { default as MdCallMade } from "./call-made";
-export { default as MdCallMerge } from "./call-merge";
-export { default as MdCallMissedOutgoing } from "./call-missed-outgoing";
-export { default as MdCallMissed } from "./call-missed";
-export { default as MdCallReceived } from "./call-received";
-export { default as MdCallSplit } from "./call-split";
-export { default as MdCallToAction } from "./call-to-action";
-export { default as MdCall } from "./call";
-export { default as MdCameraAlt } from "./camera-alt";
-export { default as MdCameraEnhance } from "./camera-enhance";
-export { default as MdCameraFront } from "./camera-front";
-export { default as MdCameraRear } from "./camera-rear";
-export { default as MdCameraRoll } from "./camera-roll";
-export { default as MdCamera } from "./camera";
-export { default as MdCancel } from "./cancel";
-export { default as MdCardGiftcard } from "./card-giftcard";
-export { default as MdCardMembership } from "./card-membership";
-export { default as MdCardTravel } from "./card-travel";
-export { default as MdCasino } from "./casino";
-export { default as MdCastConnected } from "./cast-connected";
-export { default as MdCast } from "./cast";
-export { default as MdCenterFocusStrong } from "./center-focus-strong";
-export { default as MdCenterFocusWeak } from "./center-focus-weak";
-export { default as MdChangeHistory } from "./change-history";
-export { default as MdChatBubbleOutline } from "./chat-bubble-outline";
-export { default as MdChatBubble } from "./chat-bubble";
-export { default as MdChat } from "./chat";
-export { default as MdCheckBoxOutlineBlank } from "./check-box-outline-blank";
-export { default as MdCheckBox } from "./check-box";
-export { default as MdCheckCircle } from "./check-circle";
-export { default as MdCheck } from "./check";
-export { default as MdChevronLeft } from "./chevron-left";
-export { default as MdChevronRight } from "./chevron-right";
-export { default as MdChildCare } from "./child-care";
-export { default as MdChildFriendly } from "./child-friendly";
-export { default as MdChromeReaderMode } from "./chrome-reader-mode";
-export { default as MdClass } from "./class";
-export { default as MdClearAll } from "./clear-all";
-export { default as MdClear } from "./clear";
-export { default as MdClose } from "./close";
-export { default as MdClosedCaption } from "./closed-caption";
-export { default as MdCloudCircle } from "./cloud-circle";
-export { default as MdCloudDone } from "./cloud-done";
-export { default as MdCloudDownload } from "./cloud-download";
-export { default as MdCloudOff } from "./cloud-off";
-export { default as MdCloudQueue } from "./cloud-queue";
-export { default as MdCloudUpload } from "./cloud-upload";
-export { default as MdCloud } from "./cloud";
-export { default as MdCode } from "./code";
-export { default as MdCollectionsBookmark } from "./collections-bookmark";
-export { default as MdCollections } from "./collections";
-export { default as MdColorLens } from "./color-lens";
-export { default as MdColorize } from "./colorize";
-export { default as MdComment } from "./comment";
-export { default as MdCompareArrows } from "./compare-arrows";
-export { default as MdCompare } from "./compare";
-export { default as MdComputer } from "./computer";
-export { default as MdConfirmationNumber } from "./confirmation-number";
-export { default as MdContactMail } from "./contact-mail";
-export { default as MdContactPhone } from "./contact-phone";
-export { default as MdContacts } from "./contacts";
-export { default as MdContentCopy } from "./content-copy";
-export { default as MdContentCut } from "./content-cut";
-export { default as MdContentPaste } from "./content-paste";
-export { default as MdControlPointDuplicate } from "./control-point-duplicate";
-export { default as MdControlPoint } from "./control-point";
-export { default as MdCopyright } from "./copyright";
-export { default as MdCreateNewFolder } from "./create-new-folder";
-export { default as MdCreate } from "./create";
-export { default as MdCreditCard } from "./credit-card";
-export { default as MdCrop169 } from "./crop-16-9";
-export { default as MdCrop32 } from "./crop-3-2";
-export { default as MdCrop54 } from "./crop-5-4";
-export { default as MdCrop75 } from "./crop-7-5";
-export { default as MdCropDin } from "./crop-din";
-export { default as MdCropFree } from "./crop-free";
-export { default as MdCropLandscape } from "./crop-landscape";
-export { default as MdCropOriginal } from "./crop-original";
-export { default as MdCropPortrait } from "./crop-portrait";
-export { default as MdCropRotate } from "./crop-rotate";
-export { default as MdCropSquare } from "./crop-square";
-export { default as MdCrop } from "./crop";
-export { default as MdDashboard } from "./dashboard";
-export { default as MdDataUsage } from "./data-usage";
-export { default as MdDateRange } from "./date-range";
-export { default as MdDehaze } from "./dehaze";
-export { default as MdDeleteForever } from "./delete-forever";
-export { default as MdDeleteSweep } from "./delete-sweep";
-export { default as MdDelete } from "./delete";
-export { default as MdDescription } from "./description";
-export { default as MdDesktopMac } from "./desktop-mac";
-export { default as MdDesktopWindows } from "./desktop-windows";
-export { default as MdDetails } from "./details";
-export { default as MdDeveloperBoard } from "./developer-board";
-export { default as MdDeveloperMode } from "./developer-mode";
-export { default as MdDeviceHub } from "./device-hub";
-export { default as MdDevicesOther } from "./devices-other";
-export { default as MdDevices } from "./devices";
-export { default as MdDialerSip } from "./dialer-sip";
-export { default as MdDialpad } from "./dialpad";
-export { default as MdDirectionsBike } from "./directions-bike";
-export { default as MdDirectionsBoat } from "./directions-boat";
-export { default as MdDirectionsBus } from "./directions-bus";
-export { default as MdDirectionsCar } from "./directions-car";
-export { default as MdDirectionsFerry } from "./directions-ferry";
-export { default as MdDirectionsRailway } from "./directions-railway";
-export { default as MdDirectionsRun } from "./directions-run";
-export { default as MdDirectionsSubway } from "./directions-subway";
-export { default as MdDirectionsTransit } from "./directions-transit";
-export { default as MdDirectionsWalk } from "./directions-walk";
-export { default as MdDirections } from "./directions";
-export { default as MdDiscFull } from "./disc-full";
-export { default as MdDns } from "./dns";
-export { default as MdDoNotDisturbAlt } from "./do-not-disturb-alt";
-export { default as MdDoNotDisturbOff } from "./do-not-disturb-off";
-export { default as MdDoNotDisturb } from "./do-not-disturb";
-export { default as MdDock } from "./dock";
-export { default as MdDomain } from "./domain";
-export { default as MdDoneAll } from "./done-all";
-export { default as MdDone } from "./done";
-export { default as MdDonutLarge } from "./donut-large";
-export { default as MdDonutSmall } from "./donut-small";
-export { default as MdDrafts } from "./drafts";
-export { default as MdDragHandle } from "./drag-handle";
-export { default as MdDriveEta } from "./drive-eta";
-export { default as MdDvr } from "./dvr";
-export { default as MdEditLocation } from "./edit-location";
-export { default as MdEdit } from "./edit";
-export { default as MdEject } from "./eject";
-export { default as MdEmail } from "./email";
-export { default as MdEnhancedEncryption } from "./enhanced-encryption";
-export { default as MdEqualizer } from "./equalizer";
-export { default as MdErrorOutline } from "./error-outline";
-export { default as MdError } from "./error";
-export { default as MdEuroSymbol } from "./euro-symbol";
-export { default as MdEvStation } from "./ev-station";
-export { default as MdEventAvailable } from "./event-available";
-export { default as MdEventBusy } from "./event-busy";
-export { default as MdEventNote } from "./event-note";
-export { default as MdEventSeat } from "./event-seat";
-export { default as MdEvent } from "./event";
-export { default as MdExitToApp } from "./exit-to-app";
-export { default as MdExpandLess } from "./expand-less";
-export { default as MdExpandMore } from "./expand-more";
-export { default as MdExplicit } from "./explicit";
-export { default as MdExplore } from "./explore";
-export { default as MdExposureMinus1 } from "./exposure-minus-1";
-export { default as MdExposureMinus2 } from "./exposure-minus-2";
-export { default as MdExposureNeg1 } from "./exposure-neg-1";
-export { default as MdExposureNeg2 } from "./exposure-neg-2";
-export { default as MdExposurePlus1 } from "./exposure-plus-1";
-export { default as MdExposurePlus2 } from "./exposure-plus-2";
-export { default as MdExposureZero } from "./exposure-zero";
-export { default as MdExposure } from "./exposure";
-export { default as MdExtension } from "./extension";
-export { default as MdFace } from "./face";
-export { default as MdFastForward } from "./fast-forward";
-export { default as MdFastRewind } from "./fast-rewind";
-export { default as MdFavoriteBorder } from "./favorite-border";
-export { default as MdFavoriteOutline } from "./favorite-outline";
-export { default as MdFavorite } from "./favorite";
-export { default as MdFeaturedPlayList } from "./featured-play-list";
-export { default as MdFeaturedVideo } from "./featured-video";
-export { default as MdFeedback } from "./feedback";
-export { default as MdFiberDvr } from "./fiber-dvr";
-export { default as MdFiberManualRecord } from "./fiber-manual-record";
-export { default as MdFiberNew } from "./fiber-new";
-export { default as MdFiberPin } from "./fiber-pin";
-export { default as MdFiberSmartRecord } from "./fiber-smart-record";
-export { default as MdFileDownload } from "./file-download";
-export { default as MdFileUpload } from "./file-upload";
-export { default as MdFilter1 } from "./filter-1";
-export { default as MdFilter2 } from "./filter-2";
-export { default as MdFilter3 } from "./filter-3";
-export { default as MdFilter4 } from "./filter-4";
-export { default as MdFilter5 } from "./filter-5";
-export { default as MdFilter6 } from "./filter-6";
-export { default as MdFilter7 } from "./filter-7";
-export { default as MdFilter8 } from "./filter-8";
-export { default as MdFilter9Plus } from "./filter-9-plus";
-export { default as MdFilter9 } from "./filter-9";
-export { default as MdFilterBAndW } from "./filter-b-and-w";
-export { default as MdFilterCenterFocus } from "./filter-center-focus";
-export { default as MdFilterDrama } from "./filter-drama";
-export { default as MdFilterFrames } from "./filter-frames";
-export { default as MdFilterHdr } from "./filter-hdr";
-export { default as MdFilterList } from "./filter-list";
-export { default as MdFilterNone } from "./filter-none";
-export { default as MdFilterTiltShift } from "./filter-tilt-shift";
-export { default as MdFilterVintage } from "./filter-vintage";
-export { default as MdFilter } from "./filter";
-export { default as MdFindInPage } from "./find-in-page";
-export { default as MdFindReplace } from "./find-replace";
-export { default as MdFingerprint } from "./fingerprint";
-export { default as MdFirstPage } from "./first-page";
-export { default as MdFitnessCenter } from "./fitness-center";
-export { default as MdFlag } from "./flag";
-export { default as MdFlare } from "./flare";
-export { default as MdFlashAuto } from "./flash-auto";
-export { default as MdFlashOff } from "./flash-off";
-export { default as MdFlashOn } from "./flash-on";
-export { default as MdFlightLand } from "./flight-land";
-export { default as MdFlightTakeoff } from "./flight-takeoff";
-export { default as MdFlight } from "./flight";
-export { default as MdFlipToBack } from "./flip-to-back";
-export { default as MdFlipToFront } from "./flip-to-front";
-export { default as MdFlip } from "./flip";
-export { default as MdFolderOpen } from "./folder-open";
-export { default as MdFolderShared } from "./folder-shared";
-export { default as MdFolderSpecial } from "./folder-special";
-export { default as MdFolder } from "./folder";
-export { default as MdFontDownload } from "./font-download";
-export { default as MdFormatAlignCenter } from "./format-align-center";
-export { default as MdFormatAlignJustify } from "./format-align-justify";
-export { default as MdFormatAlignLeft } from "./format-align-left";
-export { default as MdFormatAlignRight } from "./format-align-right";
-export { default as MdFormatBold } from "./format-bold";
-export { default as MdFormatClear } from "./format-clear";
-export { default as MdFormatColorFill } from "./format-color-fill";
-export { default as MdFormatColorReset } from "./format-color-reset";
-export { default as MdFormatColorText } from "./format-color-text";
-export { default as MdFormatIndentDecrease } from "./format-indent-decrease";
-export { default as MdFormatIndentIncrease } from "./format-indent-increase";
-export { default as MdFormatItalic } from "./format-italic";
-export { default as MdFormatLineSpacing } from "./format-line-spacing";
-export { default as MdFormatListBulleted } from "./format-list-bulleted";
-export { default as MdFormatListNumbered } from "./format-list-numbered";
-export { default as MdFormatPaint } from "./format-paint";
-export { default as MdFormatQuote } from "./format-quote";
-export { default as MdFormatShapes } from "./format-shapes";
-export { default as MdFormatSize } from "./format-size";
-export { default as MdFormatStrikethrough } from "./format-strikethrough";
-export { default as MdFormatTextdirectionLToR } from "./format-textdirection-l-to-r";
-export { default as MdFormatTextdirectionRToL } from "./format-textdirection-r-to-l";
-export { default as MdFormatUnderlined } from "./format-underlined";
-export { default as MdForum } from "./forum";
-export { default as MdForward10 } from "./forward-10";
-export { default as MdForward30 } from "./forward-30";
-export { default as MdForward5 } from "./forward-5";
-export { default as MdForward } from "./forward";
-export { default as MdFreeBreakfast } from "./free-breakfast";
-export { default as MdFullscreenExit } from "./fullscreen-exit";
-export { default as MdFullscreen } from "./fullscreen";
-export { default as MdFunctions } from "./functions";
-export { default as MdGTranslate } from "./g-translate";
-export { default as MdGamepad } from "./gamepad";
-export { default as MdGames } from "./games";
-export { default as MdGavel } from "./gavel";
-export { default as MdGesture } from "./gesture";
-export { default as MdGetApp } from "./get-app";
-export { default as MdGif } from "./gif";
-export { default as MdGoat } from "./goat";
-export { default as MdGolfCourse } from "./golf-course";
-export { default as MdGpsFixed } from "./gps-fixed";
-export { default as MdGpsNotFixed } from "./gps-not-fixed";
-export { default as MdGpsOff } from "./gps-off";
-export { default as MdGrade } from "./grade";
-export { default as MdGradient } from "./gradient";
-export { default as MdGrain } from "./grain";
-export { default as MdGraphicEq } from "./graphic-eq";
-export { default as MdGridOff } from "./grid-off";
-export { default as MdGridOn } from "./grid-on";
-export { default as MdGroupAdd } from "./group-add";
-export { default as MdGroupWork } from "./group-work";
-export { default as MdGroup } from "./group";
-export { default as MdHd } from "./hd";
-export { default as MdHdrOff } from "./hdr-off";
-export { default as MdHdrOn } from "./hdr-on";
-export { default as MdHdrStrong } from "./hdr-strong";
-export { default as MdHdrWeak } from "./hdr-weak";
-export { default as MdHeadsetMic } from "./headset-mic";
-export { default as MdHeadset } from "./headset";
-export { default as MdHealing } from "./healing";
-export { default as MdHearing } from "./hearing";
-export { default as MdHelpOutline } from "./help-outline";
-export { default as MdHelp } from "./help";
-export { default as MdHighQuality } from "./high-quality";
-export { default as MdHighlightOff } from "./highlight-off";
-export { default as MdHighlightRemove } from "./highlight-remove";
-export { default as MdHighlight } from "./highlight";
-export { default as MdHistory } from "./history";
-export { default as MdHome } from "./home";
-export { default as MdHotTub } from "./hot-tub";
-export { default as MdHotel } from "./hotel";
-export { default as MdHourglassEmpty } from "./hourglass-empty";
-export { default as MdHourglassFull } from "./hourglass-full";
-export { default as MdHttp } from "./http";
-export { default as MdHttps } from "./https";
-export { default as MdImageAspectRatio } from "./image-aspect-ratio";
-export { default as MdImage } from "./image";
-export { default as MdImportContacts } from "./import-contacts";
-export { default as MdImportExport } from "./import-export";
-export { default as MdImportantDevices } from "./important-devices";
-export { default as MdInbox } from "./inbox";
-export { default as MdIndeterminateCheckBox } from "./indeterminate-check-box";
-export { default as MdInfoOutline } from "./info-outline";
-export { default as MdInfo } from "./info";
-export { default as MdInput } from "./input";
-export { default as MdInsertChart } from "./insert-chart";
-export { default as MdInsertComment } from "./insert-comment";
-export { default as MdInsertDriveFile } from "./insert-drive-file";
-export { default as MdInsertEmoticon } from "./insert-emoticon";
-export { default as MdInsertInvitation } from "./insert-invitation";
-export { default as MdInsertLink } from "./insert-link";
-export { default as MdInsertPhoto } from "./insert-photo";
-export { default as MdInvertColorsOff } from "./invert-colors-off";
-export { default as MdInvertColorsOn } from "./invert-colors-on";
-export { default as MdInvertColors } from "./invert-colors";
-export { default as MdIso } from "./iso";
-export { default as MdKeyboardArrowDown } from "./keyboard-arrow-down";
-export { default as MdKeyboardArrowLeft } from "./keyboard-arrow-left";
-export { default as MdKeyboardArrowRight } from "./keyboard-arrow-right";
-export { default as MdKeyboardArrowUp } from "./keyboard-arrow-up";
-export { default as MdKeyboardBackspace } from "./keyboard-backspace";
-export { default as MdKeyboardCapslock } from "./keyboard-capslock";
-export { default as MdKeyboardControl } from "./keyboard-control";
-export { default as MdKeyboardHide } from "./keyboard-hide";
-export { default as MdKeyboardReturn } from "./keyboard-return";
-export { default as MdKeyboardTab } from "./keyboard-tab";
-export { default as MdKeyboardVoice } from "./keyboard-voice";
-export { default as MdKeyboard } from "./keyboard";
-export { default as MdKitchen } from "./kitchen";
-export { default as MdLabelOutline } from "./label-outline";
-export { default as MdLabel } from "./label";
-export { default as MdLandscape } from "./landscape";
-export { default as MdLanguage } from "./language";
-export { default as MdLaptopChromebook } from "./laptop-chromebook";
-export { default as MdLaptopMac } from "./laptop-mac";
-export { default as MdLaptopWindows } from "./laptop-windows";
-export { default as MdLaptop } from "./laptop";
-export { default as MdLastPage } from "./last-page";
-export { default as MdLaunch } from "./launch";
-export { default as MdLayersClear } from "./layers-clear";
-export { default as MdLayers } from "./layers";
-export { default as MdLeakAdd } from "./leak-add";
-export { default as MdLeakRemove } from "./leak-remove";
-export { default as MdLens } from "./lens";
-export { default as MdLibraryAdd } from "./library-add";
-export { default as MdLibraryBooks } from "./library-books";
-export { default as MdLibraryMusic } from "./library-music";
-export { default as MdLightbulbOutline } from "./lightbulb-outline";
-export { default as MdLineStyle } from "./line-style";
-export { default as MdLineWeight } from "./line-weight";
-export { default as MdLinearScale } from "./linear-scale";
-export { default as MdLink } from "./link";
-export { default as MdLinkedCamera } from "./linked-camera";
-export { default as MdList } from "./list";
-export { default as MdLiveHelp } from "./live-help";
-export { default as MdLiveTv } from "./live-tv";
-export { default as MdLocalAirport } from "./local-airport";
-export { default as MdLocalAtm } from "./local-atm";
-export { default as MdLocalAttraction } from "./local-attraction";
-export { default as MdLocalBar } from "./local-bar";
-export { default as MdLocalCafe } from "./local-cafe";
-export { default as MdLocalCarWash } from "./local-car-wash";
-export { default as MdLocalConvenienceStore } from "./local-convenience-store";
-export { default as MdLocalDrink } from "./local-drink";
-export { default as MdLocalFlorist } from "./local-florist";
-export { default as MdLocalGasStation } from "./local-gas-station";
-export { default as MdLocalGroceryStore } from "./local-grocery-store";
-export { default as MdLocalHospital } from "./local-hospital";
-export { default as MdLocalHotel } from "./local-hotel";
-export { default as MdLocalLaundryService } from "./local-laundry-service";
-export { default as MdLocalLibrary } from "./local-library";
-export { default as MdLocalMall } from "./local-mall";
-export { default as MdLocalMovies } from "./local-movies";
-export { default as MdLocalOffer } from "./local-offer";
-export { default as MdLocalParking } from "./local-parking";
-export { default as MdLocalPharmacy } from "./local-pharmacy";
-export { default as MdLocalPhone } from "./local-phone";
-export { default as MdLocalPizza } from "./local-pizza";
-export { default as MdLocalPlay } from "./local-play";
-export { default as MdLocalPostOffice } from "./local-post-office";
-export { default as MdLocalPrintShop } from "./local-print-shop";
-export { default as MdLocalRestaurant } from "./local-restaurant";
-export { default as MdLocalSee } from "./local-see";
-export { default as MdLocalShipping } from "./local-shipping";
-export { default as MdLocalTaxi } from "./local-taxi";
-export { default as MdLocationCity } from "./location-city";
-export { default as MdLocationDisabled } from "./location-disabled";
-export { default as MdLocationHistory } from "./location-history";
-export { default as MdLocationOff } from "./location-off";
-export { default as MdLocationOn } from "./location-on";
-export { default as MdLocationSearching } from "./location-searching";
-export { default as MdLockOpen } from "./lock-open";
-export { default as MdLockOutline } from "./lock-outline";
-export { default as MdLock } from "./lock";
-export { default as MdLooks3 } from "./looks-3";
-export { default as MdLooks4 } from "./looks-4";
-export { default as MdLooks5 } from "./looks-5";
-export { default as MdLooks6 } from "./looks-6";
-export { default as MdLooksOne } from "./looks-one";
-export { default as MdLooksTwo } from "./looks-two";
-export { default as MdLooks } from "./looks";
-export { default as MdLoop } from "./loop";
-export { default as MdLoupe } from "./loupe";
-export { default as MdLowPriority } from "./low-priority";
-export { default as MdLoyalty } from "./loyalty";
-export { default as MdMailOutline } from "./mail-outline";
-export { default as MdMail } from "./mail";
-export { default as MdMap } from "./map";
-export { default as MdMarkunreadMailbox } from "./markunread-mailbox";
-export { default as MdMarkunread } from "./markunread";
-export { default as MdMemory } from "./memory";
-export { default as MdMenu } from "./menu";
-export { default as MdMergeType } from "./merge-type";
-export { default as MdMessage } from "./message";
-export { default as MdMicNone } from "./mic-none";
-export { default as MdMicOff } from "./mic-off";
-export { default as MdMic } from "./mic";
-export { default as MdMms } from "./mms";
-export { default as MdModeComment } from "./mode-comment";
-export { default as MdModeEdit } from "./mode-edit";
-export { default as MdMonetizationOn } from "./monetization-on";
-export { default as MdMoneyOff } from "./money-off";
-export { default as MdMonochromePhotos } from "./monochrome-photos";
-export { default as MdMoodBad } from "./mood-bad";
-export { default as MdMood } from "./mood";
-export { default as MdMoreHoriz } from "./more-horiz";
-export { default as MdMoreVert } from "./more-vert";
-export { default as MdMore } from "./more";
-export { default as MdMotorcycle } from "./motorcycle";
-export { default as MdMouse } from "./mouse";
-export { default as MdMoveToInbox } from "./move-to-inbox";
-export { default as MdMovieCreation } from "./movie-creation";
-export { default as MdMovieFilter } from "./movie-filter";
-export { default as MdMovie } from "./movie";
-export { default as MdMultilineChart } from "./multiline-chart";
-export { default as MdMusicNote } from "./music-note";
-export { default as MdMusicVideo } from "./music-video";
-export { default as MdMyLocation } from "./my-location";
-export { default as MdNaturePeople } from "./nature-people";
-export { default as MdNature } from "./nature";
-export { default as MdNavigateBefore } from "./navigate-before";
-export { default as MdNavigateNext } from "./navigate-next";
-export { default as MdNavigation } from "./navigation";
-export { default as MdNearMe } from "./near-me";
-export { default as MdNetworkCell } from "./network-cell";
-export { default as MdNetworkCheck } from "./network-check";
-export { default as MdNetworkLocked } from "./network-locked";
-export { default as MdNetworkWifi } from "./network-wifi";
-export { default as MdNewReleases } from "./new-releases";
-export { default as MdNextWeek } from "./next-week";
-export { default as MdNfc } from "./nfc";
-export { default as MdNoEncryption } from "./no-encryption";
-export { default as MdNoSim } from "./no-sim";
-export { default as MdNotInterested } from "./not-interested";
-export { default as MdNoteAdd } from "./note-add";
-export { default as MdNote } from "./note";
-export { default as MdNotificationsActive } from "./notifications-active";
-export { default as MdNotificationsNone } from "./notifications-none";
-export { default as MdNotificationsOff } from "./notifications-off";
-export { default as MdNotificationsPaused } from "./notifications-paused";
-export { default as MdNotifications } from "./notifications";
-export { default as MdNowWallpaper } from "./now-wallpaper";
-export { default as MdNowWidgets } from "./now-widgets";
-export { default as MdOfflinePin } from "./offline-pin";
-export { default as MdOndemandVideo } from "./ondemand-video";
-export { default as MdOpacity } from "./opacity";
-export { default as MdOpenInBrowser } from "./open-in-browser";
-export { default as MdOpenInNew } from "./open-in-new";
-export { default as MdOpenWith } from "./open-with";
-export { default as MdPages } from "./pages";
-export { default as MdPageview } from "./pageview";
-export { default as MdPalette } from "./palette";
-export { default as MdPanTool } from "./pan-tool";
-export { default as MdPanoramaFishEye } from "./panorama-fish-eye";
-export { default as MdPanoramaHorizontal } from "./panorama-horizontal";
-export { default as MdPanoramaVertical } from "./panorama-vertical";
-export { default as MdPanoramaWideAngle } from "./panorama-wide-angle";
-export { default as MdPanorama } from "./panorama";
-export { default as MdPartyMode } from "./party-mode";
-export { default as MdPauseCircleFilled } from "./pause-circle-filled";
-export { default as MdPauseCircleOutline } from "./pause-circle-outline";
-export { default as MdPause } from "./pause";
-export { default as MdPayment } from "./payment";
-export { default as MdPeopleOutline } from "./people-outline";
-export { default as MdPeople } from "./people";
-export { default as MdPermCameraMic } from "./perm-camera-mic";
-export { default as MdPermContactCalendar } from "./perm-contact-calendar";
-export { default as MdPermDataSetting } from "./perm-data-setting";
-export { default as MdPermDeviceInformation } from "./perm-device-information";
-export { default as MdPermIdentity } from "./perm-identity";
-export { default as MdPermMedia } from "./perm-media";
-export { default as MdPermPhoneMsg } from "./perm-phone-msg";
-export { default as MdPermScanWifi } from "./perm-scan-wifi";
-export { default as MdPersonAdd } from "./person-add";
-export { default as MdPersonOutline } from "./person-outline";
-export { default as MdPersonPinCircle } from "./person-pin-circle";
-export { default as MdPersonPin } from "./person-pin";
-export { default as MdPerson } from "./person";
-export { default as MdPersonalVideo } from "./personal-video";
-export { default as MdPets } from "./pets";
-export { default as MdPhoneAndroid } from "./phone-android";
-export { default as MdPhoneBluetoothSpeaker } from "./phone-bluetooth-speaker";
-export { default as MdPhoneForwarded } from "./phone-forwarded";
-export { default as MdPhoneInTalk } from "./phone-in-talk";
-export { default as MdPhoneIphone } from "./phone-iphone";
-export { default as MdPhoneLocked } from "./phone-locked";
-export { default as MdPhoneMissed } from "./phone-missed";
-export { default as MdPhonePaused } from "./phone-paused";
-export { default as MdPhone } from "./phone";
-export { default as MdPhonelinkErase } from "./phonelink-erase";
-export { default as MdPhonelinkLock } from "./phonelink-lock";
-export { default as MdPhonelinkOff } from "./phonelink-off";
-export { default as MdPhonelinkRing } from "./phonelink-ring";
-export { default as MdPhonelinkSetup } from "./phonelink-setup";
-export { default as MdPhonelink } from "./phonelink";
-export { default as MdPhotoAlbum } from "./photo-album";
-export { default as MdPhotoCamera } from "./photo-camera";
-export { default as MdPhotoFilter } from "./photo-filter";
-export { default as MdPhotoLibrary } from "./photo-library";
-export { default as MdPhotoSizeSelectActual } from "./photo-size-select-actual";
-export { default as MdPhotoSizeSelectLarge } from "./photo-size-select-large";
-export { default as MdPhotoSizeSelectSmall } from "./photo-size-select-small";
-export { default as MdPhoto } from "./photo";
-export { default as MdPictureAsPdf } from "./picture-as-pdf";
-export { default as MdPictureInPictureAlt } from "./picture-in-picture-alt";
-export { default as MdPictureInPicture } from "./picture-in-picture";
-export { default as MdPieChartOutlined } from "./pie-chart-outlined";
-export { default as MdPieChart } from "./pie-chart";
-export { default as MdPinDrop } from "./pin-drop";
-export { default as MdPlace } from "./place";
-export { default as MdPlayArrow } from "./play-arrow";
-export { default as MdPlayCircleFilled } from "./play-circle-filled";
-export { default as MdPlayCircleOutline } from "./play-circle-outline";
-export { default as MdPlayForWork } from "./play-for-work";
-export { default as MdPlaylistAddCheck } from "./playlist-add-check";
-export { default as MdPlaylistAdd } from "./playlist-add";
-export { default as MdPlaylistPlay } from "./playlist-play";
-export { default as MdPlusOne } from "./plus-one";
-export { default as MdPoll } from "./poll";
-export { default as MdPolymer } from "./polymer";
-export { default as MdPool } from "./pool";
-export { default as MdPortableWifiOff } from "./portable-wifi-off";
-export { default as MdPortrait } from "./portrait";
-export { default as MdPowerInput } from "./power-input";
-export { default as MdPowerSettingsNew } from "./power-settings-new";
-export { default as MdPower } from "./power";
-export { default as MdPregnantWoman } from "./pregnant-woman";
-export { default as MdPresentToAll } from "./present-to-all";
-export { default as MdPrint } from "./print";
-export { default as MdPriorityHigh } from "./priority-high";
-export { default as MdPublic } from "./public";
-export { default as MdPublish } from "./publish";
-export { default as MdQueryBuilder } from "./query-builder";
-export { default as MdQuestionAnswer } from "./question-answer";
-export { default as MdQueueMusic } from "./queue-music";
-export { default as MdQueuePlayNext } from "./queue-play-next";
-export { default as MdQueue } from "./queue";
-export { default as MdRadioButtonChecked } from "./radio-button-checked";
-export { default as MdRadioButtonUnchecked } from "./radio-button-unchecked";
-export { default as MdRadio } from "./radio";
-export { default as MdRateReview } from "./rate-review";
-export { default as MdReceipt } from "./receipt";
-export { default as MdRecentActors } from "./recent-actors";
-export { default as MdRecordVoiceOver } from "./record-voice-over";
-export { default as MdRedeem } from "./redeem";
-export { default as MdRedo } from "./redo";
-export { default as MdRefresh } from "./refresh";
-export { default as MdRemoveCircleOutline } from "./remove-circle-outline";
-export { default as MdRemoveCircle } from "./remove-circle";
-export { default as MdRemoveFromQueue } from "./remove-from-queue";
-export { default as MdRemoveRedEye } from "./remove-red-eye";
-export { default as MdRemoveShoppingCart } from "./remove-shopping-cart";
-export { default as MdRemove } from "./remove";
-export { default as MdReorder } from "./reorder";
-export { default as MdRepeatOne } from "./repeat-one";
-export { default as MdRepeat } from "./repeat";
-export { default as MdReplay10 } from "./replay-10";
-export { default as MdReplay30 } from "./replay-30";
-export { default as MdReplay5 } from "./replay-5";
-export { default as MdReplay } from "./replay";
-export { default as MdReplyAll } from "./reply-all";
-export { default as MdReply } from "./reply";
-export { default as MdReportProblem } from "./report-problem";
-export { default as MdReport } from "./report";
-export { default as MdRestaurantMenu } from "./restaurant-menu";
-export { default as MdRestaurant } from "./restaurant";
-export { default as MdRestorePage } from "./restore-page";
-export { default as MdRestore } from "./restore";
-export { default as MdRingVolume } from "./ring-volume";
-export { default as MdRoomService } from "./room-service";
-export { default as MdRoom } from "./room";
-export { default as MdRotate90DegreesCcw } from "./rotate-90-degrees-ccw";
-export { default as MdRotateLeft } from "./rotate-left";
-export { default as MdRotateRight } from "./rotate-right";
-export { default as MdRoundedCorner } from "./rounded-corner";
-export { default as MdRouter } from "./router";
-export { default as MdRowing } from "./rowing";
-export { default as MdRssFeed } from "./rss-feed";
-export { default as MdRvHookup } from "./rv-hookup";
-export { default as MdSatellite } from "./satellite";
-export { default as MdSave } from "./save";
-export { default as MdScanner } from "./scanner";
-export { default as MdSchedule } from "./schedule";
-export { default as MdSchool } from "./school";
-export { default as MdScreenLockLandscape } from "./screen-lock-landscape";
-export { default as MdScreenLockPortrait } from "./screen-lock-portrait";
-export { default as MdScreenLockRotation } from "./screen-lock-rotation";
-export { default as MdScreenRotation } from "./screen-rotation";
-export { default as MdScreenShare } from "./screen-share";
-export { default as MdSdCard } from "./sd-card";
-export { default as MdSdStorage } from "./sd-storage";
-export { default as MdSearch } from "./search";
-export { default as MdSecurity } from "./security";
-export { default as MdSelectAll } from "./select-all";
-export { default as MdSend } from "./send";
-export { default as MdSentimentDissatisfied } from "./sentiment-dissatisfied";
-export { default as MdSentimentNeutral } from "./sentiment-neutral";
-export { default as MdSentimentSatisfied } from "./sentiment-satisfied";
-export { default as MdSentimentVeryDissatisfied } from "./sentiment-very-dissatisfied";
-export { default as MdSentimentVerySatisfied } from "./sentiment-very-satisfied";
-export { default as MdSettingsApplications } from "./settings-applications";
-export { default as MdSettingsBackupRestore } from "./settings-backup-restore";
-export { default as MdSettingsBluetooth } from "./settings-bluetooth";
-export { default as MdSettingsBrightness } from "./settings-brightness";
-export { default as MdSettingsCell } from "./settings-cell";
-export { default as MdSettingsEthernet } from "./settings-ethernet";
-export { default as MdSettingsInputAntenna } from "./settings-input-antenna";
-export { default as MdSettingsInputComponent } from "./settings-input-component";
-export { default as MdSettingsInputComposite } from "./settings-input-composite";
-export { default as MdSettingsInputHdmi } from "./settings-input-hdmi";
-export { default as MdSettingsInputSvideo } from "./settings-input-svideo";
-export { default as MdSettingsOverscan } from "./settings-overscan";
-export { default as MdSettingsPhone } from "./settings-phone";
-export { default as MdSettingsPower } from "./settings-power";
-export { default as MdSettingsRemote } from "./settings-remote";
-export { default as MdSettingsSystemDaydream } from "./settings-system-daydream";
-export { default as MdSettingsVoice } from "./settings-voice";
-export { default as MdSettings } from "./settings";
-export { default as MdShare } from "./share";
-export { default as MdShopTwo } from "./shop-two";
-export { default as MdShop } from "./shop";
-export { default as MdShoppingBasket } from "./shopping-basket";
-export { default as MdShoppingCart } from "./shopping-cart";
-export { default as MdShortText } from "./short-text";
-export { default as MdShowChart } from "./show-chart";
-export { default as MdShuffle } from "./shuffle";
-export { default as MdSignalCellular4Bar } from "./signal-cellular-4-bar";
-export { default as MdSignalCellularConnectedNoInternet4Bar } from "./signal-cellular-connected-no-internet-4-bar";
-export { default as MdSignalCellularNoSim } from "./signal-cellular-no-sim";
-export { default as MdSignalCellularNull } from "./signal-cellular-null";
-export { default as MdSignalCellularOff } from "./signal-cellular-off";
-export { default as MdSignalWifi4BarLock } from "./signal-wifi-4-bar-lock";
-export { default as MdSignalWifi4Bar } from "./signal-wifi-4-bar";
-export { default as MdSignalWifiOff } from "./signal-wifi-off";
-export { default as MdSimCardAlert } from "./sim-card-alert";
-export { default as MdSimCard } from "./sim-card";
-export { default as MdSkipNext } from "./skip-next";
-export { default as MdSkipPrevious } from "./skip-previous";
-export { default as MdSlideshow } from "./slideshow";
-export { default as MdSlowMotionVideo } from "./slow-motion-video";
-export { default as MdSmartphone } from "./smartphone";
-export { default as MdSmokeFree } from "./smoke-free";
-export { default as MdSmokingRooms } from "./smoking-rooms";
-export { default as MdSmsFailed } from "./sms-failed";
-export { default as MdSms } from "./sms";
-export { default as MdSnooze } from "./snooze";
-export { default as MdSortByAlpha } from "./sort-by-alpha";
-export { default as MdSort } from "./sort";
-export { default as MdSpa } from "./spa";
-export { default as MdSpaceBar } from "./space-bar";
-export { default as MdSpeakerGroup } from "./speaker-group";
-export { default as MdSpeakerNotesOff } from "./speaker-notes-off";
-export { default as MdSpeakerNotes } from "./speaker-notes";
-export { default as MdSpeakerPhone } from "./speaker-phone";
-export { default as MdSpeaker } from "./speaker";
-export { default as MdSpellcheck } from "./spellcheck";
-export { default as MdStarBorder } from "./star-border";
-export { default as MdStarHalf } from "./star-half";
-export { default as MdStarOutline } from "./star-outline";
-export { default as MdStar } from "./star";
-export { default as MdStars } from "./stars";
-export { default as MdStayCurrentLandscape } from "./stay-current-landscape";
-export { default as MdStayCurrentPortrait } from "./stay-current-portrait";
-export { default as MdStayPrimaryLandscape } from "./stay-primary-landscape";
-export { default as MdStayPrimaryPortrait } from "./stay-primary-portrait";
-export { default as MdStopScreenShare } from "./stop-screen-share";
-export { default as MdStop } from "./stop";
-export { default as MdStorage } from "./storage";
-export { default as MdStoreMallDirectory } from "./store-mall-directory";
-export { default as MdStore } from "./store";
-export { default as MdStraighten } from "./straighten";
-export { default as MdStreetview } from "./streetview";
-export { default as MdStrikethroughS } from "./strikethrough-s";
-export { default as MdStyle } from "./style";
-export { default as MdSubdirectoryArrowLeft } from "./subdirectory-arrow-left";
-export { default as MdSubdirectoryArrowRight } from "./subdirectory-arrow-right";
-export { default as MdSubject } from "./subject";
-export { default as MdSubscriptions } from "./subscriptions";
-export { default as MdSubtitles } from "./subtitles";
-export { default as MdSubway } from "./subway";
-export { default as MdSupervisorAccount } from "./supervisor-account";
-export { default as MdSurroundSound } from "./surround-sound";
-export { default as MdSwapCalls } from "./swap-calls";
-export { default as MdSwapHoriz } from "./swap-horiz";
-export { default as MdSwapVert } from "./swap-vert";
-export { default as MdSwapVerticalCircle } from "./swap-vertical-circle";
-export { default as MdSwitchCamera } from "./switch-camera";
-export { default as MdSwitchVideo } from "./switch-video";
-export { default as MdSyncDisabled } from "./sync-disabled";
-export { default as MdSyncProblem } from "./sync-problem";
-export { default as MdSync } from "./sync";
-export { default as MdSystemUpdateAlt } from "./system-update-alt";
-export { default as MdSystemUpdate } from "./system-update";
-export { default as MdTabUnselected } from "./tab-unselected";
-export { default as MdTab } from "./tab";
-export { default as MdTabletAndroid } from "./tablet-android";
-export { default as MdTabletMac } from "./tablet-mac";
-export { default as MdTablet } from "./tablet";
-export { default as MdTagFaces } from "./tag-faces";
-export { default as MdTapAndPlay } from "./tap-and-play";
-export { default as MdTerrain } from "./terrain";
-export { default as MdTextFields } from "./text-fields";
-export { default as MdTextFormat } from "./text-format";
-export { default as MdTextsms } from "./textsms";
-export { default as MdTexture } from "./texture";
-export { default as MdTheaters } from "./theaters";
-export { default as MdThumbDown } from "./thumb-down";
-export { default as MdThumbUp } from "./thumb-up";
-export { default as MdThumbsUpDown } from "./thumbs-up-down";
-export { default as MdTimeToLeave } from "./time-to-leave";
-export { default as MdTimelapse } from "./timelapse";
-export { default as MdTimeline } from "./timeline";
-export { default as MdTimer10 } from "./timer-10";
-export { default as MdTimer3 } from "./timer-3";
-export { default as MdTimerOff } from "./timer-off";
-export { default as MdTimer } from "./timer";
-export { default as MdTitle } from "./title";
-export { default as MdToc } from "./toc";
-export { default as MdToday } from "./today";
-export { default as MdToll } from "./toll";
-export { default as MdTonality } from "./tonality";
-export { default as MdTouchApp } from "./touch-app";
-export { default as MdToys } from "./toys";
-export { default as MdTrackChanges } from "./track-changes";
-export { default as MdTraffic } from "./traffic";
-export { default as MdTrain } from "./train";
-export { default as MdTram } from "./tram";
-export { default as MdTransferWithinAStation } from "./transfer-within-a-station";
-export { default as MdTransform } from "./transform";
-export { default as MdTranslate } from "./translate";
-export { default as MdTrendingDown } from "./trending-down";
-export { default as MdTrendingFlat } from "./trending-flat";
-export { default as MdTrendingNeutral } from "./trending-neutral";
-export { default as MdTrendingUp } from "./trending-up";
-export { default as MdTune } from "./tune";
-export { default as MdTurnedInNot } from "./turned-in-not";
-export { default as MdTurnedIn } from "./turned-in";
-export { default as MdTv } from "./tv";
-export { default as MdUnarchive } from "./unarchive";
-export { default as MdUndo } from "./undo";
-export { default as MdUnfoldLess } from "./unfold-less";
-export { default as MdUnfoldMore } from "./unfold-more";
-export { default as MdUpdate } from "./update";
-export { default as MdUsb } from "./usb";
-export { default as MdVerifiedUser } from "./verified-user";
-export { default as MdVerticalAlignBottom } from "./vertical-align-bottom";
-export { default as MdVerticalAlignCenter } from "./vertical-align-center";
-export { default as MdVerticalAlignTop } from "./vertical-align-top";
-export { default as MdVibration } from "./vibration";
-export { default as MdVideoCall } from "./video-call";
-export { default as MdVideoCollection } from "./video-collection";
-export { default as MdVideoLabel } from "./video-label";
-export { default as MdVideoLibrary } from "./video-library";
-export { default as MdVideocamOff } from "./videocam-off";
-export { default as MdVideocam } from "./videocam";
-export { default as MdVideogameAsset } from "./videogame-asset";
-export { default as MdViewAgenda } from "./view-agenda";
-export { default as MdViewArray } from "./view-array";
-export { default as MdViewCarousel } from "./view-carousel";
-export { default as MdViewColumn } from "./view-column";
-export { default as MdViewComfortable } from "./view-comfortable";
-export { default as MdViewComfy } from "./view-comfy";
-export { default as MdViewCompact } from "./view-compact";
-export { default as MdViewDay } from "./view-day";
-export { default as MdViewHeadline } from "./view-headline";
-export { default as MdViewList } from "./view-list";
-export { default as MdViewModule } from "./view-module";
-export { default as MdViewQuilt } from "./view-quilt";
-export { default as MdViewStream } from "./view-stream";
-export { default as MdViewWeek } from "./view-week";
-export { default as MdVignette } from "./vignette";
-export { default as MdVisibilityOff } from "./visibility-off";
-export { default as MdVisibility } from "./visibility";
-export { default as MdVoiceChat } from "./voice-chat";
-export { default as MdVoicemail } from "./voicemail";
-export { default as MdVolumeDown } from "./volume-down";
-export { default as MdVolumeMute } from "./volume-mute";
-export { default as MdVolumeOff } from "./volume-off";
-export { default as MdVolumeUp } from "./volume-up";
-export { default as MdVpnKey } from "./vpn-key";
-export { default as MdVpnLock } from "./vpn-lock";
-export { default as MdWallpaper } from "./wallpaper";
-export { default as MdWarning } from "./warning";
-export { default as MdWatchLater } from "./watch-later";
-export { default as MdWatch } from "./watch";
-export { default as MdWbAuto } from "./wb-auto";
-export { default as MdWbCloudy } from "./wb-cloudy";
-export { default as MdWbIncandescent } from "./wb-incandescent";
-export { default as MdWbIridescent } from "./wb-iridescent";
-export { default as MdWbSunny } from "./wb-sunny";
-export { default as MdWc } from "./wc";
-export { default as MdWebAsset } from "./web-asset";
-export { default as MdWeb } from "./web";
-export { default as MdWeekend } from "./weekend";
-export { default as MdWhatshot } from "./whatshot";
-export { default as MdWidgets } from "./widgets";
-export { default as MdWifiLock } from "./wifi-lock";
-export { default as MdWifiTethering } from "./wifi-tethering";
-export { default as MdWifi } from "./wifi";
-export { default as MdWork } from "./work";
-export { default as MdWrapText } from "./wrap-text";
-export { default as MdYoutubeSearchedFor } from "./youtube-searched-for";
-export { default as MdZoomIn } from "./zoom-in";
-export { default as MdZoomOutMap } from "./zoom-out-map";
-export { default as MdZoomOut } from "./zoom-out";
diff --git a/types/react-icons/md/info-outline.d.ts b/types/react-icons/md/info-outline.d.ts
deleted file mode 100644
index 6ac0500f92..0000000000
--- a/types/react-icons/md/info-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdInfoOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/info.d.ts b/types/react-icons/md/info.d.ts
deleted file mode 100644
index c16ac1add7..0000000000
--- a/types/react-icons/md/info.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdInfo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/input.d.ts b/types/react-icons/md/input.d.ts
deleted file mode 100644
index 1d620b29c8..0000000000
--- a/types/react-icons/md/input.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdInput extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/insert-chart.d.ts b/types/react-icons/md/insert-chart.d.ts
deleted file mode 100644
index c3f11f837a..0000000000
--- a/types/react-icons/md/insert-chart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertChart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/insert-comment.d.ts b/types/react-icons/md/insert-comment.d.ts
deleted file mode 100644
index 4e9435029c..0000000000
--- a/types/react-icons/md/insert-comment.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertComment extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/insert-drive-file.d.ts b/types/react-icons/md/insert-drive-file.d.ts
deleted file mode 100644
index cbef175f50..0000000000
--- a/types/react-icons/md/insert-drive-file.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertDriveFile extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/insert-emoticon.d.ts b/types/react-icons/md/insert-emoticon.d.ts
deleted file mode 100644
index 5cce434cd9..0000000000
--- a/types/react-icons/md/insert-emoticon.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertEmoticon extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/insert-invitation.d.ts b/types/react-icons/md/insert-invitation.d.ts
deleted file mode 100644
index 827e395a8d..0000000000
--- a/types/react-icons/md/insert-invitation.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertInvitation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/insert-link.d.ts b/types/react-icons/md/insert-link.d.ts
deleted file mode 100644
index 31aa91358d..0000000000
--- a/types/react-icons/md/insert-link.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertLink extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/insert-photo.d.ts b/types/react-icons/md/insert-photo.d.ts
deleted file mode 100644
index 7b023ca75f..0000000000
--- a/types/react-icons/md/insert-photo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertPhoto extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/invert-colors-off.d.ts b/types/react-icons/md/invert-colors-off.d.ts
deleted file mode 100644
index bf08ac105a..0000000000
--- a/types/react-icons/md/invert-colors-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdInvertColorsOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/invert-colors-on.d.ts b/types/react-icons/md/invert-colors-on.d.ts
deleted file mode 100644
index 41d3a30370..0000000000
--- a/types/react-icons/md/invert-colors-on.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdInvertColorsOn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/invert-colors.d.ts b/types/react-icons/md/invert-colors.d.ts
deleted file mode 100644
index 6700ad9028..0000000000
--- a/types/react-icons/md/invert-colors.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdInvertColors extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/iso.d.ts b/types/react-icons/md/iso.d.ts
deleted file mode 100644
index 13e1d8da6c..0000000000
--- a/types/react-icons/md/iso.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdIso extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/keyboard-arrow-down.d.ts b/types/react-icons/md/keyboard-arrow-down.d.ts
deleted file mode 100644
index 2aa3a06de4..0000000000
--- a/types/react-icons/md/keyboard-arrow-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardArrowDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/keyboard-arrow-left.d.ts b/types/react-icons/md/keyboard-arrow-left.d.ts
deleted file mode 100644
index 6ab86f3bdc..0000000000
--- a/types/react-icons/md/keyboard-arrow-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardArrowLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/keyboard-arrow-right.d.ts b/types/react-icons/md/keyboard-arrow-right.d.ts
deleted file mode 100644
index 157f9cd453..0000000000
--- a/types/react-icons/md/keyboard-arrow-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardArrowRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/keyboard-arrow-up.d.ts b/types/react-icons/md/keyboard-arrow-up.d.ts
deleted file mode 100644
index be668094a8..0000000000
--- a/types/react-icons/md/keyboard-arrow-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardArrowUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/keyboard-backspace.d.ts b/types/react-icons/md/keyboard-backspace.d.ts
deleted file mode 100644
index 361b3eacb6..0000000000
--- a/types/react-icons/md/keyboard-backspace.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardBackspace extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/keyboard-capslock.d.ts b/types/react-icons/md/keyboard-capslock.d.ts
deleted file mode 100644
index e68fb04dd4..0000000000
--- a/types/react-icons/md/keyboard-capslock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardCapslock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/keyboard-control.d.ts b/types/react-icons/md/keyboard-control.d.ts
deleted file mode 100644
index 26a47f7942..0000000000
--- a/types/react-icons/md/keyboard-control.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardControl extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/keyboard-hide.d.ts b/types/react-icons/md/keyboard-hide.d.ts
deleted file mode 100644
index 2bd9815962..0000000000
--- a/types/react-icons/md/keyboard-hide.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardHide extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/keyboard-return.d.ts b/types/react-icons/md/keyboard-return.d.ts
deleted file mode 100644
index dcc67124f3..0000000000
--- a/types/react-icons/md/keyboard-return.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardReturn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/keyboard-tab.d.ts b/types/react-icons/md/keyboard-tab.d.ts
deleted file mode 100644
index fc60cb1e9d..0000000000
--- a/types/react-icons/md/keyboard-tab.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardTab extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/keyboard-voice.d.ts b/types/react-icons/md/keyboard-voice.d.ts
deleted file mode 100644
index b0e8b84cef..0000000000
--- a/types/react-icons/md/keyboard-voice.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardVoice extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/keyboard.d.ts b/types/react-icons/md/keyboard.d.ts
deleted file mode 100644
index c48881b8b4..0000000000
--- a/types/react-icons/md/keyboard.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/kitchen.d.ts b/types/react-icons/md/kitchen.d.ts
deleted file mode 100644
index 9da8c6f762..0000000000
--- a/types/react-icons/md/kitchen.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdKitchen extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/label-outline.d.ts b/types/react-icons/md/label-outline.d.ts
deleted file mode 100644
index f8565aaac8..0000000000
--- a/types/react-icons/md/label-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLabelOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/label.d.ts b/types/react-icons/md/label.d.ts
deleted file mode 100644
index 679636e231..0000000000
--- a/types/react-icons/md/label.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLabel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/landscape.d.ts b/types/react-icons/md/landscape.d.ts
deleted file mode 100644
index fb4502522b..0000000000
--- a/types/react-icons/md/landscape.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLandscape extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/language.d.ts b/types/react-icons/md/language.d.ts
deleted file mode 100644
index a47388c654..0000000000
--- a/types/react-icons/md/language.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLanguage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/laptop-chromebook.d.ts b/types/react-icons/md/laptop-chromebook.d.ts
deleted file mode 100644
index d1f25cdc3b..0000000000
--- a/types/react-icons/md/laptop-chromebook.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLaptopChromebook extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/laptop-mac.d.ts b/types/react-icons/md/laptop-mac.d.ts
deleted file mode 100644
index 25afe25920..0000000000
--- a/types/react-icons/md/laptop-mac.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLaptopMac extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/laptop-windows.d.ts b/types/react-icons/md/laptop-windows.d.ts
deleted file mode 100644
index bd7441fea1..0000000000
--- a/types/react-icons/md/laptop-windows.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLaptopWindows extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/laptop.d.ts b/types/react-icons/md/laptop.d.ts
deleted file mode 100644
index 2510020e0c..0000000000
--- a/types/react-icons/md/laptop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLaptop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/last-page.d.ts b/types/react-icons/md/last-page.d.ts
deleted file mode 100644
index 162f94c0de..0000000000
--- a/types/react-icons/md/last-page.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLastPage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/launch.d.ts b/types/react-icons/md/launch.d.ts
deleted file mode 100644
index 6bd2552cb3..0000000000
--- a/types/react-icons/md/launch.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLaunch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/layers-clear.d.ts b/types/react-icons/md/layers-clear.d.ts
deleted file mode 100644
index 136d4ab797..0000000000
--- a/types/react-icons/md/layers-clear.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLayersClear extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/layers.d.ts b/types/react-icons/md/layers.d.ts
deleted file mode 100644
index d0f2ce7f78..0000000000
--- a/types/react-icons/md/layers.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLayers extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/leak-add.d.ts b/types/react-icons/md/leak-add.d.ts
deleted file mode 100644
index 95235a4a7d..0000000000
--- a/types/react-icons/md/leak-add.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLeakAdd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/leak-remove.d.ts b/types/react-icons/md/leak-remove.d.ts
deleted file mode 100644
index 024072b36a..0000000000
--- a/types/react-icons/md/leak-remove.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLeakRemove extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/lens.d.ts b/types/react-icons/md/lens.d.ts
deleted file mode 100644
index c5d535560e..0000000000
--- a/types/react-icons/md/lens.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLens extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/library-add.d.ts b/types/react-icons/md/library-add.d.ts
deleted file mode 100644
index 0d1e45a2d1..0000000000
--- a/types/react-icons/md/library-add.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLibraryAdd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/library-books.d.ts b/types/react-icons/md/library-books.d.ts
deleted file mode 100644
index 4cd9469a0f..0000000000
--- a/types/react-icons/md/library-books.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLibraryBooks extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/library-music.d.ts b/types/react-icons/md/library-music.d.ts
deleted file mode 100644
index 7f25717011..0000000000
--- a/types/react-icons/md/library-music.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLibraryMusic extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/lightbulb-outline.d.ts b/types/react-icons/md/lightbulb-outline.d.ts
deleted file mode 100644
index 013344155b..0000000000
--- a/types/react-icons/md/lightbulb-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLightbulbOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/line-style.d.ts b/types/react-icons/md/line-style.d.ts
deleted file mode 100644
index 01562f8705..0000000000
--- a/types/react-icons/md/line-style.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLineStyle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/line-weight.d.ts b/types/react-icons/md/line-weight.d.ts
deleted file mode 100644
index 2eaa15b7df..0000000000
--- a/types/react-icons/md/line-weight.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLineWeight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/linear-scale.d.ts b/types/react-icons/md/linear-scale.d.ts
deleted file mode 100644
index e4f2196d46..0000000000
--- a/types/react-icons/md/linear-scale.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLinearScale extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/link.d.ts b/types/react-icons/md/link.d.ts
deleted file mode 100644
index 229a79db5d..0000000000
--- a/types/react-icons/md/link.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLink extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/linked-camera.d.ts b/types/react-icons/md/linked-camera.d.ts
deleted file mode 100644
index 04f1059032..0000000000
--- a/types/react-icons/md/linked-camera.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLinkedCamera extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/list.d.ts b/types/react-icons/md/list.d.ts
deleted file mode 100644
index ee687771dd..0000000000
--- a/types/react-icons/md/list.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdList extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/live-help.d.ts b/types/react-icons/md/live-help.d.ts
deleted file mode 100644
index baa4ecfcea..0000000000
--- a/types/react-icons/md/live-help.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLiveHelp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/live-tv.d.ts b/types/react-icons/md/live-tv.d.ts
deleted file mode 100644
index 4b6700c6d7..0000000000
--- a/types/react-icons/md/live-tv.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLiveTv extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-airport.d.ts b/types/react-icons/md/local-airport.d.ts
deleted file mode 100644
index c5cbc96784..0000000000
--- a/types/react-icons/md/local-airport.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalAirport extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-atm.d.ts b/types/react-icons/md/local-atm.d.ts
deleted file mode 100644
index c3aebab325..0000000000
--- a/types/react-icons/md/local-atm.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalAtm extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-attraction.d.ts b/types/react-icons/md/local-attraction.d.ts
deleted file mode 100644
index 4cb4733fc6..0000000000
--- a/types/react-icons/md/local-attraction.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalAttraction extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-bar.d.ts b/types/react-icons/md/local-bar.d.ts
deleted file mode 100644
index 384cf80708..0000000000
--- a/types/react-icons/md/local-bar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalBar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-cafe.d.ts b/types/react-icons/md/local-cafe.d.ts
deleted file mode 100644
index 1edc27271a..0000000000
--- a/types/react-icons/md/local-cafe.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalCafe extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-car-wash.d.ts b/types/react-icons/md/local-car-wash.d.ts
deleted file mode 100644
index 2f8e3424d0..0000000000
--- a/types/react-icons/md/local-car-wash.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalCarWash extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-convenience-store.d.ts b/types/react-icons/md/local-convenience-store.d.ts
deleted file mode 100644
index 60ba5980c5..0000000000
--- a/types/react-icons/md/local-convenience-store.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalConvenienceStore extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-drink.d.ts b/types/react-icons/md/local-drink.d.ts
deleted file mode 100644
index dd0cf01d42..0000000000
--- a/types/react-icons/md/local-drink.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalDrink extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-florist.d.ts b/types/react-icons/md/local-florist.d.ts
deleted file mode 100644
index 6744bc8c3a..0000000000
--- a/types/react-icons/md/local-florist.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalFlorist extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-gas-station.d.ts b/types/react-icons/md/local-gas-station.d.ts
deleted file mode 100644
index 6c6b7df0a9..0000000000
--- a/types/react-icons/md/local-gas-station.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalGasStation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-grocery-store.d.ts b/types/react-icons/md/local-grocery-store.d.ts
deleted file mode 100644
index 74be93825c..0000000000
--- a/types/react-icons/md/local-grocery-store.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalGroceryStore extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-hospital.d.ts b/types/react-icons/md/local-hospital.d.ts
deleted file mode 100644
index 3f3d22c1f1..0000000000
--- a/types/react-icons/md/local-hospital.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalHospital extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-hotel.d.ts b/types/react-icons/md/local-hotel.d.ts
deleted file mode 100644
index 72aa8116e3..0000000000
--- a/types/react-icons/md/local-hotel.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalHotel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-laundry-service.d.ts b/types/react-icons/md/local-laundry-service.d.ts
deleted file mode 100644
index bcddaa57b7..0000000000
--- a/types/react-icons/md/local-laundry-service.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalLaundryService extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-library.d.ts b/types/react-icons/md/local-library.d.ts
deleted file mode 100644
index 66345dec71..0000000000
--- a/types/react-icons/md/local-library.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalLibrary extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-mall.d.ts b/types/react-icons/md/local-mall.d.ts
deleted file mode 100644
index 4bc0bd9a6c..0000000000
--- a/types/react-icons/md/local-mall.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalMall extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-movies.d.ts b/types/react-icons/md/local-movies.d.ts
deleted file mode 100644
index fd585253f4..0000000000
--- a/types/react-icons/md/local-movies.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalMovies extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-offer.d.ts b/types/react-icons/md/local-offer.d.ts
deleted file mode 100644
index d68ec81829..0000000000
--- a/types/react-icons/md/local-offer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalOffer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-parking.d.ts b/types/react-icons/md/local-parking.d.ts
deleted file mode 100644
index 962af582ac..0000000000
--- a/types/react-icons/md/local-parking.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalParking extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-pharmacy.d.ts b/types/react-icons/md/local-pharmacy.d.ts
deleted file mode 100644
index 4f6253241e..0000000000
--- a/types/react-icons/md/local-pharmacy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPharmacy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-phone.d.ts b/types/react-icons/md/local-phone.d.ts
deleted file mode 100644
index 295b71d056..0000000000
--- a/types/react-icons/md/local-phone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPhone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-pizza.d.ts b/types/react-icons/md/local-pizza.d.ts
deleted file mode 100644
index fd8f1e9b3f..0000000000
--- a/types/react-icons/md/local-pizza.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPizza extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-play.d.ts b/types/react-icons/md/local-play.d.ts
deleted file mode 100644
index 2323020f1f..0000000000
--- a/types/react-icons/md/local-play.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPlay extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-post-office.d.ts b/types/react-icons/md/local-post-office.d.ts
deleted file mode 100644
index d753132d88..0000000000
--- a/types/react-icons/md/local-post-office.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPostOffice extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-print-shop.d.ts b/types/react-icons/md/local-print-shop.d.ts
deleted file mode 100644
index f5f2318b18..0000000000
--- a/types/react-icons/md/local-print-shop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPrintShop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-restaurant.d.ts b/types/react-icons/md/local-restaurant.d.ts
deleted file mode 100644
index 631a9bcdba..0000000000
--- a/types/react-icons/md/local-restaurant.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalRestaurant extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-see.d.ts b/types/react-icons/md/local-see.d.ts
deleted file mode 100644
index 6c345a7bdd..0000000000
--- a/types/react-icons/md/local-see.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalSee extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-shipping.d.ts b/types/react-icons/md/local-shipping.d.ts
deleted file mode 100644
index 8862dc1e3f..0000000000
--- a/types/react-icons/md/local-shipping.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalShipping extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/local-taxi.d.ts b/types/react-icons/md/local-taxi.d.ts
deleted file mode 100644
index ffee12d51a..0000000000
--- a/types/react-icons/md/local-taxi.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalTaxi extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/location-city.d.ts b/types/react-icons/md/location-city.d.ts
deleted file mode 100644
index d4154e0b4d..0000000000
--- a/types/react-icons/md/location-city.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationCity extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/location-disabled.d.ts b/types/react-icons/md/location-disabled.d.ts
deleted file mode 100644
index f890985e4c..0000000000
--- a/types/react-icons/md/location-disabled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationDisabled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/location-history.d.ts b/types/react-icons/md/location-history.d.ts
deleted file mode 100644
index 6d7ae193ef..0000000000
--- a/types/react-icons/md/location-history.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationHistory extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/location-off.d.ts b/types/react-icons/md/location-off.d.ts
deleted file mode 100644
index ae7c278991..0000000000
--- a/types/react-icons/md/location-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/location-on.d.ts b/types/react-icons/md/location-on.d.ts
deleted file mode 100644
index 9a606064c1..0000000000
--- a/types/react-icons/md/location-on.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationOn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/location-searching.d.ts b/types/react-icons/md/location-searching.d.ts
deleted file mode 100644
index 89860efc3f..0000000000
--- a/types/react-icons/md/location-searching.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationSearching extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/lock-open.d.ts b/types/react-icons/md/lock-open.d.ts
deleted file mode 100644
index c61129c43a..0000000000
--- a/types/react-icons/md/lock-open.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLockOpen extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/lock-outline.d.ts b/types/react-icons/md/lock-outline.d.ts
deleted file mode 100644
index 8d8c854627..0000000000
--- a/types/react-icons/md/lock-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLockOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/lock.d.ts b/types/react-icons/md/lock.d.ts
deleted file mode 100644
index 08c9bebbec..0000000000
--- a/types/react-icons/md/lock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/looks-3.d.ts b/types/react-icons/md/looks-3.d.ts
deleted file mode 100644
index 91ec18b0fa..0000000000
--- a/types/react-icons/md/looks-3.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLooks3 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/looks-4.d.ts b/types/react-icons/md/looks-4.d.ts
deleted file mode 100644
index 2005a3ef6c..0000000000
--- a/types/react-icons/md/looks-4.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLooks4 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/looks-5.d.ts b/types/react-icons/md/looks-5.d.ts
deleted file mode 100644
index 0e4c8830df..0000000000
--- a/types/react-icons/md/looks-5.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLooks5 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/looks-6.d.ts b/types/react-icons/md/looks-6.d.ts
deleted file mode 100644
index b00d207ffc..0000000000
--- a/types/react-icons/md/looks-6.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLooks6 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/looks-one.d.ts b/types/react-icons/md/looks-one.d.ts
deleted file mode 100644
index 129ebbc28b..0000000000
--- a/types/react-icons/md/looks-one.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLooksOne extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/looks-two.d.ts b/types/react-icons/md/looks-two.d.ts
deleted file mode 100644
index 5f62cb2173..0000000000
--- a/types/react-icons/md/looks-two.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLooksTwo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/looks.d.ts b/types/react-icons/md/looks.d.ts
deleted file mode 100644
index 5db0141f58..0000000000
--- a/types/react-icons/md/looks.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLooks extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/loop.d.ts b/types/react-icons/md/loop.d.ts
deleted file mode 100644
index 8e7f90aad0..0000000000
--- a/types/react-icons/md/loop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLoop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/loupe.d.ts b/types/react-icons/md/loupe.d.ts
deleted file mode 100644
index 8b7e0a54f1..0000000000
--- a/types/react-icons/md/loupe.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLoupe extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/low-priority.d.ts b/types/react-icons/md/low-priority.d.ts
deleted file mode 100644
index 61f7f79811..0000000000
--- a/types/react-icons/md/low-priority.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLowPriority extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/loyalty.d.ts b/types/react-icons/md/loyalty.d.ts
deleted file mode 100644
index de4ad7303f..0000000000
--- a/types/react-icons/md/loyalty.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdLoyalty extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/mail-outline.d.ts b/types/react-icons/md/mail-outline.d.ts
deleted file mode 100644
index e2ea724b8c..0000000000
--- a/types/react-icons/md/mail-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMailOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/mail.d.ts b/types/react-icons/md/mail.d.ts
deleted file mode 100644
index 4d6ae8563e..0000000000
--- a/types/react-icons/md/mail.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMail extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/map.d.ts b/types/react-icons/md/map.d.ts
deleted file mode 100644
index e5199af23c..0000000000
--- a/types/react-icons/md/map.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMap extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/markunread-mailbox.d.ts b/types/react-icons/md/markunread-mailbox.d.ts
deleted file mode 100644
index ba5d9a5982..0000000000
--- a/types/react-icons/md/markunread-mailbox.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMarkunreadMailbox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/markunread.d.ts b/types/react-icons/md/markunread.d.ts
deleted file mode 100644
index bcf1ac3569..0000000000
--- a/types/react-icons/md/markunread.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMarkunread extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/memory.d.ts b/types/react-icons/md/memory.d.ts
deleted file mode 100644
index 507da2a21c..0000000000
--- a/types/react-icons/md/memory.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMemory extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/menu.d.ts b/types/react-icons/md/menu.d.ts
deleted file mode 100644
index 8d71a1981f..0000000000
--- a/types/react-icons/md/menu.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMenu extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/merge-type.d.ts b/types/react-icons/md/merge-type.d.ts
deleted file mode 100644
index 40e48a7b93..0000000000
--- a/types/react-icons/md/merge-type.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMergeType extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/message.d.ts b/types/react-icons/md/message.d.ts
deleted file mode 100644
index 64488ed66b..0000000000
--- a/types/react-icons/md/message.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMessage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/mic-none.d.ts b/types/react-icons/md/mic-none.d.ts
deleted file mode 100644
index 5b71761c02..0000000000
--- a/types/react-icons/md/mic-none.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMicNone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/mic-off.d.ts b/types/react-icons/md/mic-off.d.ts
deleted file mode 100644
index ce68ec3b85..0000000000
--- a/types/react-icons/md/mic-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMicOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/mic.d.ts b/types/react-icons/md/mic.d.ts
deleted file mode 100644
index e827c93aee..0000000000
--- a/types/react-icons/md/mic.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMic extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/mms.d.ts b/types/react-icons/md/mms.d.ts
deleted file mode 100644
index dd4635435c..0000000000
--- a/types/react-icons/md/mms.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMms extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/mode-comment.d.ts b/types/react-icons/md/mode-comment.d.ts
deleted file mode 100644
index 4e70e6a57e..0000000000
--- a/types/react-icons/md/mode-comment.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdModeComment extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/mode-edit.d.ts b/types/react-icons/md/mode-edit.d.ts
deleted file mode 100644
index 8ba0f1809c..0000000000
--- a/types/react-icons/md/mode-edit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdModeEdit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/monetization-on.d.ts b/types/react-icons/md/monetization-on.d.ts
deleted file mode 100644
index 5fbac94cd6..0000000000
--- a/types/react-icons/md/monetization-on.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMonetizationOn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/money-off.d.ts b/types/react-icons/md/money-off.d.ts
deleted file mode 100644
index 682df0c9e9..0000000000
--- a/types/react-icons/md/money-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMoneyOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/monochrome-photos.d.ts b/types/react-icons/md/monochrome-photos.d.ts
deleted file mode 100644
index 57d0224d92..0000000000
--- a/types/react-icons/md/monochrome-photos.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMonochromePhotos extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/mood-bad.d.ts b/types/react-icons/md/mood-bad.d.ts
deleted file mode 100644
index 6cb4070c36..0000000000
--- a/types/react-icons/md/mood-bad.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMoodBad extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/mood.d.ts b/types/react-icons/md/mood.d.ts
deleted file mode 100644
index fd15fc4d9d..0000000000
--- a/types/react-icons/md/mood.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMood extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/more-horiz.d.ts b/types/react-icons/md/more-horiz.d.ts
deleted file mode 100644
index dd46d5526c..0000000000
--- a/types/react-icons/md/more-horiz.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMoreHoriz extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/more-vert.d.ts b/types/react-icons/md/more-vert.d.ts
deleted file mode 100644
index 9c1080b74a..0000000000
--- a/types/react-icons/md/more-vert.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMoreVert extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/more.d.ts b/types/react-icons/md/more.d.ts
deleted file mode 100644
index 395fe8b215..0000000000
--- a/types/react-icons/md/more.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMore extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/motorcycle.d.ts b/types/react-icons/md/motorcycle.d.ts
deleted file mode 100644
index b06e285368..0000000000
--- a/types/react-icons/md/motorcycle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMotorcycle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/mouse.d.ts b/types/react-icons/md/mouse.d.ts
deleted file mode 100644
index 6b48389af1..0000000000
--- a/types/react-icons/md/mouse.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMouse extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/move-to-inbox.d.ts b/types/react-icons/md/move-to-inbox.d.ts
deleted file mode 100644
index 2723e6516e..0000000000
--- a/types/react-icons/md/move-to-inbox.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMoveToInbox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/movie-creation.d.ts b/types/react-icons/md/movie-creation.d.ts
deleted file mode 100644
index 1e795092d6..0000000000
--- a/types/react-icons/md/movie-creation.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMovieCreation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/movie-filter.d.ts b/types/react-icons/md/movie-filter.d.ts
deleted file mode 100644
index 22da6198e8..0000000000
--- a/types/react-icons/md/movie-filter.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMovieFilter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/movie.d.ts b/types/react-icons/md/movie.d.ts
deleted file mode 100644
index 7982199452..0000000000
--- a/types/react-icons/md/movie.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMovie extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/multiline-chart.d.ts b/types/react-icons/md/multiline-chart.d.ts
deleted file mode 100644
index 03aba87bc1..0000000000
--- a/types/react-icons/md/multiline-chart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMultilineChart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/music-note.d.ts b/types/react-icons/md/music-note.d.ts
deleted file mode 100644
index b3c161252e..0000000000
--- a/types/react-icons/md/music-note.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMusicNote extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/music-video.d.ts b/types/react-icons/md/music-video.d.ts
deleted file mode 100644
index e7c4890596..0000000000
--- a/types/react-icons/md/music-video.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMusicVideo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/my-location.d.ts b/types/react-icons/md/my-location.d.ts
deleted file mode 100644
index e9e49e3638..0000000000
--- a/types/react-icons/md/my-location.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdMyLocation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/nature-people.d.ts b/types/react-icons/md/nature-people.d.ts
deleted file mode 100644
index 123a578eff..0000000000
--- a/types/react-icons/md/nature-people.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNaturePeople extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/nature.d.ts b/types/react-icons/md/nature.d.ts
deleted file mode 100644
index 14b871e450..0000000000
--- a/types/react-icons/md/nature.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNature extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/navigate-before.d.ts b/types/react-icons/md/navigate-before.d.ts
deleted file mode 100644
index e66fdc2c7b..0000000000
--- a/types/react-icons/md/navigate-before.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNavigateBefore extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/navigate-next.d.ts b/types/react-icons/md/navigate-next.d.ts
deleted file mode 100644
index f39bad2270..0000000000
--- a/types/react-icons/md/navigate-next.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNavigateNext extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/navigation.d.ts b/types/react-icons/md/navigation.d.ts
deleted file mode 100644
index be44444790..0000000000
--- a/types/react-icons/md/navigation.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNavigation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/near-me.d.ts b/types/react-icons/md/near-me.d.ts
deleted file mode 100644
index a1fe717c03..0000000000
--- a/types/react-icons/md/near-me.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNearMe extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/network-cell.d.ts b/types/react-icons/md/network-cell.d.ts
deleted file mode 100644
index 9dc116de65..0000000000
--- a/types/react-icons/md/network-cell.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNetworkCell extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/network-check.d.ts b/types/react-icons/md/network-check.d.ts
deleted file mode 100644
index 3497ab3224..0000000000
--- a/types/react-icons/md/network-check.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNetworkCheck extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/network-locked.d.ts b/types/react-icons/md/network-locked.d.ts
deleted file mode 100644
index e7e66850e4..0000000000
--- a/types/react-icons/md/network-locked.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNetworkLocked extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/network-wifi.d.ts b/types/react-icons/md/network-wifi.d.ts
deleted file mode 100644
index 2c9097fc57..0000000000
--- a/types/react-icons/md/network-wifi.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNetworkWifi extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/new-releases.d.ts b/types/react-icons/md/new-releases.d.ts
deleted file mode 100644
index 4ff4c3e21f..0000000000
--- a/types/react-icons/md/new-releases.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNewReleases extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/next-week.d.ts b/types/react-icons/md/next-week.d.ts
deleted file mode 100644
index 4754bfc5c5..0000000000
--- a/types/react-icons/md/next-week.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNextWeek extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/nfc.d.ts b/types/react-icons/md/nfc.d.ts
deleted file mode 100644
index 521ad7fe89..0000000000
--- a/types/react-icons/md/nfc.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNfc extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/no-encryption.d.ts b/types/react-icons/md/no-encryption.d.ts
deleted file mode 100644
index 038f3eef3f..0000000000
--- a/types/react-icons/md/no-encryption.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNoEncryption extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/no-sim.d.ts b/types/react-icons/md/no-sim.d.ts
deleted file mode 100644
index 09e6165201..0000000000
--- a/types/react-icons/md/no-sim.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNoSim extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/not-interested.d.ts b/types/react-icons/md/not-interested.d.ts
deleted file mode 100644
index a21c3ca574..0000000000
--- a/types/react-icons/md/not-interested.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNotInterested extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/note-add.d.ts b/types/react-icons/md/note-add.d.ts
deleted file mode 100644
index 7673a94b3c..0000000000
--- a/types/react-icons/md/note-add.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNoteAdd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/note.d.ts b/types/react-icons/md/note.d.ts
deleted file mode 100644
index 757dfc63fc..0000000000
--- a/types/react-icons/md/note.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNote extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/notifications-active.d.ts b/types/react-icons/md/notifications-active.d.ts
deleted file mode 100644
index afb7f84483..0000000000
--- a/types/react-icons/md/notifications-active.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNotificationsActive extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/notifications-none.d.ts b/types/react-icons/md/notifications-none.d.ts
deleted file mode 100644
index d1667a5307..0000000000
--- a/types/react-icons/md/notifications-none.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNotificationsNone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/notifications-off.d.ts b/types/react-icons/md/notifications-off.d.ts
deleted file mode 100644
index ea413b9d5c..0000000000
--- a/types/react-icons/md/notifications-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNotificationsOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/notifications-paused.d.ts b/types/react-icons/md/notifications-paused.d.ts
deleted file mode 100644
index 7181f702a7..0000000000
--- a/types/react-icons/md/notifications-paused.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNotificationsPaused extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/notifications.d.ts b/types/react-icons/md/notifications.d.ts
deleted file mode 100644
index 14de6c4b4e..0000000000
--- a/types/react-icons/md/notifications.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNotifications extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/now-wallpaper.d.ts b/types/react-icons/md/now-wallpaper.d.ts
deleted file mode 100644
index 076ec5c4bf..0000000000
--- a/types/react-icons/md/now-wallpaper.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNowWallpaper extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/now-widgets.d.ts b/types/react-icons/md/now-widgets.d.ts
deleted file mode 100644
index 0242391941..0000000000
--- a/types/react-icons/md/now-widgets.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdNowWidgets extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/offline-pin.d.ts b/types/react-icons/md/offline-pin.d.ts
deleted file mode 100644
index 0c691eb46c..0000000000
--- a/types/react-icons/md/offline-pin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdOfflinePin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/ondemand-video.d.ts b/types/react-icons/md/ondemand-video.d.ts
deleted file mode 100644
index 2abd212bc0..0000000000
--- a/types/react-icons/md/ondemand-video.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdOndemandVideo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/opacity.d.ts b/types/react-icons/md/opacity.d.ts
deleted file mode 100644
index abf5830ea6..0000000000
--- a/types/react-icons/md/opacity.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdOpacity extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/open-in-browser.d.ts b/types/react-icons/md/open-in-browser.d.ts
deleted file mode 100644
index 52bb107a78..0000000000
--- a/types/react-icons/md/open-in-browser.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdOpenInBrowser extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/open-in-new.d.ts b/types/react-icons/md/open-in-new.d.ts
deleted file mode 100644
index c9cdd9711c..0000000000
--- a/types/react-icons/md/open-in-new.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdOpenInNew extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/open-with.d.ts b/types/react-icons/md/open-with.d.ts
deleted file mode 100644
index 400d1e0deb..0000000000
--- a/types/react-icons/md/open-with.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdOpenWith extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/pages.d.ts b/types/react-icons/md/pages.d.ts
deleted file mode 100644
index 6a156250cc..0000000000
--- a/types/react-icons/md/pages.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPages extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/pageview.d.ts b/types/react-icons/md/pageview.d.ts
deleted file mode 100644
index f69c0ee9f2..0000000000
--- a/types/react-icons/md/pageview.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPageview extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/palette.d.ts b/types/react-icons/md/palette.d.ts
deleted file mode 100644
index 823c529566..0000000000
--- a/types/react-icons/md/palette.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPalette extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/pan-tool.d.ts b/types/react-icons/md/pan-tool.d.ts
deleted file mode 100644
index b208116369..0000000000
--- a/types/react-icons/md/pan-tool.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPanTool extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/panorama-fish-eye.d.ts b/types/react-icons/md/panorama-fish-eye.d.ts
deleted file mode 100644
index 29420599ae..0000000000
--- a/types/react-icons/md/panorama-fish-eye.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPanoramaFishEye extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/panorama-horizontal.d.ts b/types/react-icons/md/panorama-horizontal.d.ts
deleted file mode 100644
index 201fb72074..0000000000
--- a/types/react-icons/md/panorama-horizontal.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPanoramaHorizontal extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/panorama-vertical.d.ts b/types/react-icons/md/panorama-vertical.d.ts
deleted file mode 100644
index 460041e27d..0000000000
--- a/types/react-icons/md/panorama-vertical.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPanoramaVertical extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/panorama-wide-angle.d.ts b/types/react-icons/md/panorama-wide-angle.d.ts
deleted file mode 100644
index 58bf2f6a41..0000000000
--- a/types/react-icons/md/panorama-wide-angle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPanoramaWideAngle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/panorama.d.ts b/types/react-icons/md/panorama.d.ts
deleted file mode 100644
index ce2631733d..0000000000
--- a/types/react-icons/md/panorama.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPanorama extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/party-mode.d.ts b/types/react-icons/md/party-mode.d.ts
deleted file mode 100644
index 61270bf1f0..0000000000
--- a/types/react-icons/md/party-mode.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPartyMode extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/pause-circle-filled.d.ts b/types/react-icons/md/pause-circle-filled.d.ts
deleted file mode 100644
index 8dcc944037..0000000000
--- a/types/react-icons/md/pause-circle-filled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPauseCircleFilled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/pause-circle-outline.d.ts b/types/react-icons/md/pause-circle-outline.d.ts
deleted file mode 100644
index c694731521..0000000000
--- a/types/react-icons/md/pause-circle-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPauseCircleOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/pause.d.ts b/types/react-icons/md/pause.d.ts
deleted file mode 100644
index 29d68353f7..0000000000
--- a/types/react-icons/md/pause.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPause extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/payment.d.ts b/types/react-icons/md/payment.d.ts
deleted file mode 100644
index bd2439d38c..0000000000
--- a/types/react-icons/md/payment.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPayment extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/people-outline.d.ts b/types/react-icons/md/people-outline.d.ts
deleted file mode 100644
index 88a012742e..0000000000
--- a/types/react-icons/md/people-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPeopleOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/people.d.ts b/types/react-icons/md/people.d.ts
deleted file mode 100644
index 75f9cbfe7e..0000000000
--- a/types/react-icons/md/people.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPeople extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/perm-camera-mic.d.ts b/types/react-icons/md/perm-camera-mic.d.ts
deleted file mode 100644
index a17acb8788..0000000000
--- a/types/react-icons/md/perm-camera-mic.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPermCameraMic extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/perm-contact-calendar.d.ts b/types/react-icons/md/perm-contact-calendar.d.ts
deleted file mode 100644
index 3b2105a7cf..0000000000
--- a/types/react-icons/md/perm-contact-calendar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPermContactCalendar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/perm-data-setting.d.ts b/types/react-icons/md/perm-data-setting.d.ts
deleted file mode 100644
index 18d108d14f..0000000000
--- a/types/react-icons/md/perm-data-setting.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPermDataSetting extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/perm-device-information.d.ts b/types/react-icons/md/perm-device-information.d.ts
deleted file mode 100644
index db2dfcc07b..0000000000
--- a/types/react-icons/md/perm-device-information.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPermDeviceInformation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/perm-identity.d.ts b/types/react-icons/md/perm-identity.d.ts
deleted file mode 100644
index d56d0b3c37..0000000000
--- a/types/react-icons/md/perm-identity.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPermIdentity extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/perm-media.d.ts b/types/react-icons/md/perm-media.d.ts
deleted file mode 100644
index 36f4bee6a7..0000000000
--- a/types/react-icons/md/perm-media.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPermMedia extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/perm-phone-msg.d.ts b/types/react-icons/md/perm-phone-msg.d.ts
deleted file mode 100644
index 6352e415a6..0000000000
--- a/types/react-icons/md/perm-phone-msg.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPermPhoneMsg extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/perm-scan-wifi.d.ts b/types/react-icons/md/perm-scan-wifi.d.ts
deleted file mode 100644
index 20bb1186e4..0000000000
--- a/types/react-icons/md/perm-scan-wifi.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPermScanWifi extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/person-add.d.ts b/types/react-icons/md/person-add.d.ts
deleted file mode 100644
index 12887556b7..0000000000
--- a/types/react-icons/md/person-add.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPersonAdd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/person-outline.d.ts b/types/react-icons/md/person-outline.d.ts
deleted file mode 100644
index fe49015f3f..0000000000
--- a/types/react-icons/md/person-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPersonOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/person-pin-circle.d.ts b/types/react-icons/md/person-pin-circle.d.ts
deleted file mode 100644
index a26c822211..0000000000
--- a/types/react-icons/md/person-pin-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPersonPinCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/person-pin.d.ts b/types/react-icons/md/person-pin.d.ts
deleted file mode 100644
index ab1aa735eb..0000000000
--- a/types/react-icons/md/person-pin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPersonPin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/person.d.ts b/types/react-icons/md/person.d.ts
deleted file mode 100644
index bcae2bbac8..0000000000
--- a/types/react-icons/md/person.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPerson extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/personal-video.d.ts b/types/react-icons/md/personal-video.d.ts
deleted file mode 100644
index 0fece81d04..0000000000
--- a/types/react-icons/md/personal-video.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPersonalVideo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/pets.d.ts b/types/react-icons/md/pets.d.ts
deleted file mode 100644
index 94bc0005e8..0000000000
--- a/types/react-icons/md/pets.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPets extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/phone-android.d.ts b/types/react-icons/md/phone-android.d.ts
deleted file mode 100644
index aa43921b51..0000000000
--- a/types/react-icons/md/phone-android.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneAndroid extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/phone-bluetooth-speaker.d.ts b/types/react-icons/md/phone-bluetooth-speaker.d.ts
deleted file mode 100644
index 08e2cd6791..0000000000
--- a/types/react-icons/md/phone-bluetooth-speaker.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneBluetoothSpeaker extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/phone-forwarded.d.ts b/types/react-icons/md/phone-forwarded.d.ts
deleted file mode 100644
index 8363d7e3ec..0000000000
--- a/types/react-icons/md/phone-forwarded.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneForwarded extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/phone-in-talk.d.ts b/types/react-icons/md/phone-in-talk.d.ts
deleted file mode 100644
index 430f87b4e4..0000000000
--- a/types/react-icons/md/phone-in-talk.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneInTalk extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/phone-iphone.d.ts b/types/react-icons/md/phone-iphone.d.ts
deleted file mode 100644
index 8704ae8ad4..0000000000
--- a/types/react-icons/md/phone-iphone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneIphone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/phone-locked.d.ts b/types/react-icons/md/phone-locked.d.ts
deleted file mode 100644
index 68ca6e9376..0000000000
--- a/types/react-icons/md/phone-locked.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneLocked extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/phone-missed.d.ts b/types/react-icons/md/phone-missed.d.ts
deleted file mode 100644
index 91b97ca8e9..0000000000
--- a/types/react-icons/md/phone-missed.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneMissed extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/phone-paused.d.ts b/types/react-icons/md/phone-paused.d.ts
deleted file mode 100644
index ba3f998fd8..0000000000
--- a/types/react-icons/md/phone-paused.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonePaused extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/phone.d.ts b/types/react-icons/md/phone.d.ts
deleted file mode 100644
index 6318cdc39d..0000000000
--- a/types/react-icons/md/phone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/phonelink-erase.d.ts b/types/react-icons/md/phonelink-erase.d.ts
deleted file mode 100644
index b0cbec1c39..0000000000
--- a/types/react-icons/md/phonelink-erase.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelinkErase extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/phonelink-lock.d.ts b/types/react-icons/md/phonelink-lock.d.ts
deleted file mode 100644
index 5bb479ddc0..0000000000
--- a/types/react-icons/md/phonelink-lock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelinkLock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/phonelink-off.d.ts b/types/react-icons/md/phonelink-off.d.ts
deleted file mode 100644
index ec245ecd6f..0000000000
--- a/types/react-icons/md/phonelink-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelinkOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/phonelink-ring.d.ts b/types/react-icons/md/phonelink-ring.d.ts
deleted file mode 100644
index f14d93a479..0000000000
--- a/types/react-icons/md/phonelink-ring.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelinkRing extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/phonelink-setup.d.ts b/types/react-icons/md/phonelink-setup.d.ts
deleted file mode 100644
index dd21188bb5..0000000000
--- a/types/react-icons/md/phonelink-setup.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelinkSetup extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/phonelink.d.ts b/types/react-icons/md/phonelink.d.ts
deleted file mode 100644
index 6aa5af39d7..0000000000
--- a/types/react-icons/md/phonelink.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelink extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/photo-album.d.ts b/types/react-icons/md/photo-album.d.ts
deleted file mode 100644
index 116f8b1ff6..0000000000
--- a/types/react-icons/md/photo-album.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoAlbum extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/photo-camera.d.ts b/types/react-icons/md/photo-camera.d.ts
deleted file mode 100644
index 9ca8814377..0000000000
--- a/types/react-icons/md/photo-camera.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoCamera extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/photo-filter.d.ts b/types/react-icons/md/photo-filter.d.ts
deleted file mode 100644
index e2b37a4b91..0000000000
--- a/types/react-icons/md/photo-filter.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoFilter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/photo-library.d.ts b/types/react-icons/md/photo-library.d.ts
deleted file mode 100644
index 3ec4c29cac..0000000000
--- a/types/react-icons/md/photo-library.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoLibrary extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/photo-size-select-actual.d.ts b/types/react-icons/md/photo-size-select-actual.d.ts
deleted file mode 100644
index 15e1777cf0..0000000000
--- a/types/react-icons/md/photo-size-select-actual.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoSizeSelectActual extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/photo-size-select-large.d.ts b/types/react-icons/md/photo-size-select-large.d.ts
deleted file mode 100644
index 56025586af..0000000000
--- a/types/react-icons/md/photo-size-select-large.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoSizeSelectLarge extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/photo-size-select-small.d.ts b/types/react-icons/md/photo-size-select-small.d.ts
deleted file mode 100644
index f1a2547ff6..0000000000
--- a/types/react-icons/md/photo-size-select-small.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoSizeSelectSmall extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/photo.d.ts b/types/react-icons/md/photo.d.ts
deleted file mode 100644
index 3af5e8d6b9..0000000000
--- a/types/react-icons/md/photo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoto extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/picture-as-pdf.d.ts b/types/react-icons/md/picture-as-pdf.d.ts
deleted file mode 100644
index 06fd1dfb31..0000000000
--- a/types/react-icons/md/picture-as-pdf.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPictureAsPdf extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/picture-in-picture-alt.d.ts b/types/react-icons/md/picture-in-picture-alt.d.ts
deleted file mode 100644
index 41a6b03404..0000000000
--- a/types/react-icons/md/picture-in-picture-alt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPictureInPictureAlt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/picture-in-picture.d.ts b/types/react-icons/md/picture-in-picture.d.ts
deleted file mode 100644
index e174bddfd7..0000000000
--- a/types/react-icons/md/picture-in-picture.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPictureInPicture extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/pie-chart-outlined.d.ts b/types/react-icons/md/pie-chart-outlined.d.ts
deleted file mode 100644
index 8fdaa68aee..0000000000
--- a/types/react-icons/md/pie-chart-outlined.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPieChartOutlined extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/pie-chart.d.ts b/types/react-icons/md/pie-chart.d.ts
deleted file mode 100644
index bf0203c4d9..0000000000
--- a/types/react-icons/md/pie-chart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPieChart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/pin-drop.d.ts b/types/react-icons/md/pin-drop.d.ts
deleted file mode 100644
index b1511912aa..0000000000
--- a/types/react-icons/md/pin-drop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPinDrop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/place.d.ts b/types/react-icons/md/place.d.ts
deleted file mode 100644
index 6e7bc9f83d..0000000000
--- a/types/react-icons/md/place.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPlace extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/play-arrow.d.ts b/types/react-icons/md/play-arrow.d.ts
deleted file mode 100644
index 34eeedbfc9..0000000000
--- a/types/react-icons/md/play-arrow.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPlayArrow extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/play-circle-filled.d.ts b/types/react-icons/md/play-circle-filled.d.ts
deleted file mode 100644
index a952747a1f..0000000000
--- a/types/react-icons/md/play-circle-filled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPlayCircleFilled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/play-circle-outline.d.ts b/types/react-icons/md/play-circle-outline.d.ts
deleted file mode 100644
index e75083c2f3..0000000000
--- a/types/react-icons/md/play-circle-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPlayCircleOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/play-for-work.d.ts b/types/react-icons/md/play-for-work.d.ts
deleted file mode 100644
index 4bb94a94b0..0000000000
--- a/types/react-icons/md/play-for-work.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPlayForWork extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/playlist-add-check.d.ts b/types/react-icons/md/playlist-add-check.d.ts
deleted file mode 100644
index 6b71a3b8c0..0000000000
--- a/types/react-icons/md/playlist-add-check.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPlaylistAddCheck extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/playlist-add.d.ts b/types/react-icons/md/playlist-add.d.ts
deleted file mode 100644
index 6cd4bf46e6..0000000000
--- a/types/react-icons/md/playlist-add.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPlaylistAdd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/playlist-play.d.ts b/types/react-icons/md/playlist-play.d.ts
deleted file mode 100644
index 1bbf520f44..0000000000
--- a/types/react-icons/md/playlist-play.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPlaylistPlay extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/plus-one.d.ts b/types/react-icons/md/plus-one.d.ts
deleted file mode 100644
index 1237985ba5..0000000000
--- a/types/react-icons/md/plus-one.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPlusOne extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/poll.d.ts b/types/react-icons/md/poll.d.ts
deleted file mode 100644
index e0d456a28a..0000000000
--- a/types/react-icons/md/poll.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPoll extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/polymer.d.ts b/types/react-icons/md/polymer.d.ts
deleted file mode 100644
index 6ff9e004b4..0000000000
--- a/types/react-icons/md/polymer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPolymer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/pool.d.ts b/types/react-icons/md/pool.d.ts
deleted file mode 100644
index 933c4f1448..0000000000
--- a/types/react-icons/md/pool.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPool extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/portable-wifi-off.d.ts b/types/react-icons/md/portable-wifi-off.d.ts
deleted file mode 100644
index b3bdd30ff8..0000000000
--- a/types/react-icons/md/portable-wifi-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPortableWifiOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/portrait.d.ts b/types/react-icons/md/portrait.d.ts
deleted file mode 100644
index 1e9b2f717e..0000000000
--- a/types/react-icons/md/portrait.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPortrait extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/power-input.d.ts b/types/react-icons/md/power-input.d.ts
deleted file mode 100644
index 71f89e9e40..0000000000
--- a/types/react-icons/md/power-input.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPowerInput extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/power-settings-new.d.ts b/types/react-icons/md/power-settings-new.d.ts
deleted file mode 100644
index 69221c9111..0000000000
--- a/types/react-icons/md/power-settings-new.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPowerSettingsNew extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/power.d.ts b/types/react-icons/md/power.d.ts
deleted file mode 100644
index 106471c2a5..0000000000
--- a/types/react-icons/md/power.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPower extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/pregnant-woman.d.ts b/types/react-icons/md/pregnant-woman.d.ts
deleted file mode 100644
index 9e88eab156..0000000000
--- a/types/react-icons/md/pregnant-woman.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPregnantWoman extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/present-to-all.d.ts b/types/react-icons/md/present-to-all.d.ts
deleted file mode 100644
index b88c9a45d2..0000000000
--- a/types/react-icons/md/present-to-all.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPresentToAll extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/print.d.ts b/types/react-icons/md/print.d.ts
deleted file mode 100644
index 74d6db2f37..0000000000
--- a/types/react-icons/md/print.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPrint extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/priority-high.d.ts b/types/react-icons/md/priority-high.d.ts
deleted file mode 100644
index 56c1354dae..0000000000
--- a/types/react-icons/md/priority-high.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPriorityHigh extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/public.d.ts b/types/react-icons/md/public.d.ts
deleted file mode 100644
index 1615661bab..0000000000
--- a/types/react-icons/md/public.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPublic extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/publish.d.ts b/types/react-icons/md/publish.d.ts
deleted file mode 100644
index 76aae7f48b..0000000000
--- a/types/react-icons/md/publish.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdPublish extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/query-builder.d.ts b/types/react-icons/md/query-builder.d.ts
deleted file mode 100644
index 3607cbf408..0000000000
--- a/types/react-icons/md/query-builder.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdQueryBuilder extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/question-answer.d.ts b/types/react-icons/md/question-answer.d.ts
deleted file mode 100644
index b88cd376d0..0000000000
--- a/types/react-icons/md/question-answer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdQuestionAnswer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/queue-music.d.ts b/types/react-icons/md/queue-music.d.ts
deleted file mode 100644
index 0a9a451291..0000000000
--- a/types/react-icons/md/queue-music.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdQueueMusic extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/queue-play-next.d.ts b/types/react-icons/md/queue-play-next.d.ts
deleted file mode 100644
index 4540a71df0..0000000000
--- a/types/react-icons/md/queue-play-next.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdQueuePlayNext extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/queue.d.ts b/types/react-icons/md/queue.d.ts
deleted file mode 100644
index 80b27a7f8a..0000000000
--- a/types/react-icons/md/queue.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdQueue extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/radio-button-checked.d.ts b/types/react-icons/md/radio-button-checked.d.ts
deleted file mode 100644
index dfa06080e6..0000000000
--- a/types/react-icons/md/radio-button-checked.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRadioButtonChecked extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/radio-button-unchecked.d.ts b/types/react-icons/md/radio-button-unchecked.d.ts
deleted file mode 100644
index b154b71305..0000000000
--- a/types/react-icons/md/radio-button-unchecked.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRadioButtonUnchecked extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/radio.d.ts b/types/react-icons/md/radio.d.ts
deleted file mode 100644
index bd53fd4f03..0000000000
--- a/types/react-icons/md/radio.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRadio extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/rate-review.d.ts b/types/react-icons/md/rate-review.d.ts
deleted file mode 100644
index 6de3f28785..0000000000
--- a/types/react-icons/md/rate-review.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRateReview extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/receipt.d.ts b/types/react-icons/md/receipt.d.ts
deleted file mode 100644
index 1b781c04c7..0000000000
--- a/types/react-icons/md/receipt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdReceipt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/recent-actors.d.ts b/types/react-icons/md/recent-actors.d.ts
deleted file mode 100644
index cfcf0432b5..0000000000
--- a/types/react-icons/md/recent-actors.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRecentActors extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/record-voice-over.d.ts b/types/react-icons/md/record-voice-over.d.ts
deleted file mode 100644
index ab9b2189b8..0000000000
--- a/types/react-icons/md/record-voice-over.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRecordVoiceOver extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/redeem.d.ts b/types/react-icons/md/redeem.d.ts
deleted file mode 100644
index 7690d10236..0000000000
--- a/types/react-icons/md/redeem.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRedeem extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/redo.d.ts b/types/react-icons/md/redo.d.ts
deleted file mode 100644
index 3e0e1fac51..0000000000
--- a/types/react-icons/md/redo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRedo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/refresh.d.ts b/types/react-icons/md/refresh.d.ts
deleted file mode 100644
index f037c2a972..0000000000
--- a/types/react-icons/md/refresh.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRefresh extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/remove-circle-outline.d.ts b/types/react-icons/md/remove-circle-outline.d.ts
deleted file mode 100644
index 3488b16e2a..0000000000
--- a/types/react-icons/md/remove-circle-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRemoveCircleOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/remove-circle.d.ts b/types/react-icons/md/remove-circle.d.ts
deleted file mode 100644
index 77d8b1db6c..0000000000
--- a/types/react-icons/md/remove-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRemoveCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/remove-from-queue.d.ts b/types/react-icons/md/remove-from-queue.d.ts
deleted file mode 100644
index 05299a588f..0000000000
--- a/types/react-icons/md/remove-from-queue.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRemoveFromQueue extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/remove-red-eye.d.ts b/types/react-icons/md/remove-red-eye.d.ts
deleted file mode 100644
index 8f839358ba..0000000000
--- a/types/react-icons/md/remove-red-eye.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRemoveRedEye extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/remove-shopping-cart.d.ts b/types/react-icons/md/remove-shopping-cart.d.ts
deleted file mode 100644
index 2715486aea..0000000000
--- a/types/react-icons/md/remove-shopping-cart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRemoveShoppingCart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/remove.d.ts b/types/react-icons/md/remove.d.ts
deleted file mode 100644
index 9522f25fe9..0000000000
--- a/types/react-icons/md/remove.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRemove extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/reorder.d.ts b/types/react-icons/md/reorder.d.ts
deleted file mode 100644
index 9f24bc5ed5..0000000000
--- a/types/react-icons/md/reorder.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdReorder extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/repeat-one.d.ts b/types/react-icons/md/repeat-one.d.ts
deleted file mode 100644
index 74a3642bf5..0000000000
--- a/types/react-icons/md/repeat-one.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRepeatOne extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/repeat.d.ts b/types/react-icons/md/repeat.d.ts
deleted file mode 100644
index e1d7352ab9..0000000000
--- a/types/react-icons/md/repeat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRepeat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/replay-10.d.ts b/types/react-icons/md/replay-10.d.ts
deleted file mode 100644
index 3d9f3ef0c4..0000000000
--- a/types/react-icons/md/replay-10.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdReplay10 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/replay-30.d.ts b/types/react-icons/md/replay-30.d.ts
deleted file mode 100644
index 402af551ba..0000000000
--- a/types/react-icons/md/replay-30.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdReplay30 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/replay-5.d.ts b/types/react-icons/md/replay-5.d.ts
deleted file mode 100644
index 78905ba50c..0000000000
--- a/types/react-icons/md/replay-5.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdReplay5 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/replay.d.ts b/types/react-icons/md/replay.d.ts
deleted file mode 100644
index 47d8592a3d..0000000000
--- a/types/react-icons/md/replay.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdReplay extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/reply-all.d.ts b/types/react-icons/md/reply-all.d.ts
deleted file mode 100644
index 07aa5f01f2..0000000000
--- a/types/react-icons/md/reply-all.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdReplyAll extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/reply.d.ts b/types/react-icons/md/reply.d.ts
deleted file mode 100644
index 648de11ef1..0000000000
--- a/types/react-icons/md/reply.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdReply extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/report-problem.d.ts b/types/react-icons/md/report-problem.d.ts
deleted file mode 100644
index c3dbf0101a..0000000000
--- a/types/react-icons/md/report-problem.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdReportProblem extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/report.d.ts b/types/react-icons/md/report.d.ts
deleted file mode 100644
index af51419c00..0000000000
--- a/types/react-icons/md/report.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdReport extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/restaurant-menu.d.ts b/types/react-icons/md/restaurant-menu.d.ts
deleted file mode 100644
index 306891c857..0000000000
--- a/types/react-icons/md/restaurant-menu.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRestaurantMenu extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/restaurant.d.ts b/types/react-icons/md/restaurant.d.ts
deleted file mode 100644
index 5adc8e8712..0000000000
--- a/types/react-icons/md/restaurant.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRestaurant extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/restore-page.d.ts b/types/react-icons/md/restore-page.d.ts
deleted file mode 100644
index d836b1f669..0000000000
--- a/types/react-icons/md/restore-page.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRestorePage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/restore.d.ts b/types/react-icons/md/restore.d.ts
deleted file mode 100644
index aaadca1e08..0000000000
--- a/types/react-icons/md/restore.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRestore extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/ring-volume.d.ts b/types/react-icons/md/ring-volume.d.ts
deleted file mode 100644
index 41843c29bd..0000000000
--- a/types/react-icons/md/ring-volume.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRingVolume extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/room-service.d.ts b/types/react-icons/md/room-service.d.ts
deleted file mode 100644
index 4b69032332..0000000000
--- a/types/react-icons/md/room-service.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRoomService extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/room.d.ts b/types/react-icons/md/room.d.ts
deleted file mode 100644
index 49ab4cae8d..0000000000
--- a/types/react-icons/md/room.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRoom extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/rotate-90-degrees-ccw.d.ts b/types/react-icons/md/rotate-90-degrees-ccw.d.ts
deleted file mode 100644
index ba2f85b1e2..0000000000
--- a/types/react-icons/md/rotate-90-degrees-ccw.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRotate90DegreesCcw extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/rotate-left.d.ts b/types/react-icons/md/rotate-left.d.ts
deleted file mode 100644
index 493c21cd47..0000000000
--- a/types/react-icons/md/rotate-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRotateLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/rotate-right.d.ts b/types/react-icons/md/rotate-right.d.ts
deleted file mode 100644
index 936625527b..0000000000
--- a/types/react-icons/md/rotate-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRotateRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/rounded-corner.d.ts b/types/react-icons/md/rounded-corner.d.ts
deleted file mode 100644
index 592818db46..0000000000
--- a/types/react-icons/md/rounded-corner.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRoundedCorner extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/router.d.ts b/types/react-icons/md/router.d.ts
deleted file mode 100644
index 71effffe25..0000000000
--- a/types/react-icons/md/router.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRouter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/rowing.d.ts b/types/react-icons/md/rowing.d.ts
deleted file mode 100644
index 66d50957df..0000000000
--- a/types/react-icons/md/rowing.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRowing extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/rss-feed.d.ts b/types/react-icons/md/rss-feed.d.ts
deleted file mode 100644
index 857453af7d..0000000000
--- a/types/react-icons/md/rss-feed.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRssFeed extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/rv-hookup.d.ts b/types/react-icons/md/rv-hookup.d.ts
deleted file mode 100644
index 6b3f6b3a67..0000000000
--- a/types/react-icons/md/rv-hookup.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdRvHookup extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/satellite.d.ts b/types/react-icons/md/satellite.d.ts
deleted file mode 100644
index 1371e50a1d..0000000000
--- a/types/react-icons/md/satellite.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSatellite extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/save.d.ts b/types/react-icons/md/save.d.ts
deleted file mode 100644
index f3aa747a5a..0000000000
--- a/types/react-icons/md/save.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSave extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/scanner.d.ts b/types/react-icons/md/scanner.d.ts
deleted file mode 100644
index db18a8c57b..0000000000
--- a/types/react-icons/md/scanner.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdScanner extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/schedule.d.ts b/types/react-icons/md/schedule.d.ts
deleted file mode 100644
index e85dac4d66..0000000000
--- a/types/react-icons/md/schedule.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSchedule extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/school.d.ts b/types/react-icons/md/school.d.ts
deleted file mode 100644
index ec9ad586c7..0000000000
--- a/types/react-icons/md/school.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSchool extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/screen-lock-landscape.d.ts b/types/react-icons/md/screen-lock-landscape.d.ts
deleted file mode 100644
index 8bd82ab85e..0000000000
--- a/types/react-icons/md/screen-lock-landscape.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdScreenLockLandscape extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/screen-lock-portrait.d.ts b/types/react-icons/md/screen-lock-portrait.d.ts
deleted file mode 100644
index 4439deda82..0000000000
--- a/types/react-icons/md/screen-lock-portrait.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdScreenLockPortrait extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/screen-lock-rotation.d.ts b/types/react-icons/md/screen-lock-rotation.d.ts
deleted file mode 100644
index 7edd36c10d..0000000000
--- a/types/react-icons/md/screen-lock-rotation.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdScreenLockRotation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/screen-rotation.d.ts b/types/react-icons/md/screen-rotation.d.ts
deleted file mode 100644
index ac2cd107e2..0000000000
--- a/types/react-icons/md/screen-rotation.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdScreenRotation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/screen-share.d.ts b/types/react-icons/md/screen-share.d.ts
deleted file mode 100644
index 1c6e5f8f3f..0000000000
--- a/types/react-icons/md/screen-share.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdScreenShare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sd-card.d.ts b/types/react-icons/md/sd-card.d.ts
deleted file mode 100644
index fbf66bc8ae..0000000000
--- a/types/react-icons/md/sd-card.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSdCard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sd-storage.d.ts b/types/react-icons/md/sd-storage.d.ts
deleted file mode 100644
index 645f26b009..0000000000
--- a/types/react-icons/md/sd-storage.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSdStorage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/search.d.ts b/types/react-icons/md/search.d.ts
deleted file mode 100644
index 4c4f7aafeb..0000000000
--- a/types/react-icons/md/search.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSearch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/security.d.ts b/types/react-icons/md/security.d.ts
deleted file mode 100644
index ffeffbbfeb..0000000000
--- a/types/react-icons/md/security.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSecurity extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/select-all.d.ts b/types/react-icons/md/select-all.d.ts
deleted file mode 100644
index e8d8ba116a..0000000000
--- a/types/react-icons/md/select-all.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSelectAll extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/send.d.ts b/types/react-icons/md/send.d.ts
deleted file mode 100644
index a643cfddfa..0000000000
--- a/types/react-icons/md/send.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSend extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sentiment-dissatisfied.d.ts b/types/react-icons/md/sentiment-dissatisfied.d.ts
deleted file mode 100644
index e5e989d5ad..0000000000
--- a/types/react-icons/md/sentiment-dissatisfied.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSentimentDissatisfied extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sentiment-neutral.d.ts b/types/react-icons/md/sentiment-neutral.d.ts
deleted file mode 100644
index ea95a02aea..0000000000
--- a/types/react-icons/md/sentiment-neutral.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSentimentNeutral extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sentiment-satisfied.d.ts b/types/react-icons/md/sentiment-satisfied.d.ts
deleted file mode 100644
index ff9ba41c7e..0000000000
--- a/types/react-icons/md/sentiment-satisfied.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSentimentSatisfied extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sentiment-very-dissatisfied.d.ts b/types/react-icons/md/sentiment-very-dissatisfied.d.ts
deleted file mode 100644
index 9e26b053fc..0000000000
--- a/types/react-icons/md/sentiment-very-dissatisfied.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSentimentVeryDissatisfied extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sentiment-very-satisfied.d.ts b/types/react-icons/md/sentiment-very-satisfied.d.ts
deleted file mode 100644
index 570e358c3a..0000000000
--- a/types/react-icons/md/sentiment-very-satisfied.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSentimentVerySatisfied extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-applications.d.ts b/types/react-icons/md/settings-applications.d.ts
deleted file mode 100644
index 75223b6af8..0000000000
--- a/types/react-icons/md/settings-applications.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsApplications extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-backup-restore.d.ts b/types/react-icons/md/settings-backup-restore.d.ts
deleted file mode 100644
index beeec5199f..0000000000
--- a/types/react-icons/md/settings-backup-restore.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsBackupRestore extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-bluetooth.d.ts b/types/react-icons/md/settings-bluetooth.d.ts
deleted file mode 100644
index 0f295f3c78..0000000000
--- a/types/react-icons/md/settings-bluetooth.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsBluetooth extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-brightness.d.ts b/types/react-icons/md/settings-brightness.d.ts
deleted file mode 100644
index 41c1e8360f..0000000000
--- a/types/react-icons/md/settings-brightness.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsBrightness extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-cell.d.ts b/types/react-icons/md/settings-cell.d.ts
deleted file mode 100644
index 620d7e1fe5..0000000000
--- a/types/react-icons/md/settings-cell.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsCell extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-ethernet.d.ts b/types/react-icons/md/settings-ethernet.d.ts
deleted file mode 100644
index c610f8ec24..0000000000
--- a/types/react-icons/md/settings-ethernet.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsEthernet extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-input-antenna.d.ts b/types/react-icons/md/settings-input-antenna.d.ts
deleted file mode 100644
index f19536a4cb..0000000000
--- a/types/react-icons/md/settings-input-antenna.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsInputAntenna extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-input-component.d.ts b/types/react-icons/md/settings-input-component.d.ts
deleted file mode 100644
index e1fe37ccdf..0000000000
--- a/types/react-icons/md/settings-input-component.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsInputComponent extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-input-composite.d.ts b/types/react-icons/md/settings-input-composite.d.ts
deleted file mode 100644
index 266f9969fb..0000000000
--- a/types/react-icons/md/settings-input-composite.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsInputComposite extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-input-hdmi.d.ts b/types/react-icons/md/settings-input-hdmi.d.ts
deleted file mode 100644
index be910d9b17..0000000000
--- a/types/react-icons/md/settings-input-hdmi.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsInputHdmi extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-input-svideo.d.ts b/types/react-icons/md/settings-input-svideo.d.ts
deleted file mode 100644
index d9254b4996..0000000000
--- a/types/react-icons/md/settings-input-svideo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsInputSvideo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-overscan.d.ts b/types/react-icons/md/settings-overscan.d.ts
deleted file mode 100644
index c74ed6c60b..0000000000
--- a/types/react-icons/md/settings-overscan.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsOverscan extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-phone.d.ts b/types/react-icons/md/settings-phone.d.ts
deleted file mode 100644
index a24ed75c1a..0000000000
--- a/types/react-icons/md/settings-phone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsPhone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-power.d.ts b/types/react-icons/md/settings-power.d.ts
deleted file mode 100644
index f93530a007..0000000000
--- a/types/react-icons/md/settings-power.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsPower extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-remote.d.ts b/types/react-icons/md/settings-remote.d.ts
deleted file mode 100644
index 19720afb98..0000000000
--- a/types/react-icons/md/settings-remote.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsRemote extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-system-daydream.d.ts b/types/react-icons/md/settings-system-daydream.d.ts
deleted file mode 100644
index 654c1666d7..0000000000
--- a/types/react-icons/md/settings-system-daydream.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsSystemDaydream extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings-voice.d.ts b/types/react-icons/md/settings-voice.d.ts
deleted file mode 100644
index 2ca59f4b0b..0000000000
--- a/types/react-icons/md/settings-voice.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsVoice extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/settings.d.ts b/types/react-icons/md/settings.d.ts
deleted file mode 100644
index 2117b4be55..0000000000
--- a/types/react-icons/md/settings.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSettings extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/share.d.ts b/types/react-icons/md/share.d.ts
deleted file mode 100644
index 5a6639be86..0000000000
--- a/types/react-icons/md/share.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdShare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/shop-two.d.ts b/types/react-icons/md/shop-two.d.ts
deleted file mode 100644
index ffd2e40d8a..0000000000
--- a/types/react-icons/md/shop-two.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdShopTwo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/shop.d.ts b/types/react-icons/md/shop.d.ts
deleted file mode 100644
index 0247f8919e..0000000000
--- a/types/react-icons/md/shop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdShop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/shopping-basket.d.ts b/types/react-icons/md/shopping-basket.d.ts
deleted file mode 100644
index ce58316185..0000000000
--- a/types/react-icons/md/shopping-basket.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdShoppingBasket extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/shopping-cart.d.ts b/types/react-icons/md/shopping-cart.d.ts
deleted file mode 100644
index 2980434fd6..0000000000
--- a/types/react-icons/md/shopping-cart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdShoppingCart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/short-text.d.ts b/types/react-icons/md/short-text.d.ts
deleted file mode 100644
index 66c49133ba..0000000000
--- a/types/react-icons/md/short-text.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdShortText extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/show-chart.d.ts b/types/react-icons/md/show-chart.d.ts
deleted file mode 100644
index 4fc9b77c9e..0000000000
--- a/types/react-icons/md/show-chart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdShowChart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/shuffle.d.ts b/types/react-icons/md/shuffle.d.ts
deleted file mode 100644
index b20fd0302e..0000000000
--- a/types/react-icons/md/shuffle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdShuffle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/signal-cellular-4-bar.d.ts b/types/react-icons/md/signal-cellular-4-bar.d.ts
deleted file mode 100644
index 9961d076e8..0000000000
--- a/types/react-icons/md/signal-cellular-4-bar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalCellular4Bar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/signal-cellular-connected-no-internet-4-bar.d.ts b/types/react-icons/md/signal-cellular-connected-no-internet-4-bar.d.ts
deleted file mode 100644
index 35546b90db..0000000000
--- a/types/react-icons/md/signal-cellular-connected-no-internet-4-bar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalCellularConnectedNoInternet4Bar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/signal-cellular-no-sim.d.ts b/types/react-icons/md/signal-cellular-no-sim.d.ts
deleted file mode 100644
index 37c952ef33..0000000000
--- a/types/react-icons/md/signal-cellular-no-sim.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalCellularNoSim extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/signal-cellular-null.d.ts b/types/react-icons/md/signal-cellular-null.d.ts
deleted file mode 100644
index 81c4801bac..0000000000
--- a/types/react-icons/md/signal-cellular-null.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalCellularNull extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/signal-cellular-off.d.ts b/types/react-icons/md/signal-cellular-off.d.ts
deleted file mode 100644
index 71b723a036..0000000000
--- a/types/react-icons/md/signal-cellular-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalCellularOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/signal-wifi-4-bar-lock.d.ts b/types/react-icons/md/signal-wifi-4-bar-lock.d.ts
deleted file mode 100644
index 45689253f7..0000000000
--- a/types/react-icons/md/signal-wifi-4-bar-lock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalWifi4BarLock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/signal-wifi-4-bar.d.ts b/types/react-icons/md/signal-wifi-4-bar.d.ts
deleted file mode 100644
index 9b90b1dc00..0000000000
--- a/types/react-icons/md/signal-wifi-4-bar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalWifi4Bar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/signal-wifi-off.d.ts b/types/react-icons/md/signal-wifi-off.d.ts
deleted file mode 100644
index 62c5ceee3c..0000000000
--- a/types/react-icons/md/signal-wifi-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalWifiOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sim-card-alert.d.ts b/types/react-icons/md/sim-card-alert.d.ts
deleted file mode 100644
index 4060c4594e..0000000000
--- a/types/react-icons/md/sim-card-alert.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSimCardAlert extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sim-card.d.ts b/types/react-icons/md/sim-card.d.ts
deleted file mode 100644
index da691e53ad..0000000000
--- a/types/react-icons/md/sim-card.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSimCard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/skip-next.d.ts b/types/react-icons/md/skip-next.d.ts
deleted file mode 100644
index ecf5c1dc78..0000000000
--- a/types/react-icons/md/skip-next.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSkipNext extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/skip-previous.d.ts b/types/react-icons/md/skip-previous.d.ts
deleted file mode 100644
index 93b71643d7..0000000000
--- a/types/react-icons/md/skip-previous.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSkipPrevious extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/slideshow.d.ts b/types/react-icons/md/slideshow.d.ts
deleted file mode 100644
index 3604117de4..0000000000
--- a/types/react-icons/md/slideshow.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSlideshow extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/slow-motion-video.d.ts b/types/react-icons/md/slow-motion-video.d.ts
deleted file mode 100644
index b1613e9196..0000000000
--- a/types/react-icons/md/slow-motion-video.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSlowMotionVideo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/smartphone.d.ts b/types/react-icons/md/smartphone.d.ts
deleted file mode 100644
index 48e919a7f2..0000000000
--- a/types/react-icons/md/smartphone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSmartphone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/smoke-free.d.ts b/types/react-icons/md/smoke-free.d.ts
deleted file mode 100644
index 494a9ffbed..0000000000
--- a/types/react-icons/md/smoke-free.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSmokeFree extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/smoking-rooms.d.ts b/types/react-icons/md/smoking-rooms.d.ts
deleted file mode 100644
index 9793808427..0000000000
--- a/types/react-icons/md/smoking-rooms.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSmokingRooms extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sms-failed.d.ts b/types/react-icons/md/sms-failed.d.ts
deleted file mode 100644
index ed04e950bd..0000000000
--- a/types/react-icons/md/sms-failed.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSmsFailed extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sms.d.ts b/types/react-icons/md/sms.d.ts
deleted file mode 100644
index bcdc21c622..0000000000
--- a/types/react-icons/md/sms.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSms extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/snooze.d.ts b/types/react-icons/md/snooze.d.ts
deleted file mode 100644
index 39ef1f6213..0000000000
--- a/types/react-icons/md/snooze.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSnooze extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sort-by-alpha.d.ts b/types/react-icons/md/sort-by-alpha.d.ts
deleted file mode 100644
index 1d823eec21..0000000000
--- a/types/react-icons/md/sort-by-alpha.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSortByAlpha extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sort.d.ts b/types/react-icons/md/sort.d.ts
deleted file mode 100644
index 4ae7f76a01..0000000000
--- a/types/react-icons/md/sort.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSort extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/spa.d.ts b/types/react-icons/md/spa.d.ts
deleted file mode 100644
index 328203f62f..0000000000
--- a/types/react-icons/md/spa.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSpa extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/space-bar.d.ts b/types/react-icons/md/space-bar.d.ts
deleted file mode 100644
index 861c34892a..0000000000
--- a/types/react-icons/md/space-bar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSpaceBar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/speaker-group.d.ts b/types/react-icons/md/speaker-group.d.ts
deleted file mode 100644
index 81915fc511..0000000000
--- a/types/react-icons/md/speaker-group.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSpeakerGroup extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/speaker-notes-off.d.ts b/types/react-icons/md/speaker-notes-off.d.ts
deleted file mode 100644
index bc5b008527..0000000000
--- a/types/react-icons/md/speaker-notes-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSpeakerNotesOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/speaker-notes.d.ts b/types/react-icons/md/speaker-notes.d.ts
deleted file mode 100644
index 1c3c0e4ddc..0000000000
--- a/types/react-icons/md/speaker-notes.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSpeakerNotes extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/speaker-phone.d.ts b/types/react-icons/md/speaker-phone.d.ts
deleted file mode 100644
index b459a0c395..0000000000
--- a/types/react-icons/md/speaker-phone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSpeakerPhone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/speaker.d.ts b/types/react-icons/md/speaker.d.ts
deleted file mode 100644
index 1f28f03e88..0000000000
--- a/types/react-icons/md/speaker.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSpeaker extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/spellcheck.d.ts b/types/react-icons/md/spellcheck.d.ts
deleted file mode 100644
index 6b74288ebf..0000000000
--- a/types/react-icons/md/spellcheck.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSpellcheck extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/star-border.d.ts b/types/react-icons/md/star-border.d.ts
deleted file mode 100644
index 2dda5ebb35..0000000000
--- a/types/react-icons/md/star-border.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStarBorder extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/star-half.d.ts b/types/react-icons/md/star-half.d.ts
deleted file mode 100644
index d6684bbfe0..0000000000
--- a/types/react-icons/md/star-half.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStarHalf extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/star-outline.d.ts b/types/react-icons/md/star-outline.d.ts
deleted file mode 100644
index 2b9f3546a3..0000000000
--- a/types/react-icons/md/star-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStarOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/star.d.ts b/types/react-icons/md/star.d.ts
deleted file mode 100644
index f10524254e..0000000000
--- a/types/react-icons/md/star.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/stars.d.ts b/types/react-icons/md/stars.d.ts
deleted file mode 100644
index b92a32acd6..0000000000
--- a/types/react-icons/md/stars.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStars extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/stay-current-landscape.d.ts b/types/react-icons/md/stay-current-landscape.d.ts
deleted file mode 100644
index c2edfbaa27..0000000000
--- a/types/react-icons/md/stay-current-landscape.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStayCurrentLandscape extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/stay-current-portrait.d.ts b/types/react-icons/md/stay-current-portrait.d.ts
deleted file mode 100644
index 9f523f0514..0000000000
--- a/types/react-icons/md/stay-current-portrait.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStayCurrentPortrait extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/stay-primary-landscape.d.ts b/types/react-icons/md/stay-primary-landscape.d.ts
deleted file mode 100644
index 4cf222880a..0000000000
--- a/types/react-icons/md/stay-primary-landscape.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStayPrimaryLandscape extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/stay-primary-portrait.d.ts b/types/react-icons/md/stay-primary-portrait.d.ts
deleted file mode 100644
index e4371a0ff9..0000000000
--- a/types/react-icons/md/stay-primary-portrait.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStayPrimaryPortrait extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/stop-screen-share.d.ts b/types/react-icons/md/stop-screen-share.d.ts
deleted file mode 100644
index aa6a7b1f11..0000000000
--- a/types/react-icons/md/stop-screen-share.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStopScreenShare extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/stop.d.ts b/types/react-icons/md/stop.d.ts
deleted file mode 100644
index 23972ad40d..0000000000
--- a/types/react-icons/md/stop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/storage.d.ts b/types/react-icons/md/storage.d.ts
deleted file mode 100644
index 76cdb38312..0000000000
--- a/types/react-icons/md/storage.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStorage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/store-mall-directory.d.ts b/types/react-icons/md/store-mall-directory.d.ts
deleted file mode 100644
index 68d4294ade..0000000000
--- a/types/react-icons/md/store-mall-directory.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStoreMallDirectory extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/store.d.ts b/types/react-icons/md/store.d.ts
deleted file mode 100644
index c64ab33e61..0000000000
--- a/types/react-icons/md/store.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStore extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/straighten.d.ts b/types/react-icons/md/straighten.d.ts
deleted file mode 100644
index fa68ffb61f..0000000000
--- a/types/react-icons/md/straighten.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStraighten extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/streetview.d.ts b/types/react-icons/md/streetview.d.ts
deleted file mode 100644
index b786fc4504..0000000000
--- a/types/react-icons/md/streetview.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStreetview extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/strikethrough-s.d.ts b/types/react-icons/md/strikethrough-s.d.ts
deleted file mode 100644
index 8ccb18a292..0000000000
--- a/types/react-icons/md/strikethrough-s.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStrikethroughS extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/style.d.ts b/types/react-icons/md/style.d.ts
deleted file mode 100644
index 6826a067a7..0000000000
--- a/types/react-icons/md/style.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdStyle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/subdirectory-arrow-left.d.ts b/types/react-icons/md/subdirectory-arrow-left.d.ts
deleted file mode 100644
index ebfbf45689..0000000000
--- a/types/react-icons/md/subdirectory-arrow-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSubdirectoryArrowLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/subdirectory-arrow-right.d.ts b/types/react-icons/md/subdirectory-arrow-right.d.ts
deleted file mode 100644
index 435777e018..0000000000
--- a/types/react-icons/md/subdirectory-arrow-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSubdirectoryArrowRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/subject.d.ts b/types/react-icons/md/subject.d.ts
deleted file mode 100644
index b187b836f2..0000000000
--- a/types/react-icons/md/subject.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSubject extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/subscriptions.d.ts b/types/react-icons/md/subscriptions.d.ts
deleted file mode 100644
index 0baf020371..0000000000
--- a/types/react-icons/md/subscriptions.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSubscriptions extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/subtitles.d.ts b/types/react-icons/md/subtitles.d.ts
deleted file mode 100644
index 2cacca492e..0000000000
--- a/types/react-icons/md/subtitles.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSubtitles extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/subway.d.ts b/types/react-icons/md/subway.d.ts
deleted file mode 100644
index c5496480da..0000000000
--- a/types/react-icons/md/subway.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSubway extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/supervisor-account.d.ts b/types/react-icons/md/supervisor-account.d.ts
deleted file mode 100644
index 4c9b87c063..0000000000
--- a/types/react-icons/md/supervisor-account.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSupervisorAccount extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/surround-sound.d.ts b/types/react-icons/md/surround-sound.d.ts
deleted file mode 100644
index 673f1fdb7e..0000000000
--- a/types/react-icons/md/surround-sound.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSurroundSound extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/swap-calls.d.ts b/types/react-icons/md/swap-calls.d.ts
deleted file mode 100644
index 5b6c5eb55b..0000000000
--- a/types/react-icons/md/swap-calls.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSwapCalls extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/swap-horiz.d.ts b/types/react-icons/md/swap-horiz.d.ts
deleted file mode 100644
index da47fa6f40..0000000000
--- a/types/react-icons/md/swap-horiz.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSwapHoriz extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/swap-vert.d.ts b/types/react-icons/md/swap-vert.d.ts
deleted file mode 100644
index d034eaf517..0000000000
--- a/types/react-icons/md/swap-vert.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSwapVert extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/swap-vertical-circle.d.ts b/types/react-icons/md/swap-vertical-circle.d.ts
deleted file mode 100644
index 617a1f6d9a..0000000000
--- a/types/react-icons/md/swap-vertical-circle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSwapVerticalCircle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/switch-camera.d.ts b/types/react-icons/md/switch-camera.d.ts
deleted file mode 100644
index c18ad57764..0000000000
--- a/types/react-icons/md/switch-camera.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSwitchCamera extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/switch-video.d.ts b/types/react-icons/md/switch-video.d.ts
deleted file mode 100644
index 0c95857fed..0000000000
--- a/types/react-icons/md/switch-video.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSwitchVideo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sync-disabled.d.ts b/types/react-icons/md/sync-disabled.d.ts
deleted file mode 100644
index 99fa13f705..0000000000
--- a/types/react-icons/md/sync-disabled.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSyncDisabled extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sync-problem.d.ts b/types/react-icons/md/sync-problem.d.ts
deleted file mode 100644
index 4ef37a1cbb..0000000000
--- a/types/react-icons/md/sync-problem.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSyncProblem extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/sync.d.ts b/types/react-icons/md/sync.d.ts
deleted file mode 100644
index fefdf38258..0000000000
--- a/types/react-icons/md/sync.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSync extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/system-update-alt.d.ts b/types/react-icons/md/system-update-alt.d.ts
deleted file mode 100644
index 2725f7b77c..0000000000
--- a/types/react-icons/md/system-update-alt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSystemUpdateAlt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/system-update.d.ts b/types/react-icons/md/system-update.d.ts
deleted file mode 100644
index 24ebe7c98c..0000000000
--- a/types/react-icons/md/system-update.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdSystemUpdate extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/tab-unselected.d.ts b/types/react-icons/md/tab-unselected.d.ts
deleted file mode 100644
index bac83b73ed..0000000000
--- a/types/react-icons/md/tab-unselected.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTabUnselected extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/tab.d.ts b/types/react-icons/md/tab.d.ts
deleted file mode 100644
index 5fa18473c7..0000000000
--- a/types/react-icons/md/tab.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTab extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/tablet-android.d.ts b/types/react-icons/md/tablet-android.d.ts
deleted file mode 100644
index 2f30739971..0000000000
--- a/types/react-icons/md/tablet-android.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTabletAndroid extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/tablet-mac.d.ts b/types/react-icons/md/tablet-mac.d.ts
deleted file mode 100644
index cad896f80b..0000000000
--- a/types/react-icons/md/tablet-mac.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTabletMac extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/tablet.d.ts b/types/react-icons/md/tablet.d.ts
deleted file mode 100644
index 839c55d2a9..0000000000
--- a/types/react-icons/md/tablet.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTablet extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/tag-faces.d.ts b/types/react-icons/md/tag-faces.d.ts
deleted file mode 100644
index 36fe31f9f7..0000000000
--- a/types/react-icons/md/tag-faces.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTagFaces extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/tap-and-play.d.ts b/types/react-icons/md/tap-and-play.d.ts
deleted file mode 100644
index 50203118f9..0000000000
--- a/types/react-icons/md/tap-and-play.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTapAndPlay extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/terrain.d.ts b/types/react-icons/md/terrain.d.ts
deleted file mode 100644
index 89ddcb3ab1..0000000000
--- a/types/react-icons/md/terrain.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTerrain extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/text-fields.d.ts b/types/react-icons/md/text-fields.d.ts
deleted file mode 100644
index 51d63798ed..0000000000
--- a/types/react-icons/md/text-fields.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTextFields extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/text-format.d.ts b/types/react-icons/md/text-format.d.ts
deleted file mode 100644
index ca4ef5d0b6..0000000000
--- a/types/react-icons/md/text-format.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTextFormat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/textsms.d.ts b/types/react-icons/md/textsms.d.ts
deleted file mode 100644
index c8f57f986a..0000000000
--- a/types/react-icons/md/textsms.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTextsms extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/texture.d.ts b/types/react-icons/md/texture.d.ts
deleted file mode 100644
index 48805b49d0..0000000000
--- a/types/react-icons/md/texture.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTexture extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/theaters.d.ts b/types/react-icons/md/theaters.d.ts
deleted file mode 100644
index eeecdd668f..0000000000
--- a/types/react-icons/md/theaters.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTheaters extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/thumb-down.d.ts b/types/react-icons/md/thumb-down.d.ts
deleted file mode 100644
index 412517a68f..0000000000
--- a/types/react-icons/md/thumb-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdThumbDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/thumb-up.d.ts b/types/react-icons/md/thumb-up.d.ts
deleted file mode 100644
index 4aedde1b4d..0000000000
--- a/types/react-icons/md/thumb-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdThumbUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/thumbs-up-down.d.ts b/types/react-icons/md/thumbs-up-down.d.ts
deleted file mode 100644
index f191397ff2..0000000000
--- a/types/react-icons/md/thumbs-up-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdThumbsUpDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/time-to-leave.d.ts b/types/react-icons/md/time-to-leave.d.ts
deleted file mode 100644
index 6da47c86df..0000000000
--- a/types/react-icons/md/time-to-leave.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTimeToLeave extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/timelapse.d.ts b/types/react-icons/md/timelapse.d.ts
deleted file mode 100644
index 57ac9ba997..0000000000
--- a/types/react-icons/md/timelapse.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTimelapse extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/timeline.d.ts b/types/react-icons/md/timeline.d.ts
deleted file mode 100644
index e3c47270ce..0000000000
--- a/types/react-icons/md/timeline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTimeline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/timer-10.d.ts b/types/react-icons/md/timer-10.d.ts
deleted file mode 100644
index 309eb0d095..0000000000
--- a/types/react-icons/md/timer-10.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTimer10 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/timer-3.d.ts b/types/react-icons/md/timer-3.d.ts
deleted file mode 100644
index 16ffff55b0..0000000000
--- a/types/react-icons/md/timer-3.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTimer3 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/timer-off.d.ts b/types/react-icons/md/timer-off.d.ts
deleted file mode 100644
index 60b525d44f..0000000000
--- a/types/react-icons/md/timer-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTimerOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/timer.d.ts b/types/react-icons/md/timer.d.ts
deleted file mode 100644
index aefa851f3e..0000000000
--- a/types/react-icons/md/timer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTimer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/title.d.ts b/types/react-icons/md/title.d.ts
deleted file mode 100644
index 9585257382..0000000000
--- a/types/react-icons/md/title.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTitle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/toc.d.ts b/types/react-icons/md/toc.d.ts
deleted file mode 100644
index cdd1be99e6..0000000000
--- a/types/react-icons/md/toc.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdToc extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/today.d.ts b/types/react-icons/md/today.d.ts
deleted file mode 100644
index c21725c6bb..0000000000
--- a/types/react-icons/md/today.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdToday extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/toll.d.ts b/types/react-icons/md/toll.d.ts
deleted file mode 100644
index a95cb48e8e..0000000000
--- a/types/react-icons/md/toll.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdToll extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/tonality.d.ts b/types/react-icons/md/tonality.d.ts
deleted file mode 100644
index 21595adc48..0000000000
--- a/types/react-icons/md/tonality.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTonality extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/touch-app.d.ts b/types/react-icons/md/touch-app.d.ts
deleted file mode 100644
index f5052a4d41..0000000000
--- a/types/react-icons/md/touch-app.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTouchApp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/toys.d.ts b/types/react-icons/md/toys.d.ts
deleted file mode 100644
index 07ecd03fbd..0000000000
--- a/types/react-icons/md/toys.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdToys extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/track-changes.d.ts b/types/react-icons/md/track-changes.d.ts
deleted file mode 100644
index a729929069..0000000000
--- a/types/react-icons/md/track-changes.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTrackChanges extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/traffic.d.ts b/types/react-icons/md/traffic.d.ts
deleted file mode 100644
index 41cb955abb..0000000000
--- a/types/react-icons/md/traffic.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTraffic extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/train.d.ts b/types/react-icons/md/train.d.ts
deleted file mode 100644
index 88b32243ca..0000000000
--- a/types/react-icons/md/train.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTrain extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/tram.d.ts b/types/react-icons/md/tram.d.ts
deleted file mode 100644
index ac0677ac2f..0000000000
--- a/types/react-icons/md/tram.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTram extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/transfer-within-a-station.d.ts b/types/react-icons/md/transfer-within-a-station.d.ts
deleted file mode 100644
index c8ab351a40..0000000000
--- a/types/react-icons/md/transfer-within-a-station.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTransferWithinAStation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/transform.d.ts b/types/react-icons/md/transform.d.ts
deleted file mode 100644
index 3898a71c86..0000000000
--- a/types/react-icons/md/transform.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTransform extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/translate.d.ts b/types/react-icons/md/translate.d.ts
deleted file mode 100644
index f8d624afc1..0000000000
--- a/types/react-icons/md/translate.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTranslate extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/trending-down.d.ts b/types/react-icons/md/trending-down.d.ts
deleted file mode 100644
index 00698234f5..0000000000
--- a/types/react-icons/md/trending-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTrendingDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/trending-flat.d.ts b/types/react-icons/md/trending-flat.d.ts
deleted file mode 100644
index b511527a55..0000000000
--- a/types/react-icons/md/trending-flat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTrendingFlat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/trending-neutral.d.ts b/types/react-icons/md/trending-neutral.d.ts
deleted file mode 100644
index 0c3d3d1fc1..0000000000
--- a/types/react-icons/md/trending-neutral.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTrendingNeutral extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/trending-up.d.ts b/types/react-icons/md/trending-up.d.ts
deleted file mode 100644
index 4468236a4e..0000000000
--- a/types/react-icons/md/trending-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTrendingUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/tune.d.ts b/types/react-icons/md/tune.d.ts
deleted file mode 100644
index 76c17a1112..0000000000
--- a/types/react-icons/md/tune.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTune extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/turned-in-not.d.ts b/types/react-icons/md/turned-in-not.d.ts
deleted file mode 100644
index a2120936f2..0000000000
--- a/types/react-icons/md/turned-in-not.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTurnedInNot extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/turned-in.d.ts b/types/react-icons/md/turned-in.d.ts
deleted file mode 100644
index 685e4225f4..0000000000
--- a/types/react-icons/md/turned-in.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTurnedIn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/tv.d.ts b/types/react-icons/md/tv.d.ts
deleted file mode 100644
index 4d184b9d39..0000000000
--- a/types/react-icons/md/tv.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdTv extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/unarchive.d.ts b/types/react-icons/md/unarchive.d.ts
deleted file mode 100644
index 5fb2297759..0000000000
--- a/types/react-icons/md/unarchive.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdUnarchive extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/undo.d.ts b/types/react-icons/md/undo.d.ts
deleted file mode 100644
index 16cec6f9f2..0000000000
--- a/types/react-icons/md/undo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdUndo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/unfold-less.d.ts b/types/react-icons/md/unfold-less.d.ts
deleted file mode 100644
index c13b17448f..0000000000
--- a/types/react-icons/md/unfold-less.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdUnfoldLess extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/unfold-more.d.ts b/types/react-icons/md/unfold-more.d.ts
deleted file mode 100644
index c87c91e57d..0000000000
--- a/types/react-icons/md/unfold-more.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdUnfoldMore extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/update.d.ts b/types/react-icons/md/update.d.ts
deleted file mode 100644
index bfc17eb008..0000000000
--- a/types/react-icons/md/update.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdUpdate extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/usb.d.ts b/types/react-icons/md/usb.d.ts
deleted file mode 100644
index 66f7b5444e..0000000000
--- a/types/react-icons/md/usb.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdUsb extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/verified-user.d.ts b/types/react-icons/md/verified-user.d.ts
deleted file mode 100644
index 680ba2575f..0000000000
--- a/types/react-icons/md/verified-user.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVerifiedUser extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/vertical-align-bottom.d.ts b/types/react-icons/md/vertical-align-bottom.d.ts
deleted file mode 100644
index e172ed18d3..0000000000
--- a/types/react-icons/md/vertical-align-bottom.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVerticalAlignBottom extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/vertical-align-center.d.ts b/types/react-icons/md/vertical-align-center.d.ts
deleted file mode 100644
index f672e556c6..0000000000
--- a/types/react-icons/md/vertical-align-center.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVerticalAlignCenter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/vertical-align-top.d.ts b/types/react-icons/md/vertical-align-top.d.ts
deleted file mode 100644
index 712e86f0e3..0000000000
--- a/types/react-icons/md/vertical-align-top.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVerticalAlignTop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/vibration.d.ts b/types/react-icons/md/vibration.d.ts
deleted file mode 100644
index 6f9b90222f..0000000000
--- a/types/react-icons/md/vibration.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVibration extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/video-call.d.ts b/types/react-icons/md/video-call.d.ts
deleted file mode 100644
index b22ae1fcee..0000000000
--- a/types/react-icons/md/video-call.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVideoCall extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/video-collection.d.ts b/types/react-icons/md/video-collection.d.ts
deleted file mode 100644
index 037903682d..0000000000
--- a/types/react-icons/md/video-collection.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVideoCollection extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/video-label.d.ts b/types/react-icons/md/video-label.d.ts
deleted file mode 100644
index b2dc4eb7d1..0000000000
--- a/types/react-icons/md/video-label.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVideoLabel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/video-library.d.ts b/types/react-icons/md/video-library.d.ts
deleted file mode 100644
index 75bfe2a8aa..0000000000
--- a/types/react-icons/md/video-library.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVideoLibrary extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/videocam-off.d.ts b/types/react-icons/md/videocam-off.d.ts
deleted file mode 100644
index fd9d514107..0000000000
--- a/types/react-icons/md/videocam-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVideocamOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/videocam.d.ts b/types/react-icons/md/videocam.d.ts
deleted file mode 100644
index 7dc49c3be4..0000000000
--- a/types/react-icons/md/videocam.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVideocam extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/videogame-asset.d.ts b/types/react-icons/md/videogame-asset.d.ts
deleted file mode 100644
index 7e49edf4f8..0000000000
--- a/types/react-icons/md/videogame-asset.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVideogameAsset extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/view-agenda.d.ts b/types/react-icons/md/view-agenda.d.ts
deleted file mode 100644
index 04beb28dd3..0000000000
--- a/types/react-icons/md/view-agenda.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdViewAgenda extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/view-array.d.ts b/types/react-icons/md/view-array.d.ts
deleted file mode 100644
index 6b125ee5b6..0000000000
--- a/types/react-icons/md/view-array.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdViewArray extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/view-carousel.d.ts b/types/react-icons/md/view-carousel.d.ts
deleted file mode 100644
index da381e92f6..0000000000
--- a/types/react-icons/md/view-carousel.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdViewCarousel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/view-column.d.ts b/types/react-icons/md/view-column.d.ts
deleted file mode 100644
index c5aaaea343..0000000000
--- a/types/react-icons/md/view-column.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdViewColumn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/view-comfortable.d.ts b/types/react-icons/md/view-comfortable.d.ts
deleted file mode 100644
index 4a8277c807..0000000000
--- a/types/react-icons/md/view-comfortable.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdViewComfortable extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/view-comfy.d.ts b/types/react-icons/md/view-comfy.d.ts
deleted file mode 100644
index a7004f4eee..0000000000
--- a/types/react-icons/md/view-comfy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdViewComfy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/view-compact.d.ts b/types/react-icons/md/view-compact.d.ts
deleted file mode 100644
index fefa73473f..0000000000
--- a/types/react-icons/md/view-compact.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdViewCompact extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/view-day.d.ts b/types/react-icons/md/view-day.d.ts
deleted file mode 100644
index 2013b75c21..0000000000
--- a/types/react-icons/md/view-day.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdViewDay extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/view-headline.d.ts b/types/react-icons/md/view-headline.d.ts
deleted file mode 100644
index b82272bf35..0000000000
--- a/types/react-icons/md/view-headline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdViewHeadline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/view-list.d.ts b/types/react-icons/md/view-list.d.ts
deleted file mode 100644
index e4cafe07c0..0000000000
--- a/types/react-icons/md/view-list.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdViewList extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/view-module.d.ts b/types/react-icons/md/view-module.d.ts
deleted file mode 100644
index 745cf535be..0000000000
--- a/types/react-icons/md/view-module.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdViewModule extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/view-quilt.d.ts b/types/react-icons/md/view-quilt.d.ts
deleted file mode 100644
index f0e1e3694f..0000000000
--- a/types/react-icons/md/view-quilt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdViewQuilt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/view-stream.d.ts b/types/react-icons/md/view-stream.d.ts
deleted file mode 100644
index af7906aa62..0000000000
--- a/types/react-icons/md/view-stream.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdViewStream extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/view-week.d.ts b/types/react-icons/md/view-week.d.ts
deleted file mode 100644
index f40184d700..0000000000
--- a/types/react-icons/md/view-week.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdViewWeek extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/vignette.d.ts b/types/react-icons/md/vignette.d.ts
deleted file mode 100644
index 0f34dde7dd..0000000000
--- a/types/react-icons/md/vignette.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVignette extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/visibility-off.d.ts b/types/react-icons/md/visibility-off.d.ts
deleted file mode 100644
index 679a746bd7..0000000000
--- a/types/react-icons/md/visibility-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVisibilityOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/visibility.d.ts b/types/react-icons/md/visibility.d.ts
deleted file mode 100644
index 59c3bb1f38..0000000000
--- a/types/react-icons/md/visibility.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVisibility extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/voice-chat.d.ts b/types/react-icons/md/voice-chat.d.ts
deleted file mode 100644
index a64ac1bee4..0000000000
--- a/types/react-icons/md/voice-chat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVoiceChat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/voicemail.d.ts b/types/react-icons/md/voicemail.d.ts
deleted file mode 100644
index bf922ef49e..0000000000
--- a/types/react-icons/md/voicemail.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVoicemail extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/volume-down.d.ts b/types/react-icons/md/volume-down.d.ts
deleted file mode 100644
index f7a335c1c7..0000000000
--- a/types/react-icons/md/volume-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVolumeDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/volume-mute.d.ts b/types/react-icons/md/volume-mute.d.ts
deleted file mode 100644
index 566bbe0003..0000000000
--- a/types/react-icons/md/volume-mute.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVolumeMute extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/volume-off.d.ts b/types/react-icons/md/volume-off.d.ts
deleted file mode 100644
index 74acca188c..0000000000
--- a/types/react-icons/md/volume-off.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVolumeOff extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/volume-up.d.ts b/types/react-icons/md/volume-up.d.ts
deleted file mode 100644
index 28387e23f0..0000000000
--- a/types/react-icons/md/volume-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVolumeUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/vpn-key.d.ts b/types/react-icons/md/vpn-key.d.ts
deleted file mode 100644
index e2325babe7..0000000000
--- a/types/react-icons/md/vpn-key.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVpnKey extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/vpn-lock.d.ts b/types/react-icons/md/vpn-lock.d.ts
deleted file mode 100644
index b83205b117..0000000000
--- a/types/react-icons/md/vpn-lock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdVpnLock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/wallpaper.d.ts b/types/react-icons/md/wallpaper.d.ts
deleted file mode 100644
index ea0485412f..0000000000
--- a/types/react-icons/md/wallpaper.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWallpaper extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/warning.d.ts b/types/react-icons/md/warning.d.ts
deleted file mode 100644
index 74ec79fe30..0000000000
--- a/types/react-icons/md/warning.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWarning extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/watch-later.d.ts b/types/react-icons/md/watch-later.d.ts
deleted file mode 100644
index c4dc2a3b49..0000000000
--- a/types/react-icons/md/watch-later.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWatchLater extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/watch.d.ts b/types/react-icons/md/watch.d.ts
deleted file mode 100644
index ae09dcd597..0000000000
--- a/types/react-icons/md/watch.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWatch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/wb-auto.d.ts b/types/react-icons/md/wb-auto.d.ts
deleted file mode 100644
index 216d3b41dc..0000000000
--- a/types/react-icons/md/wb-auto.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWbAuto extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/wb-cloudy.d.ts b/types/react-icons/md/wb-cloudy.d.ts
deleted file mode 100644
index 2ad62d4341..0000000000
--- a/types/react-icons/md/wb-cloudy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWbCloudy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/wb-incandescent.d.ts b/types/react-icons/md/wb-incandescent.d.ts
deleted file mode 100644
index 52b597fc99..0000000000
--- a/types/react-icons/md/wb-incandescent.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWbIncandescent extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/wb-iridescent.d.ts b/types/react-icons/md/wb-iridescent.d.ts
deleted file mode 100644
index 6d16c62bba..0000000000
--- a/types/react-icons/md/wb-iridescent.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWbIridescent extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/wb-sunny.d.ts b/types/react-icons/md/wb-sunny.d.ts
deleted file mode 100644
index e8bd77c743..0000000000
--- a/types/react-icons/md/wb-sunny.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWbSunny extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/wc.d.ts b/types/react-icons/md/wc.d.ts
deleted file mode 100644
index 9e9cde374f..0000000000
--- a/types/react-icons/md/wc.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWc extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/web-asset.d.ts b/types/react-icons/md/web-asset.d.ts
deleted file mode 100644
index 1871d94e5f..0000000000
--- a/types/react-icons/md/web-asset.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWebAsset extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/web.d.ts b/types/react-icons/md/web.d.ts
deleted file mode 100644
index 0a6c41e697..0000000000
--- a/types/react-icons/md/web.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWeb extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/weekend.d.ts b/types/react-icons/md/weekend.d.ts
deleted file mode 100644
index 4a7c411c87..0000000000
--- a/types/react-icons/md/weekend.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWeekend extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/whatshot.d.ts b/types/react-icons/md/whatshot.d.ts
deleted file mode 100644
index cf16b36c37..0000000000
--- a/types/react-icons/md/whatshot.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWhatshot extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/widgets.d.ts b/types/react-icons/md/widgets.d.ts
deleted file mode 100644
index ea00e70e7b..0000000000
--- a/types/react-icons/md/widgets.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWidgets extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/wifi-lock.d.ts b/types/react-icons/md/wifi-lock.d.ts
deleted file mode 100644
index 58c31bb22c..0000000000
--- a/types/react-icons/md/wifi-lock.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWifiLock extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/wifi-tethering.d.ts b/types/react-icons/md/wifi-tethering.d.ts
deleted file mode 100644
index 580c2fe273..0000000000
--- a/types/react-icons/md/wifi-tethering.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWifiTethering extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/wifi.d.ts b/types/react-icons/md/wifi.d.ts
deleted file mode 100644
index ee81b9f84c..0000000000
--- a/types/react-icons/md/wifi.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWifi extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/work.d.ts b/types/react-icons/md/work.d.ts
deleted file mode 100644
index 8b1f10367f..0000000000
--- a/types/react-icons/md/work.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWork extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/wrap-text.d.ts b/types/react-icons/md/wrap-text.d.ts
deleted file mode 100644
index 4e90b8190a..0000000000
--- a/types/react-icons/md/wrap-text.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdWrapText extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/youtube-searched-for.d.ts b/types/react-icons/md/youtube-searched-for.d.ts
deleted file mode 100644
index 0267e151dc..0000000000
--- a/types/react-icons/md/youtube-searched-for.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdYoutubeSearchedFor extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/zoom-in.d.ts b/types/react-icons/md/zoom-in.d.ts
deleted file mode 100644
index 068a0d9bd7..0000000000
--- a/types/react-icons/md/zoom-in.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdZoomIn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/zoom-out-map.d.ts b/types/react-icons/md/zoom-out-map.d.ts
deleted file mode 100644
index 4d526d0095..0000000000
--- a/types/react-icons/md/zoom-out-map.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdZoomOutMap extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/zoom-out.d.ts b/types/react-icons/md/zoom-out.d.ts
deleted file mode 100644
index 54862f1b45..0000000000
--- a/types/react-icons/md/zoom-out.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class MdZoomOut extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/react-icons-tests.tsx b/types/react-icons/react-icons-tests.tsx
deleted file mode 100644
index 8cfacdbf4e..0000000000
--- a/types/react-icons/react-icons-tests.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import * as React from 'react';
-import FaBeer from 'react-icons/fa/beer';
-import { FaExclamation } from 'react-icons/fa';
-import FaCog = require('react-icons/lib/fa/cog');
-import { FaPowerOff } from 'react-icons/lib/fa';
-
-class Question extends React.Component {
-    render() {
-        return <h3> Lets go for a <FaBeer /><FaExclamation />? It'll help you <FaPowerOff /> your <FaCog /></h3>;
-    }
-}
diff --git a/types/react-icons/scripts/generate.ts b/types/react-icons/scripts/generate.ts
deleted file mode 100644
index 035516e57e..0000000000
--- a/types/react-icons/scripts/generate.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-// Usage: npm install && ts-node generate.ts
-import { mkdirSync, readdirSync, writeFileSync } from 'fs';
-import { removeSync } from 'fs-extra';
-import { join as joinPaths } from 'path';
-
-const allModules = findAllModules();
-
-// Delete old output
-for (const { group } of allModules) {
-    const outPath = getOutDir(group);
-    removeSync(outPath);
-    const outLibPath = getOutLibDir(group);
-    removeSync(outLibPath);
-}
-
-// Create new empty folders
-for (const { group } of allModules) {
-    const outPath = getOutDir(group);
-    mkdirSync(outPath);
-    const outLibPath = getOutLibDir(group);
-    mkdirSync(outLibPath);
-}
-
-for (const { group, ids } of allModules) {
-    for (const id of ids) {
-        writeFileSync(getOutFile(group, `${id}.d.ts`), iconFile(getModuleName(group, id)), 'utf-8');
-        writeFileSync(getOutLibFile(group, `${id}.d.ts`), iconFile(getModuleName(group, id), true), 'utf-8');
-    }
-    writeFileSync(getOutFile(group, 'index.d.ts'), indexFile(group, ids), 'utf-8');
-    writeFileSync(getOutLibFile(group, 'index.d.ts'), indexFile(group, ids, true), 'utf-8');
-}
-
-function getOutDir(group: string): string {
-    return joinPaths(__dirname, '..', group);
-}
-
-function getOutFile(folder: string, fileName: string): string {
-    return joinPaths(getOutDir(folder), fileName);
-}
-
-function getOutLibDir(group: string): string {
-    return joinPaths(__dirname, '..', 'lib', group);
-}
-
-function getOutLibFile(folder: string, fileName: string): string {
-    return joinPaths(getOutLibDir(folder), fileName);
-}
-
-function iconFile(name: string, lib: boolean = false): string {
-    if (lib) {
-        return `import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-declare class ${name} extends React.Component<IconBaseProps> { }
-export = ${name};
-`;
-    }
-
-    return `import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class ${name} extends React.Component<IconBaseProps> { }
-`;
-}
-
-function indexFile(folder: string, ids: string[], lib: boolean = false): string {
-    const reExports = ids.map(id => `export { default as ${getModuleName(folder, id)} } from "${lib ? `../../${folder}` : "."}/${id}";`);
-    return reExports.join("\n") + "\n";
-}
-
-function getModuleName(folder: string, id: string): string {
-    return capitalize(folder) + capitalize(camelcase(id));
-}
-
-function capitalize(str: string): string {
-    return str[0].toUpperCase() + str.slice(1);
-}
-
-function camelcase(str: string): string {
-    return str.replace(/-(\w)/g, (_, s) => s.toUpperCase());
-}
-
-function findAllModules(): Array<{ group: string, ids: string[] }> {
-    const rootDir = joinPaths(__dirname, 'node_modules/react-icons');
-    return ["fa", "go", "io", "md", "ti"].map(group => {
-        const ids: string[] = [];
-        const dirPath = joinPaths(rootDir, group);
-        for (const js of readdirSync(dirPath)) {
-            if (js.endsWith(".js")) {
-                const id = js.slice(0, js.length - ".js".length);
-                if (id !== "index") {
-                    ids.push(id);
-                }
-            }
-        }
-        return { group, ids };
-    });
-}
diff --git a/types/react-icons/scripts/package.json b/types/react-icons/scripts/package.json
deleted file mode 100644
index 03fe7b3e2c..0000000000
--- a/types/react-icons/scripts/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "dependencies": {
-    "fs-extra": "^2.1.2",
-    "react-icons": "^2.2.3"
-  }
-}
diff --git a/types/react-icons/scripts/tsconfig.json b/types/react-icons/scripts/tsconfig.json
deleted file mode 100644
index 0003c6720a..0000000000
--- a/types/react-icons/scripts/tsconfig.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es6",
-
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "baseUrl": "../..",
-        "typeRoots": [
-            "../.."
-        ],
-        "types": [],
-        "noUnusedLocals": true,
-        "noUnusedParameters": true
-    },
-    "files": ["generate.ts"]
-}
diff --git a/types/react-icons/ti/adjust-brightness.d.ts b/types/react-icons/ti/adjust-brightness.d.ts
deleted file mode 100644
index 5beec88e6a..0000000000
--- a/types/react-icons/ti/adjust-brightness.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiAdjustBrightness extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/adjust-contrast.d.ts b/types/react-icons/ti/adjust-contrast.d.ts
deleted file mode 100644
index 2d49b0ce59..0000000000
--- a/types/react-icons/ti/adjust-contrast.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiAdjustContrast extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/anchor-outline.d.ts b/types/react-icons/ti/anchor-outline.d.ts
deleted file mode 100644
index 7a9bc3ab6e..0000000000
--- a/types/react-icons/ti/anchor-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiAnchorOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/anchor.d.ts b/types/react-icons/ti/anchor.d.ts
deleted file mode 100644
index 3c90ca1623..0000000000
--- a/types/react-icons/ti/anchor.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiAnchor extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/archive.d.ts b/types/react-icons/ti/archive.d.ts
deleted file mode 100644
index 22c92eab3d..0000000000
--- a/types/react-icons/ti/archive.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArchive extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-back-outline.d.ts b/types/react-icons/ti/arrow-back-outline.d.ts
deleted file mode 100644
index c168ae0809..0000000000
--- a/types/react-icons/ti/arrow-back-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowBackOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-back.d.ts b/types/react-icons/ti/arrow-back.d.ts
deleted file mode 100644
index 5eb11665a2..0000000000
--- a/types/react-icons/ti/arrow-back.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowBack extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-down-outline.d.ts b/types/react-icons/ti/arrow-down-outline.d.ts
deleted file mode 100644
index 17ff0d0547..0000000000
--- a/types/react-icons/ti/arrow-down-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowDownOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-down-thick.d.ts b/types/react-icons/ti/arrow-down-thick.d.ts
deleted file mode 100644
index 450cbe6467..0000000000
--- a/types/react-icons/ti/arrow-down-thick.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowDownThick extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-down.d.ts b/types/react-icons/ti/arrow-down.d.ts
deleted file mode 100644
index fcb3596caf..0000000000
--- a/types/react-icons/ti/arrow-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-forward-outline.d.ts b/types/react-icons/ti/arrow-forward-outline.d.ts
deleted file mode 100644
index 610881bf2d..0000000000
--- a/types/react-icons/ti/arrow-forward-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowForwardOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-forward.d.ts b/types/react-icons/ti/arrow-forward.d.ts
deleted file mode 100644
index a4291100ca..0000000000
--- a/types/react-icons/ti/arrow-forward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowForward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-left-outline.d.ts b/types/react-icons/ti/arrow-left-outline.d.ts
deleted file mode 100644
index fb50e3e8ae..0000000000
--- a/types/react-icons/ti/arrow-left-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowLeftOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-left-thick.d.ts b/types/react-icons/ti/arrow-left-thick.d.ts
deleted file mode 100644
index 4c5bf0e54e..0000000000
--- a/types/react-icons/ti/arrow-left-thick.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowLeftThick extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-left.d.ts b/types/react-icons/ti/arrow-left.d.ts
deleted file mode 100644
index f4ae370d36..0000000000
--- a/types/react-icons/ti/arrow-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-loop-outline.d.ts b/types/react-icons/ti/arrow-loop-outline.d.ts
deleted file mode 100644
index 40da459c5f..0000000000
--- a/types/react-icons/ti/arrow-loop-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowLoopOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-loop.d.ts b/types/react-icons/ti/arrow-loop.d.ts
deleted file mode 100644
index e4d207fe46..0000000000
--- a/types/react-icons/ti/arrow-loop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowLoop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-maximise-outline.d.ts b/types/react-icons/ti/arrow-maximise-outline.d.ts
deleted file mode 100644
index e6900ecdb4..0000000000
--- a/types/react-icons/ti/arrow-maximise-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMaximiseOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-maximise.d.ts b/types/react-icons/ti/arrow-maximise.d.ts
deleted file mode 100644
index 14797e2179..0000000000
--- a/types/react-icons/ti/arrow-maximise.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMaximise extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-minimise-outline.d.ts b/types/react-icons/ti/arrow-minimise-outline.d.ts
deleted file mode 100644
index 16e1c2c67d..0000000000
--- a/types/react-icons/ti/arrow-minimise-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMinimiseOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-minimise.d.ts b/types/react-icons/ti/arrow-minimise.d.ts
deleted file mode 100644
index 557625ec1a..0000000000
--- a/types/react-icons/ti/arrow-minimise.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMinimise extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-move-outline.d.ts b/types/react-icons/ti/arrow-move-outline.d.ts
deleted file mode 100644
index 0035cbddca..0000000000
--- a/types/react-icons/ti/arrow-move-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMoveOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-move.d.ts b/types/react-icons/ti/arrow-move.d.ts
deleted file mode 100644
index 974082e4ed..0000000000
--- a/types/react-icons/ti/arrow-move.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMove extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-repeat-outline.d.ts b/types/react-icons/ti/arrow-repeat-outline.d.ts
deleted file mode 100644
index 7b4e2b2c06..0000000000
--- a/types/react-icons/ti/arrow-repeat-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowRepeatOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-repeat.d.ts b/types/react-icons/ti/arrow-repeat.d.ts
deleted file mode 100644
index 00445af479..0000000000
--- a/types/react-icons/ti/arrow-repeat.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowRepeat extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-right-outline.d.ts b/types/react-icons/ti/arrow-right-outline.d.ts
deleted file mode 100644
index 7f7319172c..0000000000
--- a/types/react-icons/ti/arrow-right-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowRightOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-right-thick.d.ts b/types/react-icons/ti/arrow-right-thick.d.ts
deleted file mode 100644
index cc72754ddf..0000000000
--- a/types/react-icons/ti/arrow-right-thick.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowRightThick extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-right.d.ts b/types/react-icons/ti/arrow-right.d.ts
deleted file mode 100644
index 0761bfd383..0000000000
--- a/types/react-icons/ti/arrow-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-shuffle.d.ts b/types/react-icons/ti/arrow-shuffle.d.ts
deleted file mode 100644
index c0cb7629b3..0000000000
--- a/types/react-icons/ti/arrow-shuffle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowShuffle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-sorted-down.d.ts b/types/react-icons/ti/arrow-sorted-down.d.ts
deleted file mode 100644
index b7b8a436dd..0000000000
--- a/types/react-icons/ti/arrow-sorted-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowSortedDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-sorted-up.d.ts b/types/react-icons/ti/arrow-sorted-up.d.ts
deleted file mode 100644
index 66f3ef408a..0000000000
--- a/types/react-icons/ti/arrow-sorted-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowSortedUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-sync-outline.d.ts b/types/react-icons/ti/arrow-sync-outline.d.ts
deleted file mode 100644
index 91b296966b..0000000000
--- a/types/react-icons/ti/arrow-sync-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowSyncOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-sync.d.ts b/types/react-icons/ti/arrow-sync.d.ts
deleted file mode 100644
index 4a863fe22c..0000000000
--- a/types/react-icons/ti/arrow-sync.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowSync extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-unsorted.d.ts b/types/react-icons/ti/arrow-unsorted.d.ts
deleted file mode 100644
index 1fbd71c7fa..0000000000
--- a/types/react-icons/ti/arrow-unsorted.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowUnsorted extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-up-outline.d.ts b/types/react-icons/ti/arrow-up-outline.d.ts
deleted file mode 100644
index 5f7d9b2baa..0000000000
--- a/types/react-icons/ti/arrow-up-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowUpOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-up-thick.d.ts b/types/react-icons/ti/arrow-up-thick.d.ts
deleted file mode 100644
index 965192a20a..0000000000
--- a/types/react-icons/ti/arrow-up-thick.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowUpThick extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/arrow-up.d.ts b/types/react-icons/ti/arrow-up.d.ts
deleted file mode 100644
index d8930645ae..0000000000
--- a/types/react-icons/ti/arrow-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/at.d.ts b/types/react-icons/ti/at.d.ts
deleted file mode 100644
index 7eaadbcb42..0000000000
--- a/types/react-icons/ti/at.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiAt extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/attachment-outline.d.ts b/types/react-icons/ti/attachment-outline.d.ts
deleted file mode 100644
index 2f3c1c54ea..0000000000
--- a/types/react-icons/ti/attachment-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiAttachmentOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/attachment.d.ts b/types/react-icons/ti/attachment.d.ts
deleted file mode 100644
index ae09ff061c..0000000000
--- a/types/react-icons/ti/attachment.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiAttachment extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/backspace-outline.d.ts b/types/react-icons/ti/backspace-outline.d.ts
deleted file mode 100644
index a7047f88fc..0000000000
--- a/types/react-icons/ti/backspace-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiBackspaceOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/backspace.d.ts b/types/react-icons/ti/backspace.d.ts
deleted file mode 100644
index fcd1490219..0000000000
--- a/types/react-icons/ti/backspace.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiBackspace extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/battery-charge.d.ts b/types/react-icons/ti/battery-charge.d.ts
deleted file mode 100644
index 6b1af42674..0000000000
--- a/types/react-icons/ti/battery-charge.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiBatteryCharge extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/battery-full.d.ts b/types/react-icons/ti/battery-full.d.ts
deleted file mode 100644
index 6e75957baf..0000000000
--- a/types/react-icons/ti/battery-full.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiBatteryFull extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/battery-high.d.ts b/types/react-icons/ti/battery-high.d.ts
deleted file mode 100644
index 951e63a507..0000000000
--- a/types/react-icons/ti/battery-high.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiBatteryHigh extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/battery-low.d.ts b/types/react-icons/ti/battery-low.d.ts
deleted file mode 100644
index 9c0f370293..0000000000
--- a/types/react-icons/ti/battery-low.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiBatteryLow extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/battery-mid.d.ts b/types/react-icons/ti/battery-mid.d.ts
deleted file mode 100644
index 6625efa374..0000000000
--- a/types/react-icons/ti/battery-mid.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiBatteryMid extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/beaker.d.ts b/types/react-icons/ti/beaker.d.ts
deleted file mode 100644
index 0cdfe9fc68..0000000000
--- a/types/react-icons/ti/beaker.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiBeaker extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/beer.d.ts b/types/react-icons/ti/beer.d.ts
deleted file mode 100644
index a76c8d06f6..0000000000
--- a/types/react-icons/ti/beer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiBeer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/bell.d.ts b/types/react-icons/ti/bell.d.ts
deleted file mode 100644
index d3dd3950ed..0000000000
--- a/types/react-icons/ti/bell.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiBell extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/book.d.ts b/types/react-icons/ti/book.d.ts
deleted file mode 100644
index e2a2e7d952..0000000000
--- a/types/react-icons/ti/book.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiBook extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/bookmark.d.ts b/types/react-icons/ti/bookmark.d.ts
deleted file mode 100644
index 47dc6a5e5f..0000000000
--- a/types/react-icons/ti/bookmark.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiBookmark extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/briefcase.d.ts b/types/react-icons/ti/briefcase.d.ts
deleted file mode 100644
index c830dab76b..0000000000
--- a/types/react-icons/ti/briefcase.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiBriefcase extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/brush.d.ts b/types/react-icons/ti/brush.d.ts
deleted file mode 100644
index d8a1b5a5d8..0000000000
--- a/types/react-icons/ti/brush.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiBrush extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/business-card.d.ts b/types/react-icons/ti/business-card.d.ts
deleted file mode 100644
index 1ecf3f6621..0000000000
--- a/types/react-icons/ti/business-card.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiBusinessCard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/calculator.d.ts b/types/react-icons/ti/calculator.d.ts
deleted file mode 100644
index 403ce8c3e6..0000000000
--- a/types/react-icons/ti/calculator.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCalculator extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/calendar-outline.d.ts b/types/react-icons/ti/calendar-outline.d.ts
deleted file mode 100644
index bd3dd9e9d3..0000000000
--- a/types/react-icons/ti/calendar-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCalendarOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/calendar.d.ts b/types/react-icons/ti/calendar.d.ts
deleted file mode 100644
index 9b0ba315d5..0000000000
--- a/types/react-icons/ti/calendar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCalendar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/calender-outline.d.ts b/types/react-icons/ti/calender-outline.d.ts
deleted file mode 100644
index 8afcb4ef62..0000000000
--- a/types/react-icons/ti/calender-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCalenderOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/calender.d.ts b/types/react-icons/ti/calender.d.ts
deleted file mode 100644
index 0393fece08..0000000000
--- a/types/react-icons/ti/calender.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCalender extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/camera-outline.d.ts b/types/react-icons/ti/camera-outline.d.ts
deleted file mode 100644
index 940ba3bd58..0000000000
--- a/types/react-icons/ti/camera-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCameraOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/camera.d.ts b/types/react-icons/ti/camera.d.ts
deleted file mode 100644
index 8291efbd7d..0000000000
--- a/types/react-icons/ti/camera.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCamera extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/cancel-outline.d.ts b/types/react-icons/ti/cancel-outline.d.ts
deleted file mode 100644
index 233d7b4b9b..0000000000
--- a/types/react-icons/ti/cancel-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCancelOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/cancel.d.ts b/types/react-icons/ti/cancel.d.ts
deleted file mode 100644
index 882317d054..0000000000
--- a/types/react-icons/ti/cancel.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCancel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/chart-area-outline.d.ts b/types/react-icons/ti/chart-area-outline.d.ts
deleted file mode 100644
index fa40a08cde..0000000000
--- a/types/react-icons/ti/chart-area-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiChartAreaOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/chart-area.d.ts b/types/react-icons/ti/chart-area.d.ts
deleted file mode 100644
index 80806cbd7c..0000000000
--- a/types/react-icons/ti/chart-area.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiChartArea extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/chart-bar-outline.d.ts b/types/react-icons/ti/chart-bar-outline.d.ts
deleted file mode 100644
index 9ec3c4ca70..0000000000
--- a/types/react-icons/ti/chart-bar-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiChartBarOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/chart-bar.d.ts b/types/react-icons/ti/chart-bar.d.ts
deleted file mode 100644
index a98da7fe10..0000000000
--- a/types/react-icons/ti/chart-bar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiChartBar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/chart-line-outline.d.ts b/types/react-icons/ti/chart-line-outline.d.ts
deleted file mode 100644
index f5a982d0f1..0000000000
--- a/types/react-icons/ti/chart-line-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiChartLineOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/chart-line.d.ts b/types/react-icons/ti/chart-line.d.ts
deleted file mode 100644
index be581f2b53..0000000000
--- a/types/react-icons/ti/chart-line.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiChartLine extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/chart-pie-outline.d.ts b/types/react-icons/ti/chart-pie-outline.d.ts
deleted file mode 100644
index 449d799a79..0000000000
--- a/types/react-icons/ti/chart-pie-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiChartPieOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/chart-pie.d.ts b/types/react-icons/ti/chart-pie.d.ts
deleted file mode 100644
index 5a641290fb..0000000000
--- a/types/react-icons/ti/chart-pie.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiChartPie extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/chevron-left-outline.d.ts b/types/react-icons/ti/chevron-left-outline.d.ts
deleted file mode 100644
index 38ad9ab531..0000000000
--- a/types/react-icons/ti/chevron-left-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiChevronLeftOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/chevron-left.d.ts b/types/react-icons/ti/chevron-left.d.ts
deleted file mode 100644
index d6a3e7286c..0000000000
--- a/types/react-icons/ti/chevron-left.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiChevronLeft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/chevron-right-outline.d.ts b/types/react-icons/ti/chevron-right-outline.d.ts
deleted file mode 100644
index 09cc6370fd..0000000000
--- a/types/react-icons/ti/chevron-right-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiChevronRightOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/chevron-right.d.ts b/types/react-icons/ti/chevron-right.d.ts
deleted file mode 100644
index 311697c66a..0000000000
--- a/types/react-icons/ti/chevron-right.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiChevronRight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/clipboard.d.ts b/types/react-icons/ti/clipboard.d.ts
deleted file mode 100644
index cce73b1bc7..0000000000
--- a/types/react-icons/ti/clipboard.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiClipboard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/cloud-storage-outline.d.ts b/types/react-icons/ti/cloud-storage-outline.d.ts
deleted file mode 100644
index d36a07cdb6..0000000000
--- a/types/react-icons/ti/cloud-storage-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCloudStorageOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/cloud-storage.d.ts b/types/react-icons/ti/cloud-storage.d.ts
deleted file mode 100644
index 45142999f9..0000000000
--- a/types/react-icons/ti/cloud-storage.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCloudStorage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/code-outline.d.ts b/types/react-icons/ti/code-outline.d.ts
deleted file mode 100644
index f7c2eec174..0000000000
--- a/types/react-icons/ti/code-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCodeOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/code.d.ts b/types/react-icons/ti/code.d.ts
deleted file mode 100644
index e6bf302269..0000000000
--- a/types/react-icons/ti/code.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCode extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/coffee.d.ts b/types/react-icons/ti/coffee.d.ts
deleted file mode 100644
index df3aa18694..0000000000
--- a/types/react-icons/ti/coffee.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCoffee extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/cog-outline.d.ts b/types/react-icons/ti/cog-outline.d.ts
deleted file mode 100644
index 40c76991c5..0000000000
--- a/types/react-icons/ti/cog-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCogOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/cog.d.ts b/types/react-icons/ti/cog.d.ts
deleted file mode 100644
index 24573b9291..0000000000
--- a/types/react-icons/ti/cog.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCog extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/compass.d.ts b/types/react-icons/ti/compass.d.ts
deleted file mode 100644
index 54c70bee8b..0000000000
--- a/types/react-icons/ti/compass.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCompass extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/contacts.d.ts b/types/react-icons/ti/contacts.d.ts
deleted file mode 100644
index f780e8ca9c..0000000000
--- a/types/react-icons/ti/contacts.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiContacts extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/credit-card.d.ts b/types/react-icons/ti/credit-card.d.ts
deleted file mode 100644
index 2f05b56233..0000000000
--- a/types/react-icons/ti/credit-card.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCreditCard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/cross.d.ts b/types/react-icons/ti/cross.d.ts
deleted file mode 100644
index 5af003cf93..0000000000
--- a/types/react-icons/ti/cross.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCross extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/css3.d.ts b/types/react-icons/ti/css3.d.ts
deleted file mode 100644
index 00e79bcbce..0000000000
--- a/types/react-icons/ti/css3.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiCss3 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/database.d.ts b/types/react-icons/ti/database.d.ts
deleted file mode 100644
index 65dccc441f..0000000000
--- a/types/react-icons/ti/database.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDatabase extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/delete-outline.d.ts b/types/react-icons/ti/delete-outline.d.ts
deleted file mode 100644
index bf27aa49f9..0000000000
--- a/types/react-icons/ti/delete-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDeleteOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/delete.d.ts b/types/react-icons/ti/delete.d.ts
deleted file mode 100644
index 57791a71ab..0000000000
--- a/types/react-icons/ti/delete.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDelete extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/device-desktop.d.ts b/types/react-icons/ti/device-desktop.d.ts
deleted file mode 100644
index d405810142..0000000000
--- a/types/react-icons/ti/device-desktop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDeviceDesktop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/device-laptop.d.ts b/types/react-icons/ti/device-laptop.d.ts
deleted file mode 100644
index dada29c74f..0000000000
--- a/types/react-icons/ti/device-laptop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDeviceLaptop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/device-phone.d.ts b/types/react-icons/ti/device-phone.d.ts
deleted file mode 100644
index 977cf3f0f1..0000000000
--- a/types/react-icons/ti/device-phone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDevicePhone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/device-tablet.d.ts b/types/react-icons/ti/device-tablet.d.ts
deleted file mode 100644
index 06a9e07cca..0000000000
--- a/types/react-icons/ti/device-tablet.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDeviceTablet extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/directions.d.ts b/types/react-icons/ti/directions.d.ts
deleted file mode 100644
index 3be0928f95..0000000000
--- a/types/react-icons/ti/directions.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDirections extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/divide-outline.d.ts b/types/react-icons/ti/divide-outline.d.ts
deleted file mode 100644
index 9b30f64d2d..0000000000
--- a/types/react-icons/ti/divide-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDivideOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/divide.d.ts b/types/react-icons/ti/divide.d.ts
deleted file mode 100644
index 375a79b628..0000000000
--- a/types/react-icons/ti/divide.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDivide extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/document-add.d.ts b/types/react-icons/ti/document-add.d.ts
deleted file mode 100644
index 0b2ed20d5c..0000000000
--- a/types/react-icons/ti/document-add.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDocumentAdd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/document-delete.d.ts b/types/react-icons/ti/document-delete.d.ts
deleted file mode 100644
index 916608ade9..0000000000
--- a/types/react-icons/ti/document-delete.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDocumentDelete extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/document-text.d.ts b/types/react-icons/ti/document-text.d.ts
deleted file mode 100644
index c3af80ad89..0000000000
--- a/types/react-icons/ti/document-text.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDocumentText extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/document.d.ts b/types/react-icons/ti/document.d.ts
deleted file mode 100644
index 60ace2ba35..0000000000
--- a/types/react-icons/ti/document.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDocument extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/download-outline.d.ts b/types/react-icons/ti/download-outline.d.ts
deleted file mode 100644
index b405ad061c..0000000000
--- a/types/react-icons/ti/download-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDownloadOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/download.d.ts b/types/react-icons/ti/download.d.ts
deleted file mode 100644
index 6cf13f385b..0000000000
--- a/types/react-icons/ti/download.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDownload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/dropbox.d.ts b/types/react-icons/ti/dropbox.d.ts
deleted file mode 100644
index 000560becf..0000000000
--- a/types/react-icons/ti/dropbox.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiDropbox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/edit.d.ts b/types/react-icons/ti/edit.d.ts
deleted file mode 100644
index 7a937ccd2a..0000000000
--- a/types/react-icons/ti/edit.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiEdit extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/eject-outline.d.ts b/types/react-icons/ti/eject-outline.d.ts
deleted file mode 100644
index be15038312..0000000000
--- a/types/react-icons/ti/eject-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiEjectOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/eject.d.ts b/types/react-icons/ti/eject.d.ts
deleted file mode 100644
index 3ad5cda1c4..0000000000
--- a/types/react-icons/ti/eject.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiEject extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/equals-outline.d.ts b/types/react-icons/ti/equals-outline.d.ts
deleted file mode 100644
index 04e77346cc..0000000000
--- a/types/react-icons/ti/equals-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiEqualsOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/equals.d.ts b/types/react-icons/ti/equals.d.ts
deleted file mode 100644
index 231585549c..0000000000
--- a/types/react-icons/ti/equals.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiEquals extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/export-outline.d.ts b/types/react-icons/ti/export-outline.d.ts
deleted file mode 100644
index 4d51c29d1a..0000000000
--- a/types/react-icons/ti/export-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiExportOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/export.d.ts b/types/react-icons/ti/export.d.ts
deleted file mode 100644
index fe71d72677..0000000000
--- a/types/react-icons/ti/export.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiExport extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/eye-outline.d.ts b/types/react-icons/ti/eye-outline.d.ts
deleted file mode 100644
index 1956f13f4d..0000000000
--- a/types/react-icons/ti/eye-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiEyeOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/eye.d.ts b/types/react-icons/ti/eye.d.ts
deleted file mode 100644
index 810fdf7009..0000000000
--- a/types/react-icons/ti/eye.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiEye extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/feather.d.ts b/types/react-icons/ti/feather.d.ts
deleted file mode 100644
index b4a99ba3ec..0000000000
--- a/types/react-icons/ti/feather.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiFeather extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/film.d.ts b/types/react-icons/ti/film.d.ts
deleted file mode 100644
index a035c6378d..0000000000
--- a/types/react-icons/ti/film.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiFilm extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/filter.d.ts b/types/react-icons/ti/filter.d.ts
deleted file mode 100644
index f806a9034b..0000000000
--- a/types/react-icons/ti/filter.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiFilter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/flag-outline.d.ts b/types/react-icons/ti/flag-outline.d.ts
deleted file mode 100644
index 164b221757..0000000000
--- a/types/react-icons/ti/flag-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiFlagOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/flag.d.ts b/types/react-icons/ti/flag.d.ts
deleted file mode 100644
index 4aa2838c02..0000000000
--- a/types/react-icons/ti/flag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiFlag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/flash-outline.d.ts b/types/react-icons/ti/flash-outline.d.ts
deleted file mode 100644
index 5acea29381..0000000000
--- a/types/react-icons/ti/flash-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiFlashOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/flash.d.ts b/types/react-icons/ti/flash.d.ts
deleted file mode 100644
index 27bbe63a9d..0000000000
--- a/types/react-icons/ti/flash.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiFlash extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/flow-children.d.ts b/types/react-icons/ti/flow-children.d.ts
deleted file mode 100644
index 8e3a8a9246..0000000000
--- a/types/react-icons/ti/flow-children.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiFlowChildren extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/flow-merge.d.ts b/types/react-icons/ti/flow-merge.d.ts
deleted file mode 100644
index c479b08b53..0000000000
--- a/types/react-icons/ti/flow-merge.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiFlowMerge extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/flow-parallel.d.ts b/types/react-icons/ti/flow-parallel.d.ts
deleted file mode 100644
index 4ed94844fc..0000000000
--- a/types/react-icons/ti/flow-parallel.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiFlowParallel extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/flow-switch.d.ts b/types/react-icons/ti/flow-switch.d.ts
deleted file mode 100644
index 8a68f856fa..0000000000
--- a/types/react-icons/ti/flow-switch.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiFlowSwitch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/folder-add.d.ts b/types/react-icons/ti/folder-add.d.ts
deleted file mode 100644
index 83a709521a..0000000000
--- a/types/react-icons/ti/folder-add.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiFolderAdd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/folder-delete.d.ts b/types/react-icons/ti/folder-delete.d.ts
deleted file mode 100644
index bf96e60c12..0000000000
--- a/types/react-icons/ti/folder-delete.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiFolderDelete extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/folder-open.d.ts b/types/react-icons/ti/folder-open.d.ts
deleted file mode 100644
index 3c0f2ab47f..0000000000
--- a/types/react-icons/ti/folder-open.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiFolderOpen extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/folder.d.ts b/types/react-icons/ti/folder.d.ts
deleted file mode 100644
index b12e97b6c3..0000000000
--- a/types/react-icons/ti/folder.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiFolder extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/gift.d.ts b/types/react-icons/ti/gift.d.ts
deleted file mode 100644
index 25e13a5038..0000000000
--- a/types/react-icons/ti/gift.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiGift extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/globe-outline.d.ts b/types/react-icons/ti/globe-outline.d.ts
deleted file mode 100644
index ee4d8cbb6b..0000000000
--- a/types/react-icons/ti/globe-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiGlobeOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/globe.d.ts b/types/react-icons/ti/globe.d.ts
deleted file mode 100644
index 30912a9f17..0000000000
--- a/types/react-icons/ti/globe.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiGlobe extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/group-outline.d.ts b/types/react-icons/ti/group-outline.d.ts
deleted file mode 100644
index 621001d90e..0000000000
--- a/types/react-icons/ti/group-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiGroupOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/group.d.ts b/types/react-icons/ti/group.d.ts
deleted file mode 100644
index bb5fcf8559..0000000000
--- a/types/react-icons/ti/group.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiGroup extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/headphones.d.ts b/types/react-icons/ti/headphones.d.ts
deleted file mode 100644
index 90fb1a083f..0000000000
--- a/types/react-icons/ti/headphones.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiHeadphones extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/heart-full-outline.d.ts b/types/react-icons/ti/heart-full-outline.d.ts
deleted file mode 100644
index 8153a02133..0000000000
--- a/types/react-icons/ti/heart-full-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiHeartFullOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/heart-half-outline.d.ts b/types/react-icons/ti/heart-half-outline.d.ts
deleted file mode 100644
index 9d7482079f..0000000000
--- a/types/react-icons/ti/heart-half-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiHeartHalfOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/heart-outline.d.ts b/types/react-icons/ti/heart-outline.d.ts
deleted file mode 100644
index 77ebb5ba4d..0000000000
--- a/types/react-icons/ti/heart-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiHeartOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/heart.d.ts b/types/react-icons/ti/heart.d.ts
deleted file mode 100644
index edf26ea22d..0000000000
--- a/types/react-icons/ti/heart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiHeart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/home-outline.d.ts b/types/react-icons/ti/home-outline.d.ts
deleted file mode 100644
index aba8177146..0000000000
--- a/types/react-icons/ti/home-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiHomeOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/home.d.ts b/types/react-icons/ti/home.d.ts
deleted file mode 100644
index ffd2e0a744..0000000000
--- a/types/react-icons/ti/home.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiHome extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/html5.d.ts b/types/react-icons/ti/html5.d.ts
deleted file mode 100644
index 7850028128..0000000000
--- a/types/react-icons/ti/html5.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiHtml5 extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/image-outline.d.ts b/types/react-icons/ti/image-outline.d.ts
deleted file mode 100644
index e8dabff924..0000000000
--- a/types/react-icons/ti/image-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiImageOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/image.d.ts b/types/react-icons/ti/image.d.ts
deleted file mode 100644
index f33b613d66..0000000000
--- a/types/react-icons/ti/image.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiImage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/index.d.ts b/types/react-icons/ti/index.d.ts
deleted file mode 100644
index bbe2809f2e..0000000000
--- a/types/react-icons/ti/index.d.ts
+++ /dev/null
@@ -1,339 +0,0 @@
-export { default as TiAdjustBrightness } from "./adjust-brightness";
-export { default as TiAdjustContrast } from "./adjust-contrast";
-export { default as TiAnchorOutline } from "./anchor-outline";
-export { default as TiAnchor } from "./anchor";
-export { default as TiArchive } from "./archive";
-export { default as TiArrowBackOutline } from "./arrow-back-outline";
-export { default as TiArrowBack } from "./arrow-back";
-export { default as TiArrowDownOutline } from "./arrow-down-outline";
-export { default as TiArrowDownThick } from "./arrow-down-thick";
-export { default as TiArrowDown } from "./arrow-down";
-export { default as TiArrowForwardOutline } from "./arrow-forward-outline";
-export { default as TiArrowForward } from "./arrow-forward";
-export { default as TiArrowLeftOutline } from "./arrow-left-outline";
-export { default as TiArrowLeftThick } from "./arrow-left-thick";
-export { default as TiArrowLeft } from "./arrow-left";
-export { default as TiArrowLoopOutline } from "./arrow-loop-outline";
-export { default as TiArrowLoop } from "./arrow-loop";
-export { default as TiArrowMaximiseOutline } from "./arrow-maximise-outline";
-export { default as TiArrowMaximise } from "./arrow-maximise";
-export { default as TiArrowMinimiseOutline } from "./arrow-minimise-outline";
-export { default as TiArrowMinimise } from "./arrow-minimise";
-export { default as TiArrowMoveOutline } from "./arrow-move-outline";
-export { default as TiArrowMove } from "./arrow-move";
-export { default as TiArrowRepeatOutline } from "./arrow-repeat-outline";
-export { default as TiArrowRepeat } from "./arrow-repeat";
-export { default as TiArrowRightOutline } from "./arrow-right-outline";
-export { default as TiArrowRightThick } from "./arrow-right-thick";
-export { default as TiArrowRight } from "./arrow-right";
-export { default as TiArrowShuffle } from "./arrow-shuffle";
-export { default as TiArrowSortedDown } from "./arrow-sorted-down";
-export { default as TiArrowSortedUp } from "./arrow-sorted-up";
-export { default as TiArrowSyncOutline } from "./arrow-sync-outline";
-export { default as TiArrowSync } from "./arrow-sync";
-export { default as TiArrowUnsorted } from "./arrow-unsorted";
-export { default as TiArrowUpOutline } from "./arrow-up-outline";
-export { default as TiArrowUpThick } from "./arrow-up-thick";
-export { default as TiArrowUp } from "./arrow-up";
-export { default as TiAt } from "./at";
-export { default as TiAttachmentOutline } from "./attachment-outline";
-export { default as TiAttachment } from "./attachment";
-export { default as TiBackspaceOutline } from "./backspace-outline";
-export { default as TiBackspace } from "./backspace";
-export { default as TiBatteryCharge } from "./battery-charge";
-export { default as TiBatteryFull } from "./battery-full";
-export { default as TiBatteryHigh } from "./battery-high";
-export { default as TiBatteryLow } from "./battery-low";
-export { default as TiBatteryMid } from "./battery-mid";
-export { default as TiBeaker } from "./beaker";
-export { default as TiBeer } from "./beer";
-export { default as TiBell } from "./bell";
-export { default as TiBook } from "./book";
-export { default as TiBookmark } from "./bookmark";
-export { default as TiBriefcase } from "./briefcase";
-export { default as TiBrush } from "./brush";
-export { default as TiBusinessCard } from "./business-card";
-export { default as TiCalculator } from "./calculator";
-export { default as TiCalendarOutline } from "./calendar-outline";
-export { default as TiCalendar } from "./calendar";
-export { default as TiCalenderOutline } from "./calender-outline";
-export { default as TiCalender } from "./calender";
-export { default as TiCameraOutline } from "./camera-outline";
-export { default as TiCamera } from "./camera";
-export { default as TiCancelOutline } from "./cancel-outline";
-export { default as TiCancel } from "./cancel";
-export { default as TiChartAreaOutline } from "./chart-area-outline";
-export { default as TiChartArea } from "./chart-area";
-export { default as TiChartBarOutline } from "./chart-bar-outline";
-export { default as TiChartBar } from "./chart-bar";
-export { default as TiChartLineOutline } from "./chart-line-outline";
-export { default as TiChartLine } from "./chart-line";
-export { default as TiChartPieOutline } from "./chart-pie-outline";
-export { default as TiChartPie } from "./chart-pie";
-export { default as TiChevronLeftOutline } from "./chevron-left-outline";
-export { default as TiChevronLeft } from "./chevron-left";
-export { default as TiChevronRightOutline } from "./chevron-right-outline";
-export { default as TiChevronRight } from "./chevron-right";
-export { default as TiClipboard } from "./clipboard";
-export { default as TiCloudStorageOutline } from "./cloud-storage-outline";
-export { default as TiCloudStorage } from "./cloud-storage";
-export { default as TiCodeOutline } from "./code-outline";
-export { default as TiCode } from "./code";
-export { default as TiCoffee } from "./coffee";
-export { default as TiCogOutline } from "./cog-outline";
-export { default as TiCog } from "./cog";
-export { default as TiCompass } from "./compass";
-export { default as TiContacts } from "./contacts";
-export { default as TiCreditCard } from "./credit-card";
-export { default as TiCross } from "./cross";
-export { default as TiCss3 } from "./css3";
-export { default as TiDatabase } from "./database";
-export { default as TiDeleteOutline } from "./delete-outline";
-export { default as TiDelete } from "./delete";
-export { default as TiDeviceDesktop } from "./device-desktop";
-export { default as TiDeviceLaptop } from "./device-laptop";
-export { default as TiDevicePhone } from "./device-phone";
-export { default as TiDeviceTablet } from "./device-tablet";
-export { default as TiDirections } from "./directions";
-export { default as TiDivideOutline } from "./divide-outline";
-export { default as TiDivide } from "./divide";
-export { default as TiDocumentAdd } from "./document-add";
-export { default as TiDocumentDelete } from "./document-delete";
-export { default as TiDocumentText } from "./document-text";
-export { default as TiDocument } from "./document";
-export { default as TiDownloadOutline } from "./download-outline";
-export { default as TiDownload } from "./download";
-export { default as TiDropbox } from "./dropbox";
-export { default as TiEdit } from "./edit";
-export { default as TiEjectOutline } from "./eject-outline";
-export { default as TiEject } from "./eject";
-export { default as TiEqualsOutline } from "./equals-outline";
-export { default as TiEquals } from "./equals";
-export { default as TiExportOutline } from "./export-outline";
-export { default as TiExport } from "./export";
-export { default as TiEyeOutline } from "./eye-outline";
-export { default as TiEye } from "./eye";
-export { default as TiFeather } from "./feather";
-export { default as TiFilm } from "./film";
-export { default as TiFilter } from "./filter";
-export { default as TiFlagOutline } from "./flag-outline";
-export { default as TiFlag } from "./flag";
-export { default as TiFlashOutline } from "./flash-outline";
-export { default as TiFlash } from "./flash";
-export { default as TiFlowChildren } from "./flow-children";
-export { default as TiFlowMerge } from "./flow-merge";
-export { default as TiFlowParallel } from "./flow-parallel";
-export { default as TiFlowSwitch } from "./flow-switch";
-export { default as TiFolderAdd } from "./folder-add";
-export { default as TiFolderDelete } from "./folder-delete";
-export { default as TiFolderOpen } from "./folder-open";
-export { default as TiFolder } from "./folder";
-export { default as TiGift } from "./gift";
-export { default as TiGlobeOutline } from "./globe-outline";
-export { default as TiGlobe } from "./globe";
-export { default as TiGroupOutline } from "./group-outline";
-export { default as TiGroup } from "./group";
-export { default as TiHeadphones } from "./headphones";
-export { default as TiHeartFullOutline } from "./heart-full-outline";
-export { default as TiHeartHalfOutline } from "./heart-half-outline";
-export { default as TiHeartOutline } from "./heart-outline";
-export { default as TiHeart } from "./heart";
-export { default as TiHomeOutline } from "./home-outline";
-export { default as TiHome } from "./home";
-export { default as TiHtml5 } from "./html5";
-export { default as TiImageOutline } from "./image-outline";
-export { default as TiImage } from "./image";
-export { default as TiInfinityOutline } from "./infinity-outline";
-export { default as TiInfinity } from "./infinity";
-export { default as TiInfoLargeOutline } from "./info-large-outline";
-export { default as TiInfoLarge } from "./info-large";
-export { default as TiInfoOutline } from "./info-outline";
-export { default as TiInfo } from "./info";
-export { default as TiInputCheckedOutline } from "./input-checked-outline";
-export { default as TiInputChecked } from "./input-checked";
-export { default as TiKeyOutline } from "./key-outline";
-export { default as TiKey } from "./key";
-export { default as TiKeyboard } from "./keyboard";
-export { default as TiLeaf } from "./leaf";
-export { default as TiLightbulb } from "./lightbulb";
-export { default as TiLinkOutline } from "./link-outline";
-export { default as TiLink } from "./link";
-export { default as TiLocationArrowOutline } from "./location-arrow-outline";
-export { default as TiLocationArrow } from "./location-arrow";
-export { default as TiLocationOutline } from "./location-outline";
-export { default as TiLocation } from "./location";
-export { default as TiLockClosedOutline } from "./lock-closed-outline";
-export { default as TiLockClosed } from "./lock-closed";
-export { default as TiLockOpenOutline } from "./lock-open-outline";
-export { default as TiLockOpen } from "./lock-open";
-export { default as TiMail } from "./mail";
-export { default as TiMap } from "./map";
-export { default as TiMediaEjectOutline } from "./media-eject-outline";
-export { default as TiMediaEject } from "./media-eject";
-export { default as TiMediaFastForwardOutline } from "./media-fast-forward-outline";
-export { default as TiMediaFastForward } from "./media-fast-forward";
-export { default as TiMediaPauseOutline } from "./media-pause-outline";
-export { default as TiMediaPause } from "./media-pause";
-export { default as TiMediaPlayOutline } from "./media-play-outline";
-export { default as TiMediaPlayReverseOutline } from "./media-play-reverse-outline";
-export { default as TiMediaPlayReverse } from "./media-play-reverse";
-export { default as TiMediaPlay } from "./media-play";
-export { default as TiMediaRecordOutline } from "./media-record-outline";
-export { default as TiMediaRecord } from "./media-record";
-export { default as TiMediaRewindOutline } from "./media-rewind-outline";
-export { default as TiMediaRewind } from "./media-rewind";
-export { default as TiMediaStopOutline } from "./media-stop-outline";
-export { default as TiMediaStop } from "./media-stop";
-export { default as TiMessageTyping } from "./message-typing";
-export { default as TiMessage } from "./message";
-export { default as TiMessages } from "./messages";
-export { default as TiMicrophoneOutline } from "./microphone-outline";
-export { default as TiMicrophone } from "./microphone";
-export { default as TiMinusOutline } from "./minus-outline";
-export { default as TiMinus } from "./minus";
-export { default as TiMortarBoard } from "./mortar-board";
-export { default as TiNews } from "./news";
-export { default as TiNotesOutline } from "./notes-outline";
-export { default as TiNotes } from "./notes";
-export { default as TiPen } from "./pen";
-export { default as TiPencil } from "./pencil";
-export { default as TiPhoneOutline } from "./phone-outline";
-export { default as TiPhone } from "./phone";
-export { default as TiPiOutline } from "./pi-outline";
-export { default as TiPi } from "./pi";
-export { default as TiPinOutline } from "./pin-outline";
-export { default as TiPin } from "./pin";
-export { default as TiPipette } from "./pipette";
-export { default as TiPlaneOutline } from "./plane-outline";
-export { default as TiPlane } from "./plane";
-export { default as TiPlug } from "./plug";
-export { default as TiPlusOutline } from "./plus-outline";
-export { default as TiPlus } from "./plus";
-export { default as TiPointOfInterestOutline } from "./point-of-interest-outline";
-export { default as TiPointOfInterest } from "./point-of-interest";
-export { default as TiPowerOutline } from "./power-outline";
-export { default as TiPower } from "./power";
-export { default as TiPrinter } from "./printer";
-export { default as TiPuzzleOutline } from "./puzzle-outline";
-export { default as TiPuzzle } from "./puzzle";
-export { default as TiRadarOutline } from "./radar-outline";
-export { default as TiRadar } from "./radar";
-export { default as TiRefreshOutline } from "./refresh-outline";
-export { default as TiRefresh } from "./refresh";
-export { default as TiRssOutline } from "./rss-outline";
-export { default as TiRss } from "./rss";
-export { default as TiScissorsOutline } from "./scissors-outline";
-export { default as TiScissors } from "./scissors";
-export { default as TiShoppingBag } from "./shopping-bag";
-export { default as TiShoppingCart } from "./shopping-cart";
-export { default as TiSocialAtCircular } from "./social-at-circular";
-export { default as TiSocialDribbbleCircular } from "./social-dribbble-circular";
-export { default as TiSocialDribbble } from "./social-dribbble";
-export { default as TiSocialFacebookCircular } from "./social-facebook-circular";
-export { default as TiSocialFacebook } from "./social-facebook";
-export { default as TiSocialFlickrCircular } from "./social-flickr-circular";
-export { default as TiSocialFlickr } from "./social-flickr";
-export { default as TiSocialGithubCircular } from "./social-github-circular";
-export { default as TiSocialGithub } from "./social-github";
-export { default as TiSocialGooglePlusCircular } from "./social-google-plus-circular";
-export { default as TiSocialGooglePlus } from "./social-google-plus";
-export { default as TiSocialInstagramCircular } from "./social-instagram-circular";
-export { default as TiSocialInstagram } from "./social-instagram";
-export { default as TiSocialLastFmCircular } from "./social-last-fm-circular";
-export { default as TiSocialLastFm } from "./social-last-fm";
-export { default as TiSocialLinkedinCircular } from "./social-linkedin-circular";
-export { default as TiSocialLinkedin } from "./social-linkedin";
-export { default as TiSocialPinterestCircular } from "./social-pinterest-circular";
-export { default as TiSocialPinterest } from "./social-pinterest";
-export { default as TiSocialSkypeOutline } from "./social-skype-outline";
-export { default as TiSocialSkype } from "./social-skype";
-export { default as TiSocialTumblerCircular } from "./social-tumbler-circular";
-export { default as TiSocialTumbler } from "./social-tumbler";
-export { default as TiSocialTwitterCircular } from "./social-twitter-circular";
-export { default as TiSocialTwitter } from "./social-twitter";
-export { default as TiSocialVimeoCircular } from "./social-vimeo-circular";
-export { default as TiSocialVimeo } from "./social-vimeo";
-export { default as TiSocialYoutubeCircular } from "./social-youtube-circular";
-export { default as TiSocialYoutube } from "./social-youtube";
-export { default as TiSortAlphabeticallyOutline } from "./sort-alphabetically-outline";
-export { default as TiSortAlphabetically } from "./sort-alphabetically";
-export { default as TiSortNumericallyOutline } from "./sort-numerically-outline";
-export { default as TiSortNumerically } from "./sort-numerically";
-export { default as TiSpannerOutline } from "./spanner-outline";
-export { default as TiSpanner } from "./spanner";
-export { default as TiSpiral } from "./spiral";
-export { default as TiStarFullOutline } from "./star-full-outline";
-export { default as TiStarHalfOutline } from "./star-half-outline";
-export { default as TiStarHalf } from "./star-half";
-export { default as TiStarOutline } from "./star-outline";
-export { default as TiStar } from "./star";
-export { default as TiStarburstOutline } from "./starburst-outline";
-export { default as TiStarburst } from "./starburst";
-export { default as TiStopwatch } from "./stopwatch";
-export { default as TiSupport } from "./support";
-export { default as TiTabsOutline } from "./tabs-outline";
-export { default as TiTag } from "./tag";
-export { default as TiTags } from "./tags";
-export { default as TiThLargeOutline } from "./th-large-outline";
-export { default as TiThLarge } from "./th-large";
-export { default as TiThListOutline } from "./th-list-outline";
-export { default as TiThList } from "./th-list";
-export { default as TiThMenuOutline } from "./th-menu-outline";
-export { default as TiThMenu } from "./th-menu";
-export { default as TiThSmallOutline } from "./th-small-outline";
-export { default as TiThSmall } from "./th-small";
-export { default as TiThermometer } from "./thermometer";
-export { default as TiThumbsDown } from "./thumbs-down";
-export { default as TiThumbsOk } from "./thumbs-ok";
-export { default as TiThumbsUp } from "./thumbs-up";
-export { default as TiTickOutline } from "./tick-outline";
-export { default as TiTick } from "./tick";
-export { default as TiTicket } from "./ticket";
-export { default as TiTime } from "./time";
-export { default as TiTimesOutline } from "./times-outline";
-export { default as TiTimes } from "./times";
-export { default as TiTrash } from "./trash";
-export { default as TiTree } from "./tree";
-export { default as TiUploadOutline } from "./upload-outline";
-export { default as TiUpload } from "./upload";
-export { default as TiUserAddOutline } from "./user-add-outline";
-export { default as TiUserAdd } from "./user-add";
-export { default as TiUserDeleteOutline } from "./user-delete-outline";
-export { default as TiUserDelete } from "./user-delete";
-export { default as TiUserOutline } from "./user-outline";
-export { default as TiUser } from "./user";
-export { default as TiVendorAndroid } from "./vendor-android";
-export { default as TiVendorApple } from "./vendor-apple";
-export { default as TiVendorMicrosoft } from "./vendor-microsoft";
-export { default as TiVideoOutline } from "./video-outline";
-export { default as TiVideo } from "./video";
-export { default as TiVolumeDown } from "./volume-down";
-export { default as TiVolumeMute } from "./volume-mute";
-export { default as TiVolumeUp } from "./volume-up";
-export { default as TiVolume } from "./volume";
-export { default as TiWarningOutline } from "./warning-outline";
-export { default as TiWarning } from "./warning";
-export { default as TiWatch } from "./watch";
-export { default as TiWavesOutline } from "./waves-outline";
-export { default as TiWaves } from "./waves";
-export { default as TiWeatherCloudy } from "./weather-cloudy";
-export { default as TiWeatherDownpour } from "./weather-downpour";
-export { default as TiWeatherNight } from "./weather-night";
-export { default as TiWeatherPartlySunny } from "./weather-partly-sunny";
-export { default as TiWeatherShower } from "./weather-shower";
-export { default as TiWeatherSnow } from "./weather-snow";
-export { default as TiWeatherStormy } from "./weather-stormy";
-export { default as TiWeatherSunny } from "./weather-sunny";
-export { default as TiWeatherWindyCloudy } from "./weather-windy-cloudy";
-export { default as TiWeatherWindy } from "./weather-windy";
-export { default as TiWiFiOutline } from "./wi-fi-outline";
-export { default as TiWiFi } from "./wi-fi";
-export { default as TiWine } from "./wine";
-export { default as TiWorldOutline } from "./world-outline";
-export { default as TiWorld } from "./world";
-export { default as TiZoomInOutline } from "./zoom-in-outline";
-export { default as TiZoomIn } from "./zoom-in";
-export { default as TiZoomOutOutline } from "./zoom-out-outline";
-export { default as TiZoomOut } from "./zoom-out";
-export { default as TiZoomOutline } from "./zoom-outline";
-export { default as TiZoom } from "./zoom";
diff --git a/types/react-icons/ti/infinity-outline.d.ts b/types/react-icons/ti/infinity-outline.d.ts
deleted file mode 100644
index 396db6cef4..0000000000
--- a/types/react-icons/ti/infinity-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiInfinityOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/infinity.d.ts b/types/react-icons/ti/infinity.d.ts
deleted file mode 100644
index e2e330678f..0000000000
--- a/types/react-icons/ti/infinity.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiInfinity extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/info-large-outline.d.ts b/types/react-icons/ti/info-large-outline.d.ts
deleted file mode 100644
index 3ff6a8be6c..0000000000
--- a/types/react-icons/ti/info-large-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiInfoLargeOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/info-large.d.ts b/types/react-icons/ti/info-large.d.ts
deleted file mode 100644
index 0ad4eb3b6a..0000000000
--- a/types/react-icons/ti/info-large.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiInfoLarge extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/info-outline.d.ts b/types/react-icons/ti/info-outline.d.ts
deleted file mode 100644
index b80e266196..0000000000
--- a/types/react-icons/ti/info-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiInfoOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/info.d.ts b/types/react-icons/ti/info.d.ts
deleted file mode 100644
index ec2cd25bdf..0000000000
--- a/types/react-icons/ti/info.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiInfo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/input-checked-outline.d.ts b/types/react-icons/ti/input-checked-outline.d.ts
deleted file mode 100644
index 91f4f396a0..0000000000
--- a/types/react-icons/ti/input-checked-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiInputCheckedOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/input-checked.d.ts b/types/react-icons/ti/input-checked.d.ts
deleted file mode 100644
index beb1227d76..0000000000
--- a/types/react-icons/ti/input-checked.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiInputChecked extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/key-outline.d.ts b/types/react-icons/ti/key-outline.d.ts
deleted file mode 100644
index 0a2cac24a7..0000000000
--- a/types/react-icons/ti/key-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiKeyOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/key.d.ts b/types/react-icons/ti/key.d.ts
deleted file mode 100644
index c167c86f85..0000000000
--- a/types/react-icons/ti/key.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiKey extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/keyboard.d.ts b/types/react-icons/ti/keyboard.d.ts
deleted file mode 100644
index c936d0245d..0000000000
--- a/types/react-icons/ti/keyboard.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiKeyboard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/leaf.d.ts b/types/react-icons/ti/leaf.d.ts
deleted file mode 100644
index 7b34567dde..0000000000
--- a/types/react-icons/ti/leaf.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiLeaf extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/lightbulb.d.ts b/types/react-icons/ti/lightbulb.d.ts
deleted file mode 100644
index 389a15ff3e..0000000000
--- a/types/react-icons/ti/lightbulb.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiLightbulb extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/link-outline.d.ts b/types/react-icons/ti/link-outline.d.ts
deleted file mode 100644
index 8aec8924d9..0000000000
--- a/types/react-icons/ti/link-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiLinkOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/link.d.ts b/types/react-icons/ti/link.d.ts
deleted file mode 100644
index 7de0129e97..0000000000
--- a/types/react-icons/ti/link.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiLink extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/location-arrow-outline.d.ts b/types/react-icons/ti/location-arrow-outline.d.ts
deleted file mode 100644
index be73bc68bb..0000000000
--- a/types/react-icons/ti/location-arrow-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiLocationArrowOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/location-arrow.d.ts b/types/react-icons/ti/location-arrow.d.ts
deleted file mode 100644
index c9fca74a46..0000000000
--- a/types/react-icons/ti/location-arrow.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiLocationArrow extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/location-outline.d.ts b/types/react-icons/ti/location-outline.d.ts
deleted file mode 100644
index 5e33402d00..0000000000
--- a/types/react-icons/ti/location-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiLocationOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/location.d.ts b/types/react-icons/ti/location.d.ts
deleted file mode 100644
index 4b2ad147b6..0000000000
--- a/types/react-icons/ti/location.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiLocation extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/lock-closed-outline.d.ts b/types/react-icons/ti/lock-closed-outline.d.ts
deleted file mode 100644
index df9d6ffaad..0000000000
--- a/types/react-icons/ti/lock-closed-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiLockClosedOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/lock-closed.d.ts b/types/react-icons/ti/lock-closed.d.ts
deleted file mode 100644
index 234cc40580..0000000000
--- a/types/react-icons/ti/lock-closed.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiLockClosed extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/lock-open-outline.d.ts b/types/react-icons/ti/lock-open-outline.d.ts
deleted file mode 100644
index 380878a869..0000000000
--- a/types/react-icons/ti/lock-open-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiLockOpenOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/lock-open.d.ts b/types/react-icons/ti/lock-open.d.ts
deleted file mode 100644
index c4b51c68ee..0000000000
--- a/types/react-icons/ti/lock-open.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiLockOpen extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/mail.d.ts b/types/react-icons/ti/mail.d.ts
deleted file mode 100644
index 34979f6b13..0000000000
--- a/types/react-icons/ti/mail.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMail extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/map.d.ts b/types/react-icons/ti/map.d.ts
deleted file mode 100644
index 8b8092f4e7..0000000000
--- a/types/react-icons/ti/map.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMap extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-eject-outline.d.ts b/types/react-icons/ti/media-eject-outline.d.ts
deleted file mode 100644
index d58fadb21b..0000000000
--- a/types/react-icons/ti/media-eject-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaEjectOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-eject.d.ts b/types/react-icons/ti/media-eject.d.ts
deleted file mode 100644
index 41a9baaea8..0000000000
--- a/types/react-icons/ti/media-eject.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaEject extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-fast-forward-outline.d.ts b/types/react-icons/ti/media-fast-forward-outline.d.ts
deleted file mode 100644
index 8923d0fa44..0000000000
--- a/types/react-icons/ti/media-fast-forward-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaFastForwardOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-fast-forward.d.ts b/types/react-icons/ti/media-fast-forward.d.ts
deleted file mode 100644
index e53638bf62..0000000000
--- a/types/react-icons/ti/media-fast-forward.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaFastForward extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-pause-outline.d.ts b/types/react-icons/ti/media-pause-outline.d.ts
deleted file mode 100644
index e792f0c894..0000000000
--- a/types/react-icons/ti/media-pause-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPauseOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-pause.d.ts b/types/react-icons/ti/media-pause.d.ts
deleted file mode 100644
index b24950b19c..0000000000
--- a/types/react-icons/ti/media-pause.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPause extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-play-outline.d.ts b/types/react-icons/ti/media-play-outline.d.ts
deleted file mode 100644
index 8e024e323f..0000000000
--- a/types/react-icons/ti/media-play-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPlayOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-play-reverse-outline.d.ts b/types/react-icons/ti/media-play-reverse-outline.d.ts
deleted file mode 100644
index 5594d646d8..0000000000
--- a/types/react-icons/ti/media-play-reverse-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPlayReverseOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-play-reverse.d.ts b/types/react-icons/ti/media-play-reverse.d.ts
deleted file mode 100644
index 26e71c1733..0000000000
--- a/types/react-icons/ti/media-play-reverse.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPlayReverse extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-play.d.ts b/types/react-icons/ti/media-play.d.ts
deleted file mode 100644
index defa546ee7..0000000000
--- a/types/react-icons/ti/media-play.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPlay extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-record-outline.d.ts b/types/react-icons/ti/media-record-outline.d.ts
deleted file mode 100644
index 0761437451..0000000000
--- a/types/react-icons/ti/media-record-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaRecordOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-record.d.ts b/types/react-icons/ti/media-record.d.ts
deleted file mode 100644
index d924b105b6..0000000000
--- a/types/react-icons/ti/media-record.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaRecord extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-rewind-outline.d.ts b/types/react-icons/ti/media-rewind-outline.d.ts
deleted file mode 100644
index 11de328095..0000000000
--- a/types/react-icons/ti/media-rewind-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaRewindOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-rewind.d.ts b/types/react-icons/ti/media-rewind.d.ts
deleted file mode 100644
index f0e7151590..0000000000
--- a/types/react-icons/ti/media-rewind.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaRewind extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-stop-outline.d.ts b/types/react-icons/ti/media-stop-outline.d.ts
deleted file mode 100644
index e8728ac857..0000000000
--- a/types/react-icons/ti/media-stop-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaStopOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/media-stop.d.ts b/types/react-icons/ti/media-stop.d.ts
deleted file mode 100644
index d38b31aa5a..0000000000
--- a/types/react-icons/ti/media-stop.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaStop extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/message-typing.d.ts b/types/react-icons/ti/message-typing.d.ts
deleted file mode 100644
index 2cb5497a4e..0000000000
--- a/types/react-icons/ti/message-typing.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMessageTyping extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/message.d.ts b/types/react-icons/ti/message.d.ts
deleted file mode 100644
index 9edcc4226a..0000000000
--- a/types/react-icons/ti/message.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMessage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/messages.d.ts b/types/react-icons/ti/messages.d.ts
deleted file mode 100644
index e21fdac0a4..0000000000
--- a/types/react-icons/ti/messages.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMessages extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/microphone-outline.d.ts b/types/react-icons/ti/microphone-outline.d.ts
deleted file mode 100644
index 27e430bd72..0000000000
--- a/types/react-icons/ti/microphone-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMicrophoneOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/microphone.d.ts b/types/react-icons/ti/microphone.d.ts
deleted file mode 100644
index 543db1b50a..0000000000
--- a/types/react-icons/ti/microphone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMicrophone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/minus-outline.d.ts b/types/react-icons/ti/minus-outline.d.ts
deleted file mode 100644
index 99bb9fa7df..0000000000
--- a/types/react-icons/ti/minus-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMinusOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/minus.d.ts b/types/react-icons/ti/minus.d.ts
deleted file mode 100644
index 6239684cfa..0000000000
--- a/types/react-icons/ti/minus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMinus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/mortar-board.d.ts b/types/react-icons/ti/mortar-board.d.ts
deleted file mode 100644
index 84d29d2b24..0000000000
--- a/types/react-icons/ti/mortar-board.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiMortarBoard extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/news.d.ts b/types/react-icons/ti/news.d.ts
deleted file mode 100644
index 31c3f66c1e..0000000000
--- a/types/react-icons/ti/news.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiNews extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/notes-outline.d.ts b/types/react-icons/ti/notes-outline.d.ts
deleted file mode 100644
index 4613ba38af..0000000000
--- a/types/react-icons/ti/notes-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiNotesOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/notes.d.ts b/types/react-icons/ti/notes.d.ts
deleted file mode 100644
index 5d2b4160f1..0000000000
--- a/types/react-icons/ti/notes.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiNotes extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/pen.d.ts b/types/react-icons/ti/pen.d.ts
deleted file mode 100644
index 79b4e72f1a..0000000000
--- a/types/react-icons/ti/pen.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPen extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/pencil.d.ts b/types/react-icons/ti/pencil.d.ts
deleted file mode 100644
index b8726f9010..0000000000
--- a/types/react-icons/ti/pencil.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPencil extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/phone-outline.d.ts b/types/react-icons/ti/phone-outline.d.ts
deleted file mode 100644
index d84b152351..0000000000
--- a/types/react-icons/ti/phone-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPhoneOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/phone.d.ts b/types/react-icons/ti/phone.d.ts
deleted file mode 100644
index af3eb027a1..0000000000
--- a/types/react-icons/ti/phone.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPhone extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/pi-outline.d.ts b/types/react-icons/ti/pi-outline.d.ts
deleted file mode 100644
index 4327e47c3d..0000000000
--- a/types/react-icons/ti/pi-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPiOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/pi.d.ts b/types/react-icons/ti/pi.d.ts
deleted file mode 100644
index d68aefa610..0000000000
--- a/types/react-icons/ti/pi.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPi extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/pin-outline.d.ts b/types/react-icons/ti/pin-outline.d.ts
deleted file mode 100644
index 5a8943532e..0000000000
--- a/types/react-icons/ti/pin-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPinOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/pin.d.ts b/types/react-icons/ti/pin.d.ts
deleted file mode 100644
index 8d887edc98..0000000000
--- a/types/react-icons/ti/pin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/pipette.d.ts b/types/react-icons/ti/pipette.d.ts
deleted file mode 100644
index 4f48d8afd3..0000000000
--- a/types/react-icons/ti/pipette.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPipette extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/plane-outline.d.ts b/types/react-icons/ti/plane-outline.d.ts
deleted file mode 100644
index ea4ac38deb..0000000000
--- a/types/react-icons/ti/plane-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPlaneOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/plane.d.ts b/types/react-icons/ti/plane.d.ts
deleted file mode 100644
index 13e32cab40..0000000000
--- a/types/react-icons/ti/plane.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPlane extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/plug.d.ts b/types/react-icons/ti/plug.d.ts
deleted file mode 100644
index 019e4adc15..0000000000
--- a/types/react-icons/ti/plug.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPlug extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/plus-outline.d.ts b/types/react-icons/ti/plus-outline.d.ts
deleted file mode 100644
index 22ec83aedd..0000000000
--- a/types/react-icons/ti/plus-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPlusOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/plus.d.ts b/types/react-icons/ti/plus.d.ts
deleted file mode 100644
index 247f279571..0000000000
--- a/types/react-icons/ti/plus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPlus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/point-of-interest-outline.d.ts b/types/react-icons/ti/point-of-interest-outline.d.ts
deleted file mode 100644
index 63cfa579e5..0000000000
--- a/types/react-icons/ti/point-of-interest-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPointOfInterestOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/point-of-interest.d.ts b/types/react-icons/ti/point-of-interest.d.ts
deleted file mode 100644
index a5d480400c..0000000000
--- a/types/react-icons/ti/point-of-interest.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPointOfInterest extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/power-outline.d.ts b/types/react-icons/ti/power-outline.d.ts
deleted file mode 100644
index 52f6a2262c..0000000000
--- a/types/react-icons/ti/power-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPowerOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/power.d.ts b/types/react-icons/ti/power.d.ts
deleted file mode 100644
index 64dfece1af..0000000000
--- a/types/react-icons/ti/power.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPower extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/printer.d.ts b/types/react-icons/ti/printer.d.ts
deleted file mode 100644
index 556a9f07db..0000000000
--- a/types/react-icons/ti/printer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPrinter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/puzzle-outline.d.ts b/types/react-icons/ti/puzzle-outline.d.ts
deleted file mode 100644
index 4a7341192a..0000000000
--- a/types/react-icons/ti/puzzle-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPuzzleOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/puzzle.d.ts b/types/react-icons/ti/puzzle.d.ts
deleted file mode 100644
index a0c57f6b0e..0000000000
--- a/types/react-icons/ti/puzzle.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiPuzzle extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/radar-outline.d.ts b/types/react-icons/ti/radar-outline.d.ts
deleted file mode 100644
index aad8289852..0000000000
--- a/types/react-icons/ti/radar-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiRadarOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/radar.d.ts b/types/react-icons/ti/radar.d.ts
deleted file mode 100644
index b98c278714..0000000000
--- a/types/react-icons/ti/radar.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiRadar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/refresh-outline.d.ts b/types/react-icons/ti/refresh-outline.d.ts
deleted file mode 100644
index 38d77c5598..0000000000
--- a/types/react-icons/ti/refresh-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiRefreshOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/refresh.d.ts b/types/react-icons/ti/refresh.d.ts
deleted file mode 100644
index 6aeba2082a..0000000000
--- a/types/react-icons/ti/refresh.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiRefresh extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/rss-outline.d.ts b/types/react-icons/ti/rss-outline.d.ts
deleted file mode 100644
index 0b31e05198..0000000000
--- a/types/react-icons/ti/rss-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiRssOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/rss.d.ts b/types/react-icons/ti/rss.d.ts
deleted file mode 100644
index 13f61bf841..0000000000
--- a/types/react-icons/ti/rss.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiRss extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/scissors-outline.d.ts b/types/react-icons/ti/scissors-outline.d.ts
deleted file mode 100644
index 82b195b7bd..0000000000
--- a/types/react-icons/ti/scissors-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiScissorsOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/scissors.d.ts b/types/react-icons/ti/scissors.d.ts
deleted file mode 100644
index da6f78e767..0000000000
--- a/types/react-icons/ti/scissors.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiScissors extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/shopping-bag.d.ts b/types/react-icons/ti/shopping-bag.d.ts
deleted file mode 100644
index 6de75d8f81..0000000000
--- a/types/react-icons/ti/shopping-bag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiShoppingBag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/shopping-cart.d.ts b/types/react-icons/ti/shopping-cart.d.ts
deleted file mode 100644
index 2364dc03ba..0000000000
--- a/types/react-icons/ti/shopping-cart.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiShoppingCart extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-at-circular.d.ts b/types/react-icons/ti/social-at-circular.d.ts
deleted file mode 100644
index 2c2fcee614..0000000000
--- a/types/react-icons/ti/social-at-circular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialAtCircular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-dribbble-circular.d.ts b/types/react-icons/ti/social-dribbble-circular.d.ts
deleted file mode 100644
index 7e7ddc450a..0000000000
--- a/types/react-icons/ti/social-dribbble-circular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialDribbbleCircular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-dribbble.d.ts b/types/react-icons/ti/social-dribbble.d.ts
deleted file mode 100644
index b47018320f..0000000000
--- a/types/react-icons/ti/social-dribbble.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialDribbble extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-facebook-circular.d.ts b/types/react-icons/ti/social-facebook-circular.d.ts
deleted file mode 100644
index e9863905d3..0000000000
--- a/types/react-icons/ti/social-facebook-circular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialFacebookCircular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-facebook.d.ts b/types/react-icons/ti/social-facebook.d.ts
deleted file mode 100644
index 982ae3d78c..0000000000
--- a/types/react-icons/ti/social-facebook.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialFacebook extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-flickr-circular.d.ts b/types/react-icons/ti/social-flickr-circular.d.ts
deleted file mode 100644
index 4c7b97dce4..0000000000
--- a/types/react-icons/ti/social-flickr-circular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialFlickrCircular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-flickr.d.ts b/types/react-icons/ti/social-flickr.d.ts
deleted file mode 100644
index ab945e0965..0000000000
--- a/types/react-icons/ti/social-flickr.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialFlickr extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-github-circular.d.ts b/types/react-icons/ti/social-github-circular.d.ts
deleted file mode 100644
index 1db20eba35..0000000000
--- a/types/react-icons/ti/social-github-circular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialGithubCircular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-github.d.ts b/types/react-icons/ti/social-github.d.ts
deleted file mode 100644
index d2f3b8f628..0000000000
--- a/types/react-icons/ti/social-github.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialGithub extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-google-plus-circular.d.ts b/types/react-icons/ti/social-google-plus-circular.d.ts
deleted file mode 100644
index 7fd96cf1b4..0000000000
--- a/types/react-icons/ti/social-google-plus-circular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialGooglePlusCircular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-google-plus.d.ts b/types/react-icons/ti/social-google-plus.d.ts
deleted file mode 100644
index 977e3bb738..0000000000
--- a/types/react-icons/ti/social-google-plus.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialGooglePlus extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-instagram-circular.d.ts b/types/react-icons/ti/social-instagram-circular.d.ts
deleted file mode 100644
index ef7e9ea9f1..0000000000
--- a/types/react-icons/ti/social-instagram-circular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialInstagramCircular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-instagram.d.ts b/types/react-icons/ti/social-instagram.d.ts
deleted file mode 100644
index ff4d5d3346..0000000000
--- a/types/react-icons/ti/social-instagram.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialInstagram extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-last-fm-circular.d.ts b/types/react-icons/ti/social-last-fm-circular.d.ts
deleted file mode 100644
index 38e8fc08be..0000000000
--- a/types/react-icons/ti/social-last-fm-circular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialLastFmCircular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-last-fm.d.ts b/types/react-icons/ti/social-last-fm.d.ts
deleted file mode 100644
index fde2b626cc..0000000000
--- a/types/react-icons/ti/social-last-fm.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialLastFm extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-linkedin-circular.d.ts b/types/react-icons/ti/social-linkedin-circular.d.ts
deleted file mode 100644
index 32b5ba1add..0000000000
--- a/types/react-icons/ti/social-linkedin-circular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialLinkedinCircular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-linkedin.d.ts b/types/react-icons/ti/social-linkedin.d.ts
deleted file mode 100644
index 6a4f1b264b..0000000000
--- a/types/react-icons/ti/social-linkedin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialLinkedin extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-pinterest-circular.d.ts b/types/react-icons/ti/social-pinterest-circular.d.ts
deleted file mode 100644
index 4278c08e25..0000000000
--- a/types/react-icons/ti/social-pinterest-circular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialPinterestCircular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-pinterest.d.ts b/types/react-icons/ti/social-pinterest.d.ts
deleted file mode 100644
index 1544d9d0ff..0000000000
--- a/types/react-icons/ti/social-pinterest.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialPinterest extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-skype-outline.d.ts b/types/react-icons/ti/social-skype-outline.d.ts
deleted file mode 100644
index 7bc87167e4..0000000000
--- a/types/react-icons/ti/social-skype-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialSkypeOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-skype.d.ts b/types/react-icons/ti/social-skype.d.ts
deleted file mode 100644
index 1c62817e98..0000000000
--- a/types/react-icons/ti/social-skype.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialSkype extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-tumbler-circular.d.ts b/types/react-icons/ti/social-tumbler-circular.d.ts
deleted file mode 100644
index 1d5823a418..0000000000
--- a/types/react-icons/ti/social-tumbler-circular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialTumblerCircular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-tumbler.d.ts b/types/react-icons/ti/social-tumbler.d.ts
deleted file mode 100644
index 25826e8f98..0000000000
--- a/types/react-icons/ti/social-tumbler.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialTumbler extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-twitter-circular.d.ts b/types/react-icons/ti/social-twitter-circular.d.ts
deleted file mode 100644
index 951a8a90ac..0000000000
--- a/types/react-icons/ti/social-twitter-circular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialTwitterCircular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-twitter.d.ts b/types/react-icons/ti/social-twitter.d.ts
deleted file mode 100644
index 2f5d6e6fe2..0000000000
--- a/types/react-icons/ti/social-twitter.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialTwitter extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-vimeo-circular.d.ts b/types/react-icons/ti/social-vimeo-circular.d.ts
deleted file mode 100644
index a161f647e2..0000000000
--- a/types/react-icons/ti/social-vimeo-circular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialVimeoCircular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-vimeo.d.ts b/types/react-icons/ti/social-vimeo.d.ts
deleted file mode 100644
index 20a6fe4e96..0000000000
--- a/types/react-icons/ti/social-vimeo.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialVimeo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-youtube-circular.d.ts b/types/react-icons/ti/social-youtube-circular.d.ts
deleted file mode 100644
index 5373438d05..0000000000
--- a/types/react-icons/ti/social-youtube-circular.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialYoutubeCircular extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/social-youtube.d.ts b/types/react-icons/ti/social-youtube.d.ts
deleted file mode 100644
index 6040ccbd2e..0000000000
--- a/types/react-icons/ti/social-youtube.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialYoutube extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/sort-alphabetically-outline.d.ts b/types/react-icons/ti/sort-alphabetically-outline.d.ts
deleted file mode 100644
index b822906e2c..0000000000
--- a/types/react-icons/ti/sort-alphabetically-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSortAlphabeticallyOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/sort-alphabetically.d.ts b/types/react-icons/ti/sort-alphabetically.d.ts
deleted file mode 100644
index 75a9622393..0000000000
--- a/types/react-icons/ti/sort-alphabetically.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSortAlphabetically extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/sort-numerically-outline.d.ts b/types/react-icons/ti/sort-numerically-outline.d.ts
deleted file mode 100644
index e279726f0c..0000000000
--- a/types/react-icons/ti/sort-numerically-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSortNumericallyOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/sort-numerically.d.ts b/types/react-icons/ti/sort-numerically.d.ts
deleted file mode 100644
index d514d789f3..0000000000
--- a/types/react-icons/ti/sort-numerically.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSortNumerically extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/spanner-outline.d.ts b/types/react-icons/ti/spanner-outline.d.ts
deleted file mode 100644
index 424e07581a..0000000000
--- a/types/react-icons/ti/spanner-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSpannerOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/spanner.d.ts b/types/react-icons/ti/spanner.d.ts
deleted file mode 100644
index bcfc2421d2..0000000000
--- a/types/react-icons/ti/spanner.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSpanner extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/spiral.d.ts b/types/react-icons/ti/spiral.d.ts
deleted file mode 100644
index f35df30ad0..0000000000
--- a/types/react-icons/ti/spiral.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSpiral extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/star-full-outline.d.ts b/types/react-icons/ti/star-full-outline.d.ts
deleted file mode 100644
index f1c40795ae..0000000000
--- a/types/react-icons/ti/star-full-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiStarFullOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/star-half-outline.d.ts b/types/react-icons/ti/star-half-outline.d.ts
deleted file mode 100644
index 4e93ae767e..0000000000
--- a/types/react-icons/ti/star-half-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiStarHalfOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/star-half.d.ts b/types/react-icons/ti/star-half.d.ts
deleted file mode 100644
index b9409290f7..0000000000
--- a/types/react-icons/ti/star-half.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiStarHalf extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/star-outline.d.ts b/types/react-icons/ti/star-outline.d.ts
deleted file mode 100644
index c5c504aec6..0000000000
--- a/types/react-icons/ti/star-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiStarOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/star.d.ts b/types/react-icons/ti/star.d.ts
deleted file mode 100644
index 6c7cfe125b..0000000000
--- a/types/react-icons/ti/star.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiStar extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/starburst-outline.d.ts b/types/react-icons/ti/starburst-outline.d.ts
deleted file mode 100644
index 621a50c206..0000000000
--- a/types/react-icons/ti/starburst-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiStarburstOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/starburst.d.ts b/types/react-icons/ti/starburst.d.ts
deleted file mode 100644
index 5deb65f908..0000000000
--- a/types/react-icons/ti/starburst.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiStarburst extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/stopwatch.d.ts b/types/react-icons/ti/stopwatch.d.ts
deleted file mode 100644
index 2433dc6b21..0000000000
--- a/types/react-icons/ti/stopwatch.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiStopwatch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/support.d.ts b/types/react-icons/ti/support.d.ts
deleted file mode 100644
index 629e7c1596..0000000000
--- a/types/react-icons/ti/support.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiSupport extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/tabs-outline.d.ts b/types/react-icons/ti/tabs-outline.d.ts
deleted file mode 100644
index a3debbbc0a..0000000000
--- a/types/react-icons/ti/tabs-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiTabsOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/tag.d.ts b/types/react-icons/ti/tag.d.ts
deleted file mode 100644
index ec88c4ff81..0000000000
--- a/types/react-icons/ti/tag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiTag extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/tags.d.ts b/types/react-icons/ti/tags.d.ts
deleted file mode 100644
index a0e4a1a154..0000000000
--- a/types/react-icons/ti/tags.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiTags extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/th-large-outline.d.ts b/types/react-icons/ti/th-large-outline.d.ts
deleted file mode 100644
index 652b61667c..0000000000
--- a/types/react-icons/ti/th-large-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiThLargeOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/th-large.d.ts b/types/react-icons/ti/th-large.d.ts
deleted file mode 100644
index bde15e269a..0000000000
--- a/types/react-icons/ti/th-large.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiThLarge extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/th-list-outline.d.ts b/types/react-icons/ti/th-list-outline.d.ts
deleted file mode 100644
index a906b52c05..0000000000
--- a/types/react-icons/ti/th-list-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiThListOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/th-list.d.ts b/types/react-icons/ti/th-list.d.ts
deleted file mode 100644
index ebb6163713..0000000000
--- a/types/react-icons/ti/th-list.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiThList extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/th-menu-outline.d.ts b/types/react-icons/ti/th-menu-outline.d.ts
deleted file mode 100644
index df09e4456f..0000000000
--- a/types/react-icons/ti/th-menu-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiThMenuOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/th-menu.d.ts b/types/react-icons/ti/th-menu.d.ts
deleted file mode 100644
index e03eadc959..0000000000
--- a/types/react-icons/ti/th-menu.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiThMenu extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/th-small-outline.d.ts b/types/react-icons/ti/th-small-outline.d.ts
deleted file mode 100644
index 995c8c1f88..0000000000
--- a/types/react-icons/ti/th-small-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiThSmallOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/th-small.d.ts b/types/react-icons/ti/th-small.d.ts
deleted file mode 100644
index 332f49b3f1..0000000000
--- a/types/react-icons/ti/th-small.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiThSmall extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/thermometer.d.ts b/types/react-icons/ti/thermometer.d.ts
deleted file mode 100644
index 771653ad7b..0000000000
--- a/types/react-icons/ti/thermometer.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiThermometer extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/thumbs-down.d.ts b/types/react-icons/ti/thumbs-down.d.ts
deleted file mode 100644
index bb60d7aaa9..0000000000
--- a/types/react-icons/ti/thumbs-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiThumbsDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/thumbs-ok.d.ts b/types/react-icons/ti/thumbs-ok.d.ts
deleted file mode 100644
index 610f5a2633..0000000000
--- a/types/react-icons/ti/thumbs-ok.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiThumbsOk extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/thumbs-up.d.ts b/types/react-icons/ti/thumbs-up.d.ts
deleted file mode 100644
index 01747a7a8b..0000000000
--- a/types/react-icons/ti/thumbs-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiThumbsUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/tick-outline.d.ts b/types/react-icons/ti/tick-outline.d.ts
deleted file mode 100644
index 8c8fd0025c..0000000000
--- a/types/react-icons/ti/tick-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiTickOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/tick.d.ts b/types/react-icons/ti/tick.d.ts
deleted file mode 100644
index fc06a6fe51..0000000000
--- a/types/react-icons/ti/tick.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiTick extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/ticket.d.ts b/types/react-icons/ti/ticket.d.ts
deleted file mode 100644
index 3248f1018c..0000000000
--- a/types/react-icons/ti/ticket.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiTicket extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/time.d.ts b/types/react-icons/ti/time.d.ts
deleted file mode 100644
index fd09903b66..0000000000
--- a/types/react-icons/ti/time.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiTime extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/times-outline.d.ts b/types/react-icons/ti/times-outline.d.ts
deleted file mode 100644
index 52fd65e3ba..0000000000
--- a/types/react-icons/ti/times-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiTimesOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/times.d.ts b/types/react-icons/ti/times.d.ts
deleted file mode 100644
index 1b60d77610..0000000000
--- a/types/react-icons/ti/times.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiTimes extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/trash.d.ts b/types/react-icons/ti/trash.d.ts
deleted file mode 100644
index 2772532c76..0000000000
--- a/types/react-icons/ti/trash.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiTrash extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/tree.d.ts b/types/react-icons/ti/tree.d.ts
deleted file mode 100644
index a0f46de32e..0000000000
--- a/types/react-icons/ti/tree.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiTree extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/upload-outline.d.ts b/types/react-icons/ti/upload-outline.d.ts
deleted file mode 100644
index 541435783e..0000000000
--- a/types/react-icons/ti/upload-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiUploadOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/upload.d.ts b/types/react-icons/ti/upload.d.ts
deleted file mode 100644
index 5875c4576b..0000000000
--- a/types/react-icons/ti/upload.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiUpload extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/user-add-outline.d.ts b/types/react-icons/ti/user-add-outline.d.ts
deleted file mode 100644
index 80590bcdaa..0000000000
--- a/types/react-icons/ti/user-add-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiUserAddOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/user-add.d.ts b/types/react-icons/ti/user-add.d.ts
deleted file mode 100644
index 18d297cb33..0000000000
--- a/types/react-icons/ti/user-add.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiUserAdd extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/user-delete-outline.d.ts b/types/react-icons/ti/user-delete-outline.d.ts
deleted file mode 100644
index 19f98f8eed..0000000000
--- a/types/react-icons/ti/user-delete-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiUserDeleteOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/user-delete.d.ts b/types/react-icons/ti/user-delete.d.ts
deleted file mode 100644
index 2c12847a35..0000000000
--- a/types/react-icons/ti/user-delete.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiUserDelete extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/user-outline.d.ts b/types/react-icons/ti/user-outline.d.ts
deleted file mode 100644
index 64e4678e0c..0000000000
--- a/types/react-icons/ti/user-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiUserOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/user.d.ts b/types/react-icons/ti/user.d.ts
deleted file mode 100644
index a333a43892..0000000000
--- a/types/react-icons/ti/user.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiUser extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/vendor-android.d.ts b/types/react-icons/ti/vendor-android.d.ts
deleted file mode 100644
index 8075011cff..0000000000
--- a/types/react-icons/ti/vendor-android.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiVendorAndroid extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/vendor-apple.d.ts b/types/react-icons/ti/vendor-apple.d.ts
deleted file mode 100644
index d100e9de7f..0000000000
--- a/types/react-icons/ti/vendor-apple.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiVendorApple extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/vendor-microsoft.d.ts b/types/react-icons/ti/vendor-microsoft.d.ts
deleted file mode 100644
index fc2393f6c8..0000000000
--- a/types/react-icons/ti/vendor-microsoft.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiVendorMicrosoft extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/video-outline.d.ts b/types/react-icons/ti/video-outline.d.ts
deleted file mode 100644
index ff4ded254c..0000000000
--- a/types/react-icons/ti/video-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiVideoOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/video.d.ts b/types/react-icons/ti/video.d.ts
deleted file mode 100644
index 59503c717e..0000000000
--- a/types/react-icons/ti/video.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiVideo extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/volume-down.d.ts b/types/react-icons/ti/volume-down.d.ts
deleted file mode 100644
index cd012e5287..0000000000
--- a/types/react-icons/ti/volume-down.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiVolumeDown extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/volume-mute.d.ts b/types/react-icons/ti/volume-mute.d.ts
deleted file mode 100644
index df323c2347..0000000000
--- a/types/react-icons/ti/volume-mute.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiVolumeMute extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/volume-up.d.ts b/types/react-icons/ti/volume-up.d.ts
deleted file mode 100644
index 443c4bb060..0000000000
--- a/types/react-icons/ti/volume-up.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiVolumeUp extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/volume.d.ts b/types/react-icons/ti/volume.d.ts
deleted file mode 100644
index ebbe9bac7a..0000000000
--- a/types/react-icons/ti/volume.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiVolume extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/warning-outline.d.ts b/types/react-icons/ti/warning-outline.d.ts
deleted file mode 100644
index 66d630a33d..0000000000
--- a/types/react-icons/ti/warning-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWarningOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/warning.d.ts b/types/react-icons/ti/warning.d.ts
deleted file mode 100644
index 394d46e315..0000000000
--- a/types/react-icons/ti/warning.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWarning extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/watch.d.ts b/types/react-icons/ti/watch.d.ts
deleted file mode 100644
index 191379a23f..0000000000
--- a/types/react-icons/ti/watch.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWatch extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/waves-outline.d.ts b/types/react-icons/ti/waves-outline.d.ts
deleted file mode 100644
index 814f0bb4bd..0000000000
--- a/types/react-icons/ti/waves-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWavesOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/waves.d.ts b/types/react-icons/ti/waves.d.ts
deleted file mode 100644
index 10d88f9f9c..0000000000
--- a/types/react-icons/ti/waves.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWaves extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/weather-cloudy.d.ts b/types/react-icons/ti/weather-cloudy.d.ts
deleted file mode 100644
index f0a7569133..0000000000
--- a/types/react-icons/ti/weather-cloudy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherCloudy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/weather-downpour.d.ts b/types/react-icons/ti/weather-downpour.d.ts
deleted file mode 100644
index 945dd0b196..0000000000
--- a/types/react-icons/ti/weather-downpour.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherDownpour extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/weather-night.d.ts b/types/react-icons/ti/weather-night.d.ts
deleted file mode 100644
index 72b8e61ebd..0000000000
--- a/types/react-icons/ti/weather-night.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherNight extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/weather-partly-sunny.d.ts b/types/react-icons/ti/weather-partly-sunny.d.ts
deleted file mode 100644
index 9acece9fcf..0000000000
--- a/types/react-icons/ti/weather-partly-sunny.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherPartlySunny extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/weather-shower.d.ts b/types/react-icons/ti/weather-shower.d.ts
deleted file mode 100644
index d96b321350..0000000000
--- a/types/react-icons/ti/weather-shower.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherShower extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/weather-snow.d.ts b/types/react-icons/ti/weather-snow.d.ts
deleted file mode 100644
index 8e274c5f85..0000000000
--- a/types/react-icons/ti/weather-snow.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherSnow extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/weather-stormy.d.ts b/types/react-icons/ti/weather-stormy.d.ts
deleted file mode 100644
index 0fe69851dc..0000000000
--- a/types/react-icons/ti/weather-stormy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherStormy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/weather-sunny.d.ts b/types/react-icons/ti/weather-sunny.d.ts
deleted file mode 100644
index 96bb430093..0000000000
--- a/types/react-icons/ti/weather-sunny.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherSunny extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/weather-windy-cloudy.d.ts b/types/react-icons/ti/weather-windy-cloudy.d.ts
deleted file mode 100644
index d28624e436..0000000000
--- a/types/react-icons/ti/weather-windy-cloudy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherWindyCloudy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/weather-windy.d.ts b/types/react-icons/ti/weather-windy.d.ts
deleted file mode 100644
index e5808895f1..0000000000
--- a/types/react-icons/ti/weather-windy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherWindy extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/wi-fi-outline.d.ts b/types/react-icons/ti/wi-fi-outline.d.ts
deleted file mode 100644
index 54c27adcb2..0000000000
--- a/types/react-icons/ti/wi-fi-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWiFiOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/wi-fi.d.ts b/types/react-icons/ti/wi-fi.d.ts
deleted file mode 100644
index 46cc54f2f5..0000000000
--- a/types/react-icons/ti/wi-fi.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWiFi extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/wine.d.ts b/types/react-icons/ti/wine.d.ts
deleted file mode 100644
index aab4d0d43e..0000000000
--- a/types/react-icons/ti/wine.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWine extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/world-outline.d.ts b/types/react-icons/ti/world-outline.d.ts
deleted file mode 100644
index deb94cd766..0000000000
--- a/types/react-icons/ti/world-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWorldOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/world.d.ts b/types/react-icons/ti/world.d.ts
deleted file mode 100644
index 54d7682959..0000000000
--- a/types/react-icons/ti/world.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiWorld extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/zoom-in-outline.d.ts b/types/react-icons/ti/zoom-in-outline.d.ts
deleted file mode 100644
index 9f0c9c98a7..0000000000
--- a/types/react-icons/ti/zoom-in-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiZoomInOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/zoom-in.d.ts b/types/react-icons/ti/zoom-in.d.ts
deleted file mode 100644
index 4b9716467b..0000000000
--- a/types/react-icons/ti/zoom-in.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiZoomIn extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/zoom-out-outline.d.ts b/types/react-icons/ti/zoom-out-outline.d.ts
deleted file mode 100644
index bdb15bbf3f..0000000000
--- a/types/react-icons/ti/zoom-out-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiZoomOutOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/zoom-out.d.ts b/types/react-icons/ti/zoom-out.d.ts
deleted file mode 100644
index e6b1bb1bd3..0000000000
--- a/types/react-icons/ti/zoom-out.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiZoomOut extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/zoom-outline.d.ts b/types/react-icons/ti/zoom-outline.d.ts
deleted file mode 100644
index 066a240186..0000000000
--- a/types/react-icons/ti/zoom-outline.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiZoomOutline extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/zoom.d.ts b/types/react-icons/ti/zoom.d.ts
deleted file mode 100644
index 74bda099c6..0000000000
--- a/types/react-icons/ti/zoom.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as React from 'react';
-import { IconBaseProps } from 'react-icon-base';
-export default class TiZoom extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/tsconfig.json b/types/react-icons/tsconfig.json
deleted file mode 100644
index 30695260df..0000000000
--- a/types/react-icons/tsconfig.json
+++ /dev/null
@@ -1,5681 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "jsx": "preserve"
-    },
-    "files": [
-        "index.d.ts",
-        "react-icons-tests.tsx",
-        "fa/index.d.ts",
-        "go/index.d.ts",
-        "io/index.d.ts",
-        "md/index.d.ts",
-        "ti/index.d.ts",
-        "fa/500px.d.ts",
-        "fa/adjust.d.ts",
-        "fa/adn.d.ts",
-        "fa/align-center.d.ts",
-        "fa/align-justify.d.ts",
-        "fa/align-left.d.ts",
-        "fa/align-right.d.ts",
-        "fa/amazon.d.ts",
-        "fa/ambulance.d.ts",
-        "fa/american-sign-language-interpreting.d.ts",
-        "fa/anchor.d.ts",
-        "fa/android.d.ts",
-        "fa/angellist.d.ts",
-        "fa/angle-double-down.d.ts",
-        "fa/angle-double-left.d.ts",
-        "fa/angle-double-right.d.ts",
-        "fa/angle-double-up.d.ts",
-        "fa/angle-down.d.ts",
-        "fa/angle-left.d.ts",
-        "fa/angle-right.d.ts",
-        "fa/angle-up.d.ts",
-        "fa/apple.d.ts",
-        "fa/archive.d.ts",
-        "fa/area-chart.d.ts",
-        "fa/arrow-circle-down.d.ts",
-        "fa/arrow-circle-left.d.ts",
-        "fa/arrow-circle-o-down.d.ts",
-        "fa/arrow-circle-o-left.d.ts",
-        "fa/arrow-circle-o-right.d.ts",
-        "fa/arrow-circle-o-up.d.ts",
-        "fa/arrow-circle-right.d.ts",
-        "fa/arrow-circle-up.d.ts",
-        "fa/arrow-down.d.ts",
-        "fa/arrow-left.d.ts",
-        "fa/arrow-right.d.ts",
-        "fa/arrow-up.d.ts",
-        "fa/arrows-alt.d.ts",
-        "fa/arrows-h.d.ts",
-        "fa/arrows-v.d.ts",
-        "fa/arrows.d.ts",
-        "fa/assistive-listening-systems.d.ts",
-        "fa/asterisk.d.ts",
-        "fa/at.d.ts",
-        "fa/audio-description.d.ts",
-        "fa/automobile.d.ts",
-        "fa/backward.d.ts",
-        "fa/balance-scale.d.ts",
-        "fa/ban.d.ts",
-        "fa/bank.d.ts",
-        "fa/bar-chart.d.ts",
-        "fa/barcode.d.ts",
-        "fa/bars.d.ts",
-        "fa/battery-0.d.ts",
-        "fa/battery-1.d.ts",
-        "fa/battery-2.d.ts",
-        "fa/battery-3.d.ts",
-        "fa/battery-4.d.ts",
-        "fa/bed.d.ts",
-        "fa/beer.d.ts",
-        "fa/behance-square.d.ts",
-        "fa/behance.d.ts",
-        "fa/bell-o.d.ts",
-        "fa/bell-slash-o.d.ts",
-        "fa/bell-slash.d.ts",
-        "fa/bell.d.ts",
-        "fa/bicycle.d.ts",
-        "fa/binoculars.d.ts",
-        "fa/birthday-cake.d.ts",
-        "fa/bitbucket-square.d.ts",
-        "fa/bitbucket.d.ts",
-        "fa/bitcoin.d.ts",
-        "fa/black-tie.d.ts",
-        "fa/blind.d.ts",
-        "fa/bluetooth-b.d.ts",
-        "fa/bluetooth.d.ts",
-        "fa/bold.d.ts",
-        "fa/bolt.d.ts",
-        "fa/bomb.d.ts",
-        "fa/book.d.ts",
-        "fa/bookmark-o.d.ts",
-        "fa/bookmark.d.ts",
-        "fa/braille.d.ts",
-        "fa/briefcase.d.ts",
-        "fa/bug.d.ts",
-        "fa/building-o.d.ts",
-        "fa/building.d.ts",
-        "fa/bullhorn.d.ts",
-        "fa/bullseye.d.ts",
-        "fa/bus.d.ts",
-        "fa/buysellads.d.ts",
-        "fa/cab.d.ts",
-        "fa/calculator.d.ts",
-        "fa/calendar-check-o.d.ts",
-        "fa/calendar-minus-o.d.ts",
-        "fa/calendar-o.d.ts",
-        "fa/calendar-plus-o.d.ts",
-        "fa/calendar-times-o.d.ts",
-        "fa/calendar.d.ts",
-        "fa/camera-retro.d.ts",
-        "fa/camera.d.ts",
-        "fa/caret-down.d.ts",
-        "fa/caret-left.d.ts",
-        "fa/caret-right.d.ts",
-        "fa/caret-square-o-down.d.ts",
-        "fa/caret-square-o-left.d.ts",
-        "fa/caret-square-o-right.d.ts",
-        "fa/caret-square-o-up.d.ts",
-        "fa/caret-up.d.ts",
-        "fa/cart-arrow-down.d.ts",
-        "fa/cart-plus.d.ts",
-        "fa/cc-amex.d.ts",
-        "fa/cc-diners-club.d.ts",
-        "fa/cc-discover.d.ts",
-        "fa/cc-jcb.d.ts",
-        "fa/cc-mastercard.d.ts",
-        "fa/cc-paypal.d.ts",
-        "fa/cc-stripe.d.ts",
-        "fa/cc-visa.d.ts",
-        "fa/cc.d.ts",
-        "fa/certificate.d.ts",
-        "fa/chain-broken.d.ts",
-        "fa/chain.d.ts",
-        "fa/check-circle-o.d.ts",
-        "fa/check-circle.d.ts",
-        "fa/check-square-o.d.ts",
-        "fa/check-square.d.ts",
-        "fa/check.d.ts",
-        "fa/chevron-circle-down.d.ts",
-        "fa/chevron-circle-left.d.ts",
-        "fa/chevron-circle-right.d.ts",
-        "fa/chevron-circle-up.d.ts",
-        "fa/chevron-down.d.ts",
-        "fa/chevron-left.d.ts",
-        "fa/chevron-right.d.ts",
-        "fa/chevron-up.d.ts",
-        "fa/child.d.ts",
-        "fa/chrome.d.ts",
-        "fa/circle-o-notch.d.ts",
-        "fa/circle-o.d.ts",
-        "fa/circle-thin.d.ts",
-        "fa/circle.d.ts",
-        "fa/clipboard.d.ts",
-        "fa/clock-o.d.ts",
-        "fa/clone.d.ts",
-        "fa/close.d.ts",
-        "fa/cloud-download.d.ts",
-        "fa/cloud-upload.d.ts",
-        "fa/cloud.d.ts",
-        "fa/cny.d.ts",
-        "fa/code-fork.d.ts",
-        "fa/code.d.ts",
-        "fa/codepen.d.ts",
-        "fa/codiepie.d.ts",
-        "fa/coffee.d.ts",
-        "fa/cog.d.ts",
-        "fa/cogs.d.ts",
-        "fa/columns.d.ts",
-        "fa/comment-o.d.ts",
-        "fa/comment.d.ts",
-        "fa/commenting-o.d.ts",
-        "fa/commenting.d.ts",
-        "fa/comments-o.d.ts",
-        "fa/comments.d.ts",
-        "fa/compass.d.ts",
-        "fa/compress.d.ts",
-        "fa/connectdevelop.d.ts",
-        "fa/contao.d.ts",
-        "fa/copy.d.ts",
-        "fa/copyright.d.ts",
-        "fa/creative-commons.d.ts",
-        "fa/credit-card-alt.d.ts",
-        "fa/credit-card.d.ts",
-        "fa/crop.d.ts",
-        "fa/crosshairs.d.ts",
-        "fa/css3.d.ts",
-        "fa/cube.d.ts",
-        "fa/cubes.d.ts",
-        "fa/cut.d.ts",
-        "fa/cutlery.d.ts",
-        "fa/dashboard.d.ts",
-        "fa/dashcube.d.ts",
-        "fa/database.d.ts",
-        "fa/deaf.d.ts",
-        "fa/dedent.d.ts",
-        "fa/delicious.d.ts",
-        "fa/desktop.d.ts",
-        "fa/deviantart.d.ts",
-        "fa/diamond.d.ts",
-        "fa/digg.d.ts",
-        "fa/dollar.d.ts",
-        "fa/dot-circle-o.d.ts",
-        "fa/download.d.ts",
-        "fa/dribbble.d.ts",
-        "fa/dropbox.d.ts",
-        "fa/drupal.d.ts",
-        "fa/edge.d.ts",
-        "fa/edit.d.ts",
-        "fa/eject.d.ts",
-        "fa/ellipsis-h.d.ts",
-        "fa/ellipsis-v.d.ts",
-        "fa/empire.d.ts",
-        "fa/envelope-o.d.ts",
-        "fa/envelope-square.d.ts",
-        "fa/envelope.d.ts",
-        "fa/envira.d.ts",
-        "fa/eraser.d.ts",
-        "fa/eur.d.ts",
-        "fa/exchange.d.ts",
-        "fa/exclamation-circle.d.ts",
-        "fa/exclamation-triangle.d.ts",
-        "fa/exclamation.d.ts",
-        "fa/expand.d.ts",
-        "fa/expeditedssl.d.ts",
-        "fa/external-link-square.d.ts",
-        "fa/external-link.d.ts",
-        "fa/eye-slash.d.ts",
-        "fa/eye.d.ts",
-        "fa/eyedropper.d.ts",
-        "fa/facebook-official.d.ts",
-        "fa/facebook-square.d.ts",
-        "fa/facebook.d.ts",
-        "fa/fast-backward.d.ts",
-        "fa/fast-forward.d.ts",
-        "fa/fax.d.ts",
-        "fa/feed.d.ts",
-        "fa/female.d.ts",
-        "fa/fighter-jet.d.ts",
-        "fa/file-archive-o.d.ts",
-        "fa/file-audio-o.d.ts",
-        "fa/file-code-o.d.ts",
-        "fa/file-excel-o.d.ts",
-        "fa/file-image-o.d.ts",
-        "fa/file-movie-o.d.ts",
-        "fa/file-o.d.ts",
-        "fa/file-pdf-o.d.ts",
-        "fa/file-powerpoint-o.d.ts",
-        "fa/file-text-o.d.ts",
-        "fa/file-text.d.ts",
-        "fa/file-word-o.d.ts",
-        "fa/file.d.ts",
-        "fa/film.d.ts",
-        "fa/filter.d.ts",
-        "fa/fire-extinguisher.d.ts",
-        "fa/fire.d.ts",
-        "fa/firefox.d.ts",
-        "fa/flag-checkered.d.ts",
-        "fa/flag-o.d.ts",
-        "fa/flag.d.ts",
-        "fa/flask.d.ts",
-        "fa/flickr.d.ts",
-        "fa/floppy-o.d.ts",
-        "fa/folder-o.d.ts",
-        "fa/folder-open-o.d.ts",
-        "fa/folder-open.d.ts",
-        "fa/folder.d.ts",
-        "fa/font.d.ts",
-        "fa/fonticons.d.ts",
-        "fa/fort-awesome.d.ts",
-        "fa/forumbee.d.ts",
-        "fa/forward.d.ts",
-        "fa/foursquare.d.ts",
-        "fa/frown-o.d.ts",
-        "fa/futbol-o.d.ts",
-        "fa/gamepad.d.ts",
-        "fa/gavel.d.ts",
-        "fa/gbp.d.ts",
-        "fa/genderless.d.ts",
-        "fa/get-pocket.d.ts",
-        "fa/gg-circle.d.ts",
-        "fa/gg.d.ts",
-        "fa/gift.d.ts",
-        "fa/git-square.d.ts",
-        "fa/git.d.ts",
-        "fa/github-alt.d.ts",
-        "fa/github-square.d.ts",
-        "fa/github.d.ts",
-        "fa/gitlab.d.ts",
-        "fa/gittip.d.ts",
-        "fa/glass.d.ts",
-        "fa/glide-g.d.ts",
-        "fa/glide.d.ts",
-        "fa/globe.d.ts",
-        "fa/google-plus-square.d.ts",
-        "fa/google-plus.d.ts",
-        "fa/google-wallet.d.ts",
-        "fa/google.d.ts",
-        "fa/graduation-cap.d.ts",
-        "fa/group.d.ts",
-        "fa/h-square.d.ts",
-        "fa/hacker-news.d.ts",
-        "fa/hand-grab-o.d.ts",
-        "fa/hand-lizard-o.d.ts",
-        "fa/hand-o-down.d.ts",
-        "fa/hand-o-left.d.ts",
-        "fa/hand-o-right.d.ts",
-        "fa/hand-o-up.d.ts",
-        "fa/hand-paper-o.d.ts",
-        "fa/hand-peace-o.d.ts",
-        "fa/hand-pointer-o.d.ts",
-        "fa/hand-scissors-o.d.ts",
-        "fa/hand-spock-o.d.ts",
-        "fa/hashtag.d.ts",
-        "fa/hdd-o.d.ts",
-        "fa/header.d.ts",
-        "fa/headphones.d.ts",
-        "fa/heart-o.d.ts",
-        "fa/heart.d.ts",
-        "fa/heartbeat.d.ts",
-        "fa/history.d.ts",
-        "fa/home.d.ts",
-        "fa/hospital-o.d.ts",
-        "fa/hourglass-1.d.ts",
-        "fa/hourglass-2.d.ts",
-        "fa/hourglass-3.d.ts",
-        "fa/hourglass-o.d.ts",
-        "fa/hourglass.d.ts",
-        "fa/houzz.d.ts",
-        "fa/html5.d.ts",
-        "fa/i-cursor.d.ts",
-        "fa/ils.d.ts",
-        "fa/image.d.ts",
-        "fa/inbox.d.ts",
-        "fa/indent.d.ts",
-        "fa/industry.d.ts",
-        "fa/info-circle.d.ts",
-        "fa/info.d.ts",
-        "fa/inr.d.ts",
-        "fa/instagram.d.ts",
-        "fa/internet-explorer.d.ts",
-        "fa/intersex.d.ts",
-        "fa/ioxhost.d.ts",
-        "fa/italic.d.ts",
-        "fa/joomla.d.ts",
-        "fa/jsfiddle.d.ts",
-        "fa/key.d.ts",
-        "fa/keyboard-o.d.ts",
-        "fa/krw.d.ts",
-        "fa/language.d.ts",
-        "fa/laptop.d.ts",
-        "fa/lastfm-square.d.ts",
-        "fa/lastfm.d.ts",
-        "fa/leaf.d.ts",
-        "fa/leanpub.d.ts",
-        "fa/lemon-o.d.ts",
-        "fa/level-down.d.ts",
-        "fa/level-up.d.ts",
-        "fa/life-bouy.d.ts",
-        "fa/lightbulb-o.d.ts",
-        "fa/line-chart.d.ts",
-        "fa/linkedin-square.d.ts",
-        "fa/linkedin.d.ts",
-        "fa/linux.d.ts",
-        "fa/list-alt.d.ts",
-        "fa/list-ol.d.ts",
-        "fa/list-ul.d.ts",
-        "fa/list.d.ts",
-        "fa/location-arrow.d.ts",
-        "fa/lock.d.ts",
-        "fa/long-arrow-down.d.ts",
-        "fa/long-arrow-left.d.ts",
-        "fa/long-arrow-right.d.ts",
-        "fa/long-arrow-up.d.ts",
-        "fa/low-vision.d.ts",
-        "fa/magic.d.ts",
-        "fa/magnet.d.ts",
-        "fa/mail-forward.d.ts",
-        "fa/mail-reply-all.d.ts",
-        "fa/mail-reply.d.ts",
-        "fa/male.d.ts",
-        "fa/map-marker.d.ts",
-        "fa/map-o.d.ts",
-        "fa/map-pin.d.ts",
-        "fa/map-signs.d.ts",
-        "fa/map.d.ts",
-        "fa/mars-double.d.ts",
-        "fa/mars-stroke-h.d.ts",
-        "fa/mars-stroke-v.d.ts",
-        "fa/mars-stroke.d.ts",
-        "fa/mars.d.ts",
-        "fa/maxcdn.d.ts",
-        "fa/meanpath.d.ts",
-        "fa/medium.d.ts",
-        "fa/medkit.d.ts",
-        "fa/meh-o.d.ts",
-        "fa/mercury.d.ts",
-        "fa/microphone-slash.d.ts",
-        "fa/microphone.d.ts",
-        "fa/minus-circle.d.ts",
-        "fa/minus-square-o.d.ts",
-        "fa/minus-square.d.ts",
-        "fa/minus.d.ts",
-        "fa/mixcloud.d.ts",
-        "fa/mobile.d.ts",
-        "fa/modx.d.ts",
-        "fa/money.d.ts",
-        "fa/moon-o.d.ts",
-        "fa/motorcycle.d.ts",
-        "fa/mouse-pointer.d.ts",
-        "fa/music.d.ts",
-        "fa/neuter.d.ts",
-        "fa/newspaper-o.d.ts",
-        "fa/object-group.d.ts",
-        "fa/object-ungroup.d.ts",
-        "fa/odnoklassniki-square.d.ts",
-        "fa/odnoklassniki.d.ts",
-        "fa/opencart.d.ts",
-        "fa/openid.d.ts",
-        "fa/opera.d.ts",
-        "fa/optin-monster.d.ts",
-        "fa/pagelines.d.ts",
-        "fa/paint-brush.d.ts",
-        "fa/paper-plane-o.d.ts",
-        "fa/paper-plane.d.ts",
-        "fa/paperclip.d.ts",
-        "fa/paragraph.d.ts",
-        "fa/pause-circle-o.d.ts",
-        "fa/pause-circle.d.ts",
-        "fa/pause.d.ts",
-        "fa/paw.d.ts",
-        "fa/paypal.d.ts",
-        "fa/pencil-square.d.ts",
-        "fa/pencil.d.ts",
-        "fa/percent.d.ts",
-        "fa/phone-square.d.ts",
-        "fa/phone.d.ts",
-        "fa/pie-chart.d.ts",
-        "fa/pied-piper-alt.d.ts",
-        "fa/pied-piper.d.ts",
-        "fa/pinterest-p.d.ts",
-        "fa/pinterest-square.d.ts",
-        "fa/pinterest.d.ts",
-        "fa/plane.d.ts",
-        "fa/play-circle-o.d.ts",
-        "fa/play-circle.d.ts",
-        "fa/play.d.ts",
-        "fa/plug.d.ts",
-        "fa/plus-circle.d.ts",
-        "fa/plus-square-o.d.ts",
-        "fa/plus-square.d.ts",
-        "fa/plus.d.ts",
-        "fa/power-off.d.ts",
-        "fa/print.d.ts",
-        "fa/product-hunt.d.ts",
-        "fa/puzzle-piece.d.ts",
-        "fa/qq.d.ts",
-        "fa/qrcode.d.ts",
-        "fa/question-circle-o.d.ts",
-        "fa/question-circle.d.ts",
-        "fa/question.d.ts",
-        "fa/quote-left.d.ts",
-        "fa/quote-right.d.ts",
-        "fa/ra.d.ts",
-        "fa/random.d.ts",
-        "fa/recycle.d.ts",
-        "fa/reddit-alien.d.ts",
-        "fa/reddit-square.d.ts",
-        "fa/reddit.d.ts",
-        "fa/refresh.d.ts",
-        "fa/registered.d.ts",
-        "fa/renren.d.ts",
-        "fa/repeat.d.ts",
-        "fa/retweet.d.ts",
-        "fa/road.d.ts",
-        "fa/rocket.d.ts",
-        "fa/rotate-left.d.ts",
-        "fa/rouble.d.ts",
-        "fa/rss-square.d.ts",
-        "fa/safari.d.ts",
-        "fa/scribd.d.ts",
-        "fa/search-minus.d.ts",
-        "fa/search-plus.d.ts",
-        "fa/search.d.ts",
-        "fa/sellsy.d.ts",
-        "fa/server.d.ts",
-        "fa/share-alt-square.d.ts",
-        "fa/share-alt.d.ts",
-        "fa/share-square-o.d.ts",
-        "fa/share-square.d.ts",
-        "fa/shield.d.ts",
-        "fa/ship.d.ts",
-        "fa/shirtsinbulk.d.ts",
-        "fa/shopping-bag.d.ts",
-        "fa/shopping-basket.d.ts",
-        "fa/shopping-cart.d.ts",
-        "fa/sign-in.d.ts",
-        "fa/sign-language.d.ts",
-        "fa/sign-out.d.ts",
-        "fa/signal.d.ts",
-        "fa/simplybuilt.d.ts",
-        "fa/sitemap.d.ts",
-        "fa/skyatlas.d.ts",
-        "fa/skype.d.ts",
-        "fa/slack.d.ts",
-        "fa/sliders.d.ts",
-        "fa/slideshare.d.ts",
-        "fa/smile-o.d.ts",
-        "fa/snapchat-ghost.d.ts",
-        "fa/snapchat-square.d.ts",
-        "fa/snapchat.d.ts",
-        "fa/sort-alpha-asc.d.ts",
-        "fa/sort-alpha-desc.d.ts",
-        "fa/sort-amount-asc.d.ts",
-        "fa/sort-amount-desc.d.ts",
-        "fa/sort-asc.d.ts",
-        "fa/sort-desc.d.ts",
-        "fa/sort-numeric-asc.d.ts",
-        "fa/sort-numeric-desc.d.ts",
-        "fa/sort.d.ts",
-        "fa/soundcloud.d.ts",
-        "fa/space-shuttle.d.ts",
-        "fa/spinner.d.ts",
-        "fa/spoon.d.ts",
-        "fa/spotify.d.ts",
-        "fa/square-o.d.ts",
-        "fa/square.d.ts",
-        "fa/stack-exchange.d.ts",
-        "fa/stack-overflow.d.ts",
-        "fa/star-half-empty.d.ts",
-        "fa/star-half.d.ts",
-        "fa/star-o.d.ts",
-        "fa/star.d.ts",
-        "fa/steam-square.d.ts",
-        "fa/steam.d.ts",
-        "fa/step-backward.d.ts",
-        "fa/step-forward.d.ts",
-        "fa/stethoscope.d.ts",
-        "fa/sticky-note-o.d.ts",
-        "fa/sticky-note.d.ts",
-        "fa/stop-circle-o.d.ts",
-        "fa/stop-circle.d.ts",
-        "fa/stop.d.ts",
-        "fa/street-view.d.ts",
-        "fa/strikethrough.d.ts",
-        "fa/stumbleupon-circle.d.ts",
-        "fa/stumbleupon.d.ts",
-        "fa/subscript.d.ts",
-        "fa/subway.d.ts",
-        "fa/suitcase.d.ts",
-        "fa/sun-o.d.ts",
-        "fa/superscript.d.ts",
-        "fa/table.d.ts",
-        "fa/tablet.d.ts",
-        "fa/tag.d.ts",
-        "fa/tags.d.ts",
-        "fa/tasks.d.ts",
-        "fa/television.d.ts",
-        "fa/tencent-weibo.d.ts",
-        "fa/terminal.d.ts",
-        "fa/text-height.d.ts",
-        "fa/text-width.d.ts",
-        "fa/th-large.d.ts",
-        "fa/th-list.d.ts",
-        "fa/th.d.ts",
-        "fa/thumb-tack.d.ts",
-        "fa/thumbs-down.d.ts",
-        "fa/thumbs-o-down.d.ts",
-        "fa/thumbs-o-up.d.ts",
-        "fa/thumbs-up.d.ts",
-        "fa/ticket.d.ts",
-        "fa/times-circle-o.d.ts",
-        "fa/times-circle.d.ts",
-        "fa/tint.d.ts",
-        "fa/toggle-off.d.ts",
-        "fa/toggle-on.d.ts",
-        "fa/trademark.d.ts",
-        "fa/train.d.ts",
-        "fa/transgender-alt.d.ts",
-        "fa/trash-o.d.ts",
-        "fa/trash.d.ts",
-        "fa/tree.d.ts",
-        "fa/trello.d.ts",
-        "fa/tripadvisor.d.ts",
-        "fa/trophy.d.ts",
-        "fa/truck.d.ts",
-        "fa/try.d.ts",
-        "fa/tty.d.ts",
-        "fa/tumblr-square.d.ts",
-        "fa/tumblr.d.ts",
-        "fa/twitch.d.ts",
-        "fa/twitter-square.d.ts",
-        "fa/twitter.d.ts",
-        "fa/umbrella.d.ts",
-        "fa/underline.d.ts",
-        "fa/universal-access.d.ts",
-        "fa/unlock-alt.d.ts",
-        "fa/unlock.d.ts",
-        "fa/upload.d.ts",
-        "fa/usb.d.ts",
-        "fa/user-md.d.ts",
-        "fa/user-plus.d.ts",
-        "fa/user-secret.d.ts",
-        "fa/user-times.d.ts",
-        "fa/user.d.ts",
-        "fa/venus-double.d.ts",
-        "fa/venus-mars.d.ts",
-        "fa/venus.d.ts",
-        "fa/viacoin.d.ts",
-        "fa/viadeo-square.d.ts",
-        "fa/viadeo.d.ts",
-        "fa/video-camera.d.ts",
-        "fa/vimeo-square.d.ts",
-        "fa/vimeo.d.ts",
-        "fa/vine.d.ts",
-        "fa/vk.d.ts",
-        "fa/volume-control-phone.d.ts",
-        "fa/volume-down.d.ts",
-        "fa/volume-off.d.ts",
-        "fa/volume-up.d.ts",
-        "fa/wechat.d.ts",
-        "fa/weibo.d.ts",
-        "fa/whatsapp.d.ts",
-        "fa/wheelchair-alt.d.ts",
-        "fa/wheelchair.d.ts",
-        "fa/wifi.d.ts",
-        "fa/wikipedia-w.d.ts",
-        "fa/windows.d.ts",
-        "fa/wordpress.d.ts",
-        "fa/wpbeginner.d.ts",
-        "fa/wpforms.d.ts",
-        "fa/wrench.d.ts",
-        "fa/xing-square.d.ts",
-        "fa/xing.d.ts",
-        "fa/y-combinator.d.ts",
-        "fa/yahoo.d.ts",
-        "fa/yelp.d.ts",
-        "fa/youtube-play.d.ts",
-        "fa/youtube-square.d.ts",
-        "fa/youtube.d.ts",
-        "go/alert.d.ts",
-        "go/alignment-align.d.ts",
-        "go/alignment-aligned-to.d.ts",
-        "go/alignment-unalign.d.ts",
-        "go/arrow-down.d.ts",
-        "go/arrow-left.d.ts",
-        "go/arrow-right.d.ts",
-        "go/arrow-small-down.d.ts",
-        "go/arrow-small-left.d.ts",
-        "go/arrow-small-right.d.ts",
-        "go/arrow-small-up.d.ts",
-        "go/arrow-up.d.ts",
-        "go/beer.d.ts",
-        "go/book.d.ts",
-        "go/bookmark.d.ts",
-        "go/briefcase.d.ts",
-        "go/broadcast.d.ts",
-        "go/browser.d.ts",
-        "go/bug.d.ts",
-        "go/calendar.d.ts",
-        "go/check.d.ts",
-        "go/checklist.d.ts",
-        "go/chevron-down.d.ts",
-        "go/chevron-left.d.ts",
-        "go/chevron-right.d.ts",
-        "go/chevron-up.d.ts",
-        "go/circle-slash.d.ts",
-        "go/circuit-board.d.ts",
-        "go/clippy.d.ts",
-        "go/clock.d.ts",
-        "go/cloud-download.d.ts",
-        "go/cloud-upload.d.ts",
-        "go/code.d.ts",
-        "go/color-mode.d.ts",
-        "go/comment-discussion.d.ts",
-        "go/comment.d.ts",
-        "go/credit-card.d.ts",
-        "go/dash.d.ts",
-        "go/dashboard.d.ts",
-        "go/database.d.ts",
-        "go/device-camera-video.d.ts",
-        "go/device-camera.d.ts",
-        "go/device-desktop.d.ts",
-        "go/device-mobile.d.ts",
-        "go/diff-added.d.ts",
-        "go/diff-ignored.d.ts",
-        "go/diff-modified.d.ts",
-        "go/diff-removed.d.ts",
-        "go/diff-renamed.d.ts",
-        "go/diff.d.ts",
-        "go/ellipsis.d.ts",
-        "go/eye.d.ts",
-        "go/file-binary.d.ts",
-        "go/file-code.d.ts",
-        "go/file-directory.d.ts",
-        "go/file-media.d.ts",
-        "go/file-pdf.d.ts",
-        "go/file-submodule.d.ts",
-        "go/file-symlink-directory.d.ts",
-        "go/file-symlink-file.d.ts",
-        "go/file-text.d.ts",
-        "go/file-zip.d.ts",
-        "go/flame.d.ts",
-        "go/fold.d.ts",
-        "go/gear.d.ts",
-        "go/gift.d.ts",
-        "go/gist-secret.d.ts",
-        "go/gist.d.ts",
-        "go/git-branch.d.ts",
-        "go/git-commit.d.ts",
-        "go/git-compare.d.ts",
-        "go/git-merge.d.ts",
-        "go/git-pull-request.d.ts",
-        "go/globe.d.ts",
-        "go/graph.d.ts",
-        "go/heart.d.ts",
-        "go/history.d.ts",
-        "go/home.d.ts",
-        "go/horizontal-rule.d.ts",
-        "go/hourglass.d.ts",
-        "go/hubot.d.ts",
-        "go/inbox.d.ts",
-        "go/info.d.ts",
-        "go/issue-closed.d.ts",
-        "go/issue-opened.d.ts",
-        "go/issue-reopened.d.ts",
-        "go/jersey.d.ts",
-        "go/jump-down.d.ts",
-        "go/jump-left.d.ts",
-        "go/jump-right.d.ts",
-        "go/jump-up.d.ts",
-        "go/key.d.ts",
-        "go/keyboard.d.ts",
-        "go/law.d.ts",
-        "go/light-bulb.d.ts",
-        "go/link-external.d.ts",
-        "go/link.d.ts",
-        "go/list-ordered.d.ts",
-        "go/list-unordered.d.ts",
-        "go/location.d.ts",
-        "go/lock.d.ts",
-        "go/logo-github.d.ts",
-        "go/mail-read.d.ts",
-        "go/mail-reply.d.ts",
-        "go/mail.d.ts",
-        "go/mark-github.d.ts",
-        "go/markdown.d.ts",
-        "go/megaphone.d.ts",
-        "go/mention.d.ts",
-        "go/microscope.d.ts",
-        "go/milestone.d.ts",
-        "go/mirror.d.ts",
-        "go/mortar-board.d.ts",
-        "go/move-down.d.ts",
-        "go/move-left.d.ts",
-        "go/move-right.d.ts",
-        "go/move-up.d.ts",
-        "go/mute.d.ts",
-        "go/no-newline.d.ts",
-        "go/octoface.d.ts",
-        "go/organization.d.ts",
-        "go/package.d.ts",
-        "go/paintcan.d.ts",
-        "go/pencil.d.ts",
-        "go/person.d.ts",
-        "go/pin.d.ts",
-        "go/playback-fast-forward.d.ts",
-        "go/playback-pause.d.ts",
-        "go/playback-play.d.ts",
-        "go/playback-rewind.d.ts",
-        "go/plug.d.ts",
-        "go/plus.d.ts",
-        "go/podium.d.ts",
-        "go/primitive-dot.d.ts",
-        "go/primitive-square.d.ts",
-        "go/pulse.d.ts",
-        "go/puzzle.d.ts",
-        "go/question.d.ts",
-        "go/quote.d.ts",
-        "go/radio-tower.d.ts",
-        "go/repo-clone.d.ts",
-        "go/repo-force-push.d.ts",
-        "go/repo-forked.d.ts",
-        "go/repo-pull.d.ts",
-        "go/repo-push.d.ts",
-        "go/repo.d.ts",
-        "go/rocket.d.ts",
-        "go/rss.d.ts",
-        "go/ruby.d.ts",
-        "go/screen-full.d.ts",
-        "go/screen-normal.d.ts",
-        "go/search.d.ts",
-        "go/server.d.ts",
-        "go/settings.d.ts",
-        "go/sign-in.d.ts",
-        "go/sign-out.d.ts",
-        "go/split.d.ts",
-        "go/squirrel.d.ts",
-        "go/star.d.ts",
-        "go/steps.d.ts",
-        "go/stop.d.ts",
-        "go/sync.d.ts",
-        "go/tag.d.ts",
-        "go/telescope.d.ts",
-        "go/terminal.d.ts",
-        "go/three-bars.d.ts",
-        "go/tools.d.ts",
-        "go/trashcan.d.ts",
-        "go/triangle-down.d.ts",
-        "go/triangle-left.d.ts",
-        "go/triangle-right.d.ts",
-        "go/triangle-up.d.ts",
-        "go/unfold.d.ts",
-        "go/unmute.d.ts",
-        "go/versions.d.ts",
-        "go/x.d.ts",
-        "go/zap.d.ts",
-        "io/alert-circled.d.ts",
-        "io/alert.d.ts",
-        "io/android-add-circle.d.ts",
-        "io/android-add.d.ts",
-        "io/android-alarm-clock.d.ts",
-        "io/android-alert.d.ts",
-        "io/android-apps.d.ts",
-        "io/android-archive.d.ts",
-        "io/android-arrow-back.d.ts",
-        "io/android-arrow-down.d.ts",
-        "io/android-arrow-dropdown-circle.d.ts",
-        "io/android-arrow-dropdown.d.ts",
-        "io/android-arrow-dropleft-circle.d.ts",
-        "io/android-arrow-dropleft.d.ts",
-        "io/android-arrow-dropright-circle.d.ts",
-        "io/android-arrow-dropright.d.ts",
-        "io/android-arrow-dropup-circle.d.ts",
-        "io/android-arrow-dropup.d.ts",
-        "io/android-arrow-forward.d.ts",
-        "io/android-arrow-up.d.ts",
-        "io/android-attach.d.ts",
-        "io/android-bar.d.ts",
-        "io/android-bicycle.d.ts",
-        "io/android-boat.d.ts",
-        "io/android-bookmark.d.ts",
-        "io/android-bulb.d.ts",
-        "io/android-bus.d.ts",
-        "io/android-calendar.d.ts",
-        "io/android-call.d.ts",
-        "io/android-camera.d.ts",
-        "io/android-cancel.d.ts",
-        "io/android-car.d.ts",
-        "io/android-cart.d.ts",
-        "io/android-chat.d.ts",
-        "io/android-checkbox-blank.d.ts",
-        "io/android-checkbox-outline-blank.d.ts",
-        "io/android-checkbox-outline.d.ts",
-        "io/android-checkbox.d.ts",
-        "io/android-checkmark-circle.d.ts",
-        "io/android-clipboard.d.ts",
-        "io/android-close.d.ts",
-        "io/android-cloud-circle.d.ts",
-        "io/android-cloud-done.d.ts",
-        "io/android-cloud-outline.d.ts",
-        "io/android-cloud.d.ts",
-        "io/android-color-palette.d.ts",
-        "io/android-compass.d.ts",
-        "io/android-contact.d.ts",
-        "io/android-contacts.d.ts",
-        "io/android-contract.d.ts",
-        "io/android-create.d.ts",
-        "io/android-delete.d.ts",
-        "io/android-desktop.d.ts",
-        "io/android-document.d.ts",
-        "io/android-done-all.d.ts",
-        "io/android-done.d.ts",
-        "io/android-download.d.ts",
-        "io/android-drafts.d.ts",
-        "io/android-exit.d.ts",
-        "io/android-expand.d.ts",
-        "io/android-favorite-outline.d.ts",
-        "io/android-favorite.d.ts",
-        "io/android-film.d.ts",
-        "io/android-folder-open.d.ts",
-        "io/android-folder.d.ts",
-        "io/android-funnel.d.ts",
-        "io/android-globe.d.ts",
-        "io/android-hand.d.ts",
-        "io/android-hangout.d.ts",
-        "io/android-happy.d.ts",
-        "io/android-home.d.ts",
-        "io/android-image.d.ts",
-        "io/android-laptop.d.ts",
-        "io/android-list.d.ts",
-        "io/android-locate.d.ts",
-        "io/android-lock.d.ts",
-        "io/android-mail.d.ts",
-        "io/android-map.d.ts",
-        "io/android-menu.d.ts",
-        "io/android-microphone-off.d.ts",
-        "io/android-microphone.d.ts",
-        "io/android-more-horizontal.d.ts",
-        "io/android-more-vertical.d.ts",
-        "io/android-navigate.d.ts",
-        "io/android-notifications-none.d.ts",
-        "io/android-notifications-off.d.ts",
-        "io/android-notifications.d.ts",
-        "io/android-open.d.ts",
-        "io/android-options.d.ts",
-        "io/android-people.d.ts",
-        "io/android-person-add.d.ts",
-        "io/android-person.d.ts",
-        "io/android-phone-landscape.d.ts",
-        "io/android-phone-portrait.d.ts",
-        "io/android-pin.d.ts",
-        "io/android-plane.d.ts",
-        "io/android-playstore.d.ts",
-        "io/android-print.d.ts",
-        "io/android-radio-button-off.d.ts",
-        "io/android-radio-button-on.d.ts",
-        "io/android-refresh.d.ts",
-        "io/android-remove-circle.d.ts",
-        "io/android-remove.d.ts",
-        "io/android-restaurant.d.ts",
-        "io/android-sad.d.ts",
-        "io/android-search.d.ts",
-        "io/android-send.d.ts",
-        "io/android-settings.d.ts",
-        "io/android-share-alt.d.ts",
-        "io/android-share.d.ts",
-        "io/android-star-half.d.ts",
-        "io/android-star-outline.d.ts",
-        "io/android-star.d.ts",
-        "io/android-stopwatch.d.ts",
-        "io/android-subway.d.ts",
-        "io/android-sunny.d.ts",
-        "io/android-sync.d.ts",
-        "io/android-textsms.d.ts",
-        "io/android-time.d.ts",
-        "io/android-train.d.ts",
-        "io/android-unlock.d.ts",
-        "io/android-upload.d.ts",
-        "io/android-volume-down.d.ts",
-        "io/android-volume-mute.d.ts",
-        "io/android-volume-off.d.ts",
-        "io/android-volume-up.d.ts",
-        "io/android-walk.d.ts",
-        "io/android-warning.d.ts",
-        "io/android-watch.d.ts",
-        "io/android-wifi.d.ts",
-        "io/aperture.d.ts",
-        "io/archive.d.ts",
-        "io/arrow-down-a.d.ts",
-        "io/arrow-down-b.d.ts",
-        "io/arrow-down-c.d.ts",
-        "io/arrow-expand.d.ts",
-        "io/arrow-graph-down-left.d.ts",
-        "io/arrow-graph-down-right.d.ts",
-        "io/arrow-graph-up-left.d.ts",
-        "io/arrow-graph-up-right.d.ts",
-        "io/arrow-left-a.d.ts",
-        "io/arrow-left-b.d.ts",
-        "io/arrow-left-c.d.ts",
-        "io/arrow-move.d.ts",
-        "io/arrow-resize.d.ts",
-        "io/arrow-return-left.d.ts",
-        "io/arrow-return-right.d.ts",
-        "io/arrow-right-a.d.ts",
-        "io/arrow-right-b.d.ts",
-        "io/arrow-right-c.d.ts",
-        "io/arrow-shrink.d.ts",
-        "io/arrow-swap.d.ts",
-        "io/arrow-up-a.d.ts",
-        "io/arrow-up-b.d.ts",
-        "io/arrow-up-c.d.ts",
-        "io/asterisk.d.ts",
-        "io/at.d.ts",
-        "io/backspace-outline.d.ts",
-        "io/backspace.d.ts",
-        "io/bag.d.ts",
-        "io/battery-charging.d.ts",
-        "io/battery-empty.d.ts",
-        "io/battery-full.d.ts",
-        "io/battery-half.d.ts",
-        "io/battery-low.d.ts",
-        "io/beaker.d.ts",
-        "io/beer.d.ts",
-        "io/bluetooth.d.ts",
-        "io/bonfire.d.ts",
-        "io/bookmark.d.ts",
-        "io/bowtie.d.ts",
-        "io/briefcase.d.ts",
-        "io/bug.d.ts",
-        "io/calculator.d.ts",
-        "io/calendar.d.ts",
-        "io/camera.d.ts",
-        "io/card.d.ts",
-        "io/cash.d.ts",
-        "io/chatbox-working.d.ts",
-        "io/chatbox.d.ts",
-        "io/chatboxes.d.ts",
-        "io/chatbubble-working.d.ts",
-        "io/chatbubble.d.ts",
-        "io/chatbubbles.d.ts",
-        "io/checkmark-circled.d.ts",
-        "io/checkmark-round.d.ts",
-        "io/checkmark.d.ts",
-        "io/chevron-down.d.ts",
-        "io/chevron-left.d.ts",
-        "io/chevron-right.d.ts",
-        "io/chevron-up.d.ts",
-        "io/clipboard.d.ts",
-        "io/clock.d.ts",
-        "io/close-circled.d.ts",
-        "io/close-round.d.ts",
-        "io/close.d.ts",
-        "io/closed-captioning.d.ts",
-        "io/cloud.d.ts",
-        "io/code-download.d.ts",
-        "io/code-working.d.ts",
-        "io/code.d.ts",
-        "io/coffee.d.ts",
-        "io/compass.d.ts",
-        "io/compose.d.ts",
-        "io/connectbars.d.ts",
-        "io/contrast.d.ts",
-        "io/crop.d.ts",
-        "io/cube.d.ts",
-        "io/disc.d.ts",
-        "io/document-text.d.ts",
-        "io/document.d.ts",
-        "io/drag.d.ts",
-        "io/earth.d.ts",
-        "io/easel.d.ts",
-        "io/edit.d.ts",
-        "io/egg.d.ts",
-        "io/eject.d.ts",
-        "io/email-unread.d.ts",
-        "io/email.d.ts",
-        "io/erlenmeyer-flask-bubbles.d.ts",
-        "io/erlenmeyer-flask.d.ts",
-        "io/eye-disabled.d.ts",
-        "io/eye.d.ts",
-        "io/female.d.ts",
-        "io/filing.d.ts",
-        "io/film-marker.d.ts",
-        "io/fireball.d.ts",
-        "io/flag.d.ts",
-        "io/flame.d.ts",
-        "io/flash-off.d.ts",
-        "io/flash.d.ts",
-        "io/folder.d.ts",
-        "io/fork-repo.d.ts",
-        "io/fork.d.ts",
-        "io/forward.d.ts",
-        "io/funnel.d.ts",
-        "io/gear-a.d.ts",
-        "io/gear-b.d.ts",
-        "io/grid.d.ts",
-        "io/hammer.d.ts",
-        "io/happy-outline.d.ts",
-        "io/happy.d.ts",
-        "io/headphone.d.ts",
-        "io/heart-broken.d.ts",
-        "io/heart.d.ts",
-        "io/help-buoy.d.ts",
-        "io/help-circled.d.ts",
-        "io/help.d.ts",
-        "io/home.d.ts",
-        "io/icecream.d.ts",
-        "io/image.d.ts",
-        "io/images.d.ts",
-        "io/informatcircled.d.ts",
-        "io/information.d.ts",
-        "io/ionic.d.ts",
-        "io/ios-alarm-outline.d.ts",
-        "io/ios-alarm.d.ts",
-        "io/ios-albums-outline.d.ts",
-        "io/ios-albums.d.ts",
-        "io/ios-americanfootball-outline.d.ts",
-        "io/ios-americanfootball.d.ts",
-        "io/ios-analytics-outline.d.ts",
-        "io/ios-analytics.d.ts",
-        "io/ios-arrow-back.d.ts",
-        "io/ios-arrow-down.d.ts",
-        "io/ios-arrow-forward.d.ts",
-        "io/ios-arrow-left.d.ts",
-        "io/ios-arrow-right.d.ts",
-        "io/ios-arrow-thin-down.d.ts",
-        "io/ios-arrow-thin-left.d.ts",
-        "io/ios-arrow-thin-right.d.ts",
-        "io/ios-arrow-thin-up.d.ts",
-        "io/ios-arrow-up.d.ts",
-        "io/ios-at-outline.d.ts",
-        "io/ios-at.d.ts",
-        "io/ios-barcode-outline.d.ts",
-        "io/ios-barcode.d.ts",
-        "io/ios-baseball-outline.d.ts",
-        "io/ios-baseball.d.ts",
-        "io/ios-basketball-outline.d.ts",
-        "io/ios-basketball.d.ts",
-        "io/ios-bell-outline.d.ts",
-        "io/ios-bell.d.ts",
-        "io/ios-body-outline.d.ts",
-        "io/ios-body.d.ts",
-        "io/ios-bolt-outline.d.ts",
-        "io/ios-bolt.d.ts",
-        "io/ios-book-outline.d.ts",
-        "io/ios-book.d.ts",
-        "io/ios-bookmarks-outline.d.ts",
-        "io/ios-bookmarks.d.ts",
-        "io/ios-box-outline.d.ts",
-        "io/ios-box.d.ts",
-        "io/ios-briefcase-outline.d.ts",
-        "io/ios-briefcase.d.ts",
-        "io/ios-browsers-outline.d.ts",
-        "io/ios-browsers.d.ts",
-        "io/ios-calculator-outline.d.ts",
-        "io/ios-calculator.d.ts",
-        "io/ios-calendar-outline.d.ts",
-        "io/ios-calendar.d.ts",
-        "io/ios-camera-outline.d.ts",
-        "io/ios-camera.d.ts",
-        "io/ios-cart-outline.d.ts",
-        "io/ios-cart.d.ts",
-        "io/ios-chatboxes-outline.d.ts",
-        "io/ios-chatboxes.d.ts",
-        "io/ios-chatbubble-outline.d.ts",
-        "io/ios-chatbubble.d.ts",
-        "io/ios-checkmark-empty.d.ts",
-        "io/ios-checkmark-outline.d.ts",
-        "io/ios-checkmark.d.ts",
-        "io/ios-circle-filled.d.ts",
-        "io/ios-circle-outline.d.ts",
-        "io/ios-clock-outline.d.ts",
-        "io/ios-clock.d.ts",
-        "io/ios-close-empty.d.ts",
-        "io/ios-close-outline.d.ts",
-        "io/ios-close.d.ts",
-        "io/ios-cloud-download-outline.d.ts",
-        "io/ios-cloud-download.d.ts",
-        "io/ios-cloud-outline.d.ts",
-        "io/ios-cloud-upload-outline.d.ts",
-        "io/ios-cloud-upload.d.ts",
-        "io/ios-cloud.d.ts",
-        "io/ios-cloudy-night-outline.d.ts",
-        "io/ios-cloudy-night.d.ts",
-        "io/ios-cloudy-outline.d.ts",
-        "io/ios-cloudy.d.ts",
-        "io/ios-cog-outline.d.ts",
-        "io/ios-cog.d.ts",
-        "io/ios-color-filter-outline.d.ts",
-        "io/ios-color-filter.d.ts",
-        "io/ios-color-wand-outline.d.ts",
-        "io/ios-color-wand.d.ts",
-        "io/ios-compose-outline.d.ts",
-        "io/ios-compose.d.ts",
-        "io/ios-contact-outline.d.ts",
-        "io/ios-contact.d.ts",
-        "io/ios-copy-outline.d.ts",
-        "io/ios-copy.d.ts",
-        "io/ios-crop-strong.d.ts",
-        "io/ios-crop.d.ts",
-        "io/ios-download-outline.d.ts",
-        "io/ios-download.d.ts",
-        "io/ios-drag.d.ts",
-        "io/ios-email-outline.d.ts",
-        "io/ios-email.d.ts",
-        "io/ios-eye-outline.d.ts",
-        "io/ios-eye.d.ts",
-        "io/ios-fastforward-outline.d.ts",
-        "io/ios-fastforward.d.ts",
-        "io/ios-filing-outline.d.ts",
-        "io/ios-filing.d.ts",
-        "io/ios-film-outline.d.ts",
-        "io/ios-film.d.ts",
-        "io/ios-flag-outline.d.ts",
-        "io/ios-flag.d.ts",
-        "io/ios-flame-outline.d.ts",
-        "io/ios-flame.d.ts",
-        "io/ios-flask-outline.d.ts",
-        "io/ios-flask.d.ts",
-        "io/ios-flower-outline.d.ts",
-        "io/ios-flower.d.ts",
-        "io/ios-folder-outline.d.ts",
-        "io/ios-folder.d.ts",
-        "io/ios-football-outline.d.ts",
-        "io/ios-football.d.ts",
-        "io/ios-game-controller-a-outline.d.ts",
-        "io/ios-game-controller-a.d.ts",
-        "io/ios-game-controller-b-outline.d.ts",
-        "io/ios-game-controller-b.d.ts",
-        "io/ios-gear-outline.d.ts",
-        "io/ios-gear.d.ts",
-        "io/ios-glasses-outline.d.ts",
-        "io/ios-glasses.d.ts",
-        "io/ios-grid-view-outline.d.ts",
-        "io/ios-grid-view.d.ts",
-        "io/ios-heart-outline.d.ts",
-        "io/ios-heart.d.ts",
-        "io/ios-help-empty.d.ts",
-        "io/ios-help-outline.d.ts",
-        "io/ios-help.d.ts",
-        "io/ios-home-outline.d.ts",
-        "io/ios-home.d.ts",
-        "io/ios-infinite-outline.d.ts",
-        "io/ios-infinite.d.ts",
-        "io/ios-informatempty.d.ts",
-        "io/ios-information.d.ts",
-        "io/ios-informatoutline.d.ts",
-        "io/ios-ionic-outline.d.ts",
-        "io/ios-keypad-outline.d.ts",
-        "io/ios-keypad.d.ts",
-        "io/ios-lightbulb-outline.d.ts",
-        "io/ios-lightbulb.d.ts",
-        "io/ios-list-outline.d.ts",
-        "io/ios-list.d.ts",
-        "io/ios-location.d.ts",
-        "io/ios-locatoutline.d.ts",
-        "io/ios-locked-outline.d.ts",
-        "io/ios-locked.d.ts",
-        "io/ios-loop-strong.d.ts",
-        "io/ios-loop.d.ts",
-        "io/ios-medical-outline.d.ts",
-        "io/ios-medical.d.ts",
-        "io/ios-medkit-outline.d.ts",
-        "io/ios-medkit.d.ts",
-        "io/ios-mic-off.d.ts",
-        "io/ios-mic-outline.d.ts",
-        "io/ios-mic.d.ts",
-        "io/ios-minus-empty.d.ts",
-        "io/ios-minus-outline.d.ts",
-        "io/ios-minus.d.ts",
-        "io/ios-monitor-outline.d.ts",
-        "io/ios-monitor.d.ts",
-        "io/ios-moon-outline.d.ts",
-        "io/ios-moon.d.ts",
-        "io/ios-more-outline.d.ts",
-        "io/ios-more.d.ts",
-        "io/ios-musical-note.d.ts",
-        "io/ios-musical-notes.d.ts",
-        "io/ios-navigate-outline.d.ts",
-        "io/ios-navigate.d.ts",
-        "io/ios-nutrition.d.ts",
-        "io/ios-nutritoutline.d.ts",
-        "io/ios-paper-outline.d.ts",
-        "io/ios-paper.d.ts",
-        "io/ios-paperplane-outline.d.ts",
-        "io/ios-paperplane.d.ts",
-        "io/ios-partlysunny-outline.d.ts",
-        "io/ios-partlysunny.d.ts",
-        "io/ios-pause-outline.d.ts",
-        "io/ios-pause.d.ts",
-        "io/ios-paw-outline.d.ts",
-        "io/ios-paw.d.ts",
-        "io/ios-people-outline.d.ts",
-        "io/ios-people.d.ts",
-        "io/ios-person-outline.d.ts",
-        "io/ios-person.d.ts",
-        "io/ios-personadd-outline.d.ts",
-        "io/ios-personadd.d.ts",
-        "io/ios-photos-outline.d.ts",
-        "io/ios-photos.d.ts",
-        "io/ios-pie-outline.d.ts",
-        "io/ios-pie.d.ts",
-        "io/ios-pint-outline.d.ts",
-        "io/ios-pint.d.ts",
-        "io/ios-play-outline.d.ts",
-        "io/ios-play.d.ts",
-        "io/ios-plus-empty.d.ts",
-        "io/ios-plus-outline.d.ts",
-        "io/ios-plus.d.ts",
-        "io/ios-pricetag-outline.d.ts",
-        "io/ios-pricetag.d.ts",
-        "io/ios-pricetags-outline.d.ts",
-        "io/ios-pricetags.d.ts",
-        "io/ios-printer-outline.d.ts",
-        "io/ios-printer.d.ts",
-        "io/ios-pulse-strong.d.ts",
-        "io/ios-pulse.d.ts",
-        "io/ios-rainy-outline.d.ts",
-        "io/ios-rainy.d.ts",
-        "io/ios-recording-outline.d.ts",
-        "io/ios-recording.d.ts",
-        "io/ios-redo-outline.d.ts",
-        "io/ios-redo.d.ts",
-        "io/ios-refresh-empty.d.ts",
-        "io/ios-refresh-outline.d.ts",
-        "io/ios-refresh.d.ts",
-        "io/ios-reload.d.ts",
-        "io/ios-reverse-camera-outline.d.ts",
-        "io/ios-reverse-camera.d.ts",
-        "io/ios-rewind-outline.d.ts",
-        "io/ios-rewind.d.ts",
-        "io/ios-rose-outline.d.ts",
-        "io/ios-rose.d.ts",
-        "io/ios-search-strong.d.ts",
-        "io/ios-search.d.ts",
-        "io/ios-settings-strong.d.ts",
-        "io/ios-settings.d.ts",
-        "io/ios-shuffle-strong.d.ts",
-        "io/ios-shuffle.d.ts",
-        "io/ios-skipbackward-outline.d.ts",
-        "io/ios-skipbackward.d.ts",
-        "io/ios-skipforward-outline.d.ts",
-        "io/ios-skipforward.d.ts",
-        "io/ios-snowy.d.ts",
-        "io/ios-speedometer-outline.d.ts",
-        "io/ios-speedometer.d.ts",
-        "io/ios-star-half.d.ts",
-        "io/ios-star-outline.d.ts",
-        "io/ios-star.d.ts",
-        "io/ios-stopwatch-outline.d.ts",
-        "io/ios-stopwatch.d.ts",
-        "io/ios-sunny-outline.d.ts",
-        "io/ios-sunny.d.ts",
-        "io/ios-telephone-outline.d.ts",
-        "io/ios-telephone.d.ts",
-        "io/ios-tennisball-outline.d.ts",
-        "io/ios-tennisball.d.ts",
-        "io/ios-thunderstorm-outline.d.ts",
-        "io/ios-thunderstorm.d.ts",
-        "io/ios-time-outline.d.ts",
-        "io/ios-time.d.ts",
-        "io/ios-timer-outline.d.ts",
-        "io/ios-timer.d.ts",
-        "io/ios-toggle-outline.d.ts",
-        "io/ios-toggle.d.ts",
-        "io/ios-trash-outline.d.ts",
-        "io/ios-trash.d.ts",
-        "io/ios-undo-outline.d.ts",
-        "io/ios-undo.d.ts",
-        "io/ios-unlocked-outline.d.ts",
-        "io/ios-unlocked.d.ts",
-        "io/ios-upload-outline.d.ts",
-        "io/ios-upload.d.ts",
-        "io/ios-videocam-outline.d.ts",
-        "io/ios-videocam.d.ts",
-        "io/ios-volume-high.d.ts",
-        "io/ios-volume-low.d.ts",
-        "io/ios-wineglass-outline.d.ts",
-        "io/ios-wineglass.d.ts",
-        "io/ios-world-outline.d.ts",
-        "io/ios-world.d.ts",
-        "io/ipad.d.ts",
-        "io/iphone.d.ts",
-        "io/ipod.d.ts",
-        "io/jet.d.ts",
-        "io/key.d.ts",
-        "io/knife.d.ts",
-        "io/laptop.d.ts",
-        "io/leaf.d.ts",
-        "io/levels.d.ts",
-        "io/lightbulb.d.ts",
-        "io/link.d.ts",
-        "io/load-a.d.ts",
-        "io/load-b.d.ts",
-        "io/load-c.d.ts",
-        "io/load-d.d.ts",
-        "io/location.d.ts",
-        "io/lock-combination.d.ts",
-        "io/locked.d.ts",
-        "io/log-in.d.ts",
-        "io/log-out.d.ts",
-        "io/loop.d.ts",
-        "io/magnet.d.ts",
-        "io/male.d.ts",
-        "io/man.d.ts",
-        "io/map.d.ts",
-        "io/medkit.d.ts",
-        "io/merge.d.ts",
-        "io/mic-a.d.ts",
-        "io/mic-b.d.ts",
-        "io/mic-c.d.ts",
-        "io/minus-circled.d.ts",
-        "io/minus-round.d.ts",
-        "io/minus.d.ts",
-        "io/model-s.d.ts",
-        "io/monitor.d.ts",
-        "io/more.d.ts",
-        "io/mouse.d.ts",
-        "io/music-note.d.ts",
-        "io/navicon-round.d.ts",
-        "io/navicon.d.ts",
-        "io/navigate.d.ts",
-        "io/network.d.ts",
-        "io/no-smoking.d.ts",
-        "io/nuclear.d.ts",
-        "io/outlet.d.ts",
-        "io/paintbrush.d.ts",
-        "io/paintbucket.d.ts",
-        "io/paper-airplane.d.ts",
-        "io/paperclip.d.ts",
-        "io/pause.d.ts",
-        "io/person-add.d.ts",
-        "io/person-stalker.d.ts",
-        "io/person.d.ts",
-        "io/pie-graph.d.ts",
-        "io/pin.d.ts",
-        "io/pinpoint.d.ts",
-        "io/pizza.d.ts",
-        "io/plane.d.ts",
-        "io/planet.d.ts",
-        "io/play.d.ts",
-        "io/playstation.d.ts",
-        "io/plus-circled.d.ts",
-        "io/plus-round.d.ts",
-        "io/plus.d.ts",
-        "io/podium.d.ts",
-        "io/pound.d.ts",
-        "io/power.d.ts",
-        "io/pricetag.d.ts",
-        "io/pricetags.d.ts",
-        "io/printer.d.ts",
-        "io/pull-request.d.ts",
-        "io/qr-scanner.d.ts",
-        "io/quote.d.ts",
-        "io/radio-waves.d.ts",
-        "io/record.d.ts",
-        "io/refresh.d.ts",
-        "io/reply-all.d.ts",
-        "io/reply.d.ts",
-        "io/ribbon-a.d.ts",
-        "io/ribbon-b.d.ts",
-        "io/sad-outline.d.ts",
-        "io/sad.d.ts",
-        "io/scissors.d.ts",
-        "io/search.d.ts",
-        "io/settings.d.ts",
-        "io/share.d.ts",
-        "io/shuffle.d.ts",
-        "io/skip-backward.d.ts",
-        "io/skip-forward.d.ts",
-        "io/social-android-outline.d.ts",
-        "io/social-android.d.ts",
-        "io/social-angular-outline.d.ts",
-        "io/social-angular.d.ts",
-        "io/social-apple-outline.d.ts",
-        "io/social-apple.d.ts",
-        "io/social-bitcoin-outline.d.ts",
-        "io/social-bitcoin.d.ts",
-        "io/social-buffer-outline.d.ts",
-        "io/social-buffer.d.ts",
-        "io/social-chrome-outline.d.ts",
-        "io/social-chrome.d.ts",
-        "io/social-codepen-outline.d.ts",
-        "io/social-codepen.d.ts",
-        "io/social-css3-outline.d.ts",
-        "io/social-css3.d.ts",
-        "io/social-designernews-outline.d.ts",
-        "io/social-designernews.d.ts",
-        "io/social-dribbble-outline.d.ts",
-        "io/social-dribbble.d.ts",
-        "io/social-dropbox-outline.d.ts",
-        "io/social-dropbox.d.ts",
-        "io/social-euro-outline.d.ts",
-        "io/social-euro.d.ts",
-        "io/social-facebook-outline.d.ts",
-        "io/social-facebook.d.ts",
-        "io/social-foursquare-outline.d.ts",
-        "io/social-foursquare.d.ts",
-        "io/social-freebsd-devil.d.ts",
-        "io/social-github-outline.d.ts",
-        "io/social-github.d.ts",
-        "io/social-google-outline.d.ts",
-        "io/social-google.d.ts",
-        "io/social-googleplus-outline.d.ts",
-        "io/social-googleplus.d.ts",
-        "io/social-hackernews-outline.d.ts",
-        "io/social-hackernews.d.ts",
-        "io/social-html5-outline.d.ts",
-        "io/social-html5.d.ts",
-        "io/social-instagram-outline.d.ts",
-        "io/social-instagram.d.ts",
-        "io/social-javascript-outline.d.ts",
-        "io/social-javascript.d.ts",
-        "io/social-linkedin-outline.d.ts",
-        "io/social-linkedin.d.ts",
-        "io/social-markdown.d.ts",
-        "io/social-nodejs.d.ts",
-        "io/social-octocat.d.ts",
-        "io/social-pinterest-outline.d.ts",
-        "io/social-pinterest.d.ts",
-        "io/social-python.d.ts",
-        "io/social-reddit-outline.d.ts",
-        "io/social-reddit.d.ts",
-        "io/social-rss-outline.d.ts",
-        "io/social-rss.d.ts",
-        "io/social-sass.d.ts",
-        "io/social-skype-outline.d.ts",
-        "io/social-skype.d.ts",
-        "io/social-snapchat-outline.d.ts",
-        "io/social-snapchat.d.ts",
-        "io/social-tumblr-outline.d.ts",
-        "io/social-tumblr.d.ts",
-        "io/social-tux.d.ts",
-        "io/social-twitch-outline.d.ts",
-        "io/social-twitch.d.ts",
-        "io/social-twitter-outline.d.ts",
-        "io/social-twitter.d.ts",
-        "io/social-usd-outline.d.ts",
-        "io/social-usd.d.ts",
-        "io/social-vimeo-outline.d.ts",
-        "io/social-vimeo.d.ts",
-        "io/social-whatsapp-outline.d.ts",
-        "io/social-whatsapp.d.ts",
-        "io/social-windows-outline.d.ts",
-        "io/social-windows.d.ts",
-        "io/social-wordpress-outline.d.ts",
-        "io/social-wordpress.d.ts",
-        "io/social-yahoo-outline.d.ts",
-        "io/social-yahoo.d.ts",
-        "io/social-yen-outline.d.ts",
-        "io/social-yen.d.ts",
-        "io/social-youtube-outline.d.ts",
-        "io/social-youtube.d.ts",
-        "io/soup-can-outline.d.ts",
-        "io/soup-can.d.ts",
-        "io/speakerphone.d.ts",
-        "io/speedometer.d.ts",
-        "io/spoon.d.ts",
-        "io/star.d.ts",
-        "io/stats-bars.d.ts",
-        "io/steam.d.ts",
-        "io/stop.d.ts",
-        "io/thermometer.d.ts",
-        "io/thumbsdown.d.ts",
-        "io/thumbsup.d.ts",
-        "io/toggle-filled.d.ts",
-        "io/toggle.d.ts",
-        "io/transgender.d.ts",
-        "io/trash-a.d.ts",
-        "io/trash-b.d.ts",
-        "io/trophy.d.ts",
-        "io/tshirt-outline.d.ts",
-        "io/tshirt.d.ts",
-        "io/umbrella.d.ts",
-        "io/university.d.ts",
-        "io/unlocked.d.ts",
-        "io/upload.d.ts",
-        "io/usb.d.ts",
-        "io/videocamera.d.ts",
-        "io/volume-high.d.ts",
-        "io/volume-low.d.ts",
-        "io/volume-medium.d.ts",
-        "io/volume-mute.d.ts",
-        "io/wand.d.ts",
-        "io/waterdrop.d.ts",
-        "io/wifi.d.ts",
-        "io/wineglass.d.ts",
-        "io/woman.d.ts",
-        "io/wrench.d.ts",
-        "io/xbox.d.ts",
-        "md/3d-rotation.d.ts",
-        "md/ac-unit.d.ts",
-        "md/access-alarm.d.ts",
-        "md/access-alarms.d.ts",
-        "md/access-time.d.ts",
-        "md/accessibility.d.ts",
-        "md/accessible.d.ts",
-        "md/account-balance-wallet.d.ts",
-        "md/account-balance.d.ts",
-        "md/account-box.d.ts",
-        "md/account-circle.d.ts",
-        "md/adb.d.ts",
-        "md/add-a-photo.d.ts",
-        "md/add-alarm.d.ts",
-        "md/add-alert.d.ts",
-        "md/add-box.d.ts",
-        "md/add-circle-outline.d.ts",
-        "md/add-circle.d.ts",
-        "md/add-location.d.ts",
-        "md/add-shopping-cart.d.ts",
-        "md/add-to-photos.d.ts",
-        "md/add-to-queue.d.ts",
-        "md/add.d.ts",
-        "md/adjust.d.ts",
-        "md/airline-seat-flat-angled.d.ts",
-        "md/airline-seat-flat.d.ts",
-        "md/airline-seat-individual-suite.d.ts",
-        "md/airline-seat-legroom-extra.d.ts",
-        "md/airline-seat-legroom-normal.d.ts",
-        "md/airline-seat-legroom-reduced.d.ts",
-        "md/airline-seat-recline-extra.d.ts",
-        "md/airline-seat-recline-normal.d.ts",
-        "md/airplanemode-active.d.ts",
-        "md/airplanemode-inactive.d.ts",
-        "md/airplay.d.ts",
-        "md/airport-shuttle.d.ts",
-        "md/alarm-add.d.ts",
-        "md/alarm-off.d.ts",
-        "md/alarm-on.d.ts",
-        "md/alarm.d.ts",
-        "md/album.d.ts",
-        "md/all-inclusive.d.ts",
-        "md/all-out.d.ts",
-        "md/android.d.ts",
-        "md/announcement.d.ts",
-        "md/apps.d.ts",
-        "md/archive.d.ts",
-        "md/arrow-back.d.ts",
-        "md/arrow-downward.d.ts",
-        "md/arrow-drop-down-circle.d.ts",
-        "md/arrow-drop-down.d.ts",
-        "md/arrow-drop-up.d.ts",
-        "md/arrow-forward.d.ts",
-        "md/arrow-upward.d.ts",
-        "md/art-track.d.ts",
-        "md/aspect-ratio.d.ts",
-        "md/assessment.d.ts",
-        "md/assignment-ind.d.ts",
-        "md/assignment-late.d.ts",
-        "md/assignment-return.d.ts",
-        "md/assignment-returned.d.ts",
-        "md/assignment-turned-in.d.ts",
-        "md/assignment.d.ts",
-        "md/assistant-photo.d.ts",
-        "md/assistant.d.ts",
-        "md/attach-file.d.ts",
-        "md/attach-money.d.ts",
-        "md/attachment.d.ts",
-        "md/audiotrack.d.ts",
-        "md/autorenew.d.ts",
-        "md/av-timer.d.ts",
-        "md/backspace.d.ts",
-        "md/backup.d.ts",
-        "md/battery-alert.d.ts",
-        "md/battery-charging-full.d.ts",
-        "md/battery-full.d.ts",
-        "md/battery-std.d.ts",
-        "md/battery-unknown.d.ts",
-        "md/beach-access.d.ts",
-        "md/beenhere.d.ts",
-        "md/block.d.ts",
-        "md/bluetooth-audio.d.ts",
-        "md/bluetooth-connected.d.ts",
-        "md/bluetooth-disabled.d.ts",
-        "md/bluetooth-searching.d.ts",
-        "md/bluetooth.d.ts",
-        "md/blur-circular.d.ts",
-        "md/blur-linear.d.ts",
-        "md/blur-off.d.ts",
-        "md/blur-on.d.ts",
-        "md/book.d.ts",
-        "md/bookmark-outline.d.ts",
-        "md/bookmark.d.ts",
-        "md/border-all.d.ts",
-        "md/border-bottom.d.ts",
-        "md/border-clear.d.ts",
-        "md/border-color.d.ts",
-        "md/border-horizontal.d.ts",
-        "md/border-inner.d.ts",
-        "md/border-left.d.ts",
-        "md/border-outer.d.ts",
-        "md/border-right.d.ts",
-        "md/border-style.d.ts",
-        "md/border-top.d.ts",
-        "md/border-vertical.d.ts",
-        "md/branding-watermark.d.ts",
-        "md/brightness-1.d.ts",
-        "md/brightness-2.d.ts",
-        "md/brightness-3.d.ts",
-        "md/brightness-4.d.ts",
-        "md/brightness-5.d.ts",
-        "md/brightness-6.d.ts",
-        "md/brightness-7.d.ts",
-        "md/brightness-auto.d.ts",
-        "md/brightness-high.d.ts",
-        "md/brightness-low.d.ts",
-        "md/brightness-medium.d.ts",
-        "md/broken-image.d.ts",
-        "md/brush.d.ts",
-        "md/bubble-chart.d.ts",
-        "md/bug-report.d.ts",
-        "md/build.d.ts",
-        "md/burst-mode.d.ts",
-        "md/business-center.d.ts",
-        "md/business.d.ts",
-        "md/cached.d.ts",
-        "md/cake.d.ts",
-        "md/call-end.d.ts",
-        "md/call-made.d.ts",
-        "md/call-merge.d.ts",
-        "md/call-missed-outgoing.d.ts",
-        "md/call-missed.d.ts",
-        "md/call-received.d.ts",
-        "md/call-split.d.ts",
-        "md/call-to-action.d.ts",
-        "md/call.d.ts",
-        "md/camera-alt.d.ts",
-        "md/camera-enhance.d.ts",
-        "md/camera-front.d.ts",
-        "md/camera-rear.d.ts",
-        "md/camera-roll.d.ts",
-        "md/camera.d.ts",
-        "md/cancel.d.ts",
-        "md/card-giftcard.d.ts",
-        "md/card-membership.d.ts",
-        "md/card-travel.d.ts",
-        "md/casino.d.ts",
-        "md/cast-connected.d.ts",
-        "md/cast.d.ts",
-        "md/center-focus-strong.d.ts",
-        "md/center-focus-weak.d.ts",
-        "md/change-history.d.ts",
-        "md/chat-bubble-outline.d.ts",
-        "md/chat-bubble.d.ts",
-        "md/chat.d.ts",
-        "md/check-box-outline-blank.d.ts",
-        "md/check-box.d.ts",
-        "md/check-circle.d.ts",
-        "md/check.d.ts",
-        "md/chevron-left.d.ts",
-        "md/chevron-right.d.ts",
-        "md/child-care.d.ts",
-        "md/child-friendly.d.ts",
-        "md/chrome-reader-mode.d.ts",
-        "md/class.d.ts",
-        "md/clear-all.d.ts",
-        "md/clear.d.ts",
-        "md/close.d.ts",
-        "md/closed-caption.d.ts",
-        "md/cloud-circle.d.ts",
-        "md/cloud-done.d.ts",
-        "md/cloud-download.d.ts",
-        "md/cloud-off.d.ts",
-        "md/cloud-queue.d.ts",
-        "md/cloud-upload.d.ts",
-        "md/cloud.d.ts",
-        "md/code.d.ts",
-        "md/collections-bookmark.d.ts",
-        "md/collections.d.ts",
-        "md/color-lens.d.ts",
-        "md/colorize.d.ts",
-        "md/comment.d.ts",
-        "md/compare-arrows.d.ts",
-        "md/compare.d.ts",
-        "md/computer.d.ts",
-        "md/confirmation-number.d.ts",
-        "md/contact-mail.d.ts",
-        "md/contact-phone.d.ts",
-        "md/contacts.d.ts",
-        "md/content-copy.d.ts",
-        "md/content-cut.d.ts",
-        "md/content-paste.d.ts",
-        "md/control-point-duplicate.d.ts",
-        "md/control-point.d.ts",
-        "md/copyright.d.ts",
-        "md/create-new-folder.d.ts",
-        "md/create.d.ts",
-        "md/credit-card.d.ts",
-        "md/crop-16-9.d.ts",
-        "md/crop-3-2.d.ts",
-        "md/crop-5-4.d.ts",
-        "md/crop-7-5.d.ts",
-        "md/crop-din.d.ts",
-        "md/crop-free.d.ts",
-        "md/crop-landscape.d.ts",
-        "md/crop-original.d.ts",
-        "md/crop-portrait.d.ts",
-        "md/crop-rotate.d.ts",
-        "md/crop-square.d.ts",
-        "md/crop.d.ts",
-        "md/dashboard.d.ts",
-        "md/data-usage.d.ts",
-        "md/date-range.d.ts",
-        "md/dehaze.d.ts",
-        "md/delete-forever.d.ts",
-        "md/delete-sweep.d.ts",
-        "md/delete.d.ts",
-        "md/description.d.ts",
-        "md/desktop-mac.d.ts",
-        "md/desktop-windows.d.ts",
-        "md/details.d.ts",
-        "md/developer-board.d.ts",
-        "md/developer-mode.d.ts",
-        "md/device-hub.d.ts",
-        "md/devices-other.d.ts",
-        "md/devices.d.ts",
-        "md/dialer-sip.d.ts",
-        "md/dialpad.d.ts",
-        "md/directions-bike.d.ts",
-        "md/directions-boat.d.ts",
-        "md/directions-bus.d.ts",
-        "md/directions-car.d.ts",
-        "md/directions-ferry.d.ts",
-        "md/directions-railway.d.ts",
-        "md/directions-run.d.ts",
-        "md/directions-subway.d.ts",
-        "md/directions-transit.d.ts",
-        "md/directions-walk.d.ts",
-        "md/directions.d.ts",
-        "md/disc-full.d.ts",
-        "md/dns.d.ts",
-        "md/do-not-disturb-alt.d.ts",
-        "md/do-not-disturb-off.d.ts",
-        "md/do-not-disturb.d.ts",
-        "md/dock.d.ts",
-        "md/domain.d.ts",
-        "md/done-all.d.ts",
-        "md/done.d.ts",
-        "md/donut-large.d.ts",
-        "md/donut-small.d.ts",
-        "md/drafts.d.ts",
-        "md/drag-handle.d.ts",
-        "md/drive-eta.d.ts",
-        "md/dvr.d.ts",
-        "md/edit-location.d.ts",
-        "md/edit.d.ts",
-        "md/eject.d.ts",
-        "md/email.d.ts",
-        "md/enhanced-encryption.d.ts",
-        "md/equalizer.d.ts",
-        "md/error-outline.d.ts",
-        "md/error.d.ts",
-        "md/euro-symbol.d.ts",
-        "md/ev-station.d.ts",
-        "md/event-available.d.ts",
-        "md/event-busy.d.ts",
-        "md/event-note.d.ts",
-        "md/event-seat.d.ts",
-        "md/event.d.ts",
-        "md/exit-to-app.d.ts",
-        "md/expand-less.d.ts",
-        "md/expand-more.d.ts",
-        "md/explicit.d.ts",
-        "md/explore.d.ts",
-        "md/exposure-minus-1.d.ts",
-        "md/exposure-minus-2.d.ts",
-        "md/exposure-neg-1.d.ts",
-        "md/exposure-neg-2.d.ts",
-        "md/exposure-plus-1.d.ts",
-        "md/exposure-plus-2.d.ts",
-        "md/exposure-zero.d.ts",
-        "md/exposure.d.ts",
-        "md/extension.d.ts",
-        "md/face.d.ts",
-        "md/fast-forward.d.ts",
-        "md/fast-rewind.d.ts",
-        "md/favorite-border.d.ts",
-        "md/favorite-outline.d.ts",
-        "md/favorite.d.ts",
-        "md/featured-play-list.d.ts",
-        "md/featured-video.d.ts",
-        "md/feedback.d.ts",
-        "md/fiber-dvr.d.ts",
-        "md/fiber-manual-record.d.ts",
-        "md/fiber-new.d.ts",
-        "md/fiber-pin.d.ts",
-        "md/fiber-smart-record.d.ts",
-        "md/file-download.d.ts",
-        "md/file-upload.d.ts",
-        "md/filter-1.d.ts",
-        "md/filter-2.d.ts",
-        "md/filter-3.d.ts",
-        "md/filter-4.d.ts",
-        "md/filter-5.d.ts",
-        "md/filter-6.d.ts",
-        "md/filter-7.d.ts",
-        "md/filter-8.d.ts",
-        "md/filter-9-plus.d.ts",
-        "md/filter-9.d.ts",
-        "md/filter-b-and-w.d.ts",
-        "md/filter-center-focus.d.ts",
-        "md/filter-drama.d.ts",
-        "md/filter-frames.d.ts",
-        "md/filter-hdr.d.ts",
-        "md/filter-list.d.ts",
-        "md/filter-none.d.ts",
-        "md/filter-tilt-shift.d.ts",
-        "md/filter-vintage.d.ts",
-        "md/filter.d.ts",
-        "md/find-in-page.d.ts",
-        "md/find-replace.d.ts",
-        "md/fingerprint.d.ts",
-        "md/first-page.d.ts",
-        "md/fitness-center.d.ts",
-        "md/flag.d.ts",
-        "md/flare.d.ts",
-        "md/flash-auto.d.ts",
-        "md/flash-off.d.ts",
-        "md/flash-on.d.ts",
-        "md/flight-land.d.ts",
-        "md/flight-takeoff.d.ts",
-        "md/flight.d.ts",
-        "md/flip-to-back.d.ts",
-        "md/flip-to-front.d.ts",
-        "md/flip.d.ts",
-        "md/folder-open.d.ts",
-        "md/folder-shared.d.ts",
-        "md/folder-special.d.ts",
-        "md/folder.d.ts",
-        "md/font-download.d.ts",
-        "md/format-align-center.d.ts",
-        "md/format-align-justify.d.ts",
-        "md/format-align-left.d.ts",
-        "md/format-align-right.d.ts",
-        "md/format-bold.d.ts",
-        "md/format-clear.d.ts",
-        "md/format-color-fill.d.ts",
-        "md/format-color-reset.d.ts",
-        "md/format-color-text.d.ts",
-        "md/format-indent-decrease.d.ts",
-        "md/format-indent-increase.d.ts",
-        "md/format-italic.d.ts",
-        "md/format-line-spacing.d.ts",
-        "md/format-list-bulleted.d.ts",
-        "md/format-list-numbered.d.ts",
-        "md/format-paint.d.ts",
-        "md/format-quote.d.ts",
-        "md/format-shapes.d.ts",
-        "md/format-size.d.ts",
-        "md/format-strikethrough.d.ts",
-        "md/format-textdirection-l-to-r.d.ts",
-        "md/format-textdirection-r-to-l.d.ts",
-        "md/format-underlined.d.ts",
-        "md/forum.d.ts",
-        "md/forward-10.d.ts",
-        "md/forward-30.d.ts",
-        "md/forward-5.d.ts",
-        "md/forward.d.ts",
-        "md/free-breakfast.d.ts",
-        "md/fullscreen-exit.d.ts",
-        "md/fullscreen.d.ts",
-        "md/functions.d.ts",
-        "md/g-translate.d.ts",
-        "md/gamepad.d.ts",
-        "md/games.d.ts",
-        "md/gavel.d.ts",
-        "md/gesture.d.ts",
-        "md/get-app.d.ts",
-        "md/gif.d.ts",
-        "md/goat.d.ts",
-        "md/golf-course.d.ts",
-        "md/gps-fixed.d.ts",
-        "md/gps-not-fixed.d.ts",
-        "md/gps-off.d.ts",
-        "md/grade.d.ts",
-        "md/gradient.d.ts",
-        "md/grain.d.ts",
-        "md/graphic-eq.d.ts",
-        "md/grid-off.d.ts",
-        "md/grid-on.d.ts",
-        "md/group-add.d.ts",
-        "md/group-work.d.ts",
-        "md/group.d.ts",
-        "md/hd.d.ts",
-        "md/hdr-off.d.ts",
-        "md/hdr-on.d.ts",
-        "md/hdr-strong.d.ts",
-        "md/hdr-weak.d.ts",
-        "md/headset-mic.d.ts",
-        "md/headset.d.ts",
-        "md/healing.d.ts",
-        "md/hearing.d.ts",
-        "md/help-outline.d.ts",
-        "md/help.d.ts",
-        "md/high-quality.d.ts",
-        "md/highlight-off.d.ts",
-        "md/highlight-remove.d.ts",
-        "md/highlight.d.ts",
-        "md/history.d.ts",
-        "md/home.d.ts",
-        "md/hot-tub.d.ts",
-        "md/hotel.d.ts",
-        "md/hourglass-empty.d.ts",
-        "md/hourglass-full.d.ts",
-        "md/http.d.ts",
-        "md/https.d.ts",
-        "md/image-aspect-ratio.d.ts",
-        "md/image.d.ts",
-        "md/import-contacts.d.ts",
-        "md/import-export.d.ts",
-        "md/important-devices.d.ts",
-        "md/inbox.d.ts",
-        "md/indeterminate-check-box.d.ts",
-        "md/info-outline.d.ts",
-        "md/info.d.ts",
-        "md/input.d.ts",
-        "md/insert-chart.d.ts",
-        "md/insert-comment.d.ts",
-        "md/insert-drive-file.d.ts",
-        "md/insert-emoticon.d.ts",
-        "md/insert-invitation.d.ts",
-        "md/insert-link.d.ts",
-        "md/insert-photo.d.ts",
-        "md/invert-colors-off.d.ts",
-        "md/invert-colors-on.d.ts",
-        "md/invert-colors.d.ts",
-        "md/iso.d.ts",
-        "md/keyboard-arrow-down.d.ts",
-        "md/keyboard-arrow-left.d.ts",
-        "md/keyboard-arrow-right.d.ts",
-        "md/keyboard-arrow-up.d.ts",
-        "md/keyboard-backspace.d.ts",
-        "md/keyboard-capslock.d.ts",
-        "md/keyboard-control.d.ts",
-        "md/keyboard-hide.d.ts",
-        "md/keyboard-return.d.ts",
-        "md/keyboard-tab.d.ts",
-        "md/keyboard-voice.d.ts",
-        "md/keyboard.d.ts",
-        "md/kitchen.d.ts",
-        "md/label-outline.d.ts",
-        "md/label.d.ts",
-        "md/landscape.d.ts",
-        "md/language.d.ts",
-        "md/laptop-chromebook.d.ts",
-        "md/laptop-mac.d.ts",
-        "md/laptop-windows.d.ts",
-        "md/laptop.d.ts",
-        "md/last-page.d.ts",
-        "md/launch.d.ts",
-        "md/layers-clear.d.ts",
-        "md/layers.d.ts",
-        "md/leak-add.d.ts",
-        "md/leak-remove.d.ts",
-        "md/lens.d.ts",
-        "md/library-add.d.ts",
-        "md/library-books.d.ts",
-        "md/library-music.d.ts",
-        "md/lightbulb-outline.d.ts",
-        "md/line-style.d.ts",
-        "md/line-weight.d.ts",
-        "md/linear-scale.d.ts",
-        "md/link.d.ts",
-        "md/linked-camera.d.ts",
-        "md/list.d.ts",
-        "md/live-help.d.ts",
-        "md/live-tv.d.ts",
-        "md/local-airport.d.ts",
-        "md/local-atm.d.ts",
-        "md/local-attraction.d.ts",
-        "md/local-bar.d.ts",
-        "md/local-cafe.d.ts",
-        "md/local-car-wash.d.ts",
-        "md/local-convenience-store.d.ts",
-        "md/local-drink.d.ts",
-        "md/local-florist.d.ts",
-        "md/local-gas-station.d.ts",
-        "md/local-grocery-store.d.ts",
-        "md/local-hospital.d.ts",
-        "md/local-hotel.d.ts",
-        "md/local-laundry-service.d.ts",
-        "md/local-library.d.ts",
-        "md/local-mall.d.ts",
-        "md/local-movies.d.ts",
-        "md/local-offer.d.ts",
-        "md/local-parking.d.ts",
-        "md/local-pharmacy.d.ts",
-        "md/local-phone.d.ts",
-        "md/local-pizza.d.ts",
-        "md/local-play.d.ts",
-        "md/local-post-office.d.ts",
-        "md/local-print-shop.d.ts",
-        "md/local-restaurant.d.ts",
-        "md/local-see.d.ts",
-        "md/local-shipping.d.ts",
-        "md/local-taxi.d.ts",
-        "md/location-city.d.ts",
-        "md/location-disabled.d.ts",
-        "md/location-history.d.ts",
-        "md/location-off.d.ts",
-        "md/location-on.d.ts",
-        "md/location-searching.d.ts",
-        "md/lock-open.d.ts",
-        "md/lock-outline.d.ts",
-        "md/lock.d.ts",
-        "md/looks-3.d.ts",
-        "md/looks-4.d.ts",
-        "md/looks-5.d.ts",
-        "md/looks-6.d.ts",
-        "md/looks-one.d.ts",
-        "md/looks-two.d.ts",
-        "md/looks.d.ts",
-        "md/loop.d.ts",
-        "md/loupe.d.ts",
-        "md/low-priority.d.ts",
-        "md/loyalty.d.ts",
-        "md/mail-outline.d.ts",
-        "md/mail.d.ts",
-        "md/map.d.ts",
-        "md/markunread-mailbox.d.ts",
-        "md/markunread.d.ts",
-        "md/memory.d.ts",
-        "md/menu.d.ts",
-        "md/merge-type.d.ts",
-        "md/message.d.ts",
-        "md/mic-none.d.ts",
-        "md/mic-off.d.ts",
-        "md/mic.d.ts",
-        "md/mms.d.ts",
-        "md/mode-comment.d.ts",
-        "md/mode-edit.d.ts",
-        "md/monetization-on.d.ts",
-        "md/money-off.d.ts",
-        "md/monochrome-photos.d.ts",
-        "md/mood-bad.d.ts",
-        "md/mood.d.ts",
-        "md/more-horiz.d.ts",
-        "md/more-vert.d.ts",
-        "md/more.d.ts",
-        "md/motorcycle.d.ts",
-        "md/mouse.d.ts",
-        "md/move-to-inbox.d.ts",
-        "md/movie-creation.d.ts",
-        "md/movie-filter.d.ts",
-        "md/movie.d.ts",
-        "md/multiline-chart.d.ts",
-        "md/music-note.d.ts",
-        "md/music-video.d.ts",
-        "md/my-location.d.ts",
-        "md/nature-people.d.ts",
-        "md/nature.d.ts",
-        "md/navigate-before.d.ts",
-        "md/navigate-next.d.ts",
-        "md/navigation.d.ts",
-        "md/near-me.d.ts",
-        "md/network-cell.d.ts",
-        "md/network-check.d.ts",
-        "md/network-locked.d.ts",
-        "md/network-wifi.d.ts",
-        "md/new-releases.d.ts",
-        "md/next-week.d.ts",
-        "md/nfc.d.ts",
-        "md/no-encryption.d.ts",
-        "md/no-sim.d.ts",
-        "md/not-interested.d.ts",
-        "md/note-add.d.ts",
-        "md/note.d.ts",
-        "md/notifications-active.d.ts",
-        "md/notifications-none.d.ts",
-        "md/notifications-off.d.ts",
-        "md/notifications-paused.d.ts",
-        "md/notifications.d.ts",
-        "md/now-wallpaper.d.ts",
-        "md/now-widgets.d.ts",
-        "md/offline-pin.d.ts",
-        "md/ondemand-video.d.ts",
-        "md/opacity.d.ts",
-        "md/open-in-browser.d.ts",
-        "md/open-in-new.d.ts",
-        "md/open-with.d.ts",
-        "md/pages.d.ts",
-        "md/pageview.d.ts",
-        "md/palette.d.ts",
-        "md/pan-tool.d.ts",
-        "md/panorama-fish-eye.d.ts",
-        "md/panorama-horizontal.d.ts",
-        "md/panorama-vertical.d.ts",
-        "md/panorama-wide-angle.d.ts",
-        "md/panorama.d.ts",
-        "md/party-mode.d.ts",
-        "md/pause-circle-filled.d.ts",
-        "md/pause-circle-outline.d.ts",
-        "md/pause.d.ts",
-        "md/payment.d.ts",
-        "md/people-outline.d.ts",
-        "md/people.d.ts",
-        "md/perm-camera-mic.d.ts",
-        "md/perm-contact-calendar.d.ts",
-        "md/perm-data-setting.d.ts",
-        "md/perm-device-information.d.ts",
-        "md/perm-identity.d.ts",
-        "md/perm-media.d.ts",
-        "md/perm-phone-msg.d.ts",
-        "md/perm-scan-wifi.d.ts",
-        "md/person-add.d.ts",
-        "md/person-outline.d.ts",
-        "md/person-pin-circle.d.ts",
-        "md/person-pin.d.ts",
-        "md/person.d.ts",
-        "md/personal-video.d.ts",
-        "md/pets.d.ts",
-        "md/phone-android.d.ts",
-        "md/phone-bluetooth-speaker.d.ts",
-        "md/phone-forwarded.d.ts",
-        "md/phone-in-talk.d.ts",
-        "md/phone-iphone.d.ts",
-        "md/phone-locked.d.ts",
-        "md/phone-missed.d.ts",
-        "md/phone-paused.d.ts",
-        "md/phone.d.ts",
-        "md/phonelink-erase.d.ts",
-        "md/phonelink-lock.d.ts",
-        "md/phonelink-off.d.ts",
-        "md/phonelink-ring.d.ts",
-        "md/phonelink-setup.d.ts",
-        "md/phonelink.d.ts",
-        "md/photo-album.d.ts",
-        "md/photo-camera.d.ts",
-        "md/photo-filter.d.ts",
-        "md/photo-library.d.ts",
-        "md/photo-size-select-actual.d.ts",
-        "md/photo-size-select-large.d.ts",
-        "md/photo-size-select-small.d.ts",
-        "md/photo.d.ts",
-        "md/picture-as-pdf.d.ts",
-        "md/picture-in-picture-alt.d.ts",
-        "md/picture-in-picture.d.ts",
-        "md/pie-chart-outlined.d.ts",
-        "md/pie-chart.d.ts",
-        "md/pin-drop.d.ts",
-        "md/place.d.ts",
-        "md/play-arrow.d.ts",
-        "md/play-circle-filled.d.ts",
-        "md/play-circle-outline.d.ts",
-        "md/play-for-work.d.ts",
-        "md/playlist-add-check.d.ts",
-        "md/playlist-add.d.ts",
-        "md/playlist-play.d.ts",
-        "md/plus-one.d.ts",
-        "md/poll.d.ts",
-        "md/polymer.d.ts",
-        "md/pool.d.ts",
-        "md/portable-wifi-off.d.ts",
-        "md/portrait.d.ts",
-        "md/power-input.d.ts",
-        "md/power-settings-new.d.ts",
-        "md/power.d.ts",
-        "md/pregnant-woman.d.ts",
-        "md/present-to-all.d.ts",
-        "md/print.d.ts",
-        "md/priority-high.d.ts",
-        "md/public.d.ts",
-        "md/publish.d.ts",
-        "md/query-builder.d.ts",
-        "md/question-answer.d.ts",
-        "md/queue-music.d.ts",
-        "md/queue-play-next.d.ts",
-        "md/queue.d.ts",
-        "md/radio-button-checked.d.ts",
-        "md/radio-button-unchecked.d.ts",
-        "md/radio.d.ts",
-        "md/rate-review.d.ts",
-        "md/receipt.d.ts",
-        "md/recent-actors.d.ts",
-        "md/record-voice-over.d.ts",
-        "md/redeem.d.ts",
-        "md/redo.d.ts",
-        "md/refresh.d.ts",
-        "md/remove-circle-outline.d.ts",
-        "md/remove-circle.d.ts",
-        "md/remove-from-queue.d.ts",
-        "md/remove-red-eye.d.ts",
-        "md/remove-shopping-cart.d.ts",
-        "md/remove.d.ts",
-        "md/reorder.d.ts",
-        "md/repeat-one.d.ts",
-        "md/repeat.d.ts",
-        "md/replay-10.d.ts",
-        "md/replay-30.d.ts",
-        "md/replay-5.d.ts",
-        "md/replay.d.ts",
-        "md/reply-all.d.ts",
-        "md/reply.d.ts",
-        "md/report-problem.d.ts",
-        "md/report.d.ts",
-        "md/restaurant-menu.d.ts",
-        "md/restaurant.d.ts",
-        "md/restore-page.d.ts",
-        "md/restore.d.ts",
-        "md/ring-volume.d.ts",
-        "md/room-service.d.ts",
-        "md/room.d.ts",
-        "md/rotate-90-degrees-ccw.d.ts",
-        "md/rotate-left.d.ts",
-        "md/rotate-right.d.ts",
-        "md/rounded-corner.d.ts",
-        "md/router.d.ts",
-        "md/rowing.d.ts",
-        "md/rss-feed.d.ts",
-        "md/rv-hookup.d.ts",
-        "md/satellite.d.ts",
-        "md/save.d.ts",
-        "md/scanner.d.ts",
-        "md/schedule.d.ts",
-        "md/school.d.ts",
-        "md/screen-lock-landscape.d.ts",
-        "md/screen-lock-portrait.d.ts",
-        "md/screen-lock-rotation.d.ts",
-        "md/screen-rotation.d.ts",
-        "md/screen-share.d.ts",
-        "md/sd-card.d.ts",
-        "md/sd-storage.d.ts",
-        "md/search.d.ts",
-        "md/security.d.ts",
-        "md/select-all.d.ts",
-        "md/send.d.ts",
-        "md/sentiment-dissatisfied.d.ts",
-        "md/sentiment-neutral.d.ts",
-        "md/sentiment-satisfied.d.ts",
-        "md/sentiment-very-dissatisfied.d.ts",
-        "md/sentiment-very-satisfied.d.ts",
-        "md/settings-applications.d.ts",
-        "md/settings-backup-restore.d.ts",
-        "md/settings-bluetooth.d.ts",
-        "md/settings-brightness.d.ts",
-        "md/settings-cell.d.ts",
-        "md/settings-ethernet.d.ts",
-        "md/settings-input-antenna.d.ts",
-        "md/settings-input-component.d.ts",
-        "md/settings-input-composite.d.ts",
-        "md/settings-input-hdmi.d.ts",
-        "md/settings-input-svideo.d.ts",
-        "md/settings-overscan.d.ts",
-        "md/settings-phone.d.ts",
-        "md/settings-power.d.ts",
-        "md/settings-remote.d.ts",
-        "md/settings-system-daydream.d.ts",
-        "md/settings-voice.d.ts",
-        "md/settings.d.ts",
-        "md/share.d.ts",
-        "md/shop-two.d.ts",
-        "md/shop.d.ts",
-        "md/shopping-basket.d.ts",
-        "md/shopping-cart.d.ts",
-        "md/short-text.d.ts",
-        "md/show-chart.d.ts",
-        "md/shuffle.d.ts",
-        "md/signal-cellular-4-bar.d.ts",
-        "md/signal-cellular-connected-no-internet-4-bar.d.ts",
-        "md/signal-cellular-no-sim.d.ts",
-        "md/signal-cellular-null.d.ts",
-        "md/signal-cellular-off.d.ts",
-        "md/signal-wifi-4-bar-lock.d.ts",
-        "md/signal-wifi-4-bar.d.ts",
-        "md/signal-wifi-off.d.ts",
-        "md/sim-card-alert.d.ts",
-        "md/sim-card.d.ts",
-        "md/skip-next.d.ts",
-        "md/skip-previous.d.ts",
-        "md/slideshow.d.ts",
-        "md/slow-motion-video.d.ts",
-        "md/smartphone.d.ts",
-        "md/smoke-free.d.ts",
-        "md/smoking-rooms.d.ts",
-        "md/sms-failed.d.ts",
-        "md/sms.d.ts",
-        "md/snooze.d.ts",
-        "md/sort-by-alpha.d.ts",
-        "md/sort.d.ts",
-        "md/spa.d.ts",
-        "md/space-bar.d.ts",
-        "md/speaker-group.d.ts",
-        "md/speaker-notes-off.d.ts",
-        "md/speaker-notes.d.ts",
-        "md/speaker-phone.d.ts",
-        "md/speaker.d.ts",
-        "md/spellcheck.d.ts",
-        "md/star-border.d.ts",
-        "md/star-half.d.ts",
-        "md/star-outline.d.ts",
-        "md/star.d.ts",
-        "md/stars.d.ts",
-        "md/stay-current-landscape.d.ts",
-        "md/stay-current-portrait.d.ts",
-        "md/stay-primary-landscape.d.ts",
-        "md/stay-primary-portrait.d.ts",
-        "md/stop-screen-share.d.ts",
-        "md/stop.d.ts",
-        "md/storage.d.ts",
-        "md/store-mall-directory.d.ts",
-        "md/store.d.ts",
-        "md/straighten.d.ts",
-        "md/streetview.d.ts",
-        "md/strikethrough-s.d.ts",
-        "md/style.d.ts",
-        "md/subdirectory-arrow-left.d.ts",
-        "md/subdirectory-arrow-right.d.ts",
-        "md/subject.d.ts",
-        "md/subscriptions.d.ts",
-        "md/subtitles.d.ts",
-        "md/subway.d.ts",
-        "md/supervisor-account.d.ts",
-        "md/surround-sound.d.ts",
-        "md/swap-calls.d.ts",
-        "md/swap-horiz.d.ts",
-        "md/swap-vert.d.ts",
-        "md/swap-vertical-circle.d.ts",
-        "md/switch-camera.d.ts",
-        "md/switch-video.d.ts",
-        "md/sync-disabled.d.ts",
-        "md/sync-problem.d.ts",
-        "md/sync.d.ts",
-        "md/system-update-alt.d.ts",
-        "md/system-update.d.ts",
-        "md/tab-unselected.d.ts",
-        "md/tab.d.ts",
-        "md/tablet-android.d.ts",
-        "md/tablet-mac.d.ts",
-        "md/tablet.d.ts",
-        "md/tag-faces.d.ts",
-        "md/tap-and-play.d.ts",
-        "md/terrain.d.ts",
-        "md/text-fields.d.ts",
-        "md/text-format.d.ts",
-        "md/textsms.d.ts",
-        "md/texture.d.ts",
-        "md/theaters.d.ts",
-        "md/thumb-down.d.ts",
-        "md/thumb-up.d.ts",
-        "md/thumbs-up-down.d.ts",
-        "md/time-to-leave.d.ts",
-        "md/timelapse.d.ts",
-        "md/timeline.d.ts",
-        "md/timer-10.d.ts",
-        "md/timer-3.d.ts",
-        "md/timer-off.d.ts",
-        "md/timer.d.ts",
-        "md/title.d.ts",
-        "md/toc.d.ts",
-        "md/today.d.ts",
-        "md/toll.d.ts",
-        "md/tonality.d.ts",
-        "md/touch-app.d.ts",
-        "md/toys.d.ts",
-        "md/track-changes.d.ts",
-        "md/traffic.d.ts",
-        "md/train.d.ts",
-        "md/tram.d.ts",
-        "md/transfer-within-a-station.d.ts",
-        "md/transform.d.ts",
-        "md/translate.d.ts",
-        "md/trending-down.d.ts",
-        "md/trending-flat.d.ts",
-        "md/trending-neutral.d.ts",
-        "md/trending-up.d.ts",
-        "md/tune.d.ts",
-        "md/turned-in-not.d.ts",
-        "md/turned-in.d.ts",
-        "md/tv.d.ts",
-        "md/unarchive.d.ts",
-        "md/undo.d.ts",
-        "md/unfold-less.d.ts",
-        "md/unfold-more.d.ts",
-        "md/update.d.ts",
-        "md/usb.d.ts",
-        "md/verified-user.d.ts",
-        "md/vertical-align-bottom.d.ts",
-        "md/vertical-align-center.d.ts",
-        "md/vertical-align-top.d.ts",
-        "md/vibration.d.ts",
-        "md/video-call.d.ts",
-        "md/video-collection.d.ts",
-        "md/video-label.d.ts",
-        "md/video-library.d.ts",
-        "md/videocam-off.d.ts",
-        "md/videocam.d.ts",
-        "md/videogame-asset.d.ts",
-        "md/view-agenda.d.ts",
-        "md/view-array.d.ts",
-        "md/view-carousel.d.ts",
-        "md/view-column.d.ts",
-        "md/view-comfortable.d.ts",
-        "md/view-comfy.d.ts",
-        "md/view-compact.d.ts",
-        "md/view-day.d.ts",
-        "md/view-headline.d.ts",
-        "md/view-list.d.ts",
-        "md/view-module.d.ts",
-        "md/view-quilt.d.ts",
-        "md/view-stream.d.ts",
-        "md/view-week.d.ts",
-        "md/vignette.d.ts",
-        "md/visibility-off.d.ts",
-        "md/visibility.d.ts",
-        "md/voice-chat.d.ts",
-        "md/voicemail.d.ts",
-        "md/volume-down.d.ts",
-        "md/volume-mute.d.ts",
-        "md/volume-off.d.ts",
-        "md/volume-up.d.ts",
-        "md/vpn-key.d.ts",
-        "md/vpn-lock.d.ts",
-        "md/wallpaper.d.ts",
-        "md/warning.d.ts",
-        "md/watch-later.d.ts",
-        "md/watch.d.ts",
-        "md/wb-auto.d.ts",
-        "md/wb-cloudy.d.ts",
-        "md/wb-incandescent.d.ts",
-        "md/wb-iridescent.d.ts",
-        "md/wb-sunny.d.ts",
-        "md/wc.d.ts",
-        "md/web-asset.d.ts",
-        "md/web.d.ts",
-        "md/weekend.d.ts",
-        "md/whatshot.d.ts",
-        "md/widgets.d.ts",
-        "md/wifi-lock.d.ts",
-        "md/wifi-tethering.d.ts",
-        "md/wifi.d.ts",
-        "md/work.d.ts",
-        "md/wrap-text.d.ts",
-        "md/youtube-searched-for.d.ts",
-        "md/zoom-in.d.ts",
-        "md/zoom-out-map.d.ts",
-        "md/zoom-out.d.ts",
-        "ti/adjust-brightness.d.ts",
-        "ti/adjust-contrast.d.ts",
-        "ti/anchor-outline.d.ts",
-        "ti/anchor.d.ts",
-        "ti/archive.d.ts",
-        "ti/arrow-back-outline.d.ts",
-        "ti/arrow-back.d.ts",
-        "ti/arrow-down-outline.d.ts",
-        "ti/arrow-down-thick.d.ts",
-        "ti/arrow-down.d.ts",
-        "ti/arrow-forward-outline.d.ts",
-        "ti/arrow-forward.d.ts",
-        "ti/arrow-left-outline.d.ts",
-        "ti/arrow-left-thick.d.ts",
-        "ti/arrow-left.d.ts",
-        "ti/arrow-loop-outline.d.ts",
-        "ti/arrow-loop.d.ts",
-        "ti/arrow-maximise-outline.d.ts",
-        "ti/arrow-maximise.d.ts",
-        "ti/arrow-minimise-outline.d.ts",
-        "ti/arrow-minimise.d.ts",
-        "ti/arrow-move-outline.d.ts",
-        "ti/arrow-move.d.ts",
-        "ti/arrow-repeat-outline.d.ts",
-        "ti/arrow-repeat.d.ts",
-        "ti/arrow-right-outline.d.ts",
-        "ti/arrow-right-thick.d.ts",
-        "ti/arrow-right.d.ts",
-        "ti/arrow-shuffle.d.ts",
-        "ti/arrow-sorted-down.d.ts",
-        "ti/arrow-sorted-up.d.ts",
-        "ti/arrow-sync-outline.d.ts",
-        "ti/arrow-sync.d.ts",
-        "ti/arrow-unsorted.d.ts",
-        "ti/arrow-up-outline.d.ts",
-        "ti/arrow-up-thick.d.ts",
-        "ti/arrow-up.d.ts",
-        "ti/at.d.ts",
-        "ti/attachment-outline.d.ts",
-        "ti/attachment.d.ts",
-        "ti/backspace-outline.d.ts",
-        "ti/backspace.d.ts",
-        "ti/battery-charge.d.ts",
-        "ti/battery-full.d.ts",
-        "ti/battery-high.d.ts",
-        "ti/battery-low.d.ts",
-        "ti/battery-mid.d.ts",
-        "ti/beaker.d.ts",
-        "ti/beer.d.ts",
-        "ti/bell.d.ts",
-        "ti/book.d.ts",
-        "ti/bookmark.d.ts",
-        "ti/briefcase.d.ts",
-        "ti/brush.d.ts",
-        "ti/business-card.d.ts",
-        "ti/calculator.d.ts",
-        "ti/calendar-outline.d.ts",
-        "ti/calendar.d.ts",
-        "ti/calender-outline.d.ts",
-        "ti/calender.d.ts",
-        "ti/camera-outline.d.ts",
-        "ti/camera.d.ts",
-        "ti/cancel-outline.d.ts",
-        "ti/cancel.d.ts",
-        "ti/chart-area-outline.d.ts",
-        "ti/chart-area.d.ts",
-        "ti/chart-bar-outline.d.ts",
-        "ti/chart-bar.d.ts",
-        "ti/chart-line-outline.d.ts",
-        "ti/chart-line.d.ts",
-        "ti/chart-pie-outline.d.ts",
-        "ti/chart-pie.d.ts",
-        "ti/chevron-left-outline.d.ts",
-        "ti/chevron-left.d.ts",
-        "ti/chevron-right-outline.d.ts",
-        "ti/chevron-right.d.ts",
-        "ti/clipboard.d.ts",
-        "ti/cloud-storage-outline.d.ts",
-        "ti/cloud-storage.d.ts",
-        "ti/code-outline.d.ts",
-        "ti/code.d.ts",
-        "ti/coffee.d.ts",
-        "ti/cog-outline.d.ts",
-        "ti/cog.d.ts",
-        "ti/compass.d.ts",
-        "ti/contacts.d.ts",
-        "ti/credit-card.d.ts",
-        "ti/cross.d.ts",
-        "ti/css3.d.ts",
-        "ti/database.d.ts",
-        "ti/delete-outline.d.ts",
-        "ti/delete.d.ts",
-        "ti/device-desktop.d.ts",
-        "ti/device-laptop.d.ts",
-        "ti/device-phone.d.ts",
-        "ti/device-tablet.d.ts",
-        "ti/directions.d.ts",
-        "ti/divide-outline.d.ts",
-        "ti/divide.d.ts",
-        "ti/document-add.d.ts",
-        "ti/document-delete.d.ts",
-        "ti/document-text.d.ts",
-        "ti/document.d.ts",
-        "ti/download-outline.d.ts",
-        "ti/download.d.ts",
-        "ti/dropbox.d.ts",
-        "ti/edit.d.ts",
-        "ti/eject-outline.d.ts",
-        "ti/eject.d.ts",
-        "ti/equals-outline.d.ts",
-        "ti/equals.d.ts",
-        "ti/export-outline.d.ts",
-        "ti/export.d.ts",
-        "ti/eye-outline.d.ts",
-        "ti/eye.d.ts",
-        "ti/feather.d.ts",
-        "ti/film.d.ts",
-        "ti/filter.d.ts",
-        "ti/flag-outline.d.ts",
-        "ti/flag.d.ts",
-        "ti/flash-outline.d.ts",
-        "ti/flash.d.ts",
-        "ti/flow-children.d.ts",
-        "ti/flow-merge.d.ts",
-        "ti/flow-parallel.d.ts",
-        "ti/flow-switch.d.ts",
-        "ti/folder-add.d.ts",
-        "ti/folder-delete.d.ts",
-        "ti/folder-open.d.ts",
-        "ti/folder.d.ts",
-        "ti/gift.d.ts",
-        "ti/globe-outline.d.ts",
-        "ti/globe.d.ts",
-        "ti/group-outline.d.ts",
-        "ti/group.d.ts",
-        "ti/headphones.d.ts",
-        "ti/heart-full-outline.d.ts",
-        "ti/heart-half-outline.d.ts",
-        "ti/heart-outline.d.ts",
-        "ti/heart.d.ts",
-        "ti/home-outline.d.ts",
-        "ti/home.d.ts",
-        "ti/html5.d.ts",
-        "ti/image-outline.d.ts",
-        "ti/image.d.ts",
-        "ti/infinity-outline.d.ts",
-        "ti/infinity.d.ts",
-        "ti/info-large-outline.d.ts",
-        "ti/info-large.d.ts",
-        "ti/info-outline.d.ts",
-        "ti/info.d.ts",
-        "ti/input-checked-outline.d.ts",
-        "ti/input-checked.d.ts",
-        "ti/key-outline.d.ts",
-        "ti/key.d.ts",
-        "ti/keyboard.d.ts",
-        "ti/leaf.d.ts",
-        "ti/lightbulb.d.ts",
-        "ti/link-outline.d.ts",
-        "ti/link.d.ts",
-        "ti/location-arrow-outline.d.ts",
-        "ti/location-arrow.d.ts",
-        "ti/location-outline.d.ts",
-        "ti/location.d.ts",
-        "ti/lock-closed-outline.d.ts",
-        "ti/lock-closed.d.ts",
-        "ti/lock-open-outline.d.ts",
-        "ti/lock-open.d.ts",
-        "ti/mail.d.ts",
-        "ti/map.d.ts",
-        "ti/media-eject-outline.d.ts",
-        "ti/media-eject.d.ts",
-        "ti/media-fast-forward-outline.d.ts",
-        "ti/media-fast-forward.d.ts",
-        "ti/media-pause-outline.d.ts",
-        "ti/media-pause.d.ts",
-        "ti/media-play-outline.d.ts",
-        "ti/media-play-reverse-outline.d.ts",
-        "ti/media-play-reverse.d.ts",
-        "ti/media-play.d.ts",
-        "ti/media-record-outline.d.ts",
-        "ti/media-record.d.ts",
-        "ti/media-rewind-outline.d.ts",
-        "ti/media-rewind.d.ts",
-        "ti/media-stop-outline.d.ts",
-        "ti/media-stop.d.ts",
-        "ti/message-typing.d.ts",
-        "ti/message.d.ts",
-        "ti/messages.d.ts",
-        "ti/microphone-outline.d.ts",
-        "ti/microphone.d.ts",
-        "ti/minus-outline.d.ts",
-        "ti/minus.d.ts",
-        "ti/mortar-board.d.ts",
-        "ti/news.d.ts",
-        "ti/notes-outline.d.ts",
-        "ti/notes.d.ts",
-        "ti/pen.d.ts",
-        "ti/pencil.d.ts",
-        "ti/phone-outline.d.ts",
-        "ti/phone.d.ts",
-        "ti/pi-outline.d.ts",
-        "ti/pi.d.ts",
-        "ti/pin-outline.d.ts",
-        "ti/pin.d.ts",
-        "ti/pipette.d.ts",
-        "ti/plane-outline.d.ts",
-        "ti/plane.d.ts",
-        "ti/plug.d.ts",
-        "ti/plus-outline.d.ts",
-        "ti/plus.d.ts",
-        "ti/point-of-interest-outline.d.ts",
-        "ti/point-of-interest.d.ts",
-        "ti/power-outline.d.ts",
-        "ti/power.d.ts",
-        "ti/printer.d.ts",
-        "ti/puzzle-outline.d.ts",
-        "ti/puzzle.d.ts",
-        "ti/radar-outline.d.ts",
-        "ti/radar.d.ts",
-        "ti/refresh-outline.d.ts",
-        "ti/refresh.d.ts",
-        "ti/rss-outline.d.ts",
-        "ti/rss.d.ts",
-        "ti/scissors-outline.d.ts",
-        "ti/scissors.d.ts",
-        "ti/shopping-bag.d.ts",
-        "ti/shopping-cart.d.ts",
-        "ti/social-at-circular.d.ts",
-        "ti/social-dribbble-circular.d.ts",
-        "ti/social-dribbble.d.ts",
-        "ti/social-facebook-circular.d.ts",
-        "ti/social-facebook.d.ts",
-        "ti/social-flickr-circular.d.ts",
-        "ti/social-flickr.d.ts",
-        "ti/social-github-circular.d.ts",
-        "ti/social-github.d.ts",
-        "ti/social-google-plus-circular.d.ts",
-        "ti/social-google-plus.d.ts",
-        "ti/social-instagram-circular.d.ts",
-        "ti/social-instagram.d.ts",
-        "ti/social-last-fm-circular.d.ts",
-        "ti/social-last-fm.d.ts",
-        "ti/social-linkedin-circular.d.ts",
-        "ti/social-linkedin.d.ts",
-        "ti/social-pinterest-circular.d.ts",
-        "ti/social-pinterest.d.ts",
-        "ti/social-skype-outline.d.ts",
-        "ti/social-skype.d.ts",
-        "ti/social-tumbler-circular.d.ts",
-        "ti/social-tumbler.d.ts",
-        "ti/social-twitter-circular.d.ts",
-        "ti/social-twitter.d.ts",
-        "ti/social-vimeo-circular.d.ts",
-        "ti/social-vimeo.d.ts",
-        "ti/social-youtube-circular.d.ts",
-        "ti/social-youtube.d.ts",
-        "ti/sort-alphabetically-outline.d.ts",
-        "ti/sort-alphabetically.d.ts",
-        "ti/sort-numerically-outline.d.ts",
-        "ti/sort-numerically.d.ts",
-        "ti/spanner-outline.d.ts",
-        "ti/spanner.d.ts",
-        "ti/spiral.d.ts",
-        "ti/star-full-outline.d.ts",
-        "ti/star-half-outline.d.ts",
-        "ti/star-half.d.ts",
-        "ti/star-outline.d.ts",
-        "ti/star.d.ts",
-        "ti/starburst-outline.d.ts",
-        "ti/starburst.d.ts",
-        "ti/stopwatch.d.ts",
-        "ti/support.d.ts",
-        "ti/tabs-outline.d.ts",
-        "ti/tag.d.ts",
-        "ti/tags.d.ts",
-        "ti/th-large-outline.d.ts",
-        "ti/th-large.d.ts",
-        "ti/th-list-outline.d.ts",
-        "ti/th-list.d.ts",
-        "ti/th-menu-outline.d.ts",
-        "ti/th-menu.d.ts",
-        "ti/th-small-outline.d.ts",
-        "ti/th-small.d.ts",
-        "ti/thermometer.d.ts",
-        "ti/thumbs-down.d.ts",
-        "ti/thumbs-ok.d.ts",
-        "ti/thumbs-up.d.ts",
-        "ti/tick-outline.d.ts",
-        "ti/tick.d.ts",
-        "ti/ticket.d.ts",
-        "ti/time.d.ts",
-        "ti/times-outline.d.ts",
-        "ti/times.d.ts",
-        "ti/trash.d.ts",
-        "ti/tree.d.ts",
-        "ti/upload-outline.d.ts",
-        "ti/upload.d.ts",
-        "ti/user-add-outline.d.ts",
-        "ti/user-add.d.ts",
-        "ti/user-delete-outline.d.ts",
-        "ti/user-delete.d.ts",
-        "ti/user-outline.d.ts",
-        "ti/user.d.ts",
-        "ti/vendor-android.d.ts",
-        "ti/vendor-apple.d.ts",
-        "ti/vendor-microsoft.d.ts",
-        "ti/video-outline.d.ts",
-        "ti/video.d.ts",
-        "ti/volume-down.d.ts",
-        "ti/volume-mute.d.ts",
-        "ti/volume-up.d.ts",
-        "ti/volume.d.ts",
-        "ti/warning-outline.d.ts",
-        "ti/warning.d.ts",
-        "ti/watch.d.ts",
-        "ti/waves-outline.d.ts",
-        "ti/waves.d.ts",
-        "ti/weather-cloudy.d.ts",
-        "ti/weather-downpour.d.ts",
-        "ti/weather-night.d.ts",
-        "ti/weather-partly-sunny.d.ts",
-        "ti/weather-shower.d.ts",
-        "ti/weather-snow.d.ts",
-        "ti/weather-stormy.d.ts",
-        "ti/weather-sunny.d.ts",
-        "ti/weather-windy-cloudy.d.ts",
-        "ti/weather-windy.d.ts",
-        "ti/wi-fi-outline.d.ts",
-        "ti/wi-fi.d.ts",
-        "ti/wine.d.ts",
-        "ti/world-outline.d.ts",
-        "ti/world.d.ts",
-        "ti/zoom-in-outline.d.ts",
-        "ti/zoom-in.d.ts",
-        "ti/zoom-out-outline.d.ts",
-        "ti/zoom-out.d.ts",
-        "ti/zoom-outline.d.ts",
-        "ti/zoom.d.ts",
-        "lib/fa/index.d.ts",
-        "lib/go/index.d.ts",
-        "lib/io/index.d.ts",
-        "lib/md/index.d.ts",
-        "lib/ti/index.d.ts",
-        "lib/fa/500px.d.ts",
-        "lib/fa/adjust.d.ts",
-        "lib/fa/adn.d.ts",
-        "lib/fa/align-center.d.ts",
-        "lib/fa/align-justify.d.ts",
-        "lib/fa/align-left.d.ts",
-        "lib/fa/align-right.d.ts",
-        "lib/fa/amazon.d.ts",
-        "lib/fa/ambulance.d.ts",
-        "lib/fa/american-sign-language-interpreting.d.ts",
-        "lib/fa/anchor.d.ts",
-        "lib/fa/android.d.ts",
-        "lib/fa/angellist.d.ts",
-        "lib/fa/angle-double-down.d.ts",
-        "lib/fa/angle-double-left.d.ts",
-        "lib/fa/angle-double-right.d.ts",
-        "lib/fa/angle-double-up.d.ts",
-        "lib/fa/angle-down.d.ts",
-        "lib/fa/angle-left.d.ts",
-        "lib/fa/angle-right.d.ts",
-        "lib/fa/angle-up.d.ts",
-        "lib/fa/apple.d.ts",
-        "lib/fa/archive.d.ts",
-        "lib/fa/area-chart.d.ts",
-        "lib/fa/arrow-circle-down.d.ts",
-        "lib/fa/arrow-circle-left.d.ts",
-        "lib/fa/arrow-circle-o-down.d.ts",
-        "lib/fa/arrow-circle-o-left.d.ts",
-        "lib/fa/arrow-circle-o-right.d.ts",
-        "lib/fa/arrow-circle-o-up.d.ts",
-        "lib/fa/arrow-circle-right.d.ts",
-        "lib/fa/arrow-circle-up.d.ts",
-        "lib/fa/arrow-down.d.ts",
-        "lib/fa/arrow-left.d.ts",
-        "lib/fa/arrow-right.d.ts",
-        "lib/fa/arrow-up.d.ts",
-        "lib/fa/arrows-alt.d.ts",
-        "lib/fa/arrows-h.d.ts",
-        "lib/fa/arrows-v.d.ts",
-        "lib/fa/arrows.d.ts",
-        "lib/fa/assistive-listening-systems.d.ts",
-        "lib/fa/asterisk.d.ts",
-        "lib/fa/at.d.ts",
-        "lib/fa/audio-description.d.ts",
-        "lib/fa/automobile.d.ts",
-        "lib/fa/backward.d.ts",
-        "lib/fa/balance-scale.d.ts",
-        "lib/fa/ban.d.ts",
-        "lib/fa/bank.d.ts",
-        "lib/fa/bar-chart.d.ts",
-        "lib/fa/barcode.d.ts",
-        "lib/fa/bars.d.ts",
-        "lib/fa/battery-0.d.ts",
-        "lib/fa/battery-1.d.ts",
-        "lib/fa/battery-2.d.ts",
-        "lib/fa/battery-3.d.ts",
-        "lib/fa/battery-4.d.ts",
-        "lib/fa/bed.d.ts",
-        "lib/fa/beer.d.ts",
-        "lib/fa/behance-square.d.ts",
-        "lib/fa/behance.d.ts",
-        "lib/fa/bell-o.d.ts",
-        "lib/fa/bell-slash-o.d.ts",
-        "lib/fa/bell-slash.d.ts",
-        "lib/fa/bell.d.ts",
-        "lib/fa/bicycle.d.ts",
-        "lib/fa/binoculars.d.ts",
-        "lib/fa/birthday-cake.d.ts",
-        "lib/fa/bitbucket-square.d.ts",
-        "lib/fa/bitbucket.d.ts",
-        "lib/fa/bitcoin.d.ts",
-        "lib/fa/black-tie.d.ts",
-        "lib/fa/blind.d.ts",
-        "lib/fa/bluetooth-b.d.ts",
-        "lib/fa/bluetooth.d.ts",
-        "lib/fa/bold.d.ts",
-        "lib/fa/bolt.d.ts",
-        "lib/fa/bomb.d.ts",
-        "lib/fa/book.d.ts",
-        "lib/fa/bookmark-o.d.ts",
-        "lib/fa/bookmark.d.ts",
-        "lib/fa/braille.d.ts",
-        "lib/fa/briefcase.d.ts",
-        "lib/fa/bug.d.ts",
-        "lib/fa/building-o.d.ts",
-        "lib/fa/building.d.ts",
-        "lib/fa/bullhorn.d.ts",
-        "lib/fa/bullseye.d.ts",
-        "lib/fa/bus.d.ts",
-        "lib/fa/buysellads.d.ts",
-        "lib/fa/cab.d.ts",
-        "lib/fa/calculator.d.ts",
-        "lib/fa/calendar-check-o.d.ts",
-        "lib/fa/calendar-minus-o.d.ts",
-        "lib/fa/calendar-o.d.ts",
-        "lib/fa/calendar-plus-o.d.ts",
-        "lib/fa/calendar-times-o.d.ts",
-        "lib/fa/calendar.d.ts",
-        "lib/fa/camera-retro.d.ts",
-        "lib/fa/camera.d.ts",
-        "lib/fa/caret-down.d.ts",
-        "lib/fa/caret-left.d.ts",
-        "lib/fa/caret-right.d.ts",
-        "lib/fa/caret-square-o-down.d.ts",
-        "lib/fa/caret-square-o-left.d.ts",
-        "lib/fa/caret-square-o-right.d.ts",
-        "lib/fa/caret-square-o-up.d.ts",
-        "lib/fa/caret-up.d.ts",
-        "lib/fa/cart-arrow-down.d.ts",
-        "lib/fa/cart-plus.d.ts",
-        "lib/fa/cc-amex.d.ts",
-        "lib/fa/cc-diners-club.d.ts",
-        "lib/fa/cc-discover.d.ts",
-        "lib/fa/cc-jcb.d.ts",
-        "lib/fa/cc-mastercard.d.ts",
-        "lib/fa/cc-paypal.d.ts",
-        "lib/fa/cc-stripe.d.ts",
-        "lib/fa/cc-visa.d.ts",
-        "lib/fa/cc.d.ts",
-        "lib/fa/certificate.d.ts",
-        "lib/fa/chain-broken.d.ts",
-        "lib/fa/chain.d.ts",
-        "lib/fa/check-circle-o.d.ts",
-        "lib/fa/check-circle.d.ts",
-        "lib/fa/check-square-o.d.ts",
-        "lib/fa/check-square.d.ts",
-        "lib/fa/check.d.ts",
-        "lib/fa/chevron-circle-down.d.ts",
-        "lib/fa/chevron-circle-left.d.ts",
-        "lib/fa/chevron-circle-right.d.ts",
-        "lib/fa/chevron-circle-up.d.ts",
-        "lib/fa/chevron-down.d.ts",
-        "lib/fa/chevron-left.d.ts",
-        "lib/fa/chevron-right.d.ts",
-        "lib/fa/chevron-up.d.ts",
-        "lib/fa/child.d.ts",
-        "lib/fa/chrome.d.ts",
-        "lib/fa/circle-o-notch.d.ts",
-        "lib/fa/circle-o.d.ts",
-        "lib/fa/circle-thin.d.ts",
-        "lib/fa/circle.d.ts",
-        "lib/fa/clipboard.d.ts",
-        "lib/fa/clock-o.d.ts",
-        "lib/fa/clone.d.ts",
-        "lib/fa/close.d.ts",
-        "lib/fa/cloud-download.d.ts",
-        "lib/fa/cloud-upload.d.ts",
-        "lib/fa/cloud.d.ts",
-        "lib/fa/cny.d.ts",
-        "lib/fa/code-fork.d.ts",
-        "lib/fa/code.d.ts",
-        "lib/fa/codepen.d.ts",
-        "lib/fa/codiepie.d.ts",
-        "lib/fa/coffee.d.ts",
-        "lib/fa/cog.d.ts",
-        "lib/fa/cogs.d.ts",
-        "lib/fa/columns.d.ts",
-        "lib/fa/comment-o.d.ts",
-        "lib/fa/comment.d.ts",
-        "lib/fa/commenting-o.d.ts",
-        "lib/fa/commenting.d.ts",
-        "lib/fa/comments-o.d.ts",
-        "lib/fa/comments.d.ts",
-        "lib/fa/compass.d.ts",
-        "lib/fa/compress.d.ts",
-        "lib/fa/connectdevelop.d.ts",
-        "lib/fa/contao.d.ts",
-        "lib/fa/copy.d.ts",
-        "lib/fa/copyright.d.ts",
-        "lib/fa/creative-commons.d.ts",
-        "lib/fa/credit-card-alt.d.ts",
-        "lib/fa/credit-card.d.ts",
-        "lib/fa/crop.d.ts",
-        "lib/fa/crosshairs.d.ts",
-        "lib/fa/css3.d.ts",
-        "lib/fa/cube.d.ts",
-        "lib/fa/cubes.d.ts",
-        "lib/fa/cut.d.ts",
-        "lib/fa/cutlery.d.ts",
-        "lib/fa/dashboard.d.ts",
-        "lib/fa/dashcube.d.ts",
-        "lib/fa/database.d.ts",
-        "lib/fa/deaf.d.ts",
-        "lib/fa/dedent.d.ts",
-        "lib/fa/delicious.d.ts",
-        "lib/fa/desktop.d.ts",
-        "lib/fa/deviantart.d.ts",
-        "lib/fa/diamond.d.ts",
-        "lib/fa/digg.d.ts",
-        "lib/fa/dollar.d.ts",
-        "lib/fa/dot-circle-o.d.ts",
-        "lib/fa/download.d.ts",
-        "lib/fa/dribbble.d.ts",
-        "lib/fa/dropbox.d.ts",
-        "lib/fa/drupal.d.ts",
-        "lib/fa/edge.d.ts",
-        "lib/fa/edit.d.ts",
-        "lib/fa/eject.d.ts",
-        "lib/fa/ellipsis-h.d.ts",
-        "lib/fa/ellipsis-v.d.ts",
-        "lib/fa/empire.d.ts",
-        "lib/fa/envelope-o.d.ts",
-        "lib/fa/envelope-square.d.ts",
-        "lib/fa/envelope.d.ts",
-        "lib/fa/envira.d.ts",
-        "lib/fa/eraser.d.ts",
-        "lib/fa/eur.d.ts",
-        "lib/fa/exchange.d.ts",
-        "lib/fa/exclamation-circle.d.ts",
-        "lib/fa/exclamation-triangle.d.ts",
-        "lib/fa/exclamation.d.ts",
-        "lib/fa/expand.d.ts",
-        "lib/fa/expeditedssl.d.ts",
-        "lib/fa/external-link-square.d.ts",
-        "lib/fa/external-link.d.ts",
-        "lib/fa/eye-slash.d.ts",
-        "lib/fa/eye.d.ts",
-        "lib/fa/eyedropper.d.ts",
-        "lib/fa/facebook-official.d.ts",
-        "lib/fa/facebook-square.d.ts",
-        "lib/fa/facebook.d.ts",
-        "lib/fa/fast-backward.d.ts",
-        "lib/fa/fast-forward.d.ts",
-        "lib/fa/fax.d.ts",
-        "lib/fa/feed.d.ts",
-        "lib/fa/female.d.ts",
-        "lib/fa/fighter-jet.d.ts",
-        "lib/fa/file-archive-o.d.ts",
-        "lib/fa/file-audio-o.d.ts",
-        "lib/fa/file-code-o.d.ts",
-        "lib/fa/file-excel-o.d.ts",
-        "lib/fa/file-image-o.d.ts",
-        "lib/fa/file-movie-o.d.ts",
-        "lib/fa/file-o.d.ts",
-        "lib/fa/file-pdf-o.d.ts",
-        "lib/fa/file-powerpoint-o.d.ts",
-        "lib/fa/file-text-o.d.ts",
-        "lib/fa/file-text.d.ts",
-        "lib/fa/file-word-o.d.ts",
-        "lib/fa/file.d.ts",
-        "lib/fa/film.d.ts",
-        "lib/fa/filter.d.ts",
-        "lib/fa/fire-extinguisher.d.ts",
-        "lib/fa/fire.d.ts",
-        "lib/fa/firefox.d.ts",
-        "lib/fa/flag-checkered.d.ts",
-        "lib/fa/flag-o.d.ts",
-        "lib/fa/flag.d.ts",
-        "lib/fa/flask.d.ts",
-        "lib/fa/flickr.d.ts",
-        "lib/fa/floppy-o.d.ts",
-        "lib/fa/folder-o.d.ts",
-        "lib/fa/folder-open-o.d.ts",
-        "lib/fa/folder-open.d.ts",
-        "lib/fa/folder.d.ts",
-        "lib/fa/font.d.ts",
-        "lib/fa/fonticons.d.ts",
-        "lib/fa/fort-awesome.d.ts",
-        "lib/fa/forumbee.d.ts",
-        "lib/fa/forward.d.ts",
-        "lib/fa/foursquare.d.ts",
-        "lib/fa/frown-o.d.ts",
-        "lib/fa/futbol-o.d.ts",
-        "lib/fa/gamepad.d.ts",
-        "lib/fa/gavel.d.ts",
-        "lib/fa/gbp.d.ts",
-        "lib/fa/genderless.d.ts",
-        "lib/fa/get-pocket.d.ts",
-        "lib/fa/gg-circle.d.ts",
-        "lib/fa/gg.d.ts",
-        "lib/fa/gift.d.ts",
-        "lib/fa/git-square.d.ts",
-        "lib/fa/git.d.ts",
-        "lib/fa/github-alt.d.ts",
-        "lib/fa/github-square.d.ts",
-        "lib/fa/github.d.ts",
-        "lib/fa/gitlab.d.ts",
-        "lib/fa/gittip.d.ts",
-        "lib/fa/glass.d.ts",
-        "lib/fa/glide-g.d.ts",
-        "lib/fa/glide.d.ts",
-        "lib/fa/globe.d.ts",
-        "lib/fa/google-plus-square.d.ts",
-        "lib/fa/google-plus.d.ts",
-        "lib/fa/google-wallet.d.ts",
-        "lib/fa/google.d.ts",
-        "lib/fa/graduation-cap.d.ts",
-        "lib/fa/group.d.ts",
-        "lib/fa/h-square.d.ts",
-        "lib/fa/hacker-news.d.ts",
-        "lib/fa/hand-grab-o.d.ts",
-        "lib/fa/hand-lizard-o.d.ts",
-        "lib/fa/hand-o-down.d.ts",
-        "lib/fa/hand-o-left.d.ts",
-        "lib/fa/hand-o-right.d.ts",
-        "lib/fa/hand-o-up.d.ts",
-        "lib/fa/hand-paper-o.d.ts",
-        "lib/fa/hand-peace-o.d.ts",
-        "lib/fa/hand-pointer-o.d.ts",
-        "lib/fa/hand-scissors-o.d.ts",
-        "lib/fa/hand-spock-o.d.ts",
-        "lib/fa/hashtag.d.ts",
-        "lib/fa/hdd-o.d.ts",
-        "lib/fa/header.d.ts",
-        "lib/fa/headphones.d.ts",
-        "lib/fa/heart-o.d.ts",
-        "lib/fa/heart.d.ts",
-        "lib/fa/heartbeat.d.ts",
-        "lib/fa/history.d.ts",
-        "lib/fa/home.d.ts",
-        "lib/fa/hospital-o.d.ts",
-        "lib/fa/hourglass-1.d.ts",
-        "lib/fa/hourglass-2.d.ts",
-        "lib/fa/hourglass-3.d.ts",
-        "lib/fa/hourglass-o.d.ts",
-        "lib/fa/hourglass.d.ts",
-        "lib/fa/houzz.d.ts",
-        "lib/fa/html5.d.ts",
-        "lib/fa/i-cursor.d.ts",
-        "lib/fa/ils.d.ts",
-        "lib/fa/image.d.ts",
-        "lib/fa/inbox.d.ts",
-        "lib/fa/indent.d.ts",
-        "lib/fa/industry.d.ts",
-        "lib/fa/info-circle.d.ts",
-        "lib/fa/info.d.ts",
-        "lib/fa/inr.d.ts",
-        "lib/fa/instagram.d.ts",
-        "lib/fa/internet-explorer.d.ts",
-        "lib/fa/intersex.d.ts",
-        "lib/fa/ioxhost.d.ts",
-        "lib/fa/italic.d.ts",
-        "lib/fa/joomla.d.ts",
-        "lib/fa/jsfiddle.d.ts",
-        "lib/fa/key.d.ts",
-        "lib/fa/keyboard-o.d.ts",
-        "lib/fa/krw.d.ts",
-        "lib/fa/language.d.ts",
-        "lib/fa/laptop.d.ts",
-        "lib/fa/lastfm-square.d.ts",
-        "lib/fa/lastfm.d.ts",
-        "lib/fa/leaf.d.ts",
-        "lib/fa/leanpub.d.ts",
-        "lib/fa/lemon-o.d.ts",
-        "lib/fa/level-down.d.ts",
-        "lib/fa/level-up.d.ts",
-        "lib/fa/life-bouy.d.ts",
-        "lib/fa/lightbulb-o.d.ts",
-        "lib/fa/line-chart.d.ts",
-        "lib/fa/linkedin-square.d.ts",
-        "lib/fa/linkedin.d.ts",
-        "lib/fa/linux.d.ts",
-        "lib/fa/list-alt.d.ts",
-        "lib/fa/list-ol.d.ts",
-        "lib/fa/list-ul.d.ts",
-        "lib/fa/list.d.ts",
-        "lib/fa/location-arrow.d.ts",
-        "lib/fa/lock.d.ts",
-        "lib/fa/long-arrow-down.d.ts",
-        "lib/fa/long-arrow-left.d.ts",
-        "lib/fa/long-arrow-right.d.ts",
-        "lib/fa/long-arrow-up.d.ts",
-        "lib/fa/low-vision.d.ts",
-        "lib/fa/magic.d.ts",
-        "lib/fa/magnet.d.ts",
-        "lib/fa/mail-forward.d.ts",
-        "lib/fa/mail-reply-all.d.ts",
-        "lib/fa/mail-reply.d.ts",
-        "lib/fa/male.d.ts",
-        "lib/fa/map-marker.d.ts",
-        "lib/fa/map-o.d.ts",
-        "lib/fa/map-pin.d.ts",
-        "lib/fa/map-signs.d.ts",
-        "lib/fa/map.d.ts",
-        "lib/fa/mars-double.d.ts",
-        "lib/fa/mars-stroke-h.d.ts",
-        "lib/fa/mars-stroke-v.d.ts",
-        "lib/fa/mars-stroke.d.ts",
-        "lib/fa/mars.d.ts",
-        "lib/fa/maxcdn.d.ts",
-        "lib/fa/meanpath.d.ts",
-        "lib/fa/medium.d.ts",
-        "lib/fa/medkit.d.ts",
-        "lib/fa/meh-o.d.ts",
-        "lib/fa/mercury.d.ts",
-        "lib/fa/microphone-slash.d.ts",
-        "lib/fa/microphone.d.ts",
-        "lib/fa/minus-circle.d.ts",
-        "lib/fa/minus-square-o.d.ts",
-        "lib/fa/minus-square.d.ts",
-        "lib/fa/minus.d.ts",
-        "lib/fa/mixcloud.d.ts",
-        "lib/fa/mobile.d.ts",
-        "lib/fa/modx.d.ts",
-        "lib/fa/money.d.ts",
-        "lib/fa/moon-o.d.ts",
-        "lib/fa/motorcycle.d.ts",
-        "lib/fa/mouse-pointer.d.ts",
-        "lib/fa/music.d.ts",
-        "lib/fa/neuter.d.ts",
-        "lib/fa/newspaper-o.d.ts",
-        "lib/fa/object-group.d.ts",
-        "lib/fa/object-ungroup.d.ts",
-        "lib/fa/odnoklassniki-square.d.ts",
-        "lib/fa/odnoklassniki.d.ts",
-        "lib/fa/opencart.d.ts",
-        "lib/fa/openid.d.ts",
-        "lib/fa/opera.d.ts",
-        "lib/fa/optin-monster.d.ts",
-        "lib/fa/pagelines.d.ts",
-        "lib/fa/paint-brush.d.ts",
-        "lib/fa/paper-plane-o.d.ts",
-        "lib/fa/paper-plane.d.ts",
-        "lib/fa/paperclip.d.ts",
-        "lib/fa/paragraph.d.ts",
-        "lib/fa/pause-circle-o.d.ts",
-        "lib/fa/pause-circle.d.ts",
-        "lib/fa/pause.d.ts",
-        "lib/fa/paw.d.ts",
-        "lib/fa/paypal.d.ts",
-        "lib/fa/pencil-square.d.ts",
-        "lib/fa/pencil.d.ts",
-        "lib/fa/percent.d.ts",
-        "lib/fa/phone-square.d.ts",
-        "lib/fa/phone.d.ts",
-        "lib/fa/pie-chart.d.ts",
-        "lib/fa/pied-piper-alt.d.ts",
-        "lib/fa/pied-piper.d.ts",
-        "lib/fa/pinterest-p.d.ts",
-        "lib/fa/pinterest-square.d.ts",
-        "lib/fa/pinterest.d.ts",
-        "lib/fa/plane.d.ts",
-        "lib/fa/play-circle-o.d.ts",
-        "lib/fa/play-circle.d.ts",
-        "lib/fa/play.d.ts",
-        "lib/fa/plug.d.ts",
-        "lib/fa/plus-circle.d.ts",
-        "lib/fa/plus-square-o.d.ts",
-        "lib/fa/plus-square.d.ts",
-        "lib/fa/plus.d.ts",
-        "lib/fa/power-off.d.ts",
-        "lib/fa/print.d.ts",
-        "lib/fa/product-hunt.d.ts",
-        "lib/fa/puzzle-piece.d.ts",
-        "lib/fa/qq.d.ts",
-        "lib/fa/qrcode.d.ts",
-        "lib/fa/question-circle-o.d.ts",
-        "lib/fa/question-circle.d.ts",
-        "lib/fa/question.d.ts",
-        "lib/fa/quote-left.d.ts",
-        "lib/fa/quote-right.d.ts",
-        "lib/fa/ra.d.ts",
-        "lib/fa/random.d.ts",
-        "lib/fa/recycle.d.ts",
-        "lib/fa/reddit-alien.d.ts",
-        "lib/fa/reddit-square.d.ts",
-        "lib/fa/reddit.d.ts",
-        "lib/fa/refresh.d.ts",
-        "lib/fa/registered.d.ts",
-        "lib/fa/renren.d.ts",
-        "lib/fa/repeat.d.ts",
-        "lib/fa/retweet.d.ts",
-        "lib/fa/road.d.ts",
-        "lib/fa/rocket.d.ts",
-        "lib/fa/rotate-left.d.ts",
-        "lib/fa/rouble.d.ts",
-        "lib/fa/rss-square.d.ts",
-        "lib/fa/safari.d.ts",
-        "lib/fa/scribd.d.ts",
-        "lib/fa/search-minus.d.ts",
-        "lib/fa/search-plus.d.ts",
-        "lib/fa/search.d.ts",
-        "lib/fa/sellsy.d.ts",
-        "lib/fa/server.d.ts",
-        "lib/fa/share-alt-square.d.ts",
-        "lib/fa/share-alt.d.ts",
-        "lib/fa/share-square-o.d.ts",
-        "lib/fa/share-square.d.ts",
-        "lib/fa/shield.d.ts",
-        "lib/fa/ship.d.ts",
-        "lib/fa/shirtsinbulk.d.ts",
-        "lib/fa/shopping-bag.d.ts",
-        "lib/fa/shopping-basket.d.ts",
-        "lib/fa/shopping-cart.d.ts",
-        "lib/fa/sign-in.d.ts",
-        "lib/fa/sign-language.d.ts",
-        "lib/fa/sign-out.d.ts",
-        "lib/fa/signal.d.ts",
-        "lib/fa/simplybuilt.d.ts",
-        "lib/fa/sitemap.d.ts",
-        "lib/fa/skyatlas.d.ts",
-        "lib/fa/skype.d.ts",
-        "lib/fa/slack.d.ts",
-        "lib/fa/sliders.d.ts",
-        "lib/fa/slideshare.d.ts",
-        "lib/fa/smile-o.d.ts",
-        "lib/fa/snapchat-ghost.d.ts",
-        "lib/fa/snapchat-square.d.ts",
-        "lib/fa/snapchat.d.ts",
-        "lib/fa/sort-alpha-asc.d.ts",
-        "lib/fa/sort-alpha-desc.d.ts",
-        "lib/fa/sort-amount-asc.d.ts",
-        "lib/fa/sort-amount-desc.d.ts",
-        "lib/fa/sort-asc.d.ts",
-        "lib/fa/sort-desc.d.ts",
-        "lib/fa/sort-numeric-asc.d.ts",
-        "lib/fa/sort-numeric-desc.d.ts",
-        "lib/fa/sort.d.ts",
-        "lib/fa/soundcloud.d.ts",
-        "lib/fa/space-shuttle.d.ts",
-        "lib/fa/spinner.d.ts",
-        "lib/fa/spoon.d.ts",
-        "lib/fa/spotify.d.ts",
-        "lib/fa/square-o.d.ts",
-        "lib/fa/square.d.ts",
-        "lib/fa/stack-exchange.d.ts",
-        "lib/fa/stack-overflow.d.ts",
-        "lib/fa/star-half-empty.d.ts",
-        "lib/fa/star-half.d.ts",
-        "lib/fa/star-o.d.ts",
-        "lib/fa/star.d.ts",
-        "lib/fa/steam-square.d.ts",
-        "lib/fa/steam.d.ts",
-        "lib/fa/step-backward.d.ts",
-        "lib/fa/step-forward.d.ts",
-        "lib/fa/stethoscope.d.ts",
-        "lib/fa/sticky-note-o.d.ts",
-        "lib/fa/sticky-note.d.ts",
-        "lib/fa/stop-circle-o.d.ts",
-        "lib/fa/stop-circle.d.ts",
-        "lib/fa/stop.d.ts",
-        "lib/fa/street-view.d.ts",
-        "lib/fa/strikethrough.d.ts",
-        "lib/fa/stumbleupon-circle.d.ts",
-        "lib/fa/stumbleupon.d.ts",
-        "lib/fa/subscript.d.ts",
-        "lib/fa/subway.d.ts",
-        "lib/fa/suitcase.d.ts",
-        "lib/fa/sun-o.d.ts",
-        "lib/fa/superscript.d.ts",
-        "lib/fa/table.d.ts",
-        "lib/fa/tablet.d.ts",
-        "lib/fa/tag.d.ts",
-        "lib/fa/tags.d.ts",
-        "lib/fa/tasks.d.ts",
-        "lib/fa/television.d.ts",
-        "lib/fa/tencent-weibo.d.ts",
-        "lib/fa/terminal.d.ts",
-        "lib/fa/text-height.d.ts",
-        "lib/fa/text-width.d.ts",
-        "lib/fa/th-large.d.ts",
-        "lib/fa/th-list.d.ts",
-        "lib/fa/th.d.ts",
-        "lib/fa/thumb-tack.d.ts",
-        "lib/fa/thumbs-down.d.ts",
-        "lib/fa/thumbs-o-down.d.ts",
-        "lib/fa/thumbs-o-up.d.ts",
-        "lib/fa/thumbs-up.d.ts",
-        "lib/fa/ticket.d.ts",
-        "lib/fa/times-circle-o.d.ts",
-        "lib/fa/times-circle.d.ts",
-        "lib/fa/tint.d.ts",
-        "lib/fa/toggle-off.d.ts",
-        "lib/fa/toggle-on.d.ts",
-        "lib/fa/trademark.d.ts",
-        "lib/fa/train.d.ts",
-        "lib/fa/transgender-alt.d.ts",
-        "lib/fa/trash-o.d.ts",
-        "lib/fa/trash.d.ts",
-        "lib/fa/tree.d.ts",
-        "lib/fa/trello.d.ts",
-        "lib/fa/tripadvisor.d.ts",
-        "lib/fa/trophy.d.ts",
-        "lib/fa/truck.d.ts",
-        "lib/fa/try.d.ts",
-        "lib/fa/tty.d.ts",
-        "lib/fa/tumblr-square.d.ts",
-        "lib/fa/tumblr.d.ts",
-        "lib/fa/twitch.d.ts",
-        "lib/fa/twitter-square.d.ts",
-        "lib/fa/twitter.d.ts",
-        "lib/fa/umbrella.d.ts",
-        "lib/fa/underline.d.ts",
-        "lib/fa/universal-access.d.ts",
-        "lib/fa/unlock-alt.d.ts",
-        "lib/fa/unlock.d.ts",
-        "lib/fa/upload.d.ts",
-        "lib/fa/usb.d.ts",
-        "lib/fa/user-md.d.ts",
-        "lib/fa/user-plus.d.ts",
-        "lib/fa/user-secret.d.ts",
-        "lib/fa/user-times.d.ts",
-        "lib/fa/user.d.ts",
-        "lib/fa/venus-double.d.ts",
-        "lib/fa/venus-mars.d.ts",
-        "lib/fa/venus.d.ts",
-        "lib/fa/viacoin.d.ts",
-        "lib/fa/viadeo-square.d.ts",
-        "lib/fa/viadeo.d.ts",
-        "lib/fa/video-camera.d.ts",
-        "lib/fa/vimeo-square.d.ts",
-        "lib/fa/vimeo.d.ts",
-        "lib/fa/vine.d.ts",
-        "lib/fa/vk.d.ts",
-        "lib/fa/volume-control-phone.d.ts",
-        "lib/fa/volume-down.d.ts",
-        "lib/fa/volume-off.d.ts",
-        "lib/fa/volume-up.d.ts",
-        "lib/fa/wechat.d.ts",
-        "lib/fa/weibo.d.ts",
-        "lib/fa/whatsapp.d.ts",
-        "lib/fa/wheelchair-alt.d.ts",
-        "lib/fa/wheelchair.d.ts",
-        "lib/fa/wifi.d.ts",
-        "lib/fa/wikipedia-w.d.ts",
-        "lib/fa/windows.d.ts",
-        "lib/fa/wordpress.d.ts",
-        "lib/fa/wpbeginner.d.ts",
-        "lib/fa/wpforms.d.ts",
-        "lib/fa/wrench.d.ts",
-        "lib/fa/xing-square.d.ts",
-        "lib/fa/xing.d.ts",
-        "lib/fa/y-combinator.d.ts",
-        "lib/fa/yahoo.d.ts",
-        "lib/fa/yelp.d.ts",
-        "lib/fa/youtube-play.d.ts",
-        "lib/fa/youtube-square.d.ts",
-        "lib/fa/youtube.d.ts",
-        "lib/go/alert.d.ts",
-        "lib/go/alignment-align.d.ts",
-        "lib/go/alignment-aligned-to.d.ts",
-        "lib/go/alignment-unalign.d.ts",
-        "lib/go/arrow-down.d.ts",
-        "lib/go/arrow-left.d.ts",
-        "lib/go/arrow-right.d.ts",
-        "lib/go/arrow-small-down.d.ts",
-        "lib/go/arrow-small-left.d.ts",
-        "lib/go/arrow-small-right.d.ts",
-        "lib/go/arrow-small-up.d.ts",
-        "lib/go/arrow-up.d.ts",
-        "lib/go/beer.d.ts",
-        "lib/go/book.d.ts",
-        "lib/go/bookmark.d.ts",
-        "lib/go/briefcase.d.ts",
-        "lib/go/broadcast.d.ts",
-        "lib/go/browser.d.ts",
-        "lib/go/bug.d.ts",
-        "lib/go/calendar.d.ts",
-        "lib/go/check.d.ts",
-        "lib/go/checklist.d.ts",
-        "lib/go/chevron-down.d.ts",
-        "lib/go/chevron-left.d.ts",
-        "lib/go/chevron-right.d.ts",
-        "lib/go/chevron-up.d.ts",
-        "lib/go/circle-slash.d.ts",
-        "lib/go/circuit-board.d.ts",
-        "lib/go/clippy.d.ts",
-        "lib/go/clock.d.ts",
-        "lib/go/cloud-download.d.ts",
-        "lib/go/cloud-upload.d.ts",
-        "lib/go/code.d.ts",
-        "lib/go/color-mode.d.ts",
-        "lib/go/comment-discussion.d.ts",
-        "lib/go/comment.d.ts",
-        "lib/go/credit-card.d.ts",
-        "lib/go/dash.d.ts",
-        "lib/go/dashboard.d.ts",
-        "lib/go/database.d.ts",
-        "lib/go/device-camera-video.d.ts",
-        "lib/go/device-camera.d.ts",
-        "lib/go/device-desktop.d.ts",
-        "lib/go/device-mobile.d.ts",
-        "lib/go/diff-added.d.ts",
-        "lib/go/diff-ignored.d.ts",
-        "lib/go/diff-modified.d.ts",
-        "lib/go/diff-removed.d.ts",
-        "lib/go/diff-renamed.d.ts",
-        "lib/go/diff.d.ts",
-        "lib/go/ellipsis.d.ts",
-        "lib/go/eye.d.ts",
-        "lib/go/file-binary.d.ts",
-        "lib/go/file-code.d.ts",
-        "lib/go/file-directory.d.ts",
-        "lib/go/file-media.d.ts",
-        "lib/go/file-pdf.d.ts",
-        "lib/go/file-submodule.d.ts",
-        "lib/go/file-symlink-directory.d.ts",
-        "lib/go/file-symlink-file.d.ts",
-        "lib/go/file-text.d.ts",
-        "lib/go/file-zip.d.ts",
-        "lib/go/flame.d.ts",
-        "lib/go/fold.d.ts",
-        "lib/go/gear.d.ts",
-        "lib/go/gift.d.ts",
-        "lib/go/gist-secret.d.ts",
-        "lib/go/gist.d.ts",
-        "lib/go/git-branch.d.ts",
-        "lib/go/git-commit.d.ts",
-        "lib/go/git-compare.d.ts",
-        "lib/go/git-merge.d.ts",
-        "lib/go/git-pull-request.d.ts",
-        "lib/go/globe.d.ts",
-        "lib/go/graph.d.ts",
-        "lib/go/heart.d.ts",
-        "lib/go/history.d.ts",
-        "lib/go/home.d.ts",
-        "lib/go/horizontal-rule.d.ts",
-        "lib/go/hourglass.d.ts",
-        "lib/go/hubot.d.ts",
-        "lib/go/inbox.d.ts",
-        "lib/go/info.d.ts",
-        "lib/go/issue-closed.d.ts",
-        "lib/go/issue-opened.d.ts",
-        "lib/go/issue-reopened.d.ts",
-        "lib/go/jersey.d.ts",
-        "lib/go/jump-down.d.ts",
-        "lib/go/jump-left.d.ts",
-        "lib/go/jump-right.d.ts",
-        "lib/go/jump-up.d.ts",
-        "lib/go/key.d.ts",
-        "lib/go/keyboard.d.ts",
-        "lib/go/law.d.ts",
-        "lib/go/light-bulb.d.ts",
-        "lib/go/link-external.d.ts",
-        "lib/go/link.d.ts",
-        "lib/go/list-ordered.d.ts",
-        "lib/go/list-unordered.d.ts",
-        "lib/go/location.d.ts",
-        "lib/go/lock.d.ts",
-        "lib/go/logo-github.d.ts",
-        "lib/go/mail-read.d.ts",
-        "lib/go/mail-reply.d.ts",
-        "lib/go/mail.d.ts",
-        "lib/go/mark-github.d.ts",
-        "lib/go/markdown.d.ts",
-        "lib/go/megaphone.d.ts",
-        "lib/go/mention.d.ts",
-        "lib/go/microscope.d.ts",
-        "lib/go/milestone.d.ts",
-        "lib/go/mirror.d.ts",
-        "lib/go/mortar-board.d.ts",
-        "lib/go/move-down.d.ts",
-        "lib/go/move-left.d.ts",
-        "lib/go/move-right.d.ts",
-        "lib/go/move-up.d.ts",
-        "lib/go/mute.d.ts",
-        "lib/go/no-newline.d.ts",
-        "lib/go/octoface.d.ts",
-        "lib/go/organization.d.ts",
-        "lib/go/package.d.ts",
-        "lib/go/paintcan.d.ts",
-        "lib/go/pencil.d.ts",
-        "lib/go/person.d.ts",
-        "lib/go/pin.d.ts",
-        "lib/go/playback-fast-forward.d.ts",
-        "lib/go/playback-pause.d.ts",
-        "lib/go/playback-play.d.ts",
-        "lib/go/playback-rewind.d.ts",
-        "lib/go/plug.d.ts",
-        "lib/go/plus.d.ts",
-        "lib/go/podium.d.ts",
-        "lib/go/primitive-dot.d.ts",
-        "lib/go/primitive-square.d.ts",
-        "lib/go/pulse.d.ts",
-        "lib/go/puzzle.d.ts",
-        "lib/go/question.d.ts",
-        "lib/go/quote.d.ts",
-        "lib/go/radio-tower.d.ts",
-        "lib/go/repo-clone.d.ts",
-        "lib/go/repo-force-push.d.ts",
-        "lib/go/repo-forked.d.ts",
-        "lib/go/repo-pull.d.ts",
-        "lib/go/repo-push.d.ts",
-        "lib/go/repo.d.ts",
-        "lib/go/rocket.d.ts",
-        "lib/go/rss.d.ts",
-        "lib/go/ruby.d.ts",
-        "lib/go/screen-full.d.ts",
-        "lib/go/screen-normal.d.ts",
-        "lib/go/search.d.ts",
-        "lib/go/server.d.ts",
-        "lib/go/settings.d.ts",
-        "lib/go/sign-in.d.ts",
-        "lib/go/sign-out.d.ts",
-        "lib/go/split.d.ts",
-        "lib/go/squirrel.d.ts",
-        "lib/go/star.d.ts",
-        "lib/go/steps.d.ts",
-        "lib/go/stop.d.ts",
-        "lib/go/sync.d.ts",
-        "lib/go/tag.d.ts",
-        "lib/go/telescope.d.ts",
-        "lib/go/terminal.d.ts",
-        "lib/go/three-bars.d.ts",
-        "lib/go/tools.d.ts",
-        "lib/go/trashcan.d.ts",
-        "lib/go/triangle-down.d.ts",
-        "lib/go/triangle-left.d.ts",
-        "lib/go/triangle-right.d.ts",
-        "lib/go/triangle-up.d.ts",
-        "lib/go/unfold.d.ts",
-        "lib/go/unmute.d.ts",
-        "lib/go/versions.d.ts",
-        "lib/go/x.d.ts",
-        "lib/go/zap.d.ts",
-        "lib/io/alert-circled.d.ts",
-        "lib/io/alert.d.ts",
-        "lib/io/android-add-circle.d.ts",
-        "lib/io/android-add.d.ts",
-        "lib/io/android-alarm-clock.d.ts",
-        "lib/io/android-alert.d.ts",
-        "lib/io/android-apps.d.ts",
-        "lib/io/android-archive.d.ts",
-        "lib/io/android-arrow-back.d.ts",
-        "lib/io/android-arrow-down.d.ts",
-        "lib/io/android-arrow-dropdown-circle.d.ts",
-        "lib/io/android-arrow-dropdown.d.ts",
-        "lib/io/android-arrow-dropleft-circle.d.ts",
-        "lib/io/android-arrow-dropleft.d.ts",
-        "lib/io/android-arrow-dropright-circle.d.ts",
-        "lib/io/android-arrow-dropright.d.ts",
-        "lib/io/android-arrow-dropup-circle.d.ts",
-        "lib/io/android-arrow-dropup.d.ts",
-        "lib/io/android-arrow-forward.d.ts",
-        "lib/io/android-arrow-up.d.ts",
-        "lib/io/android-attach.d.ts",
-        "lib/io/android-bar.d.ts",
-        "lib/io/android-bicycle.d.ts",
-        "lib/io/android-boat.d.ts",
-        "lib/io/android-bookmark.d.ts",
-        "lib/io/android-bulb.d.ts",
-        "lib/io/android-bus.d.ts",
-        "lib/io/android-calendar.d.ts",
-        "lib/io/android-call.d.ts",
-        "lib/io/android-camera.d.ts",
-        "lib/io/android-cancel.d.ts",
-        "lib/io/android-car.d.ts",
-        "lib/io/android-cart.d.ts",
-        "lib/io/android-chat.d.ts",
-        "lib/io/android-checkbox-blank.d.ts",
-        "lib/io/android-checkbox-outline-blank.d.ts",
-        "lib/io/android-checkbox-outline.d.ts",
-        "lib/io/android-checkbox.d.ts",
-        "lib/io/android-checkmark-circle.d.ts",
-        "lib/io/android-clipboard.d.ts",
-        "lib/io/android-close.d.ts",
-        "lib/io/android-cloud-circle.d.ts",
-        "lib/io/android-cloud-done.d.ts",
-        "lib/io/android-cloud-outline.d.ts",
-        "lib/io/android-cloud.d.ts",
-        "lib/io/android-color-palette.d.ts",
-        "lib/io/android-compass.d.ts",
-        "lib/io/android-contact.d.ts",
-        "lib/io/android-contacts.d.ts",
-        "lib/io/android-contract.d.ts",
-        "lib/io/android-create.d.ts",
-        "lib/io/android-delete.d.ts",
-        "lib/io/android-desktop.d.ts",
-        "lib/io/android-document.d.ts",
-        "lib/io/android-done-all.d.ts",
-        "lib/io/android-done.d.ts",
-        "lib/io/android-download.d.ts",
-        "lib/io/android-drafts.d.ts",
-        "lib/io/android-exit.d.ts",
-        "lib/io/android-expand.d.ts",
-        "lib/io/android-favorite-outline.d.ts",
-        "lib/io/android-favorite.d.ts",
-        "lib/io/android-film.d.ts",
-        "lib/io/android-folder-open.d.ts",
-        "lib/io/android-folder.d.ts",
-        "lib/io/android-funnel.d.ts",
-        "lib/io/android-globe.d.ts",
-        "lib/io/android-hand.d.ts",
-        "lib/io/android-hangout.d.ts",
-        "lib/io/android-happy.d.ts",
-        "lib/io/android-home.d.ts",
-        "lib/io/android-image.d.ts",
-        "lib/io/android-laptop.d.ts",
-        "lib/io/android-list.d.ts",
-        "lib/io/android-locate.d.ts",
-        "lib/io/android-lock.d.ts",
-        "lib/io/android-mail.d.ts",
-        "lib/io/android-map.d.ts",
-        "lib/io/android-menu.d.ts",
-        "lib/io/android-microphone-off.d.ts",
-        "lib/io/android-microphone.d.ts",
-        "lib/io/android-more-horizontal.d.ts",
-        "lib/io/android-more-vertical.d.ts",
-        "lib/io/android-navigate.d.ts",
-        "lib/io/android-notifications-none.d.ts",
-        "lib/io/android-notifications-off.d.ts",
-        "lib/io/android-notifications.d.ts",
-        "lib/io/android-open.d.ts",
-        "lib/io/android-options.d.ts",
-        "lib/io/android-people.d.ts",
-        "lib/io/android-person-add.d.ts",
-        "lib/io/android-person.d.ts",
-        "lib/io/android-phone-landscape.d.ts",
-        "lib/io/android-phone-portrait.d.ts",
-        "lib/io/android-pin.d.ts",
-        "lib/io/android-plane.d.ts",
-        "lib/io/android-playstore.d.ts",
-        "lib/io/android-print.d.ts",
-        "lib/io/android-radio-button-off.d.ts",
-        "lib/io/android-radio-button-on.d.ts",
-        "lib/io/android-refresh.d.ts",
-        "lib/io/android-remove-circle.d.ts",
-        "lib/io/android-remove.d.ts",
-        "lib/io/android-restaurant.d.ts",
-        "lib/io/android-sad.d.ts",
-        "lib/io/android-search.d.ts",
-        "lib/io/android-send.d.ts",
-        "lib/io/android-settings.d.ts",
-        "lib/io/android-share-alt.d.ts",
-        "lib/io/android-share.d.ts",
-        "lib/io/android-star-half.d.ts",
-        "lib/io/android-star-outline.d.ts",
-        "lib/io/android-star.d.ts",
-        "lib/io/android-stopwatch.d.ts",
-        "lib/io/android-subway.d.ts",
-        "lib/io/android-sunny.d.ts",
-        "lib/io/android-sync.d.ts",
-        "lib/io/android-textsms.d.ts",
-        "lib/io/android-time.d.ts",
-        "lib/io/android-train.d.ts",
-        "lib/io/android-unlock.d.ts",
-        "lib/io/android-upload.d.ts",
-        "lib/io/android-volume-down.d.ts",
-        "lib/io/android-volume-mute.d.ts",
-        "lib/io/android-volume-off.d.ts",
-        "lib/io/android-volume-up.d.ts",
-        "lib/io/android-walk.d.ts",
-        "lib/io/android-warning.d.ts",
-        "lib/io/android-watch.d.ts",
-        "lib/io/android-wifi.d.ts",
-        "lib/io/aperture.d.ts",
-        "lib/io/archive.d.ts",
-        "lib/io/arrow-down-a.d.ts",
-        "lib/io/arrow-down-b.d.ts",
-        "lib/io/arrow-down-c.d.ts",
-        "lib/io/arrow-expand.d.ts",
-        "lib/io/arrow-graph-down-left.d.ts",
-        "lib/io/arrow-graph-down-right.d.ts",
-        "lib/io/arrow-graph-up-left.d.ts",
-        "lib/io/arrow-graph-up-right.d.ts",
-        "lib/io/arrow-left-a.d.ts",
-        "lib/io/arrow-left-b.d.ts",
-        "lib/io/arrow-left-c.d.ts",
-        "lib/io/arrow-move.d.ts",
-        "lib/io/arrow-resize.d.ts",
-        "lib/io/arrow-return-left.d.ts",
-        "lib/io/arrow-return-right.d.ts",
-        "lib/io/arrow-right-a.d.ts",
-        "lib/io/arrow-right-b.d.ts",
-        "lib/io/arrow-right-c.d.ts",
-        "lib/io/arrow-shrink.d.ts",
-        "lib/io/arrow-swap.d.ts",
-        "lib/io/arrow-up-a.d.ts",
-        "lib/io/arrow-up-b.d.ts",
-        "lib/io/arrow-up-c.d.ts",
-        "lib/io/asterisk.d.ts",
-        "lib/io/at.d.ts",
-        "lib/io/backspace-outline.d.ts",
-        "lib/io/backspace.d.ts",
-        "lib/io/bag.d.ts",
-        "lib/io/battery-charging.d.ts",
-        "lib/io/battery-empty.d.ts",
-        "lib/io/battery-full.d.ts",
-        "lib/io/battery-half.d.ts",
-        "lib/io/battery-low.d.ts",
-        "lib/io/beaker.d.ts",
-        "lib/io/beer.d.ts",
-        "lib/io/bluetooth.d.ts",
-        "lib/io/bonfire.d.ts",
-        "lib/io/bookmark.d.ts",
-        "lib/io/bowtie.d.ts",
-        "lib/io/briefcase.d.ts",
-        "lib/io/bug.d.ts",
-        "lib/io/calculator.d.ts",
-        "lib/io/calendar.d.ts",
-        "lib/io/camera.d.ts",
-        "lib/io/card.d.ts",
-        "lib/io/cash.d.ts",
-        "lib/io/chatbox-working.d.ts",
-        "lib/io/chatbox.d.ts",
-        "lib/io/chatboxes.d.ts",
-        "lib/io/chatbubble-working.d.ts",
-        "lib/io/chatbubble.d.ts",
-        "lib/io/chatbubbles.d.ts",
-        "lib/io/checkmark-circled.d.ts",
-        "lib/io/checkmark-round.d.ts",
-        "lib/io/checkmark.d.ts",
-        "lib/io/chevron-down.d.ts",
-        "lib/io/chevron-left.d.ts",
-        "lib/io/chevron-right.d.ts",
-        "lib/io/chevron-up.d.ts",
-        "lib/io/clipboard.d.ts",
-        "lib/io/clock.d.ts",
-        "lib/io/close-circled.d.ts",
-        "lib/io/close-round.d.ts",
-        "lib/io/close.d.ts",
-        "lib/io/closed-captioning.d.ts",
-        "lib/io/cloud.d.ts",
-        "lib/io/code-download.d.ts",
-        "lib/io/code-working.d.ts",
-        "lib/io/code.d.ts",
-        "lib/io/coffee.d.ts",
-        "lib/io/compass.d.ts",
-        "lib/io/compose.d.ts",
-        "lib/io/connectbars.d.ts",
-        "lib/io/contrast.d.ts",
-        "lib/io/crop.d.ts",
-        "lib/io/cube.d.ts",
-        "lib/io/disc.d.ts",
-        "lib/io/document-text.d.ts",
-        "lib/io/document.d.ts",
-        "lib/io/drag.d.ts",
-        "lib/io/earth.d.ts",
-        "lib/io/easel.d.ts",
-        "lib/io/edit.d.ts",
-        "lib/io/egg.d.ts",
-        "lib/io/eject.d.ts",
-        "lib/io/email-unread.d.ts",
-        "lib/io/email.d.ts",
-        "lib/io/erlenmeyer-flask-bubbles.d.ts",
-        "lib/io/erlenmeyer-flask.d.ts",
-        "lib/io/eye-disabled.d.ts",
-        "lib/io/eye.d.ts",
-        "lib/io/female.d.ts",
-        "lib/io/filing.d.ts",
-        "lib/io/film-marker.d.ts",
-        "lib/io/fireball.d.ts",
-        "lib/io/flag.d.ts",
-        "lib/io/flame.d.ts",
-        "lib/io/flash-off.d.ts",
-        "lib/io/flash.d.ts",
-        "lib/io/folder.d.ts",
-        "lib/io/fork-repo.d.ts",
-        "lib/io/fork.d.ts",
-        "lib/io/forward.d.ts",
-        "lib/io/funnel.d.ts",
-        "lib/io/gear-a.d.ts",
-        "lib/io/gear-b.d.ts",
-        "lib/io/grid.d.ts",
-        "lib/io/hammer.d.ts",
-        "lib/io/happy-outline.d.ts",
-        "lib/io/happy.d.ts",
-        "lib/io/headphone.d.ts",
-        "lib/io/heart-broken.d.ts",
-        "lib/io/heart.d.ts",
-        "lib/io/help-buoy.d.ts",
-        "lib/io/help-circled.d.ts",
-        "lib/io/help.d.ts",
-        "lib/io/home.d.ts",
-        "lib/io/icecream.d.ts",
-        "lib/io/image.d.ts",
-        "lib/io/images.d.ts",
-        "lib/io/informatcircled.d.ts",
-        "lib/io/information.d.ts",
-        "lib/io/ionic.d.ts",
-        "lib/io/ios-alarm-outline.d.ts",
-        "lib/io/ios-alarm.d.ts",
-        "lib/io/ios-albums-outline.d.ts",
-        "lib/io/ios-albums.d.ts",
-        "lib/io/ios-americanfootball-outline.d.ts",
-        "lib/io/ios-americanfootball.d.ts",
-        "lib/io/ios-analytics-outline.d.ts",
-        "lib/io/ios-analytics.d.ts",
-        "lib/io/ios-arrow-back.d.ts",
-        "lib/io/ios-arrow-down.d.ts",
-        "lib/io/ios-arrow-forward.d.ts",
-        "lib/io/ios-arrow-left.d.ts",
-        "lib/io/ios-arrow-right.d.ts",
-        "lib/io/ios-arrow-thin-down.d.ts",
-        "lib/io/ios-arrow-thin-left.d.ts",
-        "lib/io/ios-arrow-thin-right.d.ts",
-        "lib/io/ios-arrow-thin-up.d.ts",
-        "lib/io/ios-arrow-up.d.ts",
-        "lib/io/ios-at-outline.d.ts",
-        "lib/io/ios-at.d.ts",
-        "lib/io/ios-barcode-outline.d.ts",
-        "lib/io/ios-barcode.d.ts",
-        "lib/io/ios-baseball-outline.d.ts",
-        "lib/io/ios-baseball.d.ts",
-        "lib/io/ios-basketball-outline.d.ts",
-        "lib/io/ios-basketball.d.ts",
-        "lib/io/ios-bell-outline.d.ts",
-        "lib/io/ios-bell.d.ts",
-        "lib/io/ios-body-outline.d.ts",
-        "lib/io/ios-body.d.ts",
-        "lib/io/ios-bolt-outline.d.ts",
-        "lib/io/ios-bolt.d.ts",
-        "lib/io/ios-book-outline.d.ts",
-        "lib/io/ios-book.d.ts",
-        "lib/io/ios-bookmarks-outline.d.ts",
-        "lib/io/ios-bookmarks.d.ts",
-        "lib/io/ios-box-outline.d.ts",
-        "lib/io/ios-box.d.ts",
-        "lib/io/ios-briefcase-outline.d.ts",
-        "lib/io/ios-briefcase.d.ts",
-        "lib/io/ios-browsers-outline.d.ts",
-        "lib/io/ios-browsers.d.ts",
-        "lib/io/ios-calculator-outline.d.ts",
-        "lib/io/ios-calculator.d.ts",
-        "lib/io/ios-calendar-outline.d.ts",
-        "lib/io/ios-calendar.d.ts",
-        "lib/io/ios-camera-outline.d.ts",
-        "lib/io/ios-camera.d.ts",
-        "lib/io/ios-cart-outline.d.ts",
-        "lib/io/ios-cart.d.ts",
-        "lib/io/ios-chatboxes-outline.d.ts",
-        "lib/io/ios-chatboxes.d.ts",
-        "lib/io/ios-chatbubble-outline.d.ts",
-        "lib/io/ios-chatbubble.d.ts",
-        "lib/io/ios-checkmark-empty.d.ts",
-        "lib/io/ios-checkmark-outline.d.ts",
-        "lib/io/ios-checkmark.d.ts",
-        "lib/io/ios-circle-filled.d.ts",
-        "lib/io/ios-circle-outline.d.ts",
-        "lib/io/ios-clock-outline.d.ts",
-        "lib/io/ios-clock.d.ts",
-        "lib/io/ios-close-empty.d.ts",
-        "lib/io/ios-close-outline.d.ts",
-        "lib/io/ios-close.d.ts",
-        "lib/io/ios-cloud-download-outline.d.ts",
-        "lib/io/ios-cloud-download.d.ts",
-        "lib/io/ios-cloud-outline.d.ts",
-        "lib/io/ios-cloud-upload-outline.d.ts",
-        "lib/io/ios-cloud-upload.d.ts",
-        "lib/io/ios-cloud.d.ts",
-        "lib/io/ios-cloudy-night-outline.d.ts",
-        "lib/io/ios-cloudy-night.d.ts",
-        "lib/io/ios-cloudy-outline.d.ts",
-        "lib/io/ios-cloudy.d.ts",
-        "lib/io/ios-cog-outline.d.ts",
-        "lib/io/ios-cog.d.ts",
-        "lib/io/ios-color-filter-outline.d.ts",
-        "lib/io/ios-color-filter.d.ts",
-        "lib/io/ios-color-wand-outline.d.ts",
-        "lib/io/ios-color-wand.d.ts",
-        "lib/io/ios-compose-outline.d.ts",
-        "lib/io/ios-compose.d.ts",
-        "lib/io/ios-contact-outline.d.ts",
-        "lib/io/ios-contact.d.ts",
-        "lib/io/ios-copy-outline.d.ts",
-        "lib/io/ios-copy.d.ts",
-        "lib/io/ios-crop-strong.d.ts",
-        "lib/io/ios-crop.d.ts",
-        "lib/io/ios-download-outline.d.ts",
-        "lib/io/ios-download.d.ts",
-        "lib/io/ios-drag.d.ts",
-        "lib/io/ios-email-outline.d.ts",
-        "lib/io/ios-email.d.ts",
-        "lib/io/ios-eye-outline.d.ts",
-        "lib/io/ios-eye.d.ts",
-        "lib/io/ios-fastforward-outline.d.ts",
-        "lib/io/ios-fastforward.d.ts",
-        "lib/io/ios-filing-outline.d.ts",
-        "lib/io/ios-filing.d.ts",
-        "lib/io/ios-film-outline.d.ts",
-        "lib/io/ios-film.d.ts",
-        "lib/io/ios-flag-outline.d.ts",
-        "lib/io/ios-flag.d.ts",
-        "lib/io/ios-flame-outline.d.ts",
-        "lib/io/ios-flame.d.ts",
-        "lib/io/ios-flask-outline.d.ts",
-        "lib/io/ios-flask.d.ts",
-        "lib/io/ios-flower-outline.d.ts",
-        "lib/io/ios-flower.d.ts",
-        "lib/io/ios-folder-outline.d.ts",
-        "lib/io/ios-folder.d.ts",
-        "lib/io/ios-football-outline.d.ts",
-        "lib/io/ios-football.d.ts",
-        "lib/io/ios-game-controller-a-outline.d.ts",
-        "lib/io/ios-game-controller-a.d.ts",
-        "lib/io/ios-game-controller-b-outline.d.ts",
-        "lib/io/ios-game-controller-b.d.ts",
-        "lib/io/ios-gear-outline.d.ts",
-        "lib/io/ios-gear.d.ts",
-        "lib/io/ios-glasses-outline.d.ts",
-        "lib/io/ios-glasses.d.ts",
-        "lib/io/ios-grid-view-outline.d.ts",
-        "lib/io/ios-grid-view.d.ts",
-        "lib/io/ios-heart-outline.d.ts",
-        "lib/io/ios-heart.d.ts",
-        "lib/io/ios-help-empty.d.ts",
-        "lib/io/ios-help-outline.d.ts",
-        "lib/io/ios-help.d.ts",
-        "lib/io/ios-home-outline.d.ts",
-        "lib/io/ios-home.d.ts",
-        "lib/io/ios-infinite-outline.d.ts",
-        "lib/io/ios-infinite.d.ts",
-        "lib/io/ios-informatempty.d.ts",
-        "lib/io/ios-information.d.ts",
-        "lib/io/ios-informatoutline.d.ts",
-        "lib/io/ios-ionic-outline.d.ts",
-        "lib/io/ios-keypad-outline.d.ts",
-        "lib/io/ios-keypad.d.ts",
-        "lib/io/ios-lightbulb-outline.d.ts",
-        "lib/io/ios-lightbulb.d.ts",
-        "lib/io/ios-list-outline.d.ts",
-        "lib/io/ios-list.d.ts",
-        "lib/io/ios-location.d.ts",
-        "lib/io/ios-locatoutline.d.ts",
-        "lib/io/ios-locked-outline.d.ts",
-        "lib/io/ios-locked.d.ts",
-        "lib/io/ios-loop-strong.d.ts",
-        "lib/io/ios-loop.d.ts",
-        "lib/io/ios-medical-outline.d.ts",
-        "lib/io/ios-medical.d.ts",
-        "lib/io/ios-medkit-outline.d.ts",
-        "lib/io/ios-medkit.d.ts",
-        "lib/io/ios-mic-off.d.ts",
-        "lib/io/ios-mic-outline.d.ts",
-        "lib/io/ios-mic.d.ts",
-        "lib/io/ios-minus-empty.d.ts",
-        "lib/io/ios-minus-outline.d.ts",
-        "lib/io/ios-minus.d.ts",
-        "lib/io/ios-monitor-outline.d.ts",
-        "lib/io/ios-monitor.d.ts",
-        "lib/io/ios-moon-outline.d.ts",
-        "lib/io/ios-moon.d.ts",
-        "lib/io/ios-more-outline.d.ts",
-        "lib/io/ios-more.d.ts",
-        "lib/io/ios-musical-note.d.ts",
-        "lib/io/ios-musical-notes.d.ts",
-        "lib/io/ios-navigate-outline.d.ts",
-        "lib/io/ios-navigate.d.ts",
-        "lib/io/ios-nutrition.d.ts",
-        "lib/io/ios-nutritoutline.d.ts",
-        "lib/io/ios-paper-outline.d.ts",
-        "lib/io/ios-paper.d.ts",
-        "lib/io/ios-paperplane-outline.d.ts",
-        "lib/io/ios-paperplane.d.ts",
-        "lib/io/ios-partlysunny-outline.d.ts",
-        "lib/io/ios-partlysunny.d.ts",
-        "lib/io/ios-pause-outline.d.ts",
-        "lib/io/ios-pause.d.ts",
-        "lib/io/ios-paw-outline.d.ts",
-        "lib/io/ios-paw.d.ts",
-        "lib/io/ios-people-outline.d.ts",
-        "lib/io/ios-people.d.ts",
-        "lib/io/ios-person-outline.d.ts",
-        "lib/io/ios-person.d.ts",
-        "lib/io/ios-personadd-outline.d.ts",
-        "lib/io/ios-personadd.d.ts",
-        "lib/io/ios-photos-outline.d.ts",
-        "lib/io/ios-photos.d.ts",
-        "lib/io/ios-pie-outline.d.ts",
-        "lib/io/ios-pie.d.ts",
-        "lib/io/ios-pint-outline.d.ts",
-        "lib/io/ios-pint.d.ts",
-        "lib/io/ios-play-outline.d.ts",
-        "lib/io/ios-play.d.ts",
-        "lib/io/ios-plus-empty.d.ts",
-        "lib/io/ios-plus-outline.d.ts",
-        "lib/io/ios-plus.d.ts",
-        "lib/io/ios-pricetag-outline.d.ts",
-        "lib/io/ios-pricetag.d.ts",
-        "lib/io/ios-pricetags-outline.d.ts",
-        "lib/io/ios-pricetags.d.ts",
-        "lib/io/ios-printer-outline.d.ts",
-        "lib/io/ios-printer.d.ts",
-        "lib/io/ios-pulse-strong.d.ts",
-        "lib/io/ios-pulse.d.ts",
-        "lib/io/ios-rainy-outline.d.ts",
-        "lib/io/ios-rainy.d.ts",
-        "lib/io/ios-recording-outline.d.ts",
-        "lib/io/ios-recording.d.ts",
-        "lib/io/ios-redo-outline.d.ts",
-        "lib/io/ios-redo.d.ts",
-        "lib/io/ios-refresh-empty.d.ts",
-        "lib/io/ios-refresh-outline.d.ts",
-        "lib/io/ios-refresh.d.ts",
-        "lib/io/ios-reload.d.ts",
-        "lib/io/ios-reverse-camera-outline.d.ts",
-        "lib/io/ios-reverse-camera.d.ts",
-        "lib/io/ios-rewind-outline.d.ts",
-        "lib/io/ios-rewind.d.ts",
-        "lib/io/ios-rose-outline.d.ts",
-        "lib/io/ios-rose.d.ts",
-        "lib/io/ios-search-strong.d.ts",
-        "lib/io/ios-search.d.ts",
-        "lib/io/ios-settings-strong.d.ts",
-        "lib/io/ios-settings.d.ts",
-        "lib/io/ios-shuffle-strong.d.ts",
-        "lib/io/ios-shuffle.d.ts",
-        "lib/io/ios-skipbackward-outline.d.ts",
-        "lib/io/ios-skipbackward.d.ts",
-        "lib/io/ios-skipforward-outline.d.ts",
-        "lib/io/ios-skipforward.d.ts",
-        "lib/io/ios-snowy.d.ts",
-        "lib/io/ios-speedometer-outline.d.ts",
-        "lib/io/ios-speedometer.d.ts",
-        "lib/io/ios-star-half.d.ts",
-        "lib/io/ios-star-outline.d.ts",
-        "lib/io/ios-star.d.ts",
-        "lib/io/ios-stopwatch-outline.d.ts",
-        "lib/io/ios-stopwatch.d.ts",
-        "lib/io/ios-sunny-outline.d.ts",
-        "lib/io/ios-sunny.d.ts",
-        "lib/io/ios-telephone-outline.d.ts",
-        "lib/io/ios-telephone.d.ts",
-        "lib/io/ios-tennisball-outline.d.ts",
-        "lib/io/ios-tennisball.d.ts",
-        "lib/io/ios-thunderstorm-outline.d.ts",
-        "lib/io/ios-thunderstorm.d.ts",
-        "lib/io/ios-time-outline.d.ts",
-        "lib/io/ios-time.d.ts",
-        "lib/io/ios-timer-outline.d.ts",
-        "lib/io/ios-timer.d.ts",
-        "lib/io/ios-toggle-outline.d.ts",
-        "lib/io/ios-toggle.d.ts",
-        "lib/io/ios-trash-outline.d.ts",
-        "lib/io/ios-trash.d.ts",
-        "lib/io/ios-undo-outline.d.ts",
-        "lib/io/ios-undo.d.ts",
-        "lib/io/ios-unlocked-outline.d.ts",
-        "lib/io/ios-unlocked.d.ts",
-        "lib/io/ios-upload-outline.d.ts",
-        "lib/io/ios-upload.d.ts",
-        "lib/io/ios-videocam-outline.d.ts",
-        "lib/io/ios-videocam.d.ts",
-        "lib/io/ios-volume-high.d.ts",
-        "lib/io/ios-volume-low.d.ts",
-        "lib/io/ios-wineglass-outline.d.ts",
-        "lib/io/ios-wineglass.d.ts",
-        "lib/io/ios-world-outline.d.ts",
-        "lib/io/ios-world.d.ts",
-        "lib/io/ipad.d.ts",
-        "lib/io/iphone.d.ts",
-        "lib/io/ipod.d.ts",
-        "lib/io/jet.d.ts",
-        "lib/io/key.d.ts",
-        "lib/io/knife.d.ts",
-        "lib/io/laptop.d.ts",
-        "lib/io/leaf.d.ts",
-        "lib/io/levels.d.ts",
-        "lib/io/lightbulb.d.ts",
-        "lib/io/link.d.ts",
-        "lib/io/load-a.d.ts",
-        "lib/io/load-b.d.ts",
-        "lib/io/load-c.d.ts",
-        "lib/io/load-d.d.ts",
-        "lib/io/location.d.ts",
-        "lib/io/lock-combination.d.ts",
-        "lib/io/locked.d.ts",
-        "lib/io/log-in.d.ts",
-        "lib/io/log-out.d.ts",
-        "lib/io/loop.d.ts",
-        "lib/io/magnet.d.ts",
-        "lib/io/male.d.ts",
-        "lib/io/man.d.ts",
-        "lib/io/map.d.ts",
-        "lib/io/medkit.d.ts",
-        "lib/io/merge.d.ts",
-        "lib/io/mic-a.d.ts",
-        "lib/io/mic-b.d.ts",
-        "lib/io/mic-c.d.ts",
-        "lib/io/minus-circled.d.ts",
-        "lib/io/minus-round.d.ts",
-        "lib/io/minus.d.ts",
-        "lib/io/model-s.d.ts",
-        "lib/io/monitor.d.ts",
-        "lib/io/more.d.ts",
-        "lib/io/mouse.d.ts",
-        "lib/io/music-note.d.ts",
-        "lib/io/navicon-round.d.ts",
-        "lib/io/navicon.d.ts",
-        "lib/io/navigate.d.ts",
-        "lib/io/network.d.ts",
-        "lib/io/no-smoking.d.ts",
-        "lib/io/nuclear.d.ts",
-        "lib/io/outlet.d.ts",
-        "lib/io/paintbrush.d.ts",
-        "lib/io/paintbucket.d.ts",
-        "lib/io/paper-airplane.d.ts",
-        "lib/io/paperclip.d.ts",
-        "lib/io/pause.d.ts",
-        "lib/io/person-add.d.ts",
-        "lib/io/person-stalker.d.ts",
-        "lib/io/person.d.ts",
-        "lib/io/pie-graph.d.ts",
-        "lib/io/pin.d.ts",
-        "lib/io/pinpoint.d.ts",
-        "lib/io/pizza.d.ts",
-        "lib/io/plane.d.ts",
-        "lib/io/planet.d.ts",
-        "lib/io/play.d.ts",
-        "lib/io/playstation.d.ts",
-        "lib/io/plus-circled.d.ts",
-        "lib/io/plus-round.d.ts",
-        "lib/io/plus.d.ts",
-        "lib/io/podium.d.ts",
-        "lib/io/pound.d.ts",
-        "lib/io/power.d.ts",
-        "lib/io/pricetag.d.ts",
-        "lib/io/pricetags.d.ts",
-        "lib/io/printer.d.ts",
-        "lib/io/pull-request.d.ts",
-        "lib/io/qr-scanner.d.ts",
-        "lib/io/quote.d.ts",
-        "lib/io/radio-waves.d.ts",
-        "lib/io/record.d.ts",
-        "lib/io/refresh.d.ts",
-        "lib/io/reply-all.d.ts",
-        "lib/io/reply.d.ts",
-        "lib/io/ribbon-a.d.ts",
-        "lib/io/ribbon-b.d.ts",
-        "lib/io/sad-outline.d.ts",
-        "lib/io/sad.d.ts",
-        "lib/io/scissors.d.ts",
-        "lib/io/search.d.ts",
-        "lib/io/settings.d.ts",
-        "lib/io/share.d.ts",
-        "lib/io/shuffle.d.ts",
-        "lib/io/skip-backward.d.ts",
-        "lib/io/skip-forward.d.ts",
-        "lib/io/social-android-outline.d.ts",
-        "lib/io/social-android.d.ts",
-        "lib/io/social-angular-outline.d.ts",
-        "lib/io/social-angular.d.ts",
-        "lib/io/social-apple-outline.d.ts",
-        "lib/io/social-apple.d.ts",
-        "lib/io/social-bitcoin-outline.d.ts",
-        "lib/io/social-bitcoin.d.ts",
-        "lib/io/social-buffer-outline.d.ts",
-        "lib/io/social-buffer.d.ts",
-        "lib/io/social-chrome-outline.d.ts",
-        "lib/io/social-chrome.d.ts",
-        "lib/io/social-codepen-outline.d.ts",
-        "lib/io/social-codepen.d.ts",
-        "lib/io/social-css3-outline.d.ts",
-        "lib/io/social-css3.d.ts",
-        "lib/io/social-designernews-outline.d.ts",
-        "lib/io/social-designernews.d.ts",
-        "lib/io/social-dribbble-outline.d.ts",
-        "lib/io/social-dribbble.d.ts",
-        "lib/io/social-dropbox-outline.d.ts",
-        "lib/io/social-dropbox.d.ts",
-        "lib/io/social-euro-outline.d.ts",
-        "lib/io/social-euro.d.ts",
-        "lib/io/social-facebook-outline.d.ts",
-        "lib/io/social-facebook.d.ts",
-        "lib/io/social-foursquare-outline.d.ts",
-        "lib/io/social-foursquare.d.ts",
-        "lib/io/social-freebsd-devil.d.ts",
-        "lib/io/social-github-outline.d.ts",
-        "lib/io/social-github.d.ts",
-        "lib/io/social-google-outline.d.ts",
-        "lib/io/social-google.d.ts",
-        "lib/io/social-googleplus-outline.d.ts",
-        "lib/io/social-googleplus.d.ts",
-        "lib/io/social-hackernews-outline.d.ts",
-        "lib/io/social-hackernews.d.ts",
-        "lib/io/social-html5-outline.d.ts",
-        "lib/io/social-html5.d.ts",
-        "lib/io/social-instagram-outline.d.ts",
-        "lib/io/social-instagram.d.ts",
-        "lib/io/social-javascript-outline.d.ts",
-        "lib/io/social-javascript.d.ts",
-        "lib/io/social-linkedin-outline.d.ts",
-        "lib/io/social-linkedin.d.ts",
-        "lib/io/social-markdown.d.ts",
-        "lib/io/social-nodejs.d.ts",
-        "lib/io/social-octocat.d.ts",
-        "lib/io/social-pinterest-outline.d.ts",
-        "lib/io/social-pinterest.d.ts",
-        "lib/io/social-python.d.ts",
-        "lib/io/social-reddit-outline.d.ts",
-        "lib/io/social-reddit.d.ts",
-        "lib/io/social-rss-outline.d.ts",
-        "lib/io/social-rss.d.ts",
-        "lib/io/social-sass.d.ts",
-        "lib/io/social-skype-outline.d.ts",
-        "lib/io/social-skype.d.ts",
-        "lib/io/social-snapchat-outline.d.ts",
-        "lib/io/social-snapchat.d.ts",
-        "lib/io/social-tumblr-outline.d.ts",
-        "lib/io/social-tumblr.d.ts",
-        "lib/io/social-tux.d.ts",
-        "lib/io/social-twitch-outline.d.ts",
-        "lib/io/social-twitch.d.ts",
-        "lib/io/social-twitter-outline.d.ts",
-        "lib/io/social-twitter.d.ts",
-        "lib/io/social-usd-outline.d.ts",
-        "lib/io/social-usd.d.ts",
-        "lib/io/social-vimeo-outline.d.ts",
-        "lib/io/social-vimeo.d.ts",
-        "lib/io/social-whatsapp-outline.d.ts",
-        "lib/io/social-whatsapp.d.ts",
-        "lib/io/social-windows-outline.d.ts",
-        "lib/io/social-windows.d.ts",
-        "lib/io/social-wordpress-outline.d.ts",
-        "lib/io/social-wordpress.d.ts",
-        "lib/io/social-yahoo-outline.d.ts",
-        "lib/io/social-yahoo.d.ts",
-        "lib/io/social-yen-outline.d.ts",
-        "lib/io/social-yen.d.ts",
-        "lib/io/social-youtube-outline.d.ts",
-        "lib/io/social-youtube.d.ts",
-        "lib/io/soup-can-outline.d.ts",
-        "lib/io/soup-can.d.ts",
-        "lib/io/speakerphone.d.ts",
-        "lib/io/speedometer.d.ts",
-        "lib/io/spoon.d.ts",
-        "lib/io/star.d.ts",
-        "lib/io/stats-bars.d.ts",
-        "lib/io/steam.d.ts",
-        "lib/io/stop.d.ts",
-        "lib/io/thermometer.d.ts",
-        "lib/io/thumbsdown.d.ts",
-        "lib/io/thumbsup.d.ts",
-        "lib/io/toggle-filled.d.ts",
-        "lib/io/toggle.d.ts",
-        "lib/io/transgender.d.ts",
-        "lib/io/trash-a.d.ts",
-        "lib/io/trash-b.d.ts",
-        "lib/io/trophy.d.ts",
-        "lib/io/tshirt-outline.d.ts",
-        "lib/io/tshirt.d.ts",
-        "lib/io/umbrella.d.ts",
-        "lib/io/university.d.ts",
-        "lib/io/unlocked.d.ts",
-        "lib/io/upload.d.ts",
-        "lib/io/usb.d.ts",
-        "lib/io/videocamera.d.ts",
-        "lib/io/volume-high.d.ts",
-        "lib/io/volume-low.d.ts",
-        "lib/io/volume-medium.d.ts",
-        "lib/io/volume-mute.d.ts",
-        "lib/io/wand.d.ts",
-        "lib/io/waterdrop.d.ts",
-        "lib/io/wifi.d.ts",
-        "lib/io/wineglass.d.ts",
-        "lib/io/woman.d.ts",
-        "lib/io/wrench.d.ts",
-        "lib/io/xbox.d.ts",
-        "lib/md/3d-rotation.d.ts",
-        "lib/md/ac-unit.d.ts",
-        "lib/md/access-alarm.d.ts",
-        "lib/md/access-alarms.d.ts",
-        "lib/md/access-time.d.ts",
-        "lib/md/accessibility.d.ts",
-        "lib/md/accessible.d.ts",
-        "lib/md/account-balance-wallet.d.ts",
-        "lib/md/account-balance.d.ts",
-        "lib/md/account-box.d.ts",
-        "lib/md/account-circle.d.ts",
-        "lib/md/adb.d.ts",
-        "lib/md/add-a-photo.d.ts",
-        "lib/md/add-alarm.d.ts",
-        "lib/md/add-alert.d.ts",
-        "lib/md/add-box.d.ts",
-        "lib/md/add-circle-outline.d.ts",
-        "lib/md/add-circle.d.ts",
-        "lib/md/add-location.d.ts",
-        "lib/md/add-shopping-cart.d.ts",
-        "lib/md/add-to-photos.d.ts",
-        "lib/md/add-to-queue.d.ts",
-        "lib/md/add.d.ts",
-        "lib/md/adjust.d.ts",
-        "lib/md/airline-seat-flat-angled.d.ts",
-        "lib/md/airline-seat-flat.d.ts",
-        "lib/md/airline-seat-individual-suite.d.ts",
-        "lib/md/airline-seat-legroom-extra.d.ts",
-        "lib/md/airline-seat-legroom-normal.d.ts",
-        "lib/md/airline-seat-legroom-reduced.d.ts",
-        "lib/md/airline-seat-recline-extra.d.ts",
-        "lib/md/airline-seat-recline-normal.d.ts",
-        "lib/md/airplanemode-active.d.ts",
-        "lib/md/airplanemode-inactive.d.ts",
-        "lib/md/airplay.d.ts",
-        "lib/md/airport-shuttle.d.ts",
-        "lib/md/alarm-add.d.ts",
-        "lib/md/alarm-off.d.ts",
-        "lib/md/alarm-on.d.ts",
-        "lib/md/alarm.d.ts",
-        "lib/md/album.d.ts",
-        "lib/md/all-inclusive.d.ts",
-        "lib/md/all-out.d.ts",
-        "lib/md/android.d.ts",
-        "lib/md/announcement.d.ts",
-        "lib/md/apps.d.ts",
-        "lib/md/archive.d.ts",
-        "lib/md/arrow-back.d.ts",
-        "lib/md/arrow-downward.d.ts",
-        "lib/md/arrow-drop-down-circle.d.ts",
-        "lib/md/arrow-drop-down.d.ts",
-        "lib/md/arrow-drop-up.d.ts",
-        "lib/md/arrow-forward.d.ts",
-        "lib/md/arrow-upward.d.ts",
-        "lib/md/art-track.d.ts",
-        "lib/md/aspect-ratio.d.ts",
-        "lib/md/assessment.d.ts",
-        "lib/md/assignment-ind.d.ts",
-        "lib/md/assignment-late.d.ts",
-        "lib/md/assignment-return.d.ts",
-        "lib/md/assignment-returned.d.ts",
-        "lib/md/assignment-turned-in.d.ts",
-        "lib/md/assignment.d.ts",
-        "lib/md/assistant-photo.d.ts",
-        "lib/md/assistant.d.ts",
-        "lib/md/attach-file.d.ts",
-        "lib/md/attach-money.d.ts",
-        "lib/md/attachment.d.ts",
-        "lib/md/audiotrack.d.ts",
-        "lib/md/autorenew.d.ts",
-        "lib/md/av-timer.d.ts",
-        "lib/md/backspace.d.ts",
-        "lib/md/backup.d.ts",
-        "lib/md/battery-alert.d.ts",
-        "lib/md/battery-charging-full.d.ts",
-        "lib/md/battery-full.d.ts",
-        "lib/md/battery-std.d.ts",
-        "lib/md/battery-unknown.d.ts",
-        "lib/md/beach-access.d.ts",
-        "lib/md/beenhere.d.ts",
-        "lib/md/block.d.ts",
-        "lib/md/bluetooth-audio.d.ts",
-        "lib/md/bluetooth-connected.d.ts",
-        "lib/md/bluetooth-disabled.d.ts",
-        "lib/md/bluetooth-searching.d.ts",
-        "lib/md/bluetooth.d.ts",
-        "lib/md/blur-circular.d.ts",
-        "lib/md/blur-linear.d.ts",
-        "lib/md/blur-off.d.ts",
-        "lib/md/blur-on.d.ts",
-        "lib/md/book.d.ts",
-        "lib/md/bookmark-outline.d.ts",
-        "lib/md/bookmark.d.ts",
-        "lib/md/border-all.d.ts",
-        "lib/md/border-bottom.d.ts",
-        "lib/md/border-clear.d.ts",
-        "lib/md/border-color.d.ts",
-        "lib/md/border-horizontal.d.ts",
-        "lib/md/border-inner.d.ts",
-        "lib/md/border-left.d.ts",
-        "lib/md/border-outer.d.ts",
-        "lib/md/border-right.d.ts",
-        "lib/md/border-style.d.ts",
-        "lib/md/border-top.d.ts",
-        "lib/md/border-vertical.d.ts",
-        "lib/md/branding-watermark.d.ts",
-        "lib/md/brightness-1.d.ts",
-        "lib/md/brightness-2.d.ts",
-        "lib/md/brightness-3.d.ts",
-        "lib/md/brightness-4.d.ts",
-        "lib/md/brightness-5.d.ts",
-        "lib/md/brightness-6.d.ts",
-        "lib/md/brightness-7.d.ts",
-        "lib/md/brightness-auto.d.ts",
-        "lib/md/brightness-high.d.ts",
-        "lib/md/brightness-low.d.ts",
-        "lib/md/brightness-medium.d.ts",
-        "lib/md/broken-image.d.ts",
-        "lib/md/brush.d.ts",
-        "lib/md/bubble-chart.d.ts",
-        "lib/md/bug-report.d.ts",
-        "lib/md/build.d.ts",
-        "lib/md/burst-mode.d.ts",
-        "lib/md/business-center.d.ts",
-        "lib/md/business.d.ts",
-        "lib/md/cached.d.ts",
-        "lib/md/cake.d.ts",
-        "lib/md/call-end.d.ts",
-        "lib/md/call-made.d.ts",
-        "lib/md/call-merge.d.ts",
-        "lib/md/call-missed-outgoing.d.ts",
-        "lib/md/call-missed.d.ts",
-        "lib/md/call-received.d.ts",
-        "lib/md/call-split.d.ts",
-        "lib/md/call-to-action.d.ts",
-        "lib/md/call.d.ts",
-        "lib/md/camera-alt.d.ts",
-        "lib/md/camera-enhance.d.ts",
-        "lib/md/camera-front.d.ts",
-        "lib/md/camera-rear.d.ts",
-        "lib/md/camera-roll.d.ts",
-        "lib/md/camera.d.ts",
-        "lib/md/cancel.d.ts",
-        "lib/md/card-giftcard.d.ts",
-        "lib/md/card-membership.d.ts",
-        "lib/md/card-travel.d.ts",
-        "lib/md/casino.d.ts",
-        "lib/md/cast-connected.d.ts",
-        "lib/md/cast.d.ts",
-        "lib/md/center-focus-strong.d.ts",
-        "lib/md/center-focus-weak.d.ts",
-        "lib/md/change-history.d.ts",
-        "lib/md/chat-bubble-outline.d.ts",
-        "lib/md/chat-bubble.d.ts",
-        "lib/md/chat.d.ts",
-        "lib/md/check-box-outline-blank.d.ts",
-        "lib/md/check-box.d.ts",
-        "lib/md/check-circle.d.ts",
-        "lib/md/check.d.ts",
-        "lib/md/chevron-left.d.ts",
-        "lib/md/chevron-right.d.ts",
-        "lib/md/child-care.d.ts",
-        "lib/md/child-friendly.d.ts",
-        "lib/md/chrome-reader-mode.d.ts",
-        "lib/md/class.d.ts",
-        "lib/md/clear-all.d.ts",
-        "lib/md/clear.d.ts",
-        "lib/md/close.d.ts",
-        "lib/md/closed-caption.d.ts",
-        "lib/md/cloud-circle.d.ts",
-        "lib/md/cloud-done.d.ts",
-        "lib/md/cloud-download.d.ts",
-        "lib/md/cloud-off.d.ts",
-        "lib/md/cloud-queue.d.ts",
-        "lib/md/cloud-upload.d.ts",
-        "lib/md/cloud.d.ts",
-        "lib/md/code.d.ts",
-        "lib/md/collections-bookmark.d.ts",
-        "lib/md/collections.d.ts",
-        "lib/md/color-lens.d.ts",
-        "lib/md/colorize.d.ts",
-        "lib/md/comment.d.ts",
-        "lib/md/compare-arrows.d.ts",
-        "lib/md/compare.d.ts",
-        "lib/md/computer.d.ts",
-        "lib/md/confirmation-number.d.ts",
-        "lib/md/contact-mail.d.ts",
-        "lib/md/contact-phone.d.ts",
-        "lib/md/contacts.d.ts",
-        "lib/md/content-copy.d.ts",
-        "lib/md/content-cut.d.ts",
-        "lib/md/content-paste.d.ts",
-        "lib/md/control-point-duplicate.d.ts",
-        "lib/md/control-point.d.ts",
-        "lib/md/copyright.d.ts",
-        "lib/md/create-new-folder.d.ts",
-        "lib/md/create.d.ts",
-        "lib/md/credit-card.d.ts",
-        "lib/md/crop-16-9.d.ts",
-        "lib/md/crop-3-2.d.ts",
-        "lib/md/crop-5-4.d.ts",
-        "lib/md/crop-7-5.d.ts",
-        "lib/md/crop-din.d.ts",
-        "lib/md/crop-free.d.ts",
-        "lib/md/crop-landscape.d.ts",
-        "lib/md/crop-original.d.ts",
-        "lib/md/crop-portrait.d.ts",
-        "lib/md/crop-rotate.d.ts",
-        "lib/md/crop-square.d.ts",
-        "lib/md/crop.d.ts",
-        "lib/md/dashboard.d.ts",
-        "lib/md/data-usage.d.ts",
-        "lib/md/date-range.d.ts",
-        "lib/md/dehaze.d.ts",
-        "lib/md/delete-forever.d.ts",
-        "lib/md/delete-sweep.d.ts",
-        "lib/md/delete.d.ts",
-        "lib/md/description.d.ts",
-        "lib/md/desktop-mac.d.ts",
-        "lib/md/desktop-windows.d.ts",
-        "lib/md/details.d.ts",
-        "lib/md/developer-board.d.ts",
-        "lib/md/developer-mode.d.ts",
-        "lib/md/device-hub.d.ts",
-        "lib/md/devices-other.d.ts",
-        "lib/md/devices.d.ts",
-        "lib/md/dialer-sip.d.ts",
-        "lib/md/dialpad.d.ts",
-        "lib/md/directions-bike.d.ts",
-        "lib/md/directions-boat.d.ts",
-        "lib/md/directions-bus.d.ts",
-        "lib/md/directions-car.d.ts",
-        "lib/md/directions-ferry.d.ts",
-        "lib/md/directions-railway.d.ts",
-        "lib/md/directions-run.d.ts",
-        "lib/md/directions-subway.d.ts",
-        "lib/md/directions-transit.d.ts",
-        "lib/md/directions-walk.d.ts",
-        "lib/md/directions.d.ts",
-        "lib/md/disc-full.d.ts",
-        "lib/md/dns.d.ts",
-        "lib/md/do-not-disturb-alt.d.ts",
-        "lib/md/do-not-disturb-off.d.ts",
-        "lib/md/do-not-disturb.d.ts",
-        "lib/md/dock.d.ts",
-        "lib/md/domain.d.ts",
-        "lib/md/done-all.d.ts",
-        "lib/md/done.d.ts",
-        "lib/md/donut-large.d.ts",
-        "lib/md/donut-small.d.ts",
-        "lib/md/drafts.d.ts",
-        "lib/md/drag-handle.d.ts",
-        "lib/md/drive-eta.d.ts",
-        "lib/md/dvr.d.ts",
-        "lib/md/edit-location.d.ts",
-        "lib/md/edit.d.ts",
-        "lib/md/eject.d.ts",
-        "lib/md/email.d.ts",
-        "lib/md/enhanced-encryption.d.ts",
-        "lib/md/equalizer.d.ts",
-        "lib/md/error-outline.d.ts",
-        "lib/md/error.d.ts",
-        "lib/md/euro-symbol.d.ts",
-        "lib/md/ev-station.d.ts",
-        "lib/md/event-available.d.ts",
-        "lib/md/event-busy.d.ts",
-        "lib/md/event-note.d.ts",
-        "lib/md/event-seat.d.ts",
-        "lib/md/event.d.ts",
-        "lib/md/exit-to-app.d.ts",
-        "lib/md/expand-less.d.ts",
-        "lib/md/expand-more.d.ts",
-        "lib/md/explicit.d.ts",
-        "lib/md/explore.d.ts",
-        "lib/md/exposure-minus-1.d.ts",
-        "lib/md/exposure-minus-2.d.ts",
-        "lib/md/exposure-neg-1.d.ts",
-        "lib/md/exposure-neg-2.d.ts",
-        "lib/md/exposure-plus-1.d.ts",
-        "lib/md/exposure-plus-2.d.ts",
-        "lib/md/exposure-zero.d.ts",
-        "lib/md/exposure.d.ts",
-        "lib/md/extension.d.ts",
-        "lib/md/face.d.ts",
-        "lib/md/fast-forward.d.ts",
-        "lib/md/fast-rewind.d.ts",
-        "lib/md/favorite-border.d.ts",
-        "lib/md/favorite-outline.d.ts",
-        "lib/md/favorite.d.ts",
-        "lib/md/featured-play-list.d.ts",
-        "lib/md/featured-video.d.ts",
-        "lib/md/feedback.d.ts",
-        "lib/md/fiber-dvr.d.ts",
-        "lib/md/fiber-manual-record.d.ts",
-        "lib/md/fiber-new.d.ts",
-        "lib/md/fiber-pin.d.ts",
-        "lib/md/fiber-smart-record.d.ts",
-        "lib/md/file-download.d.ts",
-        "lib/md/file-upload.d.ts",
-        "lib/md/filter-1.d.ts",
-        "lib/md/filter-2.d.ts",
-        "lib/md/filter-3.d.ts",
-        "lib/md/filter-4.d.ts",
-        "lib/md/filter-5.d.ts",
-        "lib/md/filter-6.d.ts",
-        "lib/md/filter-7.d.ts",
-        "lib/md/filter-8.d.ts",
-        "lib/md/filter-9-plus.d.ts",
-        "lib/md/filter-9.d.ts",
-        "lib/md/filter-b-and-w.d.ts",
-        "lib/md/filter-center-focus.d.ts",
-        "lib/md/filter-drama.d.ts",
-        "lib/md/filter-frames.d.ts",
-        "lib/md/filter-hdr.d.ts",
-        "lib/md/filter-list.d.ts",
-        "lib/md/filter-none.d.ts",
-        "lib/md/filter-tilt-shift.d.ts",
-        "lib/md/filter-vintage.d.ts",
-        "lib/md/filter.d.ts",
-        "lib/md/find-in-page.d.ts",
-        "lib/md/find-replace.d.ts",
-        "lib/md/fingerprint.d.ts",
-        "lib/md/first-page.d.ts",
-        "lib/md/fitness-center.d.ts",
-        "lib/md/flag.d.ts",
-        "lib/md/flare.d.ts",
-        "lib/md/flash-auto.d.ts",
-        "lib/md/flash-off.d.ts",
-        "lib/md/flash-on.d.ts",
-        "lib/md/flight-land.d.ts",
-        "lib/md/flight-takeoff.d.ts",
-        "lib/md/flight.d.ts",
-        "lib/md/flip-to-back.d.ts",
-        "lib/md/flip-to-front.d.ts",
-        "lib/md/flip.d.ts",
-        "lib/md/folder-open.d.ts",
-        "lib/md/folder-shared.d.ts",
-        "lib/md/folder-special.d.ts",
-        "lib/md/folder.d.ts",
-        "lib/md/font-download.d.ts",
-        "lib/md/format-align-center.d.ts",
-        "lib/md/format-align-justify.d.ts",
-        "lib/md/format-align-left.d.ts",
-        "lib/md/format-align-right.d.ts",
-        "lib/md/format-bold.d.ts",
-        "lib/md/format-clear.d.ts",
-        "lib/md/format-color-fill.d.ts",
-        "lib/md/format-color-reset.d.ts",
-        "lib/md/format-color-text.d.ts",
-        "lib/md/format-indent-decrease.d.ts",
-        "lib/md/format-indent-increase.d.ts",
-        "lib/md/format-italic.d.ts",
-        "lib/md/format-line-spacing.d.ts",
-        "lib/md/format-list-bulleted.d.ts",
-        "lib/md/format-list-numbered.d.ts",
-        "lib/md/format-paint.d.ts",
-        "lib/md/format-quote.d.ts",
-        "lib/md/format-shapes.d.ts",
-        "lib/md/format-size.d.ts",
-        "lib/md/format-strikethrough.d.ts",
-        "lib/md/format-textdirection-l-to-r.d.ts",
-        "lib/md/format-textdirection-r-to-l.d.ts",
-        "lib/md/format-underlined.d.ts",
-        "lib/md/forum.d.ts",
-        "lib/md/forward-10.d.ts",
-        "lib/md/forward-30.d.ts",
-        "lib/md/forward-5.d.ts",
-        "lib/md/forward.d.ts",
-        "lib/md/free-breakfast.d.ts",
-        "lib/md/fullscreen-exit.d.ts",
-        "lib/md/fullscreen.d.ts",
-        "lib/md/functions.d.ts",
-        "lib/md/g-translate.d.ts",
-        "lib/md/gamepad.d.ts",
-        "lib/md/games.d.ts",
-        "lib/md/gavel.d.ts",
-        "lib/md/gesture.d.ts",
-        "lib/md/get-app.d.ts",
-        "lib/md/gif.d.ts",
-        "lib/md/goat.d.ts",
-        "lib/md/golf-course.d.ts",
-        "lib/md/gps-fixed.d.ts",
-        "lib/md/gps-not-fixed.d.ts",
-        "lib/md/gps-off.d.ts",
-        "lib/md/grade.d.ts",
-        "lib/md/gradient.d.ts",
-        "lib/md/grain.d.ts",
-        "lib/md/graphic-eq.d.ts",
-        "lib/md/grid-off.d.ts",
-        "lib/md/grid-on.d.ts",
-        "lib/md/group-add.d.ts",
-        "lib/md/group-work.d.ts",
-        "lib/md/group.d.ts",
-        "lib/md/hd.d.ts",
-        "lib/md/hdr-off.d.ts",
-        "lib/md/hdr-on.d.ts",
-        "lib/md/hdr-strong.d.ts",
-        "lib/md/hdr-weak.d.ts",
-        "lib/md/headset-mic.d.ts",
-        "lib/md/headset.d.ts",
-        "lib/md/healing.d.ts",
-        "lib/md/hearing.d.ts",
-        "lib/md/help-outline.d.ts",
-        "lib/md/help.d.ts",
-        "lib/md/high-quality.d.ts",
-        "lib/md/highlight-off.d.ts",
-        "lib/md/highlight-remove.d.ts",
-        "lib/md/highlight.d.ts",
-        "lib/md/history.d.ts",
-        "lib/md/home.d.ts",
-        "lib/md/hot-tub.d.ts",
-        "lib/md/hotel.d.ts",
-        "lib/md/hourglass-empty.d.ts",
-        "lib/md/hourglass-full.d.ts",
-        "lib/md/http.d.ts",
-        "lib/md/https.d.ts",
-        "lib/md/image-aspect-ratio.d.ts",
-        "lib/md/image.d.ts",
-        "lib/md/import-contacts.d.ts",
-        "lib/md/import-export.d.ts",
-        "lib/md/important-devices.d.ts",
-        "lib/md/inbox.d.ts",
-        "lib/md/indeterminate-check-box.d.ts",
-        "lib/md/info-outline.d.ts",
-        "lib/md/info.d.ts",
-        "lib/md/input.d.ts",
-        "lib/md/insert-chart.d.ts",
-        "lib/md/insert-comment.d.ts",
-        "lib/md/insert-drive-file.d.ts",
-        "lib/md/insert-emoticon.d.ts",
-        "lib/md/insert-invitation.d.ts",
-        "lib/md/insert-link.d.ts",
-        "lib/md/insert-photo.d.ts",
-        "lib/md/invert-colors-off.d.ts",
-        "lib/md/invert-colors-on.d.ts",
-        "lib/md/invert-colors.d.ts",
-        "lib/md/iso.d.ts",
-        "lib/md/keyboard-arrow-down.d.ts",
-        "lib/md/keyboard-arrow-left.d.ts",
-        "lib/md/keyboard-arrow-right.d.ts",
-        "lib/md/keyboard-arrow-up.d.ts",
-        "lib/md/keyboard-backspace.d.ts",
-        "lib/md/keyboard-capslock.d.ts",
-        "lib/md/keyboard-control.d.ts",
-        "lib/md/keyboard-hide.d.ts",
-        "lib/md/keyboard-return.d.ts",
-        "lib/md/keyboard-tab.d.ts",
-        "lib/md/keyboard-voice.d.ts",
-        "lib/md/keyboard.d.ts",
-        "lib/md/kitchen.d.ts",
-        "lib/md/label-outline.d.ts",
-        "lib/md/label.d.ts",
-        "lib/md/landscape.d.ts",
-        "lib/md/language.d.ts",
-        "lib/md/laptop-chromebook.d.ts",
-        "lib/md/laptop-mac.d.ts",
-        "lib/md/laptop-windows.d.ts",
-        "lib/md/laptop.d.ts",
-        "lib/md/last-page.d.ts",
-        "lib/md/launch.d.ts",
-        "lib/md/layers-clear.d.ts",
-        "lib/md/layers.d.ts",
-        "lib/md/leak-add.d.ts",
-        "lib/md/leak-remove.d.ts",
-        "lib/md/lens.d.ts",
-        "lib/md/library-add.d.ts",
-        "lib/md/library-books.d.ts",
-        "lib/md/library-music.d.ts",
-        "lib/md/lightbulb-outline.d.ts",
-        "lib/md/line-style.d.ts",
-        "lib/md/line-weight.d.ts",
-        "lib/md/linear-scale.d.ts",
-        "lib/md/link.d.ts",
-        "lib/md/linked-camera.d.ts",
-        "lib/md/list.d.ts",
-        "lib/md/live-help.d.ts",
-        "lib/md/live-tv.d.ts",
-        "lib/md/local-airport.d.ts",
-        "lib/md/local-atm.d.ts",
-        "lib/md/local-attraction.d.ts",
-        "lib/md/local-bar.d.ts",
-        "lib/md/local-cafe.d.ts",
-        "lib/md/local-car-wash.d.ts",
-        "lib/md/local-convenience-store.d.ts",
-        "lib/md/local-drink.d.ts",
-        "lib/md/local-florist.d.ts",
-        "lib/md/local-gas-station.d.ts",
-        "lib/md/local-grocery-store.d.ts",
-        "lib/md/local-hospital.d.ts",
-        "lib/md/local-hotel.d.ts",
-        "lib/md/local-laundry-service.d.ts",
-        "lib/md/local-library.d.ts",
-        "lib/md/local-mall.d.ts",
-        "lib/md/local-movies.d.ts",
-        "lib/md/local-offer.d.ts",
-        "lib/md/local-parking.d.ts",
-        "lib/md/local-pharmacy.d.ts",
-        "lib/md/local-phone.d.ts",
-        "lib/md/local-pizza.d.ts",
-        "lib/md/local-play.d.ts",
-        "lib/md/local-post-office.d.ts",
-        "lib/md/local-print-shop.d.ts",
-        "lib/md/local-restaurant.d.ts",
-        "lib/md/local-see.d.ts",
-        "lib/md/local-shipping.d.ts",
-        "lib/md/local-taxi.d.ts",
-        "lib/md/location-city.d.ts",
-        "lib/md/location-disabled.d.ts",
-        "lib/md/location-history.d.ts",
-        "lib/md/location-off.d.ts",
-        "lib/md/location-on.d.ts",
-        "lib/md/location-searching.d.ts",
-        "lib/md/lock-open.d.ts",
-        "lib/md/lock-outline.d.ts",
-        "lib/md/lock.d.ts",
-        "lib/md/looks-3.d.ts",
-        "lib/md/looks-4.d.ts",
-        "lib/md/looks-5.d.ts",
-        "lib/md/looks-6.d.ts",
-        "lib/md/looks-one.d.ts",
-        "lib/md/looks-two.d.ts",
-        "lib/md/looks.d.ts",
-        "lib/md/loop.d.ts",
-        "lib/md/loupe.d.ts",
-        "lib/md/low-priority.d.ts",
-        "lib/md/loyalty.d.ts",
-        "lib/md/mail-outline.d.ts",
-        "lib/md/mail.d.ts",
-        "lib/md/map.d.ts",
-        "lib/md/markunread-mailbox.d.ts",
-        "lib/md/markunread.d.ts",
-        "lib/md/memory.d.ts",
-        "lib/md/menu.d.ts",
-        "lib/md/merge-type.d.ts",
-        "lib/md/message.d.ts",
-        "lib/md/mic-none.d.ts",
-        "lib/md/mic-off.d.ts",
-        "lib/md/mic.d.ts",
-        "lib/md/mms.d.ts",
-        "lib/md/mode-comment.d.ts",
-        "lib/md/mode-edit.d.ts",
-        "lib/md/monetization-on.d.ts",
-        "lib/md/money-off.d.ts",
-        "lib/md/monochrome-photos.d.ts",
-        "lib/md/mood-bad.d.ts",
-        "lib/md/mood.d.ts",
-        "lib/md/more-horiz.d.ts",
-        "lib/md/more-vert.d.ts",
-        "lib/md/more.d.ts",
-        "lib/md/motorcycle.d.ts",
-        "lib/md/mouse.d.ts",
-        "lib/md/move-to-inbox.d.ts",
-        "lib/md/movie-creation.d.ts",
-        "lib/md/movie-filter.d.ts",
-        "lib/md/movie.d.ts",
-        "lib/md/multiline-chart.d.ts",
-        "lib/md/music-note.d.ts",
-        "lib/md/music-video.d.ts",
-        "lib/md/my-location.d.ts",
-        "lib/md/nature-people.d.ts",
-        "lib/md/nature.d.ts",
-        "lib/md/navigate-before.d.ts",
-        "lib/md/navigate-next.d.ts",
-        "lib/md/navigation.d.ts",
-        "lib/md/near-me.d.ts",
-        "lib/md/network-cell.d.ts",
-        "lib/md/network-check.d.ts",
-        "lib/md/network-locked.d.ts",
-        "lib/md/network-wifi.d.ts",
-        "lib/md/new-releases.d.ts",
-        "lib/md/next-week.d.ts",
-        "lib/md/nfc.d.ts",
-        "lib/md/no-encryption.d.ts",
-        "lib/md/no-sim.d.ts",
-        "lib/md/not-interested.d.ts",
-        "lib/md/note-add.d.ts",
-        "lib/md/note.d.ts",
-        "lib/md/notifications-active.d.ts",
-        "lib/md/notifications-none.d.ts",
-        "lib/md/notifications-off.d.ts",
-        "lib/md/notifications-paused.d.ts",
-        "lib/md/notifications.d.ts",
-        "lib/md/now-wallpaper.d.ts",
-        "lib/md/now-widgets.d.ts",
-        "lib/md/offline-pin.d.ts",
-        "lib/md/ondemand-video.d.ts",
-        "lib/md/opacity.d.ts",
-        "lib/md/open-in-browser.d.ts",
-        "lib/md/open-in-new.d.ts",
-        "lib/md/open-with.d.ts",
-        "lib/md/pages.d.ts",
-        "lib/md/pageview.d.ts",
-        "lib/md/palette.d.ts",
-        "lib/md/pan-tool.d.ts",
-        "lib/md/panorama-fish-eye.d.ts",
-        "lib/md/panorama-horizontal.d.ts",
-        "lib/md/panorama-vertical.d.ts",
-        "lib/md/panorama-wide-angle.d.ts",
-        "lib/md/panorama.d.ts",
-        "lib/md/party-mode.d.ts",
-        "lib/md/pause-circle-filled.d.ts",
-        "lib/md/pause-circle-outline.d.ts",
-        "lib/md/pause.d.ts",
-        "lib/md/payment.d.ts",
-        "lib/md/people-outline.d.ts",
-        "lib/md/people.d.ts",
-        "lib/md/perm-camera-mic.d.ts",
-        "lib/md/perm-contact-calendar.d.ts",
-        "lib/md/perm-data-setting.d.ts",
-        "lib/md/perm-device-information.d.ts",
-        "lib/md/perm-identity.d.ts",
-        "lib/md/perm-media.d.ts",
-        "lib/md/perm-phone-msg.d.ts",
-        "lib/md/perm-scan-wifi.d.ts",
-        "lib/md/person-add.d.ts",
-        "lib/md/person-outline.d.ts",
-        "lib/md/person-pin-circle.d.ts",
-        "lib/md/person-pin.d.ts",
-        "lib/md/person.d.ts",
-        "lib/md/personal-video.d.ts",
-        "lib/md/pets.d.ts",
-        "lib/md/phone-android.d.ts",
-        "lib/md/phone-bluetooth-speaker.d.ts",
-        "lib/md/phone-forwarded.d.ts",
-        "lib/md/phone-in-talk.d.ts",
-        "lib/md/phone-iphone.d.ts",
-        "lib/md/phone-locked.d.ts",
-        "lib/md/phone-missed.d.ts",
-        "lib/md/phone-paused.d.ts",
-        "lib/md/phone.d.ts",
-        "lib/md/phonelink-erase.d.ts",
-        "lib/md/phonelink-lock.d.ts",
-        "lib/md/phonelink-off.d.ts",
-        "lib/md/phonelink-ring.d.ts",
-        "lib/md/phonelink-setup.d.ts",
-        "lib/md/phonelink.d.ts",
-        "lib/md/photo-album.d.ts",
-        "lib/md/photo-camera.d.ts",
-        "lib/md/photo-filter.d.ts",
-        "lib/md/photo-library.d.ts",
-        "lib/md/photo-size-select-actual.d.ts",
-        "lib/md/photo-size-select-large.d.ts",
-        "lib/md/photo-size-select-small.d.ts",
-        "lib/md/photo.d.ts",
-        "lib/md/picture-as-pdf.d.ts",
-        "lib/md/picture-in-picture-alt.d.ts",
-        "lib/md/picture-in-picture.d.ts",
-        "lib/md/pie-chart-outlined.d.ts",
-        "lib/md/pie-chart.d.ts",
-        "lib/md/pin-drop.d.ts",
-        "lib/md/place.d.ts",
-        "lib/md/play-arrow.d.ts",
-        "lib/md/play-circle-filled.d.ts",
-        "lib/md/play-circle-outline.d.ts",
-        "lib/md/play-for-work.d.ts",
-        "lib/md/playlist-add-check.d.ts",
-        "lib/md/playlist-add.d.ts",
-        "lib/md/playlist-play.d.ts",
-        "lib/md/plus-one.d.ts",
-        "lib/md/poll.d.ts",
-        "lib/md/polymer.d.ts",
-        "lib/md/pool.d.ts",
-        "lib/md/portable-wifi-off.d.ts",
-        "lib/md/portrait.d.ts",
-        "lib/md/power-input.d.ts",
-        "lib/md/power-settings-new.d.ts",
-        "lib/md/power.d.ts",
-        "lib/md/pregnant-woman.d.ts",
-        "lib/md/present-to-all.d.ts",
-        "lib/md/print.d.ts",
-        "lib/md/priority-high.d.ts",
-        "lib/md/public.d.ts",
-        "lib/md/publish.d.ts",
-        "lib/md/query-builder.d.ts",
-        "lib/md/question-answer.d.ts",
-        "lib/md/queue-music.d.ts",
-        "lib/md/queue-play-next.d.ts",
-        "lib/md/queue.d.ts",
-        "lib/md/radio-button-checked.d.ts",
-        "lib/md/radio-button-unchecked.d.ts",
-        "lib/md/radio.d.ts",
-        "lib/md/rate-review.d.ts",
-        "lib/md/receipt.d.ts",
-        "lib/md/recent-actors.d.ts",
-        "lib/md/record-voice-over.d.ts",
-        "lib/md/redeem.d.ts",
-        "lib/md/redo.d.ts",
-        "lib/md/refresh.d.ts",
-        "lib/md/remove-circle-outline.d.ts",
-        "lib/md/remove-circle.d.ts",
-        "lib/md/remove-from-queue.d.ts",
-        "lib/md/remove-red-eye.d.ts",
-        "lib/md/remove-shopping-cart.d.ts",
-        "lib/md/remove.d.ts",
-        "lib/md/reorder.d.ts",
-        "lib/md/repeat-one.d.ts",
-        "lib/md/repeat.d.ts",
-        "lib/md/replay-10.d.ts",
-        "lib/md/replay-30.d.ts",
-        "lib/md/replay-5.d.ts",
-        "lib/md/replay.d.ts",
-        "lib/md/reply-all.d.ts",
-        "lib/md/reply.d.ts",
-        "lib/md/report-problem.d.ts",
-        "lib/md/report.d.ts",
-        "lib/md/restaurant-menu.d.ts",
-        "lib/md/restaurant.d.ts",
-        "lib/md/restore-page.d.ts",
-        "lib/md/restore.d.ts",
-        "lib/md/ring-volume.d.ts",
-        "lib/md/room-service.d.ts",
-        "lib/md/room.d.ts",
-        "lib/md/rotate-90-degrees-ccw.d.ts",
-        "lib/md/rotate-left.d.ts",
-        "lib/md/rotate-right.d.ts",
-        "lib/md/rounded-corner.d.ts",
-        "lib/md/router.d.ts",
-        "lib/md/rowing.d.ts",
-        "lib/md/rss-feed.d.ts",
-        "lib/md/rv-hookup.d.ts",
-        "lib/md/satellite.d.ts",
-        "lib/md/save.d.ts",
-        "lib/md/scanner.d.ts",
-        "lib/md/schedule.d.ts",
-        "lib/md/school.d.ts",
-        "lib/md/screen-lock-landscape.d.ts",
-        "lib/md/screen-lock-portrait.d.ts",
-        "lib/md/screen-lock-rotation.d.ts",
-        "lib/md/screen-rotation.d.ts",
-        "lib/md/screen-share.d.ts",
-        "lib/md/sd-card.d.ts",
-        "lib/md/sd-storage.d.ts",
-        "lib/md/search.d.ts",
-        "lib/md/security.d.ts",
-        "lib/md/select-all.d.ts",
-        "lib/md/send.d.ts",
-        "lib/md/sentiment-dissatisfied.d.ts",
-        "lib/md/sentiment-neutral.d.ts",
-        "lib/md/sentiment-satisfied.d.ts",
-        "lib/md/sentiment-very-dissatisfied.d.ts",
-        "lib/md/sentiment-very-satisfied.d.ts",
-        "lib/md/settings-applications.d.ts",
-        "lib/md/settings-backup-restore.d.ts",
-        "lib/md/settings-bluetooth.d.ts",
-        "lib/md/settings-brightness.d.ts",
-        "lib/md/settings-cell.d.ts",
-        "lib/md/settings-ethernet.d.ts",
-        "lib/md/settings-input-antenna.d.ts",
-        "lib/md/settings-input-component.d.ts",
-        "lib/md/settings-input-composite.d.ts",
-        "lib/md/settings-input-hdmi.d.ts",
-        "lib/md/settings-input-svideo.d.ts",
-        "lib/md/settings-overscan.d.ts",
-        "lib/md/settings-phone.d.ts",
-        "lib/md/settings-power.d.ts",
-        "lib/md/settings-remote.d.ts",
-        "lib/md/settings-system-daydream.d.ts",
-        "lib/md/settings-voice.d.ts",
-        "lib/md/settings.d.ts",
-        "lib/md/share.d.ts",
-        "lib/md/shop-two.d.ts",
-        "lib/md/shop.d.ts",
-        "lib/md/shopping-basket.d.ts",
-        "lib/md/shopping-cart.d.ts",
-        "lib/md/short-text.d.ts",
-        "lib/md/show-chart.d.ts",
-        "lib/md/shuffle.d.ts",
-        "lib/md/signal-cellular-4-bar.d.ts",
-        "lib/md/signal-cellular-connected-no-internet-4-bar.d.ts",
-        "lib/md/signal-cellular-no-sim.d.ts",
-        "lib/md/signal-cellular-null.d.ts",
-        "lib/md/signal-cellular-off.d.ts",
-        "lib/md/signal-wifi-4-bar-lock.d.ts",
-        "lib/md/signal-wifi-4-bar.d.ts",
-        "lib/md/signal-wifi-off.d.ts",
-        "lib/md/sim-card-alert.d.ts",
-        "lib/md/sim-card.d.ts",
-        "lib/md/skip-next.d.ts",
-        "lib/md/skip-previous.d.ts",
-        "lib/md/slideshow.d.ts",
-        "lib/md/slow-motion-video.d.ts",
-        "lib/md/smartphone.d.ts",
-        "lib/md/smoke-free.d.ts",
-        "lib/md/smoking-rooms.d.ts",
-        "lib/md/sms-failed.d.ts",
-        "lib/md/sms.d.ts",
-        "lib/md/snooze.d.ts",
-        "lib/md/sort-by-alpha.d.ts",
-        "lib/md/sort.d.ts",
-        "lib/md/spa.d.ts",
-        "lib/md/space-bar.d.ts",
-        "lib/md/speaker-group.d.ts",
-        "lib/md/speaker-notes-off.d.ts",
-        "lib/md/speaker-notes.d.ts",
-        "lib/md/speaker-phone.d.ts",
-        "lib/md/speaker.d.ts",
-        "lib/md/spellcheck.d.ts",
-        "lib/md/star-border.d.ts",
-        "lib/md/star-half.d.ts",
-        "lib/md/star-outline.d.ts",
-        "lib/md/star.d.ts",
-        "lib/md/stars.d.ts",
-        "lib/md/stay-current-landscape.d.ts",
-        "lib/md/stay-current-portrait.d.ts",
-        "lib/md/stay-primary-landscape.d.ts",
-        "lib/md/stay-primary-portrait.d.ts",
-        "lib/md/stop-screen-share.d.ts",
-        "lib/md/stop.d.ts",
-        "lib/md/storage.d.ts",
-        "lib/md/store-mall-directory.d.ts",
-        "lib/md/store.d.ts",
-        "lib/md/straighten.d.ts",
-        "lib/md/streetview.d.ts",
-        "lib/md/strikethrough-s.d.ts",
-        "lib/md/style.d.ts",
-        "lib/md/subdirectory-arrow-left.d.ts",
-        "lib/md/subdirectory-arrow-right.d.ts",
-        "lib/md/subject.d.ts",
-        "lib/md/subscriptions.d.ts",
-        "lib/md/subtitles.d.ts",
-        "lib/md/subway.d.ts",
-        "lib/md/supervisor-account.d.ts",
-        "lib/md/surround-sound.d.ts",
-        "lib/md/swap-calls.d.ts",
-        "lib/md/swap-horiz.d.ts",
-        "lib/md/swap-vert.d.ts",
-        "lib/md/swap-vertical-circle.d.ts",
-        "lib/md/switch-camera.d.ts",
-        "lib/md/switch-video.d.ts",
-        "lib/md/sync-disabled.d.ts",
-        "lib/md/sync-problem.d.ts",
-        "lib/md/sync.d.ts",
-        "lib/md/system-update-alt.d.ts",
-        "lib/md/system-update.d.ts",
-        "lib/md/tab-unselected.d.ts",
-        "lib/md/tab.d.ts",
-        "lib/md/tablet-android.d.ts",
-        "lib/md/tablet-mac.d.ts",
-        "lib/md/tablet.d.ts",
-        "lib/md/tag-faces.d.ts",
-        "lib/md/tap-and-play.d.ts",
-        "lib/md/terrain.d.ts",
-        "lib/md/text-fields.d.ts",
-        "lib/md/text-format.d.ts",
-        "lib/md/textsms.d.ts",
-        "lib/md/texture.d.ts",
-        "lib/md/theaters.d.ts",
-        "lib/md/thumb-down.d.ts",
-        "lib/md/thumb-up.d.ts",
-        "lib/md/thumbs-up-down.d.ts",
-        "lib/md/time-to-leave.d.ts",
-        "lib/md/timelapse.d.ts",
-        "lib/md/timeline.d.ts",
-        "lib/md/timer-10.d.ts",
-        "lib/md/timer-3.d.ts",
-        "lib/md/timer-off.d.ts",
-        "lib/md/timer.d.ts",
-        "lib/md/title.d.ts",
-        "lib/md/toc.d.ts",
-        "lib/md/today.d.ts",
-        "lib/md/toll.d.ts",
-        "lib/md/tonality.d.ts",
-        "lib/md/touch-app.d.ts",
-        "lib/md/toys.d.ts",
-        "lib/md/track-changes.d.ts",
-        "lib/md/traffic.d.ts",
-        "lib/md/train.d.ts",
-        "lib/md/tram.d.ts",
-        "lib/md/transfer-within-a-station.d.ts",
-        "lib/md/transform.d.ts",
-        "lib/md/translate.d.ts",
-        "lib/md/trending-down.d.ts",
-        "lib/md/trending-flat.d.ts",
-        "lib/md/trending-neutral.d.ts",
-        "lib/md/trending-up.d.ts",
-        "lib/md/tune.d.ts",
-        "lib/md/turned-in-not.d.ts",
-        "lib/md/turned-in.d.ts",
-        "lib/md/tv.d.ts",
-        "lib/md/unarchive.d.ts",
-        "lib/md/undo.d.ts",
-        "lib/md/unfold-less.d.ts",
-        "lib/md/unfold-more.d.ts",
-        "lib/md/update.d.ts",
-        "lib/md/usb.d.ts",
-        "lib/md/verified-user.d.ts",
-        "lib/md/vertical-align-bottom.d.ts",
-        "lib/md/vertical-align-center.d.ts",
-        "lib/md/vertical-align-top.d.ts",
-        "lib/md/vibration.d.ts",
-        "lib/md/video-call.d.ts",
-        "lib/md/video-collection.d.ts",
-        "lib/md/video-label.d.ts",
-        "lib/md/video-library.d.ts",
-        "lib/md/videocam-off.d.ts",
-        "lib/md/videocam.d.ts",
-        "lib/md/videogame-asset.d.ts",
-        "lib/md/view-agenda.d.ts",
-        "lib/md/view-array.d.ts",
-        "lib/md/view-carousel.d.ts",
-        "lib/md/view-column.d.ts",
-        "lib/md/view-comfortable.d.ts",
-        "lib/md/view-comfy.d.ts",
-        "lib/md/view-compact.d.ts",
-        "lib/md/view-day.d.ts",
-        "lib/md/view-headline.d.ts",
-        "lib/md/view-list.d.ts",
-        "lib/md/view-module.d.ts",
-        "lib/md/view-quilt.d.ts",
-        "lib/md/view-stream.d.ts",
-        "lib/md/view-week.d.ts",
-        "lib/md/vignette.d.ts",
-        "lib/md/visibility-off.d.ts",
-        "lib/md/visibility.d.ts",
-        "lib/md/voice-chat.d.ts",
-        "lib/md/voicemail.d.ts",
-        "lib/md/volume-down.d.ts",
-        "lib/md/volume-mute.d.ts",
-        "lib/md/volume-off.d.ts",
-        "lib/md/volume-up.d.ts",
-        "lib/md/vpn-key.d.ts",
-        "lib/md/vpn-lock.d.ts",
-        "lib/md/wallpaper.d.ts",
-        "lib/md/warning.d.ts",
-        "lib/md/watch-later.d.ts",
-        "lib/md/watch.d.ts",
-        "lib/md/wb-auto.d.ts",
-        "lib/md/wb-cloudy.d.ts",
-        "lib/md/wb-incandescent.d.ts",
-        "lib/md/wb-iridescent.d.ts",
-        "lib/md/wb-sunny.d.ts",
-        "lib/md/wc.d.ts",
-        "lib/md/web-asset.d.ts",
-        "lib/md/web.d.ts",
-        "lib/md/weekend.d.ts",
-        "lib/md/whatshot.d.ts",
-        "lib/md/widgets.d.ts",
-        "lib/md/wifi-lock.d.ts",
-        "lib/md/wifi-tethering.d.ts",
-        "lib/md/wifi.d.ts",
-        "lib/md/work.d.ts",
-        "lib/md/wrap-text.d.ts",
-        "lib/md/youtube-searched-for.d.ts",
-        "lib/md/zoom-in.d.ts",
-        "lib/md/zoom-out-map.d.ts",
-        "lib/md/zoom-out.d.ts",
-        "lib/ti/adjust-brightness.d.ts",
-        "lib/ti/adjust-contrast.d.ts",
-        "lib/ti/anchor-outline.d.ts",
-        "lib/ti/anchor.d.ts",
-        "lib/ti/archive.d.ts",
-        "lib/ti/arrow-back-outline.d.ts",
-        "lib/ti/arrow-back.d.ts",
-        "lib/ti/arrow-down-outline.d.ts",
-        "lib/ti/arrow-down-thick.d.ts",
-        "lib/ti/arrow-down.d.ts",
-        "lib/ti/arrow-forward-outline.d.ts",
-        "lib/ti/arrow-forward.d.ts",
-        "lib/ti/arrow-left-outline.d.ts",
-        "lib/ti/arrow-left-thick.d.ts",
-        "lib/ti/arrow-left.d.ts",
-        "lib/ti/arrow-loop-outline.d.ts",
-        "lib/ti/arrow-loop.d.ts",
-        "lib/ti/arrow-maximise-outline.d.ts",
-        "lib/ti/arrow-maximise.d.ts",
-        "lib/ti/arrow-minimise-outline.d.ts",
-        "lib/ti/arrow-minimise.d.ts",
-        "lib/ti/arrow-move-outline.d.ts",
-        "lib/ti/arrow-move.d.ts",
-        "lib/ti/arrow-repeat-outline.d.ts",
-        "lib/ti/arrow-repeat.d.ts",
-        "lib/ti/arrow-right-outline.d.ts",
-        "lib/ti/arrow-right-thick.d.ts",
-        "lib/ti/arrow-right.d.ts",
-        "lib/ti/arrow-shuffle.d.ts",
-        "lib/ti/arrow-sorted-down.d.ts",
-        "lib/ti/arrow-sorted-up.d.ts",
-        "lib/ti/arrow-sync-outline.d.ts",
-        "lib/ti/arrow-sync.d.ts",
-        "lib/ti/arrow-unsorted.d.ts",
-        "lib/ti/arrow-up-outline.d.ts",
-        "lib/ti/arrow-up-thick.d.ts",
-        "lib/ti/arrow-up.d.ts",
-        "lib/ti/at.d.ts",
-        "lib/ti/attachment-outline.d.ts",
-        "lib/ti/attachment.d.ts",
-        "lib/ti/backspace-outline.d.ts",
-        "lib/ti/backspace.d.ts",
-        "lib/ti/battery-charge.d.ts",
-        "lib/ti/battery-full.d.ts",
-        "lib/ti/battery-high.d.ts",
-        "lib/ti/battery-low.d.ts",
-        "lib/ti/battery-mid.d.ts",
-        "lib/ti/beaker.d.ts",
-        "lib/ti/beer.d.ts",
-        "lib/ti/bell.d.ts",
-        "lib/ti/book.d.ts",
-        "lib/ti/bookmark.d.ts",
-        "lib/ti/briefcase.d.ts",
-        "lib/ti/brush.d.ts",
-        "lib/ti/business-card.d.ts",
-        "lib/ti/calculator.d.ts",
-        "lib/ti/calendar-outline.d.ts",
-        "lib/ti/calendar.d.ts",
-        "lib/ti/calender-outline.d.ts",
-        "lib/ti/calender.d.ts",
-        "lib/ti/camera-outline.d.ts",
-        "lib/ti/camera.d.ts",
-        "lib/ti/cancel-outline.d.ts",
-        "lib/ti/cancel.d.ts",
-        "lib/ti/chart-area-outline.d.ts",
-        "lib/ti/chart-area.d.ts",
-        "lib/ti/chart-bar-outline.d.ts",
-        "lib/ti/chart-bar.d.ts",
-        "lib/ti/chart-line-outline.d.ts",
-        "lib/ti/chart-line.d.ts",
-        "lib/ti/chart-pie-outline.d.ts",
-        "lib/ti/chart-pie.d.ts",
-        "lib/ti/chevron-left-outline.d.ts",
-        "lib/ti/chevron-left.d.ts",
-        "lib/ti/chevron-right-outline.d.ts",
-        "lib/ti/chevron-right.d.ts",
-        "lib/ti/clipboard.d.ts",
-        "lib/ti/cloud-storage-outline.d.ts",
-        "lib/ti/cloud-storage.d.ts",
-        "lib/ti/code-outline.d.ts",
-        "lib/ti/code.d.ts",
-        "lib/ti/coffee.d.ts",
-        "lib/ti/cog-outline.d.ts",
-        "lib/ti/cog.d.ts",
-        "lib/ti/compass.d.ts",
-        "lib/ti/contacts.d.ts",
-        "lib/ti/credit-card.d.ts",
-        "lib/ti/cross.d.ts",
-        "lib/ti/css3.d.ts",
-        "lib/ti/database.d.ts",
-        "lib/ti/delete-outline.d.ts",
-        "lib/ti/delete.d.ts",
-        "lib/ti/device-desktop.d.ts",
-        "lib/ti/device-laptop.d.ts",
-        "lib/ti/device-phone.d.ts",
-        "lib/ti/device-tablet.d.ts",
-        "lib/ti/directions.d.ts",
-        "lib/ti/divide-outline.d.ts",
-        "lib/ti/divide.d.ts",
-        "lib/ti/document-add.d.ts",
-        "lib/ti/document-delete.d.ts",
-        "lib/ti/document-text.d.ts",
-        "lib/ti/document.d.ts",
-        "lib/ti/download-outline.d.ts",
-        "lib/ti/download.d.ts",
-        "lib/ti/dropbox.d.ts",
-        "lib/ti/edit.d.ts",
-        "lib/ti/eject-outline.d.ts",
-        "lib/ti/eject.d.ts",
-        "lib/ti/equals-outline.d.ts",
-        "lib/ti/equals.d.ts",
-        "lib/ti/export-outline.d.ts",
-        "lib/ti/export.d.ts",
-        "lib/ti/eye-outline.d.ts",
-        "lib/ti/eye.d.ts",
-        "lib/ti/feather.d.ts",
-        "lib/ti/film.d.ts",
-        "lib/ti/filter.d.ts",
-        "lib/ti/flag-outline.d.ts",
-        "lib/ti/flag.d.ts",
-        "lib/ti/flash-outline.d.ts",
-        "lib/ti/flash.d.ts",
-        "lib/ti/flow-children.d.ts",
-        "lib/ti/flow-merge.d.ts",
-        "lib/ti/flow-parallel.d.ts",
-        "lib/ti/flow-switch.d.ts",
-        "lib/ti/folder-add.d.ts",
-        "lib/ti/folder-delete.d.ts",
-        "lib/ti/folder-open.d.ts",
-        "lib/ti/folder.d.ts",
-        "lib/ti/gift.d.ts",
-        "lib/ti/globe-outline.d.ts",
-        "lib/ti/globe.d.ts",
-        "lib/ti/group-outline.d.ts",
-        "lib/ti/group.d.ts",
-        "lib/ti/headphones.d.ts",
-        "lib/ti/heart-full-outline.d.ts",
-        "lib/ti/heart-half-outline.d.ts",
-        "lib/ti/heart-outline.d.ts",
-        "lib/ti/heart.d.ts",
-        "lib/ti/home-outline.d.ts",
-        "lib/ti/home.d.ts",
-        "lib/ti/html5.d.ts",
-        "lib/ti/image-outline.d.ts",
-        "lib/ti/image.d.ts",
-        "lib/ti/infinity-outline.d.ts",
-        "lib/ti/infinity.d.ts",
-        "lib/ti/info-large-outline.d.ts",
-        "lib/ti/info-large.d.ts",
-        "lib/ti/info-outline.d.ts",
-        "lib/ti/info.d.ts",
-        "lib/ti/input-checked-outline.d.ts",
-        "lib/ti/input-checked.d.ts",
-        "lib/ti/key-outline.d.ts",
-        "lib/ti/key.d.ts",
-        "lib/ti/keyboard.d.ts",
-        "lib/ti/leaf.d.ts",
-        "lib/ti/lightbulb.d.ts",
-        "lib/ti/link-outline.d.ts",
-        "lib/ti/link.d.ts",
-        "lib/ti/location-arrow-outline.d.ts",
-        "lib/ti/location-arrow.d.ts",
-        "lib/ti/location-outline.d.ts",
-        "lib/ti/location.d.ts",
-        "lib/ti/lock-closed-outline.d.ts",
-        "lib/ti/lock-closed.d.ts",
-        "lib/ti/lock-open-outline.d.ts",
-        "lib/ti/lock-open.d.ts",
-        "lib/ti/mail.d.ts",
-        "lib/ti/map.d.ts",
-        "lib/ti/media-eject-outline.d.ts",
-        "lib/ti/media-eject.d.ts",
-        "lib/ti/media-fast-forward-outline.d.ts",
-        "lib/ti/media-fast-forward.d.ts",
-        "lib/ti/media-pause-outline.d.ts",
-        "lib/ti/media-pause.d.ts",
-        "lib/ti/media-play-outline.d.ts",
-        "lib/ti/media-play-reverse-outline.d.ts",
-        "lib/ti/media-play-reverse.d.ts",
-        "lib/ti/media-play.d.ts",
-        "lib/ti/media-record-outline.d.ts",
-        "lib/ti/media-record.d.ts",
-        "lib/ti/media-rewind-outline.d.ts",
-        "lib/ti/media-rewind.d.ts",
-        "lib/ti/media-stop-outline.d.ts",
-        "lib/ti/media-stop.d.ts",
-        "lib/ti/message-typing.d.ts",
-        "lib/ti/message.d.ts",
-        "lib/ti/messages.d.ts",
-        "lib/ti/microphone-outline.d.ts",
-        "lib/ti/microphone.d.ts",
-        "lib/ti/minus-outline.d.ts",
-        "lib/ti/minus.d.ts",
-        "lib/ti/mortar-board.d.ts",
-        "lib/ti/news.d.ts",
-        "lib/ti/notes-outline.d.ts",
-        "lib/ti/notes.d.ts",
-        "lib/ti/pen.d.ts",
-        "lib/ti/pencil.d.ts",
-        "lib/ti/phone-outline.d.ts",
-        "lib/ti/phone.d.ts",
-        "lib/ti/pi-outline.d.ts",
-        "lib/ti/pi.d.ts",
-        "lib/ti/pin-outline.d.ts",
-        "lib/ti/pin.d.ts",
-        "lib/ti/pipette.d.ts",
-        "lib/ti/plane-outline.d.ts",
-        "lib/ti/plane.d.ts",
-        "lib/ti/plug.d.ts",
-        "lib/ti/plus-outline.d.ts",
-        "lib/ti/plus.d.ts",
-        "lib/ti/point-of-interest-outline.d.ts",
-        "lib/ti/point-of-interest.d.ts",
-        "lib/ti/power-outline.d.ts",
-        "lib/ti/power.d.ts",
-        "lib/ti/printer.d.ts",
-        "lib/ti/puzzle-outline.d.ts",
-        "lib/ti/puzzle.d.ts",
-        "lib/ti/radar-outline.d.ts",
-        "lib/ti/radar.d.ts",
-        "lib/ti/refresh-outline.d.ts",
-        "lib/ti/refresh.d.ts",
-        "lib/ti/rss-outline.d.ts",
-        "lib/ti/rss.d.ts",
-        "lib/ti/scissors-outline.d.ts",
-        "lib/ti/scissors.d.ts",
-        "lib/ti/shopping-bag.d.ts",
-        "lib/ti/shopping-cart.d.ts",
-        "lib/ti/social-at-circular.d.ts",
-        "lib/ti/social-dribbble-circular.d.ts",
-        "lib/ti/social-dribbble.d.ts",
-        "lib/ti/social-facebook-circular.d.ts",
-        "lib/ti/social-facebook.d.ts",
-        "lib/ti/social-flickr-circular.d.ts",
-        "lib/ti/social-flickr.d.ts",
-        "lib/ti/social-github-circular.d.ts",
-        "lib/ti/social-github.d.ts",
-        "lib/ti/social-google-plus-circular.d.ts",
-        "lib/ti/social-google-plus.d.ts",
-        "lib/ti/social-instagram-circular.d.ts",
-        "lib/ti/social-instagram.d.ts",
-        "lib/ti/social-last-fm-circular.d.ts",
-        "lib/ti/social-last-fm.d.ts",
-        "lib/ti/social-linkedin-circular.d.ts",
-        "lib/ti/social-linkedin.d.ts",
-        "lib/ti/social-pinterest-circular.d.ts",
-        "lib/ti/social-pinterest.d.ts",
-        "lib/ti/social-skype-outline.d.ts",
-        "lib/ti/social-skype.d.ts",
-        "lib/ti/social-tumbler-circular.d.ts",
-        "lib/ti/social-tumbler.d.ts",
-        "lib/ti/social-twitter-circular.d.ts",
-        "lib/ti/social-twitter.d.ts",
-        "lib/ti/social-vimeo-circular.d.ts",
-        "lib/ti/social-vimeo.d.ts",
-        "lib/ti/social-youtube-circular.d.ts",
-        "lib/ti/social-youtube.d.ts",
-        "lib/ti/sort-alphabetically-outline.d.ts",
-        "lib/ti/sort-alphabetically.d.ts",
-        "lib/ti/sort-numerically-outline.d.ts",
-        "lib/ti/sort-numerically.d.ts",
-        "lib/ti/spanner-outline.d.ts",
-        "lib/ti/spanner.d.ts",
-        "lib/ti/spiral.d.ts",
-        "lib/ti/star-full-outline.d.ts",
-        "lib/ti/star-half-outline.d.ts",
-        "lib/ti/star-half.d.ts",
-        "lib/ti/star-outline.d.ts",
-        "lib/ti/star.d.ts",
-        "lib/ti/starburst-outline.d.ts",
-        "lib/ti/starburst.d.ts",
-        "lib/ti/stopwatch.d.ts",
-        "lib/ti/support.d.ts",
-        "lib/ti/tabs-outline.d.ts",
-        "lib/ti/tag.d.ts",
-        "lib/ti/tags.d.ts",
-        "lib/ti/th-large-outline.d.ts",
-        "lib/ti/th-large.d.ts",
-        "lib/ti/th-list-outline.d.ts",
-        "lib/ti/th-list.d.ts",
-        "lib/ti/th-menu-outline.d.ts",
-        "lib/ti/th-menu.d.ts",
-        "lib/ti/th-small-outline.d.ts",
-        "lib/ti/th-small.d.ts",
-        "lib/ti/thermometer.d.ts",
-        "lib/ti/thumbs-down.d.ts",
-        "lib/ti/thumbs-ok.d.ts",
-        "lib/ti/thumbs-up.d.ts",
-        "lib/ti/tick-outline.d.ts",
-        "lib/ti/tick.d.ts",
-        "lib/ti/ticket.d.ts",
-        "lib/ti/time.d.ts",
-        "lib/ti/times-outline.d.ts",
-        "lib/ti/times.d.ts",
-        "lib/ti/trash.d.ts",
-        "lib/ti/tree.d.ts",
-        "lib/ti/upload-outline.d.ts",
-        "lib/ti/upload.d.ts",
-        "lib/ti/user-add-outline.d.ts",
-        "lib/ti/user-add.d.ts",
-        "lib/ti/user-delete-outline.d.ts",
-        "lib/ti/user-delete.d.ts",
-        "lib/ti/user-outline.d.ts",
-        "lib/ti/user.d.ts",
-        "lib/ti/vendor-android.d.ts",
-        "lib/ti/vendor-apple.d.ts",
-        "lib/ti/vendor-microsoft.d.ts",
-        "lib/ti/video-outline.d.ts",
-        "lib/ti/video.d.ts",
-        "lib/ti/volume-down.d.ts",
-        "lib/ti/volume-mute.d.ts",
-        "lib/ti/volume-up.d.ts",
-        "lib/ti/volume.d.ts",
-        "lib/ti/warning-outline.d.ts",
-        "lib/ti/warning.d.ts",
-        "lib/ti/watch.d.ts",
-        "lib/ti/waves-outline.d.ts",
-        "lib/ti/waves.d.ts",
-        "lib/ti/weather-cloudy.d.ts",
-        "lib/ti/weather-downpour.d.ts",
-        "lib/ti/weather-night.d.ts",
-        "lib/ti/weather-partly-sunny.d.ts",
-        "lib/ti/weather-shower.d.ts",
-        "lib/ti/weather-snow.d.ts",
-        "lib/ti/weather-stormy.d.ts",
-        "lib/ti/weather-sunny.d.ts",
-        "lib/ti/weather-windy-cloudy.d.ts",
-        "lib/ti/weather-windy.d.ts",
-        "lib/ti/wi-fi-outline.d.ts",
-        "lib/ti/wi-fi.d.ts",
-        "lib/ti/wine.d.ts",
-        "lib/ti/world-outline.d.ts",
-        "lib/ti/world.d.ts",
-        "lib/ti/zoom-in-outline.d.ts",
-        "lib/ti/zoom-in.d.ts",
-        "lib/ti/zoom-out-outline.d.ts",
-        "lib/ti/zoom-out.d.ts",
-        "lib/ti/zoom-outline.d.ts",
-        "lib/ti/zoom.d.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/react-icons/tslint.json b/types/react-icons/tslint.json
deleted file mode 100644
index 946997cb87..0000000000
--- a/types/react-icons/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-useless-files": false
-    }
-}
diff --git a/types/react-image-fallback/index.d.ts b/types/react-image-fallback/index.d.ts
index 4fcf2c20cd..a85dcfd521 100644
--- a/types/react-image-fallback/index.d.ts
+++ b/types/react-image-fallback/index.d.ts
@@ -17,8 +17,8 @@ export default class ReactImageFallback extends React.Component<
 
 export interface ReactImageFallbackProps {
     src: string;
-    fallbackImage: string | React.ReactElement<any> | string[] | Array<React.ReactElement<any>>;
-    initialImage?: string | React.ReactElement<any>;
+    fallbackImage: string | React.ReactElement | string[] | React.ReactElement[];
+    initialImage?: string | React.ReactElement;
     onLoad?: (event: React.SyntheticEvent<HTMLImageElement>) => void;
     onError?: (event: React.SyntheticEvent<HTMLImageElement>) => void;
     initialTimeout?: number;
diff --git a/types/react-imageloader/index.d.ts b/types/react-imageloader/index.d.ts
index 6e569b1410..051167987a 100644
--- a/types/react-imageloader/index.d.ts
+++ b/types/react-imageloader/index.d.ts
@@ -21,7 +21,7 @@ declare module "react-imageloader" {
       onLoad?: (event: any) => void;
 
       /** An optional function that returns a React element to be shown while the image loads. */
-      preloader?: (params: any) => React.ReactElement<any>;
+      preloader?: (params: any) => React.ReactElement;
 
       /** The URL of the image to be loaded. */
       src: string;
@@ -30,7 +30,7 @@ declare module "react-imageloader" {
       style?: React.CSSProperties;
 
       /** A function that takes a props argument and returns a React element to be used as the wrapper component. Defaults to React.DOM.span. */
-      wrapper?: (props: any) => React.ReactElement<any>;
+      wrapper?: (props: any) => React.ReactElement;
   }
 
   class ImageLoader extends React.Component<ImageLoaderProps> {}
diff --git a/types/react-images/index.d.ts b/types/react-images/index.d.ts
index 4f3e1c8893..e477231609 100644
--- a/types/react-images/index.d.ts
+++ b/types/react-images/index.d.ts
@@ -64,7 +64,7 @@ export interface LightboxProps {
     /**
      * Spinner component.
      */
-    spinner?: () => React.ReactElement<any>;
+    spinner?: () => React.ReactElement;
 
     /**
      *  Color of spinner. Default value: 'white'
diff --git a/types/react-infinite-scroller/index.d.ts b/types/react-infinite-scroller/index.d.ts
index f0af24ac5e..eff6d71ef5 100644
--- a/types/react-infinite-scroller/index.d.ts
+++ b/types/react-infinite-scroller/index.d.ts
@@ -62,7 +62,7 @@ declare namespace InfiniteScroll {
         /**
          * Loader component for indicating "loading more".
          */
-        loader?: React.ReactElement<any>;
+        loader?: React.ReactElement;
         /**
          * Override method to return a different scroll listener if it's not the immediate parent of InfiniteScroll.
          */
diff --git a/types/react-infinite/index.d.ts b/types/react-infinite/index.d.ts
index e2149a8016..32ff6e6863 100644
--- a/types/react-infinite/index.d.ts
+++ b/types/react-infinite/index.d.ts
@@ -17,11 +17,11 @@ declare namespace Infinite {
 		containerHeight?: number;
 		preloadBatchSize?: number | Object;
 		preloadAdditionalHeight?: number | Object;
-		handleScroll?: (node: React.ReactElement<any>) => void;
+		handleScroll?: (node: React.ReactElement) => void;
 		infiniteLoadBeginBottomOffset?: number;
 		infiniteLoadBeginEdgeOffset?: number;
 		onInfiniteLoad?: () => void;
-		loadingSpinnerDelegate?: React.ReactElement<any>;
+		loadingSpinnerDelegate?: React.ReactElement;
 		isInfiniteLoading?: boolean;
 		timeScrollStateLastsForAfterUserScrolls?: number;
 		className?: string;
diff --git a/types/react-infinite/react-infinite-tests.tsx b/types/react-infinite/react-infinite-tests.tsx
index 6f51b95d1a..30ced4f1ba 100644
--- a/types/react-infinite/react-infinite-tests.tsx
+++ b/types/react-infinite/react-infinite-tests.tsx
@@ -72,14 +72,14 @@ class ListItem extends React.Component<{ key: number; num: number }, {}> {
     }
 }
 
-class InfiniteList extends React.Component<{}, { elements: React.ReactElement<any>[], isInfiniteLoading: boolean }> {
+class InfiniteList extends React.Component<{}, { elements: React.ReactElement[], isInfiniteLoading: boolean }> {
     state = {
         elements: this.buildElements(0, 20),
         isInfiniteLoading: false
     };
 
     buildElements(start: number, end: number) {
-        var elements = [] as React.ReactElement<any>[];
+        var elements = [] as React.ReactElement[];
         for (var i = start; i < end; i++) {
             elements.push(<ListItem key={i} num={i} />)
         }
diff --git a/types/react-instantsearch-native/react-instantsearch-native-tests.tsx b/types/react-instantsearch-native/react-instantsearch-native-tests.tsx
index 7a369b0487..fa3b4b594d 100644
--- a/types/react-instantsearch-native/react-instantsearch-native-tests.tsx
+++ b/types/react-instantsearch-native/react-instantsearch-native-tests.tsx
@@ -42,7 +42,7 @@ const App = () => (
 const IndexResults = connectStateResults(
   ({ searchState, searchResults, children }) =>
     searchResults && searchResults.nbHits !== 0 ? (
-      children as React.ReactElement<any>
+      children as React.ReactElement
     ) : (
       <div>
         No results has been found for {searchState.query} and index{' '}
@@ -64,6 +64,6 @@ const AllResults = connectStateResults(({ allSearchResults, children }) => {
       <Index indexName="third" />
     </div>
   ) : (
-    children as React.ReactElement<any>
+    children as React.ReactElement
   );
 });
diff --git a/types/react-instantsearch/react-instantsearch-tests.tsx b/types/react-instantsearch/react-instantsearch-tests.tsx
index 9abf91c0ef..33f362b272 100644
--- a/types/react-instantsearch/react-instantsearch-tests.tsx
+++ b/types/react-instantsearch/react-instantsearch-tests.tsx
@@ -298,7 +298,7 @@ import { createInstantSearch } from "react-instantsearch-core";
   const IndexResults = connectStateResults(
     ({ searchState, searchResults, children }) =>
       searchResults && searchResults.nbHits !== 0 ? (
-        children as React.ReactElement<any>
+        children as React.ReactElement
       ) : (
         <div>
           No results has been found for {searchState.query} and index{' '}
@@ -320,7 +320,7 @@ import { createInstantSearch } from "react-instantsearch-core";
         <Index indexName="third" />
       </div>
     ) : (
-      children as React.ReactElement<any>
+      children as React.ReactElement
     );
   });
 };
diff --git a/types/react-intl/index.d.ts b/types/react-intl/index.d.ts
index 33effbff95..cd1909b020 100644
--- a/types/react-intl/index.d.ts
+++ b/types/react-intl/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-intl 2.3
-// Project: http://formatjs.io/react/
+// Project: http://formatjs.io/react/, https://github.com/yahoo/react-intl
 // Definitions by: Bruno Grieder <https://github.com/bgrieder>,
 //                 Christian Droulers <https://github.com/cdroulers>,
 //                 Fedor Nezhivoi <https://github.com/gyzerok>,
@@ -10,6 +10,7 @@
 //                 Martin Raedlinger <https://github.com/formatlos>
 //                 Kanitkorn Sujautra <https://github.com/lukyth>
 //                 obedm503 <https://github.com/obedm503>
+//                 anion155 <https://github.com/anion155>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -35,11 +36,11 @@ declare namespace ReactIntl {
 
     function addLocaleData(data: Locale[] | Locale): void;
 
-    interface Messages {
-        [key: string]: FormattedMessage.MessageDescriptor;
-    }
+    type Messages<Names extends keyof any = string> = {
+        [key in Names]: FormattedMessage.MessageDescriptor;
+    };
 
-    function defineMessages<T extends Messages>(messages: T): T;
+    function defineMessages<Names extends keyof any>(messages: Messages<Names>): Messages<Names>;
 
     interface IntlConfig {
         locale: React.Requireable<any>;
diff --git a/types/react-is/index.d.ts b/types/react-is/index.d.ts
index 962d3e1a13..3f33f40f9c 100644
--- a/types/react-is/index.d.ts
+++ b/types/react-is/index.d.ts
@@ -17,18 +17,18 @@ import {
 
 export function typeOf(value: any): symbol | undefined;
 export function isValidElementType(value: any): value is ReactType;
-export function isAsyncMode(value: any): value is ReactElement<any>;
-export function isContextConsumer(value: any): value is ReactElement<any>;
-export function isContextProvider(value: any): value is ReactElement<any>;
-export function isElement(value: any): value is ReactElement<any>;
-export function isForwardRef(value: any): value is ReactElement<any>;
-export function isFragment(value: any): value is ReactElement<any>;
+export function isAsyncMode(value: any): value is ReactElement;
+export function isContextConsumer(value: any): value is ReactElement;
+export function isContextProvider(value: any): value is ReactElement;
+export function isElement(value: any): value is ReactElement;
+export function isForwardRef(value: any): value is ReactElement;
+export function isFragment(value: any): value is ReactElement;
 export function isLazy(value: any): value is LazyExoticComponent<any>;
 export function isMemo(value: any): value is MemoExoticComponent<any>;
-export function isProfiler(value: any): value is ReactElement<any>;
-export function isPortal(value: any): value is ReactElement<any>;
-export function isStrictMode(value: any): value is ReactElement<any>;
-export function isSuspense(value: any): value is ReactElement<any>;
+export function isProfiler(value: any): value is ReactElement;
+export function isPortal(value: any): value is ReactElement;
+export function isStrictMode(value: any): value is ReactElement;
+export function isSuspense(value: any): value is ReactElement;
 
 export const AsyncMode: symbol;
 export const ContextConsumer: symbol;
diff --git a/types/react-is/react-is-tests.tsx b/types/react-is/react-is-tests.tsx
index afbf0aabb6..d41b2a828b 100644
--- a/types/react-is/react-is-tests.tsx
+++ b/types/react-is/react-is-tests.tsx
@@ -6,7 +6,7 @@ import * as ReactIs from 'react-is';
 // Determining if a Component is Valid
 
 interface CompProps {
-    forwardedRef: React.Ref<any> | null;
+    forwardedRef: React.Ref<any>;
     children?: React.ReactNode;
 }
 
diff --git a/types/react-joyride/index.d.ts b/types/react-joyride/index.d.ts
index 13f691e56e..26a1fec1ce 100644
--- a/types/react-joyride/index.d.ts
+++ b/types/react-joyride/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-joyride 2.0
-// Project: https://github.com/gilbarbara/react-joyride
+// Project: https://github.com/gilbarbara/react-joyride, https://gilbarbara.github.com/react-joyride
 // Definitions by: DongYoon Kang <https://github.com/kdy1>
 //                 Kamran Ayub <https://github.com/kamranayub>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/react-js-pagination/index.d.ts b/types/react-js-pagination/index.d.ts
index 00f1b26a64..ee2be831e2 100644
--- a/types/react-js-pagination/index.d.ts
+++ b/types/react-js-pagination/index.d.ts
@@ -12,10 +12,10 @@ export interface ReactJsPaginationProps {
     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>;
+    prevPageText?: string| React.ReactElement;
+    nextPageText?: string | React.ReactElement;
+    lastPageText?: string | React.ReactElement;
+    firstPageText?: string | React.ReactElement;
     disabledClass?: string;
     hideDisabled?: boolean;
     hideNavigation?: boolean;
diff --git a/types/react-json-tree/index.d.ts b/types/react-json-tree/index.d.ts
index d0ab7cab62..b8b446f5b5 100644
--- a/types/react-json-tree/index.d.ts
+++ b/types/react-json-tree/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for react-json-tree v0.6.5
-// Project: https://github.com/alexkuz/react-json-tree/
+// Type definitions for react-json-tree 0.6
+// Project: https://github.com/reduxjs/redux-devtools
 // Definitions by: Grant Nestor <https://github.com/gnestor>
+//                 Zain Afzal <https://github.com/zainafzal08>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -18,7 +19,7 @@ export interface JSONTreeProps extends Props<JSONTreeComponent> {
     sortObjectKeys?: Function | boolean;
     shouldExpandNode?: (keyPath: (string | number)[], data: [any] | {}, level: number) => boolean;
     getItemString?: (type: string, data: [any] | {}, itemType: string, itemString: string) => JSX.Element;
-    labelRenderer?: (raw: [string, string]) => JSX.Element;
+    labelRenderer?: (keyPath: string[], nodeType?: string, expanded?: boolean, expandable?: boolean) => JSX.Element;
     valueRenderer?: (displayValue: string|number, rawValue?: string|number|boolean|null, ...keyPath: (string|number)[]) => JSX.Element;
     postprocessValue?: (raw: string) => JSX.Element;
     isCustomNode?: () => boolean;
diff --git a/types/react-json-tree/tslint.json b/types/react-json-tree/tslint.json
index e3610fefae..92d14c6344 100644
--- a/types/react-json-tree/tslint.json
+++ b/types/react-json-tree/tslint.json
@@ -7,7 +7,6 @@
         "ban-types": false,
         "callable-types": false,
         "comment-format": false,
-        "dt-header": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-jsonschema-form/index.d.ts b/types/react-jsonschema-form/index.d.ts
index b860fa3cd4..403356a89a 100644
--- a/types/react-jsonschema-form/index.d.ts
+++ b/types/react-jsonschema-form/index.d.ts
@@ -123,12 +123,12 @@ declare module "react-jsonschema-form" {
         id: string;
         classNames: string;
         label: string;
-        description: React.ReactElement<any>;
+        description: React.ReactElement;
         rawDescription: string;
-        children: React.ReactElement<any>;
-        errors: React.ReactElement<any>;
+        children: React.ReactElement;
+        errors: React.ReactElement;
         rawErrors: string[];
-        help: React.ReactElement<any>;
+        help: React.ReactElement;
         rawHelp: string;
         hidden: boolean;
         required: boolean;
@@ -142,14 +142,14 @@ declare module "react-jsonschema-form" {
     };
 
     export type ArrayFieldTemplateProps = {
-        DescriptionField: React.StatelessComponent<{ id: string, description: string | React.ReactElement<any> }>;
+        DescriptionField: React.StatelessComponent<{ id: string, description: string | React.ReactElement }>;
         TitleField: React.StatelessComponent<{ id: string, title: string, required: boolean }>;
         canAdd: boolean;
         className: string;
         disabled: boolean;
         idSchema: IdSchema;
         items: {
-            children: React.ReactElement<any>;
+            children: React.ReactElement;
             className: string;
             disabled: boolean;
             hasMoveDown: boolean;
@@ -175,12 +175,12 @@ declare module "react-jsonschema-form" {
     };
 
     export type ObjectFieldTemplateProps = {
-        DescriptionField: React.StatelessComponent<{ id: string, description: string | React.ReactElement<any> }>;
+        DescriptionField: React.StatelessComponent<{ id: string, description: string | React.ReactElement }>;
         TitleField: React.StatelessComponent<{ id: string, title: string, required: boolean }>;
         title: string;
         description: string;
         properties: {
-            content: React.ReactElement<any>;
+            content: React.ReactElement;
             name: string;
             disabled: boolean;
             readonly: boolean;
diff --git a/types/react-jss/index.d.ts b/types/react-jss/index.d.ts
index 7656897a08..c2ee0a008a 100644
--- a/types/react-jss/index.d.ts
+++ b/types/react-jss/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for react-jss 8.6
 // Project: https://github.com/cssinjs/react-jss#readme
 // Definitions by: Sebastian Silbermann <https://github.com/eps1lon>
+//                 James Lawrence <https://github.com/jlaw90>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 import { createGenerateClassName, JSS, SheetsRegistry } from "jss";
diff --git a/types/react-jss/lib/injectSheet.d.ts b/types/react-jss/lib/injectSheet.d.ts
index fd66af5c38..d165ee7e6d 100644
--- a/types/react-jss/lib/injectSheet.d.ts
+++ b/types/react-jss/lib/injectSheet.d.ts
@@ -41,7 +41,7 @@ export type Overwrite<T, U> = Omit<T, keyof U> & U;
  */
 export type PropsOf<C> = C extends new (props: infer P) => React.Component
   ? P
-  : C extends (props: infer P) => React.ReactElement<any> | null ? P : never;
+  : C extends (props: infer P) => React.ReactElement | null ? P : never;
 
 /**
  * a function that takes {component} and returns a component that passes along
@@ -53,26 +53,33 @@ export type PropsOf<C> = C extends new (props: infer P) => React.Component
  */
 export type PropInjector<InjectedProps, AdditionalProps = {}> = <
   C extends React.ComponentType<ConsistentWith<PropsOf<C>, InjectedProps>>
->(
+  >(
   component: C
 ) => React.ComponentType<
   Omit<JSX.LibraryManagedAttributes<C, PropsOf<C>>, keyof InjectedProps> &
-    AdditionalProps
->;
+  AdditionalProps
+  >;
 
-export interface CSSProperties extends CSS.Properties<number | string> {
+// Allow functions that take the properties of the component and return a CSS value
+export type DynamicCSSRule<Props> = {
+  [K in keyof CSS.Properties<number | string>]:
+  | CSS.Properties<number | string>[K]
+  | ((props: Props) => CSS.Properties<number | string>[K])
+}[keyof CSS.Properties];
+
+export interface CSSProperties<Props> {
   // Allow pseudo selectors and media queries
   [k: string]:
-    | CSS.Properties<number | string>[keyof CSS.Properties]
-    | CSSProperties;
+    | DynamicCSSRule<Props>
+    | CSSProperties<Props>;
 }
-export type Styles<ClassKey extends string = string> = Record<
+export type Styles<ClassKey extends string = string, Props = {}> = Record<
   ClassKey,
-  CSSProperties
->;
-export type StyleCreator<C extends string = string, T extends {} = {}> = (
+  CSSProperties<Props>
+  >;
+export type StyleCreator<C extends string = string, T extends {} = {}, Props = {}> = (
   theme: T
-) => Styles<C>;
+) => Styles<C, Props>;
 
 export interface Theming {
   channel: string;
@@ -89,15 +96,16 @@ export interface InjectOptions extends CreateStyleSheetOptions {
 export type ClassNameMap<C extends string> = Record<C, string>;
 export type WithSheet<
   S extends string | Styles | StyleCreator<string, any>,
-  GivenTheme = undefined
-> = {
+  GivenTheme = undefined,
+  Props = {}
+  > = {
   classes: ClassNameMap<
     S extends string
       ? S
-      : S extends StyleCreator<infer C, any>
-        ? C
-        : S extends Styles<infer C> ? C : never
-  >;
+      : S extends StyleCreator<infer C, any, Props>
+      ? C
+      : S extends Styles<infer C, Props> ? C : never
+    >;
 } & WithTheme<S extends StyleCreator<string, infer T> ? T : GivenTheme>;
 
 export interface WithTheme<T> {
@@ -110,7 +118,7 @@ export interface StyledComponentProps<ClassKey extends string = string> {
   innerRef?: React.Ref<any> | React.RefObject<any>;
 }
 
-export default function injectSheet<C extends string, T extends object>(
-  stylesOrCreator: Styles<C> | StyleCreator<C, T>,
+export default function injectSheet<C extends string, T extends object, Props = {}>(
+  stylesOrCreator: Styles<C, Props> | StyleCreator<C, T, Props>,
   options?: InjectOptions
-): PropInjector<WithSheet<C, T>, StyledComponentProps<C>>;
+): PropInjector<WithSheet<C, T, Props>, StyledComponentProps<C>>;
diff --git a/types/react-jss/react-jss-tests.tsx b/types/react-jss/react-jss-tests.tsx
index 803170bb99..5fe76ae1cb 100644
--- a/types/react-jss/react-jss-tests.tsx
+++ b/types/react-jss/react-jss-tests.tsx
@@ -17,42 +17,44 @@ interface MyTheme {
 /**
  * helper function to counter typescripts type widening
  */
-function createStyles<C extends string>(styles: Styles<C>): Styles<C> {
-  return styles;
+// tslint:disable-next-line:no-unnecessary-generics
+function createStyles<Props = {}, C extends string = string>(styles: Styles<C, Props>): Styles<C> {
+  return styles as Styles<C>;
 }
 
-const styles = (theme: MyTheme) =>
-  createStyles({
-    myButton: {
-      color: theme.color.primary,
-      margin: 1,
-      "& span": {
-        fontWeight: "revert"
-      }
-    },
-    myLabel: {
-      fontStyle: "italic"
-    }
-  });
-
-interface ButtonProps extends WithSheet<typeof styles> {
+interface ButtonProps {
   label: string;
+  active?: boolean;
 }
 
-const Button: React.SFC<ButtonProps> = ({ classes, children }) => {
+const styles = (theme: MyTheme) => createStyles({
+  myButton: {
+    color: (props: ButtonProps) => props.active ? 'red' : theme.color.primary,
+    margin: 1,
+    "& span": {
+      fontWeight: "revert"
+    }
+  },
+  myLabel: {
+    fontStyle: "italic"
+  }
+});
+const Button: React.SFC<ButtonProps & WithSheet<typeof styles>> = ({active, classes, children}) => {
   return (
-    <button className={classes.myButton}>
-      <span className={classes.myLabel}>{children}</span>
-    </button>
+    <>
+      <button className={classes.myButton}>
+        <span className={classes.myLabel}>{children}</span>
+      </button>
+    </>
   );
 };
 
 const ManuallyStyles = () => {
   return (
     <Button
-      classes={{ myButton: "my-button", myLabel: "my-label" }}
+      classes={{myButton: "my-button", myLabel: "my-label"}}
       label="Hello, World!"
-      theme={{ color: { primary: "red", secondary: "blue" } }}
+      theme={{color: {primary: "red", secondary: "blue"}}}
     />
   );
 };
@@ -67,17 +69,20 @@ const darkTheme: MyTheme = {
 };
 const App = () => (
   <ThemeProvider theme={darkTheme}>
-    <StyledButton label="I'm dark" />
+    <>
+      <StyledButton label="I'm dark"/>
+      <StyledButton label="I'm active" active/>
+    </>
   </ThemeProvider>
 );
 
 function ssrRender(req: any, res: { send: (text: string) => any }) {
-  const mockedRenderToString = (e: React.ReactElement<any>) => `${e}`;
+  const mockedRenderToString = (e: React.ReactElement) => `${e}`;
   const sheets = new SheetsRegistry();
 
   const body = mockedRenderToString(
     <JssProvider classNamePrefix="dt-" registry={sheets}>
-      <StyledButton label="I come from the server" />
+      <StyledButton label="I come from the server"/>
     </JssProvider>
   );
 
@@ -87,10 +92,10 @@ function ssrRender(req: any, res: { send: (text: string) => any }) {
   return res.send(
     mockedRenderToString(
       <html>
-        <head>
-          <style type="text/css">{sheets.toString()}</style>
-        </head>
-        <body>{body}</body>
+      <head>
+        <style type="text/css">{sheets.toString()}</style>
+      </head>
+      <body>{body}</body>
       </html>
     )
   );
diff --git a/types/react-kawaii/index.d.ts b/types/react-kawaii/index.d.ts
new file mode 100644
index 0000000000..59a311c091
--- /dev/null
+++ b/types/react-kawaii/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for react-kawaii 0.11
+// Project: https://github.com/miukimiu/react-kawaii
+// Definitions by: Zhang Yi Jiang <https://github.com/ZhangYiJiang>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+export type KawaiiMood =
+  | 'sad'
+  | 'shocked'
+  | 'happy'
+  | 'blissful'
+  | 'lovestruck'
+  | 'excited'
+  | 'ko';
+
+export interface KawaiiProps {
+  size?: number;
+  color?: string;
+  mood?: KawaiiMood;
+}
+
+export const SpeechBubble: React.ComponentType<KawaiiProps>;
+export const Mug: React.ComponentType<KawaiiProps>;
+export const Browser: React.ComponentType<KawaiiProps>;
+export const Ghost: React.ComponentType<KawaiiProps>;
+export const Cat: React.ComponentType<KawaiiProps>;
+export const IceCream: React.ComponentType<KawaiiProps>;
+export const CreditCard: React.ComponentType<KawaiiProps>;
+export const File: React.ComponentType<KawaiiProps>;
+export const Backpack: React.ComponentType<KawaiiProps>;
+export const Planet: React.ComponentType<KawaiiProps>;
diff --git a/types/react-kawaii/react-kawaii-tests.tsx b/types/react-kawaii/react-kawaii-tests.tsx
new file mode 100644
index 0000000000..d8412e3dbf
--- /dev/null
+++ b/types/react-kawaii/react-kawaii-tests.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import { Cat, Planet, Mug, Browser, Backpack, Ghost, File, SpeechBubble, KawaiiMood, KawaiiProps, IceCream } from 'react-kawaii';
+
+const PlanetExample = () => <Planet size={200} mood="blissful" color="#FDA7DC" />;
+const MugExample = () => <Mug size={200} mood="ko" color="rebeccapurple" />;
+const GhostExample = () => <Ghost size={200} mood="lovestruck" color="#E0E4E8" />;
+const FileExample = () => <File size={200} mood="blissful" color="#83D1FB" />;
+const IceCreamExample = () => <IceCream mood="happy" />;
+const BrowserExample = () => <Browser size={500} />;
+const BackpackExample = () => <Backpack />;
+const SpeechBubbleExample = () => <SpeechBubble />;
+const CatExample = () => <Cat />;
+
+// $ExpectError
+const invalidMoodNumber: KawaiiMood = 5;
+
+// $ExpectError
+const invalidMoodString: KawaiiMood = '';
+
+// This is defined on one line to avoid the position of the error moving between TS2/3
+// $ExpectError
+const invalidProps: KawaiiProps = { size: '200px' };
diff --git a/types/react-kawaii/tsconfig.json b/types/react-kawaii/tsconfig.json
new file mode 100644
index 0000000000..9650d17bb0
--- /dev/null
+++ b/types/react-kawaii/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-kawaii-tests.tsx"
+    ]
+}
diff --git a/types/react-kawaii/tslint.json b/types/react-kawaii/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-kawaii/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-list/index.d.ts b/types/react-list/index.d.ts
index 60beba5403..d5ab45621f 100644
--- a/types/react-list/index.d.ts
+++ b/types/react-list/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-list 0.8
-// Project: https://github.com/orgsync/react-list
+// Project: https://github.com/coderiety/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.8
diff --git a/types/react-loadable/index.d.ts b/types/react-loadable/index.d.ts
index 8661716e75..2e38f58c39 100644
--- a/types/react-loadable/index.d.ts
+++ b/types/react-loadable/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for react-loadable 5.5
 // Project: https://github.com/thejameskyle/react-loadable#readme
-// Definitions by: Jessica Franco <https://github.com/Kovensky>
+// Definitions by: Jessica Franco <https://github.com/Jessidhia>
 //                 Oden S. <https://github.com/odensc>
 //                 Ian Ker-Seymer <https://github.com/ianks>
 //                 Tomek Łaziuk <https://github.com/tlaziuk>
diff --git a/types/react-lottie/index.d.ts b/types/react-lottie/index.d.ts
index a57da91307..d547396a11 100644
--- a/types/react-lottie/index.d.ts
+++ b/types/react-lottie/index.d.ts
@@ -21,7 +21,7 @@ export interface Options {
      */
     animationData: any;
     rendererSettings?: {
-        preserveAspectRatio?: boolean;
+        preserveAspectRatio?: string;
         /**
          * The canvas context
          */
diff --git a/types/react-map-gl/index.d.ts b/types/react-map-gl/index.d.ts
index 772e24081f..4d147d3611 100644
--- a/types/react-map-gl/index.d.ts
+++ b/types/react-map-gl/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Robert Imig <https://github.com/rimig>
 //                 Fabio Berta <https://github.com/fnberta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
 import * as React from 'react';
 import * as MapboxGL from 'mapbox-gl';
diff --git a/types/react-material-ui-form-validator/index.d.ts b/types/react-material-ui-form-validator/index.d.ts
new file mode 100644
index 0000000000..209f3f5a36
--- /dev/null
+++ b/types/react-material-ui-form-validator/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for react-material-ui-form-validator 2.0
+// Project: https://github.com/NewOldMax/react-material-ui-form-validator
+// Definitions by: Frank Brullo <https://github.com/FrankBrullo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.1
+
+import * as React from "react";
+import { TextFieldProps } from "material-ui";
+
+export interface ValidatorFormProps {
+    className?: string;
+    onSubmit: (event: React.FormEventHandler) => void;
+    instantValidate?: boolean;
+    onError?: (errors: any[]) => void;
+    debounceTime?: number;
+}
+export class ValidatorForm extends React.Component<ValidatorFormProps> {
+    static addValidationRule(name: string, callback: (value: any) => boolean): void;
+    isFormValid(dryRun: boolean): boolean;
+    resetValidations(): void;
+}
+
+export interface ValidatorComponentProps {
+    errorMessages?: any[] | string;
+    validators?: any[];
+    name: string;
+    value: any;
+    validatorListener?: (isValid: boolean) => void;
+    withRequiredValidator?: boolean;
+}
+export class ValidatorComponent extends React.Component<ValidatorComponentProps & TextFieldProps> {}
+export class TextValidator extends ValidatorComponent {}
diff --git a/types/react-material-ui-form-validator/react-material-ui-form-validator-tests.tsx b/types/react-material-ui-form-validator/react-material-ui-form-validator-tests.tsx
new file mode 100644
index 0000000000..31f79a0695
--- /dev/null
+++ b/types/react-material-ui-form-validator/react-material-ui-form-validator-tests.tsx
@@ -0,0 +1,40 @@
+import * as React from 'react';
+import {
+    TextValidator,
+    ValidatorComponent,
+    ValidatorForm
+} from 'react-material-ui-form-validator';
+
+class Test extends React.Component {
+    onSubmitted = (event: React.FormEventHandler) => {};
+    onError = (errors: any[]) => {};
+    onValidate = (isValid: boolean) => {};
+
+    render() {
+        return (
+            <ValidatorForm
+                instantValidate={true}
+                debounceTime={10}
+                onSubmit={this.onSubmitted}
+                onError={this.onError}
+            >
+                <ValidatorComponent
+                    errorMessages={['Field is required']}
+                    validators={['required']}
+                    name={'Field'}
+                    value={'value'}
+                    validatorListener={this.onValidate}
+                    withRequiredValidator={true}
+                />
+                <TextValidator
+                    name="textValidator"
+                    value="value"
+                    validatorListener={this.onValidate}
+                    validators={['required']}
+                    errorMessages={['Field is required']}
+                    withRequiredValidator={true}
+                />
+            </ValidatorForm>
+        );
+    }
+}
diff --git a/types/react-material-ui-form-validator/tsconfig.json b/types/react-material-ui-form-validator/tsconfig.json
new file mode 100644
index 0000000000..95b0ef47ad
--- /dev/null
+++ b/types/react-material-ui-form-validator/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-material-ui-form-validator-tests.tsx"
+    ]
+}
diff --git a/types/react-material-ui-form-validator/tslint.json b/types/react-material-ui-form-validator/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-material-ui-form-validator/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-modal/index.d.ts b/types/react-modal/index.d.ts
index 0117a69656..157e646837 100644
--- a/types/react-modal/index.d.ts
+++ b/types/react-modal/index.d.ts
@@ -108,6 +108,9 @@ declare namespace ReactModal {
 
         /* Function accepting the ref for the overlay */
         overlayRef?: (instance: HTMLDivElement) => void;
+
+        /* String value of data-test-id attibute to be applied to to the modal content. */
+        testId?: string;
     }
 }
 
diff --git a/types/react-modal/react-modal-tests.tsx b/types/react-modal/react-modal-tests.tsx
index 96c18ea881..7da14cd65c 100644
--- a/types/react-modal/react-modal-tests.tsx
+++ b/types/react-modal/react-modal-tests.tsx
@@ -73,6 +73,7 @@ class ExampleOfUsingReactModal extends React.Component {
         data={customDataVariables}
         contentRef={instance => this.contentRef = instance}
         overlayRef={instance => this.overlayRef = instance}
+        testId="modal-content"
         >
         <h1>Modal Content</h1>
         <p>Etc.</p>
diff --git a/types/react-motion-loop/index.d.ts b/types/react-motion-loop/index.d.ts
new file mode 100644
index 0000000000..cee48f3fae
--- /dev/null
+++ b/types/react-motion-loop/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for react-motion-loop 2.0
+// Project: https://github.com/nkbt/react-motion-loop
+// Definitions by: Jeremy Allard <https://github.com/j-em>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.1
+
+import { Component, ReactElement } from "react";
+import { MotionProps, PlainStyle, Style } from "react-motion";
+
+interface ReactMotionLoopProps extends Partial<MotionProps> {
+    styleFrom: Style;
+    styleTo: Style;
+    children?: (interpolatedStyle: PlainStyle) => ReactElement;
+}
+export class ReactMotionLoop extends Component<ReactMotionLoopProps> {}
+
+export as namespace ReactMotionLoop;
diff --git a/types/react-motion-loop/react-motion-loop-tests.tsx b/types/react-motion-loop/react-motion-loop-tests.tsx
new file mode 100644
index 0000000000..b00bd0645a
--- /dev/null
+++ b/types/react-motion-loop/react-motion-loop-tests.tsx
@@ -0,0 +1,16 @@
+import * as React from "react";
+import { ReactMotionLoop } from "react-motion-loop";
+import { spring } from "react-motion";
+
+const TestComponent: React.FunctionComponent<never> = props => (
+    <ReactMotionLoop
+        styleFrom={{ rotate: spring(0) }}
+        styleTo={{ rotate: spring(180) }}
+    >
+        {interpolatedStyle => (
+            <p
+                style={{ transform: `rotate( ${interpolatedStyle.rotate}deg)` }}
+            />
+        )}
+    </ReactMotionLoop>
+);
diff --git a/types/react-motion-loop/tsconfig.json b/types/react-motion-loop/tsconfig.json
new file mode 100644
index 0000000000..51191b85ce
--- /dev/null
+++ b/types/react-motion-loop/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "react-motion-loop-tests.tsx"]
+}
diff --git a/types/react-motion-loop/tslint.json b/types/react-motion-loop/tslint.json
new file mode 100644
index 0000000000..4c4fc86ace
--- /dev/null
+++ b/types/react-motion-loop/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "strict-export-declare-modifiers": false
+    }
+}
diff --git a/types/react-motion-ui-pack/index.d.ts b/types/react-motion-ui-pack/index.d.ts
index 477cf0e604..8557d50248 100644
--- a/types/react-motion-ui-pack/index.d.ts
+++ b/types/react-motion-ui-pack/index.d.ts
@@ -9,7 +9,7 @@ import * as motion from 'react-motion';
 
 declare namespace Transition {
     interface TransitionProps {
-        component?: string | boolean | React.ReactElement<any>;
+        component?: string | boolean | React.ReactElement;
         runOnMount?: boolean;
         appear?: motion.Style;
         enter?: motion.Style;
diff --git a/types/react-motion/index.d.ts b/types/react-motion/index.d.ts
index 761c8e559f..cf5ef94250 100644
--- a/types/react-motion/index.d.ts
+++ b/types/react-motion/index.d.ts
@@ -65,7 +65,7 @@ interface MotionProps {
      * Callback with your interpolated styles. Must return one react element to render
      * @param interpolatedStyle
      */
-    children?: (interpolatedStyle: PlainStyle) => ReactElement<any>;
+    children?: (interpolatedStyle: PlainStyle) => ReactElement;
     /**
      * The callback that fires when the animation comes to a rest.
      */
@@ -113,7 +113,7 @@ interface TransitionProps {
      * <StaggeredMotion/>
      */
     styles: Array<TransitionStyle> | InterpolateFunction;
-    children?: (interpolatedStyles: Array<TransitionPlainStyle>) => ReactElement<any>;
+    children?: (interpolatedStyles: Array<TransitionPlainStyle>) => ReactElement;
     /**
      * Triggers when a new element will appear
      * @param styleThatEntered
diff --git a/types/react-native-document-picker/index.d.ts b/types/react-native-document-picker/index.d.ts
index 986da6e611..77b91e81bc 100644
--- a/types/react-native-document-picker/index.d.ts
+++ b/types/react-native-document-picker/index.d.ts
@@ -12,6 +12,8 @@ export const DocumentPickerUtil: {
     pdf(): string;
     audio(): string;
     plainText(): string;
+    video(): string;
+    images(): string;
 };
 
 export interface Options {
diff --git a/types/react-native-draggable-flatlist/index.d.ts b/types/react-native-draggable-flatlist/index.d.ts
index 0b96f0b3cd..ff97ca9f18 100644
--- a/types/react-native-draggable-flatlist/index.d.ts
+++ b/types/react-native-draggable-flatlist/index.d.ts
@@ -49,7 +49,7 @@ interface DraggableFlatListProps<Item> extends VirtualizedListWithoutRenderItemP
   /**
    * Function that calls move when the row should become active (in an onPress, onLongPress, etc). Calls moveEnd when the gesture is complete (in onPressOut).
    */
-  renderItem: (info: RenderItemInfo<Item>) => React.ReactElement<any> | null;
+  renderItem: (info: RenderItemInfo<Item>) => React.ReactElement | null;
 }
 
 declare class DraggableFlatList<Item> extends Component<DraggableFlatListProps<Item>> {
diff --git a/types/react-native-drawer/index.d.ts b/types/react-native-drawer/index.d.ts
index da3420b9a7..9f47740d2b 100644
--- a/types/react-native-drawer/index.d.ts
+++ b/types/react-native-drawer/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-native-drawer 2.5
-// Project: https://github.com/root-two/react-native-drawer
+// Project: https://github.com/root-two/react-native-drawer, https://github.com/rt2zz/react-native-drawer
 // Definitions by: jnbt <https://github.com/jnbt>
 //                 suniahk <https://github.com/suniahk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/react-native-fbsdk/index.d.ts b/types/react-native-fbsdk/index.d.ts
index eacc05209e..5049669e35 100644
--- a/types/react-native-fbsdk/index.d.ts
+++ b/types/react-native-fbsdk/index.d.ts
@@ -639,6 +639,12 @@ export namespace AppEventsLogger {
      */
     function flush(): void;
 
+    /**
+     * Sets a custom user ID to associate with all app events.
+     * The userID is persisted until it is cleared by passing nil.
+     */
+    function setUserID(userID: string | null): void;
+
     /**
      * For iOS only, sets and sends device token to register the current application for push notifications.
      * @platform ios
diff --git a/types/react-native-fs/index.d.ts b/types/react-native-fs/index.d.ts
index 6c92933c44..11abaffb46 100644
--- a/types/react-native-fs/index.d.ts
+++ b/types/react-native-fs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-native-fs 2.8
-// Project: https://github.com/johanneslumpe/react-native-fs
+// Project: https://github.com/itinance/react-native-fs
 // Definitions by: Paulo Cesar <https://github.com/pocesar>
 //                 Joseph Roque <https://github.com/josephroque>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/react-native-google-signin/index.d.ts b/types/react-native-google-signin/index.d.ts
index 54e19715e1..1d4b794256 100644
--- a/types/react-native-google-signin/index.d.ts
+++ b/types/react-native-google-signin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-native-google-signin 1.0
-// Project: https://github.com/devfd/react-native-google-signin
+// Project: https://github.com/react-native-community/react-native-google-signin
 // Definitions by: Jacob Froman <https://github.com/j-fro>
 //                 Michele Bombardi <https://github.com/bm-software>
 //                 Christian Chown <https://github.com/christianchown>
diff --git a/types/react-native-material-ui/index.d.ts b/types/react-native-material-ui/index.d.ts
index b215820f2b..f2257a086b 100644
--- a/types/react-native-material-ui/index.d.ts
+++ b/types/react-native-material-ui/index.d.ts
@@ -762,11 +762,11 @@ export interface ThemeProps {
 
 export interface ThemeProviderProps {
     value: {};
-    children: React.ReactElement<any>;
+    children: React.ReactElement;
 }
 
 export interface ThemeConsumerProps {
-    children(props: ThemeProps): React.ReactElement<any>;
+    children(props: ThemeProps): React.ReactElement;
 }
 
 export namespace ThemeContext {
diff --git a/types/react-native-modal-dropdown/index.d.ts b/types/react-native-modal-dropdown/index.d.ts
index 01470ec1cf..01e5dcf30b 100644
--- a/types/react-native-modal-dropdown/index.d.ts
+++ b/types/react-native-modal-dropdown/index.d.ts
@@ -21,6 +21,7 @@ declare namespace RNModalDropdown {
         defaultValue?: string;
         options?: any[];
         animated?: boolean;
+        scrollEnabled?: boolean;
         showsVerticalScrollIndicator?: boolean;
         style?: any;
         textStyle?: any;
diff --git a/types/react-native-modal-filter-picker/index.d.ts b/types/react-native-modal-filter-picker/index.d.ts
new file mode 100644
index 0000000000..8188a32319
--- /dev/null
+++ b/types/react-native-modal-filter-picker/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for react-native-modal-filter-picker 1.3
+// Project: https://github.com/hiddentao/react-native-modal-filter-picker#readme
+// Definitions by: Chang Yanwei <https://github.com/ywchang>
+//                 Cheng Gibson <https://github.com/nossbigg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from "react";
+import {
+    StyleProp,
+    ViewStyle,
+    TextStyle,
+    ListView,
+    KeyboardAvoidingView,
+    ModalProps,
+    ListViewProps
+} from "react-native";
+
+export interface ModalFilterPickerOption {
+    label: string;
+    key: string;
+}
+
+export interface ModalFilterPickerProps<T extends ModalFilterPickerOption> {
+    options: T[];
+    onSelect: (key: string) => void;
+    onCancel: () => void;
+    placeholderText?: string;
+    placeholderTextColor?: string;
+    androidUnderlineColor?: string;
+    cancelButtonText?: string;
+    title?: string;
+    noResultsText?: string;
+    visible?: boolean;
+    showFilter?: boolean;
+    modal?: ModalProps;
+    selectedOption?: string;
+    listViewProps?: Partial<ListViewProps>;
+    renderOption?: (option: T, isSelected: boolean) => JSX.Element;
+    renderList?: () => JSX.Element;
+    renderCancelButton?: () => JSX.Element;
+    keyboardShouldPersistTaps?: "never" | "always" | "handle";
+    autoFocus?: boolean;
+
+    // styling props
+    overlayStyle?: StyleProp<KeyboardAvoidingView>;
+    listContainerStyle?: StyleProp<ViewStyle>;
+    filterTextInputContainerStyle?: StyleProp<ViewStyle>;
+    filterTextInputStyle?: StyleProp<TextStyle>;
+    cancelContainerStyle?: StyleProp<ViewStyle>;
+    cancelButtonStyle?: StyleProp<ViewStyle>;
+    cancelButtonTextStyle?: StyleProp<TextStyle>;
+    titleTextStyle?: StyleProp<TextStyle>;
+    optionTextStyle?: StyleProp<TextStyle>;
+}
+
+declare class ModalFilterPicker<
+    T extends ModalFilterPickerOption
+> extends React.Component<ModalFilterPickerProps<T>> {}
+
+export default ModalFilterPicker;
diff --git a/types/react-native-modal-filter-picker/react-native-modal-filter-picker-tests.tsx b/types/react-native-modal-filter-picker/react-native-modal-filter-picker-tests.tsx
new file mode 100644
index 0000000000..05fc770e5a
--- /dev/null
+++ b/types/react-native-modal-filter-picker/react-native-modal-filter-picker-tests.tsx
@@ -0,0 +1,64 @@
+import * as React from "react";
+import ModalFilterPicker, {
+    ModalFilterPickerOption
+} from "react-native-modal-filter-picker";
+import { View, Button, Text } from "react-native";
+
+interface MyModalFilterPickerOption extends ModalFilterPickerOption {
+    customField: string;
+}
+
+const modalFilterPickerOptions: MyModalFilterPickerOption[] = [
+    {
+        label: "some-label-1",
+        key: "some-key-1",
+        customField: "some-customfield-1"
+    },
+    {
+        label: "some-label-2",
+        key: "some-key-2",
+        customField: "some-customfield-2"
+    }
+];
+
+const renderPicker = () => (
+    <ModalFilterPicker
+        options={modalFilterPickerOptions}
+        onSelect={key => {
+            console.log(key);
+        }}
+        onCancel={() => {}}
+        placeholderText="Filter..."
+        placeholderTextColor="#ccc"
+        androidUnderlineColor="rgba(0,0,0,0)"
+        cancelButtonText="Cancel"
+        title="some-title"
+        noResultsText="No matches"
+        visible
+        showFilter
+        modal={{ animated: true }}
+        selectedOption="some-option-key"
+        listViewProps={{ accessible: true }}
+        renderOption={(option, isSelected) => (
+            <View key={option.key}>
+                <Text>
+                    `${option.label} ${option.customField} ${isSelected}`
+                </Text>
+            </View>
+        )}
+        renderList={() => <View />}
+        renderCancelButton={() => <Button title="Cancel" onPress={() => {}} />}
+        keyboardShouldPersistTaps={"never"}
+        autoFocus={false}
+    />
+);
+
+const renderPickerWithRequiredPropsOnly = () => (
+    <ModalFilterPicker
+        options={modalFilterPickerOptions}
+        onSelect={key => {
+            console.log(key);
+        }}
+        onCancel={() => {}}
+    />
+);
diff --git a/types/react-native-modal-filter-picker/tsconfig.json b/types/react-native-modal-filter-picker/tsconfig.json
new file mode 100644
index 0000000000..66da37bb6b
--- /dev/null
+++ b/types/react-native-modal-filter-picker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": ["index.d.ts", "react-native-modal-filter-picker-tests.tsx"]
+}
diff --git a/types/react-native-modal-filter-picker/tslint.json b/types/react-native-modal-filter-picker/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-modal-filter-picker/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-modalbox/index.d.ts b/types/react-native-modalbox/index.d.ts
index 778f953f78..4aa0be6f4a 100644
--- a/types/react-native-modalbox/index.d.ts
+++ b/types/react-native-modalbox/index.d.ts
@@ -147,6 +147,14 @@ export interface ModalProps {
      */
     style?: StyleProp<ViewStyle>;
 
+    /**
+     * Enables the hardware acceleration to animate the modal. Please note that enabling this can cause some flashes in a weird way when animating
+     *
+     * Default is true
+     *
+     */
+    useNativeDriver?: boolean;
+
     /**
      * Event fired when the modal is closed and the animation is complete
      *
diff --git a/types/react-native-navbar/index.d.ts b/types/react-native-navbar/index.d.ts
index afcd7df3ed..afdd972ddc 100644
--- a/types/react-native-navbar/index.d.ts
+++ b/types/react-native-navbar/index.d.ts
@@ -33,9 +33,9 @@ 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;
+    leftButton?: NavigationBarButton | React.ReactElement | null;
+    rightButton?: NavigationBarButton | React.ReactElement | null;
+    title?: NavigationBarTitle | React.ReactElement | null;
 }
 
 export default class NavigationBar extends React.Component<NavigationBarProps> {}
diff --git a/types/react-native-photo-view/index.d.ts b/types/react-native-photo-view/index.d.ts
index c104b1c0e5..c3e49dcf09 100644
--- a/types/react-native-photo-view/index.d.ts
+++ b/types/react-native-photo-view/index.d.ts
@@ -22,9 +22,9 @@ export interface ReactNativePhotoViewProps {
     onLoad?: () => void;
     onLoadEnd?: () => void;
     onProgress?: (loaded: number, total: number) => void;
-    onTap?: (point: {x: number, y: number}, target?: React.ReactElement<any>) => void;
-    onViewTap?: (point: {x: number, y: number}, target?: React.ReactElement<any>) => void;
-    onScale?: (scale: number, target?: React.ReactElement<any>) => void;
+    onTap?: (point: {x: number, y: number}, target?: React.ReactElement) => void;
+    onViewTap?: (point: {x: number, y: number}, target?: React.ReactElement) => void;
+    onScale?: (scale: number, target?: React.ReactElement) => void;
 }
 
 export default class ReactNativePhotoView extends React.Component<ReactNativePhotoViewProps & ViewProps> {}
diff --git a/types/react-native-photo-view/react-native-photo-view-tests.tsx b/types/react-native-photo-view/react-native-photo-view-tests.tsx
index f83168d280..0bd2697630 100644
--- a/types/react-native-photo-view/react-native-photo-view-tests.tsx
+++ b/types/react-native-photo-view/react-native-photo-view-tests.tsx
@@ -25,13 +25,13 @@ const test: React.SFC = () => (
         onProgress={(loaded: number, total: number) => {
             console.log(`onProgress ${loaded}/${total}`);
         }}
-        onTap={(point: {x: number; y: number}, target?: React.ReactElement<any>) => {
+        onTap={(point: {x: number; y: number}, target?: React.ReactElement) => {
             console.log('onTap');
         }}
-        onViewTap={(point: {x: number; y: number}, target?: React.ReactElement<any>) => {
+        onViewTap={(point: {x: number; y: number}, target?: React.ReactElement) => {
             console.log(`onViewTap ${point.x},${point.y} ${!!target ? 'targetted' : ''}`);
         }}
-        onScale={(scale: number, target?: React.ReactElement<any>) => {
+        onScale={(scale: number, target?: React.ReactElement) => {
             console.log(`onScale ${scale} ${!!target ? 'targetted' : ''}`);
         }}
     />
diff --git a/types/react-native-popup-dialog/index.d.ts b/types/react-native-popup-dialog/index.d.ts
index d0a9d22a4b..b81533a6bc 100644
--- a/types/react-native-popup-dialog/index.d.ts
+++ b/types/react-native-popup-dialog/index.d.ts
@@ -17,7 +17,7 @@ export interface DialogContentProps {
     style?: StyleProp<ViewStyle>;
 }
 
-export interface DialogActionListProps {
+export interface DialogFooterProps {
     bordered?: boolean;
     style?: StyleProp<ViewStyle>;
 }
@@ -70,9 +70,7 @@ export interface DialogProps {
     onDismiss?: () => void;
     onTouchOutside?: () => void;
     onHardwareBackPress?: () => boolean;
-    actions?: any[];
-    actionContainerStyle?: StyleProp<ViewStyle>;
-    actionsBordered?: boolean;
+    footer?: any;
     useNativeDriver?: boolean;
 }
 
@@ -97,7 +95,7 @@ export class SlideAnimation {
 }
 
 export class DialogContent extends React.Component<DialogContentProps, any> { }
-export class DialogActionList extends React.Component<DialogActionListProps, any> { }
+export class DialogFooter extends React.Component<DialogFooterProps, any> { }
 export class DialogButton extends React.Component<DialogButtonProps, any> { }
 export class DialogTitle extends React.Component<DialogTitleProps, any> { }
 export class Overlay extends React.Component<OverlayProps, any> { }
diff --git a/types/react-native-popup-dialog/react-native-popup-dialog-tests.tsx b/types/react-native-popup-dialog/react-native-popup-dialog-tests.tsx
index 55f979f506..2dc943d35b 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
@@ -7,6 +7,7 @@ import Dialog, {
     SlideAnimation,
     ScaleAnimation,
     FadeAnimation,
+    DialogFooter,
 } from 'react-native-popup-dialog';
 
 const slideAnimation = new SlideAnimation({ slideFrom: 'bottom' });
@@ -50,14 +51,22 @@ class Test extends React.Component<any> {
                 <Dialog ref={(popupDialog) => this.scalingPopupDialog = popupDialog}
                     dialogTitle={<DialogTitle title="Popup Dialog - Scale Animation" />}
                     dialogAnimation={scaleAnimation}
-                    actions={[
-                        <DialogButton
-                            text="CLOSE"
-                            onPress={(event) => this.dismissPopupDialog(this.scalingPopupDialog)}
-                            textStyle={{ color: "red" }}
-                            key="button-1"
-                        />,
-                    ]}
+                    footer={
+                        <DialogFooter>
+                            <DialogButton
+                                text="CLOSE"
+                                onPress={(event) => this.dismissPopupDialog(this.scalingPopupDialog)}
+                                textStyle={{ color: "red" }}
+                                bordered
+                                key="button-1"
+                            />
+                            <DialogButton
+                                text="OK"
+                                onPress={() => {}}
+                                key="button-2"
+                            />
+                        </DialogFooter>
+                    }
                 />
                 <Dialog ref={(popupDialog) => this.slidingPopupDialog = popupDialog}
                     dialogTitle={<DialogTitle title="Popup Dialog - Slide Animation" />}
diff --git a/types/react-native-scrollable-tab-view/index.d.ts b/types/react-native-scrollable-tab-view/index.d.ts
index 2d3061594e..d5c996511f 100644
--- a/types/react-native-scrollable-tab-view/index.d.ts
+++ b/types/react-native-scrollable-tab-view/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-native-scrollable-tab-view 0.8
-// Project: https://github.com/skv-headless/react-native-scrollable-tab-view
+// Project: https://github.com/brentvatne/react-native-scrollable-tab-view
 // Definitions by: CaiHuan <https://github.com/CaiHuan>
 //                 Egor Shulga <https://github.com/egorshulga>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
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 8e99cc95dc..1a085f91cc 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
@@ -23,7 +23,7 @@ class SnapCarouselTest extends React.Component {
         );
     }
 
-    render(): React.ReactElement<any> {
+    render(): React.ReactElement {
         return (
             <View>
                 <StringCarousel
@@ -81,7 +81,7 @@ class SnapCarouselWithPaginationTest extends React.Component<{}, {activeSlide: n
         );
     }
 
-    render(): React.ReactElement<any> {
+    render(): React.ReactElement {
         return (
             <View>
                 <StringCarousel
@@ -126,7 +126,7 @@ class SnapCarouselWithParallaxTest extends React.Component {
         );
     }
 
-    render(): React.ReactElement<any> {
+    render(): React.ReactElement {
         return (
             <View>
                 <StringCarousel
diff --git a/types/react-native-swiper/react-native-swiper-tests.tsx b/types/react-native-swiper/react-native-swiper-tests.tsx
index 3313f8954c..aff5588864 100644
--- a/types/react-native-swiper/react-native-swiper-tests.tsx
+++ b/types/react-native-swiper/react-native-swiper-tests.tsx
@@ -20,7 +20,7 @@ class SwiperTest extends React.Component {
   ) => {
     console.log(this.callback.name, event, state, context);
   }
-  render(): React.ReactElement<any> {
+  render(): React.ReactElement {
     return (
       <Swiper
         horizontal
diff --git a/types/react-native-tab-view/index.d.ts b/types/react-native-tab-view/index.d.ts
index 078247e97d..a6e6b27735 100644
--- a/types/react-native-tab-view/index.d.ts
+++ b/types/react-native-tab-view/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Kalle Ott <https://github.com/kaoDev>
 //                 Kyle Roach <https://github.com/iRoachie>
 //                 Tim Wang <https://github.com/timwangdev>
+//                 Gerardo Pacheco <https://github.com/geriux>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 import { PureComponent, ReactNode, ComponentType } from 'react'
@@ -201,15 +202,21 @@ export type IndicatorProps<
 export type TabBarProps<T extends RouteBase = RouteBase> = SceneRendererProps<
   T
 > & {
-  scrollEnabled?: boolean
+  getLabelText?: (scene: Scene<T>) => string | undefined | null
+  getAccessible?: (scene: Scene<T>) => boolean
+  getAccessibilityLabel?: (scene: Scene<T>) => string | undefined | null
+  getTestID?: (scene: Scene<T>) => string | undefined | null
+  renderIcon?: (scene: Scene<T>) => ReactNode
+  renderLabel?: (scene: Scene<T>) => ReactNode
+  renderIndicator?: (props: IndicatorProps<T>) => ReactNode
+  renderBadge?: (scene: Scene<T>) => ReactNode
+  onTabPress?: (scene: Scene<T>) => void
+  onTabLongPress?: (scene: Scene<T>) => void
   pressColor?: string
   pressOpacity?: number
-  getLabelText?: (scene: Scene<T>) => string | undefined | null
-  renderLabel?: (scene: Scene<T>) => ReactNode
-  renderIcon?: (scene: Scene<T>) => ReactNode
-  renderBadge?: (scene: Scene<T>) => ReactNode
-  renderIndicator?: (props: IndicatorProps<T>) => ReactNode
-  onTabPress?: (scene: Scene<T>) => void
+  scrollEnabled?: boolean
+  bounces?: boolean
+  useNativeDriver?: boolean;
   tabStyle?: StyleProp<ViewStyle>
   indicatorStyle?: StyleProp<ViewStyle>
   labelStyle?: StyleProp<ViewStyle>
diff --git a/types/react-native-toast-native/index.d.ts b/types/react-native-toast-native/index.d.ts
index 6240441781..295b997345 100644
--- a/types/react-native-toast-native/index.d.ts
+++ b/types/react-native-toast-native/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-native-toast-native 0.1
-// Project: https://github.com/onemolegames/react-native-toast-native/blob/master/README.md
+// Project: https://github.com/onemolegames/react-native-toast-native
 // Definitions by: Michele Bombardi <https://github.com/bm-software>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-native-video/index.d.ts b/types/react-native-video/index.d.ts
index 63d0ff6c89..4ce9bf9b2d 100644
--- a/types/react-native-video/index.d.ts
+++ b/types/react-native-video/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-native-video 3.1
-// Project: https://github.com/react-native-community/react-native-video
+// Project: https://github.com/react-native-community/react-native-video, https://github.com/brentvatne/react-native-video
 // Definitions by: HuHuanming <https://github.com/huhuanming>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 2b59454222..0cee14dfd2 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -16,6 +16,7 @@
 //                 Kacper Wiszczuk <https://github.com/esemesek>
 //                 Ryan Nickel <https://github.com/mrnickel>
 //                 Souvik Ghosh <https://github.com/souvik-ghosh>
+//                 Cheng Gibson <https://github.com/nossbigg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -3918,7 +3919,7 @@ export interface ListRenderItemInfo<ItemT> {
     };
 }
 
-export type ListRenderItem<ItemT> = (info: ListRenderItemInfo<ItemT>) => React.ReactElement<any> | null;
+export type ListRenderItem<ItemT> = (info: ListRenderItemInfo<ItemT>) => React.ReactElement | null;
 
 export interface FlatListProps<ItemT> extends VirtualizedListProps<ItemT> {
     /**
@@ -3929,17 +3930,17 @@ export interface FlatListProps<ItemT> extends VirtualizedListProps<ItemT> {
     /**
      * Rendered when the list is empty.
      */
-    ListEmptyComponent?: React.ComponentType<any> | React.ReactElement<any> | null;
+    ListEmptyComponent?: React.ComponentType<any> | React.ReactElement | null;
 
     /**
      * Rendered at the very end of the list.
      */
-    ListFooterComponent?: React.ComponentType<any> | React.ReactElement<any> | null;
+    ListFooterComponent?: React.ComponentType<any> | React.ReactElement | null;
 
     /**
      * Rendered at the very beginning of the list.
      */
-    ListHeaderComponent?: React.ComponentType<any> | React.ReactElement<any> | null;
+    ListHeaderComponent?: React.ComponentType<any> | React.ReactElement | null;
 
     /**
      * Optional custom style for multi-item rows generated when numColumns > 1
@@ -4111,6 +4112,11 @@ export class FlatList<ItemT> extends React.Component<FlatListProps<ItemT>> {
      * by taps on items or by navigation actions.
      */
     recordInteraction: () => void;
+
+    /**
+     * Displays the scroll indicators momentarily.
+     */
+    flashScrollIndicators: () => void;
 }
 
 /**
@@ -4140,7 +4146,7 @@ export interface SectionListRenderItemInfo<ItemT> extends ListRenderItemInfo<Ite
     section: SectionListData<ItemT>;
 }
 
-export type SectionListRenderItem<ItemT> = (info: SectionListRenderItemInfo<ItemT>) => React.ReactElement<any> | null;
+export type SectionListRenderItem<ItemT> = (info: SectionListRenderItemInfo<ItemT>) => React.ReactElement | null;
 
 export interface SectionListProps<ItemT> extends VirtualizedListWithoutRenderItemProps<ItemT> {
     /**
@@ -4151,22 +4157,22 @@ export interface SectionListProps<ItemT> extends VirtualizedListWithoutRenderIte
     /**
      * Rendered when the list is empty.
      */
-    ListEmptyComponent?: React.ComponentType<any> | React.ReactElement<any> | null;
+    ListEmptyComponent?: React.ComponentType<any> | React.ReactElement | null;
 
     /**
      * Rendered at the very end of the list.
      */
-    ListFooterComponent?: React.ComponentType<any> | React.ReactElement<any> | null;
+    ListFooterComponent?: React.ComponentType<any> | React.ReactElement | null;
 
     /**
      * Rendered at the very beginning of the list.
      */
-    ListHeaderComponent?: React.ComponentType<any> | React.ReactElement<any> | null;
+    ListHeaderComponent?: React.ComponentType<any> | React.ReactElement | null;
 
     /**
      * Rendered in between each section.
      */
-    SectionSeparatorComponent?: React.ComponentType<any> | React.ReactElement<any> | null;
+    SectionSeparatorComponent?: React.ComponentType<any> | React.ReactElement | null;
 
     /**
      * A marker property for telling the list to re-render (since it implements PureComponent).
@@ -4252,12 +4258,12 @@ export interface SectionListProps<ItemT> extends VirtualizedListWithoutRenderIte
     /**
      * Rendered at the top of each section. Sticky headers are not yet supported.
      */
-    renderSectionHeader?: (info: { section: SectionListData<ItemT> }) => React.ReactElement<any> | null;
+    renderSectionHeader?: (info: { section: SectionListData<ItemT> }) => React.ReactElement | null;
 
     /**
      * Rendered at the bottom of each section.
      */
-    renderSectionFooter?: (info: { section: SectionListData<ItemT> }) => React.ReactElement<any> | null;
+    renderSectionFooter?: (info: { section: SectionListData<ItemT> }) => React.ReactElement | null;
 
     /**
      * An array of objects with data for each section.
@@ -4317,19 +4323,19 @@ export interface VirtualizedListWithoutRenderItemProps<ItemT> extends ScrollView
      * Rendered when the list is empty. Can be a React Component Class, a render function, or
      * a rendered element.
      */
-    ListEmptyComponent?: React.ComponentType<any> | React.ReactElement<any> | null;
+    ListEmptyComponent?: React.ComponentType<any> | React.ReactElement | null;
 
     /**
      * Rendered at the bottom of all the items. Can be a React Component Class, a render function, or
      * a rendered element.
      */
-    ListFooterComponent?: React.ComponentType<any> | React.ReactElement<any> | null;
+    ListFooterComponent?: React.ComponentType<any> | React.ReactElement | null;
 
     /**
      * Rendered at the top of all the items. Can be a React Component Class, a render function, or
      * a rendered element.
      */
-    ListHeaderComponent?: React.ComponentType<any> | React.ReactElement<any> | null;
+    ListHeaderComponent?: React.ComponentType<any> | React.ReactElement | null;
 
     /**
      * The default accessor functions assume this is an Array<{key: string}> but you can override
@@ -4554,7 +4560,7 @@ export interface ListViewProps extends ScrollViewProps {
      * in StaticContainer or other mechanism as appropriate.  Footer is always
      * at the bottom of the list, and header at the top, on every render pass.
      */
-    renderFooter?: () => React.ReactElement<any>;
+    renderFooter?: () => React.ReactElement;
 
     /**
      * () => renderable
@@ -4564,7 +4570,7 @@ export interface ListViewProps extends ScrollViewProps {
      * in StaticContainer or other mechanism as appropriate.  Footer is always
      * at the bottom of the list, and header at the top, on every render pass.
      */
-    renderHeader?: () => React.ReactElement<any>;
+    renderHeader?: () => React.ReactElement;
 
     /**
      * (rowData, sectionID, rowID) => renderable
@@ -4578,7 +4584,7 @@ export interface ListViewProps extends ScrollViewProps {
         sectionID: string | number,
         rowID: string | number,
         highlightRow?: boolean
-    ) => React.ReactElement<any>;
+    ) => React.ReactElement;
 
     /**
      * A function that returns the scrollable component in which the list rows are rendered.
@@ -4595,7 +4601,7 @@ export interface ListViewProps extends ScrollViewProps {
      * stick to the top until it is pushed off the screen by the next section
      * header.
      */
-    renderSectionHeader?: (sectionData: any, sectionId: string | number) => React.ReactElement<any>;
+    renderSectionHeader?: (sectionData: any, sectionId: string | number) => React.ReactElement;
 
     /**
      * (sectionID, rowID, adjacentRowHighlighted) => renderable
@@ -4607,7 +4613,7 @@ export interface ListViewProps extends ScrollViewProps {
         sectionID: string | number,
         rowID: string | number,
         adjacentRowHighlighted?: boolean
-    ) => React.ReactElement<any>;
+    ) => React.ReactElement;
 
     /**
      * How early to start rendering rows before they come on screen, in
@@ -4684,12 +4690,12 @@ export interface MapViewAnnotation {
     onBlur?: () => any;
     title?: string;
     subtitle?: string;
-    leftCalloutView?: React.ReactElement<any>;
-    rightCalloutView?: React.ReactElement<any>;
-    detailCalloutView?: React.ReactElement<any>;
+    leftCalloutView?: React.ReactElement;
+    rightCalloutView?: React.ReactElement;
+    detailCalloutView?: React.ReactElement;
     tintColor?: string;
     image?: ImageURISource;
-    view?: React.ReactElement<any>;
+    view?: React.ReactElement;
     hasLeftCallout?: boolean;
     hasRightCallout?: boolean;
     onLeftCalloutPress?: () => void;
@@ -4848,7 +4854,7 @@ export class MapView extends MapViewBase {
 }
 
 interface MaskedViewIOSProps extends ViewProps {
-    maskElement: React.ReactElement<any>;
+    maskElement: React.ReactElement;
 }
 
 /**
@@ -6291,21 +6297,6 @@ export interface ScrollViewPropsIOS {
      */
     scrollsToTop?: boolean;
 
-    /**
-     * When snapToInterval is set, snapToAlignment will define the relationship of the the snapping to the scroll view.
-     *      - start (the default) will align the snap at the left (horizontal) or top (vertical)
-     *      - center will align the snap in the center
-     *      - end will align the snap at the right (horizontal) or bottom (vertical)
-     */
-    snapToAlignment?: "start" | "center" | "end";
-
-    /**
-     * When set, causes the scroll view to stop at multiples of the value of snapToInterval.
-     * This can be used for paginating through children that have lengths smaller than the scroll view.
-     * Used in combination with snapToAlignment.
-     */
-    snapToInterval?: number;
-
     /**
      * An array of child indices determining which children get docked to the
      * top of the screen when scrolling. For example passing
@@ -6478,6 +6469,44 @@ export interface ScrollViewProps extends ViewProps, ScrollViewPropsIOS, ScrollVi
      * functionality for the ScrollView.
      */
     refreshControl?: React.ReactElement<RefreshControlProps>;
+
+    /**
+     * When `snapToInterval` is set, `snapToAlignment` will define the relationship of the the snapping to the scroll view.
+     *      - `start` (the default) will align the snap at the left (horizontal) or top (vertical)
+     *      - `center` will align the snap in the center
+     *      - `end` will align the snap at the right (horizontal) or bottom (vertical)
+     */
+    snapToAlignment?: "start" | "center" | "end";
+
+    /**
+     * When set, causes the scroll view to stop at multiples of the value of `snapToInterval`.
+     * This can be used for paginating through children that have lengths smaller than the scroll view.
+     * Used in combination with `snapToAlignment` and `decelerationRate="fast"`. Overrides less
+     * configurable `pagingEnabled` prop.
+     */
+    snapToInterval?: number;
+
+    /**
+     * When set, causes the scroll view to stop at the defined offsets. This can be used for
+     * paginating through variously sized children that have lengths smaller than the scroll view.
+     * Typically used in combination with `decelerationRate="fast"`. Overrides less configurable
+     * `pagingEnabled` and `snapToInterval` props.
+     */
+    snapToOffsets?: number[];
+
+    /**
+     * Use in conjuction with `snapToOffsets`. By default, the beginning of the list counts as a
+     * snap offset. Set `snapToStart` to false to disable this behavior and allow the list to scroll
+     * freely between its start and the first `snapToOffsets` offset. The default value is true.
+     */
+    snapToStart?: boolean;
+
+    /**
+     * Use in conjuction with `snapToOffsets`. By default, the end of the list counts as a snap
+     * offset. Set `snapToEnd` to false to disable this behavior and allow the list to scroll freely
+     * between its end and the last `snapToOffsets` offset. The default value is true.
+     */
+    snapToEnd?: boolean;
 }
 
 declare class ScrollViewComponent extends React.Component<ScrollViewProps> {}
@@ -6610,10 +6639,10 @@ export interface SwipeableListViewProps {
         sectionID: string | number,
         rowID: string | number,
         highlightRow?: boolean
-    ) => React.ReactElement<any>;
+    ) => React.ReactElement;
 
     // Callback method to render the view that will be unveiled on swipe
-    renderQuickActions(rowData: any, sectionID: string | number, rowID: string | number): React.ReactElement<any>;
+    renderQuickActions(rowData: any, sectionID: string | number, rowID: string | number): React.ReactElement;
 }
 
 /**
@@ -7633,6 +7662,9 @@ export interface PanResponderStatic {
 export interface Rationale {
     title: string;
     message: string;
+    buttonPositive: string;
+    buttonNegative?: string;
+    buttonNeutral?: string;
 }
 
 export type Permission =
@@ -8156,7 +8188,7 @@ export interface UIManagerStatic {
      * @platform ios
      */
     takeSnapshot: (
-        view?: "window" | React.ReactElement<any> | number,
+        view?: "window" | React.ReactElement | number,
         options?: {
             width?: number;
             height?: number;
@@ -8990,8 +9022,44 @@ export interface ARTStatic {
     Text: typeof ARTText;
 }
 
+export type KeyboardEventName =
+    | "keyboardWillShow"
+    | "keyboardDidShow"
+    | "keyboardWillHide"
+    | "keyboardDidHide"
+    | "keyboardWillChangeFrame"
+    | "keyboardDidChangeFrame";
+
+export type KeyboardEventEasing =
+    | "easeIn"
+    | "easeInEaseOut"
+    | "easeOut"
+    | "linear"
+    | "keyboard";
+
+type ScreenRect = {
+    screenX: number;
+    screenY: number;
+    width: number;
+    height: number;
+};
+
+export interface KeyboardEvent {
+    duration: number;
+    easing: KeyboardEventEasing;
+    endCoordinates: ScreenRect;
+    startCoordinates: ScreenRect;
+    isEventFromThisApp: boolean;
+}
+
+type KeyboardEventListener = (event: KeyboardEvent) => void;
+
 export interface KeyboardStatic extends NativeEventEmitter {
     dismiss: () => void;
+    addListener(
+        eventType: KeyboardEventName,
+        listener: KeyboardEventListener
+    ): EmitterSubscription;
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index 1fcbe153e6..622e2b28c8 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -85,6 +85,7 @@ import {
     DatePickerAndroid,
     ViewPropTypes,
     requireNativeComponent,
+    Keyboard,
 } from "react-native";
 
 declare module "react-native" {
@@ -332,6 +333,14 @@ InteractionManager.runAfterInteractions(() => {
 }).then(() => "done");
 
 export class FlatListTest extends React.Component<FlatListProps<number>, {}> {
+    list: FlatList<any> | null = null;
+
+    componentDidMount(): void {
+        if (this.list) {
+            this.list.flashScrollIndicators();
+        }
+    }
+
     _renderItem = (rowData: any) => {
         return (
             <View>
@@ -345,6 +354,7 @@ export class FlatListTest extends React.Component<FlatListProps<number>, {}> {
     render() {
         return (
             <FlatList
+                ref={list => (this.list = list)}
                 data={[1, 2, 3, 4, 5]}
                 renderItem={this._renderItem}
                 ItemSeparatorComponent={this._renderSeparator}
@@ -444,6 +454,9 @@ class ScrollerListComponentTest extends React.Component<{}, { dataSource: ListVi
                             nestedScrollEnabled={true}
                             invertStickyHeaders={true}
                             contentOffset={{ x: 0, y: 0 }}
+                            snapToStart={false}
+                            snapToEnd={false}
+                            snapToOffsets={[100, 300, 500]}
                             {...props}
                             style={[scrollViewStyle1.scrollView, scrollViewStyle2]}
                         />
@@ -834,3 +847,8 @@ const ShareTest = () => {
         }
     });
 };
+
+const KeyboardTest = () => {
+    const subscriber = Keyboard.addListener("keyboardDidHide", (event) => {event});
+    subscriber.remove();
+}
diff --git a/types/react-navigation-material-bottom-tabs/index.d.ts b/types/react-navigation-material-bottom-tabs/index.d.ts
index e9938c7bb4..303c29a728 100644
--- a/types/react-navigation-material-bottom-tabs/index.d.ts
+++ b/types/react-navigation-material-bottom-tabs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-navigation-material-bottom-tabs 0.3
-// Project: https://github.com/react-navigation/react-navigation-material-bottom-tab-navigator#readme
+// Project: https://github.com/react-navigation/react-navigation-material-bottom-tabs
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index e2e97c9d86..860d54523e 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -31,6 +31,7 @@
 //                 Fellipe Chagas <https://github.com/chagasaway>
 //                 Deniss Borisovs <https://github.com/denissb>
 //                 Kenneth Skovhus <https://github.com/skovhus>
+//                 Aaron Rosen <https://github.com/azrosen92>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -427,24 +428,24 @@ export interface NavigationSwitchRouterConfig {
 export interface NavigationStackScreenOptions {
   title?: string;
   header?:
-  | React.ReactElement<any>
-  | ((headerProps: HeaderProps) => React.ReactElement<any>)
+  | React.ReactElement
+  | ((headerProps: HeaderProps) => React.ReactElement)
   | null;
   headerTransparent?: boolean;
-  headerTitle?: string | React.ReactElement<any>;
+  headerTitle?: string | React.ReactElement;
   headerTitleStyle?: StyleProp<TextStyle>;
   headerTitleAllowFontScaling?: boolean;
   headerTintColor?: string;
   headerLeft?:
-  | React.ReactElement<any>
-  | ((backButtonProps: HeaderBackButtonProps) => React.ReactElement<any>)
+  | React.ReactElement
+  | ((backButtonProps: HeaderBackButtonProps) => React.ReactElement)
   | null;
   headerBackTitle?: string | null;
-  headerBackImage?: React.ReactElement<any>;
+  headerBackImage?: React.ReactElement;
   headerTruncatedBackTitle?: string;
   headerBackTitleStyle?: StyleProp<TextStyle>;
   headerPressColorAndroid?: string;
-  headerRight?: React.ReactElement<any> | null;
+  headerRight?: React.ReactElement | null;
   headerStyle?: StyleProp<ViewStyle>;
   headerForceInset?: HeaderForceInset;
   headerBackground?: React.ReactNode | React.ReactType;
@@ -539,16 +540,16 @@ export interface TabScene {
 interface NavigationTabScreenOptionsBase {
   title?: string;
   tabBarIcon?:
-  | React.ReactElement<any>
+  | React.ReactElement
   | ((
     options: { tintColor: string | null; focused: boolean; horizontal: boolean }
-  ) => React.ReactElement<any> | null);
+  ) => React.ReactElement | null);
   tabBarLabel?:
   | string
-  | React.ReactElement<any>
+  | React.ReactElement
   | ((
     options: { tintColor: string | null; focused: boolean }
-  ) => React.ReactElement<any> | string | null);
+  ) => React.ReactElement | string | null);
   tabBarVisible?: boolean;
   tabBarTestIDProps?: { testID?: string; accessibilityLabel?: string };
 }
@@ -578,16 +579,16 @@ export type DrawerLockMode = 'unlocked' | 'locked-closed' | 'locked-open';
 export interface NavigationDrawerScreenOptions {
   title?: string;
   drawerIcon?:
-  | React.ReactElement<any>
+  | React.ReactElement
   | ((
     options: { tintColor: string | null; focused: boolean }
-  ) => React.ReactElement<any> | null);
+  ) => React.ReactElement | null);
   drawerLabel?:
   | string
-  | React.ReactElement<any>
+  | React.ReactElement
   | ((
     options: { tintColor: string | null; focused: boolean }
-  ) => React.ReactElement<any> | null);
+  ) => React.ReactElement | null);
   drawerLockMode?: DrawerLockMode;
 }
 
@@ -623,7 +624,7 @@ export interface NavigationEventSubscription {
 }
 
 export interface NavigationEventsProps extends ViewProps {
-  navigation?: NavigationNavigator;
+  navigation?: NavigationScreenProp<NavigationRoute>;
   onWillFocus?: NavigationEventCallback;
   onDidFocus?: NavigationEventCallback;
   onWillBlur?: NavigationEventCallback;
@@ -804,7 +805,7 @@ export type NavigationAnimationSetter = (
   lastState: NavigationState
 ) => void;
 
-export type NavigationSceneRenderer = () => React.ReactElement<any> | null;
+export type NavigationSceneRenderer = () => React.ReactElement | null;
 
 export type NavigationStyleInterpolator = (
   props: NavigationSceneRendererProps
@@ -1061,7 +1062,7 @@ export interface TabBarTopProps {
         jumpToIndex: (index: number) => void;
       }
     ) => void;
-  renderIcon: (scene: TabScene) => React.ReactElement<any>;
+  renderIcon: (scene: TabScene) => React.ReactElement;
   labelStyle?: TextStyle;
   iconStyle?: ViewStyle;
 }
@@ -1367,3 +1368,5 @@ export interface SafeAreaViewProps extends ViewProps {
 }
 
 export const SafeAreaView: React.ComponentClass<SafeAreaViewProps>;
+
+export const NavigationContext: React.Context<NavigationScreenProp<NavigationRoute>>;
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 3409bbd32d..777a8fa9f3 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -42,6 +42,7 @@ import {
     HeaderBackButton,
     Header,
     NavigationContainer,
+    NavigationContext,
     NavigationParams,
     NavigationPopAction,
     NavigationPopToTopAction,
@@ -436,7 +437,7 @@ class CustomTransitioner extends React.Component<CustomTransitionerProps, null>
             />
         );
     }
-    _render = (props: NavigationTransitionProps, prevProps?: NavigationTransitionProps): React.ReactElement<any> => {
+    _render = (props: NavigationTransitionProps, prevProps?: NavigationTransitionProps): React.ReactElement => {
         return (
             <View />
         );
@@ -681,3 +682,14 @@ const ViewWithNavigationEvents = (
     onDidBlur={console.log}
   />
 );
+
+// Test NavigationContext
+const componentWithNavigationContext = (
+    <NavigationContext.Consumer>
+        {
+            navigationContext => (
+                <NavigationEvents navigation={navigationContext} />
+            )
+        }
+    </NavigationContext.Consumer>
+);
diff --git a/types/react-navigation/v1/index.d.ts b/types/react-navigation/v1/index.d.ts
index 8e7940c6ce..d51e0d482f 100644
--- a/types/react-navigation/v1/index.d.ts
+++ b/types/react-navigation/v1/index.d.ts
@@ -289,17 +289,17 @@ export interface NavigationStackViewConfig {
 
 export interface NavigationStackScreenOptions {
   title?: string;
-  header?: (React.ReactElement<any> | ((headerProps: HeaderProps) => React.ReactElement<any>)) | null;
+  header?: (React.ReactElement | ((headerProps: HeaderProps) => React.ReactElement)) | null;
   headerTransparent?: boolean;
-  headerTitle?: string | React.ReactElement<any>;
+  headerTitle?: string | React.ReactElement;
   headerTitleStyle?: StyleProp<TextStyle>;
   headerTintColor?: string;
-  headerLeft?: React.ReactElement<any>;
+  headerLeft?: React.ReactElement;
   headerBackTitle?: string | null;
   headerTruncatedBackTitle?: string;
   headerBackTitleStyle?: StyleProp<TextStyle>;
   headerPressColorAndroid?: string;
-  headerRight?: React.ReactElement<any>;
+  headerRight?: React.ReactElement;
   headerStyle?: StyleProp<ViewStyle>;
   headerBackground?: React.ReactNode | React.ReactType;
   gesturesEnabled?: boolean;
@@ -367,16 +367,12 @@ export interface TabScene {
 export interface NavigationTabScreenOptions {
   title?: string;
   tabBarIcon?:
-    React.ReactElement<any>
-    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-      any
-    > | null));
+    React.ReactElement
+    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement | null));
   tabBarLabel?:
     string
-    | React.ReactElement<any>
-    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-      any
-    > | string | null));
+    | React.ReactElement
+    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement | string | null));
   tabBarVisible?: boolean;
   tabBarTestIDProps?: { testID?: string, accessibilityLabel?: string };
   tabBarOnPress?: (options: {
@@ -388,16 +384,12 @@ export interface NavigationTabScreenOptions {
 export interface NavigationDrawerScreenOptions {
   title?: string;
   drawerIcon?:
-    React.ReactElement<any>
-    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-      any
-    > | null));
+    React.ReactElement
+    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement | null));
   drawerLabel?:
     string
-    | React.ReactElement<any>
-    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-      any
-    > | null));
+    | React.ReactElement
+    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement | null));
 }
 
 export interface NavigationRouteConfigMap {
@@ -557,7 +549,7 @@ export type NavigationAnimationSetter = (
   lastState: NavigationState
 ) => void;
 
-export type NavigationSceneRenderer = () => (React.ReactElement<any> | null);
+export type NavigationSceneRenderer = () => (React.ReactElement | null);
 
 export type NavigationStyleInterpolator = (
   props: NavigationSceneRendererProps
@@ -737,7 +729,7 @@ export interface TabBarTopProps {
     scene: TabScene,
     jumpToIndex: (index: number) => void,
   }) => void;
-  renderIcon: (scene: TabScene) => React.ReactElement<any>;
+  renderIcon: (scene: TabScene) => React.ReactElement;
   labelStyle?: TextStyle;
   iconStyle?: ViewStyle;
 }
diff --git a/types/react-navigation/v1/react-navigation-tests.tsx b/types/react-navigation/v1/react-navigation-tests.tsx
index b00b0a27fc..4bd46327e3 100644
--- a/types/react-navigation/v1/react-navigation-tests.tsx
+++ b/types/react-navigation/v1/react-navigation-tests.tsx
@@ -366,7 +366,7 @@ class CustomTransitioner extends React.Component<CustomTransitionerProps, null>
             />
         );
     }
-    _render = (props: NavigationTransitionProps, prevProps: NavigationTransitionProps): React.ReactElement<any> => {
+    _render = (props: NavigationTransitionProps, prevProps: NavigationTransitionProps): React.ReactElement => {
         return (
             <View />
         );
diff --git a/types/react-navigation/v2/index.d.ts b/types/react-navigation/v2/index.d.ts
index 85b42444b1..d17a8324fa 100644
--- a/types/react-navigation/v2/index.d.ts
+++ b/types/react-navigation/v2/index.d.ts
@@ -425,24 +425,24 @@ export interface NavigationSwitchRouterConfig {
 export interface NavigationStackScreenOptions {
   title?: string;
   header?:
-  | React.ReactElement<any>
-  | ((headerProps: HeaderProps) => React.ReactElement<any>)
+  | React.ReactElement
+  | ((headerProps: HeaderProps) => React.ReactElement)
   | null;
   headerTransparent?: boolean;
-  headerTitle?: string | React.ReactElement<any>;
+  headerTitle?: string | React.ReactElement;
   headerTitleStyle?: StyleProp<TextStyle>;
   headerTitleAllowFontScaling?: boolean;
   headerTintColor?: string;
   headerLeft?:
-  | React.ReactElement<any>
-  | ((backButtonProps: HeaderBackButtonProps) => React.ReactElement<any>)
+  | React.ReactElement
+  | ((backButtonProps: HeaderBackButtonProps) => React.ReactElement)
   | null;
   headerBackTitle?: string | null;
-  headerBackImage?: React.ReactElement<any>;
+  headerBackImage?: React.ReactElement;
   headerTruncatedBackTitle?: string;
   headerBackTitleStyle?: StyleProp<TextStyle>;
   headerPressColorAndroid?: string;
-  headerRight?: React.ReactElement<any> | null;
+  headerRight?: React.ReactElement | null;
   headerStyle?: StyleProp<ViewStyle>;
   headerForceInset?: HeaderForceInset;
   headerBackground?: React.ReactNode | React.ReactType;
@@ -534,16 +534,16 @@ export interface TabScene {
 interface NavigationTabScreenOptionsBase {
   title?: string;
   tabBarIcon?:
-  | React.ReactElement<any>
+  | React.ReactElement
   | ((
     options: { tintColor: string | null; focused: boolean; horizontal: boolean }
-  ) => React.ReactElement<any> | null);
+  ) => React.ReactElement | null);
   tabBarLabel?:
   | string
-  | React.ReactElement<any>
+  | React.ReactElement
   | ((
     options: { tintColor: string | null; focused: boolean }
-  ) => React.ReactElement<any> | string | null);
+  ) => React.ReactElement | string | null);
   tabBarVisible?: boolean;
   tabBarTestIDProps?: { testID?: string; accessibilityLabel?: string };
 }
@@ -573,16 +573,16 @@ export type DrawerLockMode = 'unlocked' | 'locked-closed' | 'locked-open';
 export interface NavigationDrawerScreenOptions {
   title?: string;
   drawerIcon?:
-  | React.ReactElement<any>
+  | React.ReactElement
   | ((
     options: { tintColor: string | null; focused: boolean }
-  ) => React.ReactElement<any> | null);
+  ) => React.ReactElement | null);
   drawerLabel?:
   | string
-  | React.ReactElement<any>
+  | React.ReactElement
   | ((
     options: { tintColor: string | null; focused: boolean }
-  ) => React.ReactElement<any> | null);
+  ) => React.ReactElement | null);
   drawerLockMode?: DrawerLockMode;
 }
 
@@ -799,7 +799,7 @@ export type NavigationAnimationSetter = (
   lastState: NavigationState
 ) => void;
 
-export type NavigationSceneRenderer = () => React.ReactElement<any> | null;
+export type NavigationSceneRenderer = () => React.ReactElement | null;
 
 export type NavigationStyleInterpolator = (
   props: NavigationSceneRendererProps
@@ -1056,7 +1056,7 @@ export interface TabBarTopProps {
         jumpToIndex: (index: number) => void;
       }
     ) => void;
-  renderIcon: (scene: TabScene) => React.ReactElement<any>;
+  renderIcon: (scene: TabScene) => React.ReactElement;
   labelStyle?: TextStyle;
   iconStyle?: ViewStyle;
 }
diff --git a/types/react-navigation/v2/react-navigation-tests.tsx b/types/react-navigation/v2/react-navigation-tests.tsx
index aaa69bc35b..ca90efa3eb 100644
--- a/types/react-navigation/v2/react-navigation-tests.tsx
+++ b/types/react-navigation/v2/react-navigation-tests.tsx
@@ -426,7 +426,7 @@ class CustomTransitioner extends React.Component<CustomTransitionerProps, null>
             />
         );
     }
-    _render = (props: NavigationTransitionProps, prevProps?: NavigationTransitionProps): React.ReactElement<any> => {
+    _render = (props: NavigationTransitionProps, prevProps?: NavigationTransitionProps): React.ReactElement => {
         return (
             <View />
         );
diff --git a/types/react-overlays/lib/Dropdown.d.ts b/types/react-overlays/lib/Dropdown.d.ts
index ebd4c298af..8c5266435c 100644
--- a/types/react-overlays/lib/Dropdown.d.ts
+++ b/types/react-overlays/lib/Dropdown.d.ts
@@ -24,7 +24,7 @@ declare namespace Dropdown {
          * argument should spread through to an element containing _both_ the
          * menu and toggle in order to handle keyboard events for focus management.
          */
-        children(renderProps: DropdownRenderProps): React.ReactElement<any>;
+        children(renderProps: DropdownRenderProps): React.ReactElement;
 
         /**
          * Determines the direction and location of the Menu in relation to it's Toggle.
diff --git a/types/react-overlays/lib/DropdownMenu.d.ts b/types/react-overlays/lib/DropdownMenu.d.ts
index c4a9090dcc..13e8a7038b 100644
--- a/types/react-overlays/lib/DropdownMenu.d.ts
+++ b/types/react-overlays/lib/DropdownMenu.d.ts
@@ -18,7 +18,7 @@ declare namespace DropdownMenu {
          * A render prop that returns a Menu element. The `props`
          * argument should spread through to **a component that can accept a ref**.
          */
-        children(renderProps: DropdownMenuRenderProps): React.ReactElement<any>;
+        children(renderProps: DropdownMenuRenderProps): React.ReactElement;
 
         /**
          * Controls the visible state of the menu, generally this is
diff --git a/types/react-overlays/lib/DropdownToggle.d.ts b/types/react-overlays/lib/DropdownToggle.d.ts
index d2838e8fd1..723bd5d490 100644
--- a/types/react-overlays/lib/DropdownToggle.d.ts
+++ b/types/react-overlays/lib/DropdownToggle.d.ts
@@ -24,6 +24,6 @@ declare namespace DropdownToggle {
          */
         children(
             renderProps: DropdownToggleRenderProps
-        ): React.ReactElement<any>;
+        ): React.ReactElement;
     }
 }
diff --git a/types/react-overlays/lib/Overlay.d.ts b/types/react-overlays/lib/Overlay.d.ts
index c374846188..43b95353f7 100644
--- a/types/react-overlays/lib/Overlay.d.ts
+++ b/types/react-overlays/lib/Overlay.d.ts
@@ -47,7 +47,7 @@ declare namespace Overlay {
          * A render prop that returns an element to overlay and position. See
          * the [react-popper documentation](https://github.com/FezVrasta/react-popper#children) for more info.
          */
-        children(renderProps: OverlayRenderProps): React.ReactElement<any>;
+        children(renderProps: OverlayRenderProps): React.ReactElement;
 
         /**
          * A set of popper options and props passed directly to react-popper's Popper component.
diff --git a/types/react-paginate/index.d.ts b/types/react-paginate/index.d.ts
index d66309d489..626f459fc5 100644
--- a/types/react-paginate/index.d.ts
+++ b/types/react-paginate/index.d.ts
@@ -7,12 +7,13 @@
 //                 Yasunori Ohoka <https://github.com/yasupeke>
 //                 Shingo Sato <https://github.com/sugarshin>
 //                 SPWizard01 <https://github.com/SPWizard01>
+//                 Kevin Rambaud <https://github.com/kevinrambaud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 import * as React from 'react';
 
-interface ReactPaginateProps {
+export interface ReactPaginateProps {
     /**
      * The total number of pages.
      */
diff --git a/types/react-paginate/v5/index.d.ts b/types/react-paginate/v5/index.d.ts
index 83a03ac838..7529a6b12f 100644
--- a/types/react-paginate/v5/index.d.ts
+++ b/types/react-paginate/v5/index.d.ts
@@ -5,12 +5,13 @@
 //                 pegel03 <https://github.com/pegel03>
 //                 Simon Archer <https://github.com/archy-bold>
 //                 Yasunori Ohoka <https://github.com/yasupeke>
+//                 Kevin Rambaud <https://github.com/kevinrambaud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 import * as React from 'react';
 
-interface ReactPaginateProps {
+export interface ReactPaginateProps {
     /**
      * The total number of pages.
      */
diff --git a/types/react-panelgroup/index.d.ts b/types/react-panelgroup/index.d.ts
index 4207d8e61d..79271de2ce 100644
--- a/types/react-panelgroup/index.d.ts
+++ b/types/react-panelgroup/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-panelgroup 1.0
-// Project: https://github.com/DanFessler/react-panelgroup
+// Project: https://github.com/DanFessler/react-panelgroup, http://www.danfessler.com
 // Definitions by: Quentin Golsteyn <https://github.com/qgolsteyn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.0
diff --git a/types/react-places-autocomplete/index.d.ts b/types/react-places-autocomplete/index.d.ts
index 568a0db0ca..dffcbf29f8 100644
--- a/types/react-places-autocomplete/index.d.ts
+++ b/types/react-places-autocomplete/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-places-autocomplete 7.2
-// Project: https://github.com/hibiken/react-places-autocomplete/
+// Project: https://github.com/hibiken/react-places-autocomplete/, https://github.com/kenny-hibino/react-places-autocomplete
 // Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>
 //                 Andrew Makarov <https://github.com/r3nya>
 //                 Nokky Goren <https://github.com/ApeNox>
diff --git a/types/react-popover/index.d.ts b/types/react-popover/index.d.ts
index a7bc435d2e..1d899dba16 100644
--- a/types/react-popover/index.d.ts
+++ b/types/react-popover/index.d.ts
@@ -32,7 +32,7 @@ declare namespace Popover {
         tipSize?: number;
         className?: string;
         style?: React.CSSProperties;
-        target?: React.ReactElement<any>;
+        target?: React.ReactElement;
         appendTarget?: Element;
     }
 }
diff --git a/types/react-portal/index.d.ts b/types/react-portal/index.d.ts
index 5faff72d87..af35fe4812 100644
--- a/types/react-portal/index.d.ts
+++ b/types/react-portal/index.d.ts
@@ -25,7 +25,7 @@ export interface PortalWithStateProps extends React.Props<any> {
     children: (params: PortalFunctionParams) => React.ReactNode;
     node?: Element | null;
     defaultOpen?: boolean;
-    openByClickOn?: React.ReactElement<any>;
+    openByClickOn?: React.ReactElement;
     closeOnEsc?: boolean;
     closeOnOutsideClick?: boolean;
     onOpen?(): void;
diff --git a/types/react-redux-epic/client.d.ts b/types/react-redux-epic/client.d.ts
index 54535f59ec..a22cc2072a 100644
--- a/types/react-redux-epic/client.d.ts
+++ b/types/react-redux-epic/client.d.ts
@@ -2,6 +2,6 @@ import * as React from 'react';
 import { Observable } from 'rxjs/Observable';
 
 export function render(
-    element: React.ReactElement<any>,
+    element: React.ReactElement,
     container: Element
 ): Observable<undefined>;
diff --git a/types/react-redux-epic/index.d.ts b/types/react-redux-epic/index.d.ts
index 948cd30c86..5e4302e257 100644
--- a/types/react-redux-epic/index.d.ts
+++ b/types/react-redux-epic/index.d.ts
@@ -18,6 +18,6 @@ export function wrapRootEpic<T extends Action, S, D, O extends T>(
 ): Epic<T, S, D, O>;
 
 export function renderToString(
-    element: React.ReactElement<any>,
+    element: React.ReactElement,
     wrappedEpic: Epic<any, any>
 ): Observable<{ markup: string }>;
diff --git a/types/react-relay/index.d.ts b/types/react-relay/index.d.ts
index 08e4343e42..ec51291e30 100644
--- a/types/react-relay/index.d.ts
+++ b/types/react-relay/index.d.ts
@@ -1,11 +1,12 @@
 // Type definitions for react-relay 1.3
-// Project: https://github.com/facebook/relay
+// Project: https://github.com/facebook/relay, https://facebook.github.io/relay
 // Definitions by: Johannes Schickling <https://github.com/graphcool>
 //                 Matt Martin <https://github.com/voxmatt>
 //                 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>
+//                 Matt Krick <https://github.com/mattkrick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.9
 
@@ -94,7 +95,7 @@ export interface QueryRendererProps<T extends RelayRuntimeTypes.OperationBase =
     dataFrom?: "NETWORK_ONLY"|"STORE_THEN_NETWORK";
     environment: RelayRuntimeTypes.Environment;
     query?: RelayRuntimeTypes.GraphQLTaggedNode | null;
-    render(readyState: ReadyState<T["response"]>): React.ReactElement<any> | undefined | null;
+    render(readyState: ReadyState<T["response"]>): React.ReactElement | undefined | null;
     variables: T["variables"];
     rerunParamExperimental?: RelayRuntimeTypes.RerunParam;
 }
@@ -131,14 +132,14 @@ export interface PageInfo {
 }
 export interface ConnectionData {
     edges?: ReadonlyArray<any>;
-    pageInfo?: Partial<PageInfo>;
+    pageInfo?: Partial<PageInfo> | null;
 }
 export type RelayPaginationProp = RelayProp & {
     hasMore(): boolean;
     isLoading(): boolean;
     loadMore(
         pageSize: number,
-        callback: (error?: Error) => void,
+        callback?: ((error?: Error) => void) | null,
         options?: RefetchOptions
     ): RelayRuntimeTypes.Disposable | undefined | null;
     refetchConnection(
diff --git a/types/react-relay/test/react-relay-tests.tsx b/types/react-relay/test/react-relay-tests.tsx
index f19d2a818c..14461ab9e5 100644
--- a/types/react-relay/test/react-relay-tests.tsx
+++ b/types/react-relay/test/react-relay-tests.tsx
@@ -1,7 +1,7 @@
 // tslint:disable:interface-over-type-literal
 
 import * as React from "react";
-import { Environment, Network, RecordSource, Store, ConnectionHandler, FragmentReference } from "relay-runtime";
+import { Environment, Network, RecordSource, Store, ConnectionHandler } from "relay-runtime";
 
 import {
     graphql,
diff --git a/types/react-responsive/index.d.ts b/types/react-responsive/index.d.ts
index 0fa9978c8f..f44bd65c9e 100644
--- a/types/react-responsive/index.d.ts
+++ b/types/react-responsive/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-responsive 3.0
-// Project: https://github.com/contra/react-responsive
+// Project: http://github.com/contra/react-responsive
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 //                 Alec Hill <https://github.com/alechill>
 //                 Javier Gonzalez <https://github.com/xaviergonz>
diff --git a/types/react-router-config/index.d.ts b/types/react-router-config/index.d.ts
index 5ca3cfee1a..0dc1544ca6 100644
--- a/types/react-router-config/index.d.ts
+++ b/types/react-router-config/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-router-config 1.1
-// Project: https://github.com/ReactTraining/react-router/tree/master/packages/react-router-config
+// Project: https://github.com/ReactTraining/react-router/tree/master/packages/react-router-config, https://github.com/reacttraining/react-router
 // Definitions by: François Nguyen <https://github.com/lith-light-g>
 //                 John Reilly <https://github.com/johnnyreilly>
 //                 Phoenix He <https://github.com/NullMDR>
diff --git a/types/react-router-hash-link/index.d.ts b/types/react-router-hash-link/index.d.ts
index 9480f1aef0..2fd7d3d510 100644
--- a/types/react-router-hash-link/index.d.ts
+++ b/types/react-router-hash-link/index.d.ts
@@ -1,5 +1,5 @@
 // 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.)
+// Project: https://github.com/rafrex/react-router-hash-link
 // Definitions by: Sam Baeck <https://github.com/zoompie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-router-native/index.d.ts b/types/react-router-native/index.d.ts
index 3a450a1209..a4f3dd9e83 100644
--- a/types/react-router-native/index.d.ts
+++ b/types/react-router-native/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for React Router Native 4.2
-// Project: https://github.com/ReactTraining/react-router-native
+// Project: https://github.com/reacttraining/react-router
 // Definitions by: Eduard Zintz <https://github.com/ezintz>
 //                 Fernando Helwanger <https://github.com/fhelwanger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/react-router-navigation/index.d.ts b/types/react-router-navigation/index.d.ts
index 6accca7b3d..c9375c6d10 100644
--- a/types/react-router-navigation/index.d.ts
+++ b/types/react-router-navigation/index.d.ts
@@ -144,7 +144,7 @@ export class NavBar extends Component<CardSubViewProps, void> {
 }
 
 export interface NavigationComponentProps extends NavigationProps {
-    children?: Array<ReactElement<any>>;
+    children?: ReactElement[];
 }
 
 export class Navigation extends Component<NavigationComponentProps> {
@@ -163,7 +163,7 @@ export class Navigation extends Component<NavigationComponentProps> {
 export function Tab(props: TabProps): ReactElement<{}>;
 
 export interface TabBarComponentProps extends TabBarProps {
-    children?: Array<ReactElement<any>>;
+    children?: ReactElement[];
 }
 
 export class Tabs extends Component<
@@ -174,14 +174,14 @@ export class Tabs extends Component<
 > {
     props: TabBarComponentProps;
 
-    renderHeader: (sceneProps: TabSubViewProps) => ReactElement<any> | null;
+    renderHeader: (sceneProps: TabSubViewProps) => ReactElement | null;
 
-    renderFooter: (sceneProps: TabSubViewProps) => ReactElement<any> | null;
+    renderFooter: (sceneProps: TabSubViewProps) => ReactElement | null;
 
     renderTabBar: (
         sceneProps: TabSubViewProps,
         props: TabSubViewProps
-    ) => ReactElement<any> | null;
+    ) => ReactElement | null;
 
-    renderScene: (sceneProps: TabSubViewProps) => ReactElement<any> | null;
+    renderScene: (sceneProps: TabSubViewProps) => ReactElement | null;
 }
diff --git a/types/react-router-redux/index.d.ts b/types/react-router-redux/index.d.ts
index 7abdc88505..2f00d3dbd0 100644
--- a/types/react-router-redux/index.d.ts
+++ b/types/react-router-redux/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-router-redux 5.0
-// Project: https://github.com/ReactTraining/react-router/tree/master/packages/react-router-redux
+// Project: https://github.com/reactjs/react-router-redux
 // Definitions by: Huy Nguyen <https://github.com/huy-nguyen>
 //                 Shoya Tanaka <https://github.com/8398a7>
 //                 Mykolas <https://github.com/mykolas>
diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index eee1b15972..6ed1f19bd0 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -19,6 +19,7 @@
 //                 Maksim Sharipov <https://github.com/pret-a-porter>
 //                 Duong Tran <https://github.com/t49tran>
 //                 Ben Smith <https://github.com/8enSmith>
+//                 Wesley Tsai <https://github.com/wezleytsai>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -128,7 +129,7 @@ export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
 export function matchPath<Params extends { [K in keyof Params]?: string }>(pathname: string, props: string | RouteProps, parent?: match<Params> | null): match<Params> | null;
 
-export function generatePath(pattern: string, params?: { [paramName: string]: string | number | boolean }): string;
+export function generatePath(pattern: string, params?: { [paramName: string]: string | number | boolean | undefined }): 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/v2/lib/RouteUtils.d.ts b/types/react-router/v2/lib/RouteUtils.d.ts
index 7065056ff5..36f40e7a16 100644
--- a/types/react-router/v2/lib/RouteUtils.d.ts
+++ b/types/react-router/v2/lib/RouteUtils.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import Router from './Router';
 
-type E = React.ReactElement<any>;
+type E = React.ReactElement;
 export function isReactChildren(object: E | E[]): boolean;
 export function createRouteFromReactElement(element: E): Router.PlainRoute;
 export function createRoutesFromReactChildren(children: E | E[], parentRoute: Router.PlainRoute): Router.PlainRoute[];
diff --git a/types/react-router/v2/lib/Router.d.ts b/types/react-router/v2/lib/Router.d.ts
index 6611fa55a9..c0d897c938 100644
--- a/types/react-router/v2/lib/Router.d.ts
+++ b/types/react-router/v2/lib/Router.d.ts
@@ -88,7 +88,7 @@ declare namespace Router {
         route?: PlainRoute;
         routeParams?: R;
         routes?: PlainRoute[];
-        children?: React.ReactElement<any>;
+        children?: React.ReactElement;
     }
 
     interface RouterOnContext extends History {
diff --git a/types/react-scrollspy/index.d.ts b/types/react-scrollspy/index.d.ts
new file mode 100644
index 0000000000..89fe090474
--- /dev/null
+++ b/types/react-scrollspy/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for react-scrollspy 3.3
+// Project: https://github.com/makotot/react-scrollspy
+// Definitions by: Zhang Yi Jiang <https://github.com/ZhangYiJiang>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+export interface ScrollspyProps {
+    // Array of target element IDs
+    items: ReadonlyArray<string>;
+
+    // Class name that apply to the navigation element paired with the content element in viewport
+    currentClassName: string;
+
+    // Class name that apply to the navigation elements that have been scrolled past
+    scrolledPastClassName?: string;
+
+    // HTML tag for Scrollspy component if you want to use other than ul
+    componentTag?: string;
+
+    // Style attribute to be passed to the generated <ul /> element
+    style?: React.CSSProperties;
+
+    // Offset value that adjusts to determine the elements are in the viewport
+    offset?: number;
+
+    // Selector for the element of scrollable container that can be used with querySelector
+    rootEl?: string;
+
+    // Function to be executed when the active item has been updated
+    onUpdate?: (item: string) => void;
+}
+
+export default class Scrollspy extends React.Component<ScrollspyProps> {
+    // Add event listener of scrollspy.
+    onEvent(): void;
+
+    // Remove event listener of scrollspy.
+    offEvent(): void;
+}
diff --git a/types/react-scrollspy/react-scrollspy-tests.tsx b/types/react-scrollspy/react-scrollspy-tests.tsx
new file mode 100644
index 0000000000..e3466fcf17
--- /dev/null
+++ b/types/react-scrollspy/react-scrollspy-tests.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import Scrollspy from 'react-scrollspy';
+
+const items: string[] = ['section-1', 'section-2', 'section-3'];
+
+function TestComponent() {
+    return (
+        <div>
+            <div>
+                <section id="section-1">section 1</section>
+                <section id="section-2">section 2</section>
+                <section id="section-3">section 3</section>
+            </div>
+
+            <Scrollspy items={items} currentClassName="is-current">
+                <li><a href="#section-1">section 1</a></li>
+                <li><a href="#section-2">section 2</a></li>
+                <li><a href="#section-3">section 3</a></li>
+            </Scrollspy>
+        </div>
+    );
+}
diff --git a/types/react-scrollspy/tsconfig.json b/types/react-scrollspy/tsconfig.json
new file mode 100644
index 0000000000..5a817f213c
--- /dev/null
+++ b/types/react-scrollspy/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-scrollspy-tests.tsx"
+    ]
+}
diff --git a/types/react-scrollspy/tslint.json b/types/react-scrollspy/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/react-scrollspy/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/react-select/lib/components/Menu.d.ts b/types/react-select/lib/components/Menu.d.ts
index 387b538882..65dda94931 100644
--- a/types/react-select/lib/components/Menu.d.ts
+++ b/types/react-select/lib/components/Menu.d.ts
@@ -47,7 +47,7 @@ export function getMenuPlacement(args: PlacementArgs): MenuState;
 
 export type MenuProps<OptionType> = CommonProps<OptionType> & {
   /** The children to be rendered. */
-  children: ReactElement<any>,
+  children: ReactElement,
   /** Callback to update the portal after possible flip. */
   getPortalPlacement: (state: MenuState) => void,
   /** Props to be passed to the menu wrapper. */
diff --git a/types/react-select/lib/components/Option.d.ts b/types/react-select/lib/components/Option.d.ts
index 1075e6d069..d7d20ec325 100644
--- a/types/react-select/lib/components/Option.d.ts
+++ b/types/react-select/lib/components/Option.d.ts
@@ -4,9 +4,9 @@ import { colors, spacing } from '../theme';
 import { CommonProps, PropsWithStyles, InnerRef } from '../types';
 
 interface State {
-  /** Wether the option is disabled. */
+  /** Whether the option is disabled. */
   isDisabled: boolean;
-  /** Wether the option is focused. */
+  /** Whether the option is focused. */
   isFocused: boolean;
   /** Whether the option is selected. */
   isSelected: boolean;
diff --git a/types/react-select/lib/components/indicators.d.ts b/types/react-select/lib/components/indicators.d.ts
index 15df6d3748..6bf74d1ff5 100644
--- a/types/react-select/lib/components/indicators.d.ts
+++ b/types/react-select/lib/components/indicators.d.ts
@@ -16,7 +16,7 @@ export function DownChevron(props: any): any; // TODO svg type
 
 export type IndicatorProps<OptionType> = CommonProps<OptionType> & {
   /** The children to be rendered inside the indicator. */
-  children: ElementType<any>,
+  children: ElementType,
   /** Props that will be passed on to the children. */
   innerProps: any,
   /** The focused state of the select. */
diff --git a/types/react-simple-maps/index.d.ts b/types/react-simple-maps/index.d.ts
index e76c4e3f0d..49e392035d 100644
--- a/types/react-simple-maps/index.d.ts
+++ b/types/react-simple-maps/index.d.ts
@@ -1,10 +1,12 @@
 // Type definitions for react-simple-maps 0.12
 // Project: https://github.com/zcreativelabs/react-simple-maps#readme
 // Definitions by: Novikov Mihail <https://github.com/thepocp>
+//                 Andrej Mihajlov <https://github.com/pronebird>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 import * as React from 'react';
+import { GeoProjection } from 'd3-geo';
 
 export type Point = [number, number];
 
@@ -19,17 +21,21 @@ export interface Line {
     };
 }
 
+export interface ProjectionConfig {
+    scale: number;
+    xOffset: number;
+    yOffset: number;
+    rotation: [number, number, number];
+    precision: number;
+}
+
+export type ProjectionFunction = (width: number, height: number, config: ProjectionConfig) => GeoProjection;
+
 export interface ComposableMapProps {
     width?: number;
     height?: number;
-    projection?: string | (() => void);
-    projectionConfig?: {
-        scale?: number;
-        xOffset?: number;
-        yOffset?: number;
-        rotation?: number[];
-        precision?: number;
-    };
+    projection?: string | ProjectionFunction;
+    projectionConfig?: Partial<ProjectionConfig>;
     style?: React.CSSProperties;
     defs?: SVGDefsElement;
     className?: string;
@@ -68,7 +74,7 @@ export interface ZoomableGroupProps {
 export interface GeographiesProps {
     disableOptimization?: boolean;
     geography?: string | { [key: string]: any } | string[];
-    children?: (geographies: object[], projection: (point: Point) => void) => void;
+    children?: (geographies: object[], projection: GeoProjection) => void;
 }
 
 export interface GeographyProps {
@@ -76,7 +82,7 @@ export interface GeographyProps {
     precision?: number;
     round?: boolean;
     geography?: object;
-    projection?: (point: Point) => void;
+    projection?: GeoProjection;
     tabable?: boolean;
     style?: {
         default?: React.CSSProperties;
diff --git a/types/react-sortable-hoc/index.d.ts b/types/react-sortable-hoc/index.d.ts
index 6a89c766e5..fa07d3a60c 100644
--- a/types/react-sortable-hoc/index.d.ts
+++ b/types/react-sortable-hoc/index.d.ts
@@ -36,7 +36,7 @@ export interface SortEnd {
 
 export type SortEndHandler = (sort: SortEnd, event: SortEvent) => void;
 
-export type ContainerGetter = (element: React.ReactElement<any>) => HTMLElement;
+export type ContainerGetter = (element: React.ReactElement) => HTMLElement;
 
 export interface Dimensions {
     width: number;
diff --git a/types/react-sortable-tree/index.d.ts b/types/react-sortable-tree/index.d.ts
index 0c0cc075e2..c63efb809f 100644
--- a/types/react-sortable-tree/index.d.ts
+++ b/types/react-sortable-tree/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-sortable-tree 0.3
-// Project: https://fritz-c.github.io/react-sortable-tree
+// Project: https://frontend-collective.github.io/react-sortable-tree
 // Definitions by: Wouter Hardeman <https://github.com/wouterhardeman>
 //                 Jovica Zoric <https://github.com/jzoric>
 //                 Kevin Perrine <https://github.com/kevinsperrine>
diff --git a/types/react-sticky-box/index.d.ts b/types/react-sticky-box/index.d.ts
index 50315b95e5..f538b6e454 100644
--- a/types/react-sticky-box/index.d.ts
+++ b/types/react-sticky-box/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-sticky-box 0.7
-// Project: https://github.com/codecks-io/react-sticky-box
+// Project: https://github.com/codecks-io/react-sticky-box, https://github.com/danielberndt/react-sticky-box
 // Definitions by: Konstantin Lebedev <https://github.com/koss-lebedev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-sticky-el/index.d.ts b/types/react-sticky-el/index.d.ts
index da831c9d61..d7bfba0ec8 100644
--- a/types/react-sticky-el/index.d.ts
+++ b/types/react-sticky-el/index.d.ts
@@ -41,7 +41,7 @@ declare namespace Sticky {
          *
          * Defaults to 'div'.
          */
-        wrapperCmp?: keyof React.ReactHTML | React.ReactElement<any>;
+        wrapperCmp?: keyof React.ReactHTML | React.ReactElement;
 
         /**
          * Anything that can be used by React.createElement. Used for holder
diff --git a/types/react-sticky/index.d.ts b/types/react-sticky/index.d.ts
index 0bc4e2c0f2..8920092e1d 100644
--- a/types/react-sticky/index.d.ts
+++ b/types/react-sticky/index.d.ts
@@ -22,7 +22,7 @@ export interface StickyChildArgs {
 }
 
 export interface StickyProps {
-    children: (args: StickyChildArgs) => React.ReactElement<any>;
+    children: (args: StickyChildArgs) => React.ReactElement;
     relative?: boolean;
     isActive?: boolean;
     className?: string;
diff --git a/types/react-svg-pan-zoom/index.d.ts b/types/react-svg-pan-zoom/index.d.ts
index c2636a8d6d..71eca78b0d 100644
--- a/types/react-svg-pan-zoom/index.d.ts
+++ b/types/react-svg-pan-zoom/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-svg-pan-zoom 2.5
-// Project: https://github.com/chrvadala/react-svg-pan-zoom#readme
+// Project: https://github.com/chrvadala/react-svg-pan-zoom#readme, https://chrvadala.github.io/react-svg-pan-zoom
 // Definitions by: Huy Nguyen <https://github.com/huy-nguyen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-swipe/index.d.ts b/types/react-swipe/index.d.ts
index 8b5c2d2a2d..dfa1c6abd5 100644
--- a/types/react-swipe/index.d.ts
+++ b/types/react-swipe/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for react-swipe 5.0
+// Type definitions for react-swipe 6.0
 // Project: https://github.com/voronianski/react-swipe
-// Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>
+// Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>, Ammar Alakkad <https://github.com/AAlakkad>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -26,6 +26,7 @@ declare namespace ReactSwipe {
     interface Props {
         id?: string;
         swipeOptions?: SwipeOptions;
+        childCount?: number;
         style?: Style;
         className?: string;
     }
diff --git a/types/react-swipe/react-swipe-tests.tsx b/types/react-swipe/react-swipe-tests.tsx
index 2948141ee6..2da11d0119 100644
--- a/types/react-swipe/react-swipe-tests.tsx
+++ b/types/react-swipe/react-swipe-tests.tsx
@@ -53,6 +53,7 @@ class ReactSwipeTest extends React.PureComponent {
                 id="test-carousel"
                 swipeOptions={swipeOptions}
                 style={style}
+                childCount={3}
                 ref={(swipeComponent) => { this.swipeComponent = swipeComponent; }}
             >
                 <div>PANE 1</div>
diff --git a/types/react-swipeable/index.d.ts b/types/react-swipeable/index.d.ts
index 643d053b40..fc6326deae 100644
--- a/types/react-swipeable/index.d.ts
+++ b/types/react-swipeable/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-swipeable 4.2
-// Project: https://www.npmjs.com/package/react-swipeable
+// Project: https://github.com/dogfessional/react-swipeable
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 //                 Konstantin Vasilev <https://github.com/mctep>
 //                 Hiroki Horiuchi <https://github.com/horiuchi>
diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index b4b2d3d07f..6aad7c3c8c 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -14,7 +14,7 @@ export type AccessorFunction<D = any> = (row: D) => any;
 export type Accessor<D = any> = string | string[] | AccessorFunction<D>;
 export type Aggregator = (values: any, rows: any) => any;
 export type TableCellRenderer = ((cellInfo: CellInfo, column: any) => React.ReactNode) | React.ReactNode;
-export type FilterRender = (params: { column: Column, filter: any, onChange: ReactTableFunction, key?: string }) => React.ReactElement<any>;
+export type FilterRender = (params: { column: Column, filter: any, onChange: ReactTableFunction, key?: string }) => React.ReactElement;
 export type PivotRenderer = ((cellInfo: CellInfo) => React.ReactNode) | (() => any) | string | React.ReactNode;
 
 export type ComponentPropsGetter0 = (finalState: any, rowInfo: undefined, column: undefined, instance?: any) => object | undefined;
@@ -187,7 +187,7 @@ export interface TableProps<D = any, ResolvedData = D> extends
     /** Control callback for functional rendering */
     children: (
         state: FinalState<ResolvedData>,
-        makeTable: () => React.ReactElement<any>,
+        makeTable: () => React.ReactElement,
         instance: Instance<ResolvedData>
     ) => React.ReactNode;
 }
diff --git a/types/react-tabs/index.d.ts b/types/react-tabs/index.d.ts
index 013973e8df..0eabf0c613 100644
--- a/types/react-tabs/index.d.ts
+++ b/types/react-tabs/index.d.ts
@@ -1,13 +1,18 @@
-// Type definitions for react-tabs 2.3.0
+// Type definitions for react-tabs 2.3
 // Project: https://github.com/reactjs/react-tabs/
-// Definitions by: Yuu Igarashi <https://github.com/yu-i9/>, Daniel Tschinder <https://github.com/danez>, Ummon Karpe <https://github.com/Equationist>
+// Definitions by: Yuu Igarashi <https://github.com/yu-i9>
+//                 Daniel Tschinder <https://github.com/danez>
+//                 Ummon Karpe <https://github.com/Equationist>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import * as React from 'react';
+import * as React from "react";
 
-export interface TabsProps {
-    className?: string | Array<string> | { [name: string]: boolean; };
+type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+
+export interface TabsProps
+    extends Omit<React.HTMLProps<HTMLDivElement>, "className" | "onSelect"> {
+    className?: string | string[] | { [name: string]: boolean };
     defaultFocus?: boolean;
     defaultIndex?: number;
     disabledTabClassName?: string;
@@ -19,27 +24,30 @@ export interface TabsProps {
     selectedTabPanelClassName?: string;
 }
 
-export interface TabListProps {
-    className?: string | Array<string> | { [name: string]: boolean; };
+export interface TabListProps
+    extends Omit<React.HTMLProps<HTMLUListElement>, "className"> {
+    className?: string | string[] | { [name: string]: boolean };
 }
 
-export interface TabProps {
-    className?: string | Array<string> | { [name: string]: boolean; };
+export interface TabProps
+    extends Omit<React.HTMLProps<HTMLLIElement>, "className" | "tabIndex"> {
+    className?: string | string[] | { [name: string]: boolean };
     disabled?: boolean;
     disabledClassName?: string;
     selectedClassName?: string;
     tabIndex?: string;
 }
 
-export interface TabPanelProps {
-    className?: string | Array<string> | { [name: string]: boolean; };
+export interface TabPanelProps
+    extends Omit<React.HTMLProps<HTMLDivElement>, "className"> {
+    className?: string | string[] | { [name: string]: boolean };
     forceRender?: boolean;
     selectedClassName?: string;
 }
 
-export declare class Tabs extends React.Component<TabsProps> { }
-export declare class TabList extends React.Component<TabListProps> { }
-export declare class Tab extends React.Component<TabProps> { }
-export declare class TabPanel extends React.Component<TabPanelProps> { }
+export declare class Tabs extends React.Component<TabsProps> {}
+export declare class TabList extends React.Component<TabListProps> {}
+export declare class Tab extends React.Component<TabProps> {}
+export declare class TabPanel extends React.Component<TabPanelProps> {}
 
 export declare function resetIdCounter(): void;
diff --git a/types/react-tabs/react-tabs-tests.ts b/types/react-tabs/react-tabs-tests.ts
index a7b86de6e0..7488a8a55a 100644
--- a/types/react-tabs/react-tabs-tests.ts
+++ b/types/react-tabs/react-tabs-tests.ts
@@ -9,7 +9,8 @@ import {
     TabProps,
     TabPanel,
     TabPanelProps,
-    resetIdCounter } from "react-tabs";
+    resetIdCounter
+} from "react-tabs";
 
 resetIdCounter();
 
@@ -26,15 +27,18 @@ class TestApp extends React.Component {
     }
 
     render() {
-        return React.createElement(Tabs, {onSelect: this.onSelect, selectedIndex: 1},
-                   React.createElement(TabList, {className: "test-class"},
-                       React.createElement(Tab, {disabled: true}, "Tab1"),
-                       React.createElement(Tab, {selectedClassName: "active"}, "Tab2"),
-                       React.createElement(Tab, {}, "Tab3")),
-                   React.createElement(TabPanel, {}, React.createElement("h2", {}, "Content1")),
-                   React.createElement(TabPanel, {}, React.createElement("h2", {}, "Content2")),
-                   React.createElement(TabPanel, {}, React.createElement("h2", {}, "Content3")));
+        return React.createElement(Tabs, { onSelect: this.onSelect, selectedIndex: 1, defaultFocus: true, name: 'Tabs', autoFocus: true },
+            React.createElement(TabList, { className: "test-class" },
+                React.createElement(Tab, { disabled: true }, "Tab1"),
+                React.createElement(Tab, { selectedClassName: "active" }, "Tab2"),
+                React.createElement(Tab, {}, "Tab3")),
+            React.createElement(TabPanel, {}, React.createElement("h2", {}, "Content1")),
+            React.createElement(TabPanel, {}, React.createElement("h2", {}, "Content2")),
+            React.createElement(TabPanel, {}, React.createElement("h2", {}, "Content3")));
     }
 }
 
-ReactDOM.render(React.createElement(TestApp, {}), document.getElementById("test-app"));
+ReactDOM.render(
+    React.createElement(TestApp, {}),
+    document.getElementById("test-app")
+);
diff --git a/types/react-tabs/tslint.json b/types/react-tabs/tslint.json
index a41bf5d19a..3d429fc065 100644
--- a/types/react-tabs/tslint.json
+++ b/types/react-tabs/tslint.json
@@ -1,79 +1,12 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
         "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
         "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
         "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
         "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
         "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
         "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "void-return": false
     }
 }
diff --git a/types/react-test-renderer/index.d.ts b/types/react-test-renderer/index.d.ts
index c147d5c190..9d2b53db40 100644
--- a/types/react-test-renderer/index.d.ts
+++ b/types/react-test-renderer/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for react-test-renderer 16.0
+// Type definitions for react-test-renderer 16.8
 // Project: https://facebook.github.io/react/
 // Definitions by: Arvitaly <https://github.com/arvitaly>
 //                 Lochbrunner <https://github.com/lochbrunner>
 //                 John Reilly <https://github.com/johnnyreilly>
 //                 John Gozde <https://github.com/jgoz>
+//                 Jessica Franco <https://github.com/Jessidhia>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -41,12 +42,35 @@ export interface ReactTestInstance {
 export interface ReactTestRenderer {
     toJSON(): null | ReactTestRendererJSON;
     toTree(): null | ReactTestRendererTree;
-    unmount(nextElement?: ReactElement<any>): void;
-    update(nextElement: ReactElement<any>): void;
+    unmount(nextElement?: ReactElement): void;
+    update(nextElement: ReactElement): void;
     getInstance(): null | ReactTestInstance;
     root: ReactTestInstance;
 }
 export interface TestRendererOptions {
-    createNodeMock(element: ReactElement<any>): any;
+    createNodeMock(element: ReactElement): any;
+}
+export function create(nextElement: ReactElement, options?: TestRendererOptions): ReactTestRenderer;
+
+/**
+ * Wrap any code rendering and triggering updates to your components into `act()` calls.
+ *
+ * Ensures that the behavior in your tests matches what happens in the browser
+ * more closely by executing pending `useEffect`s before returning. This also
+ * reduces the amount of re-renders done.
+ *
+ * @param callback A synchronous, void callback that will execute as a single, complete React commit.
+ *
+ * @see https://reactjs.org/blog/2019/02/06/react-v16.8.0.html#testing-hooks
+ */
+// the "void | undefined" is here to forbid any sneaky "Promise" returns.
+// the actual return value is always a "DebugPromiseLike",
+// but having an "| {}" makes it harder to accidentally use.
+export function act(callback: () => void | undefined): DebugPromiseLike | {};
+
+// Intentionally doesn't extend PromiseLike<never>.
+// Ideally this should be as hard to accidentally use as possible.
+export interface DebugPromiseLike {
+    // the actual then() in here is 0-ary, but that doesn't count as a PromiseLike.
+    then(onfulfilled: (value: never) => never, onrejected: (reason: never) => never): never;
 }
-export function create(nextElement: ReactElement<any>, options?: TestRendererOptions): ReactTestRenderer;
diff --git a/types/react-test-renderer/react-test-renderer-tests.ts b/types/react-test-renderer/react-test-renderer-tests.ts
index 83dc510e2b..f8bcb14d2d 100644
--- a/types/react-test-renderer/react-test-renderer-tests.ts
+++ b/types/react-test-renderer/react-test-renderer-tests.ts
@@ -1,11 +1,11 @@
-import * as React from "react";
-import { create, ReactTestInstance } from "react-test-renderer";
+import React = require("react");
+import { act, create, ReactTestInstance } from "react-test-renderer";
 import { createRenderer } from 'react-test-renderer/shallow';
 
 class TestComponent extends React.Component { }
 
 const renderer = create(React.createElement("div"), {
-    createNodeMock: (el: React.ReactElement<any>) => {
+    createNodeMock: (el: React.ReactElement) => {
         return {};
     }
 });
@@ -66,3 +66,12 @@ const shallowRenderer = createRenderer();
 shallowRenderer.render(component);
 shallowRenderer.getRenderOutput();
 shallowRenderer.getMountedInstance();
+
+// Only synchronous, void callbacks are acceptable for act()
+act(() => {});
+// $ExpectError
+act(async () => {});
+// $ExpectError
+act(() => null);
+// $ExpectError
+Promise.resolve(act(() => {}));
diff --git a/types/react-test-renderer/shallow/index.d.ts b/types/react-test-renderer/shallow/index.d.ts
index f51fa1e355..2c5fda1be6 100644
--- a/types/react-test-renderer/shallow/index.d.ts
+++ b/types/react-test-renderer/shallow/index.d.ts
@@ -8,15 +8,15 @@ export interface ShallowRenderer {
     /**
      * After `shallowRenderer.render()` has been called, returns shallowly rendered output.
      */
-    getRenderOutput<E extends ReactElement<any>>(): E;
+    getRenderOutput<E extends ReactElement>(): E;
     /**
      * After `shallowRenderer.render()` has been called, returns shallowly rendered output.
      */
-    getRenderOutput(): ReactElement<any>;
+    getRenderOutput(): ReactElement;
     /**
      * Similar to `ReactDOM.render` but it doesn't require DOM and only renders a single level deep.
      */
-    render(element: ReactElement<any>, context?: any): void;
+    render(element: ReactElement, context?: any): void;
     unmount(): void;
 }
 
diff --git a/types/react-test-renderer/v15/index.d.ts b/types/react-test-renderer/v15/index.d.ts
index 9c65a34140..ddb8adb466 100644
--- a/types/react-test-renderer/v15/index.d.ts
+++ b/types/react-test-renderer/v15/index.d.ts
@@ -8,8 +8,8 @@ import { ReactElement } from "react";
 
 export interface ReactTestInstance {
     toJSON(): ReactTestRendererJSON;
-    unmount(nextElement?: ReactElement<any>): void;
-    update(nextElement: ReactElement<any>): void;
+    unmount(nextElement?: ReactElement): void;
+    update(nextElement: ReactElement): void;
     getInstance(): any;
 }
 export interface ReactTestRendererJSON {
@@ -19,7 +19,7 @@ export interface ReactTestRendererJSON {
     $$typeof?: any;
 }
 export interface TestRendererOptions {
-    createNodeMock(element: ReactElement<any>): any;
+    createNodeMock(element: ReactElement): any;
 }
 // https://github.com/facebook/react/blob/master/src/renderers/testing/ReactTestMount.js#L155
-export function create(nextElement: ReactElement<any>, options?: TestRendererOptions): ReactTestInstance;
+export function create(nextElement: ReactElement, options?: TestRendererOptions): ReactTestInstance;
diff --git a/types/react-test-renderer/v15/react-test-renderer-tests.ts b/types/react-test-renderer/v15/react-test-renderer-tests.ts
index 810fdad407..fcdbd72249 100644
--- a/types/react-test-renderer/v15/react-test-renderer-tests.ts
+++ b/types/react-test-renderer/v15/react-test-renderer-tests.ts
@@ -3,7 +3,7 @@ import { create } from "react-test-renderer";
 import { createRenderer } from 'react-test-renderer/shallow';
 
 const tree = create(React.createElement("div"), {
-    createNodeMock: (el: React.ReactElement<any>) => {
+    createNodeMock: (el: React.ReactElement) => {
         return {};
     }
 }).toJSON();
diff --git a/types/react-test-renderer/v15/shallow/index.d.ts b/types/react-test-renderer/v15/shallow/index.d.ts
index 493ad4a777..190e1b56a6 100644
--- a/types/react-test-renderer/v15/shallow/index.d.ts
+++ b/types/react-test-renderer/v15/shallow/index.d.ts
@@ -4,15 +4,15 @@ export interface ShallowRenderer {
     /**
      * After `shallowRenderer.render()` has been called, returns shallowly rendered output.
      */
-    getRenderOutput<E extends ReactElement<any>>(): E;
+    getRenderOutput<E extends ReactElement>(): E;
     /**
      * After `shallowRenderer.render()` has been called, returns shallowly rendered output.
      */
-    getRenderOutput(): ReactElement<any>;
+    getRenderOutput(): ReactElement;
     /**
      * Similar to `ReactDOM.render` but it doesn't require DOM and only renders a single level deep.
      */
-    render(element: ReactElement<any>, context?: any): void;
+    render(element: ReactElement, context?: any): void;
     unmount(): void;
 }
 
diff --git a/types/react-tether/index.d.ts b/types/react-tether/index.d.ts
index 8268550eb5..bf272c035b 100644
--- a/types/react-tether/index.d.ts
+++ b/types/react-tether/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-tether 0.5
-// Project: https://github.com/souporserious/react-tether
+// Project: https://github.com/danreeves/react-tether
 // Definitions by: Ryan Price <https://github.com/ryprice>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-text-mask/index.d.ts b/types/react-text-mask/index.d.ts
index 09c28bdc68..1b29683ea9 100644
--- a/types/react-text-mask/index.d.ts
+++ b/types/react-text-mask/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-text-mask 5.4
-// Project: https://github.com/text-mask/text-mask
+// Project: https://github.com/text-mask/text-mask/tree/master/react
 // Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>
 //                 Deividi Cavarzan <https://github.com/cavarzan>
 //                 Artem Lyubchuk <https://github.com/needpower>
diff --git a/types/react-toastify/index.d.ts b/types/react-toastify/index.d.ts
index 0bde299cd4..c15add1fac 100644
--- a/types/react-toastify/index.d.ts
+++ b/types/react-toastify/index.d.ts
@@ -136,7 +136,7 @@ export interface ToastOptions extends ToastAndToastContainerOptions {
     /**
      * String or React Element, only available when calling update.
      */
-    render?: string | React.ReactElement<any>;
+    render?: string | React.ReactElement;
 }
 
 export interface Toast {
diff --git a/types/react-toastr/index.d.ts b/types/react-toastr/index.d.ts
index 7b822ad601..0160a82de9 100644
--- a/types/react-toastr/index.d.ts
+++ b/types/react-toastr/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-toastr 3.0
-// Project: https://github.com/tomchentw/react-toastr
+// Project: https://github.com/tomchentw/react-toastr, https://tomchentw.github.io/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.8
diff --git a/types/react-transition-group/TransitionGroup.d.ts b/types/react-transition-group/TransitionGroup.d.ts
index c7f42a009a..48bc9bbe6d 100644
--- a/types/react-transition-group/TransitionGroup.d.ts
+++ b/types/react-transition-group/TransitionGroup.d.ts
@@ -13,7 +13,7 @@ declare namespace TransitionGroup {
     type TransitionGroupProps<T extends keyof JSX.IntrinsicElements = "div", V extends ReactType = any> =
         (IntrinsicTransitionGroupProps<T> & JSX.IntrinsicElements[T]) | (ComponentTransitionGroupProps<V>) & {
         children?: ReactElement<TransitionProps> | Array<ReactElement<TransitionProps>>;
-        childFactory?(child: ReactElement<any>): ReactElement<any>;
+        childFactory?(child: ReactElement): ReactElement;
         [prop: string]: any;
     };
 }
diff --git a/types/react-transition-group/react-transition-group-tests.tsx b/types/react-transition-group/react-transition-group-tests.tsx
index cda468f9b5..c7fb1aede0 100644
--- a/types/react-transition-group/react-transition-group-tests.tsx
+++ b/types/react-transition-group/react-transition-group-tests.tsx
@@ -42,7 +42,7 @@ const Test: React.StatelessComponent = () => {
             component={Container}
             theme="test"
             className="animated-list"
-            childFactory={ (child: React.ReactElement<any>) => child }
+            childFactory={ (child: React.ReactElement) => child }
         >
             <Components.Transition
                 in
diff --git a/types/react-transition-group/v1/index.d.ts b/types/react-transition-group/v1/index.d.ts
index 016d1f3b48..b3e47460cf 100644
--- a/types/react-transition-group/v1/index.d.ts
+++ b/types/react-transition-group/v1/index.d.ts
@@ -8,7 +8,7 @@ import { HTMLAttributes, ReactElement, ReactType } from "react";
 
 export interface HTMLTransitionGroupProps<T> extends HTMLAttributes<T> {
     component?: ReactType;
-    childFactory?(child: ReactElement<any>): ReactElement<any>;
+    childFactory?(child: ReactElement): ReactElement;
 }
 
 import TransitionGroup = require("./TransitionGroup");
diff --git a/types/react-ultimate-pagination/index.d.ts b/types/react-ultimate-pagination/index.d.ts
new file mode 100644
index 0000000000..2f7c26c210
--- /dev/null
+++ b/types/react-ultimate-pagination/index.d.ts
@@ -0,0 +1,130 @@
+// Type definitions for react-ultimate-pagination 1.2
+// Project: https://github.com/ultimate-pagination/react-ultimate-pagination
+// Definitions by: Ben Lorantfy <https://github.com/BenLorantfy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+import * as React from "react";
+
+export interface PaginationComponentProps {
+    /**
+     * Number of pages that user should navigate to when item is activated (for items with type `PAGE` it also can be used as a label in UI)
+     */
+    value: number;
+
+    /**
+     * Show if `currentPage` if the same as `value` of an item (can be used to highlight a current page or disable first, previous, next or last page links when user is already on first/last page)
+     */
+    isActive: boolean;
+
+    /**
+     * Show if button should be disabled
+     */
+    isDisabled: boolean;
+
+    /**
+     * Should be called when user interacted with a component and the current page should be changed to the page represented by item (no arguments should be used, can be used for all item types)
+     */
+    onClick: () => void;
+}
+
+export enum ITEM_TYPES {
+    PAGE = "PAGE",
+    ELLIPSIS = "ELLIPSIS",
+    FIRST_PAGE_LINK = "FIRST_PAGE_LINK",
+    PREVIOUS_PAGE_LINK = "PREVIOUS_PAGE_LINK",
+    NEXT_PAGE_LINK = "NEXT_PAGE_LINK",
+    LAST_PAGE_LINK = "LAST_PAGE_LINK",
+}
+
+export interface ItemTypeToComponent {
+    /**
+     * A link to a page
+     */
+    PAGE: React.ComponentType<PaginationComponentProps>;
+
+    /**
+     * An item that represents groups of pages that currently are not visible in paginator (can be used to navigate to the page in the group that is the nearest to the current page)
+     */
+    ELLIPSIS: React.ComponentType<PaginationComponentProps>;
+
+    /**
+     * A link to the first page
+     */
+    FIRST_PAGE_LINK: React.ComponentType<PaginationComponentProps>;
+
+    /**
+     * A link to the previous page
+     */
+    PREVIOUS_PAGE_LINK: React.ComponentType<PaginationComponentProps>;
+
+    /**
+     * A link to the next page
+     */
+    NEXT_PAGE_LINK: React.ComponentType<PaginationComponentProps>;
+
+    /**
+     * A link to the last page
+     */
+    LAST_PAGE_LINK: React.ComponentType<PaginationComponentProps>;
+}
+
+export interface CreateUltimatePaginationOptions {
+    /**
+     * An object that is used as a map from the item type to the React.js component that will be used to render this item
+     */
+    itemTypeToComponent: ItemTypeToComponent;
+
+    /**
+     * A React.js component that will be used as a wrapper for pagination items
+     */
+    WrapperComponent?: string|React.ComponentType<any>;
+}
+
+export interface UltimatePaginationProps {
+    /**
+     * Current page number
+     */
+    currentPage: number;
+
+    /**
+     * Total number of pages
+     */
+    totalPages: number;
+
+    /**
+     * Number of always visible pages at the beginning and end
+     */
+    boundaryPagesRange?: number;
+
+    /**
+     * Number of always visible pages before and after the current one
+     */
+    siblingPagesRange?: number;
+
+    /**
+     * Boolean flag to hide ellipsis
+     */
+    hideEllipsis?: boolean;
+
+    /**
+     * Boolean flag to hide previous and next page links
+     */
+    hidePreviousAndNextPageLinks?: boolean;
+
+    /**
+     * Boolean flag to hide first and last page links
+     */
+    hideFirstAndLastPageLinks?: boolean;
+
+    /**
+     * Callback that will be called with new page when it should be changed by user interaction
+     */
+    onChange?: (newPage: number) => void;
+
+    /**
+     * Boolean flag to disable all buttons in pagination
+     */
+    disabled?: boolean;
+}
+
+export function createUltimatePagination(options: CreateUltimatePaginationOptions): React.ComponentType<UltimatePaginationProps>;
diff --git a/types/react-ultimate-pagination/react-ultimate-pagination-tests.tsx b/types/react-ultimate-pagination/react-ultimate-pagination-tests.tsx
new file mode 100644
index 0000000000..8cebdcbf52
--- /dev/null
+++ b/types/react-ultimate-pagination/react-ultimate-pagination-tests.tsx
@@ -0,0 +1,93 @@
+import * as React from "react";
+import {
+  PaginationComponentProps,
+  createUltimatePagination,
+  ItemTypeToComponent,
+  ITEM_TYPES
+} from "react-ultimate-pagination";
+
+function Page(props: PaginationComponentProps) {
+  return (
+    <button
+      style={props.isActive ? {fontWeight: 'bold'} : undefined}
+      onClick={props.onClick}
+      disabled={props.isDisabled}
+    >{props.value}</button>
+  );
+}
+
+function PageWithExtraProps(props: PaginationComponentProps & { color: "red" }) {
+  return (
+    <button style={{ color: props.color }}>5</button>
+  );
+}
+
+function Ellipsis(props: PaginationComponentProps) {
+  return <button onClick={props.onClick} disabled={props.isDisabled}>...</button>;
+}
+
+function FirstPageLink(props: PaginationComponentProps) {
+  return <button onClick={props.onClick} disabled={props.isDisabled}>First</button>;
+}
+
+function PreviousPageLink(props: PaginationComponentProps) {
+  return <button onClick={props.onClick} disabled={props.isDisabled}>Previous</button>;
+}
+
+function NextPageLink(props: PaginationComponentProps) {
+  return <button onClick={props.onClick} disabled={props.isDisabled}>Next</button>;
+}
+
+function LastPageLink(props: PaginationComponentProps) {
+  return <button onClick={props.onClick} disabled={props.isDisabled}>Last</button>;
+}
+
+function Wrapper(props: { children: React.ReactChildren }) {
+  return <div>{props.children}</div>;
+}
+
+// ItemTypeToComponent using strings
+const itemTypeToComponent: ItemTypeToComponent = {
+  PAGE: Page,
+  ELLIPSIS: Ellipsis,
+  FIRST_PAGE_LINK: FirstPageLink,
+  PREVIOUS_PAGE_LINK: PreviousPageLink,
+  NEXT_PAGE_LINK: NextPageLink,
+  LAST_PAGE_LINK: LastPageLink
+};
+
+// ItemTypeToComponent using enum
+const itemTypeToComponent2: ItemTypeToComponent = {
+  [ITEM_TYPES.PAGE]: Page,
+  [ITEM_TYPES.ELLIPSIS]: Ellipsis,
+  [ITEM_TYPES.FIRST_PAGE_LINK]: FirstPageLink,
+  [ITEM_TYPES.PREVIOUS_PAGE_LINK]: PreviousPageLink,
+  [ITEM_TYPES.NEXT_PAGE_LINK]: NextPageLink,
+  [ITEM_TYPES.LAST_PAGE_LINK]: LastPageLink
+};
+
+// ItemTypeToComponent using Page with extra props
+const itemTypeToComponent3: Partial<ItemTypeToComponent> = {
+  [ITEM_TYPES.PAGE]: PageWithExtraProps,
+};
+
+const UltimatePagination = createUltimatePagination({ itemTypeToComponent, WrapperComponent: Wrapper }); // $ExpectType ComponentType<UltimatePaginationProps>
+
+// With required props
+<UltimatePagination currentPage={0} totalPages={5} />;
+
+// With all props
+<UltimatePagination
+  currentPage={0}
+  totalPages={5}
+  boundaryPagesRange={1}
+  disabled={false}
+  hideEllipsis={false}
+  hideFirstAndLastPageLinks={false}
+  hidePreviousAndNextPageLinks={false}
+  onChange={() => {}}
+  siblingPagesRange={99}
+/>;
+
+// With unspported prop
+<UltimatePagination color="red"/>; // $ExpectError
diff --git a/types/react-ultimate-pagination/tsconfig.json b/types/react-ultimate-pagination/tsconfig.json
new file mode 100644
index 0000000000..748045849b
--- /dev/null
+++ b/types/react-ultimate-pagination/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-ultimate-pagination-tests.tsx"
+    ]
+}
diff --git a/types/react-ultimate-pagination/tslint.json b/types/react-ultimate-pagination/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-ultimate-pagination/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-vertical-timeline-component/index.d.ts b/types/react-vertical-timeline-component/index.d.ts
index 66319ee48f..091c2a2c83 100644
--- a/types/react-vertical-timeline-component/index.d.ts
+++ b/types/react-vertical-timeline-component/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-vertical-timeline-component 2.3
-// Project: https://github.com/stephane-monnot/react-vertical-timeline
+// Project: https://github.com/stephane-monnot/react-vertical-timeline, https://stephane-monnot.github.io/react-vertical-timeline
 // Definitions by: Stéphane Monnot <https://github.com/stephane-monnot>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-virtual-keyboard/index.d.ts b/types/react-virtual-keyboard/index.d.ts
index 705dfc5682..4007ed774b 100644
--- a/types/react-virtual-keyboard/index.d.ts
+++ b/types/react-virtual-keyboard/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-virtual-keyboard 1.0
-// Project: https://www.npmjs.com/package/react-virtual-keyboard
+// Project: https://github.com/utzel-butzel/react-virtual-keyboard
 // Definitions by: Bogdan Surai <https://github.com/bsurai>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/react-visibility-sensor/index.d.ts b/types/react-visibility-sensor/index.d.ts
index 80cda84d19..c1bdd353a1 100644
--- a/types/react-visibility-sensor/index.d.ts
+++ b/types/react-visibility-sensor/index.d.ts
@@ -39,7 +39,7 @@ interface Props {
   resizeThrottle?: number;
   containment?: HTMLElement;
   delayedCall?: boolean;
-  children?: React.ReactElement<any> | ChildFunction;
+  children?: React.ReactElement | ChildFunction;
 }
 
 declare const ReactVisibilitySensor: React.StatelessComponent<Props>;
diff --git a/types/react-widgets/index.d.ts b/types/react-widgets/index.d.ts
index bdf58b97d4..61eaa78829 100644
--- a/types/react-widgets/index.d.ts
+++ b/types/react-widgets/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-widgets 4.3
-// Project: https://github.com/jquense/react-widgets
+// Project: https://github.com/jquense/react-widgets, http://jquense.github.io/react-widgets/docs
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 //                 Balázs Sándor <https://github.com/sanyatuning>
 //                 Frode Hansen <https://github.com/frodehansen2>
diff --git a/types/react-window/index.d.ts b/types/react-window/index.d.ts
index 168551cc94..810661d387 100644
--- a/types/react-window/index.d.ts
+++ b/types/react-window/index.d.ts
@@ -1,10 +1,19 @@
-// Type definitions for react-window 1.1
-// Project: https://github.com/bvaughn/react-window/
+// Type definitions for react-window 1.5
+// Project: https://github.com/bvaughn/react-window/, http://react-window.now.sh
 // Definitions by: Martynas Kadiša <https://github.com/martynaskadisa>
+//                 Alex Guerra <https://github.com/heyimalex>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import { Component, ComponentType, CSSProperties, Ref, Key } from "react";
+import {
+    Component,
+    ComponentType,
+    CSSProperties,
+    Ref,
+    Key,
+    FunctionComponent,
+    ComponentClass
+} from "react";
 
 export type Direction = "vertical" | "horizontal";
 export type ScrollDirection = "forward" | "backward";
@@ -13,25 +22,42 @@ export type Align = "auto" | "center" | "end" | "start";
 export interface ListChildComponentProps {
     index: number;
     style: CSSProperties;
+    data: any;
+    isScrolling?: boolean;
 }
 
 export interface GridChildComponentProps {
     columnIndex: number;
     rowIndex: number;
     style: CSSProperties;
+    data: any;
+    isScrolling?: boolean;
 }
 
+// This is supposed to represent the type of the first parameter to
+// React.createElement.
+export type ReactElementType =
+    | FunctionComponent<any>
+    | ComponentClass<any>
+    | string;
+
 export interface CommonProps {
     /**
      * Optional CSS class to attach to outermost <div> element.
      */
     className?: string;
+    /**
+     * Tag name passed to document.createElement to create the inner container element. This is an advanced property; in most cases, the default ("div") should be used.
+     */
+    innerElementType?: ReactElementType;
     /**
      * Ref to attach to the inner container element. This is an advanced property.
      */
     innerRef?: Ref<any>;
     /**
      * Tag name passed to document.createElement to create the inner container element. This is an advanced property; in most cases, the default ("div") should be used.
+     *
+     * @deprecated since 1.4.0
      */
     innerTagName?: string;
     /**
@@ -40,23 +66,20 @@ export interface CommonProps {
      * Item data is useful for item renderers that are class components.
      */
     itemData?: any;
+    /**
+     * Tag name passed to document.createElement to create the outer container element. This is an advanced property; in most cases, the default ("div") should be used.
+     */
+    outerElementType?: ReactElementType;
     /**
      * Ref to attach to the outer container element. This is an advanced property.
      */
     outerRef?: Ref<any>;
     /**
      * Tag name passed to document.createElement to create the outer container element. This is an advanced property; in most cases, the default ("div") should be used.
+     *
+     * @deprecated since 1.4.0
      */
     outerTagName?: string;
-    /**
-     * The number of items (rows or columns) to render outside of the visible area. This property can be important for two reasons:
-     *
-     * - Overscanning by one row or column allows the tab key to focus on the next (not yet visible) item.
-     * - Overscanning slightly can reduce or prevent a flash of empty space when a user first starts scrolling.
-     *
-     * Note that overscanning too much can negatively impact performance. By default, List overscans by one item.
-     */
-    overscanCount?: number;
     /**
      * Optional inline style to attach to outermost <div> element.
      */
@@ -64,12 +87,12 @@ export interface CommonProps {
     /**
      * Adds an additional isScrolling parameter to the children render function. This parameter can be used to show a placeholder row or column while the list is being scrolled.
      *
-     * Note that using this parameter will result in an additional render call after scrolling has stopped (whenisScrolling changse from true to false).
+     * Note that using this parameter will result in an additional render call after scrolling has stopped (when isScrolling changes from true to false).
      */
     useIsScrolling?: boolean;
 }
 
-export type ListItemKeySelector = (index: number) => Key;
+export type ListItemKeySelector = (index: number, data: any) => Key;
 
 export interface ListOnItemsRenderedProps {
     overscanStartIndex: number;
@@ -135,6 +158,15 @@ export interface ListProps extends CommonProps {
      * If your list does not satisfy the above constraints, use the itemKey property to specify your own keys for items
      */
     itemKey?: ListItemKeySelector;
+    /**
+     * The number of items (rows or columns) to render outside of the visible area. This property can be important for two reasons:
+     *
+     * - Overscanning by one row or column allows the tab key to focus on the next (not yet visible) item.
+     * - Overscanning slightly can reduce or prevent a flash of empty space when a user first starts scrolling.
+     *
+     * Note that overscanning too much can negatively impact performance. By default, List overscans by one item.
+     */
+    overscanCount?: number;
     /**
      * Called when the items rendered by the list change.
      */
@@ -145,9 +177,11 @@ export interface ListProps extends CommonProps {
     onScroll?: (props: ListOnScrollProps) => any;
 }
 
-export type GridItemKeySelector = (
-    params: { columnIndex: number; rowIndex: number }
-) => Key;
+export type GridItemKeySelector = (params: {
+    columnIndex: number;
+    rowIndex: number;
+    data: any;
+}) => Key;
 
 export interface GridOnItemsRenderedProps {
     overscanColumnStartIndex: number;
@@ -208,6 +242,35 @@ export interface GridProps extends CommonProps {
      * Called when the grid scroll positions changes, as a result of user scrolling or scroll-to method calls.
      */
     onScroll?: (props: GridOnScrollProps) => any;
+    /**
+     * The number of columns to render outside of the visible area. This property can be important for two reasons:
+     *
+     * - Overscanning by one row or column allows the tab key to focus on the next (not yet visible) item.
+     * - Overscanning slightly can reduce or prevent a flash of empty space when a user first starts scrolling.
+     *
+     * Note that overscanning too much can negatively impact performance. By default, grid overscans by one item.
+     */
+    overscanColumnsCount?: number;
+    /**
+     * The number of rows to render outside of the visible area. This property can be important for two reasons:
+     *
+     * - Overscanning by one row or column allows the tab key to focus on the next (not yet visible) item.
+     * - Overscanning slightly can reduce or prevent a flash of empty space when a user first starts scrolling.
+     *
+     * Note that overscanning too much can negatively impact performance. By default, grid overscans by one item.
+     */
+    overscanRowsCount?: number;
+    /**
+     * The number of items (rows or columns) to render outside of the visible area. This property can be important for two reasons:
+     *
+     * - Overscanning by one row or column allows the tab key to focus on the next (not yet visible) item.
+     * - Overscanning slightly can reduce or prevent a flash of empty space when a user first starts scrolling.
+     *
+     * Note that overscanning too much can negatively impact performance. By default, grid overscans by one item.
+     *
+     * @deprecated since version 1.4.0
+     */
+    overscanCount?: number;
     /**
      * Number of rows in the grid. Note that only a few rows will be rendered and displayed at a time.
      */
@@ -314,11 +377,11 @@ export class VariableSizeList extends Component<VariableSizeListProps> {
     /**
      * VariableSizeList caches offsets and measurements for each index for performance purposes.
      * This method clears that cached data for all items after (and including) the specified index.
-     * It should be called whenever a item's size changes. (Note that this is not a typical occurrance.)
+     * It should be called whenever a item's size changes. (Note that this is not a typical occurrence.)
      *
      * By default the list will automatically re-render after the index is reset.
      * If you would like to delay this re-render until e.g. a state update has completed in the parent component,
-     * specify a value offalsefor the second, optional parameter.
+     * specify a value of false for the second, optional parameter.
      */
     resetAfterIndex(index: number, shouldForceUpdate: boolean): void;
 }
@@ -370,21 +433,21 @@ export class VariableSizeGrid extends Component<VariableSizeGridProps> {
     /**
      * VariableSizeGrid caches offsets and measurements for each column index for performance purposes.
      * This method clears that cached data for all columns after (and including) the specified index.
-     * It should be called whenever a column's width changes. (Note that this is not a typical occurrance.)
+     * It should be called whenever a column's width changes. (Note that this is not a typical occurrence.)
      *
      * By default the grid will automatically re-render after the index is reset.
      * If you would like to delay this re-render until e.g. a state update has completed in the parent component,
-     * specify a value offalse for the second, optional parameter.
+     * specify a value of false for the second, optional parameter.
      */
     resetAfterColumnIndex(index: number, shouldForceUpdate?: boolean): void;
     /**
      * VariableSizeGrid caches offsets and measurements for each item for performance purposes.
      * This method clears that cached data for all items after (and including) the specified indices.
-     * It should be called whenever an items size changes. (Note that this is not a typical occurrance.)
+     * It should be called whenever an items size changes. (Note that this is not a typical occurrence.)
      *
      * By default the grid will automatically re-render after the index is reset.
      * If you would like to delay this re-render until e.g. a state update has completed in the parent component,
-     * specify a value offalse for the optional shouldForceUpdate parameter.
+     * specify a value of false for the optional shouldForceUpdate parameter.
      */
     resetAfterIndices(params: {
         columnIndex: number;
@@ -394,11 +457,34 @@ export class VariableSizeGrid extends Component<VariableSizeGridProps> {
     /**
      * VariableSizeGrid caches offsets and measurements for each row index for performance purposes.
      * This method clears that cached data for all rows after (and including) the specified index.
-     * It should be called whenever a row's height changes. (Note that this is not a typical occurrance.)
+     * It should be called whenever a row's height changes. (Note that this is not a typical occurrence.)
      *
      * By default the grid will automatically re-render after the index is reset.
      * If you would like to delay this re-render until e.g. a state update has completed in the parent component,
-     * specify a value offalse for the second, optional parameter.
+     * specify a value of false for the second, optional parameter.
      */
     resetAfterRowIndex(index: number, shouldForceUpdate?: boolean): void;
 }
+
+/**
+ * Custom comparison function for React.memo().
+ * It knows to compare individual style props and ignore the wrapper object.
+ *
+ * @see https://reactjs.org/docs/react-api.html#reactmemo
+ */
+export function areEqual(
+    prevProps: Readonly<object>,
+    nextProps: Readonly<object>
+): boolean;
+
+/**
+ * Custom shouldComponentUpdate for class components.
+ * It knows to compare individual style props and ignore the wrapper object.
+ *
+ * @see https://reactjs.org/docs/react-component.html#shouldcomponentupdate
+ */
+export function shouldComponentUpdate<P = {}, S = {}>(
+    this: { props: P; state: S },
+    nextProps: Readonly<P>,
+    nextState: Readonly<S>
+): boolean;
diff --git a/types/react-window/react-window-tests.tsx b/types/react-window/react-window-tests.tsx
index 8af77f05d6..febd9ae500 100644
--- a/types/react-window/react-window-tests.tsx
+++ b/types/react-window/react-window-tests.tsx
@@ -2,7 +2,10 @@ import {
     FixedSizeList,
     VariableSizeList,
     FixedSizeGrid,
-    VariableSizeGrid
+    VariableSizeGrid,
+    ListChildComponentProps,
+    areEqual,
+    shouldComponentUpdate
 } from "react-window";
 import * as React from "react";
 
@@ -66,7 +69,7 @@ const FixedSizeListTestOptionalProps: React.SFC<{ testBool: boolean }> = ({
         direction={testBool ? "vertical" : "horizontal"}
         initialScrollOffset={0}
         innerRef={anyRef}
-        innerTagName="div"
+        innerElementType="div"
         itemData={{ foo: "bar" }}
         itemKey={index => "foo" + index.toString()}
         onItemsRendered={({
@@ -81,7 +84,7 @@ const FixedSizeListTestOptionalProps: React.SFC<{ testBool: boolean }> = ({
             visibleStopIndex
         }
         useIsScrolling={true}
-        outerTagName="div"
+        outerElementType="div"
         style={{ color: "cyan" }}
         overscanCount={0}
         outerRef={anyRef}
@@ -112,7 +115,7 @@ const VariableSizeListTestOptionalProps: React.SFC<{ testBool: boolean }> = ({
         direction={testBool ? "vertical" : "horizontal"}
         initialScrollOffset={0}
         innerRef={anyRef}
-        innerTagName="div"
+        innerElementType="div"
         itemData={{ foo: "bar" }}
         itemKey={index => "foo" + index.toString()}
         onItemsRendered={({
@@ -127,7 +130,7 @@ const VariableSizeListTestOptionalProps: React.SFC<{ testBool: boolean }> = ({
             visibleStopIndex
         }
         useIsScrolling={true}
-        outerTagName="div"
+        outerElementType="div"
         style={{ color: "cyan" }}
         overscanCount={0}
         outerRef={anyRef}
@@ -161,7 +164,7 @@ const VariableSizeGridTestOptionalProps: React.SFC = () => (
         initialScrollLeft={0}
         initialScrollTop={0}
         innerRef={anyRef}
-        innerTagName="div"
+        innerElementType="div"
         itemData={{ foo: "bar" }}
         itemKey={({ columnIndex, rowIndex }) =>
             columnIndex.toString() + rowIndex.toString()
@@ -184,8 +187,9 @@ const VariableSizeGridTestOptionalProps: React.SFC = () => (
             verticalScrollDirection
         }) => undefined}
         outerRef={anyRef}
-        outerTagName="div"
-        overscanCount={5}
+        outerElementType="div"
+        overscanColumnsCount={5}
+        overscanRowsCount={5}
         ref="ref"
         style={{ color: "red" }}
         useIsScrolling={true}
@@ -197,3 +201,20 @@ const VariableSizeGridTestOptionalProps: React.SFC = () => (
         )}
     </VariableSizeGrid>
 );
+
+const RowWithAreEqual = React.memo((props: ListChildComponentProps) => {
+    const { index, style } = props;
+    return <div style={style}>Row {index}</div>;
+}, areEqual);
+
+class RowWithShouldComponentUpdate extends React.Component<
+    ListChildComponentProps
+> {
+    shouldComponentUpdate(...args: any[]) {
+        return shouldComponentUpdate.call(this, ...args);
+    }
+    render() {
+        const { index, style } = this.props;
+        return <div style={style}>Row {index}</div>;
+    }
+}
diff --git a/types/react-youtube/index.d.ts b/types/react-youtube/index.d.ts
index 5ef3d6537b..ef905070fe 100644
--- a/types/react-youtube/index.d.ts
+++ b/types/react-youtube/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-youtube 7.6
-// Project: https://github.com/troybetz/react-youtube
+// Project: https://github.com/troybetz/react-youtube, https://github.com/compedit/react-youtube
 // Definitions by: kgtkr <https://github.com/kgtkr>
 //                 Leo Salgueiro <https://github.com/salguerooo>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index e561e8f131..97adab18d4 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for React 16.7
+// Type definitions for React 16.8
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>
 //                 AssureSign <http://www.assuresign.com>
@@ -18,8 +18,9 @@
 //                 Olivier Pascal <https://github.com/pascaloliv>
 //                 Martin Hochel <https://github.com/hotell>
 //                 Frank Li <https://github.com/franklixuefei>
-//                 Jessica Franco <https://github.com/Kovensky>
+//                 Jessica Franco <https://github.com/Jessidhia>
 //                 Paul Sherman <https://github.com/pshrmn>
+//                 Sunil Pai <https://github.com/threepointone>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -58,7 +59,7 @@ declare namespace React {
     type ComponentType<P = {}> = ComponentClass<P> | FunctionComponent<P>;
 
     type JSXElementConstructor<P> =
-        | ((props: P) => ReactElement<any> | null)
+        | ((props: P) => ReactElement | null)
         | (new (props: P) => Component<P, any>);
 
     type Key = string | number;
@@ -82,7 +83,7 @@ declare namespace React {
         ref?: LegacyRef<T>;
     }
 
-    interface ReactElement<P, T extends string | JSXElementConstructor<any> = string | JSXElementConstructor<any>> {
+    interface ReactElement<P = any, T extends string | JSXElementConstructor<any> = string | JSXElementConstructor<any>> {
         type: T;
         props: P;
         key: Key | null;
@@ -127,7 +128,7 @@ declare namespace React {
         type: keyof ReactSVG;
     }
 
-    interface ReactPortal extends ReactElement<any> {
+    interface ReactPortal extends ReactElement {
         key: Key | null;
         children: ReactNode;
     }
@@ -171,7 +172,7 @@ declare namespace React {
     // ----------------------------------------------------------------------
 
     type ReactText = string | number;
-    type ReactChild = ReactElement<any> | ReactText;
+    type ReactChild = ReactElement | ReactText;
 
     interface ReactNodeArray extends Array<ReactNode> {}
     type ReactFragment = {} | ReactNodeArray;
@@ -296,7 +297,7 @@ declare namespace React {
         /**
          * **NOTE**: Exotic components are not callable.
          */
-        (props: P): (ReactElement<any>|null);
+        (props: P): (ReactElement|null);
         readonly $$typeof: symbol;
     }
 
@@ -467,7 +468,7 @@ declare namespace React {
     type FC<P = {}> = FunctionComponent<P>;
 
     interface FunctionComponent<P = {}> {
-        (props: P & { children?: ReactNode }, context?: any): ReactElement<any> | null;
+        (props: P & { children?: ReactNode }, context?: any): ReactElement | null;
         propTypes?: WeakValidationMap<P>;
         contextTypes?: ValidationMap<any>;
         defaultProps?: Partial<P>;
@@ -475,7 +476,7 @@ declare namespace React {
     }
 
     interface RefForwardingComponent<T, P = {}> {
-        (props: P & { children?: ReactNode }, ref: Ref<T> | null): ReactElement<any> | null;
+        (props: P & { children?: ReactNode }, ref: Ref<T>): ReactElement | null;
         propTypes?: WeakValidationMap<P>;
         contextTypes?: ValidationMap<any>;
         defaultProps?: Partial<P>;
@@ -774,15 +775,17 @@ declare namespace React {
     type Dispatch<A> = (value: A) => void;
     // Unlike redux, the actions _can_ be anything
     type Reducer<S, A> = (prevState: S, action: A) => S;
+    // types used to try and prevent the compiler from reducing S
+    // to a supertype common with the second argument to useReducer()
+    type ReducerState<R extends Reducer<any, any>> = R extends Reducer<infer S, any> ? S : never;
+    type ReducerAction<R extends Reducer<any, any>> = R extends Reducer<any, infer A> ? A : never;
     // The identity check is done with the SameValue algorithm (Object.is), which is stricter than ===
     // TODO (TypeScript 3.0): ReadonlyArray<unknown>
-    type InputIdentityList = ReadonlyArray<any>;
+    type DependencyList = ReadonlyArray<any>;
 
-    // NOTE: Currently, in alpha.0, the effect callbacks are actually allowed to return anything,
-    // but functions are treated specially. The next version published with hooks will warn if you actually
-    // return anything besides `void` or a callback. Async effects need to call an async function inside
-    // them.
-    type EffectCallback = () => (void | (() => void));
+    // NOTE: callbacks are _only_ allowed to return either void, or a destructor.
+    // The destructor is itself only allowed to return void.
+    type EffectCallback = () => (void | (() => void | undefined));
 
     interface MutableRefObject<T> {
         current: T;
@@ -793,17 +796,25 @@ declare namespace React {
      * Accepts a context object (the value returned from `React.createContext`) and returns the current
      * context value, as given by the nearest context provider for the given context.
      *
-     * @version experimental
+     * @version 16.8.0
      * @see https://reactjs.org/docs/hooks-reference.html#usecontext
      */
     function useContext<T>(context: Context<T>/*, (not public API) observedBits?: number|boolean */): T;
     /**
      * Returns a stateful value, and a function to update it.
      *
-     * @version experimental
+     * @version 16.8.0
      * @see https://reactjs.org/docs/hooks-reference.html#usestate
      */
     function useState<S>(initialState: S | (() => S)): [S, Dispatch<SetStateAction<S>>];
+    // convenience overload when first argument is ommitted
+    /**
+     * Returns a stateful value, and a function to update it.
+     *
+     * @version 16.8.0
+     * @see https://reactjs.org/docs/hooks-reference.html#usestate
+     */
+    function useState<S = undefined>(): [S | undefined, Dispatch<SetStateAction<S | undefined>>];
     /**
      * An alternative to `useState`.
      *
@@ -811,10 +822,58 @@ declare namespace React {
      * multiple sub-values. It also lets you optimize performance for components that trigger deep
      * updates because you can pass `dispatch` down instead of callbacks.
      *
-     * @version experimental
+     * @version 16.8.0
      * @see https://reactjs.org/docs/hooks-reference.html#usereducer
      */
-    function useReducer<S, A>(reducer: Reducer<S, A>, initialState: S, initialAction?: A | null): [S, Dispatch<A>];
+    // overload where "I" may be a subset of ReducerState<R>; used to provide autocompletion.
+    // If "I" matches ReducerState<R> exactly then the last overload will allow initializer to be ommitted.
+    // the last overload effectively behaves as if the identity function (x => x) is the initializer.
+    function useReducer<R extends Reducer<any, any>, I>(
+        reducer: R,
+        initializerArg: I & ReducerState<R>,
+        initializer: (arg: I & ReducerState<R>) => ReducerState<R>
+    ): [ReducerState<R>, Dispatch<ReducerAction<R>>];
+    /**
+     * An alternative to `useState`.
+     *
+     * `useReducer` is usually preferable to `useState` when you have complex state logic that involves
+     * multiple sub-values. It also lets you optimize performance for components that trigger deep
+     * updates because you can pass `dispatch` down instead of callbacks.
+     *
+     * @version 16.8.0
+     * @see https://reactjs.org/docs/hooks-reference.html#usereducer
+     */
+    // overload for free "I"; all goes as long as initializer converts it into "ReducerState<R>".
+    function useReducer<R extends Reducer<any, any>, I>(
+        reducer: R,
+        initializerArg: I,
+        initializer: (arg: I) => ReducerState<R>
+    ): [ReducerState<R>, Dispatch<ReducerAction<R>>];
+    /**
+     * An alternative to `useState`.
+     *
+     * `useReducer` is usually preferable to `useState` when you have complex state logic that involves
+     * multiple sub-values. It also lets you optimize performance for components that trigger deep
+     * updates because you can pass `dispatch` down instead of callbacks.
+     *
+     * @version 16.8.0
+     * @see https://reactjs.org/docs/hooks-reference.html#usereducer
+     */
+
+    // I'm not sure if I keep this 2-ary or if I make it (2,3)-ary; it's currently (2,3)-ary.
+    // The Flow types do have an overload for 3-ary invocation with undefined initializer.
+
+    // NOTE: without the ReducerState indirection, TypeScript would reduce S to be the most common
+    // supertype between the reducer's return type and the initialState (or the initializer's return type),
+    // which would prevent autocompletion from ever working.
+
+    // TODO: double-check if this weird overload logic is necessary. It is possible it's either a bug
+    // in older versions, or a regression in newer versions of the typescript completion service.
+    function useReducer<R extends Reducer<any, any>>(
+        reducer: R,
+        initialState: ReducerState<R>,
+        initializer?: undefined
+    ): [ReducerState<R>, Dispatch<ReducerAction<R>>];
     /**
      * `useRef` returns a mutable ref object whose `.current` property is initialized to the passed argument
      * (`initialValue`). The returned object will persist for the full lifetime of the component.
@@ -822,7 +881,7 @@ declare namespace React {
      * Note that `useRef()` is useful for more than the `ref` attribute. It’s handy for keeping any mutable
      * value around similar to how you’d use instance fields in classes.
      *
-     * @version experimental
+     * @version 16.8.0
      * @see https://reactjs.org/docs/hooks-reference.html#useref
      */
     // TODO (TypeScript 3.0): <T extends unknown>
@@ -838,11 +897,25 @@ declare namespace React {
      * Usage note: if you need the result of useRef to be directly mutable, include `| null` in the type
      * of the generic argument.
      *
-     * @version experimental
+     * @version 16.8.0
      * @see https://reactjs.org/docs/hooks-reference.html#useref
      */
     // TODO (TypeScript 3.0): <T extends unknown>
     function useRef<T>(initialValue: T|null): RefObject<T>;
+    // convenience overload for potentially undefined initialValue / call with 0 arguments
+    // has a default to stop it from defaulting to {} instead
+    /**
+     * `useRef` returns a mutable ref object whose `.current` property is initialized to the passed argument
+     * (`initialValue`). The returned object will persist for the full lifetime of the component.
+     *
+     * Note that `useRef()` is useful for more than the `ref` attribute. It’s handy for keeping any mutable
+     * value around similar to how you’d use instance fields in classes.
+     *
+     * @version 16.8.0
+     * @see https://reactjs.org/docs/hooks-reference.html#useref
+     */
+    // TODO (TypeScript 3.0): <T extends unknown>
+    function useRef<T = undefined>(): MutableRefObject<T | undefined>;
     /**
      * The signature is identical to `useEffect`, but it fires synchronously after all DOM mutations.
      * Use this to read layout from the DOM and synchronously re-render. Updates scheduled inside
@@ -853,44 +926,44 @@ declare namespace React {
      * If you’re migrating code from a class component, `useLayoutEffect` fires in the same phase as
      * `componentDidMount` and `componentDidUpdate`.
      *
-     * @version experimental
+     * @version 16.8.0
      * @see https://reactjs.org/docs/hooks-reference.html#uselayouteffect
      */
-    function useLayoutEffect(effect: EffectCallback, inputs?: InputIdentityList): void;
+    function useLayoutEffect(effect: EffectCallback, deps?: DependencyList): void;
     /**
      * Accepts a function that contains imperative, possibly effectful code.
      *
      * @param effect Imperative function that can return a cleanup function
-     * @param inputs If present, effect will only activate if the values in the list change.
+     * @param deps If present, effect will only activate if the values in the list change.
      *
-     * @version experimental
+     * @version 16.8.0
      * @see https://reactjs.org/docs/hooks-reference.html#useeffect
      */
-    function useEffect(effect: EffectCallback, inputs?: InputIdentityList): void;
+    function useEffect(effect: EffectCallback, deps?: DependencyList): void;
     // NOTE: this does not accept strings, but this will have to be fixed by removing strings from type Ref<T>
     /**
-     * `useImperativeMethods` customizes the instance value that is exposed to parent components when using
+     * `useImperativeHandle` customizes the instance value that is exposed to parent components when using
      * `ref`. As always, imperative code using refs should be avoided in most cases.
      *
-     * `useImperativeMethods` should be used with `React.forwardRef`.
+     * `useImperativeHandle` should be used with `React.forwardRef`.
      *
-     * @version experimental
-     * @see https://reactjs.org/docs/hooks-reference.html#useimperativemethods
+     * @version 16.8.0
+     * @see https://reactjs.org/docs/hooks-reference.html#useimperativehandle
      */
-    function useImperativeMethods<T, R extends T>(ref: Ref<T>|undefined, init: () => R, inputs?: InputIdentityList): void;
+    function useImperativeHandle<T, R extends T>(ref: Ref<T>|undefined, init: () => R, deps?: DependencyList): void;
     // I made 'inputs' required here and in useMemo as there's no point to memoizing without the memoization key
     // useCallback(X) is identical to just using X, useMemo(() => Y) is identical to just using Y.
     /**
      * `useCallback` will return a memoized version of the callback that only changes if one of the `inputs`
      * has changed.
      *
-     * @version experimental
+     * @version 16.8.0
      * @see https://reactjs.org/docs/hooks-reference.html#usecallback
      */
     // TODO (TypeScript 3.0): <T extends (...args: never[]) => unknown>
-    function useCallback<T extends (...args: any[]) => any>(callback: T, inputs: InputIdentityList): T;
+    function useCallback<T extends (...args: any[]) => any>(callback: T, deps: DependencyList): T;
     /**
-     * `useMemo` will only recompute the memoized value when one of the `inputs` has changed.
+     * `useMemo` will only recompute the memoized value when one of the `deps` has changed.
      *
      * Usage note: if calling `useMemo` with a referentially stable function, also give it as the input in
      * the second argument.
@@ -904,10 +977,23 @@ declare namespace React {
      * }
      * ```
      *
-     * @version experimental
+     * @version 16.8.0
      * @see https://reactjs.org/docs/hooks-reference.html#usememo
      */
-    function useMemo<T>(factory: () => T, inputs: InputIdentityList): T;
+    // allow undefined, but don't make it optional as that is very likely a mistake
+    function useMemo<T>(factory: () => T, deps: DependencyList | undefined): T;
+    /**
+     * `useDebugValue` can be used to display a label for custom hooks in React DevTools.
+     *
+     * NOTE: We don’t recommend adding debug values to every custom hook.
+     * It’s most valuable for custom hooks that are part of shared libraries.
+     *
+     * @version 16.8.0
+     * @see https://reactjs.org/docs/hooks-reference.html#usedebugvalue
+     */
+    // the name of the custom hook is itself derived from the function name at runtime:
+    // it's just the function name without the "use" prefix.
+    function useDebugValue<T>(value: T, format?: (value: T) => any): void;
 
     //
     // Event System
diff --git a/types/react/test/hooks.tsx b/types/react/test/hooks.tsx
index 5239d3b522..70ea9a0ce7 100644
--- a/types/react/test/hooks.tsx
+++ b/types/react/test/hooks.tsx
@@ -21,7 +21,7 @@ export const FancyButton = React.forwardRef((props: FancyButtonProps, ref: React
     const buttonRef = React.useRef<HTMLButtonElement | null>(null);
     const [count, setCount] = React.useState(0);
 
-    React.useImperativeMethods(ref, () => ({
+    React.useImperativeHandle(ref, () => ({
         fancyClick() {
             buttonRef.current!; // $ExpectType HTMLButtonElement
         },
@@ -63,7 +63,13 @@ export function App() {
     const birthdayRef = React.useRef<FancyButton>(null);
 
     React.useLayoutEffect(() => {
-        birthdayRef.current!.fancyClick();
+        if (birthdayRef.current !== null) {
+            birthdayRef.current.fancyClick();
+        } else {
+            // this looks redundant but it ensures the type actually has "null" in it instead of "never"
+            // $ExpectType null
+            birthdayRef.current;
+        }
     });
 
     return <>
@@ -85,16 +91,66 @@ const context = React.createContext<Context>({ test: true });
 function useEveryHook(ref: React.Ref<{ id: number }>|undefined): () => boolean {
     const value: Context = React.useContext(context);
     const [, setState] = React.useState(() => 0);
-    const [reducerState, dispatch] = React.useReducer(reducer, initialState, { type: 'resetAge' });
-    // make sure this is not going to the |null overload
-    // $ExpectType MutableRefObject<boolean>
-    const didLayout = React.useRef(false);
+    // Bonus typescript@next version
+    // const [reducerState, dispatch] = React.useReducer(reducer, true as const, arg => arg && initialState);
+    // Compile error in typescript@3.0 but not in typescript@3.1.
+    // const [reducerState, dispatch] = React.useReducer(reducer, true as true, arg => arg && initialState);
+    const [reducerState, dispatch] = React.useReducer(reducer, true as true, (arg: true): AppState => arg && initialState);
+
+    // inline object, to (manually) check if autocomplete works
+    React.useReducer(reducer, { age: 42, name: 'The Answer' });
+
+    // test useRef and its convenience overloads
+    // $ExpectType MutableRefObject<number>
+    React.useRef(0);
+
+    // these are not very useful (can't assign anything else to .current)
+    // but it's the only safe way to resolve them
+    // $ExpectType MutableRefObject<null>
+    React.useRef(null);
+    // $ExpectType MutableRefObject<undefined>
+    React.useRef(undefined);
+
+    // |null convenience overload
+    // it should _not_ be mutable if the generic argument doesn't include null
+    // $ExpectType RefObject<number>
+    React.useRef<number>(null);
+    // but it should be mutable if it does (i.e. is not the convenience overload)
+    // $ExpectType MutableRefObject<number | null>
+    React.useRef<number | null>(null);
+
+    // |undefined convenience overload
+    // with no contextual type or generic argument it should default to undefined only (not {} or unknown!)
+    // $ExpectType MutableRefObject<undefined>
+    React.useRef();
+    // $ExpectType MutableRefObject<number | undefined>
+    React.useRef<number>();
+    // don't just accept a potential undefined if there is a generic argument
+    // $ExpectError
+    React.useRef<number>(undefined);
+    // make sure once again there's no |undefined if the initial value doesn't either
+    // $ExpectType MutableRefObject<number>
+    React.useRef<number>(1);
+    // and also that it is not getting erased if the parameter is wider
+    // $ExpectType MutableRefObject<number | undefined>
+    React.useRef<number | undefined>(1);
+
+    // should be contextually typed
+    const a: React.MutableRefObject<number | undefined> = React.useRef(undefined);
+    const b: React.MutableRefObject<number | undefined> = React.useRef();
+    const c: React.MutableRefObject<number | null> = React.useRef(null);
+    const d: React.RefObject<number> = React.useRef(null);
 
     const id = React.useMemo(() => Math.random(), []);
-    React.useImperativeMethods(ref, () => ({ id }), [id]);
+    React.useImperativeHandle(ref, () => ({ id }), [id]);
+    // was named like this in the first alpha, renamed before release
     // $ExpectError
     React.useImperativeMethods(ref, () => ({}), [id]);
 
+    // make sure again this is not going to the |null convenience overload
+    // $ExpectType MutableRefObject<boolean>
+    const didLayout = React.useRef(false);
+
     React.useLayoutEffect(() => {
         setState(1);
         setState(prevState => prevState - 1);
@@ -105,6 +161,49 @@ function useEveryHook(ref: React.Ref<{ id: number }>|undefined): () => boolean {
         setState(reducerState.age);
     }, []);
 
+    // effects are only allowed to either be actually void or return actually void functions
+    React.useEffect(() => () => {});
+    // indistinguishable
+    React.useEffect(() => () => undefined);
+    // $ExpectError
+    React.useEffect(() => null);
+    // $ExpectError
+    React.useEffect(() => Math.random() ? null : undefined);
+    // $ExpectError
+    React.useEffect(() => () => null);
+    // $ExpectError
+    React.useEffect(() => () => Math.random() ? null : undefined);
+    // $ExpectError
+    React.useEffect(() => async () => {});
+    // $ExpectError
+    React.useEffect(async () => () => {});
+
+    React.useDebugValue(id, value => value.toFixed());
+    React.useDebugValue(id);
+
+    // allow passing an explicit undefined
+    React.useMemo(() => {}, undefined);
+    // but don't allow it to be missing
+    // $ExpectError
+    React.useMemo(() => {});
+
+    // useState convenience overload
+    // default to undefined only (not that useful, but type-safe -- no {} or unknown!)
+    // $ExpectType undefined
+    React.useState()[0];
+    // $ExpectType number | undefined
+    React.useState<number>()[0];
+    // default overload
+    // $ExpectType number
+    React.useState(0)[0];
+    // $ExpectType undefined
+    React.useState(undefined)[0];
+    // make sure the generic argument does reject actual potentially undefined inputs
+    // $ExpectError
+    React.useState<number>(undefined)[0];
+
+    // useReducer convenience overload
+
     return React.useCallback(() => didLayout.current, []);
 }
 
@@ -118,5 +217,6 @@ const UsesEveryHook = React.forwardRef(
 );
 const everyHookRef = React.createRef<{ id: number }>();
 <UsesEveryHook ref={everyHookRef}/>;
+
 // TODO: "implicit any" in typescript@3.0 but not in typescript@3.1
 // <UsesEveryHook ref={ref => { ref && console.log(ref.id); }}/>;
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index ada2f860ba..d4fee49d30 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -494,7 +494,7 @@ const mappedChildrenArrayWithKnownChildren: number[] =
     React.Children.map(childrenArray, (child) => child.props.p);
 React.Children.forEach(children, (child) => { });
 const nChildren: number = React.Children.count(children);
-let onlyChild: React.ReactElement<any> = React.Children.only(DOM.div()); // ok
+let onlyChild: React.ReactElement = React.Children.only(DOM.div()); // ok
 onlyChild = React.Children.only([null, [[["Hallo"], true]], false]); // error
 const childrenToArray: React.ReactChild[] = React.Children.toArray(children);
 
diff --git a/types/react/v15/index.d.ts b/types/react/v15/index.d.ts
index ce2a523123..512fb5a0a7 100644
--- a/types/react/v15/index.d.ts
+++ b/types/react/v15/index.d.ts
@@ -89,7 +89,7 @@ declare namespace React {
         ref?: Ref<T>;
     }
 
-    interface ReactElement<P> {
+    interface ReactElement<P = any> {
         type: string | ComponentClass<P> | SFC<P>;
         props: P;
         key: Key | null;
@@ -180,7 +180,7 @@ declare namespace React {
     // ----------------------------------------------------------------------
 
     type ReactText = string | number;
-    type ReactChild = ReactElement<any> | ReactText;
+    type ReactChild = ReactElement | ReactText;
 
     interface ReactNodeArray extends Array<ReactNode> {}
     type ReactFragment = {} | ReactNodeArray;
@@ -343,7 +343,7 @@ declare namespace React {
 
     type SFC<P = {}> = StatelessComponent<P>;
     interface StatelessComponent<P = {}> {
-        (props: P & { children?: ReactNode }, context?: any): ReactElement<any> | null;
+        (props: P & { children?: ReactNode }, context?: any): ReactElement | null;
         propTypes?: ValidationMap<P>;
         contextTypes?: ValidationMap<any>;
         defaultProps?: Partial<P>;
@@ -404,7 +404,7 @@ declare namespace React {
     }
 
     interface ComponentSpec<P, S> extends Mixin<P, S> {
-        render(): ReactElement<any> | null;
+        render(): ReactElement | null;
 
         [propertyName: string]: any;
     }
@@ -3581,11 +3581,11 @@ declare namespace React {
     // ----------------------------------------------------------------------
 
     interface ReactChildren {
-        map<T, C extends ReactElement<any>>(children: C[], fn: (child: C, index: number) => T): T[];
+        map<T, C extends ReactElement>(children: C[], fn: (child: C, index: number) => T): T[];
         map<T>(children: ReactNode, fn: (child: ReactChild, index: number) => T): T[];
         forEach(children: ReactNode, fn: (child: ReactChild, index: number) => any): void;
         count(children: ReactNode): number;
-        only(children: ReactNode): ReactElement<any>;
+        only(children: ReactNode): ReactElement;
         toArray(children: ReactNode): ReactChild[];
     }
 
@@ -3621,7 +3621,7 @@ declare namespace React {
 declare global {
     namespace JSX {
         // tslint:disable-next-line:no-empty-interface
-        interface Element extends React.ReactElement<any> { }
+        interface Element extends React.ReactElement { }
         interface ElementClass extends React.Component<any> {
             render(): JSX.Element | null | false;
         }
diff --git a/types/react/v15/test/index.ts b/types/react/v15/test/index.ts
index 79d05ac8d0..fe80439752 100644
--- a/types/react/v15/test/index.ts
+++ b/types/react/v15/test/index.ts
@@ -441,7 +441,7 @@ const PropTypesSpecification: React.ComponentSpec<any, any> = {
             return null;
         }
     },
-    render: (): React.ReactElement<any> | null => {
+    render: (): React.ReactElement | null => {
         return null;
     }
 };
@@ -498,7 +498,7 @@ const mappedChildrenArrayWithKnownChildren: number[] =
     React.Children.map(childrenArray, (child) => child.props.p);
 React.Children.forEach(children, (child) => { });
 const nChildren: number = React.Children.count(children);
-let onlyChild: React.ReactElement<any> = React.Children.only(React.DOM.div()); // ok
+let onlyChild: React.ReactElement = React.Children.only(React.DOM.div()); // ok
 onlyChild = React.Children.only([null, [[["Hallo"], true]], false]); // error
 const childrenToArray: React.ReactChild[] = React.Children.toArray(children);
 
diff --git a/types/reactable/index.d.ts b/types/reactable/index.d.ts
index 5a6b80317d..44a51974f8 100644
--- a/types/reactable/index.d.ts
+++ b/types/reactable/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for reactable 0.14
-// Project: https://github.com/glittershark/reactable
-// Definitions by: Christoph Spielmann <https://github.com/spielc>
+// Project: https://github.com/abdulrahman-khankan/reactable
+// Definitions by: Christoph Spielmann <https://github.com/spielc>, Priscila Moneo <https://github.com/priscila-moneo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -23,10 +23,16 @@ export interface TableComponentProperties<T> {
     columns?: ColumnsType[];
     defaultSort?: { column: string, direction: SortDirection };
     id?: string;
-    sortable?: string[];
+    sortable?: string[] | boolean;
+    sortBy?: boolean;
     filterable?: string[];
     filterBy?: string;
     onFilter?: FilterMethodType;
+    itemsPerPage?: number;
+    noDataText?: string;
+    pageButtonLimit?: number;
+    currentPage?: number;
+    hideFilterInput?: boolean;
 }
 
 export interface ThProperties {
diff --git a/types/reactstrap/index.d.ts b/types/reactstrap/index.d.ts
index 64af33fde2..adadd7886a 100644
--- a/types/reactstrap/index.d.ts
+++ b/types/reactstrap/index.d.ts
@@ -246,7 +246,8 @@ import {
   UncontrolledDropdown as UncontrolledDropdown_,
   UncontrolledTooltip as UncontrolledTooltip_,
   UncontrolledCollapse as UncontrolledCollapse_,
-  UncontrolledCarousel as UncontrolledCarousel_
+  UncontrolledCarousel as UncontrolledCarousel_,
+  UncontrolledPopover as UncontrolledPopover_
 } from './lib/Uncontrolled';
 export class UncontrolledAlert<T = {}> extends UncontrolledAlert_<T> {}
 export class UncontrolledButtonDropdown<T = {}> extends UncontrolledButtonDropdown_<T> {}
@@ -254,11 +255,13 @@ export class UncontrolledDropdown<T = {}> extends UncontrolledDropdown_<T> {}
 export class UncontrolledTooltip<T = {}> extends UncontrolledTooltip_<T> {}
 export class UncontrolledCollapse<T = {}> extends UncontrolledCollapse_<T> {}
 export class UncontrolledCarousel<T = {}> extends UncontrolledCarousel_<T> {}
+export class UncontrolledPopover<T = {}> extends UncontrolledPopover_<T> {}
 export {
   UncontrolledButtonDropdownProps,
   UncontrolledAlertProps,
   UncontrolledDropdownProps,
   UncontrolledTooltipProps,
   UncontrolledCollapseProps,
-  UncontrolledCarouselProps
+  UncontrolledCarouselProps,
+  UncontrolledPopoverProps
 } from './lib/Uncontrolled';
diff --git a/types/reactstrap/lib/CustomInput.d.ts b/types/reactstrap/lib/CustomInput.d.ts
index 8527c29455..5d0af9f5c8 100644
--- a/types/reactstrap/lib/CustomInput.d.ts
+++ b/types/reactstrap/lib/CustomInput.d.ts
@@ -10,7 +10,7 @@ export type CustomInputType =
 
 export type CustomInputProps<T = {}> = React.InputHTMLAttributes<HTMLInputElement> & {
   type: CustomInputType;
-  label?: string;
+  label?: React.ReactNode;
   inline?: boolean;
   bsSize?: 'lg' | 'sm';
   valid?: boolean;
diff --git a/types/reactstrap/lib/Popover.d.ts b/types/reactstrap/lib/Popover.d.ts
index 187e76b0eb..8677fe69fa 100644
--- a/types/reactstrap/lib/Popover.d.ts
+++ b/types/reactstrap/lib/Popover.d.ts
@@ -19,5 +19,9 @@ export type PopoverProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
+export type UncontrolledPopoverProps<T = {}> = PopoverProps<T> & {
+    defaultOpen?: boolean;
+};
+
 declare class Popover<T> extends React.Component<PopoverProps<T>> {}
 export default Popover;
diff --git a/types/reactstrap/lib/Uncontrolled.d.ts b/types/reactstrap/lib/Uncontrolled.d.ts
index 3be770852f..f20db2f896 100644
--- a/types/reactstrap/lib/Uncontrolled.d.ts
+++ b/types/reactstrap/lib/Uncontrolled.d.ts
@@ -5,7 +5,8 @@ import { UncontrolledButtonDropdownProps } from './ButtonDropdown';
 import { UncontrolledDropdownProps       } from './Dropdown';
 import { UncontrolledTooltipProps        } from './Tooltip';
 import { UncontrolledCollapseProps       } from './Collapse';
-import { UncontrolledCarouselProps       } from "./Carousel";
+import { UncontrolledCarouselProps       } from './Carousel';
+import { UncontrolledPopoverProps        } from './Popover';
 
 export class UncontrolledAlert<T = {}> extends React.Component<UncontrolledAlertProps<T>> {}
 export class UncontrolledButtonDropdown<T = {}> extends React.Component<UncontrolledButtonDropdownProps<T>> {}
@@ -13,10 +14,12 @@ export class UncontrolledDropdown<T = {}> extends React.Component<UncontrolledDr
 export class UncontrolledTooltip<T = {}> extends React.Component<UncontrolledTooltipProps<T>> {}
 export class UncontrolledCollapse<T = {}> extends React.Component<UncontrolledCollapseProps<T>> {}
 export class UncontrolledCarousel<T = {}> extends React.Component<UncontrolledCarouselProps<T>> {}
+export class UncontrolledPopover<T = {}> extends React.Component<UncontrolledPopoverProps<T>> {}
 
 export { UncontrolledAlertProps          } from './Alert';
 export { UncontrolledButtonDropdownProps } from './ButtonDropdown';
 export { UncontrolledDropdownProps       } from './Dropdown';
 export { UncontrolledTooltipProps        } from './Tooltip';
 export { UncontrolledCollapseProps       } from './Collapse';
-export { UncontrolledCarouselProps       } from "./Carousel";
+export { UncontrolledCarouselProps       } from './Carousel';
+export { UncontrolledPopoverProps        } from './Popover';
diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index a84d8010b6..67c24bce28 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -80,7 +80,8 @@ import {
   Table,
   Tag,
   Tooltip,
-  Spinner
+  Spinner,
+  UncontrolledPopover,
 } from 'reactstrap';
 
 // --------------- Alert
@@ -4111,7 +4112,8 @@ class Example119 extends React.Component<any, any> {
           <div>
             <CustomInput type="checkbox" id="exampleCustomCheckbox" label="Check this custom checkbox" />
             <CustomInput type="checkbox" id="exampleCustomCheckbox2" label="Or this one" />
-            <CustomInput type="checkbox" id="exampleCustomCheckbox3" label="But not this disabled one" disabled />
+            <CustomInput type="checkbox" id="exampleCustomCheckbox3" label={<span>Or this one</span>} />
+            <CustomInput type="checkbox" id="exampleCustomCheckbox4" label="But not this disabled one" disabled />
           </div>
         </FormGroup>
         <FormGroup>
@@ -4119,7 +4121,8 @@ class Example119 extends React.Component<any, any> {
           <div>
             <CustomInput type="radio" id="exampleCustomRadio" name="customRadio" label="Select this custom radio" />
             <CustomInput type="radio" id="exampleCustomRadio2" name="customRadio" label="Or this one" />
-            <CustomInput type="radio" id="exampleCustomRadio3" label="But not this disabled one" disabled />
+            <CustomInput type="radio" id="exampleCustomRadio3" name="customRadio" label={<span>Or this one</span>} />
+            <CustomInput type="radio" id="exampleCustomRadio4" label="But not this disabled one" disabled />
           </div>
         </FormGroup>
         <FormGroup>
@@ -4127,6 +4130,7 @@ class Example119 extends React.Component<any, any> {
           <div>
             <CustomInput type="checkbox" id="exampleCustomInline" label="An inline custom input" inline />
             <CustomInput type="checkbox" id="exampleCustomInline2" label="and another one" inline />
+            <CustomInput type="checkbox" id="exampleCustomInline3" label={<span>and this one</span>} inline />
           </div>
         </FormGroup>
         <FormGroup>
@@ -4180,6 +4184,7 @@ class Example119 extends React.Component<any, any> {
         <FormGroup>
           <Label for="exampleCustomFileBrowser">File Browser with Custom Label</Label>
           <CustomInput type="file" id="exampleCustomFileBrowser" name="customFile" label="Yo, pick a file!" />
+          <CustomInput type="file" id="exampleCustomFileBrowser1" name="customFile" label={<span>Yo, pick a file!</span>} />
         </FormGroup>
         <FormGroup>
           <Label for="exampleCustomFileBrowser">File Browser Disabled</Label>
@@ -4337,3 +4342,18 @@ function Example125() {
     </div>
   );
 }
+
+function Example126() {
+    return (
+        <div>
+            <UncontrolledPopover placement="bottom" target="UncontrolledPopover">
+                <PopoverHeader>Popover Title</PopoverHeader>
+                <PopoverBody>Lorem ipsum dolor sit amet</PopoverBody>
+            </UncontrolledPopover>
+            <UncontrolledPopover defaultOpen={true} placement="bottom" target="UncontrolledPopover">
+                <PopoverHeader>Popover Title</PopoverHeader>
+                <PopoverBody>Lorem ipsum dolor sit amet</PopoverBody>
+            </UncontrolledPopover>
+        </div>
+    );
+}
diff --git a/types/readdir-enhanced/index.d.ts b/types/readdir-enhanced/index.d.ts
index afd724d57d..f9d3947ba0 100644
--- a/types/readdir-enhanced/index.d.ts
+++ b/types/readdir-enhanced/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for readdir-enhanced 2.2
-// Project: https://github.com/bigstickcarpet/readdir-enhanced
+// Project: https://github.com/bigstickcarpet/readdir-enhanced, https://jsdevtools.org/readdir-enhanced
 // Definitions by: mrmlnc <https://github.com/mrmlnc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts
index f05d136f69..7682bbc68c 100644
--- a/types/rebass/index.d.ts
+++ b/types/rebass/index.d.ts
@@ -1,107 +1,114 @@
-// Type definitions for Rebass 0.3.8
-// Project: https://github.com/jxnblk/rebass
-// Definitions by: rhysd <https://rhysd.github.io>
+// Type definitions for Rebass 3.0
+// Project: https://github.com/rebassjs/rebass
+// Definitions by: rhysd <https://github.com/rhysd>
 //                 ryee-dev <https://github.com/ryee-dev>
 //                 jamesmckenzie <https://github.com/jamesmckenzie>
+//                 sara f-p <https://github.com/gretzky>
+//                 angusfretwell <https://github.com/angusfretwell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 2.9
 
 import * as React from "react";
+import * as StyledComponents from "styled-components";
+import * as StyledSystem from "styled-system";
 
-export interface BaseProps<C> extends React.ClassAttributes<C> {
-    className?: string;
-    as?: string;
+export {};
+
+type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
+
+export interface BaseProps extends React.Props<any> {
+    as?: React.ReactType;
+    css?: StyledComponents.CSSObject;
 }
 
-export interface SpaceProps<C> extends BaseProps<C> {
-    m?: number | string;
-    mt?: number | string;
-    mr?: number | string;
-    mb?: number | string;
-    ml?: number | string;
-    mx?: number | string;
-    my?: number | string;
-    p?: number | string;
-    pt?: number | string;
-    pr?: number | string;
-    pb?: number | string;
-    pl?: number | string;
-    px?: number | string;
-    py?: number | string;
-}
+interface BoxKnownProps
+    extends BaseProps,
+        StyledSystem.SpaceProps,
+        StyledSystem.WidthProps,
+        StyledSystem.FontSizeProps,
+        StyledSystem.ColorProps,
+        StyledSystem.FlexProps,
+        StyledSystem.OrderProps,
+        StyledSystem.AlignSelfProps {}
+export interface BoxProps
+    extends BoxKnownProps,
+        Omit<React.HTMLProps<HTMLDivElement>, keyof BoxKnownProps> {}
+export const Box: React.FunctionComponent<BoxProps>;
 
-export interface BoxProps extends SpaceProps<BoxClass> {
-    className?: string;
-    width?: number | string | ReadonlyArray<number>;
-    fontSize?: number | ReadonlyArray<number>;
-    css?: Object;
-    color?: string;
-    bg?: string;
-}
-type BoxClass = React.StatelessComponent<BoxProps>;
-export declare const Box: BoxClass;
+interface ButtonKnownProps
+    extends BoxKnownProps,
+        StyledSystem.FontWeightProps,
+        StyledSystem.BorderProps,
+        StyledSystem.BordersProps,
+        StyledSystem.BorderColorProps,
+        StyledSystem.BorderRadiusProps,
+        StyledSystem.ButtonStyleProps {}
+export interface ButtonProps
+    extends ButtonKnownProps,
+        Omit<React.HTMLProps<HTMLButtonElement>, keyof ButtonKnownProps> {}
+export const Button: React.FunctionComponent<ButtonProps>;
 
-export interface ButtonProps extends BoxProps {
-    fontWeight?: string;
-    border?: number | string;
-    borderColor?: string;
-    borderRadius?: number | string;
-    variant?: string;
+interface CardKnownProps
+    extends BoxKnownProps,
+        StyledSystem.BorderProps,
+        StyledSystem.BordersProps,
+        StyledSystem.BorderColorProps,
+        StyledSystem.BorderRadiusProps,
+        StyledSystem.BoxShadowProps,
+        StyledSystem.BackgroundImageProps,
+        StyledSystem.BackgroundSizeProps,
+        StyledSystem.BackgroundPositionProps,
+        StyledSystem.BackgroundRepeatProps,
+        StyledSystem.OpacityProps {
+    variant?: StyledSystem.ResponsiveValue<string>;
 }
-type ButtonClass = React.StatelessComponent<ButtonProps>;
-export declare const Button: ButtonClass;
+export interface CardProps
+    extends CardKnownProps,
+        Omit<React.HTMLProps<HTMLDivElement>, keyof CardKnownProps> {}
+export const Card: React.FunctionComponent<CardProps>;
 
-export interface CardProps extends BoxProps {
-    border?: number | string;
-    borderColor?: string;
-    borderRadius?: number | string;
-    boxShadow?: string;
-    backgroundImage?: string;
-    backgroundSize?: string;
-    backgroundPosition?: string;
-    backgroundRepeat?: string;
-    opacity?: number;
-    variant?: string;
-}
-type CardClass = React.StatelessComponent<CardProps>;
-export declare const Card: CardClass;
+interface FlexKnownProps
+    extends BoxKnownProps,
+        StyledSystem.FlexWrapProps,
+        StyledSystem.FlexDirectionProps,
+        StyledSystem.AlignItemsProps,
+        StyledSystem.JustifyContentProps {}
+export interface FlexProps
+    extends FlexKnownProps,
+        Omit<React.HTMLProps<HTMLDivElement>, keyof FlexKnownProps> {}
+export const Flex: React.FunctionComponent<FlexProps>;
 
-export interface FlexProps extends BoxProps {
-    alignItems?: string;
-    justifyContent?: string;
-    flexDirection?: string;
-    flexWrap?: string;
-}
-type FlexClass = React.StatelessComponent<FlexProps>;
-export declare const Flex: FlexClass;
+interface ImageKnownProps
+    extends BoxKnownProps,
+        StyledSystem.HeightProps,
+        StyledSystem.BorderRadiusProps {}
+export interface ImageProps
+    extends ImageKnownProps,
+        Omit<React.HTMLProps<HTMLImageElement>, keyof ImageKnownProps> {}
+export const Image: React.FunctionComponent<ImageProps>;
 
-export interface ImageProps extends BoxProps {
-    height?: number | string;
-    borderRadius?: number | string;
-    src?: string;
-    alt?: string;
-}
-type ImageClass = React.StatelessComponent<ImageProps>;
-export declare const Image: ImageClass;
+// tslint:disable-next-line no-empty-interface
+interface LinkKnownProps extends BoxKnownProps {}
+export interface LinkProps
+    extends LinkKnownProps,
+        Omit<React.HTMLProps<HTMLAnchorElement>, keyof LinkKnownProps> {}
+export const Link: React.FunctionComponent<LinkProps>;
 
-export interface LinkProps extends BoxProps {
-    href?: string;
-}
-type LinkClass = React.StatelessComponent<LinkProps>;
-export declare const Link: LinkClass;
+interface TextKnownProps
+    extends BoxKnownProps,
+        StyledSystem.FontFamilyProps,
+        StyledSystem.FontWeightProps,
+        StyledSystem.TextAlignProps,
+        StyledSystem.LineHeightProps,
+        StyledSystem.LetterSpacingProps {}
+export interface TextProps
+    extends TextKnownProps,
+        Omit<React.HTMLProps<HTMLDivElement>, keyof TextKnownProps> {}
+export const Text: React.FunctionComponent<TextProps>;
 
-export interface TextProps extends BoxProps {
-    fontSize?: number | ReadonlyArray<number>;
-    fontWeight?: string;
-    color?: string;
-    fontFamily?: string;
-    textAlign?: string;
-    lineHeight?: number | string;
-    letterSpacing?: number | string;
-}
-type TextClass = React.StatelessComponent<TextProps>;
-export declare const Text: TextClass;
-
-export interface HeadingProps extends TextProps {}
-type HeadingClass = React.StatelessComponent<HeadingProps>;
-export declare const Heading: HeadingClass;
+// tslint:disable-next-line no-empty-interface
+interface HeadingKnownProps extends TextKnownProps {}
+export interface HeadingProps
+    extends HeadingKnownProps,
+        Omit<React.HTMLProps<HTMLHeadingElement>, keyof HeadingKnownProps> {}
+export const Heading: React.FunctionComponent<HeadingProps>;
diff --git a/types/rebass/rebass-tests.tsx b/types/rebass/rebass-tests.tsx
index fb0eae1ed4..87df64f323 100644
--- a/types/rebass/rebass-tests.tsx
+++ b/types/rebass/rebass-tests.tsx
@@ -1,13 +1,26 @@
-import * as React from 'react'
-import { Box, Flex, Text, Heading, Button, Link, Image, Card } from 'rebass'
+import * as React from "react";
+import styled from "styled-components";
+import { Box, Flex, Text, Heading, Button, Link, Image, Card } from "rebass";
 
-const RebassTests = () => (
-    <Box width={1} css={{ height: '100vh' }} ml="1em">
+const CustomComponent: React.FunctionComponent = ({ children }) => {
+    return <div>{children}</div>;
+};
+
+const ExtendedBox = styled(Box)`
+    color: red;
+`;
+
+ExtendedBox.defaultProps = {
+    p: 3
+};
+
+() => (
+    <Box width={1} css={{ height: "100vh" }} py={[1, 2, 3]} ml="1em">
         <Flex width={1} alignItems="center" justifyContent="center">
             <Heading fontSize={5} fontWeight="bold">
                 Hi, I'm a heading.
             </Heading>
-            <Text fontSize={3} lineHeight="1em" letterSpacing="1rem">
+            <Text as="p" fontSize={3} lineHeight="1em" letterSpacing="1rem">
                 Hi, I'm text.
             </Text>
             <Card
@@ -26,10 +39,16 @@ const RebassTests = () => (
                 src="https://source.unsplash.com/random/1280x720"
                 borderRadius="1em"
             />
-            <Link href="https://rebassjs.org">Link</Link>
+            <Link href="https://rebassjs.org" title="Rebass" target="_blank">
+                Link
+            </Link>
             <Button bg="magenta" border="1em" borderRadius="1em">
                 Button
             </Button>
+            <Box as={CustomComponent} bg="red">
+                CustomComponent
+            </Box>
+            <ExtendedBox m={2}>ExtendedBox</ExtendedBox>
         </Flex>
     </Box>
-)
+);
diff --git a/types/rebass/tslint.json b/types/rebass/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/rebass/tslint.json
+++ b/types/rebass/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/recase/index.d.ts b/types/recase/index.d.ts
index 29808f6130..2d81726b83 100644
--- a/types/recase/index.d.ts
+++ b/types/recase/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Recase 1.0
-// Project: https://www.npmjs.com/package/recase
+// Project: https://github.com/coolaj86/recase-js
 // Definitions by: Mikal Madsen <https://github.com/18steps>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index 426e74d6ba..963f68600c 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Recharts 1.1
-// Project: http://recharts.org/
+// Project: http://recharts.org/, https://github.com/recharts/recharts
 // Definitions by: Maarten Mulders <https://github.com/mthmulders>
 //                 Raphael Mueller <https://github.com/rapmue>
 //                 Roy Xue <https://github.com/royxue>
@@ -12,6 +12,7 @@
 //                 Harry Cruse <https://github.com/crusectrl>
 //                 Andrew Palugniok <https://github.com/apalugniok>
 //                 Robert Stigsson <https://github.com/RobertStigsson>
+//                 Kosaku Kurino <https://github.com/kousaku-maron>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -170,9 +171,9 @@ export interface AreaProps extends EventAttributes, Partial<PresentationAttribut
     stackId?: string | number;
     legendType?: LegendType;
     connectNulls?: boolean;
-    activeDot?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
-    dot?: boolean | object | React.ReactElement<any> | ContentRenderer<DotProps>;
-    label?: boolean | object | ContentRenderer<any> | React.ReactElement<any>;
+    activeDot?: boolean | object | React.ReactElement | ContentRenderer<any>;
+    dot?: boolean | object | React.ReactElement | ContentRenderer<DotProps>;
+    label?: boolean | object | ContentRenderer<any> | React.ReactElement;
     hide?: boolean;
     layout?: LayoutType;
     baseLine?: number | any[];
@@ -213,9 +214,9 @@ export interface BarProps extends EventAttributes, Partial<PresentationAttribute
     minPointSize?: number;
     maxBarSize?: number;
     hide?: boolean;
-    shape?: React.ReactElement<any> | ContentRenderer<RectangleProps>;
+    shape?: React.ReactElement | ContentRenderer<RectangleProps>;
     data?: BarData[];
-    background?: boolean | React.ReactElement<any> | ContentRenderer<any> | object;
+    background?: boolean | React.ReactElement | ContentRenderer<any> | object;
     // see label section at http://recharts.org/#/en-US/api/Bar
     label?: boolean | Label | React.SFC<LabelProps> | React.ReactElement<LabelProps> | ContentRenderer<any>;
 }
@@ -257,7 +258,7 @@ export interface CartesianAxisProps extends EventAttributes, Partial<Presentatio
     height?: number;
     orientation?: 'top' | 'bottom' | 'left' | 'right';
     viewBox?: ViewBox;
-    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement;
     axisLine?: boolean | object;
     tickLine?: boolean | object;
     mirror?: boolean;
@@ -283,8 +284,8 @@ export interface CartesianGridProps extends Partial<PresentationAttributes> {
     y?: number;
     width?: number;
     height?: number;
-    horizontal?: object | React.ReactElement<any> | ContentRenderer<LineProps & CartesianGridProps> | boolean;
-    vertical?: object | React.ReactElement<any> | ContentRenderer<LineProps & CartesianGridProps> | boolean;
+    horizontal?: object | React.ReactElement | ContentRenderer<LineProps & CartesianGridProps> | boolean;
+    vertical?: object | React.ReactElement | ContentRenderer<LineProps & CartesianGridProps> | boolean;
     horizontalPoints?: number[];
     verticalPoints?: number[];
     horizontalCoordinatesGenerator?: CoordinatesGenerator;
@@ -374,7 +375,7 @@ export interface LegendPayload {
 export type BBoxUpdateCallback = (box: { width: number; height: number; }) => void;
 
 export interface LegendProps {
-    content?: React.ReactElement<any> | ContentRenderer<LegendProps>;
+    content?: React.ReactElement | ContentRenderer<LegendProps>;
     wrapperStyle?: object;
     chartWidth?: number;
     chartHeight?: number;
@@ -409,15 +410,15 @@ export interface LineProps extends EventAttributes, Partial<PresentationAttribut
     layout?: LayoutType;
     connectNulls?: boolean;
     hide?: boolean;
-    activeDot?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
-    dot?: object | React.ReactElement<any> | ContentRenderer<DotProps> | boolean;
+    activeDot?: object | React.ReactElement | ContentRenderer<any> | boolean;
+    dot?: object | React.ReactElement | ContentRenderer<DotProps> | boolean;
     top?: number;
     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>;
+    label?: boolean | object | React.ReactElement | ContentRenderer<any>;
     points?: Point[];
 }
 
@@ -448,15 +449,26 @@ export interface PieProps extends EventAttributes, Partial<PresentationAttribute
     maxRadius?: number;
     sectors?: object[];
     hide?: boolean;
-    labelLine?: object | ContentRenderer<LineProps & any> | React.ReactElement<any> | boolean;
+    labelLine?: object | ContentRenderer<LineProps & any> | React.ReactElement | boolean;
     label?: {
         offsetRadius: number;
-    } | React.ReactElement<any> | ContentRenderer<any> | boolean;
-    activeShape?: object | ContentRenderer<any> | React.ReactElement<any>;
+    } | React.ReactElement | ContentRenderer<PieLabelRenderProps> | boolean;
+    activeShape?: object | ContentRenderer<any> | React.ReactElement;
     activeIndex?: number | number[];
     blendStroke?: boolean;
 }
 
+export interface PieLabelRenderProps extends PieProps {
+    name: string;
+    percent?: number;
+    stroke: string;
+    index?: number;
+    textAnchor: string;
+    x: number;
+    y: number;
+    [key: string]: any;
+}
+
 export class Pie extends React.Component<PieProps> { }
 
 // NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
@@ -488,7 +500,7 @@ export interface PolarAngleAxisProps extends EventAttributes, Partial<Presentati
     axisLine?: boolean | object;
     axisLineType?: 'polygon' | 'circle';
     tickLine?: boolean | object;
-    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement;
     ticks?: PolarAngleAxisTick[];
     stroke?: string;
     orientation?: 'inner' | 'outer';
@@ -527,7 +539,7 @@ export interface PolarRadiusAxisProps extends EventAttributes, Partial<Presentat
     ticks?: PolarRadiusAxisTick[];
     orientation?: "left" | "right" | "middle";
     axisLine?: boolean | object;
-    tick?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
+    tick?: boolean | object | React.ReactElement | ContentRenderer<any>;
     stroke?: string;
     tickFormatter?: TickFormatterFunction;
     domain?: [PolarRadiusAxisDomain, PolarRadiusAxisDomain];
@@ -564,10 +576,10 @@ export interface RadarProps extends EventAttributes, Partial<PresentationAttribu
     className?: string;
     dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
     points?: RadarPoint[];
-    shape?: React.ReactElement<any> | ContentRenderer<RadarProps>;
-    activeDot?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
-    dot?: object | React.ReactElement<any> | ContentRenderer<DotProps> | boolean;
-    label?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
+    shape?: React.ReactElement | ContentRenderer<RadarProps>;
+    activeDot?: object | React.ReactElement | ContentRenderer<any> | boolean;
+    dot?: object | React.ReactElement | ContentRenderer<DotProps> | boolean;
+    label?: object | React.ReactElement | ContentRenderer<any> | boolean;
     legendType?: LegendType;
     hide?: boolean;
 }
@@ -599,15 +611,15 @@ export interface RadialBarProps extends EventAttributes, Partial<PresentationAtt
     dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
     angleAxisId?: string | number;
     radiusAxisId?: string | number;
-    shape?: ContentRenderer<any> | React.ReactElement<any>;
-    activeShape?: object | ContentRenderer<any> | React.ReactElement<any>;
+    shape?: ContentRenderer<any> | React.ReactElement;
+    activeShape?: object | ContentRenderer<any> | React.ReactElement;
     cornerRadius?: number | string;
     minPointSize?: number;
     maxBarSize?: number;
     data?: RadialBarData[];
     legendType?: LegendType;
-    label?: boolean | React.ReactElement<any> | ContentRenderer<any> | object;
-    background?: boolean | React.ReactElement<any> | ContentRenderer<any> | object;
+    label?: boolean | React.ReactElement | ContentRenderer<any> | object;
+    background?: boolean | React.ReactElement | ContentRenderer<any> | object;
     hide?: boolean;
 }
 
@@ -649,7 +661,7 @@ export interface ReferenceAreaProps extends Partial<PresentationAttributes> {
     y2?: number | string;
     xAxisId?: string | number;
     yAxisId?: string | number;
-    shape?: ContentRenderer<ReferenceAreaProps & RectangleProps> | React.ReactElement<any>;
+    shape?: ContentRenderer<ReferenceAreaProps & RectangleProps> | React.ReactElement;
 }
 
 export class ReferenceArea extends React.Component<ReferenceAreaProps> { }
@@ -675,7 +687,7 @@ export interface ReferenceDotProps extends EventAttributes, Partial<Presentation
         EventAttributes
         & Partial<PresentationAttributes<number | string, number | string>>
         & { cx: number; cy: number; }
-    > | React.ReactElement<any>;
+    > | React.ReactElement;
 }
 
 export class ReferenceDot extends React.Component<ReferenceDotProps> { }
@@ -690,14 +702,14 @@ export interface ReferenceLineProps extends Partial<PresentationAttributes<numbe
     ifOverflow?: IfOverflowType;
     x?: number | string;
     y?: number | string;
-    label?: string | number | ContentRenderer<any> | React.ReactElement<any>;
+    label?: string | number | ContentRenderer<any> | React.ReactElement;
     xAxisId?: string | number;
     yAxisId?: string | number;
     shape?: ContentRenderer<
         EventAttributes
         & Partial<PresentationAttributes<number | string, number | string>>
         & { x1: number; y1: number; x2: number; y2: number; }
-    > | React.ReactElement<any>;
+    > | React.ReactElement;
 }
 
 export class ReferenceLine extends React.Component<ReferenceLineProps> { }
@@ -733,13 +745,13 @@ export interface ScatterProps extends EventAttributes, Partial<PresentationAttri
     xAxisId?: string | number;
     yAxisId?: string | number;
     zAxisId?: string | number;
-    line?: boolean | object | RechartsFunction | React.ReactElement<any>;
+    line?: boolean | object | RechartsFunction | React.ReactElement;
     lineType?: 'joint' | 'fitting';
     lineJointType?: LineType;
     legendType?: LegendType;
     activeIndex?: number;
-    activeShape?: object | RechartsFunction | React.ReactElement<any>;
-    shape?: 'circle' | 'cross' | 'diamond' | 'square' | 'star' | 'triangle' | 'wye' | React.ReactElement<any> | ContentRenderer<any>;
+    activeShape?: object | RechartsFunction | React.ReactElement;
+    shape?: 'circle' | 'cross' | 'diamond' | 'square' | 'star' | 'triangle' | 'wye' | React.ReactElement | ContentRenderer<any>;
     points?: ScatterPoint[];
     hide?: boolean;
     data?: object[];
@@ -811,7 +823,7 @@ export interface TooltipPayload {
 }
 
 export interface TooltipProps extends Animatable {
-    content?: React.ReactElement<any> | React.StatelessComponent<any> | ContentRenderer<TooltipProps>;
+    content?: React.ReactElement | React.StatelessComponent<any> | ContentRenderer<TooltipProps>;
     viewBox?: ViewBox;
     active?: boolean;
     separator?: string;
@@ -820,7 +832,7 @@ export interface TooltipProps extends Animatable {
     itemStyle?: object;
     labelStyle?: object;
     wrapperStyle?: object;
-    cursor?: boolean | object | React.ReactElement<any> | React.StatelessComponent<any>;
+    cursor?: boolean | object | React.ReactElement | React.StatelessComponent<any>;
     coordinate?: Coordinate;
     position?: Coordinate;
     label?: string | number;
@@ -839,7 +851,7 @@ export interface TreemapProps extends EventAttributes, Animatable {
     data?: any[];
     style?: object;
     aspectRatio?: number;
-    content?: React.ReactElement<any> | ContentRenderer<any>;
+    content?: React.ReactElement | ContentRenderer<any>;
     fill?: string;
     stroke?: string;
     className?: string;
@@ -861,7 +873,7 @@ export interface LabelProps extends Partial<PresentationAttributes> {
     position?: PositionType;
     children?: React.ReactNode[] | React.ReactNode;
     className?: string;
-    content?: React.ReactElement<any> | ContentRenderer<any>;
+    content?: React.ReactElement | ContentRenderer<any>;
 }
 
 export class LabelList extends React.Component<LabelListProps> { }
@@ -871,7 +883,7 @@ export interface LabelListProps {
     children?: React.ReactNode[] | React.ReactNode;
     className?: string;
     clockWise?: boolean;
-    content?: React.ReactElement<any> | ContentRenderer<LabelProps>;
+    content?: React.ReactElement | ContentRenderer<LabelProps>;
     data?: number;
     dataKey: string | number | RechartsFunction;
     formatter?: LabelFormatter;
@@ -922,7 +934,7 @@ export interface XAxisProps extends EventAttributes {
     padding?: XPadding;
     allowDataOverflow?: boolean;
     scale?: ScaleType | RechartsFunction;
-    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement;
     axisLine?: boolean | object;
     tickLine?: boolean | object;
     minTickGap?: number;
@@ -976,7 +988,7 @@ export interface YAxisProps extends EventAttributes {
     padding?: YPadding;
     allowDataOverflow?: boolean;
     scale?: ScaleType | RechartsFunction;
-    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement;
     axisLine?: boolean | object;
     tickLine?: boolean | object;
     minTickGap?: number;
diff --git a/types/rechoir/index.d.ts b/types/rechoir/index.d.ts
index 2cb3bbb7ab..682811d551 100644
--- a/types/rechoir/index.d.ts
+++ b/types/rechoir/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for rechoir 0.6
-// Project: https://github.com/tkellen/node-rechoir
+// Project: https://github.com/gulpjs/rechoir
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/recompose/index.d.ts b/types/recompose/index.d.ts
index f571753468..540e1128dd 100644
--- a/types/recompose/index.d.ts
+++ b/types/recompose/index.d.ts
@@ -269,7 +269,7 @@ declare module 'recompose' {
     // toRenderProps: https://github.com/acdlite/recompose/blob/master/docs/API.md#torenderprops
     export function toRenderProps<TInner, TOutter>(
         hoc: InferableComponentEnhancerWithProps<TInner & TOutter, TOutter>
-    ): StatelessComponent<TOutter & { children: (props: TInner) => React.ReactElement<any> }>;
+    ): StatelessComponent<TOutter & { children: (props: TInner) => React.ReactElement }>;
 
     // fromRenderProps: https://github.com/acdlite/recompose/blob/master/docs/API.md#fromrenderprops
     export function fromRenderProps<TInner, TOutter, TRenderProps = {}>(
@@ -335,10 +335,10 @@ declare module 'recompose' {
         type: Component<any> | string,
         props?: Object,
         children?: React.ReactNode
-    ): React.ReactElement<any>;
+    ): React.ReactElement;
 
     // createEagerFactory: https://github.com/acdlite/recompose/blob/master/docs/API.md#createEagerFactory
-    type componentFactory = (props?: Object, children?: React.ReactNode) => React.ReactElement<any>;
+    type componentFactory = (props?: Object, children?: React.ReactNode) => React.ReactElement;
     export function createEagerFactory(
         type: Component<any> | string
     ): componentFactory;
diff --git a/types/recompose/recompose-tests.tsx b/types/recompose/recompose-tests.tsx
index 53cf796fd6..5be4d4ddbc 100644
--- a/types/recompose/recompose-tests.tsx
+++ b/types/recompose/recompose-tests.tsx
@@ -533,7 +533,7 @@ function testFromRenderProps() {
     }
 
     interface RenderComponentProps {
-        render: (renderProps: RenderProps) => React.ReactElement<any>;
+        render: (renderProps: RenderProps) => React.ReactElement;
     }
 
     class RenderPropComponent extends React.Component<RenderComponentProps> {
diff --git a/types/reconnect-core/index.d.ts b/types/reconnect-core/index.d.ts
index 0a447e7571..a422834ef3 100644
--- a/types/reconnect-core/index.d.ts
+++ b/types/reconnect-core/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for reconnect-core 1.3
-// Project: https://www.npmjs.com/package/reconnect-core
+// Project: https://github.com/juliangruber/reconnect-core
 // Definitions by: James Bromwell <https://github.com/thw0rted>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/redis-rate-limiter/index.d.ts b/types/redis-rate-limiter/index.d.ts
index ec277ae82a..6115a259c9 100644
--- a/types/redis-rate-limiter/index.d.ts
+++ b/types/redis-rate-limiter/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for redis-rate-limiter 1.2
-// Project: https://github.com/TabDigital/redis-rate-limiter
+// Project: https://github.com/tabcorp/redis-rate-limiter
 // Definitions by: Seth Westphal <https://github.com/westy92>
 //                 Hasan Oezdemir <https://github.com/nodify-at>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/redom/index.d.ts b/types/redom/index.d.ts
index fde67bfb12..e6f9222c27 100644
--- a/types/redom/index.d.ts
+++ b/types/redom/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for redom 3.12
-// Project: https://github.com/redom/redom/
+// Project: https://github.com/redom/redom/, https://redom.js.org
 // Definitions by: Rauli Laine <https://github.com/RauliL>
 //                 Felix Nehrke <https://github.com/nemoinho>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/reduce-reducers/index.d.ts b/types/reduce-reducers/index.d.ts
index d4bde0bc8a..9f787df032 100644
--- a/types/reduce-reducers/index.d.ts
+++ b/types/reduce-reducers/index.d.ts
@@ -1,7 +1,81 @@
-// Type definitions for reduce-reducers 0.1
-// Project: https://github.com/acdlite/reduce-reducers
+// Type definitions for reduce-reducers 0.2
+// Project: https://github.com/redux-utilities/reduce-reducers
 // Definitions by: Huy Nguyen <https://github.com/huy-nguyen>
+//                 Dalius Dobravolskas <https://github.com/daliusd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import { Reducer } from 'redux';
+export default function reduceReducer<S>(r0: Reducer<S>, s: S | null): Reducer<S>;
+export default function reduceReducer<S>(r0: Reducer<S>, r1: Reducer<S>, s: S | null): Reducer<S>;
+export default function reduceReducer<S>(r0: Reducer<S>, r1: Reducer<S>, r2: Reducer<S>, s: S | null): Reducer<S>;
+export default function reduceReducer<S>(
+    r0: Reducer<S>,
+    r1: Reducer<S>,
+    r2: Reducer<S>,
+    r3: Reducer<S>,
+    s: S | null,
+): Reducer<S>;
+export default function reduceReducer<S>(
+    r0: Reducer<S>,
+    r1: Reducer<S>,
+    r2: Reducer<S>,
+    r3: Reducer<S>,
+    r4: Reducer<S>,
+    s: S | null,
+): Reducer<S>;
+export default function reduceReducer<S>(
+    r0: Reducer<S>,
+    r1: Reducer<S>,
+    r2: Reducer<S>,
+    r3: Reducer<S>,
+    r4: Reducer<S>,
+    r5: Reducer<S>,
+    s: S | null,
+): Reducer<S>;
+export default function reduceReducer<S>(
+    r0: Reducer<S>,
+    r1: Reducer<S>,
+    r2: Reducer<S>,
+    r3: Reducer<S>,
+    r4: Reducer<S>,
+    r5: Reducer<S>,
+    r6: Reducer<S>,
+    s: S | null,
+): Reducer<S>;
+export default function reduceReducer<S>(
+    r0: Reducer<S>,
+    r1: Reducer<S>,
+    r2: Reducer<S>,
+    r3: Reducer<S>,
+    r4: Reducer<S>,
+    r5: Reducer<S>,
+    r6: Reducer<S>,
+    r7: Reducer<S>,
+    s: S | null,
+): Reducer<S>;
+export default function reduceReducer<S>(
+    r0: Reducer<S>,
+    r1: Reducer<S>,
+    r2: Reducer<S>,
+    r3: Reducer<S>,
+    r4: Reducer<S>,
+    r5: Reducer<S>,
+    r6: Reducer<S>,
+    r7: Reducer<S>,
+    r8: Reducer<S>,
+    s: S | null,
+): Reducer<S>;
+export default function reduceReducer<S>(
+    r0: Reducer<S>,
+    r1: Reducer<S>,
+    r2: Reducer<S>,
+    r3: Reducer<S>,
+    r4: Reducer<S>,
+    r5: Reducer<S>,
+    r6: Reducer<S>,
+    r7: Reducer<S>,
+    r8: Reducer<S>,
+    r9: Reducer<S>,
+    s: S | null,
+): Reducer<S>;
 export default function reduceReducer<S>(...reducers: Array<Reducer<S>>): Reducer<S>;
diff --git a/types/reduce-reducers/reduce-reducers-tests.ts b/types/reduce-reducers/reduce-reducers-tests.ts
index f542fe834a..f4fdd8fff3 100644
--- a/types/reduce-reducers/reduce-reducers-tests.ts
+++ b/types/reduce-reducers/reduce-reducers-tests.ts
@@ -1,13 +1,188 @@
 import {
-	Reducer,
-	Action,
+    Reducer,
+    Action,
 } from 'redux';
 import reduceReducers from 'reduce-reducers';
 
 interface TestStore {
-	a: number;
-	b: string;
+    a: number;
+    b: string;
 }
 const firstReducer: (state: TestStore, action: Action) => TestStore = (a, b) => a;
 const secondReducer: (state: TestStore, action: Action) => TestStore = (a, b) => a;
 const finalReducer: (state: TestStore, action: Action) => TestStore = reduceReducers(firstReducer, secondReducer);
+const finalReducerWithState: (state: TestStore, action: Action) => TestStore = reduceReducers(firstReducer, secondReducer, null);
+
+const initialState: TestStore = {
+    a: 1,
+    b: '2',
+};
+
+const finalReducerWithInitialState: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    initialState);
+
+const reducer02: (state: TestStore, action: Action) => TestStore = (a, b) => a;
+const reducer03: (state: TestStore, action: Action) => TestStore = (a, b) => a;
+const reducer04: (state: TestStore, action: Action) => TestStore = (a, b) => a;
+const reducer05: (state: TestStore, action: Action) => TestStore = (a, b) => a;
+const reducer06: (state: TestStore, action: Action) => TestStore = (a, b) => a;
+const reducer07: (state: TestStore, action: Action) => TestStore = (a, b) => a;
+const reducer08: (state: TestStore, action: Action) => TestStore = (a, b) => a;
+const reducer09: (state: TestStore, action: Action) => TestStore = (a, b) => a;
+
+const finalReducerWithInitialState02: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    initialState);
+const finalReducerWithInitialState02null: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    null);
+
+const finalReducerWithInitialState03: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    reducer03,
+    initialState);
+const finalReducerWithInitialState03null: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    reducer03,
+    null);
+
+const finalReducerWithInitialState04: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    reducer03,
+    reducer04,
+    initialState);
+const finalReducerWithInitialState04null: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    reducer03,
+    reducer04,
+    null);
+
+const finalReducerWithInitialState05: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    reducer03,
+    reducer04,
+    reducer05,
+    initialState);
+const finalReducerWithInitialState05null: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    reducer03,
+    reducer04,
+    reducer05,
+    null);
+
+const finalReducerWithInitialState06: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    reducer03,
+    reducer04,
+    reducer05,
+    reducer06,
+    initialState);
+const finalReducerWithInitialState06null: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    reducer03,
+    reducer04,
+    reducer05,
+    reducer06,
+    null);
+
+const finalReducerWithInitialState07: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    reducer03,
+    reducer04,
+    reducer05,
+    reducer06,
+    reducer07,
+    initialState);
+const finalReducerWithInitialState07null: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    reducer03,
+    reducer04,
+    reducer05,
+    reducer06,
+    reducer07,
+    null);
+
+const finalReducerWithInitialState08: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    reducer03,
+    reducer04,
+    reducer05,
+    reducer06,
+    reducer07,
+    reducer08,
+    initialState);
+const finalReducerWithInitialState08null: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    reducer03,
+    reducer04,
+    reducer05,
+    reducer06,
+    reducer07,
+    reducer08,
+    null);
+
+const finalReducerWithoutInitialState09: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    reducer03,
+    reducer04,
+    reducer05,
+    reducer06,
+    reducer07,
+    reducer08,
+    reducer09);
+const finalReducerWithInitialState09: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    reducer03,
+    reducer04,
+    reducer05,
+    reducer06,
+    reducer07,
+    reducer08,
+    reducer09,
+    initialState);
+const finalReducerWithInitialState09null: (state: TestStore, action: Action) => TestStore = reduceReducers(
+    firstReducer,
+    secondReducer,
+    reducer02,
+    reducer03,
+    reducer04,
+    reducer05,
+    reducer06,
+    reducer07,
+    reducer08,
+    reducer09,
+    null);
diff --git a/types/redux-actions/index.d.ts b/types/redux-actions/index.d.ts
index 526a5bf95c..6891563ab9 100644
--- a/types/redux-actions/index.d.ts
+++ b/types/redux-actions/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for redux-actions 2.3
-// Project: https://github.com/acdlite/redux-actions
+// Project: https://github.com/redux-utilities/redux-actions
 // Definitions by: Jack Hsu <https://github.com/jaysoo>,
 //                 Alex Gorbatchev <https://github.com/alexgorbatchev>,
 //                 Alec Hill <https://github.com/alechill>
diff --git a/types/redux-devtools/index.d.ts b/types/redux-devtools/index.d.ts
index ddead025ff..e457839d2f 100644
--- a/types/redux-devtools/index.d.ts
+++ b/types/redux-devtools/index.d.ts
@@ -12,7 +12,7 @@ export interface IDevTools {
     instrument(): GenericStoreEnhancer
 }
 
-export declare function createDevTools(el: React.ReactElement<any>): IDevTools;
+export declare function createDevTools(el: React.ReactElement): IDevTools;
 export declare function persistState(debugSessionKey: string): GenericStoreEnhancer;
 
 declare const factory: { instrument(): (opts: any) => any };
diff --git a/types/redux-form/immutable/index.d.ts b/types/redux-form/immutable/index.d.ts
index 742027ccad..2ce6164232 100644
--- a/types/redux-form/immutable/index.d.ts
+++ b/types/redux-form/immutable/index.d.ts
@@ -24,5 +24,7 @@ export {
     isSubmitting,
     isAsyncValidating,
     isValid,
-    SubmissionError
-} from "../";
+    SubmissionError,
+    startSubmit,
+    stopSubmit,
+} from '../';
diff --git a/types/redux-form/index.d.ts b/types/redux-form/index.d.ts
index 6915032138..08d077875a 100644
--- a/types/redux-form/index.d.ts
+++ b/types/redux-form/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for redux-form 7.4
-// Project: https://github.com/erikras/redux-form
+// Type definitions for redux-form 7.5
+// Project: https://github.com/erikras/redux-form, https://redux-form.com
 // Definitions by: Carson Full <https://github.com/carsonf>
 //                 Daniel Lytkin <https://github.com/aikoven>
 //                 Karol Janyst <https://github.com/LKay>
@@ -12,6 +12,7 @@
 //                 Maddi Joyce <https://github.com/maddijoyce>
 //                 Kamil Wojcik <https://github.com/smifun>
 //                 Mohamed Shaaban <https://github.com/mshaaban088>
+//                 Ethan Setnik <https://github.com/esetnik>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.0
 import {
@@ -27,7 +28,7 @@ export interface ErrorOther<T = string> {
 }
 
 export type FormErrors<FormData = {}, T = string> = {
-    [P in keyof FormData]?: ReactElement<any> | T;
+    [P in keyof FormData]?: ReactElement | T;
 } & ErrorOther<T>;
 
 export interface WarningOther<T = void> {
@@ -35,7 +36,7 @@ export interface WarningOther<T = void> {
 }
 
 export type FormWarnings<FormData = {}, T = void> = {
-    [P in keyof FormData]?: ReactElement<any> | string | WarningOther<T>;
+    [P in keyof FormData]?: ReactElement | string | WarningOther<T>;
 };
 
 export interface RegisteredFieldState {
diff --git a/types/redux-form/lib/Field.d.ts b/types/redux-form/lib/Field.d.ts
index 87a8947717..194a322408 100644
--- a/types/redux-form/lib/Field.d.ts
+++ b/types/redux-form/lib/Field.d.ts
@@ -61,7 +61,7 @@ export type GenericFieldHTMLAttributes =
     SelectHTMLAttributes<HTMLSelectElement> |
     TextareaHTMLAttributes<HTMLTextAreaElement>;
 
-export class Field<P = GenericFieldHTMLAttributes | BaseFieldProps> extends Component<BaseFieldProps<P> & P> {
+export class Field<P extends GenericFieldHTMLAttributes | BaseFieldProps = GenericFieldHTMLAttributes | BaseFieldProps> extends Component<P> {
     dirty: boolean;
     name: string;
     pristine: boolean;
diff --git a/types/redux-form/redux-form-tests.tsx b/types/redux-form/redux-form-tests.tsx
index 25f395884c..8ad71bbc42 100644
--- a/types/redux-form/redux-form-tests.tsx
+++ b/types/redux-form/redux-form-tests.tsx
@@ -26,9 +26,12 @@ import {
     SubmissionError,
     FieldArrayFieldsProps
 } from "redux-form";
+
 import {
     Field as ImmutableField,
-    reduxForm as immutableReduxForm
+    reduxForm as immutableReduxForm,
+    startSubmit as immutableStartSubmit,
+    stopSubmit as immutableStopSubmit
 } from "redux-form/immutable";
 
 import LibField, {
@@ -287,6 +290,12 @@ const Test = reduxForm<TestFormData>({
                                 component="select"
                             />
 
+                            <Field
+                                name="field4"
+                                component={ MyField }
+                                foo="bar"
+                            />
+
                             <FieldCustom
                                 name="field4"
                                 component={ MyField }
diff --git a/types/redux-form/v6/index.d.ts b/types/redux-form/v6/index.d.ts
index 63921312b8..360830215f 100644
--- a/types/redux-form/v6/index.d.ts
+++ b/types/redux-form/v6/index.d.ts
@@ -30,11 +30,11 @@ export interface DataShape {
 }
 
 export type FormErrors<FormData extends DataShape> = {
-    [P in keyof FormData]?: ReactElement<any> | string | { _error?: string };
+    [P in keyof FormData]?: ReactElement | string | { _error?: string };
 };
 
 export type FormWarnings<FormData extends DataShape> = {
-    [P in keyof FormData]?: ReactElement<any> | string | { _warning?: string };
+    [P in keyof FormData]?: ReactElement | string | { _warning?: string };
 };
 
 export type FormMeta<FormData extends DataShape> = {
diff --git a/types/redux-logger/index.d.ts b/types/redux-logger/index.d.ts
index 0d4d1ec386..c48438313f 100644
--- a/types/redux-logger/index.d.ts
+++ b/types/redux-logger/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for redux-logger 3.0
-// Project: https://github.com/fcomb/redux-logger
+// Project: https://github.com/theaqua/redux-logger
 // Definitions by: Alexander Rusakov <https://github.com/arusakov>
 //                 Kevin Groat <https://github.com/kgroat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/redux-sentry-middleware/index.d.ts b/types/redux-sentry-middleware/index.d.ts
index 0d3f2eabc9..5713391dd3 100644
--- a/types/redux-sentry-middleware/index.d.ts
+++ b/types/redux-sentry-middleware/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for redux-sentry-middleware 0.0
-// Project: https://github.com/vidit-sh/redux-sentry-middleware#readme
+// Project: https://github.com/vidit-sh/redux-sentry-middleware#readme, https://github.com/viditisonline/redux-sentry-middleware
 // Definitions by: Jan Dolezel <https://github.com/dolezel>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/redux-state-sync/index.d.ts b/types/redux-state-sync/index.d.ts
new file mode 100644
index 0000000000..fb7e0f84b5
--- /dev/null
+++ b/types/redux-state-sync/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for redux-state-sync 2.0
+// Project: https://github.com/AOHUA/redux-state-sync#readme
+// Definitions by: MU AOHUA <https://github.com/AOHUA>
+//                 AntonioMendez <https://github.com/AntonioMendez>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { Store, Reducer, Middleware, AnyAction } from "redux";
+import BroadcastChannel from "broadcast-channel";
+
+export interface Stamp {
+    $uuid: string;
+    $wuid: string;
+}
+export type StampedAction = Stamp & AnyAction;
+
+export interface Config {
+    channel?: string;
+    predicate?: (type?: string) => boolean | null;
+    blacklist?: string[];
+    whitelist?: string[];
+    broadcastChannelOption?: object | null;
+}
+
+export interface MessageListenerConfig {
+    channel: BroadcastChannel;
+    dispatch: (action: AnyAction | StampedAction) => void;
+    allowed: (type?: string) => boolean;
+}
+
+export function generateUuidForAction(action: AnyAction): StampedAction;
+export function isActionAllowed(config: Config): (type: string) => boolean;
+export function createMessageListener(config: MessageListenerConfig): void;
+export function createStateSyncMiddleware(config?: Config): Middleware;
+export function withReduxStateSync(
+    appReducer: Reducer
+): (state: any, action: AnyAction) => Reducer;
+export function initStateWithPrevTab(store: Store): Store;
diff --git a/types/redux-state-sync/package.json b/types/redux-state-sync/package.json
new file mode 100644
index 0000000000..d39f9e8fc6
--- /dev/null
+++ b/types/redux-state-sync/package.json
@@ -0,0 +1,7 @@
+{
+  "private": true,
+  "dependencies": {
+    "broadcast-channel": "^2.1.8",
+    "redux": "^4.0.1"
+  }
+}
diff --git a/types/redux-state-sync/redux-state-sync-tests.ts b/types/redux-state-sync/redux-state-sync-tests.ts
new file mode 100644
index 0000000000..3f5e689675
--- /dev/null
+++ b/types/redux-state-sync/redux-state-sync-tests.ts
@@ -0,0 +1,22 @@
+import { createStore, applyMiddleware, Action } from "redux";
+import { createStateSyncMiddleware, initStateWithPrevTab, withReduxStateSync } from "redux-state-sync";
+
+interface TestState {
+    a: number;
+    b: string;
+    c: string;
+}
+const middleware = createStateSyncMiddleware({
+        channel: 'test',
+        predicate: (type) => true,
+        blacklist: [],
+        whitelist: [],
+        broadcastChannelOption: {}
+    });
+
+function rootReducer(state: TestState, action: Action): TestState {
+    return state;
+}
+
+const store = createStore(withReduxStateSync(rootReducer), ['test'], applyMiddleware(middleware));
+initStateWithPrevTab(store);
diff --git a/types/redux-state-sync/tsconfig.json b/types/redux-state-sync/tsconfig.json
new file mode 100644
index 0000000000..dd15d9a067
--- /dev/null
+++ b/types/redux-state-sync/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-state-sync-tests.ts"
+    ]
+}
diff --git a/types/redux-state-sync/tslint.json b/types/redux-state-sync/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/redux-state-sync/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/relay-runtime/index.d.ts b/types/relay-runtime/index.d.ts
index 27ae20706c..d5ce247a49 100644
--- a/types/relay-runtime/index.d.ts
+++ b/types/relay-runtime/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for relay-runtime 1.3
-// Project: https://github.com/facebook/relay
+// Project: https://github.com/facebook/relay, https://facebook.github.io/relay
 // Definitions by: Matt Martin <https://github.com/voxmatt>
 //                 Eloy Durán <https://github.com/alloy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -23,6 +23,7 @@ export type RelayMutationRequest = any;
 export type RelayQueryRequest = any;
 export type ConcreteFragmentDefinition = object;
 export type ConcreteOperationDefinition = object;
+export type ReaderFragment = object;
 
 /**
  * FIXME: RelayContainer used to be typed with ReactClass<any>, but
@@ -45,11 +46,9 @@ export type ConcreteFragment = any;
 export type ConcreteRequest = any;
 export type ConcreteBatchRequest = any;
 
-export type RequestNode = ConcreteRequest | ConcreteBatchRequest;
+export function getRequest(taggedNode: GraphQLTaggedNode): ConcreteRequest;
 
-// Using `enum` here to create a distinct type and `const` to ensure it doesn’t leave any generated code.
-// tslint:disable-next-line:no-const-enum
-export const enum FragmentReference {}
+export type RequestNode = ConcreteRequest | ConcreteBatchRequest;
 
 export interface OperationBase {
     variables: object;
diff --git a/types/rellax/index.d.ts b/types/rellax/index.d.ts
index 71c583073b..ce6921b9d5 100644
--- a/types/rellax/index.d.ts
+++ b/types/rellax/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for rellax 1.7
-// Project: https://github.com/dixonandmoe/rellax
+// Project: https://github.com/dixonandmoe/rellax, https://dixonandmoe.com/rellax
 // Definitions by: Rostislav Shermenyov <https://github.com/shermendev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/requestidlecallback/index.d.ts b/types/requestidlecallback/index.d.ts
index 7f92f39103..ebb27eb8c4 100644
--- a/types/requestidlecallback/index.d.ts
+++ b/types/requestidlecallback/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for requestidlecallback 0.1
-// Project: https://w3c.github.io/requestidlecallback/
+// Project: https://w3c.github.io/requestidlecallback/, https://github.com/afarkas/requestidlecallback
 // Definitions by: 贺师俊 <https://github.com/hax>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/requestretry/index.d.ts b/types/requestretry/index.d.ts
index 3963ce2c17..8bb2de93e5 100644
--- a/types/requestretry/index.d.ts
+++ b/types/requestretry/index.d.ts
@@ -25,6 +25,7 @@ declare namespace requestretry {
 		promiseFactory?(resolver: any): any;
 		retryDelay?: number;
 		retryStrategy?: RetryStrategy;
+        fullResponse?: boolean;
 	}
 }
 
diff --git a/types/responselike/index.d.ts b/types/responselike/index.d.ts
new file mode 100644
index 0000000000..7152388232
--- /dev/null
+++ b/types/responselike/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for responselike 1.0
+// Project: https://github.com/lukechilds/responselike#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { IncomingMessage } from 'http';
+import { Stream } from 'stream';
+
+export = ResponseLike;
+
+/**
+ * Returns a streamable response object similar to a [Node.js HTTP response stream](https://nodejs.org/api/http.html#http_class_http_incomingmessage).
+ */
+declare class ResponseLike extends Stream.Readable {
+    statusCode: number;
+    headers: { [header: string]: string | string[] | undefined };
+    body: Buffer;
+    url: string;
+
+    /**
+     * @param statusCode HTTP response status code.
+     * @param headers HTTP headers object. Keys will be automatically lowercased.
+     * @param body A Buffer containing the response body. The Buffer contents will be streamable but is also exposed directly as `response.body`.
+     * @param url Request URL string.
+     */
+    constructor(
+        statusCode: number,
+        headers: { [header: string]: string | string[] | undefined },
+        body: Buffer,
+        url: string
+    );
+}
diff --git a/types/responselike/responselike-tests.ts b/types/responselike/responselike-tests.ts
new file mode 100644
index 0000000000..95c5e4f701
--- /dev/null
+++ b/types/responselike/responselike-tests.ts
@@ -0,0 +1,10 @@
+import Response = require('responselike');
+
+const response = new Response(200, { foo: 'bar' }, Buffer.from('Hi!'), 'https://example.com');
+
+response.statusCode; // $ExpectType number
+response.headers; // $ExpectType { [header: string]: string | string[] | undefined; }
+response.body; // $ExpectType Buffer
+response.url; // $ExpectType string
+
+response.pipe(process.stdout);
diff --git a/types/responselike/tsconfig.json b/types/responselike/tsconfig.json
new file mode 100644
index 0000000000..2c0a9e392b
--- /dev/null
+++ b/types/responselike/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "responselike-tests.ts"
+    ]
+}
diff --git a/types/responselike/tslint.json b/types/responselike/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/responselike/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/restify/index.d.ts b/types/restify/index.d.ts
index 1bff23e8ea..5dad7503b6 100644
--- a/types/restify/index.d.ts
+++ b/types/restify/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for restify 7.2
-// Project: https://github.com/restify/node-restify
+// Project: https://github.com/restify/node-restify, http://restifyjs.com
 // Definitions by: Bret Little <https://github.com/blittle>
 //                 Steve Hipwell <https://github.com/stevehipwell>
 //                 Leandro Almeida <https://github.com/leanazulyoro>
diff --git a/types/rheostat/rheostat-tests.tsx b/types/rheostat/rheostat-tests.tsx
index 263e287f6f..cb07cd6a2e 100644
--- a/types/rheostat/rheostat-tests.tsx
+++ b/types/rheostat/rheostat-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import Rheostat, { Orientation, Algorithm, PublicState } from 'rheostat';
 
-type Element = React.ReactElement<any>;
+type Element = React.ReactElement;
 
 function Basic(props: {}): Element {
   return <Rheostat />;
diff --git a/types/riot/index.d.ts b/types/riot/index.d.ts
index 2a7a22b596..f143141b57 100644
--- a/types/riot/index.d.ts
+++ b/types/riot/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for riot 3.6
-// Project: https://github.com/riot/riot
+// Project: https://github.com/riot/riot, http://riot.js.org
 // Definitions by: Boriss Nazarovs <https://github.com/Stubb0rn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/rivets/index.d.ts b/types/rivets/index.d.ts
index b0254f3b79..fcf07555b7 100644
--- a/types/rivets/index.d.ts
+++ b/types/rivets/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for rivets 0.9
-// Project: http://rivetsjs.com/
+// Project: http://rivetsjs.com/, https://github.com/mikeric/rivets
 // Definitions by:  Trevor Baron <https://github.com/TrevorDev>
 //                  Jakub Matjanowski <https://github.com/matjanos>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/rollup-plugin-buble/index.d.ts b/types/rollup-plugin-buble/index.d.ts
new file mode 100644
index 0000000000..d6e3414346
--- /dev/null
+++ b/types/rollup-plugin-buble/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for rollup-plugin-buble 0.19
+// Project: https://github.com/rollup/rollup-plugin-buble#readme
+// Definitions by: Hugo Alliaume <https://github.com/Kocal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import { Plugin } from 'rollup';
+import { TransformOptions } from 'buble';
+
+export interface Options extends TransformOptions {
+    // Every files will be parsed by default, but you can specify which files to include or exclude
+    include?: Array<string | RegExp> | string | RegExp | null;
+    exclude?: Array<string | RegExp> | string | RegExp | null;
+}
+
+export default function buble(options?: Options): Plugin;
diff --git a/types/rollup-plugin-buble/package.json b/types/rollup-plugin-buble/package.json
new file mode 100644
index 0000000000..ee69ca3cd2
--- /dev/null
+++ b/types/rollup-plugin-buble/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "rollup": "^0.63.4"
+    }
+}
diff --git a/types/rollup-plugin-buble/rollup-plugin-buble-tests.ts b/types/rollup-plugin-buble/rollup-plugin-buble-tests.ts
new file mode 100644
index 0000000000..d020539f8b
--- /dev/null
+++ b/types/rollup-plugin-buble/rollup-plugin-buble-tests.ts
@@ -0,0 +1,57 @@
+import buble from 'rollup-plugin-buble';
+
+// No options (default)
+(() => {
+    // $ExpectType Plugin
+    buble();
+})();
+
+// With every options
+(() => {
+    // $ExpectType Plugin
+    buble({
+        target: {
+            chrome: 71,
+            firefox: 64,
+        },
+        objectAssign: true,
+        transforms: {
+            arrow: true,
+            classes: false,
+            collections: true,
+            computedProperty: false,
+            conciseMethodProperty: true,
+            constLoop: false,
+            dangerousForOf: true,
+            dangerousTaggedTemplateString: false,
+            defaultParameter: true,
+            destructuring: false,
+            forOf: true,
+            generator: false,
+            letConst: true,
+            modules: false,
+            numericLiteral: true,
+            parameterDestructuring: false,
+            reservedProperties: true,
+            spreadRest: false,
+            stickyRegExp: true,
+            templateString: false,
+            unicodeRegExp: true,
+        }
+    });
+})();
+
+// Filter files
+(() => {
+    // $ExpectType Plugin
+    buble({
+        include: '*.js',
+        exclude: '*.js',
+    });
+
+    // $ExpectType Plugin
+    buble({
+        include: /.js$/,
+        exclude: ['foo.js', 'bar.js'],
+    });
+})();
diff --git a/types/rollup-plugin-buble/tsconfig.json b/types/rollup-plugin-buble/tsconfig.json
new file mode 100644
index 0000000000..80dec6b110
--- /dev/null
+++ b/types/rollup-plugin-buble/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "rollup-plugin-buble-tests.ts"
+    ]
+}
diff --git a/types/rollup-plugin-buble/tslint.json b/types/rollup-plugin-buble/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/rollup-plugin-buble/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/rollup-plugin-delete/index.d.ts b/types/rollup-plugin-delete/index.d.ts
new file mode 100644
index 0000000000..9f9cfe020d
--- /dev/null
+++ b/types/rollup-plugin-delete/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for rollup-plugin-delete 0.2
+// Project: https://github.com/vladshcherbin/rollup-plugin-delete#readme
+// Definitions by: Vlad Shcherbin <https://github.com/vladshcherbin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import del = require('del');
+import { Plugin } from 'rollup';
+
+export interface Options extends del.Options {
+    /**
+     * Patterns of files and folders to be deleted.
+     * @default []
+     */
+    readonly targets: ReadonlyArray<string> | string;
+
+    /**
+     * Outputs removed files and folders to console.
+     * @default false
+     */
+    readonly verbose?: boolean;
+}
+
+export default function(options?: Options): Plugin;
diff --git a/types/rollup-plugin-delete/package.json b/types/rollup-plugin-delete/package.json
new file mode 100644
index 0000000000..272f65edde
--- /dev/null
+++ b/types/rollup-plugin-delete/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "rollup": ">=0.60.0"
+    }
+}
diff --git a/types/rollup-plugin-delete/rollup-plugin-delete-tests.ts b/types/rollup-plugin-delete/rollup-plugin-delete-tests.ts
new file mode 100644
index 0000000000..eff3508e29
--- /dev/null
+++ b/types/rollup-plugin-delete/rollup-plugin-delete-tests.ts
@@ -0,0 +1,13 @@
+import del from 'rollup-plugin-delete';
+
+del(); // $ExpectType Plugin
+
+del({}); // $ExpectError
+
+del({ targets: '/dist' }); // $ExpectType Plugin
+
+del({ targets: ['/dist'], verbose: true }); // $ExpectType Plugin
+
+del({ targets: ['/dist'], verbose: true, dryRun: true }); // $ExpectType Plugin
+
+del({ targets: ['/dist'], verbose: true, dryRun: true, debug: true }); // $ExpectType Plugin
diff --git a/types/rollup-plugin-delete/tsconfig.json b/types/rollup-plugin-delete/tsconfig.json
new file mode 100644
index 0000000000..d03999e03a
--- /dev/null
+++ b/types/rollup-plugin-delete/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "rollup-plugin-delete-tests.ts"
+    ]
+}
diff --git a/types/rollup-plugin-delete/tslint.json b/types/rollup-plugin-delete/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/rollup-plugin-delete/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/rollup-plugin-node-builtins/index.d.ts b/types/rollup-plugin-node-builtins/index.d.ts
new file mode 100644
index 0000000000..e839485ac9
--- /dev/null
+++ b/types/rollup-plugin-node-builtins/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for rollup-plugin-node-builtins 2.1
+// Project: https://github.com/calvinmetcalf/rollup-plugin-node-builtins#readme
+// Definitions by: Hugo Alliaume <https://github.com/Kocal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import { Plugin } from 'rollup';
+
+export interface Options {
+    crypto?: boolean;
+    fs?: boolean;
+}
+
+export default function builtins(options?: Options): Plugin;
diff --git a/types/rollup-plugin-node-builtins/package.json b/types/rollup-plugin-node-builtins/package.json
new file mode 100644
index 0000000000..ee69ca3cd2
--- /dev/null
+++ b/types/rollup-plugin-node-builtins/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "rollup": "^0.63.4"
+    }
+}
diff --git a/types/rollup-plugin-node-builtins/rollup-plugin-node-builtins-tests.ts b/types/rollup-plugin-node-builtins/rollup-plugin-node-builtins-tests.ts
new file mode 100644
index 0000000000..53e488cd00
--- /dev/null
+++ b/types/rollup-plugin-node-builtins/rollup-plugin-node-builtins-tests.ts
@@ -0,0 +1,16 @@
+import builtins from 'rollup-plugin-node-builtins';
+
+// No options (default)
+(() => {
+    // $ExpectType Plugin
+    builtins();
+})();
+
+// With `crypto` and `fs` enabled
+(() => {
+    // $ExpectType Plugin
+    builtins({
+        crypto: true,
+        fs: true,
+    });
+})();
diff --git a/types/rollup-plugin-node-builtins/tsconfig.json b/types/rollup-plugin-node-builtins/tsconfig.json
new file mode 100644
index 0000000000..c0a6e1e787
--- /dev/null
+++ b/types/rollup-plugin-node-builtins/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "rollup-plugin-node-builtins-tests.ts"
+    ]
+}
diff --git a/types/rollup-plugin-node-builtins/tslint.json b/types/rollup-plugin-node-builtins/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/rollup-plugin-node-builtins/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/rollup-plugin-node-globals/index.d.ts b/types/rollup-plugin-node-globals/index.d.ts
new file mode 100644
index 0000000000..2cf29ae912
--- /dev/null
+++ b/types/rollup-plugin-node-globals/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for rollup-plugin-node-globals 1.4
+// Project: https://github.com/calvinmetcalf/rollup-plugin-node-globals#readme
+// Definitions by: Hugo Alliaume <https://github.com/kocal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import { Plugin } from 'rollup';
+
+export interface Options {
+    // Every files will be parsed by default, but you can specify which files to include or exclude
+    include?: Array<string | RegExp> | string | RegExp | null;
+    exclude?: Array<string | RegExp> | string | RegExp | null;
+
+    // Enable sourcemaps support
+    sourceMap ?: boolean;
+
+    // Plugin's options
+    process?: boolean;
+    global?: boolean;
+    buffer?: boolean;
+    dirname?: boolean;
+    filename?: boolean;
+    baseDir?: string;
+}
+
+export default function globals(options?: Options): Plugin;
diff --git a/types/rollup-plugin-node-globals/package.json b/types/rollup-plugin-node-globals/package.json
new file mode 100644
index 0000000000..ee69ca3cd2
--- /dev/null
+++ b/types/rollup-plugin-node-globals/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "rollup": "^0.63.4"
+    }
+}
diff --git a/types/rollup-plugin-node-globals/rollup-plugin-node-globals-tests.ts b/types/rollup-plugin-node-globals/rollup-plugin-node-globals-tests.ts
new file mode 100644
index 0000000000..93d10a2730
--- /dev/null
+++ b/types/rollup-plugin-node-globals/rollup-plugin-node-globals-tests.ts
@@ -0,0 +1,43 @@
+import globals from 'rollup-plugin-node-globals';
+
+// No options (default)
+(() => {
+    // $ExpectType Plugin
+    globals();
+})();
+
+// With every options
+(() => {
+    // $ExpectType Plugin
+    globals({
+        process: false,
+        global: false,
+        buffer: false,
+        dirname: false,
+        filename: false,
+        baseDir: '/',
+    });
+})();
+
+// Filter files
+(() => {
+    // $ExpectType Plugin
+    globals({
+        include: '*.js',
+        exclude: '*.js',
+    });
+
+    // $ExpectType Plugin
+    globals({
+        include: /.js$/,
+        exclude: ['foo.js', 'bar.js'],
+    });
+})();
+
+// Sourcemaps
+(() => {
+    // $ExpectType Plugin
+    globals({
+        sourceMap: false,
+    });
+})();
diff --git a/types/rollup-plugin-node-globals/tsconfig.json b/types/rollup-plugin-node-globals/tsconfig.json
new file mode 100644
index 0000000000..29e93758c9
--- /dev/null
+++ b/types/rollup-plugin-node-globals/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "rollup-plugin-node-globals-tests.ts"
+    ]
+}
diff --git a/types/rollup-plugin-node-globals/tslint.json b/types/rollup-plugin-node-globals/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/rollup-plugin-node-globals/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/rot-js/index.d.ts b/types/rot-js/index.d.ts
index e44ec88014..50c8f5c15d 100644
--- a/types/rot-js/index.d.ts
+++ b/types/rot-js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for rot-js 0.6
-// Project: https://github.com/ondras/rot.js
+// Project: https://github.com/ondras/rot.js, http://ondras.github.io/rot.js/hp
 // Definitions by: Roger Ostrander <https://github.com/atiaxi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/route-parser/index.d.ts b/types/route-parser/index.d.ts
index c2ebabdf2a..f5a803bdc0 100644
--- a/types/route-parser/index.d.ts
+++ b/types/route-parser/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for route-parser 0.1
-// Project: https://github.com/rcs/route-parser
+// Project: http://github.com/rcs/route-parser
 // Definitions by: Ian Ker-Seymer <https://github.com/ianks>, Bob Buehler <https://github.com/bobbuehler>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/safe-regex/index.d.ts b/types/safe-regex/index.d.ts
index 41aca4c6b3..4ab1c82a6e 100644
--- a/types/safe-regex/index.d.ts
+++ b/types/safe-regex/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for safe-regex 1.1
-// Project: https://github.com/substack/safe-regex
+// Project: https://github.com/davisjam/safe-regex
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/sap__xsenv/index.d.ts b/types/sap__xsenv/index.d.ts
index 6f1b895a33..675f003398 100644
--- a/types/sap__xsenv/index.d.ts
+++ b/types/sap__xsenv/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @sap/xsenv 1.2
+// Type definitions for non-npm package @sap/xsenv 1.2
 // Project: https://help.sap.com/hana_platform
 // Definitions by: [Michael Müller] <https://github.com/mad-mike>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/sarif/index.d.ts b/types/sarif/index.d.ts
index 4bece2d3f8..cc5a9899b5 100644
--- a/types/sarif/index.d.ts
+++ b/types/sarif/index.d.ts
@@ -1,12 +1,12 @@
-// Type definitions for Sarif 2.0
+// Type definitions for non-npm package Sarif 2.0
 // Project: https://github.com/Microsoft/sarif-sdk
 // Definitions by: Rusty Scrivens <https://github.com/rscrivens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
 /**
- * Static Analysis Results Format (SARIF) Version 2.0.0-csd.2.beta-2018-10-10 JSON Schema:
- * a standard format for the output of static analysis tools.
+ * Static Analysis Results Format (SARIF) Version 2.0.0-csd.2.beta-2019-01-09 JSON Schema: a standard format for the
+ * output of static analysis tools.
  */
 export interface Log {
     /**
@@ -23,11 +23,16 @@ export interface Log {
      * The set of runs contained in this log file.
      */
     runs: Run[];
+
+    /**
+     * Key/value pairs that provide additional information about the log file.
+     */
+    properties?: PropertyBag;
 }
 
 export namespace Log {
     type version =
-        "2.0.0-csd.2.beta.2018-10-10";
+        "2.0.0-csd.2.beta.2019-01-09";
 }
 
 /**
@@ -53,6 +58,11 @@ export interface Attachment {
      * An array of regions of interest within the attachment.
      */
     regions?: Region[];
+
+    /**
+     * Key/value pairs that provide additional information about the attachment.
+     */
+    properties?: PropertyBag;
 }
 
 /**
@@ -188,57 +198,81 @@ export interface Exception {
     stack?: Stack;
 
     /**
-     * Key/value pairs that provide additional information about the exception
+     * Key/value pairs that provide additional information about the exception.
      */
     properties?: PropertyBag;
 }
 
 /**
- * References to external files that should be inlined with the content of a root log file.
+ * TBD
  */
-export interface ExternalFiles {
+export interface ExternalPropertyFile {
     /**
-     * The location of a file containing a run.conversion object to be merged with the root log file.
+     * The location of the external property file.
      */
-    conversion?: FileLocation;
+    fileLocation?: FileLocation;
 
     /**
-     * The location of a file containing a run.files object to be merged with the root log file.
+     * A stable, unique identifer for the external property file in the form of a GUID.
      */
-    files?: FileLocation;
+    instanceGuid?: string;
 
     /**
-     * The location of a file containing a run.graphs object to be merged with the root log file.
+     * A non-negative integer specifying the number of items contained in the external property file.
      */
-    graphs?: FileLocation;
+    itemCount?: number;
 
     /**
-     * An array of locations of files containing arrays of run.invocation objects to be merged with the root log
-     * file.
-     */
-    invocations?: FileLocation[];
-
-    /**
-     * The location of a file containing a run.logicalLocations object to be merged with the root log file.
-     */
-    logicalLocations?: FileLocation;
-
-    /**
-     * The location of a file containing a run.resources object to be merged with the root log file.
-     */
-    resources?: FileLocation;
-
-    /**
-     * An array of locations of files containins arrays of run.result objects to be merged with the root log file.
-     */
-    results?: FileLocation[];
-
-    /**
-     * Key/value pairs that provide additional information about the external files
+     * Key/value pairs that provide additional information about the external property file.
      */
     properties?: PropertyBag;
 }
 
+/**
+ * References to external property files that should be inlined with the content of a root log file.
+ */
+export interface ExternalPropertyFiles {
+    /**
+     * An external property file containing a run.conversion object to be merged with the root log file.
+     */
+    conversion?: ExternalPropertyFile;
+
+    /**
+     * An array of external property files containing run.files arrays to be merged with the root log file.
+     */
+    files?: ExternalPropertyFile[];
+
+    /**
+     * An external property file containing a run.graphs object to be merged with the root log file.
+     */
+    graphs?: ExternalPropertyFile;
+
+    /**
+     * An array of external property files containing run.invocations arrays to be merged with the root log file.
+     */
+    invocations?: ExternalPropertyFile[];
+
+    /**
+     * An array of external property files containing run.logicalLocations arrays to be merged with the root log file.
+     */
+    logicalLocations?: ExternalPropertyFile[];
+
+    /**
+     * An external property file containing a run.resources object to be merged with the root log file.
+     */
+    resources?: ExternalPropertyFile;
+
+    /**
+     * An array of external property files containing run.results arrays to be merged with the root log file.
+     */
+    results?: ExternalPropertyFile[];
+
+    /**
+     * An external property file containing a run.properties object to be merged with the root log file.
+     */
+    properties?: ExternalPropertyFile;
+}
+
 /**
  * A single file. In some cases, this file might be nested within another file.
  */
@@ -286,15 +320,20 @@ export interface File {
     offset?: number;
 
     /**
-     * Identifies the key of the immediate parent of the file, if this file is nested.
+     * Identifies the index of the immediate parent of the file, if this file is nested.
      */
-    parentKey?: string;
+    parentIndex?: number;
 
     /**
      * The role or roles played by the file in the analysis.
      */
     roles?: File.roles[];
 
+    /**
+     * Specifies the source language for any file object that refers to a text file that contains source code.
+     */
+    sourceLanguage?: string;
+
     /**
      * Key/value pairs that provide additional information about the file.
      */
@@ -362,6 +401,11 @@ export interface FileContent {
  * Specifies the location of a file.
  */
 export interface FileLocation {
+    /**
+     * The index within the run files array of the file object associated with the file location.
+     */
+    fileIndex?: number;
+
     /**
      * A string containing a valid relative or absolute URI.
      */
@@ -413,7 +457,7 @@ export interface Graph {
     /**
      * An array of edge objects representing the edges of the graph.
      */
-    edges: Edge[];
+    edges?: Edge[];
 
     /**
      * A string that uniquely identifies the graph within a run.graphs or result.graphs array.
@@ -423,7 +467,7 @@ export interface Graph {
     /**
      * An array of node objects representing the nodes of the graph.
      */
-    nodes: Node[];
+    nodes?: Node[];
 
     /**
      * Key/value pairs that provide additional information about the graph.
@@ -443,7 +487,7 @@ export interface GraphTraversal {
     /**
      * The sequences of edges traversed by this graph traversal.
      */
-    edgeTraversals: EdgeTraversal[];
+    edgeTraversals?: EdgeTraversal[];
 
     /**
      * A string that uniquely identifies that graph being traversed.
@@ -611,6 +655,11 @@ export interface Location {
      */
     fullyQualifiedLogicalName?: string;
 
+    /**
+     * The index within the logical locations array of the logical location associated with the result.
+     */
+    logicalLocationIndex?: number;
+
     /**
      * A message relevant to the location.
      */
@@ -643,9 +692,9 @@ export interface LogicalLocation {
     fullyQualifiedName?: string;
 
     /**
-     * The type of construct this logicalLocationComponent refers to. Should be one of 'function', 'member',
-     * 'module', 'namespace', 'package', 'parameter', 'resource', 'returnType', 'type', or 'variable', if any of
-     * those accurately describe the construct.
+     * The type of construct this logical location component refers to. Should be one of 'function', 'member',
+     * 'module', 'namespace', 'parameter', 'resource', 'returnType', 'type', or 'variable', if any of those
+     * accurately describe the construct.
      */
     kind?: string;
 
@@ -656,10 +705,10 @@ export interface LogicalLocation {
     name?: string;
 
     /**
-     * Identifies the key of the immediate parent of the construct in which the result was detected. For example,
+     * Identifies the index of the immediate parent of the construct in which the result was detected. For example,
      * this property might point to a logical location that represents the namespace that holds a type.
      */
-    parentKey?: string;
+    parentIndex?: number;
 
     /**
      * Key/value pairs that provide additional information about the logical location.
@@ -763,11 +812,15 @@ export interface Notification {
     physicalLocation?: PhysicalLocation;
 
     /**
-     * The stable, unique identifier of the rule (if any) to which this notification is relevant. This member can be
-     * used to retrieve rule metadata from the rules dictionary, if it exists.
+     * The stable, unique identifier of the rule, if any, to which this notification is relevant.
      */
     ruleId?: string;
 
+    /**
+     * The index within the run resources array of the rule object, if any, associated with this notification.
+     */
+    ruleIndex?: number;
+
     /**
      * The thread identifier of the code that generated the notification.
      */
@@ -917,6 +970,11 @@ export interface Region {
      */
     snippet?: FileContent;
 
+    /**
+     * Specifies the source language, if any, of the portion of the file specified by the region object.
+     */
+    sourceLanguage?: string;
+
     /**
      * The column number of the first character in the region.
      */
@@ -963,10 +1021,14 @@ export interface Resources {
     messageStrings?: { [key: string]: string };
 
     /**
-     * A dictionary, each of whose keys is a string and each of whose values is a 'rule' object, that describe all
-     * rules associated with an analysis tool or a specific run of an analysis tool.
+     * An array of rule objects relevant to the run.
      */
-    rules?: { [key: string]: Rule };
+    rules?: Rule[];
+
+    /**
+     * Key/value pairs that provide additional information about the resources.
+     */
+    properties?: PropertyBag;
 }
 
 /**
@@ -994,12 +1056,6 @@ export interface Result {
      */
     codeFlows?: CodeFlow[];
 
-    /**
-     * An array of physicalLocation objects which specify the portions of an analysis tool's output that a converter
-     * transformed into the result object.
-     */
-    conversionProvenance?: PhysicalLocation[];
-
     /**
      * A stable, unique identifier for the equivalence class of logically identical results to which this result
      * belongs, in the form of a GUID.
@@ -1027,6 +1083,11 @@ export interface Result {
      */
     graphTraversals?: GraphTraversal[];
 
+    /**
+     * An absolute URI at which the result can be viewed.
+     */
+    hostedViewerUri?: string;
+
     /**
      * A stable, unique identifer for the result in the form of a GUID.
      */
@@ -1038,7 +1099,7 @@ export interface Result {
     level?: Result.level;
 
     /**
-     * One or more locations where the result occurred. Specify only one location unless the problem indicated by
+     * The set of locations where the result was detected. Specify only one location unless the problem indicated by
      * the result can only be corrected by making a change at every specified location.
      */
     locations?: Location[];
@@ -1047,7 +1108,7 @@ export interface Result {
      * A message that describes the result. The first sentence of the message only will be displayed when visible
      * space is limited.
      */
-    message?: Message;
+    message: Message;
 
     /**
      * A positive integer specifying the number of times this logically unique result was observed in this run.
@@ -1059,17 +1120,32 @@ export interface Result {
      */
     partialFingerprints?: { [key: string]: string };
 
+    /**
+     * Information about how and when the result was detected.
+     */
+    provenance?: ResultProvenance;
+
+    /**
+     * A number representing the priority or importance of the result.
+     */
+    rank?: number;
+
     /**
      * A set of locations relevant to this result.
      */
     relatedLocations?: Location[];
 
     /**
-     * The stable, unique identifier of the rule (if any) to which this notification is relevant. This member can be
+     * The stable, unique identifier of the rule, if any, to which this notification is relevant. This member can be
      * used to retrieve rule metadata from the rules dictionary, if it exists.
      */
     ruleId?: string;
 
+    /**
+     * The index within the run resources array of the rule object associated with this result.
+     */
+    ruleIndex?: number;
+
     /**
      * An array of 'stack' objects relevant to the result.
      */
@@ -1081,7 +1157,7 @@ export interface Result {
     suppressionStates?: Result.suppressionStates[];
 
     /**
-     * The URIs of the work items associated with this result
+     * The URIs of the work items associated with this result.
      */
     workItemUris?: string[];
 
@@ -1110,6 +1186,52 @@ export namespace Result {
         "absent";
 }
 
+/**
+ * Contains information about how and when a result was detected.
+ */
+export interface ResultProvenance {
+    /**
+     * An array of physicalLocation objects which specify the portions of an analysis tool's output that a
+     * converter transformed into the result.
+     */
+    conversionSources?: PhysicalLocation[];
+
+    /**
+     * A GUID-valued string equal to the id.instanceGuid property of the run in which the result was first
+     * detected.
+     */
+    firstDetectionRunInstanceGuid?: string;
+
+    /**
+     * The Coordinated Universal Time (UTC) date and time at which the result was first detected. See "Date/time
+     * properties" in the SARIF spec for the required format.
+     */
+    firstDetectionTimeUtc?: string;
+
+    /**
+     * The index within the run.invocations array of the invocation object which describes the tool invocation that
+     * detected the result.
+     */
+    invocationIndex?: number;
+
+    /**
+     * A GUID-valued string equal to the id.instanceGuid property of the run in which the result was most recently
+     * detected.
+     */
+    lastDetectionRunInstanceGuid?: string;
+
+    /**
+     * The Coordinated Universal Time (UTC) date and time at which the result was most recently detected. See
+     * "Date/time properties" in the SARIF spec for the required format.
+     */
+    lastDetectionTimeUtc?: string;
+
+    /**
+     * Key/value pairs that provide additional information about the result.
+     */
+    properties?: PropertyBag;
+}
+
 /**
  * Describes an analysis rule.
  */
@@ -1119,6 +1241,12 @@ export interface Rule {
      */
     configuration?: RuleConfiguration;
 
+    /**
+     * An array of stable, opaque identifiers by which this rule was known in some previous version of the analysis
+     * tool.
+     */
+    deprecatedIds?: string[];
+
     /**
      * A description of the rule. Should, as far as possible, provide details sufficient to enable resolution of any
      * problem indicated by the result.
@@ -1176,10 +1304,15 @@ export interface Rule {
  */
 export interface RuleConfiguration {
     /**
-     * Specifies the default severity level of the result.
+     * Specifies the default severity level for results generated by this rule.
      */
     defaultLevel?: RuleConfiguration.defaultLevel;
 
+    /**
+     * Specifies the default priority or importance for results generated by this rule.
+     */
+    defaultRank?: number;
+
     /**
      * Specifies whether the rule will be evaluated during the scan.
      */
@@ -1200,8 +1333,7 @@ export namespace RuleConfiguration {
     type defaultLevel =
         "note" |
         "warning" |
-        "error" |
-        "open";
+        "error";
 }
 
 /**
@@ -1213,11 +1345,6 @@ export interface Run {
      */
     aggregateIds?: RunAutomationDetails[];
 
-    /**
-     * The hardware architecture for which the run was targeted.
-     */
-    architecture?: string;
-
     /**
      * The 'instanceGuid' property of a previous SARIF 'run' that comprises the baseline that was used to compute
      * result 'baselineState' properties for the run.
@@ -1241,9 +1368,20 @@ export interface Run {
     defaultFileEncoding?: string;
 
     /**
-     * A dictionary, each of whose keys is a URI and each of whose values is a file object.
+     * Specifies the default source language for any file object that refers to a text file that contains source
+     * code.
      */
-    files?: { [key: string]: File };
+    defaultSourceLanguage?: string;
+
+    /**
+     * References to external property files that should be inlined with the content of a root log file.
+     */
+    externalPropertyFiles?: ExternalPropertyFiles;
+
+    /**
+     * An array of file objects relevant to the run.
+     */
+    files?: File[];
 
     /**
      * A dictionary, each of whose keys is the id of a graph and each of whose values is a 'graph' object with that
@@ -1262,9 +1400,15 @@ export interface Run {
     invocations?: Invocation[];
 
     /**
-     * A dictionary, each of whose keys specifies a logical location such as a namespace, type or function.
+     * An array of logical locations such as namespaces, types or functions.
      */
-    logicalLocations?: { [key: string]: LogicalLocation };
+    logicalLocations?: LogicalLocation[];
+
+    /**
+     * An ordered list of character sequences that were treated as line breaks when computing region information
+     * for the run.
+     */
+    newlineSequences?: string[];
 
     /**
      * The file location specified by each uriBaseId symbol on the machine where the tool originally ran.
@@ -1472,7 +1616,7 @@ export interface ThreadFlowLocation {
     module?: string;
 
     /**
-     * An integer representing a containment hierarchy within the thread flow
+     * An integer representing a containment hierarchy within the thread flow.
      */
     nestingLevel?: number;
 
@@ -1505,17 +1649,17 @@ export namespace ThreadFlowLocation {
  * The analysis tool that was run.
  */
 export interface Tool {
+    /**
+     * The binary version of the tool's primary executable file expressed as four non-negative integers separated
+     * by a period (for operating systems that express file versions in this way).
+     */
+    dottedQuadFileVersion?: string;
+
     /**
      * The absolute URI from which the tool can be downloaded.
      */
     downloadUri?: string;
 
-    /**
-     * The binary version of the tool's primary executable file (for operating systems such as Windows that provide
-     * that information).
-     */
-    fileVersion?: string;
-
     /**
      * The name of the tool along with its version and any other useful identifying information, such as its locale.
      */
@@ -1555,7 +1699,7 @@ export interface Tool {
 }
 
 /**
- * TBD
+ * Specifies the information necessary to retrieve a desired revision from a version control system.
  */
 export interface VersionControlDetails {
     /**
@@ -1569,6 +1713,12 @@ export interface VersionControlDetails {
      */
     branch?: string;
 
+    /**
+     * The location in the local file system to which the root of the repository was mapped at the time of the
+     * analysis.
+     */
+    mappedTo?: FileLocation;
+
     /**
      * The absolute URI of the repository.
      */
diff --git a/types/sass-webpack-plugin/index.d.ts b/types/sass-webpack-plugin/index.d.ts
index df589ca034..1299429790 100644
--- a/types/sass-webpack-plugin/index.d.ts
+++ b/types/sass-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jalkoby/sass-webpack-plugin
 // Definitions by: AEPKILL <https://github.com/AepKill>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.7
 
 import { Options } from 'node-sass';
 import { Plugin } from 'webpack';
diff --git a/types/sc-hot-reboot/index.d.ts b/types/sc-hot-reboot/index.d.ts
index 3fcc447eb0..347fc19a78 100644
--- a/types/sc-hot-reboot/index.d.ts
+++ b/types/sc-hot-reboot/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for sc-hot-reboot 1.0
-// Project: https://github.com/SocketCluster/sc-channel
+// Project: https://github.com/socketcluster/sc-hot-reboot
 // Definitions by: Daniel Rose <https://github.com/DanielRose>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/screeps-profiler/index.d.ts b/types/screeps-profiler/index.d.ts
index d874e4685f..9afe45b320 100644
--- a/types/screeps-profiler/index.d.ts
+++ b/types/screeps-profiler/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for screeps-profiler 1.2
-// Project: https://github.com/gdborton/screeps-profiler
+// Project: https://github.com/screepers/screeps-profiler
 // Definitions by: Casey Link <https://github.com/ramblurr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/script-ext-html-webpack-plugin/index.d.ts b/types/script-ext-html-webpack-plugin/index.d.ts
new file mode 100644
index 0000000000..636ac550e5
--- /dev/null
+++ b/types/script-ext-html-webpack-plugin/index.d.ts
@@ -0,0 +1,79 @@
+// Type definitions for script-ext-html-webpack-plugin 2.1
+// Project: https://github.com/numical/script-ext-html-webpack-plugin
+// Definitions by: Dave Cardwell <https://github.com/davecardwell>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Plugin } from "webpack";
+
+export = ScriptExtHtmlWebpackPlugin;
+
+declare class ScriptExtHtmlWebpackPlugin extends Plugin {
+    constructor(options?: ScriptExtHtmlWebpackPlugin.Options);
+}
+
+type ScriptMatchingPatternBase =
+    | string
+    | RegExp
+    | ReadonlyArray<string | RegExp>;
+
+interface ScriptMatchingPatternHash {
+    test: ScriptMatchingPatternBase;
+}
+
+type ScriptMatchingPattern =
+    | ScriptMatchingPatternBase
+    | ScriptMatchingPatternHash;
+
+type ScriptMatchingPatternPre =
+    | ScriptMatchingPatternBase
+    | ScriptMatchingPatternHash & {
+          chunks?: "initial" | "async" | "all";
+      };
+
+interface Custom {
+    test: ScriptMatchingPattern;
+    attribute: string;
+    value?: string;
+}
+
+declare namespace ScriptExtHtmlWebpackPlugin {
+    interface Options {
+        /**
+         * scripts that should be inlined in the html (default: `[]`)
+         */
+        inline?: ScriptMatchingPattern;
+        /**
+         * script names that should have no attribute (default: `[]`)
+         */
+        sync?: ScriptMatchingPattern;
+        /**
+         * script names that should have an async attribute (default: `[]`)
+         */
+        async?: ScriptMatchingPattern;
+        /**
+         * script names that should have a defer attribute (default: `[]`)
+         */
+        defer?: ScriptMatchingPattern;
+        /**
+         * the default attribute to set - 'sync' actually results in no attribute (default: 'sync')
+         */
+        defaultAttribute?: "sync" | "async" | "defer";
+        /**
+         * script names that should have a type="module" attribute (default: `[]`)
+         */
+        module?: ScriptMatchingPattern;
+        /**
+         * scripts that should have accompanying preload resource hints (default: `[]`)
+         */
+        preload?: ScriptMatchingPatternPre;
+        /**
+         * scripts that should have accompanying prefetch resource hints (default: `[]`)
+         */
+        prefetch?: ScriptMatchingPatternPre;
+        /**
+         * scripts that should have a custom attribute(s) added, the attribute(s), and the value(s)
+         */
+        custom?: Custom | Custom[];
+    }
+}
diff --git a/types/script-ext-html-webpack-plugin/script-ext-html-webpack-plugin-tests.ts b/types/script-ext-html-webpack-plugin/script-ext-html-webpack-plugin-tests.ts
new file mode 100644
index 0000000000..84c42b2ae9
--- /dev/null
+++ b/types/script-ext-html-webpack-plugin/script-ext-html-webpack-plugin-tests.ts
@@ -0,0 +1,112 @@
+import ScriptExtHtmlWebpackPlugin = require("script-ext-html-webpack-plugin");
+
+new ScriptExtHtmlWebpackPlugin();
+new ScriptExtHtmlWebpackPlugin({});
+
+new ScriptExtHtmlWebpackPlugin({
+    inline: "string",
+    sync: "string",
+    async: "string",
+    defer: "string",
+    module: "string",
+    preload: "string",
+    prefetch: "string"
+});
+
+new ScriptExtHtmlWebpackPlugin({
+    inline: ["array"],
+    sync: ["array"],
+    async: ["array"],
+    defer: ["array"],
+    module: ["array"],
+    preload: ["array"],
+    prefetch: ["array"]
+});
+
+new ScriptExtHtmlWebpackPlugin({
+    inline: /regexp/,
+    sync: /regexp/,
+    async: /regexp/,
+    defer: /regexp/,
+    module: /regexp/,
+    preload: /regexp/,
+    prefetch: /regexp/
+});
+
+new ScriptExtHtmlWebpackPlugin({
+    inline: { test: "string" },
+    sync: { test: "string" },
+    async: { test: "string" },
+    defer: { test: "string" },
+    module: { test: "string" },
+    preload: { test: "string" },
+    prefetch: { test: "string" }
+});
+
+new ScriptExtHtmlWebpackPlugin({
+    inline: { test: ["array"] },
+    sync: { test: ["array"] },
+    async: { test: ["array"] },
+    defer: { test: ["array"] },
+    module: { test: ["array"] },
+    preload: { test: ["array"] },
+    prefetch: { test: ["array"] }
+});
+
+new ScriptExtHtmlWebpackPlugin({
+    inline: { test: /regexp/ },
+    sync: { test: /regexp/ },
+    async: { test: /regexp/ },
+    defer: { test: /regexp/ },
+    module: { test: /regexp/ },
+    preload: { test: /regexp/ },
+    prefetch: { test: /regexp/ }
+});
+
+new ScriptExtHtmlWebpackPlugin({
+    preload: { test: "string", chunks: "initial" },
+    prefetch: { test: "string", chunks: "initial" }
+});
+
+new ScriptExtHtmlWebpackPlugin({
+    preload: { test: "string", chunks: "async" },
+    prefetch: { test: "string", chunks: "async" }
+});
+
+new ScriptExtHtmlWebpackPlugin({
+    preload: { test: "string", chunks: "all" },
+    prefetch: { test: "string", chunks: "all" }
+});
+
+new ScriptExtHtmlWebpackPlugin({ defaultAttribute: "sync" });
+new ScriptExtHtmlWebpackPlugin({ defaultAttribute: "async" });
+new ScriptExtHtmlWebpackPlugin({ defaultAttribute: "defer" });
+
+new ScriptExtHtmlWebpackPlugin({
+    custom: {
+        test: "string",
+        attribute: "string"
+    }
+});
+
+new ScriptExtHtmlWebpackPlugin({
+    custom: {
+        test: ["array"],
+        attribute: "string",
+        value: "string"
+    }
+});
+
+new ScriptExtHtmlWebpackPlugin({
+    custom: [
+        {
+            test: /regexp/,
+            attribute: "string"
+        },
+        {
+            test: "string",
+            attribute: "string",
+            value: "string"
+        }
+    ]
+});
diff --git a/types/script-ext-html-webpack-plugin/tsconfig.json b/types/script-ext-html-webpack-plugin/tsconfig.json
new file mode 100644
index 0000000000..32c8e618e3
--- /dev/null
+++ b/types/script-ext-html-webpack-plugin/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", "script-ext-html-webpack-plugin-tests.ts"]
+}
diff --git a/types/script-ext-html-webpack-plugin/tslint.json b/types/script-ext-html-webpack-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/script-ext-html-webpack-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/scroller/index.d.ts b/types/scroller/index.d.ts
index 9230285414..309a3e6441 100644
--- a/types/scroller/index.d.ts
+++ b/types/scroller/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Zynga Scroller 0.1
-// Project: http://zynga.github.com/scroller/
+// Project: http://zynga.github.com/scroller/, https://github.com/popham/scroller
 // Definitions by: Marcelo Haskell Camargo <https://github.com/haskellcamargo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/select2/index.d.ts b/types/select2/index.d.ts
index 240b4b7f25..f060d658f9 100644
--- a/types/select2/index.d.ts
+++ b/types/select2/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Select2 4.0
-// Project: http://ivaynberg.github.com/select2/
+// Project: http://ivaynberg.github.com/select2/, https://select2.org
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 //                 denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/select2/v3/index.d.ts b/types/select2/v3/index.d.ts
index 3c8fc11155..f4a0c01efb 100644
--- a/types/select2/v3/index.d.ts
+++ b/types/select2/v3/index.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-
 /// <reference types="jquery"/>
 
 interface Select2QueryOptions {
@@ -23,8 +22,8 @@ interface AjaxFunction {
 interface Select2AjaxOptions extends JQueryAjaxSettings {
     transport?: AjaxFunction;
     /**
-    * Url to make request to, Can be string or a function returning a string.
-    */
+     * Url to make request to, Can be string or a function returning a string.
+     */
     url?: any;
     dataType?: string;
     quietMillis?: number;
@@ -93,77 +92,77 @@ interface Select2Plugin {
     (): JQuery;
     (it: IdTextPair): JQuery;
 
-	/**
-	 * Get the id value of the current selection
-	 */
+    /**
+     * Get the id value of the current selection
+     */
     (method: 'val'): any;
-	/**
-	 * Set the id value of the current selection
-	 * @params value Value to set the id to
-	 * @params triggerChange Should a change event be triggered
-	 */
+    /**
+     * Set the id value of the current selection
+     * @params value Value to set the id to
+     * @params triggerChange Should a change event be triggered
+     */
     (method: 'val', value: any, triggerChange?: boolean): any;
-	/**
-	 * Get the data object of the current selection
-	 */
+    /**
+     * Get the data object of the current selection
+     */
     (method: 'data'): any;
-	/**
-	 * Set the data of the current selection
-	 * @params value Object to set the data to
-	 * @params triggerChange Should a change event be triggered
-	 */
+    /**
+     * Set the data of the current selection
+     * @params value Object to set the data to
+     * @params triggerChange Should a change event be triggered
+     */
     (method: 'data', value: any, triggerChange?: boolean): any;
-	/**
-	 * Whether it is open
-	 */
+    /**
+     * Whether it is open
+     */
     (method: 'opened'): boolean;
-	/**
-	 * Whether it is in focus
-	 */
+    /**
+     * Whether it is in focus
+     */
     (method: 'isFocused'): boolean;
-	/**
-	 * Reverts changes to DOM done by Select2. Any selection done via Select2 will be preserved.
-	 */
+    /**
+     * Reverts changes to DOM done by Select2. Any selection done via Select2 will be preserved.
+     */
     (method: 'destroy'): JQuery;
-	/**
-	 * Opens the dropdown
-	 */
+    /**
+     * Opens the dropdown
+     */
     (method: 'open'): JQuery;
-	/**
-	 * Closes the dropdown
-	 */
+    /**
+     * Closes the dropdown
+     */
     (method: 'close'): JQuery;
-	/**
-	 * Disables Select2
-	 */
+    /**
+     * Disables Select2
+     */
     (method: 'disable'): JQuery;
-	/**
-	 * Enables or disables Select2 and its underlying form component
-	 * @param value True if it should be enabled false if it should be disabled
-	 */
+    /**
+     * Enables or disables Select2 and its underlying form component
+     * @param value True if it should be enabled false if it should be disabled
+     */
     (method: 'enable', value?: boolean): JQuery;
-	/**
-	 * Enable its focus
-	 */
+    /**
+     * Enable its focus
+     */
     (method: 'focus'): JQuery;
-	/**
-	 * Toggles readonly mode on Select2 and its underlying form component
-	 * @param value True if it should be readonly false if it should be read write
-	 */
+    /**
+     * Toggles readonly mode on Select2 and its underlying form component
+     * @param value True if it should be readonly false if it should be read write
+     */
     (method: 'readonly', value: boolean): JQuery;
-	/**
-	 * Retrieves the main container element that wraps all of DOM added by Select2
-	 */
+    /**
+     * Retrieves the main container element that wraps all of DOM added by Select2
+     */
     (method: 'container'): JQuery;
-	/**
-	 * Notifies Select2 that a drag and drop sorting operation has started
-	 */
+    /**
+     * Notifies Select2 that a drag and drop sorting operation has started
+     */
     (method: 'onSortStart'): JQuery;
-	/**
-	 * Notifies Select2 that a drag and drop sorting operation has finished
-	 */
+    /**
+     * Notifies Select2 that a drag and drop sorting operation has finished
+     */
     (method: 'onSortEnd'): JQuery;
-     /**
+    /**
      * Executes a new search using the provided value. Example: $("#tags").select2("search", "California")
      */
     (method: 'search'): JQuery;
diff --git a/types/select2/v3/select2-tests.ts b/types/select2/v3/select2-tests.ts
index fe7f900e3d..4a0a496e13 100644
--- a/types/select2/v3/select2-tests.ts
+++ b/types/select2/v3/select2-tests.ts
@@ -9,9 +9,9 @@ $("#e2_2").select2({
 $("#e3").select2({
     minimumInputLength: 2
 });
-function format(state) {
+function format(state: any) {
     if (!state.id) return state.text;
-    return "<img class='flag' src='images/flags/" + state.id.toLowerCase() + ".png'/>" + state.text;
+    return `<img class='flag' src='images/flags/${state.id.toLowerCase()}.png'/>${state.text}`;
 }
 $("#e4").select2({
     formatResult: format,
@@ -21,10 +21,10 @@ $("#e5").select2({
     minimumInputLength: 1,
     query: function (query) {
         console.info('current element value:', query.element.val());
-        var data = { results: [] }, i, j, s;
-        for (i = 1; i < 5; i++) {
-            s = "";
-            for (j = 0; j < i; j++) { s = s + query.term; }
+        const data = { results: [] as IdTextPair[] };
+        for (let i = 1; i < 5; i++) {
+            let s = "";
+            for (let j = 0; j < i; j++) { s = s + query.term; }
             data.results.push({ id: query.term + i, text: s });
         }
     }
@@ -35,7 +35,7 @@ $("#e10").select2({
     data: [{ id: 0, text: 'enhancement' }, { id: 1, text: 'bug' }, { id: 2, text: 'duplicate' }, { id: 3, text: 'invalid' }, { id: 4, text: 'wontfix' }]
 });
 
-var data = [{ id: 0, tag: 'enhancement' }, { id: 1, tag: 'bug' }, { id: 2, tag: 'duplicate' }, { id: 3, tag: 'invalid' }, { id: 4, tag: 'wontfix' }];
+const data = [{ id: 0, tag: 'enhancement' }, { id: 1, tag: 'bug' }, { id: 2, tag: 'duplicate' }, { id: 3, tag: 'invalid' }, { id: 4, tag: 'wontfix' }];
 
 $("#e10_2").select2({
     data: { results: data, text: 'tag' },
@@ -44,11 +44,20 @@ $("#e10_2").select2({
 });
 
 $("#e10_3").select2({
-    data: { results: data, text: function (item) { console.log('called with', item); return item.tag; } },
+    data: {
+        results: data,
+        text: (item: {tag: string}) => {
+            console.log('called with', item);
+            return item.tag;
+        }
+    },
     formatSelection: format,
     formatResult: format
 });
-var movieFormatResult, movieFormatSelection;
+
+let movieFormatResult;
+let movieFormatSelection;
+
 $("#e6").select2({
     placeholder: "Search for a movie",
     minimumInputLength: 1,
@@ -75,7 +84,7 @@ $("#e6").select2({
     placeholder: "Search for a movie",
     minimumInputLength: 1,
     ajax: {
-        url: () => { return "http://api.rottentomatoes.com/api/public/v1.0/movies.json"; },
+        url: () => "http://api.rottentomatoes.com/api/public/v1.0/movies.json",
         dataType: 'jsonp',
         data: function (term, page) {
             return {
@@ -131,7 +140,7 @@ $("#e7").select2({
             };
         },
         results: function (data, page) {
-            var more = (page * 10) < data.total;
+            const more = (page * 10) < data.total;
             return { results: data.movies, more: more };
         }
     },
@@ -140,7 +149,7 @@ $("#e7").select2({
     dropdownCssClass: "bigdrop"
 });
 
-function sort(elements) {
+function sort(elements: any) {
     return elements.sort();
 }
 
@@ -170,13 +179,12 @@ $("#e11_2").select2({
     multiple: true,
     data: [{ id: 0, text: 'story' }, { id: 1, text: 'bug' }, { id: 2, text: 'task' }]
 });
-function log(e) {
-    var item = $("<li>" + e + "</li>");
+function log(e: string) {
+    const item = $(`<li>${e}</li>`);
     $("#events_11").append(item);
     item.animate({ opacity: 1 }, 10000, 'linear', function () { item.animate({ opacity: 0 }, 2000, 'linear', function () { item.remove(); }); });
 }
 $("#e11")
-    // TS 0.9.5: correct overload not resolved https://typescript.codeplex.com/discussions/472172
     .on("change", function (e: Select2JQueryEventObject) { log(JSON.stringify({ val: e.val, added: e.added, removed: e.removed })); })
     .on("open", function () { log("open"); });
 $("#e11_2")
@@ -201,7 +209,7 @@ $("#e16_2").select2();
 $("#e16_enable").click(function () { $("#e16,#e16_2").select2("enable"); });
 $("#e16_disable").click(function () { $("#e16,#e16_2").select2("enable", false); });
 $("#e17").select2({
-    matcher: function (term, text) { return text.toUpperCase().indexOf(term.toUpperCase()) == 0; }
+    matcher: function (term, text) { return text.toUpperCase().indexOf(term.toUpperCase()) === 0; }
 });
 $("#e17_2").select2({
     matcher: function (term, text, opt) {
@@ -210,22 +218,26 @@ $("#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;
-}});
+alert("Selected value is: " + $("#e8").select2("val"));
+$("#e8").select2("val", {id: "CA", text: "Califoria"});
 
-$('#e20').select2({
-  tokenizer: (textInput, selection, selectCallback, options) => {
-    if (options.dropdownAutoWidth) {
-      selectCallback();
-      return null;
-    } else if (options.allowClear) {
-      selectCallback(textInput + '_');
-      return textInput + '_';
+$("#e1").select2({
+    nextSearchTerm: (selectedObject: object, currentSearchTerm: string) => {
+        return currentSearchTerm;
+    }
+});
+
+$("#id").select2({
+    tokenizer: (textInput, selection, selectCallback, options) => {
+        if (options.dropdownAutoWidth) {
+            selectCallback();
+            return null;
+        } else if (options.allowClear) {
+            selectCallback(textInput + '_');
+            return textInput + '_';
+        }
+        selection.push('extra');
     }
-    selection.push('extra');
-  }
 });
 
 $("#e8").select2("val");
diff --git a/types/select2/v3/tsconfig.json b/types/select2/v3/tsconfig.json
index 8b8f30ed05..aeb9f31a86 100644
--- a/types/select2/v3/tsconfig.json
+++ b/types/select2/v3/tsconfig.json
@@ -5,8 +5,8 @@
             "es6",
             "dom"
         ],
-        "noImplicitAny": false,
-        "noImplicitThis": false,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
         "strictNullChecks": false,
         "strictFunctionTypes": true,
         "baseUrl": "../../",
diff --git a/types/select2/v3/tslint.json b/types/select2/v3/tslint.json
index a41bf5d19a..fdbd83d321 100644
--- a/types/select2/v3/tslint.json
+++ b/types/select2/v3/tslint.json
@@ -1,79 +1,9 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
         "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
         "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
         "space-before-function-paren": false,
-        "space-within-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/selenium-webdriver/index.d.ts b/types/selenium-webdriver/index.d.ts
index 4fa0ccf7ac..57a32a56b9 100644
--- a/types/selenium-webdriver/index.d.ts
+++ b/types/selenium-webdriver/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Selenium WebDriverJS 3.0
-// Project: https://github.com/SeleniumHQ/selenium/tree/master/javascript/node/selenium-webdriver
+// Project: https://github.com/SeleniumHQ/selenium/tree/master/javascript/node/selenium-webdriver, https://github.com/seleniumhq/selenium
 // Definitions by: Bill Armstrong <https://github.com/BillArmstrong>,
 //   Yuki Kokubun <https://github.com/Kuniwak>,
 //   Craig Nishina <https://github.com/cnishina>,
diff --git a/types/semantic-release/index.d.ts b/types/semantic-release/index.d.ts
new file mode 100644
index 0000000000..656461b756
--- /dev/null
+++ b/types/semantic-release/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for semantic-release 15.13
+// Project: https://github.com/semantic-release/semantic-release#readme
+// Definitions by: Leonardo Gatica <https://github.com/lgaticaq>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * The semantic release configuration itself.
+ */
+export interface GlobalConfig {
+	/** The full prepare step configuration. */
+	prepare?: any;
+	/** The branch on which releases should happen. */
+	branch: string;
+	/** The Git repository URL, in any supported format. */
+	repositoryUrl: string;
+	/** The Git tag format used by semantic-release to identify releases. */
+	tagFormat: string;
+}
+
+export interface LastRelease {
+	/** The version name of the release */
+	version: string;
+	/** The Git tag of the release. */
+	gitTag: string;
+	/** The Git checksum of the last commit of the release. */
+	gitHead: string;
+}
+
+export interface NextRelease extends LastRelease {
+	/** The release notes of the next release. */
+	notes: string;
+}
+
+export interface Context {
+	/** The semantic release configuration itself. */
+	options?: GlobalConfig;
+	/** The previous release details. */
+	lastRelease?: LastRelease;
+	/** The next release details. */
+	nextRelease?: NextRelease;
+	/** The shared logger instance of semantic release. */
+	logger: {
+		log: (message: string, ...vars: any[]) => void,
+		error: (message: string, ...vars: any[]) => void,
+	};
+}
diff --git a/types/semantic-release/semantic-release-tests.ts b/types/semantic-release/semantic-release-tests.ts
new file mode 100644
index 0000000000..0c954fe295
--- /dev/null
+++ b/types/semantic-release/semantic-release-tests.ts
@@ -0,0 +1,17 @@
+import * as lib from 'semantic-release';
+
+function publish(pluginConfig: any, context: lib.Context) {
+    const version = context.nextRelease && context.nextRelease.version;
+    context.logger.log(`New version ${version}`);
+}
+
+const context = {
+    nextRelease: {
+        version: '1.0.0',
+        gitTag: '1.0.0',
+        gitHead: 'f1eed296d2ffe184fb15f52b1c5ad778f5c87645',
+        notes: 'New release'
+    },
+    logger: console
+};
+publish({}, context);
diff --git a/types/semantic-release/tsconfig.json b/types/semantic-release/tsconfig.json
new file mode 100644
index 0000000000..d226e296ce
--- /dev/null
+++ b/types/semantic-release/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "semantic-release-tests.ts"
+    ]
+}
diff --git a/types/semantic-release/tslint.json b/types/semantic-release/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/semantic-release/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/semantic-ui/index.d.ts b/types/semantic-ui/index.d.ts
index 00b2c7c273..a5a18722fa 100644
--- a/types/semantic-ui/index.d.ts
+++ b/types/semantic-ui/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Semantic UI 2.2
-// Project: http://semantic-ui.com/
+// Project: http://www.semantic-ui.com
 // Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 701a735f14..d89dac0d4a 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -3187,8 +3187,9 @@ declare namespace sequelize {
      * We did put Object in the end, because there where query might be a JSON Blob. It cripples a bit the
      * typesafety, but there is no way to pass the tests if we just remove it.
      */
+    type Primitives = string | number | boolean | Buffer;
     type WhereOptions<T> = {
-        [P in keyof T]?: string | number | boolean | WhereLogic | WhereOptions<T[P]> | col | and | or | WhereGeometryOptions | WhereNested | Array<string | number> | null;
+        [P in keyof T]?: Primitives | Array<Primitives> | WhereLogic | (T[P] extends Primitives ? null : WhereOptions<T[P]>) | col | and | or | WhereGeometryOptions | WhereNested | null;
     };
 
     /**
@@ -3285,6 +3286,11 @@ declare namespace sequelize {
          * if true, it will also eager load the relations of the child models, recursively.
          */
         nested?: boolean;
+
+        /**
+         * If true, runs a separate query to fetch the associated instances, only supported for hasMany associations
+         */
+        separate?: boolean;
     }
 
     /**
@@ -5273,6 +5279,11 @@ declare namespace sequelize {
 
         collate?: string;
 
+        /**
+         * Specify the ROW_FORMAT for use with the MySQL InnoDB engine.
+         */
+        rowFormat?: string;
+
         /**
          * Set the initial AUTO_INCREMENT value for the table in MySQL.
          */
@@ -6504,6 +6515,16 @@ declare namespace sequelize {
          */
         logging?: Function;
 
+        /**
+         * Specify the parent transaction so that this transaction is nested or a save point within the parent
+         */
+        transaction?: Transaction;
+
+        /**
+         * Sets the constraints to be deferred or immediately checked.
+         */
+        deferrable?: Deferrable[keyof Deferrable];
+
     }
 
     //
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index e2954e3637..bc0aa7d51d 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -922,6 +922,9 @@ User.findAll( { include : [{ model : Task, paranoid: false }] } );
 User.findAll( { transaction : t } );
 User.findAll( { where : { data : { name : { last : 's' }, employment : { $ne : 'a' } } }, order : [['id', 'ASC']] } );
 User.findAll( { where : { username : ['boo', 'boo2'] } } );
+User.findAll( { where : { username : Buffer.from("a name") } } );
+User.findAll( { where : { username : [Buffer.from("a name")] } } );
+User.findAll( { where : { username : [true] } } );
 User.findAll( { where : { username : { like : '%2' } } } );
 User.findAll( { where : { theDate : { '..' : ['2013-01-02', '2013-01-11'] } } } );
 User.findAll( { where : { intVal : { '!..' : [8, 10] } } } );
diff --git a/types/server/index.d.ts b/types/server/index.d.ts
index a9936fd4ba..cd566f0100 100644
--- a/types/server/index.d.ts
+++ b/types/server/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for server 1.0
-// Project: https://github.com/franciscop/server#readme
+// Project: https://github.com/franciscop/server#readme, https://serverjs.io
 // Definitions by: Santiago Aguilar <https://github.com/sant123>
 //                 Iddan Aaronsohn <https://github.com/iddan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/servicenow/index.d.ts b/types/servicenow/index.d.ts
index eaa56f4fc0..ab51d5349e 100644
--- a/types/servicenow/index.d.ts
+++ b/types/servicenow/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ServiceNow Javascript Scoped API 10.x
-// Project: https://docs.servicenow.com/bundle/jakarta-application-development/page/build/applications/concept/api-javascript.html
+// Project: https://docs.servicenow.com/bundle/jakarta-application-development/page/build/applications/concept/api-javascript.html, https://github.com/wa-ocio/servicenowrest
 // Definitions by: Bryce Godfrey <https://github.com/bryceg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/set-cookie-parser/index.d.ts b/types/set-cookie-parser/index.d.ts
index ea00ab4399..3da321ddb0 100644
--- a/types/set-cookie-parser/index.d.ts
+++ b/types/set-cookie-parser/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for set-cookie-parser
 // Project: https://github.com/nfriedly/set-cookie-parser
 // Definitions by: Nick Paddock <https://github.com/nickp10>
+//                 Ilya Zaytsev <https://github.com/ilyaztsv>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -8,10 +9,10 @@
 declare module "set-cookie-parser" {
     import http = require("http");
 
-    function SetCookieParser(input: string | ReadonlyArray<string> | http.IncomingMessage): SetCookieParser.Cookie[];
+    function SetCookieParser(input: string | ReadonlyArray<string> | http.IncomingMessage, options?: SetCookieParser.Options): SetCookieParser.Cookie[];
 
     namespace SetCookieParser {
-        function parse(input: string | ReadonlyArray<string> | http.IncomingMessage): Cookie[];
+        function parse(input: string | ReadonlyArray<string> | http.IncomingMessage, options?: Options): Cookie[];
 
         function splitCookiesString(input: string | ReadonlyArray<string> | void): string[];
 
@@ -25,6 +26,11 @@ declare module "set-cookie-parser" {
             secure?: boolean;
             httpOnly?: boolean;
         }
+
+        type Options = {
+            decodeValues?: boolean;
+            map?: boolean;
+        }
     }
 
     export = SetCookieParser;
diff --git a/types/set-cookie-parser/set-cookie-parser-tests.ts b/types/set-cookie-parser/set-cookie-parser-tests.ts
index ab4e88005d..578e257f0c 100644
--- a/types/set-cookie-parser/set-cookie-parser-tests.ts
+++ b/types/set-cookie-parser/set-cookie-parser-tests.ts
@@ -88,3 +88,22 @@ 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',
 ])
+
+// Use decodeValues=false option
+var notDecodedValueCookies = setCookie.parse('user=%D0%98%D0%BB%D1%8C%D1%8F%20%D0%97%D0%B0%D0%B9%D1%86%D0%B5%D0%B2; Max-Age=1000; Domain=.example.com; Path=/; Expires=Tue, 01 Jul 3000 10:01:11 GMT; HttpOnly; Secure', { decodeValues: false });
+assert.equal(notDecodedValueCookies[0].value, '%D0%98%D0%BB%D1%8C%D1%8F%20%D0%97%D0%B0%D0%B9%D1%86%D0%B5%D0%B2');
+
+var decodedValueCookies = setCookie.parse('user=%D0%98%D0%BB%D1%8C%D1%8F%20%D0%97%D0%B0%D0%B9%D1%86%D0%B5%D0%B2; Max-Age=1000; Domain=.example.com; Path=/; Expires=Tue, 01 Jul 3000 10:01:11 GMT; HttpOnly; Secure', { decodeValues: true });
+assert.equal(decodedValueCookies[0].value, 'Илья Зайцев');
+
+// Use map=true option
+var expectedCookiesMap = {
+    foo: {
+        name: 'foo',
+        value: 'bar',
+        maxAge: 1000,
+        domain: '.example.com',
+    }
+};
+var cookiesMap = setCookie.parse('foo=bar; Max-Age=1000; Domain=.example.com;', { map: true });
+assert.deepStrictEqual(cookiesMap, expectedCookiesMap);
\ No newline at end of file
diff --git a/types/shallowequal/index.d.ts b/types/shallowequal/index.d.ts
index 95b91d6de5..4d111eb332 100644
--- a/types/shallowequal/index.d.ts
+++ b/types/shallowequal/index.d.ts
@@ -2,14 +2,24 @@
 // Project: https://github.com/dashed/shallowequal
 // Definitions by: Sean Kelley <https://github.com/seansfkelley>
 //                 BendingBender <https://github.com/BendingBender>
+//                 Arnd Issler <https://github.com/arndissler>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 declare function shallowEqual<TCtx = any>(
     objA: any,
     objB: any,
-    compare?: (this: TCtx, objA: any, objB: any, indexOrKey?: number | string) => boolean | void,
+    customizer?: shallowEqual.Customizer<TCtx>,
     compareContext?: TCtx
 ): boolean;
 
+declare namespace shallowEqual {
+    type Customizer<T = any> = (
+        this: T,
+        objA: any,
+        objB: any,
+        indexOrKey?: number | string
+    ) => boolean | void;
+}
+
 export = shallowEqual;
diff --git a/types/shallowequal/shallowequal-tests.ts b/types/shallowequal/shallowequal-tests.ts
index efa5b546a5..6d30381472 100644
--- a/types/shallowequal/shallowequal-tests.ts
+++ b/types/shallowequal/shallowequal-tests.ts
@@ -12,13 +12,34 @@ shallowEqual(a, b, (a, b, indexOrKey) => {
 
     return false;
 });
-shallowEqual(a, b, () => {}); // $ExpectType boolean
+shallowEqual(a, b, () => undefined); // $ExpectType boolean
 // $ExpectType boolean
 shallowEqual(
     a,
     b,
     function() {
         this; // $ExpectType { foo: string; }
+        return undefined;
     },
     { foo: 'bar' }
 );
+
+interface Foo {
+    foo: string;
+    bar: number;
+}
+
+const c: Foo = { foo: 'foo', bar: 0 };
+const d: Foo = { foo: 'baz', bar: 1 };
+
+const undefinedCustomizer: shallowEqual.Customizer<Foo> = () => undefined;
+
+const customizer: shallowEqual.Customizer<Foo> = function(a: any, b: any) {
+    this; // $ExpectType Foo
+    a; // $ExpectType any
+    b; // $ExpectType any
+    return undefined;
+};
+
+shallowEqual(c, d, undefinedCustomizer); // $ExpectType boolean
+shallowEqual(c, d, customizer); // $ExpectType boolean
diff --git a/types/shelljs/index.d.ts b/types/shelljs/index.d.ts
index 38f55bfceb..fdd4b1812e 100644
--- a/types/shelljs/index.d.ts
+++ b/types/shelljs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ShellJS 0.8
-// Project: http://shelljs.org
+// Project: http://shelljs.org, http://github.com/shelljs/shelljs
 // Definitions by: Niklas Mollenhauer <https://github.com/nikeee>
 //                 Vojtech Jasny <https://github.com/voy>
 //                 George Kalpakas <https://github.com/gkalpak>
diff --git a/types/shipit/index.d.ts b/types/shipit-cli/index.d.ts
similarity index 100%
rename from types/shipit/index.d.ts
rename to types/shipit-cli/index.d.ts
diff --git a/types/shipit-cli/shipit-cli-tests.ts b/types/shipit-cli/shipit-cli-tests.ts
new file mode 100644
index 0000000000..50dff54978
--- /dev/null
+++ b/types/shipit-cli/shipit-cli-tests.ts
@@ -0,0 +1,50 @@
+import shipit = require("shipit-cli");
+
+shipit.initConfig({
+    default: {
+        workspace: "/tmp/github-monitor",
+        deployTo: "/tmp/deploy_to",
+        repositoryUrl: "https://github.com/user/repo.git",
+        ignores: [".git", "node_modules"],
+        rsync: ["--del"],
+        keepReleases: 2,
+        key: "/path/to/key",
+        shallowClone: true
+    },
+    staging: {
+        servers: "user@myserver.com"
+    }
+});
+
+shipit.task("build", () => {
+  shipit.emit("built");
+});
+
+shipit.on("built", () => {
+  shipit.start("start-server");
+});
+
+shipit.task("pwd", () => {
+  return shipit.remote("pwd");
+});
+
+shipit.blTask("pwd", () => {
+  return shipit.remote("pwd");
+});
+
+shipit.start("task");
+shipit.start("task1", "task2");
+shipit.start(["task1", "task2"]);
+
+shipit.local("ls -lah", {cwd: "/tmp/deploy/workspace"}).then((res: any) => {
+  console.log(res.stdout);
+  console.log(res.stderr);
+});
+
+shipit.remote("ls -lah").then((res: any) => {
+  console.log(res[0].stdout);
+  console.log(res[0].stderr);
+});
+
+shipit.remoteCopy("/tmp/workspace", "/opt/web/myapp").then(() => {});
+shipit.log("hello %s", "world");
diff --git a/types/shipit-cli/tsconfig.json b/types/shipit-cli/tsconfig.json
new file mode 100644
index 0000000000..1a50f6df35
--- /dev/null
+++ b/types/shipit-cli/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "shipit-cli-tests.ts"
+    ]
+}
diff --git a/types/shipit-cli/tslint.json b/types/shipit-cli/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/shipit-cli/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/shipit/shipit-tests.ts b/types/shipit/shipit-tests.ts
deleted file mode 100644
index a256f87e07..0000000000
--- a/types/shipit/shipit-tests.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import shipit = require("shipit");
-
-shipit.initConfig({
-    default: {
-        workspace: "/tmp/github-monitor",
-        deployTo: "/tmp/deploy_to",
-        repositoryUrl: "https://github.com/user/repo.git",
-        ignores: [".git", "node_modules"],
-        rsync: ["--del"],
-        keepReleases: 2,
-        key: "/path/to/key",
-        shallowClone: true
-    },
-    staging: {
-        servers: "user@myserver.com"
-    }
-});
-
-shipit.task("build", () => {
-  shipit.emit("built");
-});
-
-shipit.on("built", () => {
-  shipit.start("start-server");
-});
-
-shipit.task("pwd", () => {
-  return shipit.remote("pwd");
-});
-
-shipit.blTask("pwd", () => {
-  return shipit.remote("pwd");
-});
-
-shipit.start("task");
-shipit.start("task1", "task2");
-shipit.start(["task1", "task2"]);
-
-shipit.local("ls -lah", {cwd: "/tmp/deploy/workspace"}).then((res: any) => {
-  console.log(res.stdout);
-  console.log(res.stderr);
-});
-
-shipit.remote("ls -lah").then((res: any) => {
-  console.log(res[0].stdout);
-  console.log(res[0].stderr);
-});
-
-shipit.remoteCopy("/tmp/workspace", "/opt/web/myapp").then(() => {});
-shipit.log("hello %s", "world");
diff --git a/types/shipit/tsconfig.json b/types/shipit/tsconfig.json
deleted file mode 100644
index a9df5d067d..0000000000
--- a/types/shipit/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "shipit-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/shrink-ray/index.d.ts b/types/shrink-ray/index.d.ts
index a237c298fa..b52a1a4a85 100644
--- a/types/shrink-ray/index.d.ts
+++ b/types/shrink-ray/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for shrink-ray 0.1
-// Project: https://github.com/aickin/shrink-ray
+// Project: https://github.com/aickin/shrink-ray, https://github.com/aickin/compression
 // Definitions by: forabi <https://github.com/forabi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/siema/index.d.ts b/types/siema/index.d.ts
index 8c1739d58c..66ee316f94 100644
--- a/types/siema/index.d.ts
+++ b/types/siema/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for siema 1.4
-// Project: https://github.com/pawelgrzybek/siema
+// Project: https://github.com/pawelgrzybek/siema, https://pawelgrzybek.com/siema
 // Definitions by: Irmantas Zenkus <https://github.com/Irmiz>
 //                 Pavel Puchkov <https://github.com/0x6368656174>
 //                 Sam Nau <https://github.com/samnau>
diff --git a/types/simpl-schema/index.d.ts b/types/simpl-schema/index.d.ts
index 16ba8245b0..3ae568b855 100644
--- a/types/simpl-schema/index.d.ts
+++ b/types/simpl-schema/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for simpl-schema 0.2
-// Project: https://github.com/aldeed/simple-schema-js
+// Project: https://github.com/aldeed/simple-schema-js, https://github.com/aldeed/node-simple-schema
 // Definitions by: Andreas Richter <https://github.com/arichter83>
 //                 Qkramer <https://github.com/Qkramer>
 //                 Deskoh <https://github.com/deskoh>
diff --git a/types/simplebar/index.d.ts b/types/simplebar/index.d.ts
index 46b6b9e737..fd3776527d 100644
--- a/types/simplebar/index.d.ts
+++ b/types/simplebar/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for simplebar.js 2.4
-// Project: https://github.com/Grsmto/simplebar
+// Project: https://github.com/Grsmto/simplebar, https://grsmto.github.io/simplebar
 // Definitions by: Gregor Woiwode <https://github.com/gregonnet>, Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/sindresorhus__djb2a/index.d.ts b/types/sindresorhus__djb2a/index.d.ts
index 33e16db621..2b29644bb6 100644
--- a/types/sindresorhus__djb2a/index.d.ts
+++ b/types/sindresorhus__djb2a/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @sindresorhus/djb2a 1.0
+// Type definitions for non-npm package @sindresorhus/djb2a 1.0
 // Project: https://github.com/sindresorhus/djb2a
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/sindresorhus__slugify/index.d.ts b/types/sindresorhus__slugify/index.d.ts
index 2bce172863..e3cecc77f2 100644
--- a/types/sindresorhus__slugify/index.d.ts
+++ b/types/sindresorhus__slugify/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @sindresorhus/slugify 0.6
-// Project: https://github.com/sindesorhus/slugify
+// Project: https://github.com/sindresorhus/slugify
 // Definitions by: Carlos Precioso <https://github.com/cprecioso>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/single-spa-react/index.d.ts b/types/single-spa-react/index.d.ts
index 9769d41963..f7b8c2c320 100644
--- a/types/single-spa-react/index.d.ts
+++ b/types/single-spa-react/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for single-spa-react 2.8
-// Project: https://github.com/CanopyTax/single-spa-react
+// Project: https://github.com/CanopyTax/single-spa-react, https://github.com/joeldenning/single-spa-react
 // Definitions by: Garrett Smith <https://github.com/Garrett-Smith-iq>
 //                 Chris Dopuch <https://github.com/chrisdopuch>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/sinon/index.d.ts b/types/sinon/index.d.ts
index f5d7a86927..7295119c66 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Sinon 7.0
-// Project: http://sinonjs.org/
+// Project: https://sinonjs.org
 // Definitions by: William Sears <https://github.com/mrbigdog2u>
 //                 Jonathan Little <https://github.com/rationull>
 //                 Lukas Spieß <https://github.com/lumaxis>
diff --git a/types/sketchapp/index.d.ts b/types/sketchapp/index.d.ts
index 6d9776aaa7..b45dcefe50 100644
--- a/types/sketchapp/index.d.ts
+++ b/types/sketchapp/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for the SketchApp 1.0
+// Type definitions for non-npm package the SketchApp 1.0
 // Project: https://github.com/xlayers/xlayers
 // Definitions by: Wassim Chegham <https://github.com/manekinekko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/slate/index.d.ts b/types/slate/index.d.ts
index 22cf22f8ef..567b7ee52e 100644
--- a/types/slate/index.d.ts
+++ b/types/slate/index.d.ts
@@ -299,7 +299,7 @@ export class Text extends Immutable.Record({}) {
     ): Immutable.Set<Mark>;
     getMarks(): Immutable.OrderedSet<Mark>;
     getMarksAsArray(): Mark[];
-    getMarksAtIndex(index: number): Mark;
+    getMarksAtIndex(index: number): Immutable.OrderedSet<Mark>;
     getNode(key: string): Node | null;
     getPath(key: string | Path): Path;
     hasNode(key: string): boolean;
diff --git a/types/slimerjs/index.d.ts b/types/slimerjs/index.d.ts
index eacba41230..e4dd66d8b9 100644
--- a/types/slimerjs/index.d.ts
+++ b/types/slimerjs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for SlimerJS 0.10
-// Project: https://docs.slimerjs.org/current/index.html#api-reference
+// Project: https://docs.slimerjs.org/current/index.html#api-reference, https://github.com/laurentj/slimerjs
 // Definitions by: Alex Wall <https://github.com/alexwall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/slug/index.d.ts b/types/slug/index.d.ts
index 1a82532473..05b27195de 100644
--- a/types/slug/index.d.ts
+++ b/types/slug/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for slug 0.9
-// Project: https://github.com/dodo/node-slug
+// Project: https://github.com/trott/node-slug
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/smoothscroll-polyfill/index.d.ts b/types/smoothscroll-polyfill/index.d.ts
index 1940dc3eec..73e108ff49 100644
--- a/types/smoothscroll-polyfill/index.d.ts
+++ b/types/smoothscroll-polyfill/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for smoothscroll-polyfill 0.3
-// Project: https://iamdustan.github.io/smoothscroll
+// Project: https://iamdustan.github.io/smoothscroll, https://iamdustan.com/smoothscroll
 // Definitions by: Michael Strobel <https://github.com/kryops>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/smtp-server/index.d.ts b/types/smtp-server/index.d.ts
index eaaf108777..44d5df4090 100644
--- a/types/smtp-server/index.d.ts
+++ b/types/smtp-server/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for smtp-server 3.5
-// Project: https://github.com/nodemailer/smtp-server
+// Project: https://github.com/nodemailer/smtp-server, https://github.com/andris9/smtp-server
 // Definitions by: markisme <https://github.com/markisme>
 //                 taisiias <https://github.com/Taisiias>
 //                 Piotr Roszatycki <https://github.com/dex4er>
diff --git a/types/snekfetch/index.d.ts b/types/snekfetch/index.d.ts
index aa831be0cc..bb1ec719c3 100644
--- a/types/snekfetch/index.d.ts
+++ b/types/snekfetch/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for snekfetch 4.0
-// Project: https://github.com/GusCaplan/snekfetch
+// Project: https://github.com/GusCaplan/snekfetch, https://snekfetch.js.org
 // Definitions by: Iker Pérez Brunelli <https://github.com/ANekoIsFineToo>
 //                 Shayne Hartford <https://github.com/ShayBox>
 //                 Yukine <https://github.com/Dev-Yukine>
diff --git a/types/snoowrap/dist/objects/LiveThread.d.ts b/types/snoowrap/dist/objects/LiveThread.d.ts
index ba34886fbb..594fc50247 100644
--- a/types/snoowrap/dist/objects/LiveThread.d.ts
+++ b/types/snoowrap/dist/objects/LiveThread.d.ts
@@ -26,8 +26,8 @@ export default class LiveThread extends RedditContent<LiveThread> {
   deleteUpdate(options: { id: string; }): Promise<this>;
   editSettings(options: LiveThreadSettings): Promise<this>;
   getContributors(): Promise<RedditUser[]>;
-  getDiscussions(options?: ListingOptions): Listing<Submission>;
-  getRecentUpdates(options?: ListingOptions): Listing<LiveUpdate>;
+  getDiscussions(options?: ListingOptions): Promise<Listing<Submission>>;
+  getRecentUpdates(options?: ListingOptions): Promise<Listing<LiveUpdate>>;
   inviteContributor(options: { name: string; permissions: Permissions[]}): Promise<this>;
   leaveContributor(): Promise<this>;
   removeContributor(options: { name: string; }): Promise<this>;
diff --git a/types/snoowrap/dist/objects/RedditUser.d.ts b/types/snoowrap/dist/objects/RedditUser.d.ts
index a93cac98cd..35bc56eb9e 100644
--- a/types/snoowrap/dist/objects/RedditUser.d.ts
+++ b/types/snoowrap/dist/objects/RedditUser.d.ts
@@ -100,18 +100,18 @@ export default class RedditUser extends RedditContent<RedditUser> {
 
   assignFlair(options: any): Promise<this>;
   friend(options: any): Promise<this>;
-  getComments(options?: any): Listing<Comment>;
-  getDownvotedContent(options?: any): Listing<Comment | Submission>;
+  getComments(options?: any): Promise<Listing<Comment>>;
+  getDownvotedContent(options?: any): Promise<Listing<Comment | Submission>>;
   getFriendInformation(): Promise<any>;
-  getGildedContent(options?: any): Listing<Comment | Submission>;
-  getHiddenContent(options?: any): Listing<Comment | Submission>;
+  getGildedContent(options?: any): Promise<Listing<Comment | Submission>>;
+  getHiddenContent(options?: any): Promise<Listing<Comment | Submission>>;
   getMultireddit(name: string): MultiReddit;
   getMultireddits(): Promise<MultiReddit[]>;
-  getOverview(options?: any): Listing<Comment | Submission>;
-  getSavedContent(options?: any): Listing<Comment | Submission>;
-  getSubmissions(options?: any): Listing<Submission>;
+  getOverview(options?: any): Promise<Listing<Comment | Submission>>;
+  getSavedContent(options?: any): Promise<Listing<Comment | Submission>>;
+  getSubmissions(options?: any): Promise<Listing<Submission>>;
   getTrophies(): Promise<any>;
-  getUpvotedContent(options?: any): Listing<Comment | Submission>;
+  getUpvotedContent(options?: any): Promise<Listing<Comment | Submission>>;
   giveGold(months: string): Promise<any>;
   unfriend(): Promise<any>;
 }
diff --git a/types/snoowrap/dist/objects/Submission.d.ts b/types/snoowrap/dist/objects/Submission.d.ts
index e2e7dc78d1..5986ac59cc 100644
--- a/types/snoowrap/dist/objects/Submission.d.ts
+++ b/types/snoowrap/dist/objects/Submission.d.ts
@@ -1,8 +1,7 @@
 import { Sort } from '../..';
 import Comment from './Comment';
 import Listing, { ListingOptions } from './Listing';
-import RedditUser from './RedditUser';
-import Subreddit, { FlairTemplate } from './Subreddit';
+import { FlairTemplate } from './Subreddit';
 import VoteableContent, { RichTextFlair } from './VoteableContent';
 
 interface Media {
@@ -113,7 +112,7 @@ export default class Submission extends VoteableContent<Submission> {
   assignFlair(options: { text: string; cssClass: string; }): Promise<this>;
   disableContestMode(): Promise<this>;
   enableContestMode(): Promise<this>;
-  getDuplicates(options?: ListingOptions): Listing<Submission>;
+  getDuplicates(options?: ListingOptions): Promise<Listing<Submission>>;
   getLinkFlairTemplates(): Promise<FlairTemplate[]>;
   /* @deprecated */ getRelated(options?: ListingOptions): Submission;
   hide(): Promise<this>;
diff --git a/types/snoowrap/dist/objects/Subreddit.d.ts b/types/snoowrap/dist/objects/Subreddit.d.ts
index 67623a17af..a9de52632d 100644
--- a/types/snoowrap/dist/objects/Subreddit.d.ts
+++ b/types/snoowrap/dist/objects/Subreddit.d.ts
@@ -1,12 +1,12 @@
-import { Sort, ModAction, SubmitSelfPostOptions, SubmitLinkOptions, BaseSearchOptions } from '../..';
+import { BaseSearchOptions, ModAction, Sort, SubmitLinkOptions, SubmitSelfPostOptions } from '../..';
 import Comment from './Comment';
 import Listing, { ListingOptions } from './Listing';
 import PrivateMessage from './PrivateMessage';
 import RedditContent from './RedditContent';
 import RedditUser from './RedditUser';
 import Submission from './Submission';
-import WikiPage, { WikiPageRevision } from './WikiPage';
 import { RichTextFlair } from './VoteableContent';
+import WikiPage, { WikiPageRevision } from './WikiPage';
 
 export default class Subreddit extends RedditContent<Subreddit> {
   accounts_active_is_fuzzed: boolean;
@@ -108,40 +108,40 @@ export default class Subreddit extends RedditContent<Subreddit> {
   deleteImage(options: { imageName: string; }): Promise<this>;
   deleteUserFlair(name: string): Promise<this>;
   editSettings(options: SubredditSettings): Promise<this>;
-  getBannedUsers(options?: ListingOptions & { name?: string }): Listing<BannedUser>;
-  getContributors(options?: ListingOptions & { name?: string }): Listing<Contributor>;
-  getControversial(options?: ListingOptions & { time?: string }): Listing<Submission>;
-  getEdited(options?: ListingOptions & { only?: 'links' | 'comments' }): Listing<Submission | Comment>;
-  getHot(options?: ListingOptions): Listing<Submission>;
+  getBannedUsers(options?: ListingOptions & { name?: string }): Promise<Listing<BannedUser>>;
+  getContributors(options?: ListingOptions & { name?: string }): Promise<Listing<Contributor>>;
+  getControversial(options?: ListingOptions & { time?: string }): Promise<Listing<Submission>>;
+  getEdited(options?: ListingOptions & { only?: 'links' | 'comments' }): Promise<Listing<Submission | Comment>>;
+  getHot(options?: ListingOptions): Promise<Listing<Submission>>;
   getLinkFlairTemplates(linkId: string): Promise<FlairTemplate[]>;
-  getModerationLog(opts?: ListingOptions & { mods?: string[]; type?: ModActionType}): Listing<ModAction>;
+  getModerationLog(opts?: ListingOptions & { mods?: string[]; type?: ModActionType}): Promise<Listing<ModAction>>;
   getModerators(options?: ListingOptions & { name?: string }): RedditUser[];
-  getModmail(options?: ListingOptions): Listing<PrivateMessage>;
-  getModqueue(options?: ListingOptions & { only?: 'links' | 'comments' }): Listing<Submission | Comment>;
-  getMutedUsers(options?: ListingOptions & { name?: string }): Listing<MutedUser>;
+  getModmail(options?: ListingOptions): Promise<Listing<PrivateMessage>>;
+  getModqueue(options?: ListingOptions & { only?: 'links' | 'comments' }): Promise<Listing<Submission | Comment>>;
+  getMutedUsers(options?: ListingOptions & { name?: string }): Promise<Listing<MutedUser>>;
   getMyFlair(): Promise<FlairTemplate>;
-  getNew(options?: ListingOptions): Listing<Submission>;
-  getNewComments(options?: ListingOptions): Listing<Comment>;
+  getNew(options?: ListingOptions): Promise<Listing<Submission>>;
+  getNewComments(options?: ListingOptions): Promise<Listing<Comment>>;
   getRandomSubmission(): Promise<Submission>;
   getRecommendedSubreddits(options?: { omit?: string[]; }): Promise<Subreddit[]>;
-  getReports(options?: ListingOptions & { only?: 'links' | 'comments' }): Listing<Submission | Comment>;
-  getRising(options?: ListingOptions): Listing<Submission>;
+  getReports(options?: ListingOptions & { only?: 'links' | 'comments' }): Promise<Listing<Submission | Comment>>;
+  getRising(options?: ListingOptions): Promise<Listing<Submission>>;
   getRules(): Promise<{ rules: Rule[]; site_rules: string[] }>;
   getSettings(): Promise<SubredditSettings>;
-  getSpam(options?: ListingOptions & { only?: 'links' | 'comments' }): Listing<Submission | Comment>;
+  getSpam(options?: ListingOptions & { only?: 'links' | 'comments' }): Promise<Listing<Submission | Comment>>;
   getSticky(options?: { num?: number }): Promise<Submission>;
   getStylesheet(): Promise<string>;
   getSubmitText(): Promise<string>;
-  getTop(options?: ListingOptions & { time?: Timespan }): Listing<Submission>;
-  getUnmoderated(options?: ListingOptions & { only?: 'links' | 'comments' }): Listing<Submission | Comment>;
+  getTop(options?: ListingOptions & { time?: Timespan }): Promise<Listing<Submission>>;
+  getUnmoderated(options?: ListingOptions & { only?: 'links' | 'comments' }): Promise<Listing<Submission | Comment>>;
   getUserFlair(name: string): Promise<FlairTemplate>;
-  getUserFlairList(options?: ListingOptions & { name?: string; }): Listing<UserFlair>;
+  getUserFlairList(options?: ListingOptions & { name?: string; }): Promise<Listing<UserFlair>>;
   getUserFlairTemplates(): Promise<FlairTemplate[]>;
-  getWikiBannedUsers(options?: ListingOptions & { name?: string }): Listing<BannedUser>;
-  getWikiContributors(options?: ListingOptions & { name?: string }): Listing<Contributor>;
+  getWikiBannedUsers(options?: ListingOptions & { name?: string }): Promise<Listing<BannedUser>>;
+  getWikiContributors(options?: ListingOptions & { name?: string }): Promise<Listing<Contributor>>;
   getWikiPage(name: string): WikiPage;
   getWikiPages(): Promise<WikiPage[]>;
-  getWikiRevisions(options?: ListingOptions): Listing<WikiPageRevision>;
+  getWikiRevisions(options?: ListingOptions): Promise<Listing<WikiPageRevision>>;
   hideMyFlair(): Promise<this>;
   inviteModerator(options: { name: string; permissions?: ModeratorPermission[]; }): Promise<this>;
   leaveContributor(): Promise<this>;
@@ -151,7 +151,7 @@ export default class Subreddit extends RedditContent<Subreddit> {
   removeModerator(options: { name: string; }): Promise<this>;
   removeWikiContributor(options: { name: string; }): Promise<this>;
   revokeModeratorInvite(options: { name: string; }): Promise<this>;
-  search(options: BaseSearchOptions): Listing<Submission>;
+  search(options: BaseSearchOptions): Promise<Listing<Submission>>;
   selectMyFlair(options: { flair_template_id: string; text?: string; }): Promise<this>;
   setModeratorPermissions(options: { name: string; permissions: ModeratorPermission; }): Promise<this>;
   setMultipleUserFlairs(flairs: Array<{
diff --git a/types/snoowrap/dist/objects/WikiPage.d.ts b/types/snoowrap/dist/objects/WikiPage.d.ts
index ab9de1bdf6..88f16e2f23 100644
--- a/types/snoowrap/dist/objects/WikiPage.d.ts
+++ b/types/snoowrap/dist/objects/WikiPage.d.ts
@@ -13,8 +13,8 @@ export default class WikiPage extends RedditContent<WikiPage> {
   addEditor(options: { name: string; }): Promise<this>;
   edit(options: EditOptions): Promise<this>;
   editSettings(options: Settings): Promise<this>;
-  getDiscussions(options?: ListingOptions): Listing<Submission>;
-  getRevisions(options?: ListingOptions): Listing<WikiPageRevision>;
+  getDiscussions(options?: ListingOptions): Promise<Listing<Submission>>;
+  getRevisions(options?: ListingOptions): Promise<Listing<WikiPageRevision>>;
   getSettings(): Promise<Settings>;
   hideRevision(options: { id: string; }): Promise<this>;
   removeEditor(options: { name: string; }): Promise<this>;
diff --git a/types/snoowrap/index.d.ts b/types/snoowrap/index.d.ts
index 069324ab60..987c35e49c 100644
--- a/types/snoowrap/index.d.ts
+++ b/types/snoowrap/index.d.ts
@@ -32,7 +32,7 @@ export = Snoowrap;
 
 declare class Snoowrap {
   static getAuthUrl(options: Snoowrap.AuthUrlOptions): string;
-  static fromAuthCode(options: Snoowrap.AuthCodeOptions): Snoowrap;
+  static fromAuthCode(options: Snoowrap.AuthCodeOptions): Promise<Snoowrap>;
   static noConflict(): typeof Snoowrap;
 
   accessToken: string;
diff --git a/types/snoowrap/snoowrap-tests.ts b/types/snoowrap/snoowrap-tests.ts
index b83a9514f1..61aca46ffa 100644
--- a/types/snoowrap/snoowrap-tests.ts
+++ b/types/snoowrap/snoowrap-tests.ts
@@ -81,3 +81,7 @@ export function submissionSearch(query: string, subreddit: string): Promise<List
 export function subredditSearch(query: string): Promise<Listing<Subreddit>> {
   return r.searchSubreddits({ query });
 }
+
+export function getHotFromSubreddit(subreddit: string): Promise<Listing<Submission>> {
+  return r.getSubreddit(subreddit).getHot({ limit: 10 });
+}
diff --git a/types/socket.io-parser/index.d.ts b/types/socket.io-parser/index.d.ts
index 66ca1be4c5..9035c08c72 100644
--- a/types/socket.io-parser/index.d.ts
+++ b/types/socket.io-parser/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for socket.io-parser 2.2
-// Project: https://github.com/socketio/socket.io-parser
+// Project: https://github.com/socketio/socket.io-parser, https://github.com/automattic/socket.io-parser
 // Definitions by: York Yao <https://github.com/plantain-00>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/socketcluster-client/index.d.ts b/types/socketcluster-client/index.d.ts
index 9c15a45465..399131437c 100644
--- a/types/socketcluster-client/index.d.ts
+++ b/types/socketcluster-client/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for socketcluster-client 13.0
-// Project: https://github.com/SocketCluster/socketcluster-client
+// Project: https://github.com/SocketCluster/socketcluster-client, http://socketcluster.io
 // Definitions by: Daniel Rose <https://github.com/DanielRose>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/socketcluster-client/lib/scclientsocket.d.ts b/types/socketcluster-client/lib/scclientsocket.d.ts
index 19552bd102..717c73432e 100644
--- a/types/socketcluster-client/lib/scclientsocket.d.ts
+++ b/types/socketcluster-client/lib/scclientsocket.d.ts
@@ -105,7 +105,7 @@ declare class SCClientSocket extends Emitter {
     on(event: string, listener: Function): this;
     once(event: string, listener: Function): this;
     off(event?: string, listener?: Function): this;
-    emit(event: string, ...args: any[]): boolean;
+    emit(event: string, ...args: any[]): this;
     listeners(event: string): Function[];
     hasListeners(event: string): boolean;
     // tslint:enable:adjacent-overload-signatures
diff --git a/types/socketcluster-server/scserver.d.ts b/types/socketcluster-server/scserver.d.ts
index c04c4888f0..d6e808b245 100644
--- a/types/socketcluster-server/scserver.d.ts
+++ b/types/socketcluster-server/scserver.d.ts
@@ -3,7 +3,7 @@ import { Secret } from "jsonwebtoken";
 import { ServerOptions } from "https";
 import { IncomingMessage, Server } from "http";
 import { SCAuthEngine } from "sc-auth";
-import { SCExchange } from "sc-broker-cluster";
+import { SCExchange, Client } from "sc-broker-cluster";
 import WebSocket = require("ws");
 
 import SCServerSocket = require("./scserversocket");
@@ -18,6 +18,7 @@ declare class SCServer extends EventEmitter {
     readonly MIDDLEWARE_EMIT: "emit";
 
     options: SCServer.SCServerOptions;
+    brokerEngine: Client;
     exchange: SCExchange;
 
     clients: {
@@ -58,7 +59,10 @@ declare class SCServer extends EventEmitter {
     removeMiddleware(type: "emit", middlewareFn: (req: SCServer.EmitRequest, next: SCServer.nextMiddlewareFunction) => void): void;
 
     setAuthEngine(authEngine: SCAuthEngine): void;
+    auth: SCAuthEngine;
+
     setCodecEngine(codecEngine: SCServer.SCCodecEngine): void;
+    codec: SCServer.SCCodecEngine;
 
     close(cb?: (err?: Error) => void): void;
 
@@ -348,7 +352,7 @@ declare namespace SCServer {
 
     interface SCCodecEngine {
         decode: (input: any) => any;
-        ncode: (object: any) => any;
+        encode: (object: any) => any;
     }
 
     interface VerifyHandshakeInfo {
diff --git a/types/socketcluster-server/scserversocket.d.ts b/types/socketcluster-server/scserversocket.d.ts
index 7b32cef72c..00eaa03c90 100644
--- a/types/socketcluster-server/scserversocket.d.ts
+++ b/types/socketcluster-server/scserversocket.d.ts
@@ -29,15 +29,65 @@ declare class SCServerSocket extends Emitter {
 
     constructor(id: string, server: SCServer, socket: WebSocket);
 
+    on(event: "error", listener: (error: Error) => void): this;
+    on(event: "message" | "raw", listener: (message: WebSocket.Data) => void): this;
+    on(event: "connectAbort" | "disconnect" | "close", listener: (code: number, data?: any) => void): this;
+    on(event: "authStateChange", listener: (stateChangeData: SCServerSocket.StateChangeData) => void): this;
+    on(event: "authenticate", listener: (authToken?: SCServer.AuthToken) => void): this;
+    on(event: "deauthenticate", listener: (oldToken?: SCServer.AuthToken) => void): this;
+
     getState(): "connecting" | "open" | "closed";
+    getBytesReceived(): number;
+
     disconnect(code?: number, data?: any): void;
+    destroy(code?: number, data?: any): void;
+    terminate(): void;
+
     send(data: any, options: { mask?: boolean; binary?: boolean; compress?: boolean; fin?: boolean }): void;
+
+    decode(message: any): any;
+    encode(object: any): any;
+
+    sendObjectBatch(object: any): void;
+    sendObjectSingle(object: any): void;
+    sendObject(object: any, options?: { batch?: boolean }): void;
+
+    emit(event: string, ...args: any[]): this;
+    emit(event: string, data: any, callback?: SCServerSocket.EmitCallback, options?: SCServerSocket.EmitOptions): void;
+
+    triggerAuthenticationEvents(oldState: "authenticated" | "unauthenticated"): void;
+
     getAuthToken(): SCServer.AuthToken;
-    setAuthToken(data: SCServer.AuthToken, options?: SignOptions): void;
-    deauthenticate(): void;
+    setAuthToken(data: SCServer.AuthToken, options?: SignOptions, callback?: SCServerSocket.EmitCallback): void;
+
+    deauthenticateSelf(): void;
+    deauthenticate(callback?: SCServerSocket.EmitCallback): void;
+
     kickOut(channel?: string, message?: string, callback?: () => void): void;
+
     subscriptions(): string[];
     isSubscribed(channel?: string): boolean;
 }
 
 export = SCServerSocket;
+
+declare namespace SCServerSocket {
+    type EmitCallback = (err: Error, eventObject: EventObject) => void;
+
+    interface EventObject {
+        event: string;
+        data?: any;
+        cid?: number;
+    }
+
+    interface EmitOptions {
+        useCache?: boolean;
+        stringifiedData?: string;
+    }
+
+    interface StateChangeData {
+        oldState: "authenticated" | "unauthenticated";
+        newState: "authenticated" | "unauthenticated";
+        authToken?: SCServer.AuthToken;
+    }
+}
diff --git a/types/socketcluster/index.d.ts b/types/socketcluster/index.d.ts
index 0346a385f4..59993eb9a4 100644
--- a/types/socketcluster/index.d.ts
+++ b/types/socketcluster/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for socketcluster 14.0
-// Project: https://github.com/SocketCluster/socketcluster
+// Project: https://github.com/SocketCluster/socketcluster, http://socketcluster.io
 // Definitions by: Daniel Rose <https://github.com/DanielRose>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/sockjs-client/index.d.ts b/types/sockjs-client/index.d.ts
index aed69a2a02..f9e08bd01c 100644
--- a/types/sockjs-client/index.d.ts
+++ b/types/sockjs-client/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for sockjs-client 1.1
-// Project: https://github.com/sockjs/sockjs-client
+// Project: https://github.com/sockjs/sockjs-client, http://sockjs.org
 // Definitions by: Emil Ivanov <https://github.com/vladev>
 //                 Alexander Rusakov <https://github.com/arusakov>
 //                 BendingBender <https://github.com/BendingBender>
diff --git a/types/solidity-parser-antlr/index.d.ts b/types/solidity-parser-antlr/index.d.ts
index 062a4ed918..7b92aefb22 100644
--- a/types/solidity-parser-antlr/index.d.ts
+++ b/types/solidity-parser-antlr/index.d.ts
@@ -18,7 +18,9 @@ export interface BaseASTNode {
     range?: [number, number];
     loc?: Location;
 }
-export interface SourceUnit extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface SourceUnit extends BaseASTNode {
+    children: ASTNode[]; // TODO: Can be more precise
+} // tslint:disable-line:no-empty-interface
 export interface PragmaDirective extends BaseASTNode {} // tslint:disable-line:no-empty-interface
 export interface PragmaName extends BaseASTNode {} // tslint:disable-line:no-empty-interface
 export interface PragmaValue extends BaseASTNode {} // tslint:disable-line:no-empty-interface
@@ -29,6 +31,7 @@ export interface ImportDeclaration extends BaseASTNode {} // tslint:disable-line
 export interface ImportDirective extends BaseASTNode {} // tslint:disable-line:no-empty-interface
 export interface ContractDefinition extends BaseASTNode {
     name: string;
+    subNodes: ASTNode[]; // TODO: Can be more precise
 }
 export interface InheritanceSpecifier extends BaseASTNode {} // tslint:disable-line:no-empty-interface
 export interface ContractPart extends BaseASTNode {} // tslint:disable-line:no-empty-interface
@@ -45,6 +48,8 @@ export interface ModifierInvocation extends BaseASTNode {
 }
 export interface FunctionDefinition extends BaseASTNode {
     name: string;
+    parameters: ParameterList;
+    body: Block | null;
 }
 export interface ReturnParameters extends BaseASTNode {} // tslint:disable-line:no-empty-interface
 export interface ModifierList extends BaseASTNode {} // tslint:disable-line:no-empty-interface
@@ -241,88 +246,88 @@ export type ASTNode =
     | BinaryOperation
     | Conditional;
 export interface Visitor {
-    SourceUnit?: (node: SourceUnit) => void;
-    PragmaDirective?: (node: PragmaDirective) => void;
-    PragmaName?: (node: PragmaName) => void;
-    PragmaValue?: (node: PragmaValue) => void;
-    Version?: (node: Version) => void;
-    VersionOperator?: (node: VersionOperator) => void;
-    VersionConstraint?: (node: VersionConstraint) => void;
-    ImportDeclaration?: (node: ImportDeclaration) => void;
-    ImportDirective?: (node: ImportDirective) => void;
-    ContractDefinition?: (node: ContractDefinition) => void;
-    InheritanceSpecifier?: (node: InheritanceSpecifier) => void;
-    ContractPart?: (node: ContractPart) => void;
-    StateVariableDeclaration?: (node: StateVariableDeclaration) => void;
-    UsingForDeclaration?: (node: UsingForDeclaration) => void;
-    StructDefinition?: (node: StructDefinition) => void;
-    ModifierDefinition?: (node: ModifierDefinition) => void;
-    ModifierInvocation?: (node: ModifierInvocation) => void;
-    FunctionDefinition?: (node: FunctionDefinition) => void;
-    ReturnParameters?: (node: ReturnParameters) => void;
-    ModifierList?: (node: ModifierList) => void;
-    EventDefinition?: (node: EventDefinition) => void;
-    EnumValue?: (node: EnumValue) => void;
-    EnumDefinition?: (node: EnumDefinition) => void;
-    ParameterList?: (node: ParameterList) => void;
-    Parameter?: (node: Parameter) => void;
-    EventParameterList?: (node: EventParameterList) => void;
-    EventParameter?: (node: EventParameter) => void;
-    FunctionTypeParameterList?: (node: FunctionTypeParameterList) => void;
-    FunctionTypeParameter?: (node: FunctionTypeParameter) => void;
-    VariableDeclaration?: (node: VariableDeclaration) => void;
-    TypeName?: (node: TypeName) => void;
-    UserDefinedTypeName?: (node: UserDefinedTypeName) => void;
-    Mapping?: (node: Mapping) => void;
-    FunctionTypeName?: (node: FunctionTypeName) => void;
-    StorageLocation?: (node: StorageLocation) => void;
-    StateMutability?: (node: StateMutability) => void;
-    Block?: (node: Block) => void;
-    Statement?: (node: Statement) => void;
-    ExpressionStatement?: (node: ExpressionStatement) => void;
-    IfStatement?: (node: IfStatement) => void;
-    WhileStatement?: (node: WhileStatement) => void;
-    SimpleStatement?: (node: SimpleStatement) => void;
-    ForStatement?: (node: ForStatement) => void;
-    InlineAssemblyStatement?: (node: InlineAssemblyStatement) => void;
-    DoWhileStatement?: (node: DoWhileStatement) => void;
-    ContinueStatement?: (node: ContinueStatement) => void;
-    BreakStatement?: (node: BreakStatement) => void;
-    ReturnStatement?: (node: ReturnStatement) => void;
-    ThrowStatement?: (node: ThrowStatement) => void;
-    VariableDeclarationStatement?: (node: VariableDeclarationStatement) => void;
-    IdentifierList?: (node: IdentifierList) => void;
-    ElementaryTypeName?: (node: ElementaryTypeName) => void;
-    Expression?: (node: Expression) => void;
-    PrimaryExpression?: (node: PrimaryExpression) => void;
-    ExpressionList?: (node: ExpressionList) => void;
-    NameValueList?: (node: NameValueList) => void;
-    NameValue?: (node: NameValue) => void;
-    FunctionCallArguments?: (node: FunctionCallArguments) => void;
-    AssemblyBlock?: (node: AssemblyBlock) => void;
-    AssemblyItem?: (node: AssemblyItem) => void;
-    AssemblyExpression?: (node: AssemblyExpression) => void;
-    AssemblyCall?: (node: AssemblyCall) => void;
-    AssemblyLocalDefinition?: (node: AssemblyLocalDefinition) => void;
-    AssemblyAssignment?: (node: AssemblyAssignment) => void;
-    AssemblyIdentifierOrList?: (node: AssemblyIdentifierOrList) => void;
-    AssemblyIdentifierList?: (node: AssemblyIdentifierList) => void;
-    AssemblyStackAssignment?: (node: AssemblyStackAssignment) => void;
-    LabelDefinition?: (node: LabelDefinition) => void;
-    AssemblySwitch?: (node: AssemblySwitch) => void;
-    AssemblyCase?: (node: AssemblyCase) => void;
-    AssemblyFunctionDefinition?: (node: AssemblyFunctionDefinition) => void;
-    AssemblyFunctionReturns?: (node: AssemblyFunctionReturns) => void;
-    AssemblyFor?: (node: AssemblyFor) => void;
-    AssemblyIf?: (node: AssemblyIf) => void;
-    AssemblyLiteral?: (node: AssemblyLiteral) => void;
-    SubAssembly?: (node: SubAssembly) => void;
-    TupleExpression?: (node: TupleExpression) => void;
-    ElementaryTypeNameExpression?: (node: ElementaryTypeNameExpression) => void;
-    NumberLiteral?: (node: NumberLiteral) => void;
-    Identifier?: (node: Identifier) => void;
-    BinaryOperation?: (node: BinaryOperation) => void;
-    Conditional?: (node: Conditional) => void;
+    SourceUnit?: (node: SourceUnit) => any;
+    PragmaDirective?: (node: PragmaDirective) => any;
+    PragmaName?: (node: PragmaName) => any;
+    PragmaValue?: (node: PragmaValue) => any;
+    Version?: (node: Version) => any;
+    VersionOperator?: (node: VersionOperator) => any;
+    VersionConstraint?: (node: VersionConstraint) => any;
+    ImportDeclaration?: (node: ImportDeclaration) => any;
+    ImportDirective?: (node: ImportDirective) => any;
+    ContractDefinition?: (node: ContractDefinition) => any;
+    InheritanceSpecifier?: (node: InheritanceSpecifier) => any;
+    ContractPart?: (node: ContractPart) => any;
+    StateVariableDeclaration?: (node: StateVariableDeclaration) => any;
+    UsingForDeclaration?: (node: UsingForDeclaration) => any;
+    StructDefinition?: (node: StructDefinition) => any;
+    ModifierDefinition?: (node: ModifierDefinition) => any;
+    ModifierInvocation?: (node: ModifierInvocation) => any;
+    FunctionDefinition?: (node: FunctionDefinition) => any;
+    ReturnParameters?: (node: ReturnParameters) => any;
+    ModifierList?: (node: ModifierList) => any;
+    EventDefinition?: (node: EventDefinition) => any;
+    EnumValue?: (node: EnumValue) => any;
+    EnumDefinition?: (node: EnumDefinition) => any;
+    ParameterList?: (node: ParameterList) => any;
+    Parameter?: (node: Parameter) => any;
+    EventParameterList?: (node: EventParameterList) => any;
+    EventParameter?: (node: EventParameter) => any;
+    FunctionTypeParameterList?: (node: FunctionTypeParameterList) => any;
+    FunctionTypeParameter?: (node: FunctionTypeParameter) => any;
+    VariableDeclaration?: (node: VariableDeclaration) => any;
+    TypeName?: (node: TypeName) => any;
+    UserDefinedTypeName?: (node: UserDefinedTypeName) => any;
+    Mapping?: (node: Mapping) => any;
+    FunctionTypeName?: (node: FunctionTypeName) => any;
+    StorageLocation?: (node: StorageLocation) => any;
+    StateMutability?: (node: StateMutability) => any;
+    Block?: (node: Block) => any;
+    Statement?: (node: Statement) => any;
+    ExpressionStatement?: (node: ExpressionStatement) => any;
+    IfStatement?: (node: IfStatement) => any;
+    WhileStatement?: (node: WhileStatement) => any;
+    SimpleStatement?: (node: SimpleStatement) => any;
+    ForStatement?: (node: ForStatement) => any;
+    InlineAssemblyStatement?: (node: InlineAssemblyStatement) => any;
+    DoWhileStatement?: (node: DoWhileStatement) => any;
+    ContinueStatement?: (node: ContinueStatement) => any;
+    BreakStatement?: (node: BreakStatement) => any;
+    ReturnStatement?: (node: ReturnStatement) => any;
+    ThrowStatement?: (node: ThrowStatement) => any;
+    VariableDeclarationStatement?: (node: VariableDeclarationStatement) => any;
+    IdentifierList?: (node: IdentifierList) => any;
+    ElementaryTypeName?: (node: ElementaryTypeName) => any;
+    Expression?: (node: Expression) => any;
+    PrimaryExpression?: (node: PrimaryExpression) => any;
+    ExpressionList?: (node: ExpressionList) => any;
+    NameValueList?: (node: NameValueList) => any;
+    NameValue?: (node: NameValue) => any;
+    FunctionCallArguments?: (node: FunctionCallArguments) => any;
+    AssemblyBlock?: (node: AssemblyBlock) => any;
+    AssemblyItem?: (node: AssemblyItem) => any;
+    AssemblyExpression?: (node: AssemblyExpression) => any;
+    AssemblyCall?: (node: AssemblyCall) => any;
+    AssemblyLocalDefinition?: (node: AssemblyLocalDefinition) => any;
+    AssemblyAssignment?: (node: AssemblyAssignment) => any;
+    AssemblyIdentifierOrList?: (node: AssemblyIdentifierOrList) => any;
+    AssemblyIdentifierList?: (node: AssemblyIdentifierList) => any;
+    AssemblyStackAssignment?: (node: AssemblyStackAssignment) => any;
+    LabelDefinition?: (node: LabelDefinition) => any;
+    AssemblySwitch?: (node: AssemblySwitch) => any;
+    AssemblyCase?: (node: AssemblyCase) => any;
+    AssemblyFunctionDefinition?: (node: AssemblyFunctionDefinition) => any;
+    AssemblyFunctionReturns?: (node: AssemblyFunctionReturns) => any;
+    AssemblyFor?: (node: AssemblyFor) => any;
+    AssemblyIf?: (node: AssemblyIf) => any;
+    AssemblyLiteral?: (node: AssemblyLiteral) => any;
+    SubAssembly?: (node: SubAssembly) => any;
+    TupleExpression?: (node: TupleExpression) => any;
+    ElementaryTypeNameExpression?: (node: ElementaryTypeNameExpression) => any;
+    NumberLiteral?: (node: NumberLiteral) => any;
+    Identifier?: (node: Identifier) => any;
+    BinaryOperation?: (node: BinaryOperation) => any;
+    Conditional?: (node: Conditional) => any;
 }
 export interface ParserOpts {
     tolerant?: boolean;
diff --git a/types/sonic-boom/index.d.ts b/types/sonic-boom/index.d.ts
index 0ae54bc997..3a14a49b46 100644
--- a/types/sonic-boom/index.d.ts
+++ b/types/sonic-boom/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for sonic-boom 0.6
-// Project: https://github.com/mcollina/sonic-boom.git
+// Project: https://github.com/mcollina/sonic-boom
 // Definitions by: Alex Ferrando <https://github.com/alferpal>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/soundmanager2/index.d.ts b/types/soundmanager2/index.d.ts
index 5f5e9a1ffb..8d39cefe3f 100644
--- a/types/soundmanager2/index.d.ts
+++ b/types/soundmanager2/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for soundmanager2 2.97
-// Project: https://github.com/scottschiller/SoundManager2
+// Project: https://github.com/scottschiller/SoundManager2, http://www.schillmania.com/projects/soundmanager2
 // Definitions by: Elton Lee <https://github.com/elton2048>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/source-map-support/index.d.ts b/types/source-map-support/index.d.ts
index f3f289dce6..f92a8383b5 100644
--- a/types/source-map-support/index.d.ts
+++ b/types/source-map-support/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for source-map-support 0.4
-// Project: https://github.com/evanw/source-map-support
+// Project: https://github.com/evanw/node-source-map-support
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Jason Cheatham <https://github.com/jason0x43>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/spatialite/index.d.ts b/types/spatialite/index.d.ts
index 978185ab99..9deef1d620 100644
--- a/types/spatialite/index.d.ts
+++ b/types/spatialite/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for spatialite 0.0
-// Project: https://github.com/zhm/node-spatialite
+// Project: http://github.com/zhm/node-spatialite
 // Definitions by: Arne Schubert <https://github.com/atd-schubert>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/speakeasy/index.d.ts b/types/speakeasy/index.d.ts
index 573a9df820..1c1c4cf853 100644
--- a/types/speakeasy/index.d.ts
+++ b/types/speakeasy/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for speakeasy 2.0
-// Project: https://github.com/speakeasyjs/speakeasy
+// Project: http://github.com/speakeasyjs/speakeasy
 // Definitions by: Lucas Woo <https://github.com/legendecas>, Alexander Batukhtin <https://github.com/mrOlorin>, Aayush Kapoor <https://github.com/xeoneux>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/spellchecker/index.d.ts b/types/spellchecker/index.d.ts
new file mode 100644
index 0000000000..01064d0688
--- /dev/null
+++ b/types/spellchecker/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for spellchecker 3.5
+// Project: http://atom.github.io/node-spellchecker
+// Definitions by: Dale Fenton <https://github.com/dalevfenton>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/* ---------------------------------------------------------------------------
+                       Custom Types / Interfaces
+--------------------------------------------------------------------------- */
+/**
+ * MisspelledLocation - shape of an object returned by checkSpelling to
+ * identify locations of misspelled words in a corpus.
+ * @description a misspelled word can be found by corpus.slice(start, end)
+ * start - start index of a misspelled word in a corpus
+ * end - end index of a misspelled word in a corpus
+ */
+export interface MisspelledLocation {
+    start: number;
+    end: number;
+}
+
+/* ---------------------------------------------------------------------------
+                                Methods
+--------------------------------------------------------------------------- */
+/**
+ * Spellchecker.isMisspelled - Check if a word is misspelled.
+ * @param word - String word to check.
+ * @returns boolean - true if the word is misspelled, false otherwise.
+ */
+export function isMisspelled(word: string): boolean;
+
+/**
+ * Spellchecker.getCorrectionsForMisspelling - Get the corrections for a misspelled word.
+ * @param word - String word to get corrections for.
+ * @returns array - Returns a non-null but possibly empty array of string corrections.
+ */
+export function getCorrectionsForMisspelling(word: string): string[];
+
+/**
+ * Spellchecker.checkSpelling - Identify misspelled words in a corpus of text.
+ * @param corpus - String corpus of text to spellcheck.
+ * @returns array - Returns an Array containing {start, end} objects that describe an
+ *                  index range within the original String that contains a misspelled word.
+ */
+export function checkSpelling(corpus: string): MisspelledLocation[];
+
+/**
+ * Spellchecker.checkSpellingAsync - Asynchronously identify misspelled words.
+ * @param corpus - String corpus of text to spellcheck.
+ * @returns array - Returns a Promise that resolves with the Array described by checkSpelling().
+ */
+export function checkSpellingAsync(corpus: string): Promise<MisspelledLocation[]>;
+
+/**
+ * Spellchecker.add - Adds a word to the dictionary.
+ * When using Hunspell, this will not modify the .dic file;
+ * new words must be added each time the spellchecker is created. Use a custom dictionary file.
+ * @param word - String word to add.
+ * @returns void
+ */
+export function add(word: string): void;
diff --git a/types/spellchecker/spellchecker-tests.ts b/types/spellchecker/spellchecker-tests.ts
new file mode 100644
index 0000000000..7f53b26ab0
--- /dev/null
+++ b/types/spellchecker/spellchecker-tests.ts
@@ -0,0 +1,41 @@
+import * as Spellchecker from 'spellchecker';
+
+const additionalDictionary = ['Xynoronmalade'];
+
+// add words to the dictionary
+additionalDictionary.forEach(word => Spellchecker.add(word));
+
+let testWord = 'kat';
+let testCorpus = 'The queeck brown fox jumped over the lazy dog, from Xynoronmalade';
+let testCorpusAsync = 'The queeck brown fox jumped over the lazy dog, from Xynoronmalade';
+
+// check and correct a single word
+if (Spellchecker.isMisspelled(testWord)) {
+  const corrections = Spellchecker.getCorrectionsForMisspelling(testWord);
+  if (corrections.length > 0) {
+    testWord = corrections[0];
+  }
+}
+
+// check and correct words in a body of text
+const misspellings = Spellchecker.checkSpelling(testCorpus);
+misspellings.forEach(location => {
+  const misspelled = testCorpus.slice(location.start, location.end);
+  const corrections = Spellchecker.getCorrectionsForMisspelling(misspelled);
+  if (corrections.length > 0) {
+    testCorpus = testCorpus.replace(misspelled, corrections[0]);
+  }
+});
+
+// check for corrections asynchronously
+const asyncSpellCheck = async () => {
+  // check and correct words in a body of text
+  const misspellings = await Spellchecker.checkSpellingAsync(testCorpusAsync);
+  misspellings.forEach(location => {
+    const misspelled = testCorpusAsync.slice(location.start, location.end);
+    const corrections = Spellchecker.getCorrectionsForMisspelling(misspelled);
+    if (corrections.length > 0) {
+      testCorpusAsync = testCorpusAsync.replace(misspelled, corrections[0]);
+    }
+  });
+};
diff --git a/types/spellchecker/tsconfig.json b/types/spellchecker/tsconfig.json
new file mode 100644
index 0000000000..6817057d8c
--- /dev/null
+++ b/types/spellchecker/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "spellchecker-tests.ts"
+    ]
+}
diff --git a/types/spellchecker/tslint.json b/types/spellchecker/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/spellchecker/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/split.js/index.d.ts b/types/split.js/index.d.ts
index cba8052b72..2d396b49ff 100644
--- a/types/split.js/index.d.ts
+++ b/types/split.js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for split.js 1.3
-// Project: https://github.com/nathancahill/Split.js
+// Project: https://github.com/nathancahill/Split.js, https://split.js.org
 // Definitions by: Ilia Choly <https://github.com/icholy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/spotify-web-playback-sdk/index.d.ts b/types/spotify-web-playback-sdk/index.d.ts
index f8b6ef99d9..452da250cd 100644
--- a/types/spotify-web-playback-sdk/index.d.ts
+++ b/types/spotify-web-playback-sdk/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for spotify-web-playback-sdk 0.1
+// Type definitions for non-npm package spotify-web-playback-sdk 0.1
 // Project: https://beta.developer.spotify.com/documentation/web-playback-sdk/reference/
 // Definitions by: Festify Dev Team <https://github.com/Festify>
 //                 Marcus Weiner <https://github.com/mraerino>
diff --git a/types/sprintf-js/index.d.ts b/types/sprintf-js/index.d.ts
index e825228429..0e4856f80e 100644
--- a/types/sprintf-js/index.d.ts
+++ b/types/sprintf-js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for sprintf-js 1.1
-// Project: https://www.npmjs.com/package/sprintf-js
+// Project: https://github.com/alexei/sprintf.js
 // Definitions by: Jason Swearingen <https://github.com/jasonswearingen>
 //                 BendingBender <https://github.com/BendingBender>
 //                 Caner Dagli <https://github.com/cdagli>
diff --git a/types/sqlanywhere/index.d.ts b/types/sqlanywhere/index.d.ts
index d56bfb7993..148babd6ec 100644
--- a/types/sqlanywhere/index.d.ts
+++ b/types/sqlanywhere/index.d.ts
@@ -12,16 +12,16 @@ export interface SybaseConnection {
     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, cb: (err: Error | undefined, result: any) => void): void;
     exec(
         query: string,
         placeholders: any[],
         cb: (err: Error | undefined, result: any) => void
-    );
+    ): void;
     prepare(
         query: string,
         cb: (err: Error | undefined, stmt: Statement) => void
-    );
+    ): void;
     prepare(query: string): Statement;
     commit(cb: (err: Error | undefined) => void): void;
     rollback(cb: (err: Error | undefined) => void): void;
@@ -37,7 +37,7 @@ export interface ConnectionParameters {
 }
 
 export interface Statement {
-    exec(args: any[], cb: (err: Error | undefined, rows: any[]) => void);
+    exec(args: any[], cb: (err: Error | undefined, rows: any[]) => void): void;
     exec(args: any[]): any[];
     getMoreResults(): any[];
     drop(cb: (err: Error | undefined) => void): void;
diff --git a/types/sqlite3/index.d.ts b/types/sqlite3/index.d.ts
index da274b925e..3ed7c96a51 100644
--- a/types/sqlite3/index.d.ts
+++ b/types/sqlite3/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for sqlite3 3.1
-// Project: https://github.com/mapbox/node-sqlite3
+// Project: http://github.com/mapbox/node-sqlite3
 // Definitions by: Nick Malaguti <https://github.com/nmalaguti>
 //                 Sumant Manne <https://github.com/dpyro>
 //                 Behind The Math <https://github.com/BehindTheMath>
diff --git a/types/ssh2-sftp-client/index.d.ts b/types/ssh2-sftp-client/index.d.ts
index c568571eb5..7263a86e10 100644
--- a/types/ssh2-sftp-client/index.d.ts
+++ b/types/ssh2-sftp-client/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ssh2-sftp-client 2.4
-// Project: https://www.npmjs.com/package/ssh2-sftp-client
+// Project: https://github.com/jyu213/ssh2-sftp-client
 // Definitions by: igrayson <https://github.com/igrayson>
 //                 Ascari Andrea <https://github.com/ascariandrea>
 //                 Kartik Malik <https://github.com/kartik2406>
diff --git a/types/ssh2-streams/index.d.ts b/types/ssh2-streams/index.d.ts
index df1e001e0a..54d6359538 100644
--- a/types/ssh2-streams/index.d.ts
+++ b/types/ssh2-streams/index.d.ts
@@ -1628,6 +1628,11 @@ export interface TransferOptions {
      * Called every time a part of a file was transferred
      */
     step?: (total_transferred: number, chunk: number, total: number) => void;
+
+    /**
+     * Integer or string representing the file mode to set for the uploaded file.
+     */
+    mode?: number | string;
 }
 
 export interface ReadStreamOptions {
@@ -1703,4 +1708,4 @@ export interface ParsedKey {
 export interface ReadFileOptions {
     encoding?: string;
     flag?: string;
-}
\ No newline at end of file
+}
diff --git a/types/ssh2-streams/ssh2-streams-tests.ts b/types/ssh2-streams/ssh2-streams-tests.ts
index 9ae121a454..7fd73756d5 100644
--- a/types/ssh2-streams/ssh2-streams-tests.ts
+++ b/types/ssh2-streams/ssh2-streams-tests.ts
@@ -102,4 +102,6 @@ sftp.createReadStream("path");
 sftp.createWriteStream("path");
 sftp.data(0, buffer);
 sftp.fastGet("remotePath", "localPath", () => {});
-sftp.fastPut("localPath", "remotePath", () => {});
\ No newline at end of file
+sftp.fastGet("remotePath", "localPath", { concurrency: 64, chunkSize: 32768, step: () => {} }, () => {});
+sftp.fastPut("localPath", "remotePath", () => {});
+sftp.fastPut("localPath", "remotePath", { concurrency: 64, chunkSize: 32768, step: () => {}, mode: '0755' }, () => {});
diff --git a/types/ssh2/index.d.ts b/types/ssh2/index.d.ts
index cf88fff5f1..8e03805817 100644
--- a/types/ssh2/index.d.ts
+++ b/types/ssh2/index.d.ts
@@ -729,6 +729,8 @@ export interface ServerConfig {
     /** Explicit overrides for the default transport layer algorithms used for the connection. */
     algorithms?: Algorithms;
     /** A message that is sent to clients immediately upon connection, before handshaking begins. */
+    greeting?: string
+    /** A message that is sent to clients once, right before authentication begins. */
     banner?: string;
     /** A custom server software name/version identifier. */
     ident?: string;
diff --git a/types/ssh2/ssh2-tests.ts b/types/ssh2/ssh2-tests.ts
index 432fad281d..b3364cd489 100644
--- a/types/ssh2/ssh2-tests.ts
+++ b/types/ssh2/ssh2-tests.ts
@@ -402,11 +402,11 @@ new ssh2.Server({
                     // the file on the disk
                     var handle = new Buffer(4);
                     openFiles.add(handleCount);
-                    handle.writeUInt32BE(handleCount++, 0, true);
+                    handle.writeUInt32BE(handleCount++, 0);
                     sftpStream.handle(reqid, handle);
                     console.log('Opening file for write')
                 }).on('WRITE', (reqid: any, handle: any, offset: any, data: any) => {
-                    if (handle.length !== 4 || !openFiles.has(handle.readUInt32BE(0, true)))
+                    if (handle.length !== 4 || !openFiles.has(handle.readUInt32BE(0)))
                         return sftpStream.status(reqid, STATUS_CODE.FAILURE);
                     // fake the write
                     sftpStream.status(reqid, STATUS_CODE.OK);
@@ -414,7 +414,7 @@ new ssh2.Server({
                     console.log('Write to file at offset %d: %s', offset, inspected);
                 }).on('CLOSE', (reqid: any, handle: any) => {
                     var fnum: any;
-                    if (handle.length !== 4 || !openFiles.has((fnum = handle.readUInt32BE(0, true))))
+                    if (handle.length !== 4 || !openFiles.has((fnum = handle.readUInt32BE(0))))
                         return sftpStream.status(reqid, STATUS_CODE.FAILURE);
                     openFiles.delete(fnum);
                     sftpStream.status(reqid, STATUS_CODE.OK);
diff --git a/types/sshpk/index.d.ts b/types/sshpk/index.d.ts
index 6089dd930b..9d179008a2 100644
--- a/types/sshpk/index.d.ts
+++ b/types/sshpk/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for sshpk 1.10
-// Project: github.com/arekinath/node-sshpk
+// Project: https://github.com/arekinath/node-sshpk
 // Definitions by: Meno Abels <https://github.com/mabels>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/ssri/index.d.ts b/types/ssri/index.d.ts
new file mode 100644
index 0000000000..8cecbfe28d
--- /dev/null
+++ b/types/ssri/index.d.ts
@@ -0,0 +1,126 @@
+// Type definitions for ssri 6.0
+// Project: https://github.com/zkat/ssri
+// Definitions by: Jeow Li Huan <https://github.com/huan086>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Utf8AsciiLatin1Encoding, Hash as CryptoHash } from "crypto";
+import { Readable, Transform } from "stream";
+
+export interface HashLike {
+    algorithm: string;
+    digest: string;
+    options?: string[];
+}
+
+export interface IntegrityLike {
+    [algorithm: string]: HashLike[];
+}
+
+export type IntegrityMap = Integrity & IntegrityLike;
+
+export class Hash implements HashLike {
+    constructor(hash: string, opts?: { strict?: boolean });
+
+    source: string;
+    algorithm: string;
+    digest: string;
+    options?: string[];
+    isHash: boolean;
+
+    hexDigest(): string;
+
+    toJSON(): string;
+
+    toString(opts?: { strict?: boolean }): string;
+}
+
+export class Integrity {
+    isIntegrity: boolean;
+
+    toJSON(): string;
+
+    toString(opts?: { strict?: boolean, sep?: string }): string;
+
+    concat(
+        integrity: string | IntegrityLike | HashLike,
+        opts?: { strict?: boolean }
+    ): IntegrityMap;
+
+    hexDigest(): string;
+
+    match(
+        integrity: string | IntegrityLike | HashLike,
+        opts?: { strict?: boolean, pickAlgorithm?: (algo1: string, algo2: string) => string }
+    ): Hash | false;
+
+    pickAlgorithm(opts?: { pickAlgorithm?: (algo1: string, algo2: string) => string }): string;
+}
+
+export function parse(
+    sri: string | IntegrityLike | HashLike,
+    opts?: { strict?: boolean }
+): IntegrityMap;
+
+export function parse(
+    sri: string | IntegrityLike | HashLike,
+    opts?: { single: true, strict?: boolean }
+): Hash;
+
+export function stringify(
+    obj: string | IntegrityLike | HashLike,
+    opts?: { strict?: boolean, sep?: string }
+): string;
+
+export function fromHex(
+    hexDigest: string,
+    algorithm: string,
+    opts?: { strict?: boolean, options?: ReadonlyArray<string> }
+): IntegrityMap;
+
+export function fromHex(
+    hexDigest: string,
+    algorithm: string,
+    opts?: { single: true, strict?: boolean, options?: ReadonlyArray<string> }
+): Hash;
+
+export function fromData(
+    data: string | Buffer | NodeJS.TypedArray | DataView,
+    opts?: { strict?: boolean, options?: ReadonlyArray<string>, algorithms?: ReadonlyArray<string> }
+): IntegrityMap;
+
+export function fromStream(
+    stream: Readable,
+    opts?: { strict?: boolean, options?: ReadonlyArray<string>, algorithms?: ReadonlyArray<string>, Promise?: PromiseConstructorLike }
+): PromiseLike<IntegrityMap>;
+
+export function checkData(
+    data: string | Buffer | NodeJS.TypedArray,
+    sri: string | IntegrityLike | HashLike,
+    opts?: { strict?: boolean, error?: boolean, size?: number, pickAlgorithm?: (algo1: string, algo2: string) => string }
+): Hash | false;
+
+export function checkStream(
+    stream: Readable,
+    sri: string | IntegrityLike | HashLike,
+    opts?: {
+        strict?: boolean,
+        options?: ReadonlyArray<string>,
+        size?: number,
+        pickAlgorithm?: (algo1: string, algo2: string) => string,
+        Promise?: PromiseConstructorLike
+    }
+): PromiseLike<Hash>;
+
+export function integrityStream(
+    opts?: {
+        single?: boolean,
+        strict?: boolean,
+        options?: ReadonlyArray<string>,
+        algorithms?: ReadonlyArray<string>,
+        integrity?: string | IntegrityLike | HashLike,
+        size?: number,
+        pickAlgorithm?: (algo1: string, algo2: string) => string,
+    }
+): Transform;
+
+export function create(opts?: { strict?: boolean, options?: ReadonlyArray<string>, algorithms?: ReadonlyArray<string> }): CryptoHash;
diff --git a/types/ssri/ssri-tests.ts b/types/ssri/ssri-tests.ts
new file mode 100644
index 0000000000..03190cec2b
--- /dev/null
+++ b/types/ssri/ssri-tests.ts
@@ -0,0 +1,135 @@
+/// <reference types="node" />
+
+import ssri = require('ssri');
+import { Hash as CryptoHash } from "crypto";
+import { createReadStream } from 'fs';
+import { Transform } from 'stream';
+
+const integrityString = 'sha512-9KhgCRIx/AmzC8xqYJTZRrnO8OW2Pxyl2DIMZSBOr0oDvtEFyht3xpp71j/r/pAe1DM+JI/A+line3jUBgzQ7A==?foo';
+const hash = { algorithm: 'sha512', digest: 'c0ffee', options: [] };
+
+const integrity = {
+    sha1: [{ algorithm: 'sha1', digest: 'deadbeef', options: [] }],
+    sha512: [
+        { algorithm: 'sha512', digest: 'c0ffee', options: [] },
+        { algorithm: 'sha512', digest: 'bad1dea', options: ['foo'] }
+    ],
+};
+
+const parseString1: ssri.IntegrityMap = ssri.parse(integrityString);
+const parseHash: ssri.IntegrityMap = ssri.parse(hash);
+const parseIntegrity: ssri.IntegrityMap = ssri.parse(integrity);
+const parseStringSingle: ssri.Hash = ssri.parse(integrityString, { single: true, strict: true });
+const parseStringWithOptions: ssri.IntegrityMap = ssri.parse(integrityString, { strict: true });
+
+const stringifyString: string = ssri.stringify('\n\rsha512-foo\n\t\tsha384-bar');
+const stringifyHash: string = ssri.stringify(hash);
+const stringifyIntegrity: string = ssri.stringify(integrity);
+const stringifyStringWithOptions: string = ssri.stringify(
+    '\n\rsha512-foo\n\t\tsha384-bar',
+    { strict: false, sep: ',' }
+);
+
+const integrityConcatString: ssri.IntegrityMap = new ssri.Integrity().concat(integrityString);
+const integrityConcatHash: ssri.IntegrityMap = new ssri.Integrity().concat(hash);
+const integrityConcatIntegrity: ssri.IntegrityMap = new ssri.Integrity().concat(integrity);
+const integrityConcatStringWithOptions: ssri.IntegrityMap = new ssri.Integrity().concat(
+    integrityString,
+    { strict: true }
+);
+
+const integrityToString: string = new ssri.Integrity().toString();
+const integrityToStringWithOptions: string = new ssri.Integrity().toString({ strict: false, sep: ',' });
+
+const integrityToJson: string = new ssri.Integrity().toJSON();
+
+const integrityMatchString: ssri.Hash | false = new ssri.Integrity().match(integrityString);
+const integrityMatchHash: ssri.Hash | false = new ssri.Integrity().match(hash);
+const integrityMatchIntegrity: ssri.Hash | false = new ssri.Integrity().match(integrity);
+const integrityMatchStringWithOptions: ssri.Hash | false = new ssri.Integrity().match(
+    integrityString,
+    { strict: true, pickAlgorithm: (a, b) => a }
+);
+
+const integrityPickAlgorithm: string = new ssri.Integrity().pickAlgorithm();
+const integrityPickAlgorithmWithOptions: string = new ssri.Integrity().pickAlgorithm({ pickAlgorithm: (a, b) => a });
+
+const integrityHexDigest: string = new ssri.Integrity().hexDigest();
+
+const fromHex: ssri.IntegrityMap = ssri.fromHex('75e69d6de79f', 'sha1');
+const fromHexSingle: ssri.Hash = ssri.fromHex(
+    '75e69d6de79f',
+    'sha1',
+    { single: true, strict: false, options: ['sriOpt'] }
+);
+const fromHexWithOptions: ssri.IntegrityMap = ssri.fromHex(
+    '75e69d6de79f',
+    'sha1',
+    { strict: false, options: ['sriOpt'] }
+);
+
+const fromDataString: ssri.IntegrityMap = ssri.fromData('foobarbaz');
+const fromDataBuffer: ssri.IntegrityMap = ssri.fromData(Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]));
+const fromDataStringWithOptions: ssri.IntegrityMap = ssri.fromData(
+    'foobarbaz', {
+        algorithms: ['sha256', 'sha384', 'sha512'],
+        strict: true,
+        options: ['sriOpt']
+    }
+);
+
+const fromStream: PromiseLike<ssri.IntegrityMap> = ssri.fromStream(createReadStream('index.js'));
+const fromStreamWithOptions: PromiseLike<ssri.IntegrityMap> = ssri.fromStream(
+    createReadStream('index.js'), {
+        algorithms: ['sha1', 'sha512'],
+        strict: true,
+        options: ['sriOpt'],
+        Promise
+    }
+);
+
+const create: CryptoHash = ssri.create();
+const createWithOptions: CryptoHash = ssri.create({
+    algorithms: ['sha1', 'sha512'],
+    strict: true,
+    options: ['sriOpt']
+});
+
+const checkDataString: ssri.Hash | false = ssri.checkData('data', integrityString);
+const checkDataBuffer: ssri.Hash | false = ssri.checkData(
+    Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]),
+    integrityString
+);
+const checkDataHash: ssri.Hash | false = ssri.checkData('data', hash);
+const checkDataIntegrity: ssri.Hash | false = ssri.checkData('data', integrity);
+const checkDataStringWithOptions: ssri.Hash | false = ssri.checkData(
+    'data',
+    integrityString,
+    { strict: true, pickAlgorithm: (a, b) => a, error: true, size: 1 }
+);
+
+const checkStreamString: PromiseLike<ssri.Hash> = ssri.checkStream(createReadStream('index.js'), integrityString);
+const checkStreamHash: PromiseLike<ssri.Hash> = ssri.checkStream(createReadStream('index.js'), hash);
+const checkStreamIntegrity: PromiseLike<ssri.Hash> = ssri.checkStream(createReadStream('index.js'), integrity);
+const checkStreamWithOptions: PromiseLike<ssri.Hash> = ssri.checkStream(
+    createReadStream('index.js'),
+    integrityString,
+    {
+        strict: true,
+        options: ['sriOpt'],
+        pickAlgorithm: (a, b) => a,
+        size: 1,
+        Promise
+    }
+);
+
+const integrityStream: Transform = ssri.integrityStream();
+const integrityStreamWithOptions: Transform = ssri.integrityStream({
+    single: true,
+    strict: true,
+    options: ['sriOpt'],
+    pickAlgorithm: (a, b) => a,
+    size: 1,
+    integrity,
+    algorithms: ['sha1', 'sha256']
+});
diff --git a/types/ssri/tsconfig.json b/types/ssri/tsconfig.json
new file mode 100644
index 0000000000..add9a00f51
--- /dev/null
+++ b/types/ssri/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ssri-tests.ts"
+    ]
+}
diff --git a/types/ssri/tslint.json b/types/ssri/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ssri/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/stampit/index.d.ts b/types/stampit/index.d.ts
index 08fcfb061b..e50aee21bc 100644
--- a/types/stampit/index.d.ts
+++ b/types/stampit/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for stampit 3.0
-// Project: https://github.com/stampit-org/stampit
+// Project: https://github.com/stampit-org/stampit, https://stampit.js.org
 // Definitions by: Vasyl Boroviak <https://github.com/koresar>
 //                 Harris Lummis <https://github.com/lummish>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/stamplay-js-sdk/index.d.ts b/types/stamplay-js-sdk/index.d.ts
index c193a14137..717801a720 100644
--- a/types/stamplay-js-sdk/index.d.ts
+++ b/types/stamplay-js-sdk/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for stamplay-js-sdk 1.2
+// Type definitions for non-npm package stamplay-js-sdk 1.2
 // Project: https://github.com/Stamplay/stamplay-js-sdk
 // Definitions by: Riderman de Sousa Barbosa <https://github.com/ridermansb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/stellar-base/index.d.ts b/types/stellar-base/index.d.ts
index a230c36942..bbdb009ae4 100644
--- a/types/stellar-base/index.d.ts
+++ b/types/stellar-base/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for stellar-base 0.10
-// Project: https://github.com/stellar/js-stellar-sdk
+// Project: https://github.com/stellar/js-stellar-base
 // Definitions by: Carl Foster <https://github.com/carl-foster>
 //                 Triston Jones <https://github.com/tristonj>
 //                 Paul Selden <https://github.com/pselden>
@@ -49,6 +49,8 @@ export class Asset {
 
 export const FastSigning: boolean;
 
+export type KeypairType = 'ed25519';
+
 export class Keypair {
     static fromRawEd25519Seed(secretSeed: Buffer): Keypair;
     static fromBase58Seed(secretSeed: string): Keypair;
@@ -57,17 +59,18 @@ export class Keypair {
     static fromPublicKey(publicKey: string): Keypair;
     static random(): Keypair;
 
-    constructor(keys: { type: 'ed25519', secretKey: string } | { type: 'ed25519', Key: string })
+    constructor(keys: { type: KeypairType, secretKey: string, publicKey?: string } | { type: KeypairType, publicKey: string })
 
+    readonly type: KeypairType;
     publicKey(): string;
     secret(): string;
     rawPublicKey(): Buffer;
     rawSecretKey(): Buffer;
     canSign(): boolean;
-    sign(data: Buffer): Buffer;
+    sign(data: Buffer): xdr.Signature;
     signDecorated(data: Buffer): xdr.DecoratedSignature;
     signatureHint(): xdr.SignatureHint;
-    verify(data: Buffer, signature: Buffer): boolean;
+    verify(data: Buffer, signature: xdr.Signature): boolean;
 }
 
 export const MemoNone = 'none';
@@ -439,10 +442,13 @@ export class Transaction<TMemo extends Memo = Memo, TOps extends Operation[] = O
     signatures: xdr.DecoratedSignature[];
 }
 
+export const TimeoutInfinite = 0;
+
 export class TransactionBuilder {
     constructor(sourceAccount: Account, options?: TransactionBuilder.TransactionBuilderOptions)
     addOperation(operation: xdr.Operation): this;
     addMemo(memo: Memo): this;
+    setTimeout(timeoutInSeconds: number): this;
     build(): Transaction;
 }
 
@@ -498,5 +504,5 @@ export namespace xdr {
 }
 
 export function hash(data: Buffer): Buffer;
-export function sign(data: Buffer, rawSecret: Buffer): Buffer;
-export function verify(data: Buffer, signature: Buffer, rawPublicKey: Buffer): boolean;
+export function sign(data: Buffer, rawSecret: Buffer): xdr.Signature;
+export function verify(data: Buffer, signature: xdr.Signature, rawPublicKey: Buffer): boolean;
diff --git a/types/stellar-base/stellar-base-tests.ts b/types/stellar-base/stellar-base-tests.ts
index 83a52cbe7b..4884a5a6a5 100644
--- a/types/stellar-base/stellar-base-tests.ts
+++ b/types/stellar-base/stellar-base-tests.ts
@@ -6,6 +6,7 @@ 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"))
+    .setTimeout(5)
     .build(); // $ExpectType () => Transaction<Memo<MemoType>, Operation[]>
 
 const sig = StellarSdk.xdr.DecoratedSignature.fromXDR(Buffer.of(1, 2)); // $ExpectType DecoratedSignature
@@ -38,3 +39,5 @@ StellarSdk.Operation.fromXDRObject(newSignerXDR2).signer; // $ExpectType Sha256H
 
 const newSignerXDR3 = StellarSdk.Operation.setOptions({signer: {preAuthTx: '', weight: 1}});
 StellarSdk.Operation.fromXDRObject(newSignerXDR3).signer; // $ExpectType PreAuthTx
+
+StellarSdk.TimeoutInfinite; // $ExpectType 0
diff --git a/types/stemmer/index.d.ts b/types/stemmer/index.d.ts
index b42026cac1..fa87a7496a 100644
--- a/types/stemmer/index.d.ts
+++ b/types/stemmer/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for stemmer 1.0
-// Project: https://github.com/wooorm/stemmer#readme
+// Project: https://github.com/wooorm/stemmer#readme, https://words.github.io/stemmer
 // Definitions by: Will Ockmore <https://github.com/will-ockmore>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/storybook-addon-jsx/index.d.ts b/types/storybook-addon-jsx/index.d.ts
index b1bd874cdd..e3fbd63368 100644
--- a/types/storybook-addon-jsx/index.d.ts
+++ b/types/storybook-addon-jsx/index.d.ts
@@ -7,7 +7,7 @@
 import '@storybook/react';
 import { ReactNode, ReactElement } from 'react';
 
-export type displayNameFunc = (element: ReactElement<any>) => string;
+export type displayNameFunc = (element: ReactElement) => string;
 
 declare module '@storybook/react' {
     interface Options {
diff --git a/types/storybook__addon-actions/index.d.ts b/types/storybook__addon-actions/index.d.ts
index 680777948c..a7a02c7513 100644
--- a/types/storybook__addon-actions/index.d.ts
+++ b/types/storybook__addon-actions/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-actions 3.4
-// Project: https://github.com/storybooks/storybook
+// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/actions
 // Definitions by: Joscha Feth <https://github.com/joscha>, June <https://github.com/jicjjang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/storybook__addon-backgrounds/index.d.ts b/types/storybook__addon-backgrounds/index.d.ts
index 08aafc451e..095bbe5154 100644
--- a/types/storybook__addon-backgrounds/index.d.ts
+++ b/types/storybook__addon-backgrounds/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-backgrounds 4.1
-// Project: https://github.com/storybooks/storybook
+// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/backgrounds
 // Definitions by: HyunSeob <https://github.com/hyunseob>
 //                 An Dohyung <https://github.com/adhrinae>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/storybook__addon-centered/index.d.ts b/types/storybook__addon-centered/index.d.ts
index 23c7a06d97..1323a7ea1c 100644
--- a/types/storybook__addon-centered/index.d.ts
+++ b/types/storybook__addon-centered/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-centered 3.3
-// Project: https://github.com/storybooks/storybook
+// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/centered
 // Definitions by: kiyopikko <https://github.com/kiyopikko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/storybook__addon-info/index.d.ts b/types/storybook__addon-info/index.d.ts
index 111f7dc54d..9e5089d443 100644
--- a/types/storybook__addon-info/index.d.ts
+++ b/types/storybook__addon-info/index.d.ts
@@ -1,12 +1,12 @@
 // Type definitions for @storybook/addon-info 3.4
-// Project: https://github.com/storybooks/storybook
+// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/info
 // Definitions by: Mark Kornblum <https://github.com/mkornblum>
 //                 Mattias Wikstrom <https://github.com/fyrkant>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 import * as React from 'react';
-import { RenderFunction } from '@storybook/react';
+import { RenderFunction, StoryDecorator } from '@storybook/react';
 
 export interface WrapStoryProps {
   storyFn?: RenderFunction;
@@ -29,6 +29,10 @@ export interface Options {
   maxPropStringLength?: number;
 }
 
+// TODO: it would be better to use type inference for the parameters
+// type DecoratorParams = StoryDecorator extends (...a: infer A) => any ? A: never;
+export function withInfo(story: RenderFunction, context: { kind: string, story: string }): ReturnType<StoryDecorator>;
+// Legacy, but supported
 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 46fd799314..505780bf7e 100644
--- a/types/storybook__addon-info/storybook__addon-info-tests.tsx
+++ b/types/storybook__addon-info/storybook__addon-info-tests.tsx
@@ -1,11 +1,13 @@
 /// <reference types="storybook__react" />
 
 import * as React from 'react';
-import { storiesOf } from '@storybook/react';
+import { addDecorator, storiesOf } from '@storybook/react';
 import { setDefaults, withInfo } from '@storybook/addon-info';
 
 const { Component } = React;
 
+addDecorator(withInfo);
+
 setDefaults({
     inline: false,
     propTables: false
diff --git a/types/storybook__addon-jest/index.d.ts b/types/storybook__addon-jest/index.d.ts
index a84b2588cd..59329b7f59 100644
--- a/types/storybook__addon-jest/index.d.ts
+++ b/types/storybook__addon-jest/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-jest 3.4
-// Project: https://github.com/storybooks/storybook
+// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/jest
 // Definitions by: Matt Oliver <https://github.com/halfmatthalfcat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/storybook__addon-knobs/index.d.ts b/types/storybook__addon-knobs/index.d.ts
index a03c3e5f79..d10652dabe 100644
--- a/types/storybook__addon-knobs/index.d.ts
+++ b/types/storybook__addon-knobs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-knobs 4.0
-// Project: https://github.com/storybooks/storybook
+// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/knobs
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Martynas Kadisa <https://github.com/martynaskadisa>
 //                 A.MacLeay <https://github.com/amacleay>
diff --git a/types/storybook__addon-links/index.d.ts b/types/storybook__addon-links/index.d.ts
index 4d25a7150e..129f02969a 100644
--- a/types/storybook__addon-links/index.d.ts
+++ b/types/storybook__addon-links/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-links 3.3
-// Project: https://github.com/storybooks/storybook
+// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/links
 // Definitions by: Joscha Feth <https://github.com/joscha>,
 //                 Jesse Pinho <https://github.com/jessepinho>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/storybook__addon-notes/index.d.ts b/types/storybook__addon-notes/index.d.ts
index b669ce0a9c..d858e11e9e 100644
--- a/types/storybook__addon-notes/index.d.ts
+++ b/types/storybook__addon-notes/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-notes 4.0
-// Project: https://github.com/storybooks/storybook
+// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/notes
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 A.MacLeay <https://github.com/amacleay>
 //                 Michael Loughry <https://github.com/MLoughry>
@@ -17,5 +17,9 @@ export type WithNotesOptions = string | {
     markdownOptions?: MarkedOptions;
 };
 
+// It would be preferable to infer the argument types, but that requires TS v 3.1
+// export function withNotes(...args: StoryDecorator extends (...a: infer A) => any ? A : never): ReturnType<StoryDecorator>;
+export function withNotes(story: RenderFunction, context: { kind: string, story: string }): ReturnType<StoryDecorator>;
+// Less-preferred but still supported:
 export function withNotes(options?: WithNotesOptions): StoryDecorator;
 export function withMarkdownNotes(markdown: string, options?: MarkedOptions): StoryDecorator;
diff --git a/types/storybook__addon-notes/storybook__addon-notes-tests.tsx b/types/storybook__addon-notes/storybook__addon-notes-tests.tsx
index ebf24ce227..edfe0daf14 100644
--- a/types/storybook__addon-notes/storybook__addon-notes-tests.tsx
+++ b/types/storybook__addon-notes/storybook__addon-notes-tests.tsx
@@ -1,8 +1,11 @@
 import * as React from 'react';
 
-import { storiesOf } from '@storybook/react';
+import { addDecorator, storiesOf } from '@storybook/react';
 import { withNotes, withMarkdownNotes, } from '@storybook/addon-notes';
 
+// New, preferred global registration:
+addDecorator(withNotes);
+
 const SIMPLE_MARKDOWN = `
 ## Markdown for component
 
diff --git a/types/storybook__addon-options/index.d.ts b/types/storybook__addon-options/index.d.ts
index 968b003543..38e9203f30 100644
--- a/types/storybook__addon-options/index.d.ts
+++ b/types/storybook__addon-options/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-options 4.0
-// Project: https://github.com/storybooks/storybook
+// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/options
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Simon Helle Nielsen <https://github.com/simonhn>
 //                 A.MacLeay <https://github.com/amacleay>
diff --git a/types/storybook__addon-storyshots/index.d.ts b/types/storybook__addon-storyshots/index.d.ts
index 80e8894b29..bc265f125c 100644
--- a/types/storybook__addon-storyshots/index.d.ts
+++ b/types/storybook__addon-storyshots/index.d.ts
@@ -1,8 +1,8 @@
 // Type definitions for @storybook/addon-storyshots 3.4
-// Project: https://github.com/storybooks/storybook/tree/master/addons/storyshots
+// Project: https://github.com/storybooks/storybook/tree/master/addons/storyshots, https://github.com/storybooks/storybook/tree/master/addons/storyshorts/storyshots-core
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
 import * as React from 'react';
 import { StoryObject } from '@storybook/react';
@@ -70,7 +70,7 @@ export interface InitOptions<Rendered = any> {
     storyNameRegex?: RegExp;
     framework?: string;
     test?: Test;
-    renderer?: (node: React.ReactElement<any>) => Rendered;
+    renderer?: (node: React.ReactElement) => Rendered;
     serializer?: (rendered: Rendered) => any;
     integrityOptions?: {};
 }
diff --git a/types/storybook__addons/index.d.ts b/types/storybook__addons/index.d.ts
new file mode 100644
index 0000000000..5db0e048a1
--- /dev/null
+++ b/types/storybook__addons/index.d.ts
@@ -0,0 +1,85 @@
+// Type definitions for @storybook/addons 4.1
+// Project: https://github.com/storybooks/storybook/tree/master/lib/addons
+// Definitions by: Bob Matcuk <https://github.com/bmatcuk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.1
+
+import Channel = require("@storybook/channels");
+import { RenderFunction, StoryDecorator } from "@storybook/react";
+
+export const mockChannel: Channel;
+
+export interface Context {
+    kind: string;
+    story: string;
+}
+
+export type GetStoryFunc = (context: Context) => ReturnType<StoryDecorator>;
+
+export interface Wrapper<Options, Parameters> {
+    (getStory: GetStoryFunc, context: Context, optsAndParams: { options: Options, parameters: Parameters }):
+        ReturnType<StoryDecorator>;
+}
+
+export interface MakeDecoratorOptions<ParameterName extends string, Options, Parameters> {
+    name: string;
+    parameterName: ParameterName;
+    wrapper: Wrapper<Options, Parameters>;
+    skipIfNoParametersOrOptions?: boolean;
+    allowDeprecatedUsage?: boolean;
+}
+
+export interface DecoratorContext<ParameterName extends string, T> extends Context {
+    parameters?: Record<ParameterName, T>;
+}
+
+export interface DecoratorWithOptions<ParameterName extends string, T> {
+    // Support for older, but not deprecated style:
+    //   .addDecorator(decorator(options))
+    (story: RenderFunction, context: DecoratorContext<ParameterName, T>): ReturnType<StoryDecorator>;
+
+    // Support for the deprecated style:
+    //   .add(decorator(options)(() => <Story />)
+    (story: RenderFunction): (context: DecoratorContext<ParameterName, T>) => ReturnType<StoryDecorator>;
+}
+
+export interface Decorator<ParameterName extends string, Options, Parameters> {
+    // Supports newer style:
+    //   .addDecorator(decorator)
+    //   .add('story', () => <Story />)
+    (story: RenderFunction, context: DecoratorContext<ParameterName, Parameters>): ReturnType<StoryDecorator>;
+
+    // Support for older styles which pass options.
+    // See DecoratorWithOptions above.
+    (options: Options): DecoratorWithOptions<ParameterName, Parameters>;
+    (...options: Options[]): DecoratorWithOptions<ParameterName, Parameters>;
+}
+
+// If you manually specify the type parameters, the first type (ParameterName)
+// must match the "parameterName" option, ie:
+//
+//   makeDecorator<"myParam", ..., ...>({ parameterName: "myParam", ... })
+//
+// TypeScript is pretty good about inferring all of the type generics if you
+// include the type declarations on the options/parameters in your wrapper
+// function.
+export function makeDecorator<ParameterName extends string, Options = any, Parameters = any>(
+    options: MakeDecoratorOptions<ParameterName, Options, Parameters>):
+        Decorator<ParameterName, Options, Parameters>;
+
+export class AddonStore {
+    constructor();
+    getChannel(): Channel;
+    hasChannel(): boolean;
+    setChannel(channel: any): void;
+    getPreview(): any;
+    getDatabase(): any;
+    setDatabase(database: any): void;
+    getPanels(): any;
+    addPanel(name: any, panel: any): void;
+    register(name: any, loader: any): any;
+    loadAddons(api: any): any;
+}
+
+declare const DefaultAddonStore: AddonStore;
+export default DefaultAddonStore;
diff --git a/types/storybook__addons/storybook__addons-tests.ts b/types/storybook__addons/storybook__addons-tests.ts
new file mode 100644
index 0000000000..14e1227398
--- /dev/null
+++ b/types/storybook__addons/storybook__addons-tests.ts
@@ -0,0 +1,25 @@
+import addons, { makeDecorator } from "@storybook/addons";
+import { addDecorator, storiesOf } from "@storybook/react";
+
+// Example from Storybook documentation
+const withNotes = makeDecorator({
+    name: "withNotes",
+    parameterName: "notes",
+    wrapper: (getStory, context, {options, parameters}: {options: number, parameters: string}) => {
+        const channel = addons.getChannel();
+        channel.emit("MYADDON/add_notes", parameters);
+        return getStory(context);
+    }
+});
+
+// new style
+addDecorator(withNotes);
+
+// old style, but still supported
+addDecorator(withNotes(42));
+
+// the deprecated style actually isn't supported by
+// @storybook/react's typings, so, no test for that...
+storiesOf("Hello", module)
+    .addDecorator(withNotes)        // new style
+    .addDecorator(withNotes(42));   // old style, but still supported
diff --git a/types/storybook__addons/tsconfig.json b/types/storybook__addons/tsconfig.json
new file mode 100644
index 0000000000..7dfe3ed67f
--- /dev/null
+++ b/types/storybook__addons/tsconfig.json
@@ -0,0 +1,34 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "paths": {
+            "@storybook/addons": [
+                "storybook__addons"
+            ],
+            "@storybook/channels": [
+                "storybook__channels"
+            ],
+            "@storybook/react": [
+                "storybook__react"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "storybook__addons-tests.ts"
+    ]
+}
diff --git a/types/storybook__addons/tslint.json b/types/storybook__addons/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/storybook__addons/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/storybook__channels/index.d.ts b/types/storybook__channels/index.d.ts
new file mode 100644
index 0000000000..f9e43d156e
--- /dev/null
+++ b/types/storybook__channels/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for @storybook/channels 4.1
+// Project: https://github.com/storybooks/storybook/tree/master/lib/channels
+// Definitions by: Bob Matcuk <https://github.com/bmatcuk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.1
+
+type EventName = PropertyKey;
+type EventHandler = (event: Channel.Event) => void;
+type Listener = (...args: any) => void;
+
+declare namespace Channel {
+    interface Event {
+        type: EventName;
+        args: any;
+        from: string;
+    }
+
+    interface Transport {
+        setHandler(handler: EventHandler): void;
+        send(event: any): void;
+    }
+}
+
+declare class Channel {
+    constructor(options?: { transport?: Channel.Transport, async?: boolean });
+    addListener(type: EventName, listener: Listener): void;
+    addPeerListener(type: EventName, listener: Listener): void;
+    emit(type: EventName, ...args: any): void;
+    eventNames(): EventName[];
+    listenerCount(type: EventName): number;
+    listeners(type: EventName): Listener[];
+    on(type: EventName, listener: Listener): void;
+    once(type: EventName, listener: Listener): void;
+    prependListener(type: EventName, listener: Listener): void;
+    removeAllListeners(type: EventName): void;
+    removeListener(type: EventName, listener: Listener): void;
+}
+
+export = Channel;
diff --git a/types/storybook__channels/storybook__channels-tests.ts b/types/storybook__channels/storybook__channels-tests.ts
new file mode 100644
index 0000000000..0f2d8c39e9
--- /dev/null
+++ b/types/storybook__channels/storybook__channels-tests.ts
@@ -0,0 +1,21 @@
+import Channel = require("@storybook/channels");
+
+const transport: Channel.Transport = {
+    setHandler(handler) { },
+    send(event) { },
+};
+const channel = new Channel({ transport, async: true });
+const listener = (...args: any) => { };
+channel.addListener("event", listener);
+channel.addPeerListener("event", listener);
+channel.emit("event", 42);
+channel.on("event", listener);
+channel.once("event", listener);
+channel.prependListener("event", listener);
+
+const events: PropertyKey[] = channel.eventNames();
+const count: number = channel.listenerCount("event");
+const listeners: Array<(...args: any) => void> = channel.listeners("event");
+
+channel.removeListener("event", listener);
+channel.removeAllListeners("event");
diff --git a/types/storybook__channels/tsconfig.json b/types/storybook__channels/tsconfig.json
new file mode 100644
index 0000000000..4c49227623
--- /dev/null
+++ b/types/storybook__channels/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "paths": {
+            "@storybook/channels": [
+                "storybook__channels"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "storybook__channels-tests.ts"
+    ]
+}
diff --git a/types/storybook__channels/tslint.json b/types/storybook__channels/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/storybook__channels/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/storybook__react-native/index.d.ts b/types/storybook__react-native/index.d.ts
index fc308fa69b..fccd0ad385 100644
--- a/types/storybook__react-native/index.d.ts
+++ b/types/storybook__react-native/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/react-native 3.0
-// Project: https://github.com/storybooks/storybook
+// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/app/react-native
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Anton Izmailov <https://github.com/wapgear>
 //                 Alec Hill <https://github.com/alechill>
diff --git a/types/storybook__react/index.d.ts b/types/storybook__react/index.d.ts
index 41ce7b45bb..aa1d839d42 100644
--- a/types/storybook__react/index.d.ts
+++ b/types/storybook__react/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/react 4.0
-// Project: https://github.com/storybooks/storybook
+// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/app/react
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Anton Izmailov <https://github.com/wapgear>
 //                 Dan Dean <https://github.com/dandean>
diff --git a/types/storybook__vue/index.d.ts b/types/storybook__vue/index.d.ts
index 13e6099724..f91c9fa8e8 100644
--- a/types/storybook__vue/index.d.ts
+++ b/types/storybook__vue/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/vue 3.3
-// Project: https://github.com/storybooks/storybook
+// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/app/vue
 // Definitions by: Punit Gupta <https://github.com/pntgupta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/string-replace-webpack-plugin/index.d.ts b/types/string-replace-webpack-plugin/index.d.ts
index b62c43e448..b9ad3dd68b 100644
--- a/types/string-replace-webpack-plugin/index.d.ts
+++ b/types/string-replace-webpack-plugin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for string-replace-webpack-plugin 0.1
-// Project: https://github.com/jamesandersen/string-replace-webpack-plugin
+// Project: http://github.com/jamesandersen/string-replace-webpack-plugin
 // Definitions by: Rongjian Zhang <https://github.com/pd4d10>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/stripe-checkout/index.d.ts b/types/stripe-checkout/index.d.ts
index d0e283504c..55e75d43f4 100644
--- a/types/stripe-checkout/index.d.ts
+++ b/types/stripe-checkout/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Stripe Checkout 1.0
-// Project: https://stripe.com/checkout
+// Project: https://stripe.com/checkout, https://github.com/matthewmueller/stripe-checkout
 // Definitions by: Chris Wrench <https://github.com/cgwrench>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index bbb003eca0..2b46cbb3af 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -4642,9 +4642,10 @@ declare namespace Stripe {
             items: IList<subscriptionItems.ISubscriptionItem>;
 
             /**
-             * Hash describing the plan the customer is subscribed to
+             * Hash describing the plan the customer is subscribed to.  Only set if the subscription
+             * contains a single plan.
              */
-            plan: plans.IPlan;
+            plan?: plans.IPlan | null;
 
             /**
              * The number of subscriptions for the associated plan
@@ -4869,6 +4870,18 @@ declare namespace Stripe {
 
         interface ISubscriptionCancellationOptions extends IDataOptions {
             /**
+             * Will generate a final invoice that invoices for any un-invoiced metered usage and new/pending proration invoice items.
+             */
+            invoice_now?: boolean;
+
+            /**
+             * Will generate a proration invoice item that credits remaining unused time until the subscription period end.
+             */
+            prorate?: boolean;
+
+            /**
+             * @deprecated Use subscription update with cancel_at_period_end option as of 2018-08-23.
+             *
              * A flag that if set to true will delay the cancellation of the subscription until the end of the current period.
              */
             at_period_end?: boolean;
@@ -5062,7 +5075,7 @@ declare namespace Stripe {
             /**
              * Balance transaction that describes the impact of this reversal on your account balance.
              */
-            balance_transaction: string;
+            balance_transaction: string | balance.IBalanceTransaction;
 
             /**
              * ID of the charge that was refunded. [Expandable]
diff --git a/types/stripejs/index.d.ts b/types/stripejs/index.d.ts
index 0ee2016af2..1304449b9d 100644
--- a/types/stripejs/index.d.ts
+++ b/types/stripejs/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for stripe.js 3.0
+// Type definitions for non-npm package stripe.js 3.0
 // Project: https://stripe.com/
 // Definitions by: Robin van Tienhoven <https://github.com/RobinvanTienhoven>
 //                 Matt Ferderer <https://github.com/mattferderer>
diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
index 1ab41d31e1..a7dea63e06 100644
--- a/types/styled-components/index.d.ts
+++ b/types/styled-components/index.d.ts
@@ -1,13 +1,20 @@
 // Type definitions for styled-components 4.1
-// Project: https://github.com/styled-components/styled-components
+// Project: https://github.com/styled-components/styled-components, https://styled-components.com
 // Definitions by: Igor Oleinikov <https://github.com/Igorbek>
 //                 Ihor Chulinda <https://github.com/Igmat>
 //                 Adam Lavin <https://github.com/lavoaster>
-//                 Jessica Franco <https://github.com/Kovensky>
+//                 Jessica Franco <https://github.com/Jessidhia>
+//                 Jason Killian <https://github.com/jkillian>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.9
 
-/// <reference types="node" />
+// forward declarations
+declare global {
+    namespace NodeJS {
+        // tslint:disable-next-line:no-empty-interface
+        interface ReadableStream {}
+    }
+}
 
 import * as CSS from "csstype";
 import * as React from "react";
@@ -65,7 +72,15 @@ export type StyledComponentProps<
         A
     > & Partial<Pick<React.ComponentPropsWithRef<C> & O, A>>,
     T
->;
+> & WithChildrenIfReactComponentClass<C>;
+
+// Because of React typing quirks, when getting props from a React.ComponentClass,
+// we need to manually add a `children` field.
+// See https://github.com/DefinitelyTyped/DefinitelyTyped/pull/31945
+// and https://github.com/DefinitelyTyped/DefinitelyTyped/pull/32843
+type WithChildrenIfReactComponentClass<
+    C extends keyof JSX.IntrinsicElements | React.ComponentType<any>
+> = C extends React.ComponentClass<any> ? { children?: React.ReactNode } : {};
 
 type StyledComponentPropsWithAs<
     C extends keyof JSX.IntrinsicElements | React.ComponentType<any>,
@@ -263,24 +278,24 @@ type ThemedStyledComponentFactories<T extends object> = {
     [TTag in keyof JSX.IntrinsicElements]: ThemedStyledFunction<TTag, T>
 };
 
-type StyledComponentInnerComponent<
+export type StyledComponentInnerComponent<
     C extends React.ComponentType<any>
 > = C extends
     | StyledComponent<infer I, any, any, any>
     | StyledComponent<infer I, any, any>
     ? I
     : C;
-type StyledComponentPropsWithRef<
+export type StyledComponentPropsWithRef<
     C extends keyof JSX.IntrinsicElements | React.ComponentType<any>
 > = C extends AnyStyledComponent
     ? React.ComponentPropsWithRef<StyledComponentInnerComponent<C>>
     : React.ComponentPropsWithRef<C>;
-type StyledComponentInnerOtherProps<C extends AnyStyledComponent> = C extends
+export type StyledComponentInnerOtherProps<C extends AnyStyledComponent> = C extends
     | StyledComponent<any, any, infer O, any>
     | StyledComponent<any, any, infer O>
     ? O
     : never;
-type StyledComponentInnerAttrs<
+export type StyledComponentInnerAttrs<
     C extends AnyStyledComponent
 > = C extends StyledComponent<any, any, any, infer A> ? A : never;
 
@@ -446,6 +461,7 @@ export class ServerStyleSheet {
         readableStream: NodeJS.ReadableStream
     ): NodeJS.ReadableStream;
     readonly instance: this;
+    seal(): void;
 }
 
 type StyleSheetManagerProps =
diff --git a/types/styled-components/native.d.ts b/types/styled-components/native.d.ts
new file mode 100644
index 0000000000..0c1c520270
--- /dev/null
+++ b/types/styled-components/native.d.ts
@@ -0,0 +1,216 @@
+import * as ReactNative from 'react-native';
+import * as React from 'react';
+
+export {
+  DefaultTheme,
+  css,
+  isStyledComponent,
+  ThemeProps,
+  ThemeProvider,
+  ThemeConsumer,
+  ThemeContext,
+  withTheme,
+} from './index';
+
+import {
+  AnyStyledComponent,
+  StyledComponentInnerComponent,
+  StyledComponentInnerOtherProps,
+  StyledComponentInnerAttrs,
+  ThemedStyledFunction,
+  ThemedStyledInterface,
+  DefaultTheme
+} from './index';
+
+type AnyIfEmpty<T extends object> = keyof T extends never ? any : T;
+
+export type ReactNativeThemedStyledFunction<
+  C extends React.ComponentType<any>,
+  T extends object,
+> = ThemedStyledFunction<C, T>;
+
+// Copied over from "ThemedBaseStyledInterface" in index.d.ts in order to remove DOM element typings
+interface ReactNativeThemedBaseStyledInterface<T extends object> {
+    <C extends AnyStyledComponent>(component: C): ThemedStyledFunction<
+        StyledComponentInnerComponent<C>,
+        T,
+        StyledComponentInnerOtherProps<C>,
+        StyledComponentInnerAttrs<C>
+    >;
+    <C extends React.ComponentType<any>>(
+        // unfortunately using a conditional type to validate that it can receive a `theme?: Theme`
+        // causes tests to fail in TS 3.1
+        component: C
+    ): ThemedStyledFunction<C, T>;
+}
+
+type ReactNativeThemedStyledInterface<T extends object> = ReactNativeThemedBaseStyledInterface<
+    AnyIfEmpty<T>
+>;
+
+export interface ReactNativeStyledInterface<T extends object> extends ReactNativeThemedStyledInterface<T> {
+  ActivityIndicator: ReactNativeThemedStyledFunction<
+    typeof ReactNative.ActivityIndicator,
+    T
+  >;
+  ActivityIndicatorIOS: ReactNativeThemedStyledFunction<
+    typeof ReactNative.ActivityIndicator,
+    T
+  >;
+  Button: ReactNativeThemedStyledFunction<
+    typeof ReactNative.Button,
+    T
+  >;
+  DatePickerIOS: ReactNativeThemedStyledFunction<
+    typeof ReactNative.DatePickerIOS,
+    T
+  >;
+  DrawerLayoutAndroid: ReactNativeThemedStyledFunction<
+    typeof ReactNative.DrawerLayoutAndroid,
+    T
+  >;
+  Image: ReactNativeThemedStyledFunction<
+    typeof ReactNative.Image,
+    T
+  >;
+  ImageBackground: ReactNativeThemedStyledFunction<
+    typeof ReactNative.ImageBackground,
+    T
+  >;
+  KeyboardAvoidingView: ReactNativeThemedStyledFunction<
+    typeof ReactNative.KeyboardAvoidingView,
+    T
+  >;
+  ListView: ReactNativeThemedStyledFunction<
+    typeof ReactNative.ListView,
+    T
+  >;
+  MapView: ReactNativeThemedStyledFunction<
+    typeof ReactNative.MapView,
+    T
+  >;
+  Modal: ReactNativeThemedStyledFunction<
+    typeof ReactNative.Modal,
+    T
+  >;
+  NavigatorIOS: ReactNativeThemedStyledFunction<
+    typeof ReactNative.NavigatorIOS,
+    T
+  >;
+  Picker: ReactNativeThemedStyledFunction<
+    typeof ReactNative.Picker,
+    T
+  >;
+  PickerIOS: ReactNativeThemedStyledFunction<
+    typeof ReactNative.PickerIOS,
+    T
+  >;
+  ProgressBarAndroid: ReactNativeThemedStyledFunction<
+    typeof ReactNative.ProgressBarAndroid,
+    T
+  >;
+  ProgressViewIOS: ReactNativeThemedStyledFunction<
+    typeof ReactNative.ProgressViewIOS,
+    T
+  >;
+  ScrollView: ReactNativeThemedStyledFunction<
+    typeof ReactNative.ScrollView,
+    T
+  >;
+  SegmentedControlIOS: ReactNativeThemedStyledFunction<
+    typeof ReactNative.SegmentedControlIOS,
+    T
+  >;
+  Slider: ReactNativeThemedStyledFunction<
+    typeof ReactNative.Slider,
+    T
+  >;
+  SliderIOS: ReactNativeThemedStyledFunction<
+    typeof ReactNative.Slider,
+    T
+  >;
+  SnapshotViewIOS: ReactNativeThemedStyledFunction<
+    typeof ReactNative.SnapshotViewIOS,
+    T
+  >;
+  Switch: ReactNativeThemedStyledFunction<
+    typeof ReactNative.Switch,
+    T
+  >;
+  RecyclerViewBackedScrollView: ReactNativeThemedStyledFunction<
+    typeof ReactNative.RecyclerViewBackedScrollView,
+    T
+  >;
+  RefreshControl: ReactNativeThemedStyledFunction<
+    typeof ReactNative.RefreshControl,
+    T
+  >;
+  SafeAreaView: ReactNativeThemedStyledFunction<
+    typeof ReactNative.SafeAreaView,
+    T
+  >;
+  StatusBar: ReactNativeThemedStyledFunction<
+    typeof ReactNative.StatusBar,
+    T
+  >;
+  SwipeableListView: ReactNativeThemedStyledFunction<
+    typeof ReactNative.SwipeableListView,
+    T
+  >;
+  SwitchAndroid: ReactNativeThemedStyledFunction<
+    typeof ReactNative.Switch,
+    T
+  >;
+  SwitchIOS: ReactNativeThemedStyledFunction<
+    typeof ReactNative.SwitchIOS,
+    T
+  >;
+  TabBarIOS: ReactNativeThemedStyledFunction<
+    typeof ReactNative.TabBarIOS,
+    T
+  >;
+  Text: ReactNativeThemedStyledFunction<
+    typeof ReactNative.Text,
+    T
+  >;
+  TextInput: ReactNativeThemedStyledFunction<
+    typeof ReactNative.TextInput,
+    T
+  >;
+  ToolbarAndroid: ReactNativeThemedStyledFunction<
+    typeof ReactNative.ToolbarAndroid,
+    T
+  >;
+  TouchableHighlight: ReactNativeThemedStyledFunction<
+    typeof ReactNative.TouchableHighlight,
+    T
+  >;
+  TouchableNativeFeedback: ReactNativeThemedStyledFunction<
+    typeof ReactNative.TouchableNativeFeedback,
+    T
+  >;
+  TouchableOpacity: ReactNativeThemedStyledFunction<
+    typeof ReactNative.TouchableOpacity,
+    T
+  >;
+  TouchableWithoutFeedback: ReactNativeThemedStyledFunction<
+    typeof ReactNative.TouchableWithoutFeedback,
+    T
+  >;
+  View: ReactNativeThemedStyledFunction<
+    typeof ReactNative.View,
+    T
+  >;
+  ViewPagerAndroid: ReactNativeThemedStyledFunction<
+    typeof ReactNative.ViewPagerAndroid,
+    T
+  >;
+  WebView: ReactNativeThemedStyledFunction<
+    typeof ReactNative.WebView,
+    T
+  >;
+}
+
+declare const styled: ReactNativeStyledInterface<DefaultTheme>;
+
+export default styled;
diff --git a/types/styled-components/test/index.tsx b/types/styled-components/test/index.tsx
index 7108f737f7..a37c33f315 100644
--- a/types/styled-components/test/index.tsx
+++ b/types/styled-components/test/index.tsx
@@ -472,6 +472,7 @@ const sheet = new ServerStyleSheet();
 const html = sheet.collectStyles(<SSRTitle>Hello world</SSRTitle>);
 const styleHtml = sheet.getStyleTags();
 const styleElement = sheet.getStyleElement();
+sheet.seal();
 
 const sheet2 = new ServerStyleSheet();
 const element = (
@@ -634,7 +635,8 @@ const StyledStyledDiv = styled(StyledDiv)``;
 <StyledStyledDiv ref="string" />; // $ExpectError
 
 const StyledA = StyledDiv.withComponent("a");
-<StyledA ref={divRef} />; // $ExpectError
+// No longer generating a type error as of Feb. 6th, 2019
+// <StyledA ref={divRef} />; // $ExpectError
 <StyledA
     ref={ref => {
         // $ExpectType HTMLAnchorElement | null
@@ -1000,3 +1002,31 @@ function validateDefaultProps() {
 
     <OtherStyledComponent requiredProp="1" />; // $ExpectError
 }
+
+interface WrapperProps {
+    className?: string;
+}
+export class WrapperClass extends React.Component<WrapperProps> {
+    render() { return <div />; }
+}
+const StyledWrapperClass = styled(WrapperClass)``;
+// React.Component typings always add `children` to props, so this should accept children
+const wrapperClass = <StyledWrapperClass>Text</StyledWrapperClass>;
+
+export class WrapperClassFuncChild extends React.Component<WrapperProps & {children: () => any}> {
+    render() { return <div />; }
+}
+const StyledWrapperClassFuncChild = styled(WrapperClassFuncChild)``;
+// React.Component typings always add `children` to props, so this should accept children
+const wrapperClassNoChildrenGood = <StyledWrapperClassFuncChild>{() => "text"}</StyledWrapperClassFuncChild>;
+const wrapperClassNoChildren = <StyledWrapperClassFuncChild>Text</StyledWrapperClassFuncChild>; // $ExpectError
+
+const WrapperFunction: React.FunctionComponent<WrapperProps> = () => <div />;
+const StyledWrapperFunction = styled(WrapperFunction)``;
+// React.FunctionComponent typings always add `children` to props, so this should accept children
+const wrapperFunction = <StyledWrapperFunction>Text</StyledWrapperFunction>;
+
+const WrapperFunc = (props: WrapperProps) => <div />;
+const StyledWrapperFunc = styled(WrapperFunc)``;
+// No `children` in props, so this should generate an error
+const wrapperFunc = <StyledWrapperFunc>Text</StyledWrapperFunc>; // $ExpectError
diff --git a/types/styled-components/test/native.tsx b/types/styled-components/test/native.tsx
new file mode 100644
index 0000000000..66b0f975ce
--- /dev/null
+++ b/types/styled-components/test/native.tsx
@@ -0,0 +1,59 @@
+import * as React from "react";
+import * as ReactNative from "react-native";
+import * as ReactDOMServer from "react-dom/server";
+
+import styled, {
+    css,
+    isStyledComponent,
+    ThemeProps,
+    ThemeProvider,
+    withTheme,
+    ThemeConsumer,
+} from "styled-components/native";
+import {} from "styled-components/cssprop";
+
+const StyledView = styled.View`
+  background-color: papayawhip;
+`;
+
+const StyledText = styled(ReactNative.Text)`
+  color: palevioletred;
+`;
+
+class MyReactNativeComponent extends React.Component {
+  render() {
+    return (
+      <StyledView>
+        <StyledText>Hello World!</StyledText>
+      </StyledView>
+    );
+  }
+}
+
+const ValidProp = <StyledText adjustsFontSizeToFit />;
+const invalidProp = <StyledText randoName={2} />; // $ExpectError
+const invalidTag = styled.div` margin-top: 5px; `; // $ExpectError
+
+interface MyTheme {
+    primary: string;
+}
+
+interface ButtonProps {
+    name: string;
+    primary?: boolean;
+    theme: MyTheme;
+}
+
+class MyButton extends React.Component<ButtonProps> {
+    render() {
+        return <ReactNative.TouchableOpacity>Custom button</ReactNative.TouchableOpacity>;
+    }
+}
+
+const TomatoButton = styled(MyButton)`
+    color: tomato;
+    border-color: tomato;
+`;
+
+// needs name prop, but not theme prop
+const tomatoElement = <TomatoButton name="needed" />;
diff --git a/types/styled-components/tsconfig.json b/types/styled-components/tsconfig.json
index fb9b5a0f7b..3744d16775 100644
--- a/types/styled-components/tsconfig.json
+++ b/types/styled-components/tsconfig.json
@@ -4,8 +4,7 @@
         "forceConsistentCasingInFileNames": true,
         "jsx": "react",
         "lib": [
-            "es6",
-            "dom"
+            "es6"
         ],
         "module": "commonjs",
         "noEmit": true,
@@ -20,9 +19,11 @@
     },
     "files": [
         "index.d.ts",
+        "native.d.ts",
         "macro.d.ts",
         "cssprop.d.ts",
         "test/index.tsx",
+        "test/native.tsx",
         "test/macro.tsx"
     ]
 }
\ No newline at end of file
diff --git a/types/styled-jsx/server.d.ts b/types/styled-jsx/server.d.ts
index 16de5fbb72..f241a2d6f3 100644
--- a/types/styled-jsx/server.d.ts
+++ b/types/styled-jsx/server.d.ts
@@ -1,7 +1,11 @@
 import { ReactElement } from "react";
 
-declare function flushToHTML(): string;
-declare function flushToReact<T>(): Array<ReactElement<T>>;
+declare function flushToHTML(opts?: {
+  nonce?: string;
+}): string;
+declare function flushToReact<T>(opts?: {
+  nonce?: string;
+}): Array<ReactElement<T>>;
 
 export { flushToHTML };
 export default flushToReact;
diff --git a/types/styled-system/index.d.ts b/types/styled-system/index.d.ts
index aa94ab2aed..ec7686ab89 100644
--- a/types/styled-system/index.d.ts
+++ b/types/styled-system/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for styled-system 3.1
+// Type definitions for styled-system 3.2
 // Project: https://github.com/jxnblk/styled-system#readme
 // Definitions by: Marshall Bowers <https://github.com/maxdeviant>
 //                 Ben McCormick <https://github.com/phobon>
@@ -9,6 +9,8 @@
 //                 Adam Lavin <https://github.com/lavoaster>
 //                 Joachim Schuler <https://github.com/jschuler>
 //                 Adam Misiorny <https://github.com/adam187>
+//                 Sara F-P <https://github.com/gretzky>
+//                 Chris LoPresto <https://github.com/chrislopresto>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -41,7 +43,9 @@ export interface LowLevelStylefunctionArguments {
     scale?: Array<string | number>;
 }
 
-export function style(args: LowLevelStylefunctionArguments): {[cssProp: string]: string};
+export function style(
+    args: LowLevelStylefunctionArguments
+): { [cssProp: string]: string };
 
 export type TLengthStyledSystem = string | 0 | number;
 export type ResponsiveValue<T> = T | Array<T | null> | { [key: string]: T };
@@ -100,7 +104,7 @@ export function variant(props: VariantArgs): (...args: any[]) => any;
 export type ObjectOrArray<T> = T[] | { [K: string]: T };
 
 export interface BaseTheme {
-    breakpoints?: number[];
+    breakpoints?: string[] | number[] | object;
     colors?: ObjectOrArray<CSS.ColorProperty>;
     fontSizes?: number[];
     space?: number[];
@@ -357,6 +361,12 @@ export interface SizeProps extends SizeHeightProps, SizeWidthProps {}
 
 export function size(...args: any[]): any;
 
+export interface RatioPaddingProps<TLength = TLengthStyledSystem> {
+    ratio?: ResponsiveValue<number>;
+}
+
+export function ratioPadding(...args: any[]): any;
+
 export interface RatioProps {
     /**
      * The ration is height: 0 & paddingBottom
@@ -418,6 +428,8 @@ export interface JustifyItemsProps {
     justifyItems?: ResponsiveValue<CSS.JustifyItemsProperty>;
 }
 
+export function justifyItems(...args: any[]): any;
+
 export interface JustifyContentProps {
     /**
      * The CSS justify-content property defines how the browser distributes space between and around content items
@@ -963,3 +975,80 @@ export interface MixedProps {
 }
 
 export function mixed(...args: any[]): any;
+
+export interface StylesProps {
+    space: typeof space;
+    width: typeof width;
+    fontSize: typeof fontSize;
+    textColor: typeof textColor;
+    bgColor: typeof bgColor;
+    color: typeof color;
+    fontFamily: typeof fontFamily;
+    textAlign: typeof textAlign;
+    lineHeight: typeof lineHeight;
+    fontWeight: typeof fontWeight;
+    fontStyle: typeof fontStyle;
+    letterSpacing: typeof letterSpacing;
+    display: typeof display;
+    maxWidth: typeof maxWidth;
+    minWidth: typeof minWidth;
+    height: typeof height;
+    maxHeight: typeof maxHeight;
+    minHeight: typeof minHeight;
+    sizeWidth: typeof sizeWidth;
+    sizeHeight: typeof sizeHeight;
+    size: typeof size;
+    ratioPadding: typeof ratioPadding;
+    ratio: typeof ratio;
+    verticalAlign: typeof verticalAlign;
+    alignItems: typeof alignItems;
+    alignContent: typeof alignContent;
+    justifyItems: typeof justifyItems;
+    justifyContent: typeof justifyContent;
+    flexWrap: typeof flexWrap;
+    flexBasis: typeof flexBasis;
+    flexDirection: typeof flexDirection;
+    flex: typeof flex;
+    justifySelf: typeof justifySelf;
+    alignSelf: typeof alignSelf;
+    order: typeof order;
+    gridGap: typeof gridGap;
+    gridColumnGap: typeof gridColumnGap;
+    gridRowGap: typeof gridRowGap;
+    gridColumn: typeof gridColumn;
+    gridRow: typeof gridRow;
+    gridAutoFlow: typeof gridAutoFlow;
+    gridAutoColumns: typeof gridAutoColumns;
+    gridAutoRows: typeof gridAutoRows;
+    gridTemplateColumns: typeof gridTemplateColumns;
+    gridTemplateRows: typeof gridTemplateRows;
+    gridTemplateAreas: typeof gridTemplateAreas;
+    gridArea: typeof gridArea;
+    border: typeof border;
+    borderTop: typeof borderTop;
+    borderRight: typeof borderRight;
+    borderBottom: typeof borderBottom;
+    borderLeft: typeof borderLeft;
+    borders: typeof borders;
+    borderColor: typeof borderColor;
+    borderRadius: typeof borderRadius;
+    boxShadow: typeof boxShadow;
+    opacity: typeof opacity;
+    overflow: typeof overflow;
+    background: typeof background;
+    backgroundImage: typeof backgroundImage;
+    backgroundPosition: typeof backgroundPosition;
+    backgroundRepeat: typeof backgroundRepeat;
+    backgroundSize: typeof backgroundSize;
+    position: typeof position;
+    zIndex: typeof zIndex;
+    top: typeof top;
+    right: typeof right;
+    bottom: typeof bottom;
+    left: typeof left;
+    textStyle: typeof textStyle;
+    colorStyle: typeof colorStyle;
+    buttonStyle: typeof buttonStyle;
+}
+
+export const styles: StylesProps;
diff --git a/types/styled-system/styled-system-tests.tsx b/types/styled-system/styled-system-tests.tsx
index 397e1b0402..ae2f87b7ab 100644
--- a/types/styled-system/styled-system-tests.tsx
+++ b/types/styled-system/styled-system-tests.tsx
@@ -10,6 +10,7 @@ import {
     SpaceProps,
     WidthProps,
     ColorProps,
+    TextColorProps,
     DisplayProps,
     FontSizeProps,
     FontFamilyProps,
@@ -43,6 +44,8 @@ import {
     alignContent,
     justifyContent,
     JustifyContentProps,
+    justifyItems,
+    JustifyItemsProps,
     FlexWrapProps,
     flexWrap,
     flexBasis,
@@ -124,7 +127,8 @@ import {
     VerticalAlignProps,
     verticalAlign,
     px,
-    createMediaQuery
+    createMediaQuery,
+    styles
 } from "styled-system";
 
 // tslint:disable-next-line:strict-export-declare-modifiers
@@ -253,7 +257,8 @@ interface FlexComponentProps
         JustifyContentProps,
         FlexWrapProps,
         FlexBasisProps,
-        FlexDirectionProps {}
+        FlexDirectionProps,
+        JustifyItemsProps {}
 const Flex: React.ComponentType<FlexComponentProps> = styled`
     ${alignItems};
     ${alignContent};
@@ -261,6 +266,7 @@ const Flex: React.ComponentType<FlexComponentProps> = styled`
     ${flexWrap};
     ${flexBasis};
     ${flexDirection};
+    ${justifyItems};
 `;
 
 interface GridComponentProps
@@ -289,11 +295,13 @@ const Grid: React.ComponentType<GridComponentProps> = styled`
 
 interface ButtonProps
     extends SpaceProps,
-        ButtonStyleProps {}
+        ButtonStyleProps,
+        TextColorProps {}
 
 const TestButton: React.ComponentType<ButtonProps> = styled`
     ${buttonStyle}
     ${space}
+    ${styles.textColor}
 `;
 
 const test = () => (
@@ -427,6 +435,10 @@ const test = () => (
         <Flex flexDirection="column" />
         <Flex flexDirection={["column"]} />
         <Flex flexDirection={{ sm: "column" }} />
+        // justifyItems
+        <Flex justifyItems="baseline" />
+        <Flex justifyItems={["baseline", "center"]} />
+        <Flex justifyItems={{ sm: "baseline", md: "center" }} />
         // gridGap
         <Grid gridGap="1px" />
         <Grid gridGap={["1", "2"]} />
@@ -515,6 +527,6 @@ const test = () => (
         // verticalAlign
         <Box verticalAlign="middle" />
 
-        <TestButton variant="primary" m={2} />
+        <TestButton variant="primary" m={2} color="tomato" />
     </div>
 );
diff --git a/types/stylelint/index.d.ts b/types/stylelint/index.d.ts
index d777948d12..7d1f0fccc4 100644
--- a/types/stylelint/index.d.ts
+++ b/types/stylelint/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for stylelint 9.4
-// Project: https://github.com/stylelint/stylelint
+// Project: https://github.com/stylelint/stylelint, https://stylelint.io
 // Definitions by: Alan Agius <https://github.com/alan-agius4>
 //                 Filips Alpe <https://github.com/filipsalpe>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/stylus/index.d.ts b/types/stylus/index.d.ts
index 5db1979770..5b17bd5138 100644
--- a/types/stylus/index.d.ts
+++ b/types/stylus/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for stylus 0.48
-// Project: https://github.com/LearnBoost/stylus
+// Project: https://github.com/stylus/stylus
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/superagent-prefix/index.d.ts b/types/superagent-prefix/index.d.ts
index 39968e7701..539afba333 100644
--- a/types/superagent-prefix/index.d.ts
+++ b/types/superagent-prefix/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for superagent-prefix 0.0
-// Project: https://github.com/johntron/superagent-prefix
+// Project: https://github.com/johntron/superagent-prefix, https://github.com/mattahorton/superagent-prefix
 // Definitions by: Michael Ledin <https://github.com/mxl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/supercluster/index.d.ts b/types/supercluster/index.d.ts
index 7fd487ae09..74ef517d7e 100644
--- a/types/supercluster/index.d.ts
+++ b/types/supercluster/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for supercluster 3.0
+// Type definitions for supercluster 5.0
 // Project: https://github.com/mapbox/supercluster
 // Definitions by: Denis Carriere <https://github.com/DenisCarriere>
+//                 Nick Zahn <https://github.com/Manc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -8,113 +9,164 @@ import * as GeoJSON from 'geojson';
 
 export as namespace supercluster;
 
-export interface Options {
+export interface Options<P, C> {
     /**
      * Minimum zoom level at which clusters are generated.
+     *
+     * @default 0
      */
     minZoom?: number;
+
     /**
      * Maximum zoom level at which clusters are generated.
+     *
+     * @default 16
      */
     maxZoom?: number;
+
     /**
      * Cluster radius, in pixels.
+     *
+     * @default 40
      */
     radius?: number;
+
     /**
      * (Tiles) Tile extent. Radius is calculated relative to this value.
+     *
+     * @default 512
      */
     extent?: number;
+
     /**
      * Size of the KD-tree leaf node. Affects performance.
+     *
+     * @default 64
      */
     nodeSize?: number;
+
     /**
      * Whether timing info should be logged.
+     *
+     * @default false
      */
     log?: boolean;
+
     /**
-     * a reduce function for calculating custom cluster properties
+     * A function that returns cluster properties corresponding to a single point.
      *
      * @example
-     * function (accumulated, props) { accumulated.sum += props.sum; }
+     * (props) => ({sum: props.myValue})
      */
-    reduce?: (accumulated: any, props: any) => void;
+    map?: (props: P) => C;
+
     /**
-     * initial properties of a cluster (before running the reducer)
+     * A reduce function that merges properties of two clusters into one.
      *
      * @example
-     * function () { return {sum: 0}; }
+     * (accumulated, props) => { accumulated.sum += props.sum; }
      */
-    initial?: () => any;
-    /**
-     * properties to use for individual points when running the reducer
-     *
-     * @example
-     * function (props) { return {sum: props.my_value}; }
-     */
-    map?: (props: any) => any;
-}
-
-export class Supercluster {
-    /**
-     * Loads an array of GeoJSON.Feature objects. Each feature's geometry must be a GeoJSON.Point. Once loaded, index is immutable.
-     */
-    load(points: Points): Supercluster;
-    /**
-     * For the given bbox array ([westLng, southLat, eastLng, northLat]) and integer zoom, returns an array of clusters and points as GeoJSON.Feature objects.
-     */
-    getClusters(bbox: BBox, zoom: number): Clusters;
-
-    /**
-     * For a given zoom and x/y coordinates, returns a geojson-vt-compatible JSON tile object with cluster/point features.
-     */
-    getTile(z: number, x: number, y: number): Tile;
-
-    /**
-     * Returns the children of a cluster (on the next zoom level) given its id (cluster_id value from feature properties) and zoom the cluster was from.
-     */
-    getChildren(clusterId: number, clusterZoom: number): Clusters;
-
-    /**
-     * Returns all the points of a cluster (given its cluster_id and zoom),
-     * with pagination support: limit is the number of points to return (set to Infinity for all points),
-     * and offset is the amount of points to skip (for pagination).
-     */
-    getLeaves(clusterId: number, clusterZoom: number, limit?: number, offset?: number): Clusters;
-
-    /**
-     * Returns the zoom on which the cluster expands into several children (useful for "click to zoom" feature), given the cluster's cluster_id and zoom.
-     */
-    getClusterExpansionZoom(clusterId: number, clusterZoom: number): number;
+    reduce?: (accumulated: C, props: Readonly<C>) => void;
 }
 
 /**
- * A very fast JavaScript library for geospatial point clustering for browsers and Node.
+ * Default properties type, allowing any properties.
+ * Try to avoid this for better typesafety by using proper types.
  */
-export default function supercluster(options: Options): Supercluster;
+export interface AnyProps {
+    [name: string]: any;
+}
+
+/**
+ * A very fast geospatial point clustering library for browsers and Node.
+ */
+export default class Supercluster<P extends GeoJSON.GeoJsonProperties = AnyProps, C extends GeoJSON.GeoJsonProperties = AnyProps> {
+    constructor(options?: Options<P, C>);
+
+    /**
+     * Loads an array of GeoJSON Feature objects. Each feature's geometry
+     * must be a GeoJSON Point. Once loaded, index is immutable.
+     *
+     * @param points Array of GeoJSON Features, the geometries being GeoJSON Points.
+     */
+    load(points: Array<PointFeature<P>>): Supercluster<P, C>;
+
+    /**
+     * Returns an array of clusters and points as `GeoJSON.Feature` objects
+     * for the given bounding box (`bbox`) and zoom level (`zoom`).
+     *
+     * @param bbox Bounding box (`[westLng, southLat, eastLng, northLat]`).
+     * @param zoom Zoom level.
+     */
+    getClusters(bbox: GeoJSON.BBox, zoom: number): Array<ClusterFeature<C> | PointFeature<P>>;
+
+    /**
+     * For a given zoom and x/y coordinates, returns a
+     * [geojson-vt](https://github.com/mapbox/geojson-vt)-compatible JSON
+     * tile object with cluster any point features.
+     */
+    getTile(zoom: number, x: number, y: number): Tile<C, P> | null;
+
+    /**
+     * Returns the children of a cluster (on the next zoom level).
+     *
+     * @param clusterId Cluster ID (`cluster_id` value from feature properties).
+     * @throws {Error} If `clusterId` does not exist.
+     */
+    getChildren(clusterId: number): Array<ClusterFeature<C> | PointFeature<P>>;
+
+    /**
+     * Returns all the points of a cluster (with pagination support).
+     *
+     * @param clusterId Cluster ID (`cluster_id` value from feature properties).
+     * @param limit The number of points to return (set to `Infinity` for all points).
+     * @param offset The amount of points to skip (for pagination).
+     */
+    getLeaves(clusterId: number, limit?: number, offset?: number): Array<ClusterFeature<C> | PointFeature<P>>; // Cluster[];
+
+    /**
+     * Returns the zoom level on which the cluster expands into several
+     * children (useful for "click to zoom" feature).
+     *
+     * @param clusterId Cluster ID (`cluster_id` value from feature properties).
+     */
+    getClusterExpansionZoom(clusterId: number): number;
+}
+
+/**
+ * [GeoJSON Feature](https://tools.ietf.org/html/rfc7946#section-3.2),
+ * with the geometry being a
+ * [GeoJSON Point](https://tools.ietf.org/html/rfc7946#section-3.1.2).
+ */
+export type PointFeature<P> = GeoJSON.Feature<GeoJSON.Point, P>;
 
-export type Point = GeoJSON.Feature<GeoJSON.Point>;
-export type Points = Point[];
-export type Clusters = Cluster[];
-export type TileFeatures = TileFeature[];
-export type BBox = [number, number, number, number];
 export interface ClusterProperties {
-    cluster?: boolean;
-    cluster_id?: number;
-    point_count?: number;
-    point_count_abbreviated?: number;
-    sum?: number;
-    [key: string]: any;
+    /**
+     * Always `true` to indicate that the Feature is a Cluster and not
+     * an individual point.
+     */
+    cluster: true;
+    /** Cluster ID */
+    cluster_id: number;
+    /** Number of points in the cluster. */
+    point_count: number;
+    /**
+     * Abbreviated number of points in the cluster as string if the number
+     * is 1000 or greater (e.g. `1.3k` if the number is 1298).
+     *
+     * For less than 1000 points it is the same value as `point_count`.
+     */
+    point_count_abbreviated: string | number;
 }
-export interface Cluster extends Point {
-    properties: ClusterProperties;
-}
-export interface TileFeature {
+
+export type ClusterFeature<C> = PointFeature<ClusterProperties & C>;
+
+export interface TileFeature<C, P> {
     type: 1;
     geometry: Array<[number, number]>;
-    tags: ClusterProperties;
+    tags: (ClusterProperties & C) | P;
 }
-export interface Tile {
-    features: TileFeatures;
+
+export interface Tile<C, P> {
+    features: Array<TileFeature<C, P>>;
 }
diff --git a/types/supercluster/supercluster-tests.ts b/types/supercluster/supercluster-tests.ts
index e3120206e9..6da89ef104 100644
--- a/types/supercluster/supercluster-tests.ts
+++ b/types/supercluster/supercluster-tests.ts
@@ -1,43 +1,101 @@
-import supercluster, { Point } from 'supercluster';
+import Supercluster, { PointFeature, ClusterProperties } from 'supercluster';
 
-const point1: Point = {
-    type: 'Feature',
-    properties: {my_value: 2},
-    geometry: { type: 'Point', coordinates: [10, 20] }
-};
-const point2: Point = {
-    type: 'Feature',
-    properties: {my_value: 3},
-    geometry: { type: 'Point', coordinates: [20, 30] }
-};
-const points = [point1, point2];
+//
+// Test 1: strictly typed
+//
 
-const initialFunction = () => {
-  return {sum: 0};
-};
+interface TestPointProps {
+	myTestFeatureName: string;
+}
 
-const mapFunction = (props: any) => {
-  return {sum: props.my_value};
-};
+interface TestClusterProps {
+	myTestClusterName: string;
+}
 
-const reduceFunction = (accumulated: any, props: any) => {
-  accumulated.sum += props.sum;
-};
+const points: Array<PointFeature<TestPointProps>> = [
+	{
+		type: 'Feature',
+		properties: { myTestFeatureName: 'a' },
+		geometry: { type: 'Point', coordinates: [10, 20] }
+	},
+	{
+		type: 'Feature',
+		properties: { myTestFeatureName: 'b' },
+		geometry: { type: 'Point', coordinates: [20, 30] }
+	}
+];
 
-const index = supercluster({
-    radius: 40,
-    maxZoom: 16,
-    extent: 256,
-    log: true,
-    initial: initialFunction,
-    map: mapFunction,
-    reduce: reduceFunction,
+// construct()
+new Supercluster();
+new Supercluster({});
+const index = new Supercluster({
+	minZoom: 5,
+	maxZoom: 16,
+	radius: 40,
+	extent: 256,
+	nodeSize: 64,
+	log: true,
+	map: (props: TestPointProps): TestClusterProps => ({
+		myTestClusterName: props.myTestFeatureName.toUpperCase()
+	}),
+	reduce: (accumulated, props) => {
+		accumulated.myTestClusterName += ` & ${props.myTestClusterName}`;
+	},
 });
+
+// load()
 index.load(points);
+
+// getClusters()
 const clusters = index.getClusters([-180, -85, 180, 85], 2);
-clusters[0].properties.cluster_id;
-index.getTile(0, 0, 0);
-index.getChildren(0, 0);
-index.getLeaves(0, 0, 10, 5);
-index.getClusterExpansionZoom(0, 0);
-index.getTile(0, 0, 0).features[0].tags.sum;
+const firstProps = clusters[0].properties; // Either cluster or point properties
+// Generic cluster properties
+(<ClusterProperties> firstProps).cluster;
+(<ClusterProperties> firstProps).point_count;
+// Custom cluster properties
+(<TestClusterProps> firstProps).myTestClusterName;
+// Custom point properties
+(<TestPointProps> firstProps).myTestFeatureName;
+
+// getTile()
+const tile = index.getTile(0, 0, 0);
+if (tile) {
+	const tileProps = tile.features[0].tags; // Either cluster or point properties
+	// Generic cluster properties
+	(<ClusterProperties> tileProps).cluster;
+	(<ClusterProperties> tileProps).point_count;
+	// Custom cluster properties
+	(<TestClusterProps> tileProps).myTestClusterName;
+	// Custom point properties
+	(<TestPointProps> tileProps).myTestFeatureName;
+}
+
+// Other methods
+index.getChildren(0);
+index.getLeaves(0);
+index.getLeaves(0, Infinity);
+index.getLeaves(0, 0, 10);
+index.getClusterExpansionZoom(0);
+
+//
+// Test 2: loosely typed
+//
+
+const index2 = new Supercluster();
+index2.load([
+	{
+		type: 'Feature',
+		properties: { testPropertyA: 100 },
+		geometry: { type: 'Point', coordinates: [10, 20] }
+	},
+	{
+		type: 'Feature',
+		properties: { testPropertyB: 'test' },
+		geometry: { type: 'Point', coordinates: [20, 30] }
+	}
+]);
+const clusters2 = index2.getClusters([-180, -85, 180, 85], 2);
+const firstProps2 = clusters2[0].properties;
+(<ClusterProperties> firstProps2).cluster_id;
+firstProps2.testPropertyA;
+firstProps2.testPropertyB;
diff --git a/types/supercluster/tslint.json b/types/supercluster/tslint.json
index 440efbd687..3db14f85ea 100644
--- a/types/supercluster/tslint.json
+++ b/types/supercluster/tslint.json
@@ -1,7 +1 @@
-{
-	"extends": "dtslint/dt.json",
-	"rules": {
-		// TODO
-		"no-duplicate-imports": false
-	}
-}
+{ "extends": "dtslint/dt.json" }
diff --git a/types/svg-sprite-loader/index.d.ts b/types/svg-sprite-loader/index.d.ts
index b192e8bd01..ea794bd1de 100644
--- a/types/svg-sprite-loader/index.d.ts
+++ b/types/svg-sprite-loader/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for svg-sprite-loader 3.9
-// Project: https://github.com/kisenka/svg-sprite-loader/releases
+// Project: https://github.com/kisenka/svg-sprite-loader/releases, https://github.com/kisenka/svg-sprite-loader
 // Definitions by: Ryan Clark <https://github.com/rynclark>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/swagger-node-runner/index.d.ts b/types/swagger-node-runner/index.d.ts
index 88da16aceb..3e8016a73f 100644
--- a/types/swagger-node-runner/index.d.ts
+++ b/types/swagger-node-runner/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for swagger-node-runner 0.5
-// Project: https://www.npmjs.com/package/swagger-node-runner
+// Project: https://github.com/theganyo/swagger-node-runner
 // Definitions by: Michael Mrowetz <https://github.com/micmro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/swagger-parser/index.d.ts b/types/swagger-parser/index.d.ts
index 3d145b802c..4a0035ed5f 100644
--- a/types/swagger-parser/index.d.ts
+++ b/types/swagger-parser/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for swagger-parser 4.x
-// Project: https://www.npmjs.com/package/swagger-parser
+// Project: https://apidevtools.org/swagger-parser
 // Definitions by: Tobias Wolff <https://github.com/Tobias4872>
 //                 Eric Henry <https://github.com/EricHenry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/swiper/index.d.ts b/types/swiper/index.d.ts
index 0fbdfd715b..7d4cd3ed27 100644
--- a/types/swiper/index.d.ts
+++ b/types/swiper/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Swiper 4.4
-// Project: https://github.com/nolimits4web/Swiper
+// Project: https://github.com/nolimits4web/Swiper, http://www.idangero.us/swiper
 // Definitions by: Sebastián Galiano <https://github.com/sgaliano>
 //                 Luca Trazzi <https://github.com/lucax88x>
 //                 Eugene Matseruk <https://github.com/ematseruk>
diff --git a/types/syntax-error/index.d.ts b/types/syntax-error/index.d.ts
index 68bbba8346..f6815a73f4 100644
--- a/types/syntax-error/index.d.ts
+++ b/types/syntax-error/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for syntax-error 1.4
-// Project: https://github.com/browserify/syntax-error
+// Project: https://github.com/browserify/syntax-error, https://github.com/substack/node-syntax-error
 // Definitions by: TeamworkGuy2 <https://github.com/TeamworkGuy2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/tableau/index.d.ts b/types/tableau/index.d.ts
index f68790135e..3ed3f8dc94 100644
--- a/types/tableau/index.d.ts
+++ b/types/tableau/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for tableau 2.2
-// Project: https://onlinehelp.tableau.com/current/api/js_api/en-us/JavaScriptAPI/js_api.htm
+// Project: https://onlinehelp.tableau.com/current/api/js_api/en-us/JavaScriptAPI/js_api.htm, https://github.com/jwerle/tableau
 // Definitions by: Greg Zapp <https://github.com/protip>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/tail/index.d.ts b/types/tail/index.d.ts
index 00f80ab079..c2135bc079 100644
--- a/types/tail/index.d.ts
+++ b/types/tail/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for tail 1.2
-// Project: https://github.com/lucagrulla/node-tail
+// Project: https://github.com/lucagrulla/node-tail, https://www.lucagrulla.com/node-tail
 // Definitions by: Mike Linkovich <https://github.com/spacejack>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/task-worklet/index.d.ts b/types/task-worklet/index.d.ts
index 05128aa465..f9895adc8a 100644
--- a/types/task-worklet/index.d.ts
+++ b/types/task-worklet/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for task-worklet 0.1
-// Project: https://github.com/developit/task-worklet
+// Project: https://github.com/developit/task-worklet, https://github.com/googlechromelabs/task-worklet
 // Definitions by: Karol Majewski <https://github.com/karol-majewski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.9
diff --git a/types/tedious-connection-pool/index.d.ts b/types/tedious-connection-pool/index.d.ts
index dcd02a97e9..c06bea4cf6 100644
--- a/types/tedious-connection-pool/index.d.ts
+++ b/types/tedious-connection-pool/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for tedious-connection-pool 1.0
-// Project: https://github.com/pekim/tedious-connection-pool
+// Project: https://github.com/tediousjs/tedious-connection-pool
 // Definitions by: Cyprien Autexier <https://github.com/sandorfr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/temp/index.d.ts b/types/temp/index.d.ts
index 25a76ec47e..1e8519a62f 100644
--- a/types/temp/index.d.ts
+++ b/types/temp/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for temp 0.8
-// Project: https://www.npmjs.com/package/temp, https://github.com/bruce/node-temp
+// Project: https://github.com/bruce/node-temp
 // Definitions by: Daniel Rosenwasser <https://github.com/DanielRosenwasser>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/tern/lib/tern/index.d.ts b/types/tern/lib/tern/index.d.ts
index 0e48925914..7ecb4ac73e 100644
--- a/types/tern/lib/tern/index.d.ts
+++ b/types/tern/lib/tern/index.d.ts
@@ -164,17 +164,20 @@ export interface BaseQuery {
     docFormat?: "full";
 }
 
+export interface BaseQueryWithFile extends BaseQuery {
+    /** may hold either a filename, or a string in the form "#N", where N should be an integer referring to one of the files included in the request */
+    file: string;
+}
+
 export interface Position {
     ch: number;
     line: number;
 }
 
 /** Asks the server for a set of completions at the given point. */
-export interface CompletionsQuery extends BaseQuery {
+export interface CompletionsQuery extends BaseQueryWithFile {
     /** Asks the server for a set of completions at the given point. */
     type: "completions";
-    /** may hold either a filename, or a string in the form "#N", where N should be an integer referring to one of the files included in the request */
-    file: string;
     /** Specify the location to complete at. */
     end: number | Position;
     /** Whether to include the types of the completions in the result data. Default `false` */
@@ -233,11 +236,9 @@ export interface CompletionsQueryResult {
 }
 
 /** Query the type of something. */
-export interface TypeQuery extends BaseQuery {
+export interface TypeQuery extends BaseQueryWithFile {
     /** Query the type of something. */
     type: "type";
-    /** may hold either a filename, or a string in the form "#N", where N should be an integer referring to one of the files included in the request */
-    file: string;
     /** Specify the location of the expression. */
     end: number | Position;
     /** Specify the location of the expression. */
@@ -282,7 +283,7 @@ export interface TypeQueryResult {
  * type is not an object or function (other types don’t store their definition site),
  * it will fail to return useful information.
  */
-export interface DefinitionQuery extends BaseQuery {
+export interface DefinitionQuery extends BaseQueryWithFile {
     /**
      * Asks for the definition of something. This will try, for a variable or property,
      * to return the point at which it was defined. If that fails, or the chosen
@@ -292,8 +293,6 @@ export interface DefinitionQuery extends BaseQuery {
      * it will fail to return useful information.
      */
     type: "definition";
-    /** may hold either a filename, or a string in the form "#N", where N should be an integer referring to one of the files included in the request */
-    file: string;
     /** Specify the location of the expression. */
     end: number | Position;
     /** Specify the location of the expression. */
@@ -320,11 +319,9 @@ export interface DefinitionQueryResult {
 }
 
 /** Get the documentation string and URL for a given expression, if any. */
-export interface DocumentationQuery extends BaseQuery {
+export interface DocumentationQuery extends BaseQueryWithFile {
     /** Get the documentation string and URL for a given expression, if any. */
     type: "documentation";
-    /** may hold either a filename, or a string in the form "#N", where N should be an integer referring to one of the files included in the request */
-    file: string;
     /** Specify the location of the expression. */
     end: number | Position;
     /** Specify the location of the expression. */
@@ -341,11 +338,9 @@ export interface DocumentationQueryResult {
 }
 
 /** Used to find all references to a given variable or property. */
-export interface RefsQuery extends BaseQuery {
+export interface RefsQuery extends BaseQueryWithFile {
     /** Used to find all references to a given variable or property. */
     type: "refs";
-    /** may hold either a filename, or a string in the form "#N", where N should be an integer referring to one of the files included in the request */
-    file: string;
     /** Specify the location of the expression. */
     end: number | Position;
     /** Specify the location of the expression. */
@@ -365,11 +360,9 @@ export interface RefsQueryResult {
 }
 
 /** Rename a variable in a scope-aware way. */
-export interface RenameQuery extends BaseQuery {
+export interface RenameQuery extends BaseQueryWithFile {
     /** Rename a variable in a scope-aware way. */
     type: "rename";
-    /** may hold either a filename, or a string in the form "#N", where N should be an integer referring to one of the files included in the request */
-    file: string;
     /** Specify the location of the variable. */
     end: number | Position;
     /** Specify the location of the variable. */
@@ -467,7 +460,7 @@ export function registerPlugin(name: string, init: (server: Server, options?: Co
 
 export interface Desc<T extends Query["type"]> {
     run(Server: Server, query: QueryRegistry[T]["query"], file?: File): QueryRegistry[T]["result"];
-    takesfile?: boolean;
+    takesFile?: boolean;
 }
 
 /**
diff --git a/types/terser-webpack-plugin/package.json b/types/terser-webpack-plugin/package.json
new file mode 100644
index 0000000000..fa05b4d87e
--- /dev/null
+++ b/types/terser-webpack-plugin/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "terser": "^3.16.1"
+  }
+}
diff --git a/types/terser/index.d.ts b/types/terser/index.d.ts
deleted file mode 100644
index 44a3e1cdb7..0000000000
--- a/types/terser/index.d.ts
+++ /dev/null
@@ -1,648 +0,0 @@
-// Type definitions for terser 3.8
-// Project: https://github.com/terser-js/terser
-// Definitions by: JordiAnderl <https://github.com/JordiAnderl>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
-
-import * as MOZ_SourceMap from "source-map";
-
-export interface Tokenizer {
-    /**
-     * The type of this token.
-     * "comment1" and "comment2" are for single-line, respectively multi-line comments.
-     */
-    type: "num" | "string" | "regexp" | "operator" | "punc" | "atom" | "name" | "keyword" | "comment1" | "comment2";
-
-    /**
-     * The name of the file where this token originated from. Useful when compressing multiple files at once to generate the proper source map.
-     */
-    file: string;
-
-    /**
-     * The "value" of the token.
-     * That's additional information and depends on the token type: "num", "string" and "regexp" tokens you get their literal value.
-     * - For "operator" you get the operator.
-     * - For "punc" it's the punctuation sign (parens, comma, semicolon etc).
-     * - For "atom", "name" and "keyword" it's the name of the identifier
-     * - For comments it's the body of the comment (excluding the initial "//" and "/*".
-     */
-    value: string;
-
-    /**
-     * The line number of this token in the original code.
-     * 1-based index.
-     */
-    line: number;
-
-    /**
-     * The column number of this token in the original code.
-     * 0-based index.
-     */
-    col: number;
-
-    /**
-     * Short for "newline before", it's a boolean that tells us whether there was a newline before this node in the original source. It helps for automatic semicolon insertion.
-     * For multi-line comments in particular this will be set to true if there either was a newline before this comment, or * * if this comment contains a newline.
-     */
-    nlb: boolean;
-
-    /**
-     * This doesn't apply for comment tokens, but for all other token types it will be an array of comment tokens that were found before.
-     */
-    comments_before: string[];
-}
-
-export class AST_Node {
-    // The first token of this node
-    start: AST_Node;
-
-    // The last token of this node
-    end: AST_Node;
-
-    value?: string | number;
-    file?: string;
-    property?: string;
-    key?: string;
-
-    transform(tt: TreeTransformer): AST_Toplevel;
-
-    walk(walker: TreeWalker): void;
-}
-
-export class AST_Toplevel extends AST_Node {
-    // Terser contains a scope analyzer which figures out variable/function definitions, references etc.
-    // You need to call it manually before compression or mangling.
-    // The figure_out_scope method is defined only on the AST_Toplevel node.
-    figure_out_scope(): void;
-
-    // Get names that are optimized for GZip compression (names will be generated using the most frequent characters first)
-    compute_char_frequency(): void;
-
-    mangle_names(): void;
-
-    print(stream: OutputStream): void;
-
-    print_to_string(options?: BeautifierOptions): string;
-}
-
-export interface MinifyOptions {
-    spidermonkey?: boolean;
-    outSourceMap?: string;
-    sourceRoot?: string;
-    inSourceMap?: string;
-    fromString?: boolean;
-    warnings?: boolean;
-    mangle?: boolean | MangleOptions;
-    output?: OutputOptions;
-    compress?: boolean | CompressOptions;
-    nameCache?: {};
-}
-
-export interface MinifyOutput {
-    code: string;
-    map: string;
-    warnings?: string[];
-    error?: string;
-    ast?: boolean | AST_Toplevel;
-}
-
-export function minify(files: {}, options?: MinifyOptions): MinifyOutput;
-
-export interface ParseOptions {
-    // Default is false
-    strict?: boolean;
-
-    // Input file name, default is null
-    filename?: string;
-
-    // Default is null
-    toplevel?: AST_Toplevel;
-}
-export interface CompressOptions {
-    /** Replace `arguments[index]` with function parameter name whenever possible. */
-    arguments?: boolean;
-    /** Various optimizations for boolean context, for example `!!a ? b : c → a ? b : c` */
-    booleans?: boolean;
-    /** Collapse single-use non-constant variables, side effects permitting. */
-    collapse_vars?: boolean;
-    /** Apply certain optimizations to binary nodes, e.g. `!(a <= b) → a > b,` attempts to negate binary nodes, e.g. `a = !b && !c && !d && !e → a=!(b||c||d||e)` etc */
-    comparisons?: boolean;
-    /** Apply optimizations for `if-s` and conditional expressions. */
-    conditionals?: boolean;
-    /** Remove unreachable code */
-    dead_code?: boolean;
-    /**
-     * Pass `true` to discard calls to console.* functions.
-     * If you wish to drop a specific function call such as `console.info` and/or retain side effects from function
-     * arguments after dropping the function call then use `pure_funcs` instead.
-     */
-    drop_console?: boolean;
-    /** Remove `debugger;` statements */
-    drop_debugger?: boolean;
-    /** Attempt to evaluate constant expressions */
-    evaluate?: boolean;
-    /** Pass `true` to preserve completion values from terminal statements without `return`, e.g. in bookmarklets. */
-    expression?: boolean;
-    global_defs?: object;
-    /** hoist function declarations */
-    hoist_funs?: boolean;
-    /**
-     * Hoist properties from constant object and array literals into regular variables subject to a set of constraints.
-     * For example: `var o={p:1, q:2}; f(o.p, o.q);` is converted to `f(1, 2);`. Note: `hoist_props` works best with mangle enabled,
-     * the compress option passes set to 2 or higher, and the compress option toplevel enabled.
-     */
-    hoist_props?: boolean;
-    /** Hoist var declarations (this is `false` by default because it seems to increase the size of the output in general) */
-    hoist_vars?: boolean;
-    /** Optimizations for if/return and if/continue */
-    if_return?: boolean;
-    /**
-     * Inline calls to function with simple/return statement
-     * - false -- same as `Disabled`
-     * - `Disabled` -- disabled inlining
-     * - `SimpleFunctions` -- inline simple functions
-     * - `WithArguments` -- inline functions with arguments
-     * - `WithArgumentsAndVariables` -- inline functions with arguments and variables
-     * - true -- same as `WithArgumentsAndVariables`
-     */
-    inline?: boolean | InlineFunctions;
-    /** join consecutive `var` statements */
-    join_vars?: boolean;
-    /** Prevents the compressor from discarding unused function arguments. You need this for code which relies on `Function.length` */
-    keep_fargs?: boolean;
-    /** Pass true to prevent the compressor from discarding function names. Useful for code relying on `Function.prototype.name`. */
-    keep_fnames?: boolean;
-    /** Pass true to prevent Infinity from being compressed into `1/0`, which may cause performance issues on `Chrome` */
-    keep_infinity?: boolean;
-    /** Optimizations for `do`, `while` and `for` loops when we can statically determine the condition. */
-    loops?: boolean;
-    /** negate `Immediately-Called Function Expressions` where the return value is discarded, to avoid the parens that the code generator would insert. */
-    negate_iife?: boolean;
-    /** The maximum number of times to run compress. In some cases more than one pass leads to further compressed code. Keep in mind more passes will take more time. */
-    passes?: number;
-    /** Rewrite property access using the dot notation, for example `foo["bar"]` to `foo.bar` */
-    properties?: boolean;
-    /**
-     * An array of names and UglifyJS will assume that those functions do not produce side effects.
-     * DANGER: will not check if the name is redefined in scope.
-     * An example case here, for instance `var q = Math.floor(a/b)`.
-     * If variable q is not used elsewhere, UglifyJS will drop it, but will still keep the `Math.floor(a/b)`,
-     * not knowing what it does. You can pass `pure_funcs: [ 'Math.floor' ]` to let it know that this function
-     * won't produce any side effect, in which case the whole statement would get discarded. The current
-     * implementation adds some overhead (compression will be slower).
-     */
-    pure_funcs?: string[];
-    pure_getters?: boolean | 'strict';
-    /**
-     * Allows single-use functions to be inlined as function expressions when permissible allowing further optimization.
-     * Enabled by default. Option depends on reduce_vars being enabled. Some code runs faster in the Chrome V8 engine if
-     * this option is disabled. Does not negatively impact other major browsers.
-     */
-    reduce_funcs?: boolean;
-    /** Improve optimization on variables assigned with and used as constant values. */
-    reduce_vars?: boolean;
-    sequences?: boolean;
-    /** Pass false to disable potentially dropping functions marked as "pure". */
-    side_effects?: boolean;
-    /** De-duplicate and remove unreachable `switch` branches.  */
-    switches?: boolean;
-    /** Drop unreferenced functions ("funcs") and/or variables ("vars") in the top level scope (false by default, true to drop both unreferenced functions and variables) */
-    toplevel?: boolean;
-    /** Prevent specific toplevel functions and variables from unused removal (can be array, comma-separated, RegExp or function. Implies toplevel) */
-    top_retain?: boolean;
-    typeofs?: boolean;
-    unsafe?: boolean;
-    /** Compress expressions like a `<= b` assuming none of the operands can be (coerced to) `NaN`. */
-    unsafe_comps?: boolean;
-    /** Compress and mangle `Function(args, code)` when both args and code are string literals. */
-    unsafe_Function?: boolean;
-    /** Optimize numerical expressions like `2 * x * 3` into `6 * x`, which may give imprecise floating point results.  */
-    unsafe_math?: boolean;
-    /** Optimize expressions like `Array.prototype.slice.call(a)` into `[].slice.call(a)` */
-    unsafe_proto?: boolean;
-    /** Enable substitutions of variables with `RegExp` values the same way as if they are constants. */
-    unsafe_regexp?: boolean;
-    unsafe_undefined?: boolean;
-    unused?: boolean;
-    /** display warnings when dropping unreachable code or unused declarations etc. */
-    warnings?: boolean;
-}
-
-export enum InlineFunctions {
-    Disabled = 0,
-    SimpleFunctions = 1,
-    WithArguments = 2,
-    WithArgumentsAndVariables = 3
-}
-
-export interface MangleOptions {
-    /** Pass true to mangle names visible in scopes where `eval` or with are used. */
-    eval?: boolean;
-    /** Pass true to not mangle function names. Useful for code relying on `Function.prototype.name`. */
-    keep_fnames?: boolean;
-    /** Pass an array of identifiers that should be excluded from mangling. Example: `["foo", "bar"]`. */
-    reserved?: string[];
-    /** Pass true to mangle names declared in the top level scope. */
-    toplevel?: boolean;
-    properties?: boolean | ManglePropertiesOptions;
-}
-
-export interface ManglePropertiesOptions {
-    /** Use true to allow the mangling of builtin DOM properties. Not recommended to override this setting. */
-    builtins?: boolean;
-    /** Mangle names with the original name still present. Pass an empty string "" to enable, or a non-empty string to set the debug suffix. */
-    debug?: boolean;
-    /** Only mangle unquoted property names */
-    keep_quoted?: boolean;
-    /** Pass a RegExp literal to only mangle property names matching the regular expression. */
-    regex?: RegExp;
-    /** Do not mangle property names listed in the reserved array */
-    reserved?: string[];
-}
-
-export interface OutputOptions {
-    ascii_only?: boolean;
-    beautify?: boolean;
-    braces?: boolean;
-    comments?: boolean | 'all' | 'some' | RegExp;
-    indent_level?: number;
-    indent_start?: boolean;
-    inline_script?: boolean;
-    keep_quoted_props?: boolean;
-    max_line_len?: boolean | number;
-    preamble?: string;
-    preserve_line?: boolean;
-    quote_keys?: boolean;
-    quote_style?: OutputQuoteStyle;
-    semicolons?: boolean;
-    shebang?: boolean;
-    webkit?: boolean;
-    width?: number;
-    wrap_iife?: boolean;
-}
-
-export enum OutputQuoteStyle {
-    PreferDouble = 0,
-    AlwaysSingle = 1,
-    AlwaysDouble = 2,
-    AlwaysOriginal = 3
-}
-
-/**
- * The parser creates a custom abstract syntax tree given a piece of JavaScript code.
- * Perhaps you should read about the AST first.
- */
-export function parse(code: string, options?: ParseOptions): AST_Toplevel;
-
-export interface BeautifierOptions {
-    /**
-     * Start indentation on every line (only when `beautify`)
-     */
-    indent_start?: number;
-
-    /**
-     * Indentation level (only when `beautify`)
-     */
-    indent_level?: number;
-
-    /**
-     * Quote all keys in {} literals?
-     */
-    quote_keys?: boolean;
-
-    /**
-     * Add a space after colon signs?
-     */
-    space_colon?: boolean;
-
-    /**
-     * Output ASCII-safe? (encodes Unicode characters as ASCII)
-     */
-    ascii_only?: boolean;
-
-    /**
-     * Escape "</script"?
-     */
-    inline_script?: boolean;
-
-    /**
-     * Informative maximum line width (for beautified output)
-     */
-    width?: number;
-
-    /**
-     * Maximum line length (for non-beautified output)
-     */
-    max_line_len?: boolean | number;
-
-    /**
-     * Output IE-safe code?
-     */
-    ie_proof?: boolean;
-
-    /**
-     * Beautify output?
-     */
-    beautify?: boolean;
-
-    /**
-     * Output a source map
-     */
-    source_map?: SourceMap;
-
-    /**
-     * Use brackets every time?
-     */
-    bracketize?: boolean;
-
-    /**
-     * Output comments?
-     */
-    comments?: boolean;
-
-    /**
-     * Use semicolons to separate statements? (otherwise, newlines)
-     */
-    semicolons?: boolean;
-}
-
-export interface OutputStream {
-    // Return the output so far as a string
-    get(): string;
-    toString(): string;
-
-    // Insert one indentation string (usually 4 characters).
-    // Optionally pass true to indent half the width (I'm using that for case and default lines in switch blocks.
-    // If beautify is off, this function does nothing.
-    indent(half?: boolean): void;
-
-    // Return the current indentation width (not level; for example if we're in level 2 and indent_level is 4, this method would return 8.
-    indentation(): number;
-
-    // return the width of the current line text minus indentation.
-    current_width(): number;
-
-    // Return true if current_width() is bigger than options.width (assuming options.width is non-null, non-zero).
-    should_break(): boolean;
-
-    // If beautification is on, this inserts a newline. Otherwise it does nothing.
-    newline(): void;
-
-    // Include the given string into the output, adjusting current_line, current_col and current_pos accordingly.
-    print(str: string): void;
-
-    // If beautification is on this always includes a space character.
-    // Otherwise it saves a hint somewhere that a space might be needed at current point.
-    // The space will go in at the next output but only when absolutely required, for example it will insert the space in return 10 but not in return"stuff".
-    space(): void;
-
-    // Inserts a comma, and calls space() — that is, if beautification is on you'll get a space after the comma.
-    comma(): void;
-
-    // Inserts a colon, and calls space() if options.space_colon is set.
-    colon(): void;
-
-    // Returns the last printed chunk.
-    last(): string;
-
-    // If beautification is on it always inserts a semicolon.
-    // Otherwise it saves a hint that a semicolon might be needed at current point.
-    // The semicolon is inserted when the next output comes in, only if required to not break the JS syntax.
-    semicolon(): void;
-
-    // Always inserts a semicolon and clears the hint that a semicolon might be needed.
-    force_semicolon(): void;
-
-    // Encodes any non-ASCII characters in string with JavaScript's conventions (using \uCODE).
-    to_ascii(str: string): void;
-
-    // Prints an identifier. If options.ascii_only is set, non-ASCII chars will be encoded with JavaScript conventions.
-    print_name(name: string): void;
-
-    // Prints a string. It adds quotes automatically.
-    // It prefers double-quotes, but will actually count any quotes in the string and will use single-quotes if the output proves to be shorter (depending on how many backslashes it has to insert).
-    // It encodes to ASCII if options.ascii_only is set.
-    print_string(str: string): void;
-
-    // Returns the width of the next indentation level. For example if current level is 2 and options.indent_level is 4, it'll return 12.
-    next_indent(): number;
-
-    // Sets the current indentation to col (column), calls the function and thereafter restores the previous indentation level.
-    // If beautification is off it simply calls func.
-    with_indent(col: number, func: () => void): void;
-
-    // This is used to output blocks in curly brackets.
-    // It'll print an open bracket at current point, then call newline() and with the next indentation level it calls your func.
-    // Lastly, it'll print an indented closing bracket. As usual, if beautification is off you'll just get {x} where x is whatever func outputs.
-    with_block(func: () => void): void;
-
-    // Adds parens around the output that your function prints.
-    with_parens(func: () => void): void;
-
-    // Adds square brackets around the output that your function prints.
-    with_square(func: () => void): void;
-
-    // If options.source_map is set, this will generate a source mapping between the given token (which should be an AST_Token-like {}) and the current line/col.
-    // The name is optional; in most cases it will be inferred from the token.
-    add_mapping(token: AST_Node, name?: string): void;
-
-    // Returns the option with the given name.
-    option(name: string): any;
-
-    // Returns the current line in the output (1-based).
-    line(): number;
-
-    // Returns the current column in the output (zero-based).
-    col(): number;
-
-    // Push the given node into an internal stack. This is used to keep track of current node's parent(s).
-    push_node(node: AST_Node): void;
-
-    // Pops the top of the stack and returns it.
-    pop_node(): AST_Node;
-
-    // Returns that internal stack.
-    stack(): any;
-
-    // Returns the n-th parent node (where zero means the direct parent).
-    parent(n: number): AST_Node;
-}
-
-/**
- * The code generator is a recursive process of getting back source code from an AST returned by the parser.
- * Every AST node has a “print” method that takes an OutputStream and dumps the code from that node into it.
- * The stream {} supports a lot of options that control the output.
- * You can specify whether you'd like to get human-readable (indented) output, the indentation level, whether you'd like to quote all properties in {} literals etc.
- */
-export function OutputStream(options?: BeautifierOptions): OutputStream;
-
-export interface SourceMapOptions {
-    /**
-     * The compressed file name
-     */
-    file?: string;
-
-    /**
-     * The root URL to the original sources
-     */
-    root?: string;
-
-    /**
-     * The input source map.
-     * Useful when you compress code that was generated from some other source (possibly other programming language).
-     * If you have an input source map, pass it in this argument and Terser will generate a mapping that maps back
-     * to the original source (as opposed to the compiled code that you are compressing).
-     */
-    orig?: {} | JSON;
-}
-
-export interface SourceMap {
-    add(source: string, gen_line: number, gen_col: number, orig_line: number, orig_col: number, name?: string): void;
-    get(): MOZ_SourceMap.SourceMapGenerator;
-    toString(): string;
-}
-
-/**
- * The output stream keeps track of the current line/column in the output and can trivially generate a source mapping to the original code via Mozilla's source-map library.
- * To use this functionality, you must load this library (it's automatically require-d by Terser in the NodeJS version, but in a browser you must load it yourself)
- * and make it available via the global MOZ_SourceMap variable.
- */
-export function SourceMap(options?: SourceMapOptions): SourceMap;
-
-export interface CompressorOptions {
-    // Join consecutive statemets with the “comma operator”
-    sequences?: boolean;
-
-    // Optimize property access: a["foo"] → a.foo
-    properties?: boolean;
-
-    // Discard unreachable code
-    dead_code?: boolean;
-
-    // Discard “debugger” statements
-    drop_debugger?: boolean;
-
-    // Some unsafe optimizations (see below)
-    unsafe?: boolean;
-
-    // Optimize if-s and conditional expressions
-    conditionals?: boolean;
-
-    // Optimize comparisons
-    comparisons?: boolean;
-
-    // Evaluate constant expressions
-    evaluate?: boolean;
-
-    // Optimize boolean expressions
-    booleans?: boolean;
-
-    // Optimize loops
-    loops?: boolean;
-
-    // Drop unused variables/functions
-    unused?: boolean;
-
-    // Hoist function declarations
-    hoist_funs?: boolean;
-
-    // Hoist variable declarations
-    hoist_vars?: boolean;
-
-    // Optimize if-s followed by return/continue
-    if_return?: boolean;
-
-    // Join var declarations
-    join_vars?: boolean;
-
-    // Try to cascade `right` into `left` in sequences
-    cascade?: boolean;
-
-    // Drop side-effect-free statements
-    side_effects?: boolean;
-
-    // Warn about potentially dangerous optimizations/code
-    warnings?: boolean;
-
-    // Global definitions
-    global_defs?: {};
-}
-
-/**
- * The compressor is a tree transformer which reduces the code size by applying various optimizations on the AST
- */
-export function Compressor(options?: CompressorOptions): AST_Toplevel;
-
-// TODO:
-
-/**
- * Terser provides a TreeWalker {} and every node has a walk method that given a walker will apply your visitor to each node in the tree.
- * Your visitor can return a non-falsy value in order to prevent descending the current node.
- */
-export class TreeWalker {
-    constructor(visitor: visitor);
-    parent: () => AST_Scope;
-    stack: AST_Scope[];
-}
-
-export type visitor = (node: AST_Node, descend: () => void) => boolean | void;
-
-// TODO:
-
-/**
- * The tree transformer is a special case of a tree walker.
- * In fact it even inherits from TreeWalker and you can use the same methods, but initialization and visitor protocol are a bit different.
- */
-export class TreeTransformer extends TreeWalker {
-    constructor(visitor: visitor, after: visitor);
-}
-
-// TODO: http://lisperator.net/uglifyjs/ast
-
-export class AST_PropAccess extends AST_Node {
-}
-
-export class AST_ObjectKeyVal extends AST_Node {
-}
-
-export class AST_Scope extends AST_Node {
-    find_variable(name: string): AST_SymbolDeclaration;
-}
-
-export class AST_Symbol extends AST_Node {
-    scope?: AST_Scope;
-    name: string;
-    thedef: unknown;
-}
-
-export class AST_SymbolDeclaration extends AST_Symbol {
-    orig: AST_SymbolDeclaration[];
-    references: AST_SymbolRef[];
-    global: boolean;
-    undeclared: boolean;
-    constant: boolean;
-    mangledName?: string;
-    mangled_name?: string;
-}
-
-export class AST_SymbolRef extends AST_Symbol {
-}
-
-export class AST_Call extends AST_Node {
-    expression: { name?: string, property?: string };
-    args: AST_Node[];
-}
-export class AST_String extends AST_Node {
-    value: string;
-}
-export class AST_Lambda extends AST_Node {
-    name?: string;
-}
-export class AST_SymbolMethod extends AST_Node {
-    name?: string;
-}
-export class AST_ConciseMethod extends AST_Node {
-}
-export class AST_SymbolVar extends AST_Node {
-    name?: string;
-}
diff --git a/types/terser/package.json b/types/terser/package.json
deleted file mode 100644
index 25c65e7595..0000000000
--- a/types/terser/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "source-map": "*"
-    }
-}
diff --git a/types/terser/terser-tests.ts b/types/terser/terser-tests.ts
deleted file mode 100644
index 49b9190070..0000000000
--- a/types/terser/terser-tests.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/// <reference types="node" />
-
-import { OutputQuoteStyle, minify } from 'terser';
-
-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);
-
-const output = minify(code, {
-    warnings: true,
-    mangle: {
-        properties: {
-            regex: /reg/
-        }
-    },
-    compress: {
-        arguments: true
-    }
-});
-
-if (output.warnings) {
-    output.warnings.filter(x => x === 'Dropping unused variable');
-}
diff --git a/types/terser/tsconfig.json b/types/terser/tsconfig.json
deleted file mode 100644
index 937a5d1350..0000000000
--- a/types/terser/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "terser-tests.ts"
-    ]
-}
diff --git a/types/text-clipper/index.d.ts b/types/text-clipper/index.d.ts
new file mode 100644
index 0000000000..1f86ac405b
--- /dev/null
+++ b/types/text-clipper/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for text-clipper 1.2
+// Project: https://github.com/arendjr/text-clipper
+// Definitions by: Krzysztof Grzybek <https://github.com/krzysztof-grzybek>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Options {
+    breakWords?: boolean;
+    html?: boolean;
+    imageWeight?: number;
+    indicator?: string;
+    maxLines?: number;
+}
+
+declare function clip(string: string, maxLength: number, options?: Options): string;
+export = clip;
diff --git a/types/text-clipper/text-clipper-tests.ts b/types/text-clipper/text-clipper-tests.ts
new file mode 100644
index 0000000000..f4ca7e6f19
--- /dev/null
+++ b/types/text-clipper/text-clipper-tests.ts
@@ -0,0 +1,5 @@
+import clip = require('text-clipper');
+
+clip('text', 123); // $ExpectType string
+clip('text', 123, { breakWords: true, html: false }); // $ExpectType string
+clip('text', 123, { imageWeight: 123, indicator: 'something', maxLines: 321 }); // $ExpectType string
diff --git a/types/text-clipper/tsconfig.json b/types/text-clipper/tsconfig.json
new file mode 100644
index 0000000000..caf06929bb
--- /dev/null
+++ b/types/text-clipper/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "text-clipper-tests.ts"
+    ]
+}
diff --git a/types/text-clipper/tslint.json b/types/text-clipper/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/text-clipper/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/theming/index.d.ts b/types/theming/index.d.ts
index e2525b3ce6..3de78a6434 100644
--- a/types/theming/index.d.ts
+++ b/types/theming/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for theming 1.3
-// Project: https://github.com/iamstarkov/theming#readme
+// Project: https://github.com/cssinjs/theming
 // Definitions by: Sebastian Silbermann <https://github.com/eps1lon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
@@ -19,7 +19,7 @@ export function withTheme<P>(
 
 export interface ThemeProviderProps {
   theme: Theme;
-  children?: React.ReactElement<any>;
+  children?: React.ReactElement;
 }
 /**
  * Provide a theme to an entire react component listening on the default channel
diff --git a/types/theo/index.d.ts b/types/theo/index.d.ts
index f1aacfe038..de15c0238a 100644
--- a/types/theo/index.d.ts
+++ b/types/theo/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for theo 8.0
+// Type definitions for Theo 8.1
 // Project: https://github.com/salesforce-ux/theo
 // Definitions by: Pete Petrash <https://github.com/petekp>
+//                 Niko Laitinen <https://github.com/laitine>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
-import { Iterable, Collection, Map, List, OrderedMap } from "immutable";
+import { Collection, Map, List, OrderedMap } from "immutable";
 
 export type StyleProperty =
     | "name"
@@ -27,7 +28,12 @@ export type Format =
     | "list.scss"
     | "module.js"
     | "common.js"
-    | "html";
+    | "html"
+    | "json"
+    | "raw.json"
+    | "ios.json"
+    | "android.xml"
+    | "aura.tokens";
 
 export type Transform = "raw" | "ios" | "android" | "web";
 
@@ -40,22 +46,6 @@ export type ValueTransform =
     | "relative/pixel"
     | "relative/pixelValue";
 
-export function convert(options: ConvertOptions): Promise<string>;
-export function convertSync(options: ConvertOptions): string;
-export function registerFormat(
-    name: Format,
-    format: FormatResultFn | string
-): void;
-export function registerTransform(
-    name: Transform,
-    valueTransforms: ValueTransform[]
-): void;
-export function registerValueTransform(
-    name: ValueTransform,
-    predicate: (prop: Prop) => boolean,
-    transform: (prop: Prop) => string | number
-): void;
-
 export type Prop = Map<StyleProperty, string | number>;
 export type Props = List<Prop>;
 export type Aliases = OrderedMap<string, Map<string, string | number>>;
@@ -64,6 +54,8 @@ export type FormatResultFn = (result: ImmutableStyleMap) => string;
 
 export interface StyleMap {
     aliases: Aliases;
+    global?: Props;
+    imports?: string[];
     props: Props;
     meta: Meta;
     options: object;
@@ -77,10 +69,12 @@ export interface ImmutableStyleMap extends Map<string, any> {
 export interface ConvertOptions {
     transform: TransformOptions;
     format: FormatOptions;
+    resolveAliases?: boolean;
+    resolveMetaAliases?: boolean;
 }
 
-export interface TransformOptions {
-    type?: Transform;
+export interface TransformOptions<T extends string = never> {
+    type?: Transform | T;
     file: string;
     data?: string;
 }
@@ -92,3 +86,19 @@ export interface FormatOptions {
         transformPropName?: (name: string) => string
     ) => void;
 }
+
+export function convert(options: ConvertOptions): Promise<string>;
+export function convertSync(options: ConvertOptions): string;
+export function registerFormat<T extends string = never>(
+    name: Format | T,
+    format: FormatResultFn | string
+): void;
+export function registerTransform<T extends string = never>(
+    name: Transform | T,
+    valueTransforms: ValueTransform[] | T[]
+): void;
+export function registerValueTransform<T extends string = never>(
+    name: ValueTransform | T,
+    predicate: (prop: Prop) => boolean,
+    transform: (prop: Prop) => string | number
+): void;
diff --git a/types/theo/package.json b/types/theo/package.json
index 12231bb461..33339a3f75 100644
--- a/types/theo/package.json
+++ b/types/theo/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "immutable": "^3.8.2"
+        "immutable": "3.8.2"
     }
 }
diff --git a/types/theo/tslint.json b/types/theo/tslint.json
index 3db14f85ea..71ee04c4e1 100644
--- a/types/theo/tslint.json
+++ b/types/theo/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-unnecessary-generics": false
+    }
+}
diff --git a/types/three/index.d.ts b/types/three/index.d.ts
index 08b64250c8..f929ef2383 100644
--- a/types/three/index.d.ts
+++ b/types/three/index.d.ts
@@ -17,7 +17,6 @@
 //                 Daniel Hritzkiv <https://github.com/dhritzkiv>,
 //                 Apurva Ojas <https://github.com/apurvaojas>,
 //                 Tiger Oakes <https://github.com/NotWoods>,
-//                 Seth Kingsley <https://github.com/sethk>,
 //                 Ethan Kay <https://github.com/elk941>,
 //                 Methuselah96 <https://github.com/Methuselah96>
 //                 Dilip Ramirez <https://github.com/Dukuo>
@@ -25,6 +24,7 @@
 //                 Zhang Hao <https://github.com/devilsparta>
 //                 Konstantin Lukaschenko <https://github.com/KonstantinLukaschenko>
 //                 Daniel Yim <https://github.com/danyim>
+//                 Philippe Suter <https://github.com/psuter>
 // Definitions: https://github.com//DefinitelyTyped
 // TypeScript Version: 2.8
 
diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 639fba5ba5..e7291b9402 100755
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -867,6 +867,7 @@ export class BufferGeometry extends EventDispatcher {
     boundingBox: Box3;
     boundingSphere: Sphere;
     drawRange: { start: number, count: number };
+    userData: {[key: string]: any};
 
     getIndex(): BufferAttribute;
     setIndex( index: BufferAttribute|number[] ): void;
@@ -2293,7 +2294,7 @@ export class JSONLoader extends Loader {
  * Handles and keeps track of loaded and pending data.
  */
 export class LoadingManager {
-    constructor(onLoad?: () => void, onProgress?: (url: string, loaded: number, total: number) => void, onError?: () => void);
+    constructor(onLoad?: () => void, onProgress?: (url: string, loaded: number, total: number) => void, onError?: (url: string) => void);
 
     onStart?: (url: string, loaded: number, total: number) => void;
 
@@ -5272,13 +5273,23 @@ export class Line extends Object3D {
     geometry: Geometry | BufferGeometry;
     material: Material | Material[];
 
-    type: "Line";
+    type: "Line" | "LineLoop" | "LineSegments";
     isLine: true;
 
     computeLineDistances(): this;
     raycast(raycaster: Raycaster, intersects: Intersection[]): void;
 }
 
+export class LineLoop extends Line {
+    constructor(
+        geometry?: Geometry | BufferGeometry,
+        material?: Material | Material[]
+    );
+
+    type: "LineLoop";
+    isLineLoop: true;
+}
+
 /**
  * @deprecated
  */
@@ -5294,6 +5305,9 @@ export class LineSegments extends Line {
         material?: Material | Material[],
         mode?: number
     );
+    
+    type: "LineSegments";
+    isLineSegments: true;
 }
 
 export class Mesh extends Object3D {
@@ -5462,16 +5476,14 @@ export interface WebGLRendererParameters {
     preserveDrawingBuffer?: boolean;
 
     /**
-     * default is 0x000000.
+     *  Can be "high-performance", "low-power" or "default"
      */
-    clearColor?: number;
+    powerPreference?: string;
 
     /**
-     * default is 0.
+     * default is true.
      */
-    clearAlpha?: number;
-
-    devicePixelRatio?: number;
+    depth?: boolean;
 
     /**
      * default is false.
diff --git a/types/thrift/index.d.ts b/types/thrift/index.d.ts
index e4f0e3c1f9..5753828f34 100644
--- a/types/thrift/index.d.ts
+++ b/types/thrift/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for thrift 0.10
-// Project: https://www.npmjs.com/package/thrift
+// Project: http://thrift.apache.org
 // Definitions by: Kamek <https://github.com/kamek-pf>
 //                 Kevin Greene <https://github.com/kevin-greene-ck>
 //                 Jesse Zhang <https://github.com/jessezhang91>
diff --git a/types/timer-machine/index.d.ts b/types/timer-machine/index.d.ts
index 49e63781ed..4c6515e154 100644
--- a/types/timer-machine/index.d.ts
+++ b/types/timer-machine/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for timer-machine 1.1
-// Project: https://github.com/brentburg/timer-machine
+// Project: https://github.com/brentburg/timer-machine, https://github.com/brentburgoyne/timer-machine
 // Definitions by: Dolan Miu <https://github.com/dolanmiu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/tinajs__tina/index.d.ts b/types/tinajs__tina/index.d.ts
index b29ad6bff9..3ffca83574 100644
--- a/types/tinajs__tina/index.d.ts
+++ b/types/tinajs__tina/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @tinajs/tina 1.4
-// Project: https://github.com/tinajs/tina
+// Project: https://github.com/tinajs/tina, https://tina.js.org
 // Definitions by: Jiayu Liu <https://github.com/Jimexist>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/tinajs__tina
 // TypeScript Version: 2.2
diff --git a/types/tinycon/index.d.ts b/types/tinycon/index.d.ts
index 3f385603cc..03d1ce4dc8 100644
--- a/types/tinycon/index.d.ts
+++ b/types/tinycon/index.d.ts
@@ -1,9 +1,10 @@
 // Type definitions for tinycon 0.6
 // Project: https://github.com/tommoor/tinycon
 // Definitions by: Daniel Waxweiler <https://github.com/dwaxweiler>
+//                 Julian Hundeloh <https://github.com/jaulz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export function setBubble(count: number): void;
+export function setBubble(count: number | string | null): void;
 
 export function setOptions(options: TinyconOptions): void;
 
@@ -11,7 +12,7 @@ export interface TinyconOptions {
     abbreviate?: boolean;
     background?: string;
     color?: string;
-    fallback?: boolean;
+    fallback?: boolean | 'force';
     font?: string;
     height?: number;
     width?: number;
diff --git a/types/tinycon/tinycon-tests.ts b/types/tinycon/tinycon-tests.ts
index b4bcc304ac..fb898630e7 100644
--- a/types/tinycon/tinycon-tests.ts
+++ b/types/tinycon/tinycon-tests.ts
@@ -10,4 +10,16 @@ Tinycon.setOptions({
     width: 7
 });
 
+Tinycon.setOptions({
+    abbreviate: false,
+    background: '#549A2F',
+    color: '#ffffff',
+    fallback: 'force',
+    font: '10px arial',
+    height: 9,
+    width: 7
+});
+
 Tinycon.setBubble(7);
+
+Tinycon.setBubble(null);
diff --git a/types/tinymce/index.d.ts b/types/tinymce/index.d.ts
index d342e13647..b38d96d45c 100644
--- a/types/tinymce/index.d.ts
+++ b/types/tinymce/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for TinyMCE 4.5
-// Project: https://github.com/tinymce/tinymce
+// Project: https://github.com/tinymce/tinymce, https://github.com/tinymce/tinymce-dist
 // Definitions by: Martin Duparc <https://github.com/martinduparc>
 //                 Poul Poulsen <https://github.com/ipoul>
 //                 Nico Hartto <https://github.com/nicohartto>
@@ -324,13 +324,13 @@ export interface Settings {
 
 export namespace settings {
   interface Menu {
-    file: MenuItem;
-    edit: MenuItem;
-    insert: MenuItem;
-    view: MenuItem;
-    format: MenuItem;
-    table: MenuItem;
-    tools: MenuItem;
+    file?: MenuItem;
+    edit?: MenuItem;
+    insert?: MenuItem;
+    view?: MenuItem;
+    format?: MenuItem;
+    table?: MenuItem;
+    tools?: MenuItem;
   }
 
   interface MenuItem {
diff --git a/types/titanium/index.d.ts b/types/titanium/index.d.ts
index e26d4aecb4..468eccf08a 100644
--- a/types/titanium/index.d.ts
+++ b/types/titanium/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Titanium 7.3
+// Type definitions for non-npm package Titanium 7.3
 // Project: https://github.com/appcelerator/titanium_mobile
 // Definitions by: Axway Appcelerator <https://github.com/appcelerator>
 //                 Jan Vennemann <https://github.com/janvennemann>
diff --git a/types/tmp/index.d.ts b/types/tmp/index.d.ts
index 90a1deca32..71a0fbaba5 100644
--- a/types/tmp/index.d.ts
+++ b/types/tmp/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for tmp 0.0
-// Project: https://www.npmjs.com/package/tmp
+// Project: http://github.com/raszi/node-tmp
 // Definitions by: Jared Klopper <https://github.com/optical>, Gyusun Yeom <https://github.com/Perlmint>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/topojson-specification/index.d.ts b/types/topojson-specification/index.d.ts
index 764fbd6bae..5175bd9670 100644
--- a/types/topojson-specification/index.d.ts
+++ b/types/topojson-specification/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for topojson-specification 1.0
+// Type definitions for non-npm package topojson-specification 1.0
 // Project: https://github.com/topojson/topojson-specification
 // Definitions by: denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/transliteration/index.d.ts b/types/transliteration/index.d.ts
index 6e74e8d1aa..3bb9793054 100644
--- a/types/transliteration/index.d.ts
+++ b/types/transliteration/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for transliteration 1.6
-// Project: https://github.com/andyhu/transliteration#readme
+// Project: https://github.com/dzcpy/transliteration
 // Definitions by: Anthony Trinh <https://github.com/tony19>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/trezor-connect/index.d.ts b/types/trezor-connect/index.d.ts
index c9c5fb258d..282117efda 100644
--- a/types/trezor-connect/index.d.ts
+++ b/types/trezor-connect/index.d.ts
@@ -249,7 +249,13 @@ export interface Input {
 export interface RegularOutput {
   address: string;
   amount: string;
-  script_type: string;
+  script_type?: string;
+}
+
+export interface InternalOutput {
+  address_n: number[];
+  amount: string;
+  script_type?: string;
 }
 
 export interface SendMaxOutput {
@@ -262,7 +268,7 @@ export interface OpReturnOutput {
   dataHex: string;
 }
 
-export type Output = RegularOutput | SendMaxOutput | OpReturnOutput;
+export type Output = RegularOutput | InternalOutput | SendMaxOutput | OpReturnOutput;
 
 export interface SignTransactionParams extends CommonParams {
   inputs: Input[];
diff --git a/types/tryer/index.d.ts b/types/tryer/index.d.ts
index 44835dc2b2..daf123e0e7 100644
--- a/types/tryer/index.d.ts
+++ b/types/tryer/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for tryer 1.0
-// Project: https://github.com/philbooth/tryer
+// Project: https://gitlab.com/philbooth/tryer
 // Definitions by: Ben Grynhaus <https://github.com/bengry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/twilio-common/index.d.ts b/types/twilio-common/index.d.ts
index 2ad8b73ea4..4a5c40debc 100644
--- a/types/twilio-common/index.d.ts
+++ b/types/twilio-common/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for twilio-common 0.1
-// Project: https://github.com/twilio/twilio-common.js
+// Project: https://github.com/twilio/twilio-common.js, https://twilio.com
 // Definitions by: William Lohan <https://github.com/gatimus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/twilio-video/index.d.ts b/types/twilio-video/index.d.ts
index d285b0197f..9b1d483987 100644
--- a/types/twilio-video/index.d.ts
+++ b/types/twilio-video/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for twilio-video 2.0
-// Project: https://twilio.com/video
+// Project: https://twilio.com/video, https://twilio.com
 // Definitions by: MindDoc <https://github.com/minddocdev>, Darío Blanco <https://github.com/darioblanco>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/twit/index.d.ts b/types/twit/index.d.ts
index a66e75bab7..778a112ee3 100644
--- a/types/twit/index.d.ts
+++ b/types/twit/index.d.ts
@@ -5,6 +5,7 @@
 //                 abraham <https://github.com/abraham>
 //                 siwalik <https://github.com/siwalikm>
 //                 plhery <https://github.com/plhery>
+//                 justGoscha <https://github.com/justgoscha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -263,7 +264,7 @@ declare module 'twit' {
       user_id?: number | string,
       lat?: number,
       long?: number,
-      follow?: boolean | string,
+      follow?: boolean | string | string[],
       include_email?: boolean,
       cursor?: number | string,
       tweet_mode?: string,
diff --git a/types/twit/twit-tests.ts b/types/twit/twit-tests.ts
index 1029bda13c..bfdc870f13 100644
--- a/types/twit/twit-tests.ts
+++ b/types/twit/twit-tests.ts
@@ -11,3 +11,8 @@ t.post('statuses/update', { status: 'hello!' }).then(res => {
     console.log(status.id_str)
     console.log(res.resp.statusCode)
 })
+
+t.stream('statuses/filter', {
+    track: ['#love','#goscha'],
+    follow: ['40436619', '606663038', '14466815']
+  })
diff --git a/types/twitch-ext/index.d.ts b/types/twitch-ext/index.d.ts
index 81bc3d3643..4cac514539 100644
--- a/types/twitch-ext/index.d.ts
+++ b/types/twitch-ext/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for twitch-ext 1.15
+// Type definitions for non-npm package twitch-ext 1.15
 // Project: https://dev.twitch.tv/docs/extensions/reference/#javascript-helper
 // Definitions by: Benedict Etzel <https://github.com/beheh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/two.js/index.d.ts b/types/two.js/index.d.ts
index e6ffee84d2..08eba80123 100644
--- a/types/two.js/index.d.ts
+++ b/types/two.js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for js 0.7
-// Project: https://js.org/
+// Project: https://two.js.org
 // Definitions by: Carlos Precioso <https://github.com/cprecioso>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/ui-router-extras/index.d.ts b/types/ui-router-extras/index.d.ts
index 42f4926e87..9e90d528b4 100644
--- a/types/ui-router-extras/index.d.ts
+++ b/types/ui-router-extras/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ui-router-extras 0.1
-// Project: https://github.com/christopherthielen/ui-router-extras
+// Project: https://github.com/christopherthielen/ui-router-extras, http://christopherthielen.github.io/ui-router-extras
 // Definitions by: Michael Putters <https://github.com/mputters>, Marcel van de Kamp <https://github.com/marcel-k>, Viktor Smirnov <https://github.com/LaserUnicorns>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/uikit/index.d.ts b/types/uikit/index.d.ts
index dff8bb8482..4a95c08225 100644
--- a/types/uikit/index.d.ts
+++ b/types/uikit/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for uikit 2.27
-// Project: http://getuikit.org
+// Project: https://getuikit.com
 // Definitions by: Giovanni Silva <https://github.com/giovannicandido>, Ivo Senner <https://github.com/s0x>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/undertaker/index.d.ts b/types/undertaker/index.d.ts
index 5dc0cc0563..cc5c772f30 100644
--- a/types/undertaker/index.d.ts
+++ b/types/undertaker/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for undertaker 1.2
-// Project: https://github.com/phated/undertaker
+// Project: https://github.com/gulpjs/undertaker
 // Definitions by: Qubo <https://github.com/tkqubo>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/unidecode/index.d.ts b/types/unidecode/index.d.ts
index 1e4be8f43b..9fdd622e2f 100644
--- a/types/unidecode/index.d.ts
+++ b/types/unidecode/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for unidecode 0.1
-// Project: https://github.com/FGRibreau/node-unidecode
+// Project: https://github.com/FGRibreau/node-unidecode, http://blog.fgribreau.com/2012/05/unidecode-for-javascript-nodejs.html
 // Definitions by: Vitor Fernandes <https://github.com/vfernandestoptal>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/uniqid/index.d.ts b/types/uniqid/index.d.ts
index 39eef672a3..f7acc7a2d2 100644
--- a/types/uniqid/index.d.ts
+++ b/types/uniqid/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for uniqid 4.1
-// Project: https://github.com/adamhalasz/uniqid
+// Project: http://github.com/adamhalasz/uniqid
 // Definitions by: idchlife <https://github.com/idchlife>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/uniqid
 
diff --git a/types/unist/index.d.ts b/types/unist/index.d.ts
index 2d7d37e17f..e5e052db14 100644
--- a/types/unist/index.d.ts
+++ b/types/unist/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Unist 2.0
+// Type definitions for non-npm package Unist 2.0
 // Project: https://github.com/syntax-tree/unist
 // Definitions by: bizen241 <https://github.com/bizen241>
 //                 Jun Lu <https://github.com/lujun2>
diff --git a/types/url-parse/index.d.ts b/types/url-parse/index.d.ts
index 8fc22dbfc0..cb3bc75dd5 100644
--- a/types/url-parse/index.d.ts
+++ b/types/url-parse/index.d.ts
@@ -23,6 +23,8 @@ declare namespace URLParse {
         | 'username';
 
     type QueryParser = (query: string) => object;
+
+    type StringifyQuery = (query: object) => string;
 }
 
 interface URLParse {
@@ -40,7 +42,7 @@ interface URLParse {
     readonly slashes: boolean;
     readonly username: string;
     set(part: URLParse.URLPart, value: string | object | number | undefined, fn?: boolean | URLParse.QueryParser): URLParse;
-    toString(): string;
+    toString(stringify?: URLParse.StringifyQuery): string;
 }
 
 declare const URLParse: {
@@ -57,7 +59,7 @@ declare const URLParse: {
     location(url: string): object;
     qs: {
         parse: URLParse.QueryParser;
-        stringify(query: object): string;
+        stringify: URLParse.StringifyQuery;
     };
 };
 
diff --git a/types/urllib/index.d.ts b/types/urllib/index.d.ts
index 7b24fd370b..79139800b2 100644
--- a/types/urllib/index.d.ts
+++ b/types/urllib/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for urllib 2.28
-// Project: http://github.com/node-modules/urllib
+// Project: https://github.com/node-modules/urllib
 // Definitions by: SoraYama <https://github.com/sorayama>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/usb/index.d.ts b/types/usb/index.d.ts
index 9f6037fa1c..ddbb59be3d 100644
--- a/types/usb/index.d.ts
+++ b/types/usb/index.d.ts
@@ -12,258 +12,706 @@ export class LibUSBException extends Error {
   errno: number;
 }
 
+/** Represents a USB device. */
 export class Device {
+  /** Timeout in milliseconds to use for control transfers. */
   timeout: number;
+
+  /** Integer USB device number */
   busNumber: number;
+
+  /** Integer USB device address */
   deviceAddress: number;
+
+  /** Array containing the USB device port numbers, or `undefined` if not supported on this platform. */
   portNumbers: number[];
+
+  /** Object with properties for the fields of the device descriptor. */
   deviceDescriptor: DeviceDescriptor;
+
+  /** Object with properties for the fields of the configuration descriptor. */
   configDescriptor: ConfigDescriptor;
+
+  /** Contains all config descriptors of the device (same structure as .configDescriptor above) */
   allConfigDescriptors: ConfigDescriptor[];
+
+  /** Contains the parent of the device, such as a hub. If there is no parent this property is set to `null`. */
   parent: Device;
+
+  /** List of Interface objects for the interfaces of the default configuration of the device. */
   interfaces: Interface[];
 
   __open(): void;
   __claimInterface(addr: number): void;
 
+  /**
+   * Open the device.
+   * @param defaultConfig
+   */
   open(defaultConfig?: boolean): void;
+
+  /**
+   * Close the device.
+   *
+   * The device must be open to use this method.
+   */
   close(): void;
+
+  /**
+   * Return the interface with the specified interface number.
+   *
+   * The device must be open to use this method.
+   * @param addr
+   */
   interface(addr: number): Interface;
+
+  /**
+   * Perform a control transfer with `libusb_control_transfer`.
+   *
+   * Parameter `data_or_length` can be a integer length for an IN transfer, or a Buffer for an out transfer. The type must match the direction specified in the MSB of bmRequestType.
+   *
+   * The `data` parameter of the callback is always undefined for OUT transfers, or will be passed a Buffer for IN transfers.
+   *
+   * The device must be open to use this method.
+   * @param bmRequestType
+   * @param bRequest
+   * @param wValue
+   * @param wIndex
+   * @param data_or_length
+   * @param callback
+   */
   controlTransfer(bmRequestType: number, bRequest: number, wValue: number, wIndex: number, data_or_length: any, callback: (error?: LibUSBException, buf?: Buffer) => void): Device;
+
+  /**
+   * Perform a control transfer to retrieve a string descriptor
+   *
+   * The device must be open to use this method.
+   * @param desc_index
+   * @param callback
+   */
   getStringDescriptor(desc_index: number, callback: (error?: string, buf?: Buffer) => void): void;
+
+  /**
+   * Perform a control transfer to retrieve an object with properties for the fields of the Binary Object Store descriptor.
+   *
+   * The device must be open to use this method.
+   * @param callback
+   */
   getBosDescriptor(callback: (error?: string, descriptor?: BosDescriptor) => void): void;
+
+  /**
+   * Retrieve a list of Capability objects for the Binary Object Store capabilities of the device.
+   *
+   * The device must be open to use this method.
+   * @param callback
+   */
   getCapabilities(callback: (error?: string, capabilities?: Capability[]) => void): void;
+
+  /**
+   * Set the device configuration to something other than the default (0). To use this, first call `.open(false)` (which tells it not to auto configure),
+   * then before claiming an interface, call this method.
+   *
+   * The device must be open to use this method.
+   * @param desired
+   * @param cb
+   */
   setConfiguration(desired: number, cb: (err?: string) => void): void;
+
+  /**
+   * Performs a reset of the device. Callback is called when complete.
+   *
+   * The device must be open to use this method.
+   * @param callback
+   */
   reset(callback: (err?: string) => void): void;
 }
 
+/** A structure representing the standard USB device descriptor */
 export class DeviceDescriptor {
+  /** Size of this descriptor (in bytes) */
   bLength: number;
+
+  /** Descriptor type. */
   bDescriptorType: number;
+
+  /** USB specification release number in binary-coded decimal. */
   bcdUSB: number;
+
+  /** USB-IF class code for the device. */
   bDeviceClass: number;
+
+  /** USB-IF subclass code for the device, qualified by the bDeviceClass value. */
   bDeviceSubClass: number;
+
+  /** USB-IF protocol code for the device, qualified by the bDeviceClass and bDeviceSubClass values. */
   bDeviceProtocol: number;
+
+  /** Maximum packet size for endpoint 0. */
   bMaxPacketSize0: number;
+
+  /** USB-IF vendor ID. */
   idVendor: number;
+
+  /** USB-IF product ID. */
   idProduct: number;
+
+  /** Device release number in binary-coded decimal. */
   bcdDevice: number;
+
+  /** Index of string descriptor describing manufacturer. */
   iManufacturer: number;
+
+  /** Index of string descriptor describing product. */
   iProduct: number;
+
+  /** Index of string descriptor containing device serial number. */
   iSerialNumber: number;
+
+  /** Number of possible configurations. */
   bNumConfigurations: number;
 }
 
+/** A structure representing the standard USB configuration descriptor */
 export class ConfigDescriptor {
+  /** Size of this descriptor (in bytes) */
   bLength: number;
+
+  /** Descriptor type. */
   bDescriptorType: number;
+
+  /** Total length of data returned for this configuration. */
   wTotalLength: number;
+
+  /** Number of interfaces supported by this configuration. */
   bNumInterfaces: number;
+
+  /** Identifier value for this configuration. */
   bConfigurationValue: number;
+
+  /** Index of string descriptor describing this configuration. */
   iConfiguration: number;
+
+  /** Configuration characteristics. */
   bmAttributes: number;
+
+  /** Maximum power consumption of the USB device from this bus in this configuration when the device is fully operation. */
   bMaxPower: number;
+
+  /** Extra descriptors. */
   extra: Buffer;
+
+  /** Array of interfaces supported by this configuration. */
   interfaces: InterfaceDescriptor[][];
 }
 
+/** A structure representing the Binary Device Object Store (BOS) descriptor */
 export class BosDescriptor {
+  /** Size of this descriptor (in bytes) */
   bLength: number;
+
+  /** Descriptor type. */
   bDescriptorType: number;
+
+  /** Length of this descriptor and all of its sub descriptors. */
   wTotalLength: number;
+
+  /** The number of separate device capability descriptors in the BOS. */
   bNumDeviceCaps: number;
+
+  /** Device Capability Descriptors */
   capabilities: CapabilityDescriptor[];
 }
 
+/** A generic representation of a BOS Device Capability descriptor */
 export class CapabilityDescriptor {
+  /** Size of this descriptor (in bytes) */
   bLength: number;
+
+  /** Descriptor type. */
   bDescriptorType: number;
+
+  /** Device Capability type. */
   bDevCapabilityType: number;
+
+  /** Device Capability data (bLength - 3 bytes) */
   dev_capability_data: Buffer;
 }
 
 export class Capability {
+  /** Object with fields from the capability descriptor -- see libusb documentation or USB spec. */
   descriptor: CapabilityDescriptor;
+
+  /** Integer capability type. */
   type: number;
+
+  /** Buffer capability data. */
   data: Buffer;
 }
 
 export class Interface {
+  /** Integer interface number. */
   interfaceNumber: number;
+
+  /** Integer alternate setting number. */
   altSetting: number;
+
+  /** Object with fields from the interface descriptor -- see libusb documentation or USB spec. */
   descriptor: InterfaceDescriptor;
+
+  /** List of endpoints on this interface: InEndpoint and OutEndpoint objects. */
   endpoints: Endpoint[];
+
   constructor(device: Device, id: number);
+
+  /**
+   * Claims the interface. This method must be called before using any endpoints of this interface.
+   *
+   * The device must be open to use this method.
+   */
   claim(): void;
+
+  /**
+   * Releases the interface and resets the alternate setting. Calls callback when complete.
+   *
+   * It is an error to release an interface with pending transfers.
+   *
+   * The device must be open to use this method.
+   * @param cb
+   */
   release(cb?: (err?: string) => void): void;
+
+  /**
+   * Releases the interface and resets the alternate setting. Calls callback when complete.
+   *
+   * It is an error to release an interface with pending transfers. If the optional closeEndpoints
+   * parameter is true, any active endpoint streams are stopped (see `Endpoint.stopStream`),
+   * and the interface is released after the stream transfers are cancelled. Transfers submitted
+   * individually with `Endpoint.transfer` are not affected by this parameter.
+   *
+   * The device must be open to use this method.
+   * @param closeEndpoints
+   * @param cb
+   */
   release(closeEndpoints?: boolean, cb?: (err?: string) => void): void;
+
+  /**
+   * Returns `false` if a kernel driver is not active; `true` if active.
+   *
+   * The device must be open to use this method.
+   */
   isKernelDriverActive(): boolean;
+
+  /**
+   * Detaches the kernel driver from the interface.
+   *
+   * The device must be open to use this method.
+   */
   detachKernelDriver(): number;
+
+  /**
+   * Re-attaches the kernel driver for the interface.
+   *
+   * The device must be open to use this method.
+   */
   attachKernelDriver(): number;
+
+  /**
+   * Sets the alternate setting. It updates the `interface.endpoints` array to reflect the endpoints found in the alternate setting.
+   *
+   * The device must be open to use this method.
+   * @param altSetting
+   * @param cb
+   */
   setAltSetting(altSetting: number, cb: (err?: string) => void): void;
+
+  /**
+   * Return the InEndpoint or OutEndpoint with the specified address.
+   *
+   * The device must be open to use this method.
+   * @param addr
+   */
   endpoint(addr: number): Endpoint;
 }
 
+/** A structure representing the standard USB interface descriptor */
 export class InterfaceDescriptor {
+  /** Size of this descriptor (in bytes) */
   bLength: number;
+
+  /** Descriptor type. */
   bDescriptorType: number;
+
+  /** Number of this interface. */
   bInterfaceNumber: number;
+
+  /** Value used to select this alternate setting for this interface. */
   bAlternateSetting: number;
+
+  /** Number of endpoints used by this interface (excluding the control endpoint). */
   bNumEndpoints: number;
+
+  /** USB-IF class code for this interface. */
   bInterfaceClass: number;
+
+  /** USB-IF subclass code for this interface, qualified by the bInterfaceClass value. */
   bInterfaceSubClass: number;
+
+  /** USB-IF protocol code for this interface, qualified by the bInterfaceClass and bInterfaceSubClass values. */
   bInterfaceProtocol: number;
+
+  /** Index of string descriptor describing this interface. */
   iInterface: number;
+
+  /** Extra descriptors. */
   extra: Buffer;
+
+  /** Array of endpoint descriptors. */
   endpoints: EndpointDescriptor[];
 }
 
+/** Common base for InEndpoint and OutEndpoint. */
 export interface Endpoint extends EventEmitter {
+  /** Endpoint direction: `"in"` or `"out"`. */
   direction: string;
+
+  /** Endpoint type: `usb.LIBUSB_TRANSFER_TYPE_BULK`, `usb.LIBUSB_TRANSFER_TYPE_INTERRUPT`, or `usb.LIBUSB_TRANSFER_TYPE_ISOCHRONOUS`. */
   transferType: number;
+
+  /** Sets the timeout in milliseconds for transfers on this endpoint. The default, `0`, is infinite timeout. */
   timeout: number;
+
+  /** Object with fields from the endpoint descriptor -- see libusb documentation or USB spec. */
   descriptor: EndpointDescriptor;
 }
 
+/** Endpoints in the IN direction (device->PC) have this type. */
 export class InEndpoint extends EventEmitter implements Endpoint {
   direction: string;
   transferType: number;
   timeout: number;
   descriptor: EndpointDescriptor;
+
   constructor(device: Device, descriptor: EndpointDescriptor);
+
+  /**
+   * Perform a transfer to read data from the endpoint.
+   *
+   * If length is greater than maxPacketSize, libusb will automatically split the transfer in multiple packets, and you will receive one callback with all data once all packets are complete.
+   *
+   * `this` in the callback is the InEndpoint object.
+   *
+   * The device must be open to use this method.
+   * @param length
+   * @param callback
+   */
   transfer(length: number, callback: (error: LibUSBException, data: Buffer) => void): InEndpoint;
+
+  /**
+   * Start polling the endpoint.
+   *
+   * The library will keep `nTransfers` transfers of size `transferSize` pending in the kernel at all times to ensure continuous data flow.
+   * This is handled by the libusb event thread, so it continues even if the Node v8 thread is busy. The `data` and `error` events are emitted as transfers complete.
+   *
+   * The device must be open to use this method.
+   * @param nTransfers
+   * @param transferSize
+   */
   startPoll(nTransfers?: number, transferSize?: number): void;
+
+  /**
+   * Stop polling.
+   *
+   * Further data may still be received. The `end` event is emitted and the callback is called once all transfers have completed or canceled.
+   *
+   * The device must be open to use this method.
+   * @param cb
+   */
   stopPoll(cb?: () => void): void;
 }
 
+/** Endpoints in the OUT direction (PC->device) have this type. */
 export class OutEndpoint extends EventEmitter implements Endpoint {
   direction: string;
   transferType: number;
   timeout: number;
   descriptor: EndpointDescriptor;
+
   constructor(device: Device, descriptor: EndpointDescriptor);
+
+  /**
+   * Perform a transfer to write `data` to the endpoint.
+   *
+   * If length is greater than maxPacketSize, libusb will automatically split the transfer in multiple packets, and you will receive one callback once all packets are complete.
+   *
+   * `this` in the callback is the OutEndpoint object.
+   *
+   * The device must be open to use this method.
+   * @param buffer
+   * @param cb
+   */
   transfer(buffer: Buffer, cb: (err?: LibUSBException) => void): OutEndpoint;
   transferWithZLP(buf: Buffer, cb: (err?: LibUSBException) => void): void;
 }
 
+/** A structure representing the standard USB endpoint descriptor */
 export class EndpointDescriptor {
+  /** Size of this descriptor (in bytes) */
   bLength: number;
+
+  /** Descriptor type. */
   bDescriptorType: number;
+
+  /** The address of the endpoint described by this descriptor. */
   bEndpointAddress: number;
+
+  /** Attributes which apply to the endpoint when it is configured using the bConfigurationValue. */
   bmAttributes: number;
+
+  /** Maximum packet size this endpoint is capable of sending/receiving. */
   wMaxPacketSize: number;
+
+  /** Interval for polling endpoint for data transfers. */
   bInterval: number;
+
+  /** For audio devices only: the rate at which synchronization feedback is provided. */
   bRefresh: number;
+
+  /** For audio devices only: the address if the synch endpoint. */
   bSynchAddress: number;
+
+  /**
+   * Extra descriptors.
+   *
+   * If libusb encounters unknown endpoint descriptors, it will store them here, should you wish to parse them.
+   */
   extra: Buffer;
 }
 
+/**
+ * Convenience method to get the first device with the specified VID and PID, or `undefined` if no such device is present.
+ * @param vid
+ * @param pid
+ */
 export function findByIds(vid: number, pid: number): Device;
+
+/**
+ * Adds a callback to an event handler.
+ * @param event The event to add to
+ * @param callback The callback to add
+ */
 export function on(event: string, callback: (device: Device) => void): void;
+
+/**
+ * Removes a callback from an event handler
+ * @param event The event to remove from
+ * @param callback The callback to remove
+ */
 export function removeListener(event: string, callback: (device: Device) => void): void;
+
+/**
+ * Return a list of `Device` objects for the USB devices attached to the system.
+ */
 export function getDeviceList(): Device[];
+
+/**
+ * Set the libusb debug level (between 0 and 4)
+ * @param level libusb debug level (between 0 and 4)
+ */
 export function setDebugLevel(level: number): void;
 
+/**
+ * In the context of a \ref libusb_device_descriptor "device descriptor",
+ * this bDeviceClass value indicates that each interface specifies its
+ * own class information and all interfaces operate independently.
+ */
 export const LIBUSB_CLASS_PER_INTERFACE: number;
+/** Audio class */
 export const LIBUSB_CLASS_AUDIO: number;
+/** Communications class */
 export const LIBUSB_CLASS_COMM: number;
+/** Human Interface Device class */
 export const LIBUSB_CLASS_HID: number;
+/** Printer class */
 export const LIBUSB_CLASS_PRINTER: number;
+/** Image class */
 export const LIBUSB_CLASS_PTP: number;
+/** Mass storage class */
 export const LIBUSB_CLASS_MASS_STORAGE: number;
+/** Hub class */
 export const LIBUSB_CLASS_HUB: number;
+/** Data class */
 export const LIBUSB_CLASS_DATA: number;
+/** Wireless class */
 export const LIBUSB_CLASS_WIRELESS: number;
+/** Application class */
 export const LIBUSB_CLASS_APPLICATION: number;
+/** Class is vendor-specific */
 export const LIBUSB_CLASS_VENDOR_SPEC: number;
+
 // libusb_standard_request
+/** Request status of the specific recipient */
 export const LIBUSB_REQUEST_GET_STATUS: number;
+/** Clear or disable a specific feature */
 export const LIBUSB_REQUEST_CLEAR_FEATURE: number;
+/** Set or enable a specific feature */
 export const LIBUSB_REQUEST_SET_FEATURE: number;
+/** Set device address for all future accesses */
 export const LIBUSB_REQUEST_SET_ADDRESS: number;
+/** Get the specified descriptor */
 export const LIBUSB_REQUEST_GET_DESCRIPTOR: number;
+/** Used to update existing descriptors or add new descriptors */
 export const LIBUSB_REQUEST_SET_DESCRIPTOR: number;
+/** Get the current device configuration value */
 export const LIBUSB_REQUEST_GET_CONFIGURATION: number;
+/** Set device configuration */
 export const LIBUSB_REQUEST_SET_CONFIGURATION: number;
+/** Return the selected alternate setting for the specified interface */
 export const LIBUSB_REQUEST_GET_INTERFACE: number;
+/** Select an alternate interface for the specified interface */
 export const LIBUSB_REQUEST_SET_INTERFACE: number;
+/** Set then report an endpoint's synchronization frame */
 export const LIBUSB_REQUEST_SYNCH_FRAME: number;
+
 // libusb_descriptor_type
+/** Device descriptor. See libusb_device_descriptor. */
 export const LIBUSB_DT_DEVICE: number;
+/** Configuration descriptor. See libusb_config_descriptor. */
 export const LIBUSB_DT_CONFIG: number;
+/** String descriptor */
 export const LIBUSB_DT_STRING: number;
+/** Interface descriptor. See libusb_interface_descriptor. */
 export const LIBUSB_DT_INTERFACE: number;
+/** Endpoint descriptor. See libusb_endpoint_descriptor. */
 export const LIBUSB_DT_ENDPOINT: number;
+/** HID descriptor */
 export const LIBUSB_DT_HID: number;
+/** HID report descriptor */
 export const LIBUSB_DT_REPORT: number;
+/** Physical descriptor */
 export const LIBUSB_DT_PHYSICAL: number;
+/** Hub descriptor */
 export const LIBUSB_DT_HUB: number;
+
 // libusb_endpoint_direction
+/** In: device-to-host */
 export const LIBUSB_ENDPOINT_IN: number;
+/** Out: host-to-device */
 export const LIBUSB_ENDPOINT_OUT: number;
+
 // libusb_transfer_type
+/** Control endpoint */
 export const LIBUSB_TRANSFER_TYPE_CONTROL: number;
+/** Isochronous endpoint */
 export const LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: number;
+/** Bulk endpoint */
 export const LIBUSB_TRANSFER_TYPE_BULK: number;
+/** Interrupt endpoint */
 export const LIBUSB_TRANSFER_TYPE_INTERRUPT: number;
+
 // libusb_iso_sync_type
+/** No synchronization */
 export const LIBUSB_ISO_SYNC_TYPE_NONE: number;
+/** Asynchronous */
 export const LIBUSB_ISO_SYNC_TYPE_ASYNC: number;
+/** Adaptive */
 export const LIBUSB_ISO_SYNC_TYPE_ADAPTIVE: number;
+/** Synchronous */
 export const LIBUSB_ISO_SYNC_TYPE_SYNC: number;
+
 // libusb_iso_usage_type
+/** Data endpoint */
 export const LIBUSB_ISO_USAGE_TYPE_DATA: number;
+/** Feedback endpoint */
 export const LIBUSB_ISO_USAGE_TYPE_FEEDBACK: number;
+/** Implicit feedback Data endpoint */
 export const LIBUSB_ISO_USAGE_TYPE_IMPLICIT: number;
+
 // libusb_transfer_status
+/**
+ * Transfer completed without error. Note that this does not indicate
+ * that the entire amount of requested data was transferred.
+ */
 export const LIBUSB_TRANSFER_COMPLETED: number;
+/** Transfer failed */
 export const LIBUSB_TRANSFER_ERROR: number;
+/** Transfer timed out */
 export const LIBUSB_TRANSFER_TIMED_OUT: number;
+/** Transfer was cancelled */
 export const LIBUSB_TRANSFER_CANCELLED: number;
+/**
+ * For bulk/interrupt endpoints: halt condition detected (endpoint
+ * stalled). For control endpoints: control request not supported.
+ */
 export const LIBUSB_TRANSFER_STALL: number;
+/** Device was disconnected */
 export const LIBUSB_TRANSFER_NO_DEVICE: number;
+/** Device sent more data than requested */
 export const LIBUSB_TRANSFER_OVERFLOW: number;
+
 // libusb_transfer_flags
+/** Report short frames as errors */
 export const LIBUSB_TRANSFER_SHORT_NOT_OK: number;
+/**
+ * Automatically free() transfer buffer during libusb_free_transfer().
+ * Note that buffers allocated with libusb_dev_mem_alloc() should not
+ * be attempted freed in this way, since free() is not an appropriate
+ * way to release such memory.
+ */
 export const LIBUSB_TRANSFER_FREE_BUFFER: number;
+/**
+ * Automatically call libusb_free_transfer() after callback returns.
+ * If this flag is set, it is illegal to call libusb_free_transfer()
+ * from your transfer callback, as this will result in a double-free
+ * when this flag is acted upon.
+ */
 export const LIBUSB_TRANSFER_FREE_TRANSFER: number;
+
 // libusb_request_type
+/** Standard */
 export const LIBUSB_REQUEST_TYPE_STANDARD: number;
+/** Class */
 export const LIBUSB_REQUEST_TYPE_CLASS: number;
+/** Vendor */
 export const LIBUSB_REQUEST_TYPE_VENDOR: number;
+/** Reserved */
 export const LIBUSB_REQUEST_TYPE_RESERVED: number;
+
 // libusb_request_recipient
+/** Device */
 export const LIBUSB_RECIPIENT_DEVICE: number;
+/** Interface */
 export const LIBUSB_RECIPIENT_INTERFACE: number;
+/** Endpoint */
 export const LIBUSB_RECIPIENT_ENDPOINT: number;
+/** Other */
 export const LIBUSB_RECIPIENT_OTHER: number;
 
 export const LIBUSB_CONTROL_SETUP_SIZE: number;
 
 // libusb_error
-// Input/output error
+/** Input/output error */
 export const LIBUSB_ERROR_IO: number;
-// Invalid parameter
+/** Invalid parameter */
 export const LIBUSB_ERROR_INVALID_PARAM: number;
-// Access denied (insufficient permissions)
+/** Access denied (insufficient permissions) */
 export const LIBUSB_ERROR_ACCESS: number;
-// No such device (it may have been disconnected)
+/** No such device (it may have been disconnected) */
 export const LIBUSB_ERROR_NO_DEVICE: number;
-// Entity not found
+/** Entity not found */
 export const LIBUSB_ERROR_NOT_FOUND: number;
-// Resource busy
+/** Resource busy */
 export const LIBUSB_ERROR_BUSY: number;
-// Operation timed out
+/** Operation timed out */
 export const LIBUSB_ERROR_TIMEOUT: number;
-// Overflow
+/** Overflow */
 export const LIBUSB_ERROR_OVERFLOW: number;
-// Pipe error
+/** Pipe error */
 export const LIBUSB_ERROR_PIPE: number;
-// System call interrupted (perhaps due to signal)
+/** System call interrupted (perhaps due to signal) */
 export const LIBUSB_ERROR_INTERRUPTED: number;
-// Insufficient memory
+/** Insufficient memory */
 export const LIBUSB_ERROR_NO_MEM: number;
-// Operation not supported or unimplemented on this platform
+/** Operation not supported or unimplemented on this platform */
 export const LIBUSB_ERROR_NOT_SUPPORTED: number;
-// Other error
+/** Other error */
 export const LIBUSB_ERROR_OTHER: number;
diff --git a/types/use-persisted-state/index.d.ts b/types/use-persisted-state/index.d.ts
new file mode 100644
index 0000000000..76b0271986
--- /dev/null
+++ b/types/use-persisted-state/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for use-persisted-state 0.3
+// Project: https://github.com/donavon/use-persisted-state#readme
+// Definitions by: Karol Majewski <https://github.com/karol-majewski>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+import { useState } from 'react';
+
+declare function createPersistedState(key: string, provider?: Pick<Storage, 'getItem' | 'setItem'>): typeof useState;
+
+export as namespace createPersistedState;
+export default createPersistedState;
diff --git a/types/use-persisted-state/tsconfig.json b/types/use-persisted-state/tsconfig.json
new file mode 100644
index 0000000000..e6765dca73
--- /dev/null
+++ b/types/use-persisted-state/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",
+        "use-persisted-state-tests.ts"
+    ]
+}
diff --git a/types/use-persisted-state/tslint.json b/types/use-persisted-state/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/use-persisted-state/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/use-persisted-state/use-persisted-state-tests.ts b/types/use-persisted-state/use-persisted-state-tests.ts
new file mode 100644
index 0000000000..74c7a8eee7
--- /dev/null
+++ b/types/use-persisted-state/use-persisted-state-tests.ts
@@ -0,0 +1,45 @@
+import createPersistedState from 'use-persisted-state';
+import { useState } from 'react';
+
+/**
+ * Only the first argument is required.
+ */
+createPersistedState('myKey');
+
+/**
+ * The generated hook conforms to the same signature as `React.useState`.
+ */
+const myHook: typeof useState = createPersistedState('myKey');
+
+/**
+ * Custom storage provider can be passed as the second argument.
+ */
+createPersistedState('myKey', localStorage);
+createPersistedState('myKey', sessionStorage);
+
+/**
+ * The provider is similar to the `Storage` interface,
+ * but cares only about `getItem` and `setItem` methods.
+ */
+const { getItem, setItem } = localStorage;
+createPersistedState('myKey', { getItem, setItem });
+
+/**
+ * At least one argument must be provided.
+ */
+createPersistedState(); // $ExpectError
+
+/**
+ * The `key` argument must be of type `string`.
+ */
+createPersistedState(1);               // $ExpectError
+createPersistedState({});              // $ExpectError
+createPersistedState(Symbol.iterator); // $ExpectError
+createPersistedState(undefined);       // $ExpectError
+
+/**
+ * The `provider` argument, when passed, must partially implement `Storage`.
+ */
+createPersistedState('myKey', { });                               // $ExpectError
+createPersistedState('myKey', { getItem: localStorage.getItem }); // $ExpectError
+createPersistedState('myKey', { setItem: localStorage.setItem }); // $ExpectError
diff --git a/types/use-set-interval/index.d.ts b/types/use-set-interval/index.d.ts
new file mode 100644
index 0000000000..652d1a4920
--- /dev/null
+++ b/types/use-set-interval/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for use-set-interval 1.0
+// Project: https://reacthooks.org/use-set-interval
+// Definitions by: Christian Rackerseder <https://github.com/screendriver>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/**
+ * A React Hook (using useEffect) which uses window.setInterval().
+ * @param fn a function to execute
+ * @param delay the delay between executions in milliseconds
+ */
+export default function useSetInterval(fn: () => void, delay: number): void;
diff --git a/types/use-set-interval/tsconfig.json b/types/use-set-interval/tsconfig.json
new file mode 100644
index 0000000000..b319b0c356
--- /dev/null
+++ b/types/use-set-interval/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "use-set-interval-tests.ts"
+    ]
+}
diff --git a/types/use-set-interval/tslint.json b/types/use-set-interval/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/use-set-interval/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/use-set-interval/use-set-interval-tests.ts b/types/use-set-interval/use-set-interval-tests.ts
new file mode 100644
index 0000000000..44bd223602
--- /dev/null
+++ b/types/use-set-interval/use-set-interval-tests.ts
@@ -0,0 +1,5 @@
+import { useState } from 'react';
+import useSetInterval from 'use-set-interval';
+
+const [ count, setCount ] = useState(0);
+useSetInterval(() => setCount(count + 1), 1000);
diff --git a/types/use-set-timeout/index.d.ts b/types/use-set-timeout/index.d.ts
new file mode 100644
index 0000000000..e7b4fd4408
--- /dev/null
+++ b/types/use-set-timeout/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for use-set-timeout 1.0
+// Project: https://reacthooks.org/use-set-timeout
+// Definitions by: Christian Rackerseder <https://github.com/screendriver>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/**
+ * A React Hook (using useEffect) which uses window.setTimeout().
+ * @param fn a function to execute
+ * @param delay the delay in milliseconds
+ */
+export default function useSetTimeout(fn: () => void, delay: number): void;
diff --git a/types/use-set-timeout/tsconfig.json b/types/use-set-timeout/tsconfig.json
new file mode 100644
index 0000000000..54903cccc8
--- /dev/null
+++ b/types/use-set-timeout/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "use-set-timeout-tests.ts"
+    ]
+}
diff --git a/types/use-set-timeout/tslint.json b/types/use-set-timeout/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/use-set-timeout/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/use-set-timeout/use-set-timeout-tests.ts b/types/use-set-timeout/use-set-timeout-tests.ts
new file mode 100644
index 0000000000..956ffbcb53
--- /dev/null
+++ b/types/use-set-timeout/use-set-timeout-tests.ts
@@ -0,0 +1,5 @@
+import { useState } from 'react';
+import useSetTimeout from 'use-set-timeout';
+
+const [ triggered, setTriggered ] = useState(false);
+useSetTimeout(() => setTriggered(true), 5 * 1000);
diff --git a/types/user-event/index.d.ts b/types/user-event/index.d.ts
new file mode 100644
index 0000000000..4c4bebb1f8
--- /dev/null
+++ b/types/user-event/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for user-event 1.4
+// Project: https://github.com/Gpx/user-event#readme
+// Definitions by: Wu Haotian <https://github.com/whtsky>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface UserOpts {
+    allAtOnce?: boolean;
+    delay?: number;
+}
+declare const userEvent: {
+    click: (element: Element | Window) => void;
+    dblClick: (element: Element | Window) => void;
+    type: (
+        element: Element | Window,
+        text: string,
+        userOpts?: UserOpts
+    ) => Promise<void>;
+};
+
+export default userEvent;
diff --git a/types/user-event/tsconfig.json b/types/user-event/tsconfig.json
new file mode 100644
index 0000000000..38348b184c
--- /dev/null
+++ b/types/user-event/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["dom", "es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "user-event-tests.ts"]
+}
diff --git a/types/user-event/tslint.json b/types/user-event/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/user-event/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/user-event/user-event-tests.ts b/types/user-event/user-event-tests.ts
new file mode 100644
index 0000000000..0ecf6eb439
--- /dev/null
+++ b/types/user-event/user-event-tests.ts
@@ -0,0 +1,11 @@
+import userEvent, { UserOpts } from "user-event";
+
+userEvent.click(document.body); // $ExpectType void
+userEvent.dblClick(window); // $ExpectType void
+userEvent.type(document.body, "s"); // $ExpectType Promise<void>
+userEvent.type(document.body, "s", {}); // $ExpectType Promise<void>
+userEvent.type(document.body, "s", { delay: 5000 }); // $ExpectType Promise<void>
+userEvent.type(document.body, "s", { allAtOnce: true }); // $ExpectType Promise<void>
+userEvent.type(document.body, "s", { delay: 1000, allAtOnce: false }); // $ExpectType Promise<void>
+
+const u: UserOpts = { delay: 20 };
diff --git a/types/utif/index.d.ts b/types/utif/index.d.ts
new file mode 100644
index 0000000000..2ac2ff6242
--- /dev/null
+++ b/types/utif/index.d.ts
@@ -0,0 +1,72 @@
+// Type definitions for utif 3.0
+// Project: https://github.com/photopea/UTIF.js
+// Definitions by: Jan Pesa <https://github.com/smajl>
+//                 Naveen Kumar Sangi <https://github.com/nkprince007>
+//                 Massimiliano Caniparoli <https://github.com/massic80>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import 'node';
+
+export as namespace UTIF;
+
+export type TiffTag = string[] | number[];
+
+/**
+ * Each IFD is an object, keys are "tXYZ" (XYZ is a TIFF tag number), values are values of these tags.
+ * You can get the the dimension (and other properties, "metadata") of the image without decompressing pixel data.
+ * For more information on what each tag means, refer https://github.com/photopea/UTIF.js/blob/master/UTIF.js#L742 or TIFF 6 specification.
+ */
+// tslint:disable-next-line:interface-name
+export interface IFD {
+	[property: string]: TiffTag | number | Uint8Array;
+	data: Uint8Array;
+	width: number;
+	height: number;
+}
+
+/**
+ * Returns an array of "IFDs" (image file directories).
+ *
+ * @param buffer A Buffer or ArrayBuffer containing TIFF or EXIF data.
+ */
+export function decode(buffer: Buffer | ArrayBuffer): IFD[];
+
+/**
+ * If there is an image inside the IFD, it is decoded and three new properties are added to the IFD: width, height and data.
+ * Note: TIFF files may have various number of channels and various color depth. The interpretation of data depends on many tags (see the TIFF 6 specification).
+ *
+ * @param buffer A Buffer or ArrayBuffer containing TIFF or EXIF data
+ * @param ifd The element of the output of UTIF.decode()
+ */
+export function decodeImage(buffer: Buffer | ArrayBuffer, ifd: IFD): void;
+
+/**
+ * Returns Uint8Array of the image in RGBA format, 8 bits per channel (ready to use in context2d.putImageData() etc.)
+ *
+ * @param ifd An image file directory
+ */
+export function toRGBA8(ifd: IFD): Uint8Array;
+
+/**
+ * Returns an ArrayBuffer of the binary TIFF file.
+ * Note: No compression available right now.
+ *
+ * @param rgba A Uint8Array containing RGBA pixel data.
+ * @param w Width of the image.
+ * @param h Height of the image.
+ * @param metadata [optional] The image file directory which should be encoded.
+ */
+export function encodeImage(rgba: Uint8Array, w: number, h: number, metadata?: IFD): ArrayBuffer;
+
+/**
+ * Returns ArrayBuffer of binary data which can be used to encode EXIF data.
+ *
+ * @param ifds The array of IFDs (image file directories) to be encoded.
+ */
+export function encode(ifds: IFD[]): ArrayBuffer;
+
+/**
+ * Replaces all Image elements in the document with Canvas elements.
+ * The attributes "id", "class" and "style" will be copied from the original Image to the new Canvas.
+ */
+export function replaceIMG(): void;
diff --git a/types/utif/tsconfig.json b/types/utif/tsconfig.json
new file mode 100644
index 0000000000..cd4c8aa8fe
--- /dev/null
+++ b/types/utif/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "utif-tests.ts"
+    ]
+}
diff --git a/types/utif/tslint.json b/types/utif/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/utif/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/utif/utif-tests.ts b/types/utif/utif-tests.ts
new file mode 100644
index 0000000000..4f30237ed9
--- /dev/null
+++ b/types/utif/utif-tests.ts
@@ -0,0 +1,15 @@
+import * as UTIF from "utif";
+
+// $ExpectType IFD[]
+const IFDs = UTIF.decode(new ArrayBuffer(64));
+// $ExpectType Uint8Array
+const rgba = UTIF.toRGBA8(IFDs[0]);
+
+// $ExpectType ArrayBuffer
+UTIF.encodeImage(rgba, 8, 8);
+// $ExpectType ArrayBuffer
+UTIF.encode(IFDs);
+// $ExpectType void
+UTIF.decodeImage(new ArrayBuffer(64), IFDs[0]);
+// $ExpectType void
+UTIF.replaceIMG();
diff --git a/types/uuid-js/index.d.ts b/types/uuid-js/index.d.ts
index 329c53a14f..efc9f75786 100644
--- a/types/uuid-js/index.d.ts
+++ b/types/uuid-js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for uuid-js 0.7
-// Project: https://github.com/pnegri/uuid-js
+// Project: http://github.com/pnegri/uuid-js
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/uuid-validate/index.d.ts b/types/uuid-validate/index.d.ts
index 80c48feea8..e73b2a3af5 100644
--- a/types/uuid-validate/index.d.ts
+++ b/types/uuid-validate/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for uuid-validate 0.0
-// Project: https://github.com/mixer/uuid-validate
+// Project: https://github.com/mixer/uuid-validate, https://github.com/watchbeam/uuid-validate
 // Definitions by: Hiromi Shikata <https://github.com/HiromiShikata>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/uuidv4/index.d.ts b/types/uuidv4/index.d.ts
new file mode 100644
index 0000000000..44f8fc4efe
--- /dev/null
+++ b/types/uuidv4/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for uuidv4 2.0
+// Project: https://github.com/thenativeweb/uuidv4#readme
+// Definitions by: Rindo Hinase <https://github.com/Hinaser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = uuidv4;
+
+declare function uuidv4(): string;
+
+declare namespace uuidv4 {
+    type EmptyUUIDv4 = '00000000-0000-0000-0000-000000000000';
+
+    function is(value: string): boolean;
+
+    function empty(): string;
+
+    function fromString(text: string): string;
+}
diff --git a/types/uuidv4/tsconfig.json b/types/uuidv4/tsconfig.json
new file mode 100644
index 0000000000..4ae973d9cb
--- /dev/null
+++ b/types/uuidv4/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",
+        "uuidv4-tests.ts"
+    ]
+}
diff --git a/types/uuidv4/tslint.json b/types/uuidv4/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/uuidv4/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/uuidv4/uuidv4-tests.ts b/types/uuidv4/uuidv4-tests.ts
new file mode 100644
index 0000000000..0c5f915d95
--- /dev/null
+++ b/types/uuidv4/uuidv4-tests.ts
@@ -0,0 +1,13 @@
+import * as uuidv4 from 'uuidv4'; // uuidv4 is () => string
+
+// $ExpectType string
+uuidv4();
+
+// $ExpectType string
+uuidv4.empty();
+
+// $ExpectType boolean
+uuidv4.is('00000000-0000-0000-0000-000000000000');
+
+// $ExpectType string
+uuidv4.fromString("test");
diff --git a/types/v-chart-plugin/index.d.ts b/types/v-chart-plugin/index.d.ts
index d7c0e6659d..c2f8352fd8 100644
--- a/types/v-chart-plugin/index.d.ts
+++ b/types/v-chart-plugin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for v-chart-plugin 0.2
-// Project: https://github.com/ignoreintuition/v-chart-plugin
+// Project: https://github.com/ignoreintuition/v-chart-plugin, https://resurgencewebdesign.com/v-chart
 // Definitions by: Nate Mara <https://github.com/natemara>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/v8flags/index.d.ts b/types/v8flags/index.d.ts
index 409b51d60b..a4f6f670b0 100644
--- a/types/v8flags/index.d.ts
+++ b/types/v8flags/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for v8flags 3.1
-// Project: https://github.com/tkellen/node-v8flags
+// Project: https://github.com/gulpjs/v8flags
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/vanilla-modal/index.d.ts b/types/vanilla-modal/index.d.ts
index 41356846e3..e0b3d6e5d1 100644
--- a/types/vanilla-modal/index.d.ts
+++ b/types/vanilla-modal/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for vanilla-modal 1.6
-// Project: https://github.com/benceg/vanilla-modal
+// Project: https://github.com/benceg/vanilla-modal, https://github.com/thephuse/vanilla-modal
 // Definitions by: Sam Nau <https://github.com/samnau>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/victory/index.d.ts b/types/victory/index.d.ts
index 49cfcf7a83..f5c67995da 100644
--- a/types/victory/index.d.ts
+++ b/types/victory/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Victory 31.0
-// Project: https://github.com/FormidableLabs/victory
+// Project: https://github.com/FormidableLabs/victory, https://formidable.com/open-source/victory
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 //                 snerks <https://github.com/snerks>
 //                 Krzysztof Cebula <https://github.com/Havret>
@@ -33,17 +33,20 @@ declare module "victory" {
     "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;
+  type StringOrNumberOrCallback =
+    | string
+    | number
+    | ((datum: any, active: boolean) => string | number);
+  type NumberOrCallback = ((datum: any, active: boolean) => number) | number;
 
+  type VictoryStyleObject = { [K in keyof React.CSSProperties]: StringOrNumberOrCallback };
   /**
    * Style interface used in components/themeing
    */
   export interface VictoryStyleInterface {
-    parent?: React.CSSProperties;
-    data?: React.CSSProperties;
-    labels?: React.CSSProperties;
-    tickLabels?: React.CSSProperties;
+      parent?: VictoryStyleObject;
+      data?: VictoryStyleObject;
+      labels?: VictoryStyleObject;
   }
 
   export interface VictoryAnimationProps {
@@ -51,7 +54,7 @@ declare module "victory" {
      * 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>;
+    children?: (style: AnimationStyle) => React.ReactElement;
     /**
      * The number of milliseconds the animation should take to complete.
      * @default 1000
@@ -122,16 +125,19 @@ declare module "victory" {
      * 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 labelPlacement prop is used to specify the placement of labels relative to the data point they represent.
+     * This prop may be given as “vertical”, “parallel” or “perpendicular”. This props is particularly useful in polar
+     * charts, where it may be desireable to position a label either parallel or perpendicular to its corresponding angle.
+     * When this prop is not set, perpendicular label placement will be used for polar charts, and vertical label
+     * placement will be used for cartesian charts.
+     */
+    labelPlacement?: "parallel" | "perpendicular" | "vertical";
     /**
      * 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,
@@ -141,10 +147,31 @@ declare module "victory" {
      * @default 1
      */
     lineHeight?: StringOrNumberOrCallback;
+    /**
+     * Victory components will pass an origin prop is to define the center point in svg coordinates for polar charts.
+     * **This prop should not be set manually.**
+     */
+    origin?: { x: number, y: number };
+    /**
+     * Victory components can pass a boolean polar prop to specify whether a label is part of a polar chart.
+     * **This prop should not be set manually.**
+     */
+    polar?: boolean;
+    /**
+     * The renderInPortal prop specifies whether VictoryLabel should render text in place or within a VictoryPortal.
+     * Setting renderInPortal to true is equivalent to wrapping VictoryLabel in a VictoryPortal. This prop is false by default.
+     */
+    renderInPortal?: boolean;
     /**
      * The style prop applies CSS properties to the rendered `<text>` element.
      */
     style?: React.CSSProperties;
+    /**
+     * The text prop defines the text VictoryLabel will render. The text prop may be given as a string, number, a function of datum,
+     * or an array of any of these. Strings may include newline characters, which VictoryLabel will split into separate
+     * <tspan/> elements. When text is given as an array, separate <tspan/> elements will be created for each element in the array.
+     */
+    text?: string[] | StringOrNumberOrCallback;
     /**
      * The textAnchor prop defines how the text is horizontally positioned relative to the given `x` and `y` coordinates.
      */
@@ -188,7 +215,7 @@ declare module "victory" {
      * with a viewBox attribute, or a static container with absolute width and height.
      * @default true
      */
-    responsive?: boolean
+    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
@@ -244,7 +271,7 @@ declare module "victory" {
   type CursorData = {
     x: number;
     y: number;
-  }
+  };
 
   export interface VictoryCursorContainerProps extends VictoryContainerProps {
     /**
@@ -253,7 +280,7 @@ declare module "victory" {
      * If a cursorComponent is not supplied, a new Line component will be rendered.
      * @default cursorComponent={<Line/>}
      */
-    cursorComponent?: React.ReactElement<any>;
+    cursorComponent?: React.ReactElement;
     /**
      * 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.
@@ -276,7 +303,7 @@ declare module "victory" {
      * active, text. If cursorLabelComponent is omitted, a new VictoryLabel will be created with the props described above.
      * @default cursorLabelComponent={<VictoryLabel/>}
      */
-    cursorLabelComponent?: React.ReactElement<any>;
+    cursorLabelComponent?: React.ReactElement;
     /**
      * 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
@@ -294,7 +321,7 @@ declare module "victory" {
     /**
      * When the disable prop is set to true, VictoryCursorContainer events will not fire.
      */
-    disable?: boolean
+    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.
@@ -302,7 +329,7 @@ declare module "victory" {
      * 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
+    onCursorChange?: (value: CursorData, props: VictoryCursorContainerProps) => void;
   }
 
   export class VictoryCursorContainer extends React.Component<VictoryCursorContainerProps, any> {}
@@ -328,7 +355,7 @@ declare module "victory" {
      * width, height, and style. When this prop is not specified, a <rect/> will be rendered.
      * @default brushComponent={<rect/>}
      */
-    brushComponent?: React.ReactElement<any>;
+    brushComponent?: React.ReactElement;
     /**
      * 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
@@ -371,7 +398,7 @@ declare module "victory" {
      * specified, a <rect/> will be rendered.
      * @default handleComponent={<rect/>}
      */
-    handleComponent?: React.ReactElement<any>;
+    handleComponent?: React.ReactElement;
     /**
      * The handleStyle adds custom styles to the handleComponents. This prop should be given as an object of SVG style attributes.
      *
@@ -413,7 +440,7 @@ declare module "victory" {
      * props on VictoryClipContainer, such as clipPadding.
      * @example clipContainerComponent={<VictoryClipContainer clipPadding={{top: 10, right: 10}}}/>}
      */
-    clipContainerComponent?: React.ReactElement<any>;
+    clipContainerComponent?: React.ReactElement;
     /**
      * 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
@@ -568,21 +595,22 @@ declare module "victory" {
     /**
      * The style prop applies SVG style properties to the rendered flyout container. These props will be passed to the flyoutComponent.
      */
-    flyoutStyle?: React.CSSProperties;
+    flyoutStyle?: VictoryStyleObject;
     /**
      * 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.
+     * 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>;
+    flyoutComponent?: React.ReactElement;
     /**
      * 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>;
+    groupComponent?: React.ReactElement;
     /**
      * 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.
@@ -590,7 +618,8 @@ declare module "victory" {
     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.
+     * 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;
     /**
@@ -605,7 +634,7 @@ declare module "victory" {
      * Examples: labelComponent={<VictoryLabel dy={20}/>}, labelComponent={<MyCustomLabel/>}
      * @default <VictoryLabel/>
      */
-    labelComponent?: React.ReactElement<any>;
+    labelComponent?: React.ReactElement;
     /**
      * 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.
@@ -617,11 +646,13 @@ declare module "victory" {
      */
     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.
+     * 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.
+     * 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;
     /**
@@ -636,10 +667,11 @@ declare module "victory" {
     /**
      * 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.
+     * 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;
     /**
@@ -652,9 +684,9 @@ declare module "victory" {
     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 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<
@@ -735,9 +767,7 @@ declare module "victory" {
      * 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
@@ -872,7 +902,7 @@ declare module "victory" {
      * @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>;
+    containerComponent?: React.ReactElement;
     /**
      * 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.
@@ -889,7 +919,7 @@ declare module "victory" {
      * to a <g> tag on web, and a react-native-svg <G> tag on mobile
      * @default <g/>
      */
-    groupComponent?: React.ReactElement<any>;
+    groupComponent?: React.ReactElement;
   }
 
   /**
@@ -923,7 +953,7 @@ declare module "victory" {
      * not provided, VictoryArea will use its default Area component.
      * @default <Area/>
      */
-    dataComponent?: React.ReactElement<any>;
+    dataComponent?: React.ReactElement;
     /**
      * 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,
@@ -973,7 +1003,7 @@ declare module "victory" {
      * data point, they should be created by composing VictoryArea with VictoryScatter
      * @default <VictoryLabel/>
      */
-    labelComponent?: React.ReactElement<any>;
+    labelComponent?: React.ReactElement;
   }
 
   interface VictoryMultiLabeableProps extends VictoryLabableProps {
@@ -999,65 +1029,67 @@ declare module "victory" {
     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;
+  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;
   }
 
   /**
@@ -1076,7 +1108,7 @@ declare module "victory" {
      * is not supplied, VictoryAxis will render its default AxisLine component.
      * @default <AxisLine/>
      */
-    axisComponent?: React.ReactElement<any>;
+    axisComponent?: React.ReactElement;
     /**
      * 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
@@ -1087,7 +1119,7 @@ declare module "victory" {
      * VictoryLabel will be created with props described above
      * @default <VictoryLabel/>
      */
-    axisLabelComponent?: React.ReactElement<any>;
+    axisLabelComponent?: React.ReactElement;
     /**
      * This prop specifies whether a given axis is intended to cross another axis.
      */
@@ -1143,7 +1175,6 @@ declare module "victory" {
      *     }
      *   }
      * ]}
-     *}}
      */
     events?: EventPropTypeInterface<"axis" | "axisLabel" | "grid" | "ticks" | "tickLabels" | "parent", number | string>[];
     /**
@@ -1162,7 +1193,7 @@ declare module "victory" {
      * is not supplied, VictoryAxis will render its default GridLine component.
      * @default <GridLine/>
      */
-    gridComponent?: React.ReactElement<any>;
+    gridComponent?: React.ReactElement;
     /**
      * If true, this value will flip the domain of a given axis.
      */
@@ -1195,20 +1226,40 @@ declare module "victory" {
      */
     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}}
+     * The style prop defines the style of the component. The style prop should be given as an object
+     * with styles defined for parent, axis, axisLabel, grid, ticks, and tickLabels. Any valid svg
+     * styles are supported, but width, height, and padding should be specified via props as they
+     * determine relative layout for components in VictoryChart. Functional styles may be defined for
+     * grid, tick, and tickLabel style properties, and they will be evaluated with each tick.
+     *
+     * note: When a component is rendered as a child of another Victory component, or within a custom
+     * <svg> element with standalone={false} parent styles will be applied to the enclosing <g> tag.
+     * Many styles that can be applied to a parent <svg> will not be expressed when applied to a <g>.
+     *
+     * note: custom angle and verticalAnchor properties may be included in labels styles.
      */
     style?: {
       parent?: React.CSSProperties;
       axis?: React.CSSProperties;
       axisLabel?: React.CSSProperties;
-      grid?: React.CSSProperties;
-      ticks?: React.CSSProperties;
-      tickLabels?: React.CSSProperties;
+      grid?: {
+        [K in keyof React.CSSProperties]:
+        | string
+        | number
+        | ((tick?: any) => string | number)
+      };
+      ticks?: {
+        [K in keyof React.CSSProperties]:
+        | string
+        | number
+        | ((tick?: any) => string | number)
+      };
+      tickLabels?: {
+        [K in keyof React.CSSProperties]:
+        | string
+        | number
+        | ((tick?: any) => string | number)
+      };
     };
     /**
      * The tickComponent prop takes in an entire component which will be used
@@ -1219,7 +1270,7 @@ declare module "victory" {
      * is not supplied, VictoryAxis will render its default Tick component.
      * @default <Tick/>
      */
-    tickComponent?: React.ReactElement<any>;
+    tickComponent?: React.ReactElement;
     /**
      * 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
@@ -1239,7 +1290,7 @@ declare module "victory" {
      * VictoryLabel will be created with props described above
      * @default <VictoryLabel/>
      */
-    tickLabelComponent?: React.ReactElement<any>;
+    tickLabelComponent?: React.ReactElement;
     /**
      * 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
@@ -1251,7 +1302,7 @@ declare module "victory" {
      * The tickValues prop explicitly specifies which tick values to draw on the axis.
      * @example ["apples", "bananas", "oranges"], [2, 4, 6, 8]
      */
-    tickValues?: any[]
+    tickValues?: any[];
   }
 
   /**
@@ -1262,12 +1313,41 @@ declare module "victory" {
   export class VictoryAxis extends React.Component<VictoryAxisProps, any> {}
 
   export interface VictoryBarProps extends VictoryCommonProps, VictoryDatableProps, VictoryMultiLabeableProps {
+    /**
+     * The alignment prop specifies how bars should be aligned relative to their data points.
+     * This prop may be given as “start”, “middle” or “end”. When this prop is not specified,
+     * bars will have “middle” alignment relative to their data points.
+     */
+    alignment?: "start" | "middle" | "end";
+    /**
+     * The barRatio prop specifies an approximate ratio between bar widths and spaces between bars.
+     * When width is not specified via the barWidth prop or in bar styles, the barRatio prop will
+     * be used to calculate a default width for each bar given the total number of bars in the data series
+     * and the overall width of the chart.
+     */
+    barRatio?: number;
+    /**
+     * The barWidth prop is used to specify the width of each bar. This prop may be given as
+     * a number of pixels or as a function that returns a number. When this prop is given as
+     * a function, it will be evaluated with the arguments datum, and active. When this value
+     * is not given, a default value will be calculated based on the overall dimensions of
+     * the chart, and the number of bars.
+     */
+    barWidth?: NumberOrCallback;
     /**
      * The cornerRadius prop specifies a radius to apply to each bar.
      * If this prop is given as a single number, the radius will only be applied to the top of each bar.
      * When this prop is given as a function, it will be evaluated with the arguments datum, and active.
      */
-    cornerRadius?: NumberOrCallback;
+    cornerRadius?: NumberOrCallback
+    | {
+        top?: number | (NumberOrCallback),
+        topLeft?: number | (NumberOrCallback),
+        topRight?: number | (NumberOrCallback),
+        bottom?: number | (NumberOrCallback),
+        bottomLeft?: number | (NumberOrCallback),
+        bottomRight?: number | (NumberOrCallback)
+      };
     /**
      * 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
@@ -1307,8 +1387,7 @@ declare module "victory" {
      *     }
      *   }
      * ]}
-     *}}
-      */
+     */
     events?: EventPropTypeInterface<"data" | "labels" | "parent", number | string>[];
     /**
      * Similar to data accessor props `x` and `y`, this prop may be used to functionally
@@ -1331,21 +1410,6 @@ declare module "victory" {
      * @example {data: {fill: "red", width: 8}, labels: {fontSize: 12}}
      */
     style?: VictoryStyleInterface;
-    /**
-     * The barRatio prop specifies an approximate ratio between bar widths and spaces between bars.
-     * When width is not specified via the barWidth prop or in bar styles, the barRatio prop will
-     * be used to calculate a default width for each bar given the total number of bars in the data series
-     * and the overall width of the chart.
-     */
-    barRatio?: number;
-    /**
-     * The barWidth prop is used to specify the width of each bar. This prop may be given as
-     * a number of pixels or as a function that returns a number. When this prop is given as
-     * a function, it will be evaluated with the arguments datum, and active. When this value
-     * is not given, a default value will be calculated based on the overall dimensions of
-     * the chart, and the number of bars.
-     */
-    barWidth?: NumberOrCallback;
   }
 
   /**
@@ -1356,16 +1420,16 @@ declare module "victory" {
 
     export interface VictoryBoxPlotStyleInterface
         extends VictoryStyleInterface {
-        max?: React.CSSProperties;
-        maxLabels?: React.CSSProperties;
-        min?: React.CSSProperties;
-        minLabels?: React.CSSProperties;
-        median?: React.CSSProperties;
-        medianLabels?: React.CSSProperties;
-        q1?: React.CSSProperties;
-        q1Labels?: React.CSSProperties;
-        q3?: React.CSSProperties;
-        q3Labels?: React.CSSProperties;
+        max?: VictoryStyleObject;
+        maxLabels?: VictoryStyleObject;
+        min?: VictoryStyleObject;
+        minLabels?: VictoryStyleObject;
+        median?: VictoryStyleObject;
+        medianLabels?: VictoryStyleObject;
+        q1?: VictoryStyleObject;
+        q1Labels?: VictoryStyleObject;
+        q3?: VictoryStyleObject;
+        q3Labels?: VictoryStyleObject;
     }
 
     export interface VictoryBoxPlotProps
@@ -1432,7 +1496,6 @@ declare module "victory" {
          *     }
          *   }
          * ]}
-         *}}
          */
         events?: EventPropTypeInterface<string, StringOrNumberOrCallback>[];
         /**
@@ -1563,7 +1626,6 @@ declare module "victory" {
          *     }
          *   }
          * ]}
-         *}}
          */
         events?: EventPropTypeInterface<string, StringOrNumberOrCallback>[];
         /**
@@ -1668,8 +1730,7 @@ declare module "victory" {
        *     }
        *   }
        * ]}
-       *}}
-        */
+       */
       events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
       /**
        * Similar to data accessor props `x` and `y`, this prop may be used to functionally
@@ -1688,16 +1749,16 @@ declare module "victory" {
        * case of groups of bars, this number should be equal to the width of the bar
        * plus the desired spacing between bars.
        */
-      offset?:number
+      offset?: number;
       /**
        * 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
@@ -1735,8 +1796,7 @@ declare module "victory" {
        *     }
        *   }
        * ]}
-       *}}
-        */
+       */
       events?: EventPropTypeInterface<"data" | "labels" | "parent", number | string>[];
       /**
        * The interpolation prop determines how data points should be connected
@@ -1770,13 +1830,13 @@ declare module "victory" {
        */
       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
@@ -1816,7 +1876,7 @@ declare module "victory" {
        * VictoryPortal to force components to render above other children.
        * @default <VictoryContainer/>
        */
-      containerComponent?: React.ReactElement<any>;
+      containerComponent?: React.ReactElement;
       /**
        * Specify data via the data prop. VictoryLegend expects data as an
        * array of objects with name (required), symbol, and labels properties.
@@ -1847,14 +1907,14 @@ declare module "victory" {
        * If a dataComponent is not provided, VictoryLegend will use its
        * default Point component.
        */
-      dataComponent?: React.ReactElement<any>;
+      dataComponent?: React.ReactElement;
       /**
        * 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>;
+      groupComponent?: React.ReactElement;
       /**
        * The gutter prop defines the number of pixels between legend rows or
        * columns, depending on orientation. When orientation is horizontal,
@@ -1871,7 +1931,7 @@ declare module "victory" {
        * custom component itself. If labelComponent is omitted, a new
        * VictoryLabel will be created with the props described above.
        */
-      labelComponent?: React.ReactElement<any>;
+      labelComponent?: React.ReactElement;
       /**
        * The orientation prop takes a string that defines whether legend data
        * are displayed in a row or column. When orientation is "horizontal",
@@ -1925,14 +1985,14 @@ declare module "victory" {
       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
@@ -1978,8 +2038,7 @@ declare module "victory" {
        *     }
        *   }
        * ]}
-       *}}
-        */
+       */
       events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
       /**
        * Similar to data accessor props `x` and `y`, this prop may be used to functionally
@@ -2014,13 +2073,13 @@ declare module "victory" {
        */
       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.
@@ -2096,8 +2155,7 @@ declare module "victory" {
        *     }
        *   }
        * ]}
-       *}}
-        */
+       */
       events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
       /**
        * Similar to data accessor props `x` and `y`, this prop may be used to functionally
@@ -2121,9 +2179,9 @@ declare module "victory" {
        */
       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
@@ -2153,7 +2211,7 @@ declare module "victory" {
        * 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>;
+      dataComponent?: React.ReactElement;
       /**
        * 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.
@@ -2203,8 +2261,7 @@ declare module "victory" {
        *     }
        *   }
        * ]}
-       *}}
-        */
+       */
       events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback | string[] | number[]>[];
       /**
        * Similar to data accessor props `x` and `y`, this prop may be used to functionally
@@ -2212,10 +2269,10 @@ declare module "victory" {
        */
       eventKey?: StringOrNumberOrCallback;
       /**
-        * Specifies the radius of the chart. If this property is not provided it is computed
-        * from width, height, and padding props
-        *
-        */
+       * Specifies the radius of the chart. If this property is not provided it is computed
+       * from width, height, and padding props
+       *
+       */
       radius?: number;
       /**
        * When creating a donut chart, this prop determines the number of pixels between
@@ -2267,7 +2324,7 @@ declare module "victory" {
        */
       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.
@@ -2275,4 +2332,3 @@ declare module "victory" {
      */
     export class VictoryPie extends React.Component<VictoryPieProps, any> {}
   }
-  
\ No newline at end of file
diff --git a/types/victory/tslint.json b/types/victory/tslint.json
index a0357daa61..2fccde6e9b 100644
--- a/types/victory/tslint.json
+++ b/types/victory/tslint.json
@@ -1,78 +1,14 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
         "array-type": false,
-        "arrow-return-shorthand": false,
         "ban-types": false,
         "callable-types": false,
-        "comment-format": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
         "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
         "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
         "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
         "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
         "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "strict-export-declare-modifiers": false
     }
 }
diff --git a/types/victory/victory-tests.tsx b/types/victory/victory-tests.tsx
index 0c9992494e..fcd18571e3 100644
--- a/types/victory/victory-tests.tsx
+++ b/types/victory/victory-tests.tsx
@@ -34,7 +34,7 @@ let test = <VictoryAnimation
     {(style: AnimationStyle) =>
         <span style={{color: style["color"] as string}}>Hello!</span>
     }
-</VictoryAnimation>
+</VictoryAnimation>;
 
 // VictoryLabel test
 test = <VictoryLabel x={50} y={10}
@@ -51,7 +51,28 @@ test = <VictoryLabel x={50} y={10}
                      dy={10}
                      lineHeight={1.5}>
     {"data viz \n is \n fun!"}
-</VictoryLabel>
+</VictoryLabel>;
+
+test = (
+    <VictoryLabel
+        text={datum => datum.label}
+        labelPlacement='perpendicular'
+        renderInPortal={true}
+    >
+        {"data viz \n is \n fun!"}
+    </VictoryLabel>
+);
+
+test = (
+    <VictoryLabel
+        text={['some', 'text', 'strings']}
+        labelPlacement='vertical'
+        renderInPortal={true}
+        lineHeight={'12'}
+    >
+        {"data viz \n is \n fun!"}
+    </VictoryLabel>
+);
 
 // VictoryArea test
 test = (
@@ -91,19 +112,19 @@ test = (
                     onClick: () => {
                         return {
                             mutation: (props) => {
-                                return { style: { fill: "orange" } }
+                                return { style: { fill: "orange" } };
                             }
-                        }
+                        };
                     },
                     onMouseEnter: () => {
                         return [
                             {
                                 target: "labels",
                                 mutation: (props) => {
-                                    return { text: "hey" }
+                                    return { text: "hey" };
                                 }
                             }
-                        ]
+                        ];
                     }
                 }
             }
@@ -156,32 +177,37 @@ test = (
 test = (
     <VictoryAxis
         style={{
-          axis: {stroke: "black"},
-          grid: {strokeWidth: 2},
-          ticks: {stroke: "red"},
-          tickLabels: {fontSize: 12},
-          axisLabel: {fontSize: 16}
+            axis: { stroke: "black" },
+            grid: { strokeWidth: 2 },
+            ticks: { stroke: "red" },
+            tickLabels: { fontSize: 12 },
+            axisLabel: { fontSize: 16 }
         }}
         label="Planets"
         tickValues={[
-          "Mercury",
-          "Venus",
-          "Earth",
-          "Mars",
-          "Jupiter"
-        ]}/>
+            "Mercury",
+            "Venus",
+            "Earth",
+            "Mars",
+            "Jupiter"
+        ]} />
 );
 
 test = (
     <VictoryAxis
         scale="time"
+        style={{
+            grid: { strokeWidth: tick => tick.x },
+            ticks: { stroke: tick => tick.color },
+            tickLabels: { fontSize: tick => tick.y },
+        }}
         tickValues={[
             new Date(1980, 1, 1),
             new Date(1990, 1, 1),
             new Date(2000, 1, 1),
             new Date(2010, 1, 1),
             new Date(2020, 1, 1)]}
-        tickFormat={(x) => x.getFullYear()}/>
+        tickFormat={(x) => x.getFullYear()} />
 );
 
 test = (
@@ -189,7 +215,7 @@ test = (
         dependentAxis
         padding={{left: 50, top: 20, bottom: 20}}
         scale="log"
-        domain={{ x: [new Date(Date.UTC(2016, 0, 1)), new Date()], y: [1,5] }}
+        domain={{ x: [new Date(Date.UTC(2016, 0, 1)), new Date()], y: [1, 5] }}
     />
 );
 
@@ -278,6 +304,9 @@ test = (
             {x: 4, y: 2},
             {x: 5, y: 1}
         ]}
+        alignment="start"
+        barWidth={(datum, active) => active ? datum.x : datum.y}
+        cornerRadius={{top: 2, bottom: 4}}
         events={[
             {
               target: "data",
@@ -574,12 +603,19 @@ test = (
 test = (
     <VictoryScatter
         data={[
-            {amount: 1, yield: 1, error: 0.5},
-            {amount: 2, yield: 2, error: 1.1},
-            {amount: 3, yield: 3, error: 0},
-            {amount: 4, yield: 2, error: 0.1},
-            {amount: 5, yield: 1, error: 1.5}
+            { amount: 1, yield: 1, error: 0.5 },
+            { amount: 2, yield: 2, error: 1.1 },
+            { amount: 3, yield: 3, error: 0 },
+            { amount: 4, yield: 2, error: 0.1 },
+            { amount: 5, yield: 1, error: 1.5 }
         ]}
+        style={{
+            data: {
+                fill: d => d.x,
+                stroke: (datum, active) => active ? datum.x : datum.y,
+                strokeWidth: 3
+            }
+        }}
         x={"amount"}
         y={(data) => (data.yield + data.error)}
     />
diff --git a/types/video.js/index.d.ts b/types/video.js/index.d.ts
index 62bbf83362..67d2ef6dda 100644
--- a/types/video.js/index.d.ts
+++ b/types/video.js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Video.js 7.2
-// Project: https://github.com/videojs/video.js
+// Project: https://github.com/videojs/video.js, https://videojs.com
 // Definitions by: Vincent Bortone <https://github.com/vbortone>
 //                 Simon Clériot <https://github.com/scleriot>
 //                 Sean Bennett <https://github.com/SWBennett06>
@@ -3713,6 +3713,21 @@ declare namespace videojs {
 		new (player: Player, options?: ComponentOptions): MouseTimeDisplay
 	};
 
+	enum ReadyState {
+		HaveNothing = 0,
+		HaveMetadata = 1,
+		HaveCurrentData = 2,
+		HaveFutureData = 3,
+		HaveEnoughData = 4
+	}
+
+	enum NetworkState {
+		Empty = 0,
+		Idle = 1,
+		Loading = 2,
+		NoSource = 3
+	}
+
 	/**
 	 * An instance of the `Player` class is created when any of the Video.js setup methods
 	 * are used to initialize a video.
@@ -4233,7 +4248,7 @@ declare namespace videojs {
 		 */
 		loop(value?: boolean): void;
 
-		loop(): string;
+		loop(): boolean;
 
 		/**
 		 * Get the current muted state, or turn mute on or off
@@ -4249,6 +4264,13 @@ declare namespace videojs {
 
 		muted(): boolean;
 
+		/**
+		 * Returns the current state of network activity for the element
+		 *
+		 * @return The current network state
+		 */
+		networkState(): NetworkState;
+
 		/**
 		 * Pause the video playback
 		 * @check
@@ -4342,6 +4364,12 @@ declare namespace videojs {
 		 */
 		preload(value?: boolean): string;
 
+		/**
+		 * Returns a value that expresses the current state of the element
+		 * with respect to rendering the current playback position.
+		 */
+		readyState(): ReadyState;
+
 		/**
 		 * Calculates how much time is left in the video. Not part
 		 * of the native video API.
@@ -4609,6 +4637,7 @@ declare namespace videojs {
 		fluid?: boolean;
 		height?: number;
 		html5?: any;
+		inactivityTimeout?: number;
 		language?: string;
 		languages?: { [code: string]: LanguageTranslations };
 		loop?: boolean;
diff --git a/types/video.js/video.js-tests.ts b/types/video.js/video.js-tests.ts
index 378a7150f3..e21d7fe581 100644
--- a/types/video.js/video.js-tests.ts
+++ b/types/video.js/video.js-tests.ts
@@ -57,8 +57,12 @@ videojs("example_video_1").ready(function() {
 
 	this.height(480);
 
+	const readyState: videojs.ReadyState = this.readyState();
+
 	this.requestFullscreen();
 
+	const networkState: videojs.NetworkState = this.networkState();
+
 	testEvents(this);
 
 	testComponents(this);
diff --git a/types/viewability-helper/index.d.ts b/types/viewability-helper/index.d.ts
index 0fad1e32b7..05fe20e296 100644
--- a/types/viewability-helper/index.d.ts
+++ b/types/viewability-helper/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for viewability-helper 1.0
-// Project: https://github.com/outbrain/ViewabilityHelper (Does not have to be to GitHub, but prefer linking to a source code repository rather than to a project website.)
+// Project: https://github.com/outbrain/viewabilityhelper
 // Definitions by: Liron Zluf <https://github.com/lironzluf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/vinyl-fs/.editorconfig b/types/vinyl-fs/.editorconfig
deleted file mode 100644
index 831139084b..0000000000
--- a/types/vinyl-fs/.editorconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[*.ts]
-indent_style = space
-indent_size = 3
diff --git a/types/vinyl-fs/index.d.ts b/types/vinyl-fs/index.d.ts
index d35dd6bcef..1fb5921d98 100644
--- a/types/vinyl-fs/index.d.ts
+++ b/types/vinyl-fs/index.d.ts
@@ -1,17 +1,18 @@
 // Type definitions for vinyl-fs 2.4
-// Project: https://github.com/wearefractal/vinyl-fs
+// Project: https://github.com/gulpjs/vinyl-fs
 // Definitions by: vvakame <https://github.com/vvakame>
 //                 remisery <https://github.com/remisery>
+//                 TeamworkGuy2 <https://github.com/TeamworkGuy2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
 declare global {
-   namespace NodeJS {
-      interface WritableStream {
-         write(buffer: any/* Vinyl.File */, cb?: (err?: Error | null) => void): boolean;
-      }
-   }
+    namespace NodeJS {
+        interface WritableStream {
+            write(buffer: any/* Vinyl.File */, cb?: (err?: Error | null) => void): boolean;
+        }
+    }
 }
 
 import * as _events from 'events';
@@ -19,128 +20,128 @@ import * as File from 'vinyl';
 import * as globStream from 'glob-stream';
 
 export interface SrcOptions extends globStream.Options {
-   /** Prevents stream from emitting an error when file not found. */
-   allowEmpty?: boolean;
+    /** Prevents stream from emitting an error when file not found. */
+    allowEmpty?: boolean;
 
-   /** Specifies the working directory the folder is relative to */
-   cwd?: string;
+    /** Specifies the working directory the folder is relative to */
+    cwd?: string;
 
-   /**
-    * Specifies the folder relative to the cwd
-    * This is used to determine the file names when saving in .dest()
-    * Default: where the glob begins
-    */
-   base?: string;
+    /**
+     * Specifies the folder relative to the cwd
+     * This is used to determine the file names when saving in .dest()
+     * Default: where the glob begins
+     */
+    base?: string;
 
-   /**
-    * Setting this to false will make file.contents a paused stream
-    * If true it will buffer the file contents
-    * Default: true
-    */
-   buffer?: boolean;
+    /**
+     * Setting this to false will make file.contents a paused stream
+     * If true it will buffer the file contents
+     * Default: true
+     */
+    buffer?: boolean;
 
-   /**
-    * The mode the directory should be created with.
-    * Default: the process mode
-    */
-   dirMode?: number;
+    /**
+     * The mode the directory should be created with.
+     * Default: the process mode
+     */
+    dirMode?: number;
 
-   /**
-    * Whether or not you want globs to match on dot files or not
-    * (e.g., `.gitignore`).
-    */
-   dot?: boolean;
+    /**
+     * Whether or not you want globs to match on dot files or not
+     * (e.g., `.gitignore`).
+     */
+    dot?: boolean;
 
-   /**
-    * Whether or not to recursively resolve symlinks to their targets.
-    * Setting to `false` to preserve them as symlinks and make `file.symlink`
-    * equal the original symlink's target path.
-    * Default: true
-    */
-   followSymlinks?: boolean;
+    /**
+     * Whether or not to recursively resolve symlinks to their targets.
+     * Setting to `false` to preserve them as symlinks and make `file.symlink`
+     * equal the original symlink's target path.
+     * Default: true
+     */
+    followSymlinks?: boolean;
 
-   /**
-    * Setting this to false will ignore the contents of the file and disable
-    * writing to disk to speed up operations
-    * Default: true
-    */
-   read?: boolean;
+    /**
+     * Setting this to false will ignore the contents of the file and disable
+     * writing to disk to speed up operations
+     * Default: true
+     */
+    read?: boolean;
 
-   /**
-    * Whether or not the symlink should be relative or absolute.
-    * Default: false
-    */
-   relative?: boolean;
+    /**
+     * Whether or not the symlink should be relative or absolute.
+     * Default: false
+     */
+    relative?: boolean;
 
-   /** Only find files that have been modified since the time specified */
-   since?: Date|number;
+    /** Only find files that have been modified since the time specified */
+    since?: Date | number;
 
-   /**
-    * Causes the BOM to be stripped on UTF-8 encoded files. Set to `false`
-    * if you need the BOM for some reason.
-    */
-   stripBOM?: boolean;
+    /**
+     * Causes the BOM to be stripped on UTF-8 encoded files. Set to `false`
+     * if you need the BOM for some reason.
+     */
+    stripBOM?: boolean;
 
-   /**
-    * Setting this to true will create a duplex stream, one that passes
-    * through items and emits globbed files.
-    * Default: false
-    */
-   passthrough?: boolean;
+    /**
+     * Setting this to true will create a duplex stream, one that passes
+     * through items and emits globbed files.
+     * Default: false
+     */
+    passthrough?: boolean;
 
-   /**
-    * Setting this to true will enable sourcemaps.
-    * Default: false
-    */
-   sourcemaps?: boolean;
+    /**
+     * Setting this to true will enable sourcemaps.
+     * Default: false
+     */
+    sourcemaps?: boolean;
 
-   /**
-    * Whether or not to recursively resolve symlinks to their targets. Setting to false to
-    * preserve them as symlinks and make file.symlink equal the original symlink's target path.
-    * Default: false
-    */
-   resolveSymlinks?: boolean;
-   /**
-    * Causes the BOM to be removed on UTF-8 encoded files. Set to false if you need the BOM for some reason.
-    * Default: true
-    */
-   removeBOM?: boolean;
+    /**
+     * Whether or not to recursively resolve symlinks to their targets. Setting to false to
+     * preserve them as symlinks and make file.symlink equal the original symlink's target path.
+     * Default: false
+     */
+    resolveSymlinks?: boolean;
+    /**
+     * Causes the BOM to be removed on UTF-8 encoded files. Set to false if you need the BOM for some reason.
+     * Default: true
+     */
+    removeBOM?: boolean;
 }
 
 export interface DestOptions {
-   /**
-    * Specify the working directory the folder is relative to
-    * Default is process.cwd()
-    */
-   cwd?: string;
+    /**
+     * Specify the working directory the folder is relative to
+     * Default is process.cwd()
+     */
+    cwd?: string;
 
-   /**
-    * Specify the mode the files should be created with
-    * Default is the mode of the input file (file.stat.mode)
-    * or the process mode if the input file has no mode property
-    */
-   mode?: number|string;
+    /**
+     * Specify the mode the files should be created with
+     * Default is the mode of the input file (file.stat.mode)
+     * or the process mode if the input file has no mode property
+     */
+    mode?: number | string;
 
-   /** Specify the mode the directory should be created with. Default is the process mode */
-   dirMode?: number|string;
+    /** Specify the mode the directory should be created with. Default is the process mode */
+    dirMode?: number | string;
 
-   /** Specify if existing files with the same path should be overwritten or not. Default is true, to always overwrite existing files */
-   overwrite?: boolean;
+    /** Specify if existing files with the same path should be overwritten or not. Default is true, to always overwrite existing files */
+    overwrite?: boolean;
 
-   /**
-    * Enables sourcemap support on files passed through the stream. Will write inline soucemaps if
-    * specified as true. Specifying a string path will write external sourcemaps at the given path.
-    */
-   sourcemaps?: true | string;
+    /**
+     * Enables sourcemap support on files passed through the stream. Will write inline soucemaps if
+     * specified as true. Specifying a string path will write external sourcemaps at the given path.
+     */
+    sourcemaps?: true | string;
 
-   /**
-    * When creating a symlink, whether or not the created symlink should be relative. If false,
-    * the symlink will be absolute. Note: This option will be ignored if a junction is being created.
-    */
-   relativeSymlinks?: boolean;
+    /**
+     * When creating a symlink, whether or not the created symlink should be relative. If false,
+     * the symlink will be absolute. Note: This option will be ignored if a junction is being created.
+     */
+    relativeSymlinks?: boolean;
 
-   /* When creating a symlink, whether or not a directory symlink should be created as a junction. */
-   useJunctions?: boolean;
+    /* When creating a symlink, whether or not a directory symlink should be created as a junction. */
+    useJunctions?: boolean;
 }
 
 /**
@@ -152,32 +153,6 @@ export interface DestOptions {
  */
 export function src(globs: string|string[], opt?: SrcOptions): NodeJS.ReadWriteStream;
 
-/**
- * This is just a glob-watcher
- *
- * @param globs Takes a glob string or an array of glob strings as the first argument
- * Globs are executed in order, so negations should follow positive globs
- * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
- */
-export function watch(globs: string|string[], cb?: (outEvt: { type: any; path: any; old: any; }) => void): _events.EventEmitter;
-
-/**
- * This is just a glob-watcher
- *
- * @param globs Takes a glob string or an array of glob strings as the first argument
- * Globs are executed in order, so negations should follow positive globs
- * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
- */
-export function watch(
-    globs: string|string[],
-    opt?: {
-        interval?: number;
-        debounceDelay?: number;
-        cwd?: string;
-        maxListeners?(): number;
-    },
-    cb?: (outEvt: { type: any; path: any; old: any; }) => void): _events.EventEmitter;
-
 /**
  * On write the stream will save the vinyl File to disk at the folder/cwd specified.
  * After writing the file to disk, it will be emitted from the stream so you can keep piping these around.
@@ -207,20 +182,20 @@ export function dest(getFolderPath: (file: File) => string): NodeJS.ReadWriteStr
  * cwd, base, and path will be overwritten to match the folder
  */
 export function symlink(folder: string, opts?: {
-   /**
-    * Specify the working directory the folder is relative to
-    * Default is process.cwd()
-    */
-   cwd?: string;
+    /**
+     * Specify the working directory the folder is relative to
+     * Default is process.cwd()
+     */
+    cwd?: string;
 
-   /** Specify the mode the directory should be created with. Default is the process mode */
-   mode?: number|string;
+    /** Specify the mode the directory should be created with. Default is the process mode */
+    mode?: number | string;
 
-   /**
-    * Specify the mode the directory should be created with
-    * Default is the process mode
-    */
-   dirMode?: number
+    /**
+     * Specify the mode the directory should be created with
+     * Default is the process mode
+     */
+    dirMode?: number
 }): NodeJS.ReadWriteStream;
 
 /**
@@ -229,17 +204,16 @@ export function symlink(folder: string, opts?: {
  * The file will be modified after being written to this stream:
  * cwd, base, and path will be overwritten to match the folder
  */
-export function symlink(getFolderPath: (File: File) => string, opts?:
-   {
-      /**
-       * Specify the working directory the folder is relative to
-       * Default is process.cwd()
-       */
-      cwd?: string;
+export function symlink(getFolderPath: (File: File) => string, opts?: {
+    /**
+     * Specify the working directory the folder is relative to
+     * Default is process.cwd()
+     */
+    cwd?: string;
 
-      /**
-       * Specify the mode the directory should be created with
-       * Default is the process mode
-       */
-      dirMode?: number
-   }): NodeJS.ReadWriteStream;
+    /**
+     * Specify the mode the directory should be created with
+     * Default is the process mode
+     */
+    dirMode?: number
+}): NodeJS.ReadWriteStream;
diff --git a/types/vinyl-fs/tsconfig.json b/types/vinyl-fs/tsconfig.json
index 6f041838fd..7780364fc3 100644
--- a/types/vinyl-fs/tsconfig.json
+++ b/types/vinyl-fs/tsconfig.json
@@ -5,8 +5,8 @@
             "es6"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/vinyl-fs/tslint.json b/types/vinyl-fs/tslint.json
index f2821adb2b..f93cf8562a 100644
--- a/types/vinyl-fs/tslint.json
+++ b/types/vinyl-fs/tslint.json
@@ -1,6 +1,3 @@
 {
-     "extends": "dtslint/dt.json",
-     "rules": {
-       "no-object-literal-type-assertion": false
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/vinyl-fs/v0/index.d.ts b/types/vinyl-fs/v0/index.d.ts
new file mode 100644
index 0000000000..5b30adcea0
--- /dev/null
+++ b/types/vinyl-fs/v0/index.d.ts
@@ -0,0 +1,201 @@
+// Type definitions for vinyl-fs 0.3
+// Project: https://github.com/wearefractal/vinyl-fs
+// Definitions by: vvakame <https://github.com/vvakame>
+//                 remisery <https://github.com/remisery>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare global {
+   namespace NodeJS {
+      interface WritableStream {
+         write(buffer: any/* Vinyl.File */, cb?: (err?: Error | null) => void): boolean;
+      }
+   }
+}
+
+import * as _events from 'events';
+import * as File from 'vinyl';
+import * as globStream from 'glob-stream';
+
+export interface SrcOptions extends globStream.Options {
+   /** Prevents stream from emitting an error when file not found. */
+   allowEmpty?: boolean;
+
+   /** Specifies the working directory the folder is relative to */
+   cwd?: string;
+
+   /**
+    * Specifies the folder relative to the cwd
+    * This is used to determine the file names when saving in .dest()
+    * Default: where the glob begins
+    */
+   base?: string;
+
+   /**
+    * Setting this to false will make file.contents a paused stream
+    * If true it will buffer the file contents
+    * Default: true
+    */
+   buffer?: boolean;
+
+   /**
+    * The mode the directory should be created with.
+    * Default: the process mode
+    */
+   dirMode?: number;
+
+   /**
+    * Whether or not you want globs to match on dot files or not
+    * (e.g., `.gitignore`).
+    */
+   dot?: boolean;
+
+   /**
+    * Whether or not to recursively resolve symlinks to their targets.
+    * Setting to `false` to preserve them as symlinks and make `file.symlink`
+    * equal the original symlink's target path.
+    * Default: true
+    */
+   followSymlinks?: boolean;
+
+   /**
+    * Setting this to false will ignore the contents of the file and disable
+    * writing to disk to speed up operations
+    * Default: true
+    */
+   read?: boolean;
+
+   /**
+    * Whether or not the symlink should be relative or absolute.
+    * Default: false
+    */
+   relative?: boolean;
+
+   /** Only find files that have been modified since the time specified */
+   since?: Date|number;
+
+   /**
+    * Causes the BOM to be stripped on UTF-8 encoded files. Set to `false`
+    * if you need the BOM for some reason.
+    */
+   stripBOM?: boolean;
+
+   /**
+    * Setting this to true will create a duplex stream, one that passes
+    * through items and emits globbed files.
+    * Default: false
+    */
+   passthrough?: boolean;
+
+   /**
+    * Setting this to true will enable sourcemaps.
+    * Default: false
+    */
+   sourcemaps?: boolean;
+
+   /**
+    * Whether or not to recursively resolve symlinks to their targets. Setting to false to
+    * preserve them as symlinks and make file.symlink equal the original symlink's target path.
+    * Default: false
+    */
+   resolveSymlinks?: boolean;
+   /**
+    * Causes the BOM to be removed on UTF-8 encoded files. Set to false if you need the BOM for some reason.
+    * Default: true
+    */
+   removeBOM?: boolean;
+}
+
+export interface DestOptions {
+   /**
+    * Specify the working directory the folder is relative to
+    * Default is process.cwd()
+    */
+   cwd?: string;
+
+   /**
+    * Specify the mode the files should be created with
+    * Default is the mode of the input file (file.stat.mode)
+    * or the process mode if the input file has no mode property
+    */
+   mode?: number|string;
+
+   /** Specify the mode the directory should be created with. Default is the process mode */
+   dirMode?: number|string;
+
+   /** Specify if existing files with the same path should be overwritten or not. Default is true, to always overwrite existing files */
+   overwrite?: boolean;
+
+   /**
+    * Enables sourcemap support on files passed through the stream. Will write inline soucemaps if
+    * specified as true. Specifying a string path will write external sourcemaps at the given path.
+    */
+   sourcemaps?: true | string;
+
+   /**
+    * When creating a symlink, whether or not the created symlink should be relative. If false,
+    * the symlink will be absolute. Note: This option will be ignored if a junction is being created.
+    */
+   relativeSymlinks?: boolean;
+
+   /* When creating a symlink, whether or not a directory symlink should be created as a junction. */
+   useJunctions?: boolean;
+}
+
+/**
+ * Gets files that match the glob and converts them into the vinyl format
+ * @param globs Takes a glob string or an array of glob strings as the first argument
+ * Globs are executed in order, so negations should follow positive globs
+ * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
+ * @param opt Options Vinyl source options, changes the way the files are read, found, or stored in the vinyl stream
+ */
+export function src(globs: string|string[], opt?: SrcOptions): NodeJS.ReadWriteStream;
+
+/**
+ * This is just a glob-watcher
+ *
+ * @param globs Takes a glob string or an array of glob strings as the first argument
+ * Globs are executed in order, so negations should follow positive globs
+ * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
+ */
+export function watch(globs: string|string[], cb?: (outEvt: { type: any; path: any; old: any; }) => void): _events.EventEmitter;
+
+/**
+ * This is just a glob-watcher
+ *
+ * @param globs Takes a glob string or an array of glob strings as the first argument
+ * Globs are executed in order, so negations should follow positive globs
+ * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
+ */
+export function watch(
+    globs: string|string[],
+    opt?: {
+        interval?: number;
+        debounceDelay?: number;
+        cwd?: string;
+        maxListeners?(): number;
+    },
+    cb?: (outEvt: { type: any; path: any; old: any; }) => void): _events.EventEmitter;
+
+/**
+ * On write the stream will save the vinyl File to disk at the folder/cwd specified.
+ * After writing the file to disk, it will be emitted from the stream so you can keep piping these around.
+ * The file will be modified after being written to this stream:
+ * cwd, base, and path will be overwritten to match the folder
+ * stat.mode will be overwritten if you used a mode parameter
+ * contents will have it's position reset to the beginning if it is a stream
+ * @param folder destination folder
+ */
+export function dest(folder: string, opt?: DestOptions): NodeJS.ReadWriteStream;
+
+/**
+ * On write the stream will save the vinyl File to disk at the folder/cwd specified.
+ * After writing the file to disk, it will be emitted from the stream so you can keep piping these around.
+ * The file will be modified after being written to this stream:
+ * cwd, base, and path will be overwritten to match the folder
+ * stat.mode will be overwritten if you used a mode parameter
+ * contents will have it's position reset to the beginning if it is a stream
+ * @param getFolderPath function that takes in a file and returns a folder path
+ */
+export function dest(getFolderPath: (file: File) => string): NodeJS.ReadWriteStream;
diff --git a/types/vinyl-fs/v0/tsconfig.json b/types/vinyl-fs/v0/tsconfig.json
new file mode 100644
index 0000000000..08ae9db69c
--- /dev/null
+++ b/types/vinyl-fs/v0/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": false,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "vinyl-fs": [
+                "vinyl-fs/v0"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "vinyl-fs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/vinyl-fs/v0/tslint.json b/types/vinyl-fs/v0/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/vinyl-fs/v0/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/vinyl-fs/v0/vinyl-fs-tests.ts b/types/vinyl-fs/v0/vinyl-fs-tests.ts
new file mode 100644
index 0000000000..4d0316a0a0
--- /dev/null
+++ b/types/vinyl-fs/v0/vinyl-fs-tests.ts
@@ -0,0 +1,534 @@
+// from src
+
+import * as vfs from 'vinyl-fs';
+
+import * as path from 'path';
+import * as fs from 'fs'; // require('graceful-fs');
+
+// import bufEqual = require('buffer-equal');
+declare const bufEqual: any;
+// import through = require('through2');
+declare const through: any;
+import File = require('vinyl');
+// const spies = require('./spy');
+declare const spies: any;
+
+// 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};
+};
+
+// TODO: These aren't useful as types tests since they take `any`.
+declare const should: ShouldStatic;
+interface ShouldStatic {
+	exist(obj: any, desc?: string): void;
+	not: this;
+}
+declare global {
+	interface Object {
+		should: { equal(obj: any): void; };
+	}
+}
+
+declare const gulp: any;
+let bufferStream: any;
+
+let dataWrap = (fn: any) => {
+   return (data: any, enc: any, cb: any) => {
+      fn(data);
+      cb();
+   };
+};
+
+describe('source stream', () => {
+   it('should explode on invalid glob (empty)', done => {
+      let stream: any;
+      try {
+         stream = gulp.src();
+      } catch (err) {
+         should.exist(err);
+         should.not.exist(stream);
+         done();
+      }
+   });
+
+   it('should explode on invalid glob (number)', done => {
+      let stream: any;
+      try {
+         stream = gulp.src(123);
+      } catch (err) {
+         should.exist(err);
+         should.not.exist(stream);
+         done();
+      }
+   });
+
+   it('should explode on invalid glob (empty array)', done => {
+      let stream: any;
+      try {
+         stream = gulp.src([]);
+      } catch (err) {
+         should.exist(err);
+         should.not.exist(stream);
+         done();
+      }
+   });
+
+   it('should pass through writes', done => {
+      const expectedPath = path.join(__dirname, "./fixtures/test.coffee");
+      const expectedContent = fs.readFileSync(expectedPath);
+
+      const expectedFile = new File({
+         base: __dirname,
+         cwd: __dirname,
+         path: expectedPath,
+         contents: expectedContent
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         bufEqual(buffered[0].contents, expectedContent).should.equal(true);
+         done();
+      };
+
+      const stream = vfs.src("./fixtures/nothing.coffee");
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should glob a file with default settings', done => {
+      const expectedPath = path.join(__dirname, "./fixtures/test.coffee");
+      const expectedContent = fs.readFileSync(expectedPath);
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         should.exist(buffered[0].stat);
+         buffered[0].path.should.equal(expectedPath);
+         buffered[0].isBuffer().should.equal(true);
+         bufEqual(buffered[0].contents, expectedContent).should.equal(true);
+         done();
+      };
+
+      const stream = vfs.src("./fixtures/*.coffee", { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+   });
+
+   it('should glob a file with default settings and relative cwd', done => {
+      const expectedPath = path.join(__dirname, "./fixtures/test.coffee");
+      const expectedContent = fs.readFileSync(expectedPath);
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         should.exist(buffered[0].stat);
+         buffered[0].path.should.equal(expectedPath);
+         buffered[0].isBuffer().should.equal(true);
+         bufEqual(buffered[0].contents, expectedContent).should.equal(true);
+         done();
+      };
+
+      const stream = vfs.src("./fixtures/*.coffee", { cwd: path.relative(process.cwd(), __dirname) });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+   });
+
+   it('should glob a directory with default settings', done => {
+      const expectedPath = path.join(__dirname, "./fixtures/wow");
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].path.should.equal(expectedPath);
+         buffered[0].isNull().should.equal(true);
+         buffered[0].isDirectory().should.equal(true);
+         done();
+      };
+
+      const stream = vfs.src("./fixtures/wow/", { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+   });
+
+   it('should glob a file with with no contents', done => {
+      const expectedPath = path.join(__dirname, "./fixtures/test.coffee");
+      const expectedContent = fs.readFileSync(expectedPath);
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].path.should.equal(expectedPath);
+         buffered[0].isNull().should.equal(true);
+         should.not.exist(buffered[0].contents);
+         done();
+      };
+
+      const stream = vfs.src("./fixtures/*.coffee", { cwd: __dirname, read: false });
+
+      const buffered: any = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+   });
+
+   it('should glob a file with streaming contents', done => {
+      const expectedPath = path.join(__dirname, "./fixtures/test.coffee");
+      const expectedContent = fs.readFileSync(expectedPath);
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         should.exist(buffered[0].stat);
+         buffered[0].path.should.equal(expectedPath);
+         buffered[0].isStream().should.equal(true);
+
+         let contentBuffer = new Buffer([]);
+         const contentBufferStream = through(dataWrap((data: any) => {
+            contentBuffer = Buffer.concat([contentBuffer, data]);
+         }));
+         buffered[0].contents.pipe(contentBufferStream);
+         buffered[0].contents.once('end', () => {
+            bufEqual(contentBuffer, expectedContent);
+            done();
+         });
+      };
+
+      const stream = vfs.src("./fixtures/*.coffee", { cwd: __dirname, buffer: false });
+
+      const buffered: any = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+   });
+});
+
+// from dest
+// const vfs = require('../');
+
+// const path = require('path');
+// const fs = require('graceful-fs');
+import rimraf = require('rimraf');
+
+// const bufEqual = require('buffer-equal');
+// const through = require('through2');
+// const File = require('vinyl');
+
+// const should = require('should');
+// require('mocha');
+
+const wipeOut = (cb: any) => {
+   rimraf(path.join(__dirname, "./out-fixtures/"), cb);
+};
+
+dataWrap = (fn: any) => {
+   return (data: any, enc: any, cb: any) => {
+      fn(data);
+      cb();
+   };
+};
+
+const realMode = (n: any) => {
+   return n & parseInt("07777", 8);
+};
+
+describe('dest stream', () => {
+   beforeEach(wipeOut);
+   afterEach(wipeOut);
+
+   it('should explode on invalid folder', done => {
+      let stream: any;
+      try {
+         stream = gulp.dest();
+      } catch (err) {
+         should.exist(err);
+         should.not.exist(stream);
+         done();
+      }
+   });
+
+   it('should pass through writes with cwd', done => {
+      const inputPath = path.join(__dirname, "./fixtures/test.coffee");
+
+      const expectedFile = new File({
+         base: __dirname,
+         cwd: __dirname,
+         path: inputPath,
+         contents: null
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         done();
+      };
+
+      const stream = vfs.dest("./out-fixtures/", { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should pass through writes with default cwd', done => {
+      const inputPath = path.join(__dirname, "./fixtures/test.coffee");
+
+      const expectedFile = new File({
+         base: __dirname,
+         cwd: __dirname,
+         path: inputPath,
+         contents: null
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         done();
+      };
+
+      const stream = vfs.dest(path.join(__dirname, "./out-fixtures/"));
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should not write null files', done => {
+      const inputPath = path.join(__dirname, "./fixtures/test.coffee");
+      const inputBase = path.join(__dirname, "./fixtures/");
+      const expectedPath = path.join(__dirname, "./out-fixtures/test.coffee");
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, "./out-fixtures");
+
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: null
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         buffered[0].cwd.should.equal(expectedCwd, 'cwd should have changed');
+         buffered[0].base.should.equal(expectedBase, 'base should have changed');
+         buffered[0].path.should.equal(expectedPath, 'path should have changed');
+         fs.existsSync(expectedPath).should.equal(false);
+         done();
+      };
+
+      const stream = vfs.dest("./out-fixtures/", { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should write buffer files to the right folder with relative cwd', done => {
+      const inputPath = path.join(__dirname, "./fixtures/test.coffee");
+      const inputBase = path.join(__dirname, "./fixtures/");
+      const expectedPath = path.join(__dirname, "./out-fixtures/test.coffee");
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, "./out-fixtures");
+      const expectedContents = fs.readFileSync(inputPath);
+
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: expectedContents
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         buffered[0].cwd.should.equal(expectedCwd, 'cwd should have changed');
+         buffered[0].base.should.equal(expectedBase, 'base should have changed');
+         buffered[0].path.should.equal(expectedPath, 'path should have changed');
+         fs.existsSync(expectedPath).should.equal(true);
+         bufEqual(fs.readFileSync(expectedPath), expectedContents).should.equal(true);
+         done();
+      };
+
+      const stream = vfs.dest("./out-fixtures/", { cwd: path.relative(process.cwd(), __dirname) });
+
+      const buffered: any = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should write buffer files to the right folder', done => {
+      const inputPath = path.join(__dirname, "./fixtures/test.coffee");
+      const inputBase = path.join(__dirname, "./fixtures/");
+      const expectedPath = path.join(__dirname, "./out-fixtures/test.coffee");
+      const expectedContents = fs.readFileSync(inputPath);
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, "./out-fixtures");
+      const expectedMode = parseInt("0655", 8);
+
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: expectedContents,
+         stat: <any> {
+            mode: expectedMode
+         } as fs.Stats
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         buffered[0].cwd.should.equal(expectedCwd, 'cwd should have changed');
+         buffered[0].base.should.equal(expectedBase, 'base should have changed');
+         buffered[0].path.should.equal(expectedPath, 'path should have changed');
+         fs.existsSync(expectedPath).should.equal(true);
+         bufEqual(fs.readFileSync(expectedPath), expectedContents).should.equal(true);
+         realMode(fs.lstatSync(expectedPath).mode).should.equal(expectedMode);
+         done();
+      };
+
+      const stream = vfs.dest("./out-fixtures/", { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should write streaming files to the right folder', done => {
+      const inputPath = path.join(__dirname, "./fixtures/test.coffee");
+      const inputBase = path.join(__dirname, "./fixtures/");
+      const expectedPath = path.join(__dirname, "./out-fixtures/test.coffee");
+      const expectedContents = fs.readFileSync(inputPath);
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, "./out-fixtures");
+      const expectedMode = parseInt("0655", 8);
+
+      const contentStream = through.obj();
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: contentStream,
+         stat: <any> {
+            mode: expectedMode
+         } as fs.Stats
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         buffered[0].cwd.should.equal(expectedCwd, 'cwd should have changed');
+         buffered[0].base.should.equal(expectedBase, 'base should have changed');
+         buffered[0].path.should.equal(expectedPath, 'path should have changed');
+         fs.existsSync(expectedPath).should.equal(true);
+         bufEqual(fs.readFileSync(expectedPath), expectedContents).should.equal(true);
+         realMode(fs.lstatSync(expectedPath).mode).should.equal(expectedMode);
+         done();
+      };
+
+      const stream = vfs.dest("./out-fixtures/", { cwd: __dirname });
+
+      const buffered: any = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      setTimeout(() => {
+         contentStream.write(expectedContents);
+         contentStream.end();
+      }, 100);
+      stream.end();
+   });
+
+   it('should write directories to the right folder', done => {
+      const inputPath = path.join(__dirname, "./fixtures/test");
+      const inputBase = path.join(__dirname, "./fixtures/");
+      const expectedPath = path.join(__dirname, "./out-fixtures/test");
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, "./out-fixtures");
+      const expectedMode = parseInt("0655", 8);
+
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: null,
+         stat: <any> {
+            isDirectory: () => true,
+            mode: expectedMode
+         } as fs.Stats
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         buffered[0].cwd.should.equal(expectedCwd, 'cwd should have changed');
+         buffered[0].base.should.equal(expectedBase, 'base should have changed');
+         buffered[0].path.should.equal(expectedPath, 'path should have changed');
+         fs.existsSync(expectedPath).should.equal(true);
+         fs.lstatSync(expectedPath).isDirectory().should.equal(true);
+         realMode(fs.lstatSync(expectedPath).mode).should.equal(expectedMode);
+         done();
+      };
+
+      const stream = vfs.dest("./out-fixtures/", { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should allow piping multiple dests in streaming mode', done => {
+      const inputPath1 = path.join(__dirname, "./out-fixtures/multiple-first");
+      const inputPath2 = path.join(__dirname, "./out-fixtures/multiple-second");
+      const inputBase = path.join(__dirname, "./out-fixtures/");
+      const srcPath = path.join(__dirname, "./fixtures/test.coffee");
+      const stream1 = vfs.dest('./out-fixtures/', { cwd: __dirname });
+      const stream2 = vfs.dest('./out-fixtures/', { cwd: __dirname });
+      const content = fs.readFileSync(srcPath);
+      const rename = through.obj((file: any, _: any, next: any) => {
+         file.path = inputPath2;
+         this.push(file);
+         next();
+      });
+
+      stream1.on('data', (file: any) => {
+         file.path.should.equal(inputPath1);
+      });
+
+      stream1.pipe(rename).pipe(stream2);
+      stream2.on('data', (file: any) => {
+         file.path.should.equal(inputPath2);
+      }).once('end', () => {
+         fs.readFileSync(inputPath1, 'utf8').should.equal(content.toString());
+         fs.readFileSync(inputPath2, 'utf8').should.equal(content.toString());
+         done();
+      });
+
+      const file = new File({
+         base: inputBase,
+         path: inputPath1,
+         cwd: __dirname,
+         contents: content
+      });
+
+      stream1.write(file);
+      stream1.end();
+   });
+});
diff --git a/types/vinyl-fs/v1/index.d.ts b/types/vinyl-fs/v1/index.d.ts
new file mode 100644
index 0000000000..2159567816
--- /dev/null
+++ b/types/vinyl-fs/v1/index.d.ts
@@ -0,0 +1,245 @@
+// Type definitions for vinyl-fs 1.0
+// Project: https://github.com/wearefractal/vinyl-fs
+// Definitions by: vvakame <https://github.com/vvakame>
+//                 remisery <https://github.com/remisery>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare global {
+   namespace NodeJS {
+      interface WritableStream {
+         write(buffer: any/* Vinyl.File */, cb?: (err?: Error | null) => void): boolean;
+      }
+   }
+}
+
+import * as _events from 'events';
+import * as File from 'vinyl';
+import * as globStream from 'glob-stream';
+
+export interface SrcOptions extends globStream.Options {
+   /** Prevents stream from emitting an error when file not found. */
+   allowEmpty?: boolean;
+
+   /** Specifies the working directory the folder is relative to */
+   cwd?: string;
+
+   /**
+    * Specifies the folder relative to the cwd
+    * This is used to determine the file names when saving in .dest()
+    * Default: where the glob begins
+    */
+   base?: string;
+
+   /**
+    * Setting this to false will make file.contents a paused stream
+    * If true it will buffer the file contents
+    * Default: true
+    */
+   buffer?: boolean;
+
+   /**
+    * The mode the directory should be created with.
+    * Default: the process mode
+    */
+   dirMode?: number;
+
+   /**
+    * Whether or not you want globs to match on dot files or not
+    * (e.g., `.gitignore`).
+    */
+   dot?: boolean;
+
+   /**
+    * Whether or not to recursively resolve symlinks to their targets.
+    * Setting to `false` to preserve them as symlinks and make `file.symlink`
+    * equal the original symlink's target path.
+    * Default: true
+    */
+   followSymlinks?: boolean;
+
+   /**
+    * Setting this to false will ignore the contents of the file and disable
+    * writing to disk to speed up operations
+    * Default: true
+    */
+   read?: boolean;
+
+   /**
+    * Whether or not the symlink should be relative or absolute.
+    * Default: false
+    */
+   relative?: boolean;
+
+   /** Only find files that have been modified since the time specified */
+   since?: Date|number;
+
+   /**
+    * Causes the BOM to be stripped on UTF-8 encoded files. Set to `false`
+    * if you need the BOM for some reason.
+    */
+   stripBOM?: boolean;
+
+   /**
+    * Setting this to true will create a duplex stream, one that passes
+    * through items and emits globbed files.
+    * Default: false
+    */
+   passthrough?: boolean;
+
+   /**
+    * Setting this to true will enable sourcemaps.
+    * Default: false
+    */
+   sourcemaps?: boolean;
+
+   /**
+    * Whether or not to recursively resolve symlinks to their targets. Setting to false to
+    * preserve them as symlinks and make file.symlink equal the original symlink's target path.
+    * Default: false
+    */
+   resolveSymlinks?: boolean;
+   /**
+    * Causes the BOM to be removed on UTF-8 encoded files. Set to false if you need the BOM for some reason.
+    * Default: true
+    */
+   removeBOM?: boolean;
+}
+
+export interface DestOptions {
+   /**
+    * Specify the working directory the folder is relative to
+    * Default is process.cwd()
+    */
+   cwd?: string;
+
+   /**
+    * Specify the mode the files should be created with
+    * Default is the mode of the input file (file.stat.mode)
+    * or the process mode if the input file has no mode property
+    */
+   mode?: number|string;
+
+   /** Specify the mode the directory should be created with. Default is the process mode */
+   dirMode?: number|string;
+
+   /** Specify if existing files with the same path should be overwritten or not. Default is true, to always overwrite existing files */
+   overwrite?: boolean;
+
+   /**
+    * Enables sourcemap support on files passed through the stream. Will write inline soucemaps if
+    * specified as true. Specifying a string path will write external sourcemaps at the given path.
+    */
+   sourcemaps?: true | string;
+
+   /**
+    * When creating a symlink, whether or not the created symlink should be relative. If false,
+    * the symlink will be absolute. Note: This option will be ignored if a junction is being created.
+    */
+   relativeSymlinks?: boolean;
+
+   /* When creating a symlink, whether or not a directory symlink should be created as a junction. */
+   useJunctions?: boolean;
+}
+
+/**
+ * Gets files that match the glob and converts them into the vinyl format
+ * @param globs Takes a glob string or an array of glob strings as the first argument
+ * Globs are executed in order, so negations should follow positive globs
+ * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
+ * @param opt Options Vinyl source options, changes the way the files are read, found, or stored in the vinyl stream
+ */
+export function src(globs: string|string[], opt?: SrcOptions): NodeJS.ReadWriteStream;
+
+/**
+ * This is just a glob-watcher
+ *
+ * @param globs Takes a glob string or an array of glob strings as the first argument
+ * Globs are executed in order, so negations should follow positive globs
+ * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
+ */
+export function watch(globs: string|string[], cb?: (outEvt: { type: any; path: any; old: any; }) => void): _events.EventEmitter;
+
+/**
+ * This is just a glob-watcher
+ *
+ * @param globs Takes a glob string or an array of glob strings as the first argument
+ * Globs are executed in order, so negations should follow positive globs
+ * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
+ */
+export function watch(
+    globs: string|string[],
+    opt?: {
+        interval?: number;
+        debounceDelay?: number;
+        cwd?: string;
+        maxListeners?(): number;
+    },
+    cb?: (outEvt: { type: any; path: any; old: any; }) => void): _events.EventEmitter;
+
+/**
+ * On write the stream will save the vinyl File to disk at the folder/cwd specified.
+ * After writing the file to disk, it will be emitted from the stream so you can keep piping these around.
+ * The file will be modified after being written to this stream:
+ * cwd, base, and path will be overwritten to match the folder
+ * stat.mode will be overwritten if you used a mode parameter
+ * contents will have it's position reset to the beginning if it is a stream
+ * @param folder destination folder
+ */
+export function dest(folder: string, opt?: DestOptions): NodeJS.ReadWriteStream;
+
+/**
+ * On write the stream will save the vinyl File to disk at the folder/cwd specified.
+ * After writing the file to disk, it will be emitted from the stream so you can keep piping these around.
+ * The file will be modified after being written to this stream:
+ * cwd, base, and path will be overwritten to match the folder
+ * stat.mode will be overwritten if you used a mode parameter
+ * contents will have it's position reset to the beginning if it is a stream
+ * @param getFolderPath function that takes in a file and returns a folder path
+ */
+export function dest(getFolderPath: (file: File) => string): NodeJS.ReadWriteStream;
+
+/**
+ * On write the stream will create a symbolic link (i.e. symlink) on disk at the folder/cwd specified.
+ * After creating the symbolic link, it will be emitted from the stream so you can keep piping these around.
+ * The file will be modified after being written to this stream:
+ * cwd, base, and path will be overwritten to match the folder
+ */
+export function symlink(folder: string, opts?: {
+   /**
+    * Specify the working directory the folder is relative to
+    * Default is process.cwd()
+    */
+   cwd?: string;
+
+   /** Specify the mode the directory should be created with. Default is the process mode */
+   mode?: number|string;
+
+   /**
+    * Specify the mode the directory should be created with
+    * Default is the process mode
+    */
+   dirMode?: number
+}): NodeJS.ReadWriteStream;
+
+/**
+ * On write the stream will create a symbolic link (i.e. symlink) on disk at the folder/cwd generated from getFolderPath.
+ * After creating the symbolic link, it will be emitted from the stream so you can keep piping these around.
+ * The file will be modified after being written to this stream:
+ * cwd, base, and path will be overwritten to match the folder
+ */
+export function symlink(getFolderPath: (File: File) => string, opts?:
+   {
+      /**
+       * Specify the working directory the folder is relative to
+       * Default is process.cwd()
+       */
+      cwd?: string;
+
+      /**
+       * Specify the mode the directory should be created with
+       * Default is the process mode
+       */
+      dirMode?: number
+   }): NodeJS.ReadWriteStream;
diff --git a/types/vinyl-fs/v1/tsconfig.json b/types/vinyl-fs/v1/tsconfig.json
new file mode 100644
index 0000000000..4e7c14e299
--- /dev/null
+++ b/types/vinyl-fs/v1/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": false,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "vinyl-fs": [
+                "vinyl-fs/v1"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "vinyl-fs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/vinyl-fs/v1/tslint.json b/types/vinyl-fs/v1/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/vinyl-fs/v1/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/vinyl-fs/v1/vinyl-fs-tests.ts b/types/vinyl-fs/v1/vinyl-fs-tests.ts
new file mode 100644
index 0000000000..5b29b0465d
--- /dev/null
+++ b/types/vinyl-fs/v1/vinyl-fs-tests.ts
@@ -0,0 +1,919 @@
+// from src
+
+import * as vfs from 'vinyl-fs';
+
+import * as path from 'path';
+import * as fs from 'fs'; // require('graceful-fs');
+
+// import bufEqual = require('buffer-equal');
+declare const bufEqual: any;
+// import through = require('through2');
+declare const through: any;
+import File = require('vinyl');
+// const spies = require('./spy');
+declare const spies: any;
+
+// 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};
+};
+
+// TODO: These aren't useful as types tests since they take `any`.
+declare const should: ShouldStatic;
+interface ShouldStatic {
+	exist(obj: any, desc?: string): void;
+	not: this;
+}
+declare global {
+	interface Object {
+		should: { equal(obj: any): void; };
+	}
+}
+
+declare const gulp: any;
+let bufferStream: any;
+
+let dataWrap = (fn: any) => {
+   return (data: any, enc: any, cb: any) => {
+      fn(data);
+      cb();
+   };
+};
+
+describe('source stream', () => {
+   it('should explode on invalid glob (empty)', done => {
+      let stream: any;
+      try {
+         stream = gulp.src();
+      } catch (err) {
+         should.exist(err);
+         should.not.exist(stream);
+         done();
+      }
+   });
+
+   it('should explode on invalid glob (number)', done => {
+      let stream: any;
+      try {
+         stream = gulp.src(123);
+      } catch (err) {
+         should.exist(err);
+         should.not.exist(stream);
+         done();
+      }
+   });
+
+   it('should explode on invalid glob (empty array)', done => {
+      let stream: any;
+      try {
+         stream = gulp.src([]);
+      } catch (err) {
+         should.exist(err);
+         should.not.exist(stream);
+         done();
+      }
+   });
+
+   it('should pass through writes', done => {
+      const expectedPath = path.join(__dirname, "./fixtures/test.coffee");
+      const expectedContent = fs.readFileSync(expectedPath);
+
+      const expectedFile = new File({
+         base: __dirname,
+         cwd: __dirname,
+         path: expectedPath,
+         contents: expectedContent
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         bufEqual(buffered[0].contents, expectedContent).should.equal(true);
+         done();
+      };
+
+      const stream = vfs.src("./fixtures/nothing.coffee");
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should glob a file with default settings', done => {
+      const expectedPath = path.join(__dirname, "./fixtures/test.coffee");
+      const expectedContent = fs.readFileSync(expectedPath);
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         should.exist(buffered[0].stat);
+         buffered[0].path.should.equal(expectedPath);
+         buffered[0].isBuffer().should.equal(true);
+         bufEqual(buffered[0].contents, expectedContent).should.equal(true);
+         done();
+      };
+
+      const stream = vfs.src("./fixtures/*.coffee", { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+   });
+
+   it('should glob a file with default settings and relative cwd', done => {
+      const expectedPath = path.join(__dirname, "./fixtures/test.coffee");
+      const expectedContent = fs.readFileSync(expectedPath);
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         should.exist(buffered[0].stat);
+         buffered[0].path.should.equal(expectedPath);
+         buffered[0].isBuffer().should.equal(true);
+         bufEqual(buffered[0].contents, expectedContent).should.equal(true);
+         done();
+      };
+
+      const stream = vfs.src("./fixtures/*.coffee", { cwd: path.relative(process.cwd(), __dirname) });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+   });
+
+   it('should glob a directory with default settings', done => {
+      const expectedPath = path.join(__dirname, "./fixtures/wow");
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].path.should.equal(expectedPath);
+         buffered[0].isNull().should.equal(true);
+         buffered[0].isDirectory().should.equal(true);
+         done();
+      };
+
+      const stream = vfs.src("./fixtures/wow/", { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+   });
+
+   it('should glob a file with with no contents', done => {
+      const expectedPath = path.join(__dirname, "./fixtures/test.coffee");
+      const expectedContent = fs.readFileSync(expectedPath);
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].path.should.equal(expectedPath);
+         buffered[0].isNull().should.equal(true);
+         should.not.exist(buffered[0].contents);
+         done();
+      };
+
+      const stream = vfs.src("./fixtures/*.coffee", { cwd: __dirname, read: false });
+
+      const buffered: any = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+   });
+
+   it('should glob a file with streaming contents', done => {
+      const expectedPath = path.join(__dirname, "./fixtures/test.coffee");
+      const expectedContent = fs.readFileSync(expectedPath);
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         should.exist(buffered[0].stat);
+         buffered[0].path.should.equal(expectedPath);
+         buffered[0].isStream().should.equal(true);
+
+         let contentBuffer = new Buffer([]);
+         const contentBufferStream = through(dataWrap((data: any) => {
+            contentBuffer = Buffer.concat([contentBuffer, data]);
+         }));
+         buffered[0].contents.pipe(contentBufferStream);
+         buffered[0].contents.once('end', () => {
+            bufEqual(contentBuffer, expectedContent);
+            done();
+         });
+      };
+
+      const stream = vfs.src("./fixtures/*.coffee", { cwd: __dirname, buffer: false });
+
+      const buffered: any = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+   });
+});
+
+// from dest
+// const vfs = require('../');
+
+// const path = require('path');
+// const fs = require('graceful-fs');
+import rimraf = require('rimraf');
+
+// const bufEqual = require('buffer-equal');
+// const through = require('through2');
+// const File = require('vinyl');
+
+// const should = require('should');
+// require('mocha');
+
+let wipeOut = (cb: any) => {
+   rimraf(path.join(__dirname, "./out-fixtures/"), cb);
+};
+
+dataWrap = (fn: any) => {
+   return (data: any, enc: any, cb: any) => {
+      fn(data);
+      cb();
+   };
+};
+
+let realMode = (n: any) => {
+   return n & parseInt("07777", 8);
+};
+
+describe('dest stream', () => {
+   beforeEach(wipeOut);
+   afterEach(wipeOut);
+
+   it('should explode on invalid folder', done => {
+      let stream: any;
+      try {
+         stream = gulp.dest();
+      } catch (err) {
+         should.exist(err);
+         should.not.exist(stream);
+         done();
+      }
+   });
+
+   it('should pass through writes with cwd', done => {
+      const inputPath = path.join(__dirname, "./fixtures/test.coffee");
+
+      const expectedFile = new File({
+         base: __dirname,
+         cwd: __dirname,
+         path: inputPath,
+         contents: null
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         done();
+      };
+
+      const stream = vfs.dest("./out-fixtures/", { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should pass through writes with default cwd', done => {
+      const inputPath = path.join(__dirname, "./fixtures/test.coffee");
+
+      const expectedFile = new File({
+         base: __dirname,
+         cwd: __dirname,
+         path: inputPath,
+         contents: null
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         done();
+      };
+
+      const stream = vfs.dest(path.join(__dirname, "./out-fixtures/"));
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should not write null files', done => {
+      const inputPath = path.join(__dirname, "./fixtures/test.coffee");
+      const inputBase = path.join(__dirname, "./fixtures/");
+      const expectedPath = path.join(__dirname, "./out-fixtures/test.coffee");
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, "./out-fixtures");
+
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: null
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         buffered[0].cwd.should.equal(expectedCwd, 'cwd should have changed');
+         buffered[0].base.should.equal(expectedBase, 'base should have changed');
+         buffered[0].path.should.equal(expectedPath, 'path should have changed');
+         fs.existsSync(expectedPath).should.equal(false);
+         done();
+      };
+
+      const stream = vfs.dest("./out-fixtures/", { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should write buffer files to the right folder with relative cwd', done => {
+      const inputPath = path.join(__dirname, "./fixtures/test.coffee");
+      const inputBase = path.join(__dirname, "./fixtures/");
+      const expectedPath = path.join(__dirname, "./out-fixtures/test.coffee");
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, "./out-fixtures");
+      const expectedContents = fs.readFileSync(inputPath);
+
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: expectedContents
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         buffered[0].cwd.should.equal(expectedCwd, 'cwd should have changed');
+         buffered[0].base.should.equal(expectedBase, 'base should have changed');
+         buffered[0].path.should.equal(expectedPath, 'path should have changed');
+         fs.existsSync(expectedPath).should.equal(true);
+         bufEqual(fs.readFileSync(expectedPath), expectedContents).should.equal(true);
+         done();
+      };
+
+      const stream = vfs.dest("./out-fixtures/", { cwd: path.relative(process.cwd(), __dirname) });
+
+      const buffered: any = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should write buffer files to the right folder', done => {
+      const inputPath = path.join(__dirname, "./fixtures/test.coffee");
+      const inputBase = path.join(__dirname, "./fixtures/");
+      const expectedPath = path.join(__dirname, "./out-fixtures/test.coffee");
+      const expectedContents = fs.readFileSync(inputPath);
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, "./out-fixtures");
+      const expectedMode = parseInt("0655", 8);
+
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: expectedContents,
+         stat: <any> {
+            mode: expectedMode
+         } as fs.Stats
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         buffered[0].cwd.should.equal(expectedCwd, 'cwd should have changed');
+         buffered[0].base.should.equal(expectedBase, 'base should have changed');
+         buffered[0].path.should.equal(expectedPath, 'path should have changed');
+         fs.existsSync(expectedPath).should.equal(true);
+         bufEqual(fs.readFileSync(expectedPath), expectedContents).should.equal(true);
+         realMode(fs.lstatSync(expectedPath).mode).should.equal(expectedMode);
+         done();
+      };
+
+      const stream = vfs.dest("./out-fixtures/", { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should write streaming files to the right folder', done => {
+      const inputPath = path.join(__dirname, "./fixtures/test.coffee");
+      const inputBase = path.join(__dirname, "./fixtures/");
+      const expectedPath = path.join(__dirname, "./out-fixtures/test.coffee");
+      const expectedContents = fs.readFileSync(inputPath);
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, "./out-fixtures");
+      const expectedMode = parseInt("0655", 8);
+
+      const contentStream = through.obj();
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: contentStream,
+         stat: <any> {
+            mode: expectedMode
+         } as fs.Stats
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         buffered[0].cwd.should.equal(expectedCwd, 'cwd should have changed');
+         buffered[0].base.should.equal(expectedBase, 'base should have changed');
+         buffered[0].path.should.equal(expectedPath, 'path should have changed');
+         fs.existsSync(expectedPath).should.equal(true);
+         bufEqual(fs.readFileSync(expectedPath), expectedContents).should.equal(true);
+         realMode(fs.lstatSync(expectedPath).mode).should.equal(expectedMode);
+         done();
+      };
+
+      const stream = vfs.dest("./out-fixtures/", { cwd: __dirname });
+
+      const buffered: any = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      setTimeout(() => {
+         contentStream.write(expectedContents);
+         contentStream.end();
+      }, 100);
+      stream.end();
+   });
+
+   it('should write directories to the right folder', done => {
+      const inputPath = path.join(__dirname, "./fixtures/test");
+      const inputBase = path.join(__dirname, "./fixtures/");
+      const expectedPath = path.join(__dirname, "./out-fixtures/test");
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, "./out-fixtures");
+      const expectedMode = parseInt("0655", 8);
+
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: null,
+         stat: <any> {
+            isDirectory: () => true,
+            mode: expectedMode
+         } as fs.Stats
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         buffered[0].cwd.should.equal(expectedCwd, 'cwd should have changed');
+         buffered[0].base.should.equal(expectedBase, 'base should have changed');
+         buffered[0].path.should.equal(expectedPath, 'path should have changed');
+         fs.existsSync(expectedPath).should.equal(true);
+         fs.lstatSync(expectedPath).isDirectory().should.equal(true);
+         realMode(fs.lstatSync(expectedPath).mode).should.equal(expectedMode);
+         done();
+      };
+
+      const stream = vfs.dest("./out-fixtures/", { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should allow piping multiple dests in streaming mode', done => {
+      const inputPath1 = path.join(__dirname, "./out-fixtures/multiple-first");
+      const inputPath2 = path.join(__dirname, "./out-fixtures/multiple-second");
+      const inputBase = path.join(__dirname, "./out-fixtures/");
+      const srcPath = path.join(__dirname, "./fixtures/test.coffee");
+      const stream1 = vfs.dest('./out-fixtures/', { cwd: __dirname });
+      const stream2 = vfs.dest('./out-fixtures/', { cwd: __dirname });
+      const content = fs.readFileSync(srcPath);
+      const rename = through.obj((file: any, _: any, next: any) => {
+         file.path = inputPath2;
+         this.push(file);
+         next();
+      });
+
+      stream1.on('data', (file: any) => {
+         file.path.should.equal(inputPath1);
+      });
+
+      stream1.pipe(rename).pipe(stream2);
+      stream2.on('data', (file: any) => {
+         file.path.should.equal(inputPath2);
+      }).once('end', () => {
+         fs.readFileSync(inputPath1, 'utf8').should.equal(content.toString());
+         fs.readFileSync(inputPath2, 'utf8').should.equal(content.toString());
+         done();
+      });
+
+      const file = new File({
+         base: inputBase,
+         path: inputPath1,
+         cwd: __dirname,
+         contents: content
+      });
+
+      stream1.write(file);
+      stream1.end();
+   });
+});
+
+// This test is from
+
+const chmodSpy = spies.chmodSpy;
+const statSpy = spies.statSpy;
+
+wipeOut = (cb: any) => {
+   rimraf(path.join(__dirname, './out-fixtures/'), cb);
+   spies.setError('false');
+   statSpy.reset();
+   chmodSpy.reset();
+};
+
+dataWrap = (fn: any) => {
+   return (data: any, enc: any, cb: any) => {
+      fn(data);
+      cb();
+   };
+};
+
+realMode = (n: any) => {
+   return n & parseInt("07777", 8);
+};
+
+describe('symlink stream', () => {
+   beforeEach(wipeOut);
+   afterEach(wipeOut);
+
+   it('should explode on invalid folder', (done: any) => {
+      let stream: any;
+      try {
+         stream = gulp.symlink();
+      } catch (err) {
+         should.exist(err);
+         should.not.exist(stream);
+         done();
+      }
+   });
+
+   it('should pass through writes with cwd', done => {
+      const inputPath = path.join(__dirname, './fixtures/test.coffee');
+
+      const expectedFile = new File({
+         base: __dirname,
+         cwd: __dirname,
+         path: inputPath,
+         contents: null
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         done();
+      };
+
+      const stream = vfs.symlink('./out-fixtures/', { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should pass through writes with default cwd', done => {
+      const inputPath = path.join(__dirname, './fixtures/test.coffee');
+
+      const expectedFile = new File({
+         base: __dirname,
+         cwd: __dirname,
+         path: inputPath,
+         contents: null
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         done();
+      };
+
+      const stream = vfs.symlink(path.join(__dirname, './out-fixtures/'));
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should make link to the right folder with relative cwd', done => {
+      const inputPath = path.join(__dirname, './fixtures/test.coffee');
+      const inputBase = path.join(__dirname, './fixtures/');
+      const expectedPath = path.join(__dirname, './out-fixtures/test.coffee');
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, './out-fixtures');
+      const expectedContents = fs.readFileSync(inputPath);
+
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: expectedContents
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         buffered[0].cwd.should.equal(__dirname, 'cwd should have changed');
+         buffered[0].base.should.equal(expectedBase, 'base should have changed');
+         buffered[0].path.should.equal(expectedPath, 'path should have changed');
+         fs.existsSync(expectedPath).should.equal(true);
+         bufEqual(fs.readFileSync(expectedPath), expectedContents).should.equal(true);
+         fs.readlinkSync(expectedPath).should.equal(inputPath);
+         done();
+      };
+
+      const stream = vfs.symlink('./out-fixtures/', { cwd: path.relative(process.cwd(), __dirname) });
+
+      const buffered: any = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should write buffer files to the right folder with function and relative cwd', done => {
+      const inputPath = path.join(__dirname, './fixtures/test.coffee');
+      const inputBase = path.join(__dirname, './fixtures/');
+      const expectedPath = path.join(__dirname, './out-fixtures/test.coffee');
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, './out-fixtures');
+      const expectedContents = fs.readFileSync(inputPath);
+
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: expectedContents
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         buffered[0].cwd.should.equal(__dirname, 'cwd should have changed');
+         buffered[0].base.should.equal(expectedBase, 'base should have changed');
+         buffered[0].path.should.equal(expectedPath, 'path should have changed');
+         fs.existsSync(expectedPath).should.equal(true);
+         bufEqual(fs.readFileSync(expectedPath), expectedContents).should.equal(true);
+         fs.readlinkSync(expectedPath).should.equal(inputPath);
+         done();
+      };
+
+      const stream = vfs.symlink(file => {
+         should.exist(file);
+         file.should.equal(expectedFile);
+         return './out-fixtures';
+      }, { cwd: path.relative(process.cwd(), __dirname) });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should write buffer files to the right folder', done => {
+      const inputPath = path.join(__dirname, './fixtures/test.coffee');
+      const inputBase = path.join(__dirname, './fixtures/');
+      const expectedPath = path.join(__dirname, './out-fixtures/test.coffee');
+      const expectedContents = fs.readFileSync(inputPath);
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, './out-fixtures');
+      const expectedMode = parseInt("0655", 8);
+
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: expectedContents,
+         stat: <any> {
+            mode: expectedMode
+         } as fs.Stats
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         buffered[0].cwd.should.equal(__dirname, 'cwd should have changed');
+         buffered[0].base.should.equal(expectedBase, 'base should have changed');
+         buffered[0].path.should.equal(expectedPath, 'path should have changed');
+         fs.existsSync(expectedPath).should.equal(true);
+         bufEqual(fs.readFileSync(expectedPath), expectedContents).should.equal(true);
+         fs.readlinkSync(expectedPath).should.equal(inputPath);
+         done();
+      };
+
+      const stream = vfs.symlink('./out-fixtures/', { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should write streaming files to the right folder', done => {
+      const inputPath = path.join(__dirname, './fixtures/test.coffee');
+      const inputBase = path.join(__dirname, './fixtures/');
+      const expectedPath = path.join(__dirname, './out-fixtures/test.coffee');
+      const expectedContents = fs.readFileSync(inputPath);
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, './out-fixtures');
+      const expectedMode = parseInt("0655", 8);
+
+      const contentStream = through.obj();
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: contentStream,
+         stat: <any> {
+            mode: expectedMode
+         } as fs.Stats
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         buffered[0].cwd.should.equal(__dirname, 'cwd should have changed');
+         buffered[0].base.should.equal(expectedBase, 'base should have changed');
+         buffered[0].path.should.equal(expectedPath, 'path should have changed');
+         fs.existsSync(expectedPath).should.equal(true);
+         bufEqual(fs.readFileSync(expectedPath), expectedContents).should.equal(true);
+         fs.readlinkSync(expectedPath).should.equal(inputPath);
+         done();
+      };
+
+      const stream = vfs.symlink('./out-fixtures/', { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      setTimeout(() => {
+         contentStream.write(expectedContents);
+         contentStream.end();
+      }, 100);
+      stream.end();
+   });
+
+   it('should write directories to the right folder', done => {
+      const inputPath = path.join(__dirname, './fixtures/wow');
+      const inputBase = path.join(__dirname, './fixtures/');
+      const expectedPath = path.join(__dirname, './out-fixtures/wow');
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, './out-fixtures');
+      const expectedMode = parseInt("0655", 8);
+
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: null,
+         stat: <any> {
+            isDirectory: () => true,
+            mode: expectedMode
+         } as fs.Stats
+      });
+
+      const onEnd = () => {
+         buffered.length.should.equal(1);
+         buffered[0].should.equal(expectedFile);
+         buffered[0].cwd.should.equal(__dirname, 'cwd should have changed');
+         buffered[0].base.should.equal(expectedBase, 'base should have changed');
+         buffered[0].path.should.equal(expectedPath, 'path should have changed');
+         fs.readlinkSync(expectedPath).should.equal(inputPath);
+         fs.lstatSync(expectedPath).isDirectory().should.equal(false);
+         fs.statSync(expectedPath).isDirectory().should.equal(true);
+         done();
+      };
+
+      const stream = vfs.symlink('./out-fixtures/', { cwd: __dirname });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+      stream.pipe(bufferStream);
+      stream.write(expectedFile);
+      stream.end();
+   });
+
+   it('should use different modes for files and directories', done => {
+      const inputBase = path.join(__dirname, './fixtures');
+      const inputPath = path.join(__dirname, './fixtures/wow/suchempty');
+      const expectedBase = path.join(__dirname, './out-fixtures/wow');
+      const expectedDirMode = parseInt("0755", 8);
+      const expectedFileMode = parseInt("0655", 8);
+
+      const firstFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         stat: fs.statSync(inputPath)
+      });
+
+      const onEnd = () => {
+         realMode(fs.lstatSync(expectedBase).mode).should.equal(expectedDirMode);
+         realMode(buffered[0].stat.mode).should.equal(expectedFileMode);
+         done();
+      };
+
+      const stream = vfs.symlink('./out-fixtures/', {
+         cwd: __dirname,
+         mode: expectedFileMode,
+         dirMode: expectedDirMode
+      });
+
+      const buffered: any[] = [];
+      bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
+
+      stream.pipe(bufferStream);
+      stream.write(firstFile);
+      stream.end();
+   });
+
+   it('should report IO errors', done => {
+      const inputPath = path.join(__dirname, './fixtures/test.coffee');
+      const inputBase = path.join(__dirname, './fixtures/');
+      const expectedPath = path.join(__dirname, './out-fixtures/test.coffee');
+      const expectedContents = fs.readFileSync(inputPath);
+      const expectedCwd = __dirname;
+      const expectedBase = path.join(__dirname, './out-fixtures');
+      const expectedMode = parseInt("0722", 8);
+
+      const expectedFile = new File({
+         base: inputBase,
+         cwd: __dirname,
+         path: inputPath,
+         contents: expectedContents,
+         stat: <any> {
+            mode: expectedMode
+         } as fs.Stats
+      });
+
+      fs.mkdirSync(expectedBase);
+      fs.chmodSync(expectedBase, 0);
+
+      const stream = vfs.symlink('./out-fixtures/', { cwd: __dirname });
+      stream.on('error', (err: any) => {
+         err.code.should.equal('EACCES');
+         done();
+      });
+      stream.write(expectedFile);
+   });
+
+   ['end', 'finish'].forEach(eventName => {
+      it(`should emit ${eventName} event`, done => {
+         const srcPath = path.join(__dirname, './fixtures/test.coffee');
+         const stream = vfs.symlink('./out-fixtures/', { cwd: __dirname });
+
+         stream.on(eventName, () => {
+            done();
+         });
+
+         const file = new File({
+            path: srcPath,
+            cwd: __dirname,
+            contents: new Buffer("1234567890")
+         });
+
+         stream.write(file);
+         stream.end();
+      });
+   });
+   it('should check if it"s a vinyl file', () => {
+      const srcPath = path.join(__dirname, './fixtures/test.coffee');
+      const options = {
+         path: srcPath,
+         cwd: __dirname,
+         contents: new Buffer("1234567890")
+      };
+      const file = new File(options);
+      File.isVinyl(file).should.equal(true);
+      File.isVinyl(options).should.equal(false);
+   });
+});
diff --git a/types/vinyl-fs/vinyl-fs-tests.ts b/types/vinyl-fs/vinyl-fs-tests.ts
index aac3c4f49e..2a38bcf811 100644
--- a/types/vinyl-fs/vinyl-fs-tests.ts
+++ b/types/vinyl-fs/vinyl-fs-tests.ts
@@ -3,13 +3,14 @@
 import * as vfs from 'vinyl-fs';
 
 import * as path from 'path';
-import * as fs from 'fs'; // require('graceful-fs');
+import * as fs from 'fs';
+import * as stream from 'stream';
 
 // import bufEqual = require('buffer-equal');
 declare const bufEqual: any;
-// import through = require('through2');
-declare const through: any;
+import gulp = require('gulp');
 import File = require('vinyl');
+import through = require('through2');
 // const spies = require('./spy');
 declare const spies: any;
 
@@ -30,8 +31,7 @@ declare global {
 	}
 }
 
-declare const gulp: any;
-let bufferStream: any;
+let bufferStream: stream.Transform;
 
 let dataWrap = (fn: any) => {
    return (data: any, enc: any, cb: any) => {
@@ -44,7 +44,7 @@ describe('source stream', () => {
    it('should explode on invalid glob (empty)', done => {
       let stream: any;
       try {
-         stream = gulp.src();
+         stream = (<any> gulp).src();
       } catch (err) {
          should.exist(err);
          should.not.exist(stream);
@@ -55,7 +55,7 @@ describe('source stream', () => {
    it('should explode on invalid glob (number)', done => {
       let stream: any;
       try {
-         stream = gulp.src(123);
+         stream = gulp.src(<any> 123);
       } catch (err) {
          should.exist(err);
          should.not.exist(stream);
@@ -243,7 +243,7 @@ describe('dest stream', () => {
    it('should explode on invalid folder', done => {
       let stream: any;
       try {
-         stream = gulp.dest();
+         stream = (<any> gulp).dest();
       } catch (err) {
          should.exist(err);
          should.not.exist(stream);
@@ -383,7 +383,7 @@ describe('dest stream', () => {
          cwd: __dirname,
          path: inputPath,
          contents: expectedContents,
-         stat: {
+         stat: <any> {
             mode: expectedMode
          } as fs.Stats
       });
@@ -424,7 +424,7 @@ describe('dest stream', () => {
          cwd: __dirname,
          path: inputPath,
          contents: contentStream,
-         stat: {
+         stat: <any> {
             mode: expectedMode
          } as fs.Stats
       });
@@ -467,7 +467,7 @@ describe('dest stream', () => {
          cwd: __dirname,
          path: inputPath,
          contents: null,
-         stat: {
+         stat: <any> {
             isDirectory: () => true,
             mode: expectedMode
          } as fs.Stats
@@ -502,7 +502,7 @@ describe('dest stream', () => {
       const stream1 = vfs.dest('./out-fixtures/', { cwd: __dirname });
       const stream2 = vfs.dest('./out-fixtures/', { cwd: __dirname });
       const content = fs.readFileSync(srcPath);
-      const rename = through.obj((file: any, _: any, next: any) => {
+      const rename = through.obj(function t(this: stream.Transform, file: any, _: any, next: any) {
          file.path = inputPath2;
          this.push(file);
          next();
@@ -563,7 +563,7 @@ describe('symlink stream', () => {
    it('should explode on invalid folder', (done: any) => {
       let stream: any;
       try {
-         stream = gulp.symlink();
+         stream = (<any> gulp).symlink();
       } catch (err) {
          should.exist(err);
          should.not.exist(stream);
@@ -711,7 +711,7 @@ describe('symlink stream', () => {
          cwd: __dirname,
          path: inputPath,
          contents: expectedContents,
-         stat: {
+         stat: <any> {
             mode: expectedMode
          } as fs.Stats
       });
@@ -752,7 +752,7 @@ describe('symlink stream', () => {
          cwd: __dirname,
          path: inputPath,
          contents: contentStream,
-         stat: {
+         stat: <any> {
             mode: expectedMode
          } as fs.Stats
       });
@@ -795,7 +795,7 @@ describe('symlink stream', () => {
          cwd: __dirname,
          path: inputPath,
          contents: null,
-         stat: {
+         stat: <any> {
             isDirectory: () => true,
             mode: expectedMode
          } as fs.Stats
@@ -870,7 +870,7 @@ describe('symlink stream', () => {
          cwd: __dirname,
          path: inputPath,
          contents: expectedContents,
-         stat: {
+         stat: <any> {
             mode: expectedMode
          } as fs.Stats
       });
diff --git a/types/virtual-keyboard/index.d.ts b/types/virtual-keyboard/index.d.ts
index b7c248e4a5..67df253e78 100644
--- a/types/virtual-keyboard/index.d.ts
+++ b/types/virtual-keyboard/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for virtual-keyboard 1.26
-// Project: https://www.npmjs.com/package/virtual-keyboard
+// Project: https://github.com/mottie/keyboard
 // Definitions by: Bogdan Surai <https://github.com/bsurai>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/vis/index.d.ts b/types/vis/index.d.ts
index 84ff769270..827c71b260 100644
--- a/types/vis/index.d.ts
+++ b/types/vis/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for vis.js 4.21
-// Project: https://github.com/almende/vis
+// Project: https://github.com/almende/vis, http://visjs.org
 // Definitions by: Michaël Bitard <https://github.com/MichaelBitard>
 //                 MacLeod Broad <https://github.com/macleodbroad-wf>
 //                 Adrian Caballero <https://github.com/adripanico>
@@ -459,7 +459,7 @@ export class DataSet<T extends DataItem | DataGroup | Node | Edge> {
    * @returns When no item is found, null is returned when a single item was requested,
    * and and empty Array is returned in case of multiple id's.
    */
-  get(id: IdType, options?: DataSelectionOptions<T>): T;
+  get(id: IdType, options?: DataSelectionOptions<T>): T|null;
 
   /**
    * Get multiple items from the DataSet.
@@ -494,7 +494,7 @@ export class DataSet<T extends DataItem | DataGroup | Node | Edge> {
    * @param [options] Optional options.
    * @returns The mapped items.
    */
-  map(callback: (item: T, id: IdType) => any, options?: DataSelectionOptions<T>): any[];
+  map<M>(callback: (item: T, id: IdType) => M, options?: DataSelectionOptions<T>): M[];
 
   /**
    * Find the item with maximum value of specified field.
@@ -589,7 +589,7 @@ export interface DataSelectionOptions<T> {
   /**
    * Order the items by a field name or custom sort function.
    */
-  order?: string | any;
+  order?: string | ((a: T, b: T) => number);
 
   /**
    * Determine the type of output of the get function.
@@ -597,7 +597,7 @@ export interface DataSelectionOptions<T> {
    * The default returnType is an Array.
    * The Object type will return a JSON object with the ID's as keys.
    */
-  returnType?: string;
+  returnType?: "Array" | "Object";
 }
 
 export class DataView<T extends DataItem | DataGroup> {
diff --git a/types/vuelidate/index.d.ts b/types/vuelidate/index.d.ts
index bd981cac73..cc8169cbda 100644
--- a/types/vuelidate/index.d.ts
+++ b/types/vuelidate/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for vuelidate 0.7
-// Project: https://github.com/janesser/vuelidate.ts
+// Project: https://github.com/monterail/vuelidate
 // Definitions by: Jan Esser <https://github.com/janesser>
 //                 Jubair Saidi <https://github.com/jubairsaidi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/w3c-css-typed-object-model-level-1/index.d.ts b/types/w3c-css-typed-object-model-level-1/index.d.ts
index f1d68b2e94..4e1db5b6be 100644
--- a/types/w3c-css-typed-object-model-level-1/index.d.ts
+++ b/types/w3c-css-typed-object-model-level-1/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for css-typed-object-model-level-1 20180410.0
+// Type definitions for non-npm package css-typed-object-model-level-1 20180410.0
 // Project: https://www.w3.org/TR/css-typed-om-1/
 // Definitions by: Dmitry Guketlev <https://github.com/yavanosta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/w3c-generic-sensor/index.d.ts b/types/w3c-generic-sensor/index.d.ts
index 70e41c87bf..399f1b6674 100644
--- a/types/w3c-generic-sensor/index.d.ts
+++ b/types/w3c-generic-sensor/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for W3C Generic Sensor API 1.0
+// Type definitions for non-npm package W3C Generic Sensor API 1.0
 // Project: https://www.w3.org/TR/generic-sensor/
 // Definitions by: Kenneth Rohde Christiansen <https://github.com/kenchris>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/w3c-image-capture/index.d.ts b/types/w3c-image-capture/index.d.ts
index 24a7d917c4..3af96bfd81 100644
--- a/types/w3c-image-capture/index.d.ts
+++ b/types/w3c-image-capture/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for W3C Image Capture 1.0
+// Type definitions for non-npm package W3C Image Capture 1.0
 // Project: https://www.w3.org/TR/image-capture/
 // Definitions by: Cosium <https://github.com/cosium>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/w3c-permissions/index.d.ts b/types/w3c-permissions/index.d.ts
index b7658c2e6c..b8fc66bba9 100644
--- a/types/w3c-permissions/index.d.ts
+++ b/types/w3c-permissions/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for W3C Permissions API 1.0
+// Type definitions for non-npm package W3C Permissions API 1.0
 // Project: https://www.w3.org/TR/permissions/
 // Definitions by: Julien Bérubé <https://github.com/jberube>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/w3c-screen-orientation/index.d.ts b/types/w3c-screen-orientation/index.d.ts
index 7cac6c33f3..b8b4226aee 100644
--- a/types/w3c-screen-orientation/index.d.ts
+++ b/types/w3c-screen-orientation/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for W3C Screen Orientation API 1.0
+// Type definitions for non-npm package W3C Screen Orientation API 1.0
 // Project: https://www.w3.org/TR/screen-orientation/
 // Definitions by: Kenneth Rohde Christiansen <https://github.com/kenchris>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/w3c-web-usb/index.d.ts b/types/w3c-web-usb/index.d.ts
index d596351a5b..96deebfaf5 100644
--- a/types/w3c-web-usb/index.d.ts
+++ b/types/w3c-web-usb/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for W3C Web USB API 1.0
+// Type definitions for non-npm package W3C Web USB API 1.0
 // Project: https://wicg.github.io/webusb/
 // Definitions by: Lars Knudsen <https://github.com/larsgk>
+//                 Rob Moran <https://github.com/thegecko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 type USBDirection = "in" | "out";
 type USBEndpointType = "bulk" | "interrupt" | "isochronous";
@@ -111,8 +112,8 @@ declare class USB extends EventTarget {
     ondisconnect(): (this: this, ev: Event) => any;
     getDevices(): Promise<USBDevice[]>;
     requestDevice(options?: USBDeviceRequestOptions): Promise<USBDevice>;
-
     addEventListener(type: "connect" | "disconnect", listener: (this: this, ev: USBConnectionEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject | null, options?: boolean | AddEventListenerOptions): void;
 }
 
 declare class USBDevice {
diff --git a/types/w3c-web-usb/tsconfig.json b/types/w3c-web-usb/tsconfig.json
index dc162699e6..f31c4545e4 100644
--- a/types/w3c-web-usb/tsconfig.json
+++ b/types/w3c-web-usb/tsconfig.json
@@ -8,7 +8,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -21,4 +21,4 @@
         "index.d.ts",
         "w3c-web-usb-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/wait-on/index.d.ts b/types/wait-on/index.d.ts
new file mode 100644
index 0000000000..55275a24e0
--- /dev/null
+++ b/types/wait-on/index.d.ts
@@ -0,0 +1,94 @@
+// Type definitions for wait-on 3.2
+// Project: https://github.com/jeffbski/wait-on#readme
+// Definitions by: Ifiok Jr. <https://github.com/ifiokjr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export = waitOn;
+
+declare function waitOn(options: waitOn.WaitOnOptions): Promise<void>;
+declare function waitOn(
+    options: waitOn.WaitOnOptions,
+    cb: (err: any) => void,
+): void;
+
+declare namespace waitOn {
+    interface WaitOnOptions {
+        /**
+         * Array of string resources to wait for. prefix determines the type of resource with the default type of file:
+         */
+        resources: string[];
+        /**
+         * Initial delay in ms.
+         * @default 0
+         */
+        delay?: number;
+        /**
+         * Poll resource interval in ms,
+         * @default 250ms
+         */
+        interval?: number;
+        /**
+         * Flag which outputs to stdout, remaining resources waited on and when complete or any error occurs.
+         */
+        log?: boolean;
+        /**
+         * Flag to reverse operation so checks are for resources being NOT available.
+         * @default false
+         */
+        reverse?: boolean;
+        /**
+         * Timeout in ms until it aborts with error.
+         * @default Infinity
+         */
+        timeout?: number;
+        /**
+         * Tcp timeout in ms.
+         * @default 300
+         */
+        tcpTimeout?: number;
+        /**
+         * Flag which outputs debug output.
+         * @default false
+         */
+        verbose?: boolean;
+        /**
+         * Stabilization time in ms
+         * Waits this amount of time for file sizes to stabilize or other resource availability to remain unchanged.
+         * @default 750ms.
+         */
+        window?: number;
+
+        /**
+         * Https specific option.
+         * see https:// github.com/request/request#readme for specific details
+         */
+        auth?: WaitOnAuth;
+        httpSignature?: HttpSignature;
+        strictSSL?: boolean;
+        followAllRedirects?: boolean;
+        followRedirect?: boolean;
+        headers?: Record<string, any>;
+    }
+
+    interface HttpSignature {
+        keyId: string;
+        key: string;
+    }
+
+    type WaitOnAuth =
+        | {
+              username: string;
+              password: string;
+          }
+        | {
+              /**
+               * Alias of username
+               */
+              user: string;
+              /**
+               * Alias of password
+               */
+              pass: string;
+          };
+}
diff --git a/types/wait-on/tsconfig.json b/types/wait-on/tsconfig.json
new file mode 100644
index 0000000000..c400fad2fe
--- /dev/null
+++ b/types/wait-on/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", "wait-on-tests.ts"]
+}
diff --git a/types/wait-on/tslint.json b/types/wait-on/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/wait-on/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/wait-on/wait-on-tests.ts b/types/wait-on/wait-on-tests.ts
new file mode 100644
index 0000000000..dea9a9c262
--- /dev/null
+++ b/types/wait-on/wait-on-tests.ts
@@ -0,0 +1,75 @@
+import waitOn = require('wait-on');
+
+const opts = {
+    resources: [
+        'file1',
+        'http://foo.com:8000/bar',
+        'https://my.com/cat',
+        'http-get://foo.com:8000/bar',
+        'https-get://my.com/cat',
+        'tcp:foo.com:8000',
+        'socket:/my/sock',
+        'http://unix:/my/sock:/my/url',
+        'http-get://unix:/my/sock:/my/url',
+    ],
+    delay: 1000, // initial delay in ms, default 0
+    interval: 100, // poll interval in ms, default 250ms
+    timeout: 30000, // timeout in ms, default Infinity
+    tcpTimeout: 1000, // tcp timeout in ms, default 300ms
+    window: 1000, // stabilization time in ms, default 750ms
+
+    // http options
+    ca: [
+        /* strings or binaries */
+    ],
+    cert: [
+        /* strings or binaries */
+    ],
+    key: [
+        /* strings or binaries */
+    ],
+    passphrase: 'yourpassphrase',
+    auth: {
+        user: 'theuser', // or username
+        pass: 'thepassword', // or password
+    },
+    httpSignature: {
+        keyId: 'yourKeyId',
+        key: 'yourKey',
+    },
+    strictSSL: false,
+    followAllRedirects: true,
+    followRedirect: true,
+    headers: {
+        'x-custom': 'headers',
+    },
+};
+
+const handleError = (err: any) => undefined;
+
+// Usage with callback function
+waitOn(opts, err => {
+    if (err) {
+        return handleError(err);
+    }
+    // once here, all resources are available
+});
+
+// Usage with promises
+waitOn(opts)
+    .then(() => {
+        // once here, all resources are available
+    })
+    .catch(err => {
+        handleError(err);
+    });
+
+// Usage with async await
+(async () => {
+    try {
+        await waitOn(opts);
+        // once here, all resources are available
+    } catch (err) {
+        handleError(err);
+    }
+})();
diff --git a/types/wallop/index.d.ts b/types/wallop/index.d.ts
index a86bd4e99e..5e6f025c28 100644
--- a/types/wallop/index.d.ts
+++ b/types/wallop/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Wallop 2.4
-// Project: https://github.com/peduarte/wallop
+// Project: https://github.com/peduarte/wallop, http://pedroduarte.me/wallop
 // Definitions by: Nathanael McDaniel <https://github.com/leemcd56>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/watchpack/index.d.ts b/types/watchpack/index.d.ts
index 880e0d8a6d..4ef4ad2e67 100644
--- a/types/watchpack/index.d.ts
+++ b/types/watchpack/index.d.ts
@@ -23,7 +23,7 @@ declare class Watchpack extends EventEmitter {
 
     constructor(options: Watchpack.WatchOptions);
 
-    watch(files: string[], directories: string[], startTime: number): void;
+    watch(files: string[], directories: string[], startTime?: number): void;
 
     close(): void;
 
diff --git a/types/watchpack/watchpack-tests.ts b/types/watchpack/watchpack-tests.ts
index 7ae28bc514..f3eb459aef 100644
--- a/types/watchpack/watchpack-tests.ts
+++ b/types/watchpack/watchpack-tests.ts
@@ -2,6 +2,7 @@ import Watchpack = require('watchpack');
 const watch = new Watchpack({});
 
 watch.watch(['test.js'], ['lib/'], 1000);
+watch.watch(['test.js'], ['lib/']);
 
 let time: number;
 time = watch.getTimes()['test.js'];
diff --git a/types/web-animations-js/index.d.ts b/types/web-animations-js/index.d.ts
index f809b1cd3e..6fcbd4fc47 100644
--- a/types/web-animations-js/index.d.ts
+++ b/types/web-animations-js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for web-animations-js 2.2
-// Project: https://github.com/web-animations/web-animations-js
+// Project: https://github.com/web-animations/web-animations-js, https://github.com/web-animations
 // Definitions by: Kristian Moerch <https://github.com/kritollm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.0
diff --git a/types/webappsec-credential-management/index.d.ts b/types/webappsec-credential-management/index.d.ts
index 4c47ee7cc8..580f86facb 100644
--- a/types/webappsec-credential-management/index.d.ts
+++ b/types/webappsec-credential-management/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for W3C (WebAppSec) Credential Management API Level 1, 0.3
+// Type definitions for non-npm package W3C (WebAppSec) Credential Management API Level 1, 0.3
 // Project: https://github.com/w3c/webappsec-credential-management
 // Definitions by: Iain McGinniss <https://github.com/iainmcgin>
+//                 Joao Peixoto <https://github.com/Hartimer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.7
 
@@ -493,7 +494,7 @@ interface AuthenticatorAttestationResponse extends AuthenticatorResponse {
 interface AuthenticatorAssertionResponse extends AuthenticatorResponse {
     readonly authenticatorData: ArrayBuffer;
     readonly signature: ArrayBuffer;
-    readonly userHandle: ArrayBuffer;
+    readonly userHandle: ArrayBuffer | null;
 }
 
 /**
diff --git a/types/webappsec-credential-management/webappsec-credential-management-tests.ts b/types/webappsec-credential-management/webappsec-credential-management-tests.ts
index 2afa9f8785..15ae1c6b9e 100644
--- a/types/webappsec-credential-management/webappsec-credential-management-tests.ts
+++ b/types/webappsec-credential-management/webappsec-credential-management-tests.ts
@@ -5,7 +5,7 @@ function passwordBasedSignInDeprecated() {
         return;
     }
 
-    navigator.credentials.get({password: true}).then((credential) => {
+    navigator.credentials.get({ password: true }).then((credential) => {
         if (!credential) {
             return;
         }
@@ -117,7 +117,7 @@ function federatedSignIn() {
     navigator.credentials
         .get({
             password: true,
-            federated: {providers: ['https://federation.com']}
+            federated: { providers: ['https://federation.com'] }
         })
         .then((credential) => {
             if (!credential) return;
@@ -141,7 +141,7 @@ function federatedSignIn() {
                 const pwCred = credential as PasswordCredential;
                 fetch(
                     'https://example.com/loginEndpoint',
-                    {credentials: pwCred, method: 'POST'});
+                    { credentials: pwCred, method: 'POST' });
             }
         });
 }
@@ -159,7 +159,7 @@ function passwordPostSignInConfirmation() {
 
             const formElem = (e.target as HTMLFormElement);
             const c = new PasswordCredential(formElem);
-            fetch(formElem.action, {method: 'POST', credentials: c}).then(r => {
+            fetch(formElem.action, { method: 'POST', credentials: c }).then(r => {
                 if (r.status === 200) {
                     navigator.credentials!.store(c);
                 }
@@ -172,7 +172,7 @@ function passwordPostSignInConfirmation() {
 function federationPostSignInConfirmation() {
     if (navigator.credentials) {
         navigator.credentials.store(new FederatedCredential(
-            {id: 'username', provider: 'https://federation.com'}));
+            { id: 'username', provider: 'https://federation.com' }));
     }
 }
 
@@ -188,7 +188,7 @@ function existingFormPost(credential: PasswordCredential) {
     credential.passwordName = 'p';
     fetch(
         'https://example.com/loginEndpoint',
-        {credentials: credential, method: 'POST'});
+        { credentials: credential, method: 'POST' });
 }
 
 function additionalDataPost(credential: PasswordCredential, token: string) {
@@ -196,14 +196,14 @@ function additionalDataPost(credential: PasswordCredential, token: string) {
     credential.additionalData.append('csrf', token);
     fetch(
         'https://example.com/loginEndpoint',
-        {credentials: credential, method: 'POST'});
+        { credentials: credential, method: 'POST' });
 }
 
 function formEncodedPost(credential: PasswordCredential, token: string) {
     credential.additionalData = new URLSearchParams();
     fetch(
         'https://example.com/loginEndpoint',
-        {credentials: credential, method: 'POST'});
+        { credentials: credential, method: 'POST' });
 }
 
 // requireUserMediation example: not included in the spec, but included here
@@ -236,7 +236,7 @@ function createPasswordCredential() {
     }
 
     navigator.credentials.create({
-        password: {id: 'username', password: 'password'}
+        password: { id: 'username', password: 'password' }
     }).then((credential) => {
         // Credential created!
     });
@@ -266,7 +266,7 @@ function createFederatedCredential() {
     }
 
     navigator.credentials.create({
-        federated: {id: 'username', provider: 'provider'}
+        federated: { id: 'username', provider: 'provider' }
     }).then((credential) => {
         // Credential created!
     });
@@ -293,7 +293,7 @@ function webauthnRegister() {
             },
             challenge,
             pubKeyCredParams: [
-                {type: 'public-key', alg: -7},
+                { type: 'public-key', alg: -7 },
             ],
             excludeCredentials: [
                 {
@@ -329,16 +329,18 @@ function webauthnAuthenticate() {
     const challenge = new Uint8Array(32);
     window.crypto.getRandomValues(challenge);
 
-    const authPromise = navigator.credentials.get({publicKey: {
-        challenge,
-        timeout: 5000,
-        rpId: document.domain,
-        allowCredentials: [{
-            type: "public-key",
-            id: credentialID,
-            transports: ['internal', 'ble', 'nfc', 'usb']
-        }],
-    }});
+    const authPromise = navigator.credentials.get({
+        publicKey: {
+            challenge,
+            timeout: 5000,
+            rpId: document.domain,
+            allowCredentials: [{
+                type: "public-key",
+                id: credentialID,
+                transports: ['internal', 'ble', 'nfc', 'usb']
+            }],
+        }
+    });
 
     authPromise.then((cred) => {
         if (cred === null) {
@@ -352,3 +354,17 @@ function webauthnAuthenticate() {
         console.log(e.message);
     });
 }
+
+function mockAuthenticatorAssertionResponse() {
+    if (!navigator.credentials) {
+        return;
+    }
+
+    const sampleResponse: AuthenticatorAssertionResponse = {
+        clientDataJSON: new ArrayBuffer(0),
+        authenticatorData: new ArrayBuffer(0),
+        signature: new ArrayBuffer(0),
+        userHandle: null,
+    };
+    sampleResponse.userHandle === undefined;
+}
diff --git a/types/webcomponents.js/index.d.ts b/types/webcomponents.js/index.d.ts
index 36a42dd00e..50ad3bb9c1 100644
--- a/types/webcomponents.js/index.d.ts
+++ b/types/webcomponents.js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for webcomponents.js 0.6
-// Project: https://github.com/webcomponents/webcomponentsjs
+// Project: https://github.com/webcomponents/webcomponentsjs, http://webcomponents.org
 // Definitions by: Adi Dahiya <https://github.com/adidahiya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/webmidi/index.d.ts b/types/webmidi/index.d.ts
index 0d64baaaa7..c4ad1cfac2 100644
--- a/types/webmidi/index.d.ts
+++ b/types/webmidi/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Web MIDI API 2.0
-// Project: http://www.w3.org/TR/webmidi/
+// Project: http://www.w3.org/TR/webmidi/, https://github.com/djipco/webmidi
 // Definitions by: six a <https://github.com/lostfictions>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/webpack-bundle-analyzer/index.d.ts b/types/webpack-bundle-analyzer/index.d.ts
index f1e3f2a3c6..bde0237d6d 100644
--- a/types/webpack-bundle-analyzer/index.d.ts
+++ b/types/webpack-bundle-analyzer/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for webpack-bundle-analyzer 2.13
-// Project: https://github.com/th0r/webpack-bundle-analyzer
+// Project: https://github.com/webpack-contrib/webpack-bundle-analyzer
 // Definitions by: Michael Strobel <https://github.com/kryops>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/webpack-chain/index.d.ts b/types/webpack-chain/index.d.ts
index d821d13417..1cdcc9ff27 100644
--- a/types/webpack-chain/index.d.ts
+++ b/types/webpack-chain/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for webpack-chain 5.0
-// Project: https://github.com/mozilla-neutrino/webpack-chain
+// Project: https://github.com/neutrinojs/webpack-chain
 // Definitions by: Eirikur Nilsson <https://github.com/eirikurn>, Paul Sachs <https://github.com/psachs21>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/webpack-dev-server/index.d.ts b/types/webpack-dev-server/index.d.ts
index 48abc9a44c..30fd2482e7 100644
--- a/types/webpack-dev-server/index.d.ts
+++ b/types/webpack-dev-server/index.d.ts
@@ -5,6 +5,7 @@
 //                 Zheyang Song <https://github.com/ZheyangSong>
 //                 Alan Agius <https://github.com/alan-agius4>
 //                 Artur Androsovych <https://github.com/arturovt>
+//                 Dave Cardwell <https://github.com/davecardwell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -165,6 +166,8 @@ declare namespace WebpackDevServer {
         watchContentBase?: boolean;
         /** Control options related to watching the files. */
         watchOptions?: webpack.WatchOptions;
+        /** Tells devServer to write generated assets to the disk. */
+        writeToDisk?: boolean | ((filePath: string) => boolean);
     }
 }
 
diff --git a/types/webpack-dev-server/webpack-dev-server-tests.ts b/types/webpack-dev-server/webpack-dev-server-tests.ts
index f570dd134e..755245b035 100644
--- a/types/webpack-dev-server/webpack-dev-server-tests.ts
+++ b/types/webpack-dev-server/webpack-dev-server-tests.ts
@@ -72,6 +72,7 @@ const config: WebpackDevServer.Configuration = {
         aggregateTimeout: 300,
         poll: 1000
     },
+    writeToDisk: true,
     // It's a required option.
     publicPath: "/assets/",
     headers: { "X-Custom-Header": "yes" }
@@ -83,6 +84,9 @@ const c2: WebpackDevServer.Configuration = {
 const c3: WebpackDevServer.Configuration = {
     stats: "verbose",
 };
+const c4: WebpackDevServer.Configuration = {
+    writeToDisk: (filePath: string) => true,
+};
 
 // API example
 server = new WebpackDevServer(compiler, config);
diff --git a/types/webpack-env/index.d.ts b/types/webpack-env/index.d.ts
index d9047f965e..293f06797d 100644
--- a/types/webpack-env/index.d.ts
+++ b/types/webpack-env/index.d.ts
@@ -32,7 +32,7 @@ declare namespace __WebpackModuleApi {
          * This creates a chunk. The chunk can be named. If a chunk with this name already exists, the dependencies are merged into that chunk and that chunk is used.
          */
         ensure(paths: string[], callback: (require: NodeRequire) => void, errorCallback?: (error: any) => void, chunkName?: string): void;
-        context(path: string, deep?: boolean, filter?: RegExp): RequireContext;
+        context(path: string, deep?: boolean, filter?: RegExp, mode?: "sync" | "eager" | "weak" | "lazy" | "lazy-once"): RequireContext;
         /**
          * Returns the module id of a dependency. The call is sync. No request to the server is fired. The compiler ensures that the dependency is available.
          *
diff --git a/types/webpack-hot-middleware/index.d.ts b/types/webpack-hot-middleware/index.d.ts
index d9cfe9cb60..12d63dfb12 100644
--- a/types/webpack-hot-middleware/index.d.ts
+++ b/types/webpack-hot-middleware/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for webpack-hot-middleware 2.16
-// Project: https://github.com/glenjamin/webpack-hot-middleware#readme
+// Project: https://github.com/webpack-contrib/webpack-hot-middleware
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
 //                 Ron Martinez <https://github.com/icylace>
 //                 Chris Abrams <https://github.com/chrisabrams>
diff --git a/types/webpack-serve/index.d.ts b/types/webpack-serve/index.d.ts
index 48fdfcbf38..4b195e0f0f 100644
--- a/types/webpack-serve/index.d.ts
+++ b/types/webpack-serve/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for webpack-serve 2.0
-// Project: https://github.com/webpack-contrib/webpack-serve
+// Project: https://github.com/shellscape/webpack-serve
 // Definitions by: Ryan Clark <https://github.com/rynclark>
 //                 Jokcy <https://github.com/Jokcy>
 //                 ZSkycat <https://github.com/ZSkycat>
diff --git a/types/webpagetest/index.d.ts b/types/webpagetest/index.d.ts
index 7ad99b24a8..0fc1a5363b 100644
--- a/types/webpagetest/index.d.ts
+++ b/types/webpagetest/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for webpagetest 0.3
-// Project: https://github.com/marcelduran/webpagetest-api
+// Project: http://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
diff --git a/types/webtorrent/index.d.ts b/types/webtorrent/index.d.ts
index ee2e42cf55..4ad92f297f 100644
--- a/types/webtorrent/index.d.ts
+++ b/types/webtorrent/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for WebTorrent 0.98
-// Project: https://github.com/feross/webtorrent
+// Project: https://github.com/feross/webtorrent, https://webtorrent.io
 // Definitions by: Bazyli Brzóska <https://github.com/niieani>, Tomasz Łaziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/wegame-api/index.d.ts b/types/wegame-api/index.d.ts
index 4ac4e7fbc5..7fcff7b09d 100644
--- a/types/wegame-api/index.d.ts
+++ b/types/wegame-api/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for wegame 2.3
+// Type definitions for non-npm package wegame 2.3
 // Project: https://developers.weixin.qq.com/minigame/dev/index.html
 // Definitions by: J.C <https://github.com/jcyuan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/weixin-app/index.d.ts b/types/weixin-app/index.d.ts
index c4c46353d0..8c06b3de10 100644
--- a/types/weixin-app/index.d.ts
+++ b/types/weixin-app/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for wx-app 2.2
+// Type definitions for non-npm package 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>
@@ -3745,19 +3745,19 @@ declare namespace wx {
 
   type UnboxBehaviorData<T> = T extends Behavior<{}, {}, {}> ? T['__DO_NOT_USE_INTERNAL_FIELD_DATA'] : {};
   type UnboxBehaviorProps<T> = T extends Behavior<{}, {}, {}> ? T['__DO_NOT_USE_INTERNAL_FIELD_PROPS'] : {};
-	type UnboxBehaviorMethod<T> = T extends Behavior<{}, {}, {}> ? T['__DO_NOT_USE_INTERNAL_FIELD_METHODS'] : {};
+	type UnboxBehaviorMethods<T> = T extends Behavior<{}, {}, {}> ? T['__DO_NOT_USE_INTERNAL_FIELD_METHODS'] : {};
 
   type UnboxBehaviorsMethods<
     Behaviors extends Array<Behavior<{}, {}, {}> | string>
-	> = UnionToIntersection<UnboxBehaviorMethod<ArrayType<Behaviors>>>;
+	> = UnboxBehaviorMethods<UnionToIntersection<ArrayType<Behaviors>>>;
 
   type UnboxBehaviorsData<
     Behaviors extends Array<Behavior<{}, {}, {}> | string>
-	> = UnionToIntersection<UnboxBehaviorData<ArrayType<Behaviors>>>;
+	> = UnboxBehaviorData<UnionToIntersection<ArrayType<Behaviors>>>;
 
   type UnboxBehaviorsProps<
     Behaviors extends Array<Behavior<{}, {}, {}> | string>
-	> = UnionToIntersection<UnboxBehaviorProps<ArrayType<Behaviors>>>;
+	> = UnboxBehaviorProps<UnionToIntersection<ArrayType<Behaviors>>>;
 
 	// CombinedInstance models the `this`, i.e. instance type for (user defined) component
 	type CombinedInstance<
diff --git a/types/weixin-app/weixin-app-tests.ts b/types/weixin-app/weixin-app-tests.ts
index d6265f3798..fb717d0c31 100644
--- a/types/weixin-app/weixin-app-tests.ts
+++ b/types/weixin-app/weixin-app-tests.ts
@@ -25,8 +25,46 @@ const parentBehavior = Behavior({
 	}
 });
 
+function createBehaviorWithUnionTypes(n: number) {
+	const properties = n % 2 < 1 ? {
+		unionPropA: {
+			type: String,
+		},
+	} : {
+		unionPropB: {
+			type: Number,
+		},
+	};
+
+	const data = n % 4 < 2 ? {
+		unionDataA: 'a',
+	} : {
+		unionDataB: 1,
+	};
+
+	const methods = n % 8 < 4 ? {
+		unionMethodA(a: number) {
+			return n + 1;
+		},
+	} : {
+		unionMethodB(a: string) {
+			return {value: a};
+		},
+	};
+
+	return Behavior({
+		properties,
+		data,
+		methods
+	});
+}
+
 const behavior = Behavior({
-	behaviors: [parentBehavior, "wx://form-field"],
+	behaviors: [
+		createBehaviorWithUnionTypes(1),
+		parentBehavior,
+		"wx://form-field",
+	],
 	properties: {
 		myBehaviorProperty: {
 			type: String
@@ -126,6 +164,20 @@ Component({
 			console.log(this.data.myParentBehaviorData);
 			console.log(this.data.myParentBehaviorProperty);
 			this.myParentBehaviorMethod(456);
+			if (this.unionMethodA) {
+				console.log(this.unionMethodA(5));
+			}
+			if (this.unionMethodB) {
+				console.log(this.unionMethodB('test').value);
+			}
+			console.log(this.data.unionDataA);
+			console.log(this.data.unionDataB);
+			console.log(this.data.unionPropA);
+			console.log(this.data.unionPropB);
+			console.log(this.properties.unionDataA);
+			console.log(this.properties.unionDataB);
+			console.log(this.properties.unionPropA);
+			console.log(this.properties.unionPropB);
 		},
 		readMyDataAndMyProps() {
 			const stringValue1: string = this.data.myProperty;
diff --git a/types/wepy/index.d.ts b/types/wepy/index.d.ts
index 08a22f2596..3c4bbcf5ac 100644
--- a/types/wepy/index.d.ts
+++ b/types/wepy/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for wepy 1.7
-// Project: https://github.com/Tencent/wepy#readme
+// Project: https://github.com/Tencent/wepy#readme, https://github.com/wepyjs/wepy
 // Definitions by: Jiayu Liu <https://github.com/Jimexist>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/wicg-mediasession/index.d.ts b/types/wicg-mediasession/index.d.ts
index 05a769b2a2..f36b0b8a67 100644
--- a/types/wicg-mediasession/index.d.ts
+++ b/types/wicg-mediasession/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Media Session API 1.0
+// Type definitions for non-npm package Media Session API 1.0
 // Project: https://wicg.github.io/mediasession/
 // Definitions by: Julien CROUZET <https://github.com/jucrouzet>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/windows-script-host/index.d.ts b/types/windows-script-host/index.d.ts
index a6be9a0e4c..4faaa6cfa0 100644
--- a/types/windows-script-host/index.d.ts
+++ b/types/windows-script-host/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Windows Script Host 5.8
+// Type definitions for non-npm package Windows Script Host 5.8
 // Project: https://msdn.microsoft.com/en-us/library/9bbdkx3k.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/winston-syslog/index.d.ts b/types/winston-syslog/index.d.ts
index c868ef5abc..a604275ebc 100644
--- a/types/winston-syslog/index.d.ts
+++ b/types/winston-syslog/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for winston-syslog 2.0
-// Project: https://github.com/winstonjs/winston-syslog
+// Project: https://github.com/winstonjs/winston-syslog, https://github.com/indexzero/winston-syslog
 // Definitions by: Chris Barth <https://github.com/cjbarth>, Felix Hochgruber <https://github.com/felix-hoc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/wordcloud/index.d.ts b/types/wordcloud/index.d.ts
index 79ed06d252..10aed00873 100644
--- a/types/wordcloud/index.d.ts
+++ b/types/wordcloud/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for wordcloud 1.1
-// Project: https://github.com/timdream/wordcloud2.js
+// Project: https://github.com/timdream/wordcloud2.js, http://timdream.org/wordcloud2.js
 // Definitions by: Joe Skeen <https://github.com/joeskeen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/workbox-webpack-plugin/index.d.ts b/types/workbox-webpack-plugin/index.d.ts
index 2789583d2c..b08aa72c98 100644
--- a/types/workbox-webpack-plugin/index.d.ts
+++ b/types/workbox-webpack-plugin/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for workbox-webpack-plugin 3.6
-// Project: https://github.com/GoogleChrome/workbox/blob/master/packages/workbox-webpack-plugin
+// Project: https://github.com/GoogleChrome/workbox/blob/master/packages/workbox-webpack-plugin, https://github.com/googlechrome/workbox
 // Definitions by: Kevin Groat <https://github.com/kgroat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/wu/index.d.ts b/types/wu/index.d.ts
index 151997f3c6..d4a4e56c91 100644
--- a/types/wu/index.d.ts
+++ b/types/wu/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for wu.js 2.1
-// Project: https://fitzgen.github.io/wu.js/
+// Project: https://fitzgen.github.io/wu.js/, https://github.com/fitzgen/wu.js
 // Definitions by: phiresky <https://github.com/phiresky>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/wx-js-sdk-dt/index.d.ts b/types/wx-js-sdk-dt/index.d.ts
index aea78948aa..81c601ad74 100644
--- a/types/wx-js-sdk-dt/index.d.ts
+++ b/types/wx-js-sdk-dt/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for wx-js-sdk 1.4
+// Type definitions for non-npm package wx-js-sdk 1.4
 // Project: https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115
 // Definitions by: Bian Zhongjie <https://github.com/agasbzj>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/xml/index.d.ts b/types/xml/index.d.ts
index 7647043eee..357c3f5b16 100644
--- a/types/xml/index.d.ts
+++ b/types/xml/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for xml 1.0
-// Project: https://github.com/dylang/node-xml
+// Project: http://github.com/dylang/node-xml
 // Definitions by: Jianrong Yu <https://github.com/YuJianrong>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/xmldoc/index.d.ts b/types/xmldoc/index.d.ts
index 87d3403ebb..d518e0d18d 100644
--- a/types/xmldoc/index.d.ts
+++ b/types/xmldoc/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for xmldoc 1.1
-// Project: https://www.npmjs.com/package/xmldoc
+// Project: https://github.com/nfarina/xmldoc
 // Definitions by:  Xavier Stouder <https://github.com/Xstoudi>
 //                  Andrew Sheehan <https://github.com/ajsheehan>
 //                  Jordi Bunster <https://github.com/notlaforge>
diff --git a/types/xmpp__jid/index.d.ts b/types/xmpp__jid/index.d.ts
index 51b19051f1..706891519a 100644
--- a/types/xmpp__jid/index.d.ts
+++ b/types/xmpp__jid/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @xmpp/jid 0.6
-// Project: https://github.com/node-xmpp/node-xmpp/
+// Project: https://github.com/xmppjs/xmpp.js/tree/master/packages/jid
 // Definitions by: PJakcson <https://github.com/PJakcson>
 //                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/xrm/index.d.ts b/types/xrm/index.d.ts
index 361e33bf92..597ad39ce8 100644
--- a/types/xrm/index.d.ts
+++ b/types/xrm/index.d.ts
@@ -4633,7 +4633,7 @@ declare namespace Xrm {
          * Invokes the device camera to capture an image.
          * @returns On success, returns Base64 encoded file
          */
-        captureImage(imageOptions: Device.CaptureImageOptions): Async.PromiseLike<Device.CaptureFileResponse>;
+        captureImage(imageOptions?: Device.CaptureImageOptions): Async.PromiseLike<Device.CaptureFileResponse>;
 
         /**
          * Invokes the device camera to capture video.
@@ -4657,7 +4657,7 @@ declare namespace Xrm {
          * Opens a dialog box to select files from your computer (web client) or mobile device (mobile clients).
          * @returns On success, returns an array of files
          */
-        pickFile(pickFileOptions: Device.PickFileOptions): Async.PromiseLike<Device.CaptureFileResponse[]>;
+        pickFile(pickFileOptions?: Device.PickFileOptions): Async.PromiseLike<Device.CaptureFileResponse[]>;
     }
 
     /**
diff --git a/types/xxhashjs/index.d.ts b/types/xxhashjs/index.d.ts
index 40c45cf3ab..9c9d7e4318 100644
--- a/types/xxhashjs/index.d.ts
+++ b/types/xxhashjs/index.d.ts
@@ -1,19 +1,29 @@
-// Type definitions for xxhashjs 0.1
+// Type definitions for xxhashjs 0.2
 // Project: https://github.com/pierrec/js-xxhash
 // Definitions by: Dibyo Majumdar <https://github.com/mDibyo>
+//                 Nick Zahn <https://github.com/Manc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference types="node" />
+
 export as namespace XXH;
 
+// Ideally we would have a type definition for the "cuint" package.
+// The following interface `UINT` is to resolve the bare minimum.
+interface UINT {
+	toNumber(): number;
+	toString(radix?: number): string;
+}
+
 export interface HashObject {
-  init(seed: number): this;
-  update(data: string | ArrayBuffer): this;
-  digest(): number;
+	init(seed: number): this;
+	update(data: string | ArrayBuffer | Buffer): this;
+	digest(): UINT;
 }
 
 export interface HashInterface {
-  (seed?: number): HashObject;
-  (data: string | ArrayBuffer, seed: number): number;
+	(seed?: number): HashObject;
+	(data: string | ArrayBuffer | Buffer, seed: number): UINT;
 }
 
 export const h32: HashInterface;
diff --git a/types/xxhashjs/xxhashjs-tests.ts b/types/xxhashjs/xxhashjs-tests.ts
index ee2d7ef8f3..889bf9bb40 100644
--- a/types/xxhashjs/xxhashjs-tests.ts
+++ b/types/xxhashjs/xxhashjs-tests.ts
@@ -1,7 +1,37 @@
 import XXH from 'xxhashjs';
 
-// examples adapted from https://github.com/pierrec/js-xxhash
-const h1 = XXH.h32('abcd', 0xABCD).toString(16);
+// Test data
+const seed = 0xABCD;
+const stringData = 'abcd';
+const arrayBufferData = new ArrayBuffer(4);
+const bufferData = Buffer.from([1, 2, 3, 4]);
 
-const H = XXH.h32(0xABCD);
-const h2 = H.update('abcd').digest().toString(16);
+// Test XXH.h32 methods, initialising with string data
+const value32_1 = XXH.h32(stringData, seed);
+value32_1.toString();
+value32_1.toString(16);
+value32_1.toNumber();
+
+const value32_2 = XXH.h32(seed).update(stringData).digest();
+value32_2.toString();
+value32_2.toString(16);
+value32_2.toNumber();
+
+// Test XXH.h64 methods, initialising with string data
+const value64_1 = XXH.h64(stringData, seed);
+value64_1.toString();
+value64_1.toString(16);
+value64_1.toNumber();
+
+const value64_2 = XXH.h64(seed).update(stringData).digest();
+value64_2.toString();
+value64_2.toString(16);
+value64_2.toNumber();
+
+// Initialise with ArrayBuffer
+XXH.h32(arrayBufferData, seed);
+XXH.h64(arrayBufferData, seed);
+
+// Initialise with Buffer
+XXH.h32(bufferData, seed);
+XXH.h64(bufferData, seed);
diff --git a/types/yaml/index.d.ts b/types/yaml/index.d.ts
index 8ccd8397a5..c9942d5566 100644
--- a/types/yaml/index.d.ts
+++ b/types/yaml/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for yaml 1.0
-// Project: https://github.com/eemeli/yaml
+// Project: https://github.com/eemeli/yaml, https://eemeli.org/yaml
 // Definitions by: Ika <https://github.com/ikatyang>
 //                 Colin Bradley <https://github.com/ColinBradley>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/yargs/index.d.ts b/types/yargs/index.d.ts
index 310e51033a..0292ec3132 100644
--- a/types/yargs/index.d.ts
+++ b/types/yargs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for yargs 12.0
-// Project: https://github.com/chevex/yargs
+// Project: https://github.com/chevex/yargs, https://yargs.js.org
 // Definitions by: Martin Poelstra <https://github.com/poelstra>
 //                 Mizunashi Mana <https://github.com/mizunashi-mana>
 //                 Jeffery Grajkowski <https://github.com/pushplay>
diff --git a/types/yeoman-assert/index.d.ts b/types/yeoman-assert/index.d.ts
index cff816ff39..4edd4e5330 100644
--- a/types/yeoman-assert/index.d.ts
+++ b/types/yeoman-assert/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for yeoman-assert 3.1
-// Project: https://github.com/yeoman/yeoman-assert
+// Project: https://github.com/yeoman/yeoman-assert, http://yeoman.io
 // Definitions by: Toilal <https://github.com/Toilal>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/yeoman-generator/index.d.ts b/types/yeoman-generator/index.d.ts
index 1b94d06d4a..6415ad7957 100644
--- a/types/yeoman-generator/index.d.ts
+++ b/types/yeoman-generator/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for yeoman-generator 3.0
-// Project: https://github.com/yeoman/generator
+// Project: https://github.com/yeoman/generator, http://yeoman.io
 // Definitions by: Kentaro Okuno <https://github.com/armorik83>
 //                 Jay Anslow <https://github.com/janslow>
 //                 Ika <https://github.com/ikatyang>
diff --git a/types/yeoman-test/index.d.ts b/types/yeoman-test/index.d.ts
index abaad9ddb3..acccfba1bb 100644
--- a/types/yeoman-test/index.d.ts
+++ b/types/yeoman-test/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for yeoman-test 2.0
-// Project: https://github.com/yeoman/yeoman-test
+// Project: https://github.com/yeoman/yeoman-test, http://yeoman.io/authoring/testing.html
 // Definitions by: Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
diff --git a/types/youtube-dl/index.d.ts b/types/youtube-dl/index.d.ts
index e21e699892..aa7a8c4492 100644
--- a/types/youtube-dl/index.d.ts
+++ b/types/youtube-dl/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for youtube-dl 1.12
-// Project: https://www.npmjs.com/package/youtube-dl
+// Project: https://github.com/przemyslawpluta/node-youtube-dl
 // Definitions by: Bogdan Surai <https://github.com/bsurai>
 //                 Moshe Feuchtwanger <https://github.com/moshfeu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/youtube-player/dist/FunctionStateMap.d.ts b/types/youtube-player/dist/FunctionStateMap.d.ts
new file mode 100644
index 0000000000..5ee7b07081
--- /dev/null
+++ b/types/youtube-player/dist/FunctionStateMap.d.ts
@@ -0,0 +1,31 @@
+import PlayerStates from './constants/PlayerStates';
+
+declare const FUNCTION_STATE_MAP: {
+    pauseVideo: {
+        acceptableStates: [
+            PlayerStates.ENDED,
+            PlayerStates.PAUSED
+            ],
+        stateChangeRequired: false,
+    },
+    playVideo: {
+        acceptableStates: [
+            PlayerStates.ENDED,
+            PlayerStates.PLAYING
+            ],
+        stateChangeRequired: false,
+    },
+    seekTo: {
+        acceptableStates: [
+            PlayerStates.ENDED,
+            PlayerStates.PLAYING,
+            PlayerStates.PAUSED
+            ],
+        stateChangeRequired: true,
+
+        // TRICKY: `seekTo` may not cause a state change if no buffering is required.
+        timeout: 3000,
+    },
+};
+
+export default FUNCTION_STATE_MAP;
diff --git a/types/youtube-player/dist/YouTubePlayer.d.ts b/types/youtube-player/dist/YouTubePlayer.d.ts
new file mode 100644
index 0000000000..7716ca739c
--- /dev/null
+++ b/types/youtube-player/dist/YouTubePlayer.d.ts
@@ -0,0 +1,12 @@
+import { EmitterType, YouTubePlayer } from './types';
+
+export interface EventHandlerMapType {
+    [key: string]: (event: object) => void;
+}
+
+declare const YouTubePlayerHelpers: {
+    proxyEvents(emitter: EmitterType): EventHandlerMapType,
+    promisifyPlayer(playerAPIReady: Promise<YouTubePlayer>, strictState?: boolean): YouTubePlayer,
+};
+
+export default YouTubePlayerHelpers;
diff --git a/types/youtube-player/dist/constants/PlayerStates.d.ts b/types/youtube-player/dist/constants/PlayerStates.d.ts
new file mode 100644
index 0000000000..a5beac4fa7
--- /dev/null
+++ b/types/youtube-player/dist/constants/PlayerStates.d.ts
@@ -0,0 +1,10 @@
+declare enum PlayerStates {
+    BUFFERING = 3,
+    ENDED = 0,
+    PAUSED = 2,
+    PLAYING = 1,
+    UNSTARTED = -1,
+    VIDEO_CUED = 5,
+}
+
+export default PlayerStates;
diff --git a/types/youtube-player/dist/eventNames.d.ts b/types/youtube-player/dist/eventNames.d.ts
new file mode 100644
index 0000000000..a86d3b5625
--- /dev/null
+++ b/types/youtube-player/dist/eventNames.d.ts
@@ -0,0 +1,20 @@
+declare const EVENT_NAMES: [
+    'ready',
+    'stateChange',
+    'playbackQualityChange',
+    'playbackRateChange',
+    'error',
+    'apiChange',
+    'volumeChange'
+];
+
+export default EVENT_NAMES;
+
+export type EventType =
+    'ready' |
+    'stateChange' |
+    'playbackQualityChange' |
+    'playbackRateChange' |
+    'error' |
+    'apiChange' |
+    'volumeChange';
diff --git a/types/youtube-player/dist/functionNames.d.ts b/types/youtube-player/dist/functionNames.d.ts
new file mode 100644
index 0000000000..1e317d7391
--- /dev/null
+++ b/types/youtube-player/dist/functionNames.d.ts
@@ -0,0 +1,46 @@
+declare const FUNCTION_NAMES: [
+    'cueVideoById',
+    'loadVideoById',
+    'cueVideoByUrl',
+    'loadVideoByUrl',
+    'playVideo',
+    'pauseVideo',
+    'stopVideo',
+    'getVideoLoadedFraction',
+    'cuePlaylist',
+    'loadPlaylist',
+    'nextVideo',
+    'previousVideo',
+    'playVideoAt',
+    'setShuffle',
+    'setLoop',
+    'getPlaylist',
+    'getPlaylistIndex',
+    'setOption',
+    'mute',
+    'unMute',
+    'isMuted',
+    'setVolume',
+    'getVolume',
+    'seekTo',
+    'getPlayerState',
+    'getPlaybackRate',
+    'setPlaybackRate',
+    'getAvailablePlaybackRates',
+    'getPlaybackQuality',
+    'setPlaybackQuality',
+    'getAvailableQualityLevels',
+    'getCurrentTime',
+    'getDuration',
+    'removeEventListener',
+    'getVideoUrl',
+    'getVideoEmbedCode',
+    'getOptions',
+    'getOption',
+    'addEventListener',
+    'destroy',
+    'setSize',
+    'getIframe'
+];
+
+export default FUNCTION_NAMES;
diff --git a/types/youtube-player/dist/index.d.ts b/types/youtube-player/dist/index.d.ts
new file mode 100644
index 0000000000..09f07ff9c8
--- /dev/null
+++ b/types/youtube-player/dist/index.d.ts
@@ -0,0 +1,9 @@
+import { Options, YouTubePlayer } from './types';
+
+declare function PlayerFactory(
+    maybeElementId: YouTubePlayer | HTMLElement | string,
+    options?: Options,
+    strictState?: boolean,
+): YouTubePlayer;
+
+export default PlayerFactory;
diff --git a/types/youtube-player/dist/loadYouTubeIframeApi.d.ts b/types/youtube-player/dist/loadYouTubeIframeApi.d.ts
new file mode 100644
index 0000000000..7faddafbb9
--- /dev/null
+++ b/types/youtube-player/dist/loadYouTubeIframeApi.d.ts
@@ -0,0 +1,4 @@
+import { EmitterType, IframeApiType } from './types';
+
+declare function Loader(emitter: EmitterType): Promise<IframeApiType>;
+export default Loader;
diff --git a/types/youtube-player/dist/types.d.ts b/types/youtube-player/dist/types.d.ts
new file mode 100644
index 0000000000..fa64feda04
--- /dev/null
+++ b/types/youtube-player/dist/types.d.ts
@@ -0,0 +1,142 @@
+import PlayerState from './constants/PlayerStates';
+import { EventType } from './eventNames';
+
+export interface EmitterType {
+    trigger: (eventName: string, event: object) => void;
+}
+
+export interface Options {
+    width?: number;
+    height?: number;
+    videoId?: string;
+    playerVars?: {
+        autoplay?: 0 | 1,
+        cc_lang_pref?: string,
+        cc_load_policy?: 1,
+        color?: 'red' | 'white',
+        controls?: 0 | 1,
+        disablekb?: 0 | 1,
+        enablejsapi?: 0 | 1,
+        end?: number,
+        fs?: 0 | 1,
+        hl?: string,
+        iv_load_policy?: 1 | 3,
+        list?: string,
+        listType?: 'playlist' | 'search' | 'user_uploads',
+        loop?: 0 | 1,
+        modestbranding?: 1,
+        origin?: string,
+        playlist: string,
+        playsinline?: 0 | 1,
+        rel?: 0 | 1,
+        start?: number,
+        widget_referrer?: string,
+    };
+    events?: {
+        [eventType in EventType]: (event: CustomEvent) => void
+    };
+}
+
+export interface IframeApiType {
+    Player: {new(elementId: string, options: Options): YouTubePlayer};
+}
+
+/**
+ * @see https://developers.google.com/youtube/iframe_api_reference
+ */
+export interface YouTubePlayer {
+    addEventListener(event: string, listener: (event: CustomEvent) => void): void;
+    destroy(): void;
+    getAvailablePlaybackRates(): ReadonlyArray<number>;
+    getAvailableQualityLevels(): ReadonlyArray<string>;
+    getCurrentTime(): number;
+    getDuration(): number;
+    getIframe(): HTMLIFrameElement;
+    getOption(module: string, option: string): any;
+    getOptions(): string[];
+    getOptions(module: string): object;
+    setOption(module: string, option: string, value: any): void;
+    setOptions(): void;
+    cuePlaylist(
+        playlist: string | ReadonlyArray<string>,
+        index?: number,
+        startSeconds?: number,
+        suggestedQuality?: string,
+    ): void;
+    cuePlaylist(playlist: {
+        listType: string,
+        list?: string,
+        index?: number,
+        startSeconds?: number,
+        suggestedQuality?: string,
+    }): void;
+    loadPlaylist(
+        playlist: string | ReadonlyArray<string>,
+        index?: number,
+        startSeconds?: number,
+        suggestedQuality?: string,
+    ): void;
+    loadPlaylist(playlist: {
+        listType: string,
+        list?: string,
+        index?: number,
+        startSeconds?: number,
+        suggestedQuality?: string,
+    }): void;
+    getPlaylist(): ReadonlyArray<string>;
+    getPlaylistIndex(): number;
+    getPlaybackQuality(): string;
+    getPlaybackRate(): number;
+    getPlayerState(): PlayerState;
+    getVideoEmbedCode(): string;
+    getVideoLoadedFraction(): number;
+    getVideoUrl(): string;
+    getVolume(): number;
+    cueVideoById(videoId: string, startSeconds?: number, suggestedQuality?: string): void;
+    cueVideoById(video: {
+        videoId: string,
+        startSeconds?: number,
+        endSeconds?: number,
+        suggestedQuality?: string,
+    }): void;
+    cueVideoByUrl(mediaContentUrl: string, startSeconds?: number, suggestedQuality?: string): void;
+    cueVideoByUrl(video: {
+        mediaContentUrl: string,
+        startSeconds?: number,
+        endSeconds?: number,
+        suggestedQuality?: string,
+    }): void;
+    loadVideoByUrl(mediaContentUrl: string, startSeconds?: number, suggestedQuality?: string): void;
+    loadVideoByUrl(video: {
+        mediaContentUrl: string,
+        startSeconds?: number,
+        endSeconds?: number,
+        suggestedQuality?: string,
+    }): void;
+    loadVideoById(videoId: string, startSeconds?: number, suggestedQuality?: string): void;
+    loadVideoById(video: {
+        videoId: string,
+        startSeconds?: number,
+        endSeconds?: number,
+        suggestedQuality?: string,
+    }): void;
+    isMuted(): boolean;
+    mute(): void;
+    nextVideo(): void;
+    pauseVideo(): void;
+    playVideo(): void;
+    playVideoAt(index: number): void;
+    previousVideo(): void;
+    removeEventListener(event: string, listener: (event: CustomEvent) => void): void;
+    seekTo(seconds: number, allowSeekAhead: boolean): void;
+    setLoop(loopPlaylists: boolean): void;
+    setPlaybackQuality(suggestedQuality: string): void;
+    setPlaybackRate(suggestedRate: number): void;
+    setShuffle(shufflePlaylist: boolean): void;
+    setSize(width: number, height: number): object;
+    setVolume(volume: number): void;
+    stopVideo(): void;
+    unMute(): void;
+    on(eventType: 'stateChange', listener: (event: CustomEvent & {data: number}) => void): void;
+    on(eventType: EventType, listener: (event: CustomEvent) => void): void;
+}
diff --git a/types/youtube-player/index.d.ts b/types/youtube-player/index.d.ts
new file mode 100644
index 0000000000..f34f8e3505
--- /dev/null
+++ b/types/youtube-player/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for youtube-player 5.5
+// Project: https://github.com/gajus/youtube-player#readme
+// Definitions by: Martin Jurča <https://github.com/jurca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
+
+import PlayerFactory from './dist/index';
+
+export default PlayerFactory;
diff --git a/types/youtube-player/tsconfig.json b/types/youtube-player/tsconfig.json
new file mode 100644
index 0000000000..1abbcc804c
--- /dev/null
+++ b/types/youtube-player/tsconfig.json
@@ -0,0 +1,32 @@
+{
+    "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",
+        "dist/constants/PlayerStates.d.ts",
+        "dist/eventNames.d.ts",
+        "dist/functionNames.d.ts",
+        "dist/FunctionStateMap.d.ts",
+        "dist/index.d.ts",
+        "dist/loadYouTubeIframeApi.d.ts",
+        "dist/types.d.ts",
+        "dist/YouTubePlayer.d.ts",
+        "youtube-player-tests.ts"
+    ]
+}
diff --git a/types/youtube-player/tslint.json b/types/youtube-player/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/youtube-player/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/youtube-player/youtube-player-tests.ts b/types/youtube-player/youtube-player-tests.ts
new file mode 100644
index 0000000000..cb60168cea
--- /dev/null
+++ b/types/youtube-player/youtube-player-tests.ts
@@ -0,0 +1,81 @@
+import youTubePlayerFactory from 'youtube-player';
+import PlayerStates from 'youtube-player/dist/constants/PlayerStates';
+import { YouTubePlayer } from 'youtube-player/dist/types';
+
+youTubePlayerFactory('foo');
+const player: YouTubePlayer = youTubePlayerFactory(
+    document.getElementById('bar')!,
+    {
+        width: 640,
+        height: 300,
+        videoId: 'aaaaaaaaaa',
+        playerVars: {
+            autoplay: 1,
+            cc_lang_pref: 'en_US',
+            cc_load_policy: 1,
+            color: 'white',
+            controls: 1,
+            disablekb: 0,
+            enablejsapi: 1,
+            end: 60,
+            fs: 0,
+            hl: 'fooBar',
+            iv_load_policy: 3,
+            list: 'bbbbbbbbbb',
+            listType: 'search',
+            loop: 0,
+            modestbranding: 1,
+            origin: 'https://definitelytyped.org/',
+            playlist: 'cccccccccc',
+            playsinline: 0,
+            rel: 1,
+            start: 3,
+            widget_referrer: 'nothing',
+        },
+        events: {
+            ready: (event: CustomEvent): void => {},
+            stateChange: (event: CustomEvent): void => {
+                console.log(player.getPlayerState() === PlayerStates.PLAYING);
+            },
+            playbackQualityChange: (event: CustomEvent): void => {},
+            playbackRateChange: (event: CustomEvent): void => {},
+            error: (event: CustomEvent): void => {},
+            apiChange: (event: CustomEvent): void => {},
+            volumeChange: (event: CustomEvent): void => {},
+        },
+    },
+    true,
+);
+
+player.cueVideoById('xyzabc123');
+player.loadVideoById('doesNotExist');
+player.playVideo();
+player.pauseVideo();
+player.setSize(320, 200);
+if (player.isMuted()) {
+    player.unMute();
+} else {
+    player.mute();
+}
+player.setVolume(player.getVolume() / 2);
+
+player.on('stateChange', (event: CustomEvent<void> & {data: number}) => {
+    switch (event.data) {
+        case PlayerStates.PLAYING:
+            console.log('playing');
+            break;
+        case PlayerStates.PAUSED:
+            console.log('paused');
+            break;
+        case PlayerStates.ENDED:
+            console.log('ended');
+            break;
+        default:
+            break;
+    }
+});
+player.on('error', (event: CustomEvent<number>) => {
+    console.error('player error', event.detail);
+});
+
+player.destroy();
diff --git a/types/yup/index.d.ts b/types/yup/index.d.ts
index ffba765581..dc73ae6bd9 100644
--- a/types/yup/index.d.ts
+++ b/types/yup/index.d.ts
@@ -8,6 +8,7 @@
 //                 Vincent Pizzo <https://github.com/vincentjames501>
 //                 Robert Bullen <https://github.com/robertbullen>
 //                 Yusuke Sato <https://github.com/sat0yu>
+//                 Dan Rumney <https://github.com/dancrumb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -25,6 +26,7 @@ export function addMethod<T extends Schema<any>>(
 export function ref(path: string, options?: { contextPrefix: string }): Ref;
 export function lazy<T>(fn: (value: T) => Schema<T>): Lazy;
 export function setLocale(customLocale: LocaleObject): void;
+export function isSchema(obj: any): obj is Schema<any>;
 
 export const mixed: MixedSchemaConstructor;
 export const string: StringSchemaConstructor;
@@ -66,7 +68,8 @@ export interface Schema<T> {
     strict(isStrict: boolean): this;
     strip(strip: boolean): this;
     withMutation(fn: (current: this) => void): void;
-    default(value?: any): this;
+    default(value: any): this;
+    default(): T;
     nullable(isNullable: boolean): this;
     required(message?: TestOptionsMessage): this;
     notRequired(): this;
@@ -225,7 +228,7 @@ export interface TestContext {
     parent: any;
     schema: Schema<any>;
     resolve: (value: any) => any;
-    createError: (params: { path: string; message: string }) => ValidationError;
+    createError: (params?: { path?: string; message?: string }) => ValidationError;
 }
 
 export interface ValidateOptions {
diff --git a/types/yup/yup-tests.ts b/types/yup/yup-tests.ts
index a90a7df25d..c6717e95ad 100644
--- a/types/yup/yup-tests.ts
+++ b/types/yup/yup-tests.ts
@@ -3,6 +3,7 @@ import * as yup from "yup";
 // tslint:disable-next-line:no-duplicate-imports
 import {
     reach,
+    isSchema,
     date,
     Schema,
     ObjectSchema,
@@ -24,6 +25,10 @@ const schema1 = yup.object().shape({
 reach(schema1, "nested.arr.num");
 reach(schema1, "nested.arr[].num");
 
+// isSchema function
+const isSchemaResult1: boolean = isSchema(schema1);
+const isSchemaResult2: boolean = isSchema({});
+
 // addMethod function
 yup.addMethod<NumberSchema>(yup.number, "minimum", function(
     this,
@@ -199,6 +204,12 @@ const testContext = function(this: TestContext) {
     this.resolve;
     // $ExpectType ValidationError
     this.createError({ path: "1", message: "1" });
+    // $ExpectType ValidationError
+    this.createError({ message: "1" });
+    // $ExpectType ValidationError
+    this.createError({ path: "1"});
+    // $ExpectType ValidationError
+    this.createError();
     return true;
 };
 mixed.test("with-context", "it uses function context", testContext);
diff --git a/types/zapier-platform-core/index.d.ts b/types/zapier-platform-core/index.d.ts
index 2f0c11bd01..ec9f3de919 100644
--- a/types/zapier-platform-core/index.d.ts
+++ b/types/zapier-platform-core/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for zapier-platform-core 3.1
-// Project: https://github.com/zapier/zapier-platform-core
+// Project: https://github.com/zapier/zapier-platform-core, https://zapier.com
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
diff --git a/types/zeit__next-typescript/index.d.ts b/types/zeit__next-typescript/index.d.ts
index 2c4c21014e..aaa08254dc 100644
--- a/types/zeit__next-typescript/index.d.ts
+++ b/types/zeit__next-typescript/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @zeit/next-typescript 0.1
-// Project: https://github.com/zeit/next-plugins/tree/master/packages/next-typescript
+// Project: https://github.com/zeit/next-plugins/tree/master/packages/next-typescript, https://github.com/zeit/next-plugins
 // Definitions by: icopp <https://github.com/icopp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8